diff --git a/assistant/src/__tests__/__snapshots__/ipc-snapshot.test.ts.snap b/assistant/src/__tests__/__snapshots__/ipc-snapshot.test.ts.snap
index b825df5f69b..484174cfaf2 100644
--- a/assistant/src/__tests__/__snapshots__/ipc-snapshot.test.ts.snap
+++ b/assistant/src/__tests__/__snapshots__/ipc-snapshot.test.ts.snap
@@ -2609,8 +2609,8 @@ exports[`IPC message snapshots ServerMessage types dictation_response serializes
 
 exports[`IPC message snapshots ServerMessage types guardian_request_thread_created serializes to expected JSON 1`] = `
 {
-  "callSessionId": "call-guardian-001",
-  "conversationId": "conv-guardian-req-001",
+  "callSessionId": "call-001",
+  "conversationId": "conv-guardian-001",
   "requestId": "req-guardian-001",
   "title": "Guardian action request",
   "type": "guardian_request_thread_created",
diff --git a/assistant/src/__tests__/call-orchestrator.test.ts b/assistant/src/__tests__/call-orchestrator.test.ts
index 74afac3582f..51778bebfca 100644
--- a/assistant/src/__tests__/call-orchestrator.test.ts
+++ b/assistant/src/__tests__/call-orchestrator.test.ts
@@ -17,6 +17,7 @@ mock.module('../util/platform.js', () => ({
   getDbPath: () => join(testDir, 'test.db'),
   getLogPath: () => join(testDir, 'test.log'),
   ensureDataDir: () => {},
+  readHttpToken: () => null,
 }));
 
 mock.module('../util/logger.js', () => ({
@@ -55,6 +56,7 @@ mock.module('../config/loader.js', () => ({
       safety: { denyCategories: [] },
       model: mockCallModel,
     },
+    memory: { enabled: false },
   }),
 }));
 
@@ -179,6 +181,8 @@ function resetTables() {
   db.run('DELETE FROM call_pending_questions');
   db.run('DELETE FROM call_events');
   db.run('DELETE FROM call_sessions');
+  db.run('DELETE FROM tool_invocations');
+  db.run('DELETE FROM messages');
   db.run('DELETE FROM conversations');
   ensuredConvIds = new Set();
 }
diff --git a/assistant/src/__tests__/call-routes-http.test.ts b/assistant/src/__tests__/call-routes-http.test.ts
index dde51488846..0b373ca692f 100644
--- a/assistant/src/__tests__/call-routes-http.test.ts
+++ b/assistant/src/__tests__/call-routes-http.test.ts
@@ -23,6 +23,7 @@ mock.module('../util/platform.js', () => ({
   getDbPath: () => join(testDir, 'test.db'),
   getLogPath: () => join(testDir, 'test.log'),
   ensureDataDir: () => {},
+  readHttpToken: () => null,
 }));
 
 mock.module('../util/logger.js', () => ({
@@ -133,6 +134,8 @@ function resetTables() {
   db.run('DELETE FROM call_pending_questions');
   db.run('DELETE FROM call_events');
   db.run('DELETE FROM call_sessions');
+  db.run('DELETE FROM tool_invocations');
+  db.run('DELETE FROM messages');
   db.run('DELETE FROM conversations');
   ensuredConvIds = new Set();
 }
diff --git a/assistant/src/__tests__/computer-use-session-working-dir.test.ts b/assistant/src/__tests__/computer-use-session-working-dir.test.ts
index fd4e5ff7070..9ce692464ac 100644
--- a/assistant/src/__tests__/computer-use-session-working-dir.test.ts
+++ b/assistant/src/__tests__/computer-use-session-working-dir.test.ts
@@ -45,6 +45,7 @@ mock.module('../util/platform.js', () => ({
   isMacOS: () => false,
   isLinux: () => true,
   isWindows: () => false,
+  readHttpToken: () => null,
 }));
 
 mock.module('../tools/executor.js', () => ({
diff --git a/assistant/src/__tests__/relay-server.test.ts b/assistant/src/__tests__/relay-server.test.ts
index 0c66e682706..b0c3b5a0a28 100644
--- a/assistant/src/__tests__/relay-server.test.ts
+++ b/assistant/src/__tests__/relay-server.test.ts
@@ -33,6 +33,7 @@ mock.module('../util/platform.js', () => ({
   getDbPath: () => join(testDir, 'test.db'),
   getLogPath: () => join(testDir, 'test.log'),
   ensureDataDir: () => {},
+  readHttpToken: () => null,
 }));
 
 mock.module('../util/logger.js', () => ({
@@ -59,6 +60,7 @@ const mockConfig = {
       codeLength: 6,
     },
   },
+  memory: { enabled: false },
 };
 
 mock.module('../config/loader.js', () => ({
@@ -170,6 +172,8 @@ function resetTables() {
   db.run('DELETE FROM call_pending_questions');
   db.run('DELETE FROM call_events');
   db.run('DELETE FROM call_sessions');
+  db.run('DELETE FROM tool_invocations');
+  db.run('DELETE FROM messages');
   db.run('DELETE FROM conversations');
   ensuredConvIds = new Set();
 }
diff --git a/assistant/src/__tests__/session-abort-tool-results.test.ts b/assistant/src/__tests__/session-abort-tool-results.test.ts
index cebad999d08..7e7733077d4 100644
--- a/assistant/src/__tests__/session-abort-tool-results.test.ts
+++ b/assistant/src/__tests__/session-abort-tool-results.test.ts
@@ -11,6 +11,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-conflict-gate.test.ts b/assistant/src/__tests__/session-conflict-gate.test.ts
index d642af67aba..07d8ea43933 100644
--- a/assistant/src/__tests__/session-conflict-gate.test.ts
+++ b/assistant/src/__tests__/session-conflict-gate.test.ts
@@ -62,6 +62,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-pre-run-repair.test.ts b/assistant/src/__tests__/session-pre-run-repair.test.ts
index e318e3f41b7..830257e4cc8 100644
--- a/assistant/src/__tests__/session-pre-run-repair.test.ts
+++ b/assistant/src/__tests__/session-pre-run-repair.test.ts
@@ -13,6 +13,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-profile-injection.test.ts b/assistant/src/__tests__/session-profile-injection.test.ts
index e90437f4ef9..0d01ae7cc8d 100644
--- a/assistant/src/__tests__/session-profile-injection.test.ts
+++ b/assistant/src/__tests__/session-profile-injection.test.ts
@@ -22,6 +22,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-provider-retry-repair.test.ts b/assistant/src/__tests__/session-provider-retry-repair.test.ts
index 13796d76d7a..f30caef1e47 100644
--- a/assistant/src/__tests__/session-provider-retry-repair.test.ts
+++ b/assistant/src/__tests__/session-provider-retry-repair.test.ts
@@ -12,6 +12,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-queue.test.ts b/assistant/src/__tests__/session-queue.test.ts
index ff4373b0d0a..c4315af0c70 100644
--- a/assistant/src/__tests__/session-queue.test.ts
+++ b/assistant/src/__tests__/session-queue.test.ts
@@ -25,6 +25,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-slash-known.test.ts b/assistant/src/__tests__/session-slash-known.test.ts
index 5bba29b837b..8c2627f1c15 100644
--- a/assistant/src/__tests__/session-slash-known.test.ts
+++ b/assistant/src/__tests__/session-slash-known.test.ts
@@ -16,6 +16,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-slash-queue.test.ts b/assistant/src/__tests__/session-slash-queue.test.ts
index 92311625a27..bc08efaae99 100644
--- a/assistant/src/__tests__/session-slash-queue.test.ts
+++ b/assistant/src/__tests__/session-slash-queue.test.ts
@@ -16,6 +16,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-slash-unknown.test.ts b/assistant/src/__tests__/session-slash-unknown.test.ts
index d347e712fbe..a358179a927 100644
--- a/assistant/src/__tests__/session-slash-unknown.test.ts
+++ b/assistant/src/__tests__/session-slash-unknown.test.ts
@@ -16,6 +16,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-workspace-injection.test.ts b/assistant/src/__tests__/session-workspace-injection.test.ts
index e4996fdd15b..2c5ccf6e192 100644
--- a/assistant/src/__tests__/session-workspace-injection.test.ts
+++ b/assistant/src/__tests__/session-workspace-injection.test.ts
@@ -23,6 +23,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/session-workspace-tool-tracking.test.ts b/assistant/src/__tests__/session-workspace-tool-tracking.test.ts
index 9d48b87ebca..c9546504a35 100644
--- a/assistant/src/__tests__/session-workspace-tool-tracking.test.ts
+++ b/assistant/src/__tests__/session-workspace-tool-tracking.test.ts
@@ -22,6 +22,12 @@ mock.module('../util/platform.js', () => ({
   getDataDir: () => '/tmp',
 }));
 
+mock.module('../memory/guardian-action-store.js', () => ({
+  getPendingDeliveryByConversation: () => null,
+  getGuardianActionRequest: () => null,
+  resolveGuardianActionRequest: () => {},
+}));
+
 mock.module('../providers/registry.js', () => ({
   getProvider: () => ({ name: 'mock-provider' }),
   initializeProviders: () => {},
diff --git a/assistant/src/__tests__/twilio-routes.test.ts b/assistant/src/__tests__/twilio-routes.test.ts
index 49547ea9ca2..7a0d724ee58 100644
--- a/assistant/src/__tests__/twilio-routes.test.ts
+++ b/assistant/src/__tests__/twilio-routes.test.ts
@@ -31,6 +31,7 @@ mock.module('../util/platform.js', () => ({
   getDbPath: () => join(testDir, 'test.db'),
   getLogPath: () => join(testDir, 'test.log'),
   ensureDataDir: () => {},
+  readHttpToken: () => null,
 }));
 
 mock.module('../util/logger.js', () => ({
@@ -115,6 +116,8 @@ function resetTables() {
   db.run('DELETE FROM call_pending_questions');
   db.run('DELETE FROM call_events');
   db.run('DELETE FROM call_sessions');
+  db.run('DELETE FROM tool_invocations');
+  db.run('DELETE FROM messages');
   db.run('DELETE FROM conversations');
   ensuredConvIds = new Set();
 }