@vellumai/assistant 0.8.6 → 0.8.7-dev.202606052118.34cd356

package/src/__tests__/conversation-workspace-cache-state.test.ts

@@ -3,6 +3,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
+import { CompactionCircuit } from "../agent/compaction-circuit.js";
 import type { AgentEvent } from "../agent/loop.js";
 import { getConversationDirName } from "../memory/conversation-disk-view.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
@@ -164,6 +165,7 @@ mock.module("../memory/app-store.js", () => ({
 
 mock.module("../agent/loop.js", () => ({
   AgentLoop: class {
+    compactionCircuit = new CompactionCircuit("test-conv");
     constructor() {}
     getToolTokenBudget() {
       return 0;
@@ -196,6 +198,7 @@ mock.module("../agent/loop.js", () => ({
 }));
 
 import { Conversation } from "../daemon/conversation.js";
+import { refreshWorkspaceTopLevelContextIfNeeded } from "../daemon/conversation-workspace.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -217,9 +220,9 @@ function makeConversation(workingDir = "/tmp"): Conversation {
     "conv-1",
     provider,
     "system prompt",
-    4096,
     () => {},
     workingDir,
+    { maxTokens: 4096 },
   );
 }
 
@@ -247,7 +250,7 @@ describe("Conversation workspace cache state", () => {
   });
 
   test("refreshWorkspaceTopLevelContextIfNeeded populates context and clears dirty", () => {
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
     expect(conversation.getWorkspaceTopLevelContext()).not.toBeNull();
@@ -263,10 +266,10 @@ describe("Conversation workspace cache state", () => {
   });
 
   test("refreshWorkspaceTopLevelContextIfNeeded no-ops when not dirty and cache exists", () => {
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     const first = conversation.getWorkspaceTopLevelContext();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     const second = conversation.getWorkspaceTopLevelContext();
 
     // Same reference — no recomputation
@@ -274,7 +277,7 @@ describe("Conversation workspace cache state", () => {
   });
 
   test("markWorkspaceTopLevelDirty sets dirty flag", () => {
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     conversation.markWorkspaceTopLevelDirty();
@@ -282,10 +285,10 @@ describe("Conversation workspace cache state", () => {
   });
 
   test("refresh after marking dirty produces fresh context", () => {
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     conversation.markWorkspaceTopLevelDirty();
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     expect(conversation.getWorkspaceTopLevelContext()).not.toBeNull();
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
@@ -297,7 +300,7 @@ describe("Conversation workspace cache state", () => {
   test("renders client-reported host env when set on the conversation", () => {
     conversation.hostHomeDir = "/Users/alice";
     conversation.hostUsername = "alice";
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     const block = conversation.getWorkspaceTopLevelContext();
     expect(block).not.toBeNull();
@@ -307,7 +310,7 @@ describe("Conversation workspace cache state", () => {
 
   test("falls back to daemon os info when client host env is absent", async () => {
     const { homedir, userInfo } = await import("node:os");
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     const block = conversation.getWorkspaceTopLevelContext();
     expect(block).not.toBeNull();
@@ -318,7 +321,7 @@ describe("Conversation workspace cache state", () => {
   test("re-renders with updated host env after marking dirty", () => {
     conversation.hostHomeDir = "/Users/alice";
     conversation.hostUsername = "alice";
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
       "Host home directory: /Users/alice",
     );
@@ -326,7 +329,7 @@ describe("Conversation workspace cache state", () => {
     conversation.hostHomeDir = "/Users/bob";
     conversation.hostUsername = "bob";
     conversation.markWorkspaceTopLevelDirty();
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     const block = conversation.getWorkspaceTopLevelContext();
     expect(block).not.toBeNull();
@@ -342,7 +345,7 @@ describe("Conversation workspace cache state", () => {
     // Simulate a macOS turn populating host env.
     conversation.hostHomeDir = "/Users/alice";
     conversation.hostUsername = "alice";
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
       "Host home directory: /Users/alice",
     );
@@ -353,7 +356,7 @@ describe("Conversation workspace cache state", () => {
     conversation.hostHomeDir = undefined;
     conversation.hostUsername = undefined;
     conversation.markWorkspaceTopLevelDirty();
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
 
     const block = conversation.getWorkspaceTopLevelContext();
     expect(block).not.toBeNull();
@@ -379,7 +382,7 @@ describe("Conversation workspace cache state", () => {
     expect(conversation.hostUsername).toBe("alice");
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     const block = conversation.getWorkspaceTopLevelContext();
     expect(block!).toContain("Host home directory: /Users/alice");
     expect(block!).toContain("Host username: alice");
@@ -453,7 +456,7 @@ describe("Conversation workspace cache state", () => {
       hostUsername: "alice",
     });
     // Render once so the dirty flag clears.
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     // Re-apply the same values — dirty flag should remain false so we don't
@@ -474,7 +477,7 @@ describe("Conversation workspace cache state", () => {
       hostHomeDir: "/Users/alice",
       hostUsername: "alice",
     });
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     // New values — should mark dirty so the next render picks them up.
@@ -498,7 +501,7 @@ describe("Conversation workspace cache state", () => {
 
     try {
       const tempConversation = makeConversation(workspaceRoot);
-      tempConversation.refreshWorkspaceTopLevelContextIfNeeded();
+      refreshWorkspaceTopLevelContextIfNeeded(tempConversation);
 
       expect(tempConversation.getWorkspaceTopLevelContext()!).toContain(
         `Current conversation attachments: conversations/${legacyDirName}/attachments/`,

package/src/__tests__/conversation-workspace-injection.test.ts

@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { AgentEvent } from "../agent/loop.js";
+import { CompactionCircuit } from "../agent/compaction-circuit.js";
+import type { AgentEvent, AgentLoopRunResult } from "../agent/loop.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
 
 // ---------------------------------------------------------------------------
@@ -232,6 +233,7 @@ mock.module("../workspace/turn-commit.js", () => ({
 
 mock.module("../agent/loop.js", () => ({
   AgentLoop: class {
+    compactionCircuit = new CompactionCircuit("test-conv");
     constructor() {}
     getToolTokenBudget() {
       return 0;
@@ -245,7 +247,7 @@ mock.module("../agent/loop.js", () => ({
     async run(
       messages: Message[],
       onEvent: (event: AgentEvent) => void,
-    ): Promise<Message[]> {
+    ): Promise<AgentLoopRunResult> {
       // Prime the assistant row anchor — production code emits this from
       // `AgentLoop.run` just before `provider.sendMessage`.
       await onEvent({ type: "llm_call_started" });
@@ -263,7 +265,12 @@ mock.module("../agent/loop.js", () => ({
         content: [{ type: "text", text: "ok" }],
       };
       onEvent({ type: "message_complete", message: assistantMessage });
-      return [...messages, assistantMessage];
+      return {
+        history: [...messages, assistantMessage],
+        exitReason: null,
+        appendedNewMessages: true,
+        newMessages: [assistantMessage],
+      };
     }
   },
 }));
@@ -288,6 +295,15 @@ mock.module("../memory/canonical-guardian-store.js", () => ({
 }));
 
 import { Conversation } from "../daemon/conversation.js";
+import {
+  clearConversations,
+  findConversation,
+  removeSubagentConversation,
+  setConversation,
+  setSubagentConversation,
+} from "../daemon/conversation-registry.js";
+import { resolveWorkspaceTopLevelContext } from "../daemon/conversation-workspace.js";
+import { resetPluginRegistryAndRegisterDefaults } from "../plugins/defaults/index.js";
 
 function makeConversation(): Conversation {
   const provider = {
@@ -301,14 +317,18 @@ function makeConversation(): Conversation {
       };
     },
   };
-  return new Conversation(
+  const conversation = new Conversation(
     "conv-1",
     provider,
     "system prompt",
-    4096,
     () => {},
     "/tmp",
+    { maxTokens: 4096 },
   );
+  // Mirror production: top-level conversations are registered in the store, so
+  // the workspace injector can resolve them by id via the conversation registry.
+  setConversation(conversation.conversationId, conversation);
+  return conversation;
 }
 
 function messageText(message: Message): string {
@@ -327,13 +347,15 @@ describe("Conversation workspace injection", () => {
     runCalls = [];
     agentLoopScript = () => {};
     scanCallCount = 0;
+    clearConversations();
+    resetPluginRegistryAndRegisterDefaults();
   });
 
   test("runtime messages include workspace top-level context", async () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
 
     expect(runCalls).toHaveLength(1);
     const runtimeUser = runCalls[0][runCalls[0].length - 1];
@@ -347,7 +369,7 @@ describe("Conversation workspace injection", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
 
     expect(runCalls).toHaveLength(1);
     const runtimeUser = runCalls[0][runCalls[0].length - 1];
@@ -361,7 +383,7 @@ describe("Conversation workspace injection", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
 
     expect(runCalls).toHaveLength(1);
     const runtimeUser = runCalls[0][runCalls[0].length - 1];
@@ -375,7 +397,7 @@ describe("Conversation workspace injection", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
 
     // Workspace blocks use <workspace> tag which is intentionally NOT stripped.
     const persistedMessages = conversation.getMessages();
@@ -390,14 +412,17 @@ describe("Conversation workspace injection", () => {
     await conversation.loadFromDb();
 
     // First message — workspace is injected
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
     expect(runCalls).toHaveLength(1);
     const firstCallUser = runCalls[0][runCalls[0].length - 1];
     const firstText = messageText(firstCallUser);
     expect(firstText).toContain("<workspace>");
 
     // Second message — workspace is NOT injected (not first message, no compaction)
-    await conversation.processMessage("Follow up", [], () => {});
+    await conversation.processMessage({
+      content: "Follow up",
+      attachments: [],
+    });
     expect(runCalls).toHaveLength(2);
     const secondCallUser = runCalls[1][runCalls[1].length - 1];
     const secondText = messageText(secondCallUser);
@@ -405,18 +430,66 @@ describe("Conversation workspace injection", () => {
   });
 });
 
+describe("Conversation workspace injection — subagents", () => {
+  beforeEach(() => {
+    scanCallCount = 0;
+    clearConversations();
+    resetPluginRegistryAndRegisterDefaults();
+  });
+
+  test("workspace context resolves for subagent conversations not in the store", () => {
+    const provider = {
+      name: "mock",
+      async sendMessage(): Promise<ProviderResponse> {
+        return {
+          content: [],
+          model: "mock",
+          usage: { inputTokens: 0, outputTokens: 0 },
+          stopReason: "end_turn",
+        };
+      },
+    };
+    const subagentId = "subagent-conv-1";
+    const conversation = new Conversation(
+      subagentId,
+      provider,
+      "system prompt",
+      () => {},
+      "/tmp",
+      { maxTokens: 4096 },
+    );
+    setSubagentConversation(subagentId, conversation);
+
+    try {
+      // Subagents live only in the manager's index, never in the
+      // eviction-managed store, so the store lookup must not see them.
+      expect(findConversation(subagentId)).toBeUndefined();
+
+      // The per-conversation workspace lookup still resolves them, so subagent
+      // turns retain workspace grounding.
+      const context = resolveWorkspaceTopLevelContext(subagentId);
+      expect(context).not.toBeNull();
+      expect(context).toContain("Root: /tmp");
+    } finally {
+      removeSubagentConversation(subagentId, conversation);
+    }
+  });
+});
+
 describe("Conversation workspace dirty-refresh E2E", () => {
   beforeEach(() => {
     runCalls = [];
     agentLoopScript = () => {};
     scanCallCount = 0;
+    clearConversations();
+    resetPluginRegistryAndRegisterDefaults();
   });
 
   test("first turn computes snapshot", async () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
 
     expect(scanCallCount).toBe(1);
     const text = messageText(runCalls[0][runCalls[0].length - 1]);
@@ -427,10 +500,10 @@ describe("Conversation workspace dirty-refresh E2E", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
     const afterFirst = scanCallCount;
 
-    await conversation.processMessage("Again", [], () => {});
+    await conversation.processMessage({ content: "Again", attachments: [] });
 
     // Scanner should NOT have been called again
     expect(scanCallCount).toBe(afterFirst);
@@ -440,7 +513,7 @@ describe("Conversation workspace dirty-refresh E2E", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
     const afterFirst = scanCallCount;
 
     // Simulate a turn where the agent uses file_edit
@@ -453,7 +526,10 @@ describe("Conversation workspace dirty-refresh E2E", () => {
         isError: false,
       });
     };
-    await conversation.processMessage("Edit a file", [], () => {});
+    await conversation.processMessage({
+      content: "Edit a file",
+      attachments: [],
+    });
 
     // No rescan should happen during the mutation turn itself
     const afterMutation = scanCallCount;
@@ -461,7 +537,10 @@ describe("Conversation workspace dirty-refresh E2E", () => {
 
     // Next turn should trigger exactly one fresh scan
     agentLoopScript = () => {};
-    await conversation.processMessage("What happened?", [], () => {});
+    await conversation.processMessage({
+      content: "What happened?",
+      attachments: [],
+    });
 
     expect(scanCallCount).toBe(afterMutation + 1);
   });
@@ -470,7 +549,7 @@ describe("Conversation workspace dirty-refresh E2E", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
     const afterFirst = scanCallCount;
 
     agentLoopScript = (onEvent) => {
@@ -482,7 +561,10 @@ describe("Conversation workspace dirty-refresh E2E", () => {
         isError: false,
       });
     };
-    await conversation.processMessage("Run a command", [], () => {});
+    await conversation.processMessage({
+      content: "Run a command",
+      attachments: [],
+    });
 
     // No rescan should happen during the mutation turn itself
     const afterMutation = scanCallCount;
@@ -490,7 +572,10 @@ describe("Conversation workspace dirty-refresh E2E", () => {
 
     // Next turn should trigger exactly one fresh scan
     agentLoopScript = () => {};
-    await conversation.processMessage("What now?", [], () => {});
+    await conversation.processMessage({
+      content: "What now?",
+      attachments: [],
+    });
 
     expect(scanCallCount).toBe(afterMutation + 1);
   });
@@ -499,7 +584,7 @@ describe("Conversation workspace dirty-refresh E2E", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    await conversation.processMessage("Hello", [], () => {});
+    await conversation.processMessage({ content: "Hello", attachments: [] });
     const afterFirst = scanCallCount;
 
     agentLoopScript = (onEvent) => {
@@ -511,10 +596,16 @@ describe("Conversation workspace dirty-refresh E2E", () => {
         isError: true,
       });
     };
-    await conversation.processMessage("Try editing", [], () => {});
+    await conversation.processMessage({
+      content: "Try editing",
+      attachments: [],
+    });
 
     agentLoopScript = () => {};
-    await conversation.processMessage("What happened?", [], () => {});
+    await conversation.processMessage({
+      content: "What happened?",
+      attachments: [],
+    });
 
     // Scanner should NOT have been re-called since the tool failed
     expect(scanCallCount).toBe(afterFirst);

package/src/__tests__/conversation-workspace-tool-tracking.test.ts

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
+import { CompactionCircuit } from "../agent/compaction-circuit.js";
 import type { AgentEvent } from "../agent/loop.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
 
@@ -216,6 +217,7 @@ mock.module("../workspace/turn-commit.js", () => ({
 
 mock.module("../agent/loop.js", () => ({
   AgentLoop: class {
+    compactionCircuit = new CompactionCircuit("test-conv");
     constructor() {}
     getToolTokenBudget() {
       return 0;
@@ -271,6 +273,7 @@ mock.module("../memory/canonical-guardian-store.js", () => ({
 }));
 
 import { Conversation } from "../daemon/conversation.js";
+import { refreshWorkspaceTopLevelContextIfNeeded } from "../daemon/conversation-workspace.js";
 
 function makeConversation(): Conversation {
   const provider = {
@@ -288,9 +291,9 @@ function makeConversation(): Conversation {
     "conv-1",
     provider,
     "system prompt",
-    4096,
     () => {},
     "/tmp",
+    { maxTokens: 4096 },
   );
 }
 
@@ -308,7 +311,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     await conversation.loadFromDb();
 
     // Prime the cache so dirty=false
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -326,7 +329,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Write a file", [], () => {});
+    await conversation.processMessage({
+      content: "Write a file",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
   });
 
@@ -334,7 +340,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -352,7 +358,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Edit a file", [], () => {});
+    await conversation.processMessage({
+      content: "Edit a file",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
   });
 
@@ -362,7 +371,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -380,7 +389,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Write a file", [], () => {});
+    await conversation.processMessage({
+      content: "Write a file",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
   });
 
@@ -388,7 +400,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -406,7 +418,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Run a command", [], () => {});
+    await conversation.processMessage({
+      content: "Run a command",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
   });
 
@@ -414,7 +429,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -432,7 +447,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Run a command", [], () => {});
+    await conversation.processMessage({
+      content: "Run a command",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(true);
   });
 
@@ -440,7 +458,7 @@ describe("Conversation workspace dirty on file mutations", () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
-    conversation.refreshWorkspaceTopLevelContextIfNeeded();
+    refreshWorkspaceTopLevelContextIfNeeded(conversation);
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
 
     agentLoopScript = (onEvent) => {
@@ -458,7 +476,10 @@ describe("Conversation workspace dirty on file mutations", () => {
       });
     };
 
-    await conversation.processMessage("Read a file", [], () => {});
+    await conversation.processMessage({
+      content: "Read a file",
+      attachments: [],
+    });
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
   });
 });