@vellumai/assistant 0.4.55 → 0.4.57

package/src/__tests__/guardian-routing-invariants.test.ts

@@ -129,10 +129,10 @@ function registerPendingToolApprovalInteraction(
   const mockSession = {
     handleConfirmationResponse,
     ensureActorScopedHistory: async () => {},
-  } as unknown as import("../daemon/session.js").Session;
+  } as unknown as import("../daemon/conversation.js").Conversation;
 
   pendingInteractions.register(requestId, {
-    session: mockSession,
+    conversation: mockSession,
     conversationId,
     kind: "confirmation",
     confirmationDetails: {
@@ -209,7 +209,7 @@ describe("routing invariant: all decision paths reference applyCanonicalGuardian
   // the shared router rather than inlining decision logic.
   const ROUTER_CONSUMERS = [
     "runtime/routes/inbound-message-handler.ts",
-    "daemon/session-process.ts",
+    "daemon/conversation-process.ts",
   ];
 
   for (const relPath of ROUTER_CONSUMERS) {
@@ -220,15 +220,15 @@ describe("routing invariant: all decision paths reference applyCanonicalGuardian
     });
   }
 
-  test("daemon/session-process.ts no longer references legacy guardian-action interception", () => {
-    const fullPath = join(srcRoot, "daemon/session-process.ts");
+  test("daemon/conversation-process.ts no longer references legacy guardian-action interception", () => {
+    const fullPath = join(srcRoot, "daemon/conversation-process.ts");
     const source = readFileSync(fullPath, "utf-8");
     expect(source).not.toContain("../memory/guardian-action-store.js");
     expect(source).not.toContain("getPendingDeliveriesByConversation");
   });
 
-  test("daemon/session-process.ts seeds router hints via listPendingRequestsByConversationScope", () => {
-    const fullPath = join(srcRoot, "daemon/session-process.ts");
+  test("daemon/conversation-process.ts seeds router hints via listPendingRequestsByConversationScope", () => {
+    const fullPath = join(srcRoot, "daemon/conversation-process.ts");
     const source = readFileSync(fullPath, "utf-8");
     expect(source).toContain("listPendingRequestsByConversationScope");
   });
@@ -257,7 +257,7 @@ describe("routing invariant: principal-based authorization enforced before decis
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -282,7 +282,7 @@ describe("routing invariant: principal-based authorization enforced before decis
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -300,7 +300,7 @@ describe("routing invariant: principal-based authorization enforced before decis
       sourceType: "channel",
       conversationId: "conv-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -323,7 +323,7 @@ describe("routing invariant: principal-based authorization enforced before decis
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "ABC123",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
@@ -356,7 +356,7 @@ describe("routing invariant: stale/expired/already-resolved decisions rejected",
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() - 10_000).toISOString(), // already expired
+      expiresAt: Date.now() - 10_000, // already expired
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -377,7 +377,7 @@ describe("routing invariant: stale/expired/already-resolved decisions rejected",
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // First decision succeeds
@@ -423,7 +423,7 @@ describe("routing invariant: stale/expired/already-resolved decisions rejected",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "ABC123",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // Resolve the request first
@@ -455,7 +455,7 @@ describe("routing invariant: stale/expired/already-resolved decisions rejected",
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() - 10_000).toISOString(), // already expired
+      expiresAt: Date.now() - 10_000, // already expired
     });
 
     const result = await routeGuardianReply(
@@ -489,7 +489,7 @@ describe("routing invariant: code-only messages return clarification", () => {
       requestCode: "A1B2C3",
       toolName: "shell",
       questionText: "Run shell command: ls -la",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
@@ -524,7 +524,7 @@ describe("routing invariant: code-only messages return clarification", () => {
       pendingQuestionId: "pq-1",
       requestCode: "A2B3C4",
       questionText: "What time works best?",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
@@ -559,7 +559,7 @@ describe("routing invariant: code-only messages return clarification", () => {
       requestCode: "B2C3D4",
       questionText: "Allow send_email to bob@example.com?",
       toolName: "send_email",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
@@ -591,7 +591,7 @@ describe("routing invariant: code-only messages return clarification", () => {
       requestCode: "A1B2C3",
       toolName: "shell",
       inputDigest: "sha256:abc",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -618,7 +618,7 @@ describe("routing invariant: code-only messages return clarification", () => {
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "D4E5F6",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -653,14 +653,14 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "DDD444",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req.id],
         approvalConversationGenerator: undefined,
       }),
@@ -683,13 +683,13 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "GGG777",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "ok, what is this for?",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req.id],
         approvalConversationGenerator: undefined,
       }),
@@ -712,7 +712,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "HHH888",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
@@ -739,7 +739,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "EEE555",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const req2 = createCanonicalGuardianRequest({
@@ -750,13 +750,13 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "FFF666",
       toolName: "file_write",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req1.id, req2.id],
         approvalConversationGenerator: undefined,
       }),
@@ -784,7 +784,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "AAA111",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const req2 = createCanonicalGuardianRequest({
@@ -795,7 +795,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "BBB222",
       toolName: "file_write",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // The NL engine mock: returns a decision but no specific target.
@@ -842,7 +842,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       pendingQuestionId: "pq-answer",
       requestCode: "ABC123",
       questionText: "What time works best?",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const approvalRequest = createCanonicalGuardianRequest({
@@ -857,13 +857,13 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       requestCode: "DEF456",
       questionText: "Allow send_email to bob@example.com?",
       toolName: "send_email",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [answerRequest.id, approvalRequest.id],
         approvalConversationGenerator: undefined,
       }),
@@ -892,7 +892,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "CCC333",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -929,7 +929,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       toolName: "shell",
       requestCode: "GO1234",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -959,7 +959,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "111AAA",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     const outOfScope = createCanonicalGuardianRequest({
       kind: "tool_approval",
@@ -969,7 +969,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "222BBB",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(inScope.id, "conv-1", "shell");
     registerPendingToolApprovalInteraction(outOfScope.id, "conv-2", "shell");
@@ -977,7 +977,7 @@ describe("routing invariant: disambiguation stays fail-closed", () => {
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "222BBB approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [inScope.id],
         approvalConversationGenerator: undefined,
       }),
@@ -1038,7 +1038,7 @@ describe("routing invariant: approve_always downgraded for guardian-on-behalf",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       toolName: "shell",
       inputDigest: "sha256:abc",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -1071,7 +1071,7 @@ describe("routing invariant: callback buttons route through canonical primitive"
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       toolName: "shell",
       inputDigest: "sha256:abc",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -1098,7 +1098,7 @@ describe("routing invariant: callback buttons route through canonical primitive"
       conversationId: "conv-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-1", "shell");
 
@@ -1124,7 +1124,7 @@ describe("routing invariant: callback buttons route through canonical primitive"
       conversationId: "conv-other",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-other", "shell");
 
@@ -1166,7 +1166,7 @@ describe("routing invariant: destination hints do not bypass tool_approval princ
       toolName: "shell",
       requestCode: "NL1234",
       guardianPrincipalId: "request-principal",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(req.id, "conv-voice-1", "shell");
 
@@ -1201,7 +1201,7 @@ describe("routing invariant: destination hints do not bypass tool_approval princ
       toolName: "shell",
       requestCode: "NL5678",
       guardianPrincipalId: "voice-principal",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // No pendingRequestIds passed — identity-based fallback uses
@@ -1245,13 +1245,13 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "INV001",
       toolName: "ingress_access_request",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "open invite flow",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req.id],
         approvalConversationGenerator: undefined,
       }),
@@ -1274,7 +1274,7 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       sourceChannel: "telegram",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: TEST_PRINCIPAL_ID,
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     for (const phrase of [
@@ -1306,13 +1306,13 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "TAP001",
       toolName: "shell",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     await routeGuardianReply(
       replyCtx({
         messageText: "open invite flow",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req.id],
         approvalConversationGenerator: undefined,
       }),
@@ -1335,14 +1335,14 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "A00B01",
       toolName: "ingress_access_request",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // Code-based approve should still work (request code must be valid hex: [A-F0-9]{6})
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "A00B01 approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [req.id],
         approvalConversationGenerator: undefined,
       }),
@@ -1365,14 +1365,14 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "C0D3A5",
       toolName: "ingress_access_request",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await routeGuardianReply({
       messageText: "C0D3A5 approve",
       channel: "vellum",
       actor: trustedActor({ channel: "vellum" }),
-      conversationId: "conv-guardian-thread",
+      conversationId: "conv-guardian-conversation",
       pendingRequestIds: [req.id],
       approvalConversationGenerator: undefined,
     });
@@ -1398,7 +1398,7 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       requesterChatId: "chat-1",
       requestCode: "A1B2C3",
       toolName: "ingress_access_request",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const approvalConversationGenerator = async () => ({
@@ -1411,7 +1411,7 @@ describe("routing invariant: invite handoff bypass for access requests", () => {
       messageText: "please approve this request",
       channel: "vellum",
       actor: trustedActor({ channel: "vellum" }),
-      conversationId: "conv-guardian-thread",
+      conversationId: "conv-guardian-conversation",
       pendingRequestIds: [req.id],
       approvalConversationGenerator: approvalConversationGenerator as any,
     });
@@ -1444,7 +1444,7 @@ describe("routing invariant: expired requests are excluded from pending discover
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "EXP001",
       toolName: "shell",
-      expiresAt: new Date(Date.now() - 10_000).toISOString(),
+      expiresAt: Date.now() - 10_000,
     });
 
     const active = createCanonicalGuardianRequest({
@@ -1455,7 +1455,7 @@ describe("routing invariant: expired requests are excluded from pending discover
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "ACT001",
       toolName: "file_write",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
     registerPendingToolApprovalInteraction(active.id, "conv-1", "file_write");
 
@@ -1463,7 +1463,7 @@ describe("routing invariant: expired requests are excluded from pending discover
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [expired.id, active.id],
         approvalConversationGenerator: undefined,
       }),
@@ -1491,7 +1491,7 @@ describe("routing invariant: expired requests are excluded from pending discover
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "EXP002",
       toolName: "shell",
-      expiresAt: new Date(Date.now() - 10_000).toISOString(),
+      expiresAt: Date.now() - 10_000,
     });
 
     const expired2 = createCanonicalGuardianRequest({
@@ -1502,13 +1502,13 @@ describe("routing invariant: expired requests are excluded from pending discover
       guardianPrincipalId: TEST_PRINCIPAL_ID,
       requestCode: "EXP003",
       toolName: "file_write",
-      expiresAt: new Date(Date.now() - 5_000).toISOString(),
+      expiresAt: Date.now() - 5_000,
     });
 
     const result = await routeGuardianReply(
       replyCtx({
         messageText: "approve",
-        conversationId: "conv-guardian-thread",
+        conversationId: "conv-guardian-conversation",
         pendingRequestIds: [expired1.id, expired2.id],
         approvalConversationGenerator: undefined,
       }),

package/src/__tests__/guardian-routing-state.test.ts

@@ -38,7 +38,7 @@ mock.module("../security/secret-ingress.js", () => ({
 
 import { upsertContact } from "../contacts/contact-store.js";
 import { createGuardianBinding } from "../contacts/contacts-write.js";
-import type { TrustContext } from "../daemon/session-runtime-assembly.js";
+import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
 import { getDb, initializeDb, resetDb } from "../memory/db.js";
 import * as deliveryCrud from "../memory/delivery-crud.js";
 import { channelInboundEvents, messages } from "../memory/schema.js";

package/src/__tests__/guardian-verification-voice-binding.test.ts

@@ -1,6 +1,6 @@
 /**
  * Regression test: guardian verification calls must create a voice channel
- * binding so the conversation never appears as an unbound desktop thread.
+ * binding so the conversation never appears as an unbound desktop conversation.
  */
 import { mkdtempSync, realpathSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";

package/src/__tests__/handlers-user-message-approval-consumption.test.ts

@@ -2,7 +2,7 @@
  * Tests for confirmation response handling (handleConfirmationResponse).
  *
  * The legacy handleUserMessage tests that previously lived here were removed
- * when session-user-message.ts was deleted. The approval-reply behavior they
+ * when conversation-user-message.ts was deleted. The approval-reply behavior they
  * tested now lives on the HTTP path and is covered by
  * conversation-routes-guardian-reply.test.ts, send-endpoint-busy.test.ts,
  * and http-user-message-parity.test.ts.
@@ -143,9 +143,9 @@ mock.module("../util/logger.js", () => ({
   }),
 }));
 
-import { handleConfirmationResponse } from "../daemon/handlers/sessions.js";
+import { handleConfirmationResponse } from "../daemon/handlers/conversations.js";
 
-interface TestSession {
+interface TestConversation {
   messages: Array<{ role: string; content: unknown[] }>;
   setChannelCapabilities: (caps: unknown) => void;
   isProcessing: () => boolean;
@@ -173,13 +173,13 @@ interface TestSession {
   processMessage: (...args: unknown[]) => Promise<string>;
 }
 
-function createContext(session: TestSession): {
+function createContext(conversationObj: TestConversation): {
   ctx: HandlerContext;
   sent: ServerMessage[];
 } {
   const sent: ServerMessage[] = [];
   const ctx: HandlerContext = {
-    sessions: new Map(),
+    conversations: new Map(),
     sharedRequestTimestamps: [],
     debounceTimers: new DebouncerMap({ defaultDelayMs: 100 }),
     suppressConfigReload: false,
@@ -189,14 +189,16 @@ function createContext(session: TestSession): {
       sent.push(msg);
     },
     broadcast: () => {},
-    clearAllSessions: () => 0,
-    getOrCreateSession: async () => session as any,
-    touchSession: () => {},
+    clearAllConversations: () => 0,
+    getOrCreateConversation: async () => conversationObj as any,
+    touchConversation: () => {},
   };
   return { ctx, sent };
 }
 
-function makeSession(overrides: Partial<TestSession> = {}): TestSession {
+function makeConversation(
+  overrides: Partial<TestConversation> = {},
+): TestConversation {
   return {
     messages: [],
     setChannelCapabilities: () => {},
@@ -237,13 +239,13 @@ describe("handleConfirmationResponse canonical status sync", () => {
   });
 
   test("syncs canonical status to approved for allow decisions", () => {
-    const session = {
+    const conversationObj = {
       hasPendingConfirmation: (requestId: string) =>
         requestId === "req-confirm-allow",
       handleConfirmationResponse: mock(() => {}),
     };
-    const { ctx } = createContext(makeSession());
-    ctx.sessions.set("conv-1", session as any);
+    const { ctx } = createContext(makeConversation());
+    ctx.conversations.set("conv-1", conversationObj as any);
 
     const msg: ConfirmationResponse = {
       type: "confirmation_response",
@@ -253,10 +255,12 @@ describe("handleConfirmationResponse canonical status sync", () => {
 
     handleConfirmationResponse(msg, ctx);
 
-    expect((session.handleConfirmationResponse as any).mock.calls.length).toBe(
-      1,
-    );
-    expect((session.handleConfirmationResponse as any).mock.calls[0]).toEqual([
+    expect(
+      (conversationObj.handleConfirmationResponse as any).mock.calls.length,
+    ).toBe(1);
+    expect(
+      (conversationObj.handleConfirmationResponse as any).mock.calls[0],
+    ).toEqual([
       "req-confirm-allow",
       "always_allow",
       undefined,