@vellumai/assistant 0.4.55 → 0.4.57

package/src/__tests__/tool-execution-abort-cleanup.test.ts

@@ -32,8 +32,7 @@ mock.module("../config/loader.js", () => ({
       shellMaxTimeoutSec: 600,
       permissionTimeoutSec: 300,
     },
-    sandbox: { enabled: false, backend: "native" as const },
-    rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+    rateLimit: { maxRequestsPerMinute: 0 },
     secretDetection: {
       enabled: false,
       action: "warn" as const,
@@ -79,6 +78,9 @@ mock.module("../tools/network/script-proxy/index.js", () => ({
 mock.module("../util/platform.js", () => ({
   getRootDir: () => "/tmp",
   getDataDir: () => "/tmp",
+  getWorkspaceDir: () => "/tmp/workspace",
+  getDbPath: () => "/tmp/assistant.db",
+  ensureDataDir: () => {},
 }));
 
 mock.module("../tools/credentials/resolve.js", () => ({
@@ -107,7 +109,6 @@ function makeTempDir(): string {
 function makeToolContext(workingDir: string, signal?: AbortSignal) {
   return {
     workingDir,
-    sessionId: "test-session",
     conversationId: "test-conv",
     trustClass: "guardian" as const,
     signal,
@@ -444,7 +445,7 @@ describe("WorkspaceGitService — abort signal propagation", () => {
     expect(service.isInitialized()).toBe(true);
   });
 
-  test("commitChanges: interleaved with abort-signalled writeNote does not corrupt repo", async () => {
+  test("commitChanges: after abort-signalled writeNote does not corrupt repo", async () => {
     const { WorkspaceGitService, _resetGitServiceRegistry } =
       await import("../workspace/git-service.js");
 
@@ -459,27 +460,78 @@ describe("WorkspaceGitService — abort signal propagation", () => {
 
     const headHash = await service.getHeadHash();
 
-    // Fire a pre-aborted writeNote alongside another commitChanges.
+    // Fire a pre-aborted writeNote — it should fail without corrupting the repo.
     const ac = new AbortController();
     ac.abort();
 
-    const [commitResult] = await Promise.allSettled([
-      service.commitChanges("second commit").then(() => "committed"),
-      service
-        .writeNote(headHash, "note", ac.signal)
-        .catch(() => "note-aborted"),
-    ]);
-
-    // The commit itself should succeed — the aborted note does not block it.
-    expect(commitResult.status).toBe("fulfilled");
-    if (commitResult.status === "fulfilled") {
-      expect(commitResult.value).toBe("committed");
+    let noteAborted = false;
+    try {
+      await service.writeNote(headHash, "note", ac.signal);
+    } catch {
+      noteAborted = true;
     }
+    expect(noteAborted).toBe(true);
+
+    // A subsequent commit should succeed — the aborted note did not corrupt state.
+    await service.commitChanges("second commit");
 
     // Repo must still be in a clean, functional state.
     const status = await service.getStatus();
     expect(status.clean).toBe(true);
   });
+
+  test("concurrent git operations are serialized by the mutex", async () => {
+    const { WorkspaceGitService, _resetGitServiceRegistry } =
+      await import("../workspace/git-service.js");
+
+    _resetGitServiceRegistry();
+    const service = new WorkspaceGitService(testDir);
+    await service.ensureInitialized();
+
+    // Track the order of execution to prove serialization.
+    const executionLog: string[] = [];
+
+    // Create a deferred promise so we can explicitly control when the first
+    // mutex holder releases. This guarantees the second operation is queued
+    // behind the first — no timing dependency.
+    let releaseFirst!: () => void;
+    const firstBlocks = new Promise<void>((r) => {
+      releaseFirst = r;
+    });
+
+    // Operation A: acquire the mutex, signal it's holding, then wait for
+    // our explicit release before finishing.
+    let opAQueued!: () => void;
+    const opAIsHolding = new Promise<void>((r) => {
+      opAQueued = r;
+    });
+
+    const opA = service.runWithMutex(async (exec) => {
+      executionLog.push("A:start");
+      opAQueued(); // signal that A holds the lock
+      await firstBlocks; // wait until we explicitly release
+      await exec(["status"]);
+      executionLog.push("A:end");
+    });
+
+    // Wait until A is definitely holding the lock before starting B.
+    await opAIsHolding;
+
+    // Operation B: a normal commitChanges that must wait for A to finish.
+    writeFileSync(join(testDir, "concurrent.txt"), "data");
+    const opB = service.commitChanges("concurrent commit").then(() => {
+      executionLog.push("B:done");
+    });
+
+    // At this point B is queued behind A in the mutex. Release A.
+    releaseFirst();
+
+    // Both operations should complete without errors.
+    await Promise.all([opA, opB]);
+
+    // A must have fully completed before B started — that's the mutex guarantee.
+    expect(executionLog).toEqual(["A:start", "A:end", "B:done"]);
+  });
 });
 
 // ── 4. Shell tool (sandboxed) — abort signal ─────────────────────────────────

package/src/__tests__/tool-execution-pipeline.benchmark.test.ts

@@ -430,7 +430,6 @@ describe("Tool execution pipeline benchmark", () => {
     let executor: ToolExecutor;
     const toolContext: ToolContext = {
       workingDir: "/tmp",
-      sessionId: "bench-session",
       conversationId: "bench-conv",
       trustClass: "guardian",
     };

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

@@ -26,7 +26,7 @@ const mockConfig = {
       network: "none" as const,
     },
   },
-  rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+  rateLimit: { maxRequestsPerMinute: 0 },
   secretDetection: {
     enabled: false,
     action: "warn" as const,
@@ -158,7 +158,6 @@ import { ToolError } from "../util/errors.js";
 function makeContext(events: ToolLifecycleEvent[]) {
   return {
     workingDir: "/tmp/project",
-    sessionId: "session-1",
     conversationId: "conversation-1",
     trustClass: "guardian" as const,
     onToolLifecycleEvent: (event: ToolLifecycleEvent) => {
@@ -213,7 +212,6 @@ describe("ToolExecutor lifecycle events", () => {
       toolName: "file_read",
       executionTarget: "sandbox",
       conversationId: "conversation-1",
-      sessionId: "session-1",
       workingDir: "/tmp/project",
     });
     const executed = events[1];
@@ -523,7 +521,6 @@ describe("ToolExecutor lifecycle events", () => {
       {},
       {
         workingDir: "/tmp/project",
-        sessionId: "session-1",
         conversationId: "conversation-1",
         trustClass: "guardian",
         onToolLifecycleEvent: () => new Promise<void>(() => {}),
@@ -571,7 +568,7 @@ describe("ToolExecutor lifecycle events", () => {
       throw new Error("Expected permission_prompt event");
     expect(promptEvent.toolName).toBe("file_edit");
     expect(promptEvent.reason).toBe(
-      "Private thread: side-effect tools require explicit approval",
+      "Private conversation: side-effect tools require explicit approval",
     );
   });
 
@@ -600,7 +597,7 @@ describe("ToolExecutor lifecycle events", () => {
       throw new Error("Expected permission_prompt event");
     expect(promptEvent.toolName).toBe("bash");
     expect(promptEvent.reason).toBe(
-      "Private thread: side-effect tools require explicit approval",
+      "Private conversation: side-effect tools require explicit approval",
     );
     expect(promptEvent.sandboxed).toBe(true);
   });
@@ -660,7 +657,7 @@ describe("ToolExecutor lifecycle events", () => {
       throw new Error("Expected permission_prompt event");
     expect(promptEvent.toolName).toBe("file_edit");
     expect(promptEvent.reason).toBe(
-      "Private thread: side-effect tools require explicit approval",
+      "Private conversation: side-effect tools require explicit approval",
     );
   });
 });

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

@@ -35,7 +35,7 @@ const mockConfig = {
       network: "none" as const,
     },
   },
-  rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+  rateLimit: { maxRequestsPerMinute: 0 },
   secretDetection: {
     enabled: false,
     action: "warn" as const,
@@ -145,7 +145,6 @@ import { parse } from "../tools/terminal/parser.js";
 function makeContext(overrides?: Partial<ToolContext>): ToolContext {
   return {
     workingDir: "/tmp/project",
-    sessionId: "session-integration",
     conversationId: "conversation-integration",
     trustClass: "guardian",
     ...overrides,

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

@@ -44,7 +44,7 @@ const mockConfig = {
       network: "none" as const,
     },
   },
-  rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+  rateLimit: { maxRequestsPerMinute: 0 },
   secretDetection: {
     enabled: false,
     action: "warn" as const,
@@ -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",