@vellumai/assistant 0.4.54 → 0.4.56

package/src/__tests__/tool-executor.test.ts

@@ -163,7 +163,6 @@ import type { ToolContext } from "../tools/types.js";
 function makeContext(overrides?: Partial<ToolContext>): ToolContext {
   return {
     workingDir: "/tmp/project",
-    sessionId: "session-1",
     conversationId: "conversation-1",
     trustClass: "guardian",
     ...overrides,
@@ -1536,9 +1535,9 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── USER.md security invariant (PR 31) ──────────
 
-  test("file_edit to USER.md forces prompt in private thread even with matching trust rule", async () => {
+  test("file_edit to USER.md forces prompt in private conversation even with matching trust rule", async () => {
     // This is a key security invariant: USER.md contains the user's persistent
-    // memory. In a private thread (forcePromptSideEffects=true), edits to it
+    // memory. In a private conversation (forcePromptSideEffects=true), edits to it
     // must always require explicit approval, even when a trust rule matches.
     checkResultOverride = {
       decision: "allow",
@@ -1561,7 +1560,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("host_file_edit to USER.md forces prompt in private thread", async () => {
+  test("host_file_edit to USER.md forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1581,7 +1580,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── Browser action tools as side-effect tools (PR fix2) ──────────
 
-  test("browser_click forces prompt in private thread", async () => {
+  test("browser_click forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1595,7 +1594,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("browser_type forces prompt in private thread", async () => {
+  test("browser_type forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1609,7 +1608,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("browser_snapshot does NOT force prompt in private thread", async () => {
+  test("browser_snapshot does NOT force prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1626,7 +1625,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── Always-mutating document tools (PR fix5) ──────────
 
-  test("document_create forces prompt in private thread", async () => {
+  test("document_create forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1640,7 +1639,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("document_update forces prompt in private thread", async () => {
+  test("document_update forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1656,7 +1655,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── Always-mutating schedule tools (PR fix7) ──────────
 
-  test("schedule_create forces prompt in private thread", async () => {
+  test("schedule_create forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1670,7 +1669,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("schedule_update forces prompt in private thread", async () => {
+  test("schedule_update forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1684,7 +1683,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("schedule_delete forces prompt in private thread", async () => {
+  test("schedule_delete forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1700,7 +1699,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── Credential store action-aware (PR fix9) ──────────
 
-  test("credential_store store forces prompt in private thread", async () => {
+  test("credential_store store forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1714,7 +1713,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("credential_store delete forces prompt in private thread", async () => {
+  test("credential_store delete forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1728,7 +1727,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("credential_store oauth2_connect forces prompt in private thread", async () => {
+  test("credential_store oauth2_connect forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1742,7 +1741,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("credential_store list does NOT force prompt in private thread", async () => {
+  test("credential_store list does NOT force prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1759,7 +1758,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
 
   // ── Workspace mode + forcePromptSideEffects interaction ──────────
 
-  test("workspace mode allow → prompt promotion still works for side-effect tools in private threads", async () => {
+  test("workspace mode allow → prompt promotion still works for side-effect tools in private conversations", async () => {
     // Simulate workspace mode returning 'allow' for a workspace-scoped file_write
     checkResultOverride = {
       decision: "allow",
@@ -1779,7 +1778,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("schedule_create forces prompt in private thread", async () => {
+  test("schedule_create forces prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1797,7 +1796,7 @@ describe("ToolExecutor forcePromptSideEffects enforcement", () => {
     expect(promptCalled).toBe(true);
   });
 
-  test("schedule_list does NOT force prompt in private thread", async () => {
+  test("schedule_list does NOT force prompt in private conversation", async () => {
     checkResultOverride = { decision: "allow", reason: "Matched trust rule" };
 
     const executor = new ToolExecutor(makeTrackingPrompter());
@@ -1968,7 +1967,7 @@ describe("ToolExecutor persistentDecisionsAllowed contract", () => {
         _scopeOptions: ScopeOption[],
         _diff: unknown,
         _sandboxed: unknown,
-        _sessionId: unknown,
+        _conversationId: unknown,
         _executionTarget: unknown,
         persistentDecisionsAllowed: boolean | undefined,
       ) => {
@@ -2169,6 +2168,7 @@ describe("buildSanitizedEnv — baseline: credential exclusion", () => {
       "GNUPGHOME",
       "INTERNAL_GATEWAY_BASE_URL",
       "VELLUM_DATA_DIR",
+      "VELLUM_WORKSPACE_DIR",
     ];
 
     const env = buildSanitizedEnv();

package/src/__tests__/tool-grant-request-escalation.test.ts

@@ -96,7 +96,7 @@ mock.module("../runtime/channel-verification-service.js", () => ({
     return null;
   },
   createOutboundSession: () => ({
-    sessionId: "test-session",
+    conversationId: "test-session",
     secret: "123456",
   }),
 }));
@@ -160,7 +160,6 @@ afterAll(() => {
 function makeContext(overrides: Partial<ToolContext> = {}): ToolContext {
   return {
     workingDir: testDir,
-    sessionId: "session-1",
     conversationId: "conv-1",
     assistantId: "self",
     requestId: "req-1",
@@ -422,7 +421,7 @@ describe("applyCanonicalGuardianDecision / tool_grant_request", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:testdigest",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -452,7 +451,7 @@ describe("applyCanonicalGuardianDecision / tool_grant_request", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:testdigest",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -480,7 +479,7 @@ describe("applyCanonicalGuardianDecision / tool_grant_request", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:testdigest",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const result = await applyCanonicalGuardianDecision({
@@ -662,7 +661,7 @@ describe("inline wait-and-resume", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:waitgrant",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // Schedule approval after 50ms
@@ -704,7 +703,7 @@ describe("inline wait-and-resume", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:denywait",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // Schedule rejection after 50ms
@@ -743,7 +742,7 @@ describe("inline wait-and-resume", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:timeoutwait",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const start = Date.now();
@@ -777,7 +776,7 @@ describe("inline wait-and-resume", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:abortwait",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     const controller = new AbortController();

package/src/__tests__/tool-metrics-listener.test.ts

@@ -48,7 +48,6 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.execution.started", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       input: { path: "README.md" },
       startedAtMs: 100,
@@ -56,7 +55,6 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.execution.finished", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       decision: "allow",
       riskLevel: "low",
@@ -88,14 +86,12 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.execution.started", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       input: { path: "README.md" },
       startedAtMs: 100,
     });
     await bus.emit("tool.execution.finished", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       decision: "allow",
       riskLevel: "low",
@@ -117,14 +113,12 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.permission.requested", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "bash",
       riskLevel: "high",
       requestedAtMs: 120,
     });
     await bus.emit("tool.permission.decided", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "bash",
       decision: "deny",
       riskLevel: "high",
@@ -146,7 +140,6 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.secret.detected", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       action: "warn",
       matches: [
@@ -182,7 +175,6 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.execution.failed", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "bash",
       decision: "error",
       riskLevel: "high",
@@ -214,7 +206,6 @@ describe("registerToolMetricsLoggingListener", () => {
 
     await bus.emit("tool.execution.failed", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "bash",
       decision: "error",
       riskLevel: "medium",

package/src/__tests__/tool-notification-listener.test.ts

@@ -13,7 +13,6 @@ describe("registerToolNotificationListener", () => {
 
     await bus.emit("tool.secret.detected", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       action: "warn",
       matches: [
@@ -50,7 +49,6 @@ describe("registerToolNotificationListener", () => {
     subscription.dispose();
     await bus.emit("tool.secret.detected", {
       conversationId: "conversation-1",
-      sessionId: "session-1",
       toolName: "file_read",
       action: "warn",
       matches: [

package/src/__tests__/tool-preview-lifecycle.test.ts

@@ -71,18 +71,18 @@ mock.module("../memory/llm-request-log-store.js", () => ({
 }));
 
 // ── Imports (after mocks) ─────────────────────────────────────────────────────
-import type { ServerMessage } from "../daemon/message-protocol.js";
 import type {
   EventHandlerDeps,
   EventHandlerState,
-} from "../daemon/session-agent-loop-handlers.js";
+} from "../daemon/conversation-agent-loop-handlers.js";
 import {
   createEventHandlerState,
   handleInputJsonDelta,
   handleToolResult,
   handleToolUse,
   handleToolUsePreviewStart,
-} from "../daemon/session-agent-loop-handlers.js";
+} from "../daemon/conversation-agent-loop-handlers.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
@@ -212,7 +212,7 @@ describe("tool preview lifecycle", () => {
       expect(emitted.type).toBe("tool_use_preview_start");
       expect((emitted as any).toolUseId).toBe("toolu_abc123");
       expect((emitted as any).toolName).toBe("bash");
-      expect((emitted as any).sessionId).toBe("test-session-id");
+      expect((emitted as any).conversationId).toBe("test-session-id");
     });
 
     test("emits activity state with tool_running phase and preview_start reason", () => {
@@ -255,7 +255,7 @@ describe("tool preview lifecycle", () => {
       expect((emitted as any).toolUseId).toBe("toolu_delta456");
       expect((emitted as any).toolName).toBe("bash");
       expect((emitted as any).content).toBe('{"command": "ls"}');
-      expect((emitted as any).sessionId).toBe("test-session-id");
+      expect((emitted as any).conversationId).toBe("test-session-id");
     });
 
     test("handleToolResult includes toolUseId", () => {
@@ -287,7 +287,7 @@ describe("tool preview lifecycle", () => {
       );
       expect(toolResultEvent).toBeDefined();
       expect((toolResultEvent as any).toolUseId).toBe("toolu_result789");
-      expect((toolResultEvent as any).sessionId).toBe("test-session-id");
+      expect((toolResultEvent as any).conversationId).toBe("test-session-id");
     });
   });
 

package/src/__tests__/tool-profiling-listener.test.ts

@@ -161,7 +161,6 @@ describe("registerToolProfilingListener", () => {
   test("records tool.execution.finished events", async () => {
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-1",
       toolName: "file_read",
       decision: "allow",
@@ -184,7 +183,6 @@ describe("registerToolProfilingListener", () => {
   test("records tool.execution.finished with isError=true", async () => {
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "bash",
       decision: "allow",
       riskLevel: "low",
@@ -199,7 +197,6 @@ describe("registerToolProfilingListener", () => {
   test("records tool.execution.failed events as errors", async () => {
     await bus.emit("tool.execution.failed", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-2",
       toolName: "bash",
       decision: "allow",
@@ -223,7 +220,6 @@ describe("registerToolProfilingListener", () => {
   test("ignores non-completion events", async () => {
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       input: {},
       startedAtMs: 1000,
@@ -231,7 +227,6 @@ describe("registerToolProfilingListener", () => {
 
     await bus.emit("tool.permission.requested", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "bash",
       riskLevel: "high",
       requestedAtMs: 2000,
@@ -247,7 +242,6 @@ describe("registerToolProfilingListener", () => {
 
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       decision: "allow",
       riskLevel: "low",
@@ -262,7 +256,6 @@ describe("registerToolProfilingListener", () => {
 
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       decision: "allow",
       riskLevel: "low",

package/src/__tests__/tool-trace-listener.test.ts

@@ -39,7 +39,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_started trace on tool.execution.started", async () => {
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-1",
       toolName: "file_read",
       input: { path: "/tmp/test.txt" },
@@ -56,7 +55,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_permission_requested trace with riskLevel", async () => {
     await bus.emit("tool.permission.requested", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-2",
       toolName: "bash",
       riskLevel: "high",
@@ -75,7 +73,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_permission_decided trace with decision", async () => {
     await bus.emit("tool.permission.decided", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-3",
       toolName: "bash",
       decision: "deny",
@@ -95,7 +92,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_finished trace with durationMs", async () => {
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-4",
       toolName: "file_read",
       decision: "allow",
@@ -119,7 +115,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_finished trace with error status when isError is true", async () => {
     await bus.emit("tool.execution.finished", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-4b",
       toolName: "bash",
       decision: "allow",
@@ -143,7 +138,6 @@ describe("registerToolTraceListener", () => {
   test("emits tool_failed trace with error status", async () => {
     await bus.emit("tool.execution.failed", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-5",
       toolName: "bash",
       decision: "allow",
@@ -167,7 +161,6 @@ describe("registerToolTraceListener", () => {
   test("emits secret_detected trace with warning status", async () => {
     await bus.emit("tool.secret.detected", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "req-6",
       toolName: "file_read",
       action: "redact",
@@ -185,7 +178,6 @@ describe("registerToolTraceListener", () => {
   test("passes requestId from domain event payload", async () => {
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       requestId: "my-request-id",
       toolName: "file_read",
       input: {},
@@ -198,7 +190,6 @@ describe("registerToolTraceListener", () => {
   test("handles missing requestId gracefully", async () => {
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       input: {},
       startedAtMs: 8000,
@@ -224,7 +215,6 @@ describe("registerToolTraceListener", () => {
 
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       input: {},
       startedAtMs: 10000,
@@ -236,7 +226,6 @@ describe("registerToolTraceListener", () => {
 
     await bus.emit("tool.execution.started", {
       conversationId: "conv-1",
-      sessionId: "sess-1",
       toolName: "file_read",
       input: {},
       startedAtMs: 11000,

package/src/__tests__/trace-emitter.test.ts

@@ -20,7 +20,7 @@ describe("TraceEmitter", () => {
     expect(sent).toHaveLength(1);
     const event = sent[0];
     expect(event.type).toBe("trace_event");
-    expect(event.sessionId).toBe("sess-1");
+    expect(event.conversationId).toBe("sess-1");
     expect(event.kind).toBe("tool_started");
     expect(event.summary).toBe("Running bash");
     expect(typeof event.eventId).toBe("string");

package/src/__tests__/trust-context-guards.test.ts

@@ -25,7 +25,7 @@ describe("trust-context guards", () => {
 
   it("guardianPrincipalId is not typed as string | null in TrustContext", () => {
     const source = readFileSync(
-      join(srcDir, "daemon", "session-runtime-assembly.ts"),
+      join(srcDir, "daemon", "conversation-runtime-assembly.ts"),
       "utf-8",
     );
 

package/src/__tests__/trusted-contact-approval-notifier.test.ts

@@ -151,7 +151,7 @@ mock.module("../prompts/user-reference.js", () => ({
 // Import module under test AFTER mocks are set up
 import type { ChannelId } from "../channels/types.js";
 import { findGuardianForChannel } from "../contacts/contact-store.js";
-import type { TrustContext } from "../daemon/session-runtime-assembly.js";
+import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
 import { resolveGuardianName } from "../prompts/user-reference.js";
 
 // We need to test the private functions by importing the module.

package/src/__tests__/trusted-contact-inline-approval-integration.test.ts

@@ -117,7 +117,7 @@ mock.module("../runtime/channel-verification-service.js", () => ({
     return null;
   },
   createOutboundSession: () => ({
-    sessionId: "test-session",
+    conversationId: "test-session",
     secret: "123456",
   }),
   bindSessionIdentity: () => {},
@@ -177,7 +177,7 @@ mock.module("../config/env.js", () => ({
 import { applyCanonicalGuardianDecision } from "../approvals/guardian-decision-primitive.js";
 import type { ActorContext } from "../approvals/guardian-request-resolvers.js";
 import { getResolver } from "../approvals/guardian-request-resolvers.js";
-import type { TrustContext } from "../daemon/session-runtime-assembly.js";
+import type { TrustContext } from "../daemon/conversation-runtime-assembly.js";
 import {
   createCanonicalGuardianRequest,
   getCanonicalGuardianRequest,
@@ -219,7 +219,6 @@ afterAll(() => {
 function makeToolContext(overrides: Partial<ToolContext> = {}): ToolContext {
   return {
     workingDir: testDir,
-    sessionId: "session-1",
     conversationId: "conv-1",
     assistantId: "self",
     requestId: "req-1",
@@ -421,7 +420,7 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       status: "pending",
-      expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
+      expiresAt: Date.now() + 5 * 60_000,
     });
 
     const trustContext = makeTrustedContactTrustContext();
@@ -460,7 +459,7 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       status: "pending",
-      expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
+      expiresAt: Date.now() + 5 * 60_000,
     });
 
     const trustContext = makeTrustedContactTrustContext();
@@ -559,7 +558,7 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       status: "pending",
-      expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
+      expiresAt: Date.now() + 5 * 60_000,
     });
 
     const trustContext = makeTrustedContactTrustContext();
@@ -670,7 +669,7 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       status: "pending",
-      expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
+      expiresAt: Date.now() + 5 * 60_000,
     });
 
     const trustContext: TrustContext = {
@@ -873,7 +872,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:stale",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     // Set a stale inline_wait_active marker
@@ -924,7 +923,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       inputDigest: "sha256:fresh",
-      expiresAt: new Date(Date.now() + 60_000).toISOString(),
+      expiresAt: Date.now() + 60_000,
     });
 
     updateCanonicalGuardianRequest(req.id, {
@@ -1080,7 +1079,7 @@ describe("cross-milestone integration checks", () => {
       guardianPrincipalId: "test-principal-id",
       toolName: "bash",
       status: "pending",
-      expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
+      expiresAt: Date.now() + 5 * 60_000,
     });
 
     const trustContext = makeTrustedContactTrustContext();