@vellumai/assistant 0.6.0 → 0.6.2

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

@@ -3,7 +3,6 @@ import { describe, expect, test } from "bun:test";
 import {
   applyRuntimeInjections,
   injectWorkspaceTopLevelContext,
-  stripWorkspaceTopLevelContext,
 } from "../daemon/conversation-runtime-assembly.js";
 import type { Message } from "../providers/types.js";
 
@@ -15,16 +14,12 @@ function userMsg(text: string): Message {
   return { role: "user", content: [{ type: "text", text }] };
 }
 
-function assistantMsg(text: string): Message {
-  return { role: "assistant", content: [{ type: "text", text }] };
-}
-
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
 
 const sampleContext =
-  "<workspace_top_level>\nRoot: /sandbox\nDirectories: src, lib, tests\n</workspace_top_level>";
+  "<workspace>\nRoot: /sandbox\nDirectories: src, lib, tests\n</workspace>";
 
 describe("Workspace top-level context — injection", () => {
   test("prepends workspace block to user message content", () => {
@@ -62,93 +57,6 @@ describe("Workspace top-level context — injection", () => {
   });
 });
 
-describe("Workspace top-level context — stripping", () => {
-  test("strips injected workspace block from user messages", () => {
-    const messages: Message[] = [
-      {
-        role: "user",
-        content: [
-          { type: "text", text: sampleContext },
-          { type: "text", text: "Hello" },
-        ],
-      },
-      assistantMsg("Hi there"),
-    ];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-
-    expect(stripped).toHaveLength(2);
-    expect(stripped[0].content).toHaveLength(1);
-    expect((stripped[0].content[0] as { text: string }).text).toBe("Hello");
-  });
-
-  test("does not strip non-workspace text blocks", () => {
-    const messages: Message[] = [
-      userMsg("Regular message"),
-      assistantMsg("Response"),
-    ];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-    expect(stripped).toEqual(messages);
-  });
-
-  test("removes user message entirely when only workspace block remains", () => {
-    const messages: Message[] = [
-      { role: "user", content: [{ type: "text", text: sampleContext }] },
-      assistantMsg("Response"),
-    ];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-    expect(stripped).toHaveLength(1);
-    expect(stripped[0].role).toBe("assistant");
-  });
-
-  test("does not strip from assistant messages", () => {
-    const messages: Message[] = [assistantMsg(sampleContext)];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-    expect(stripped).toHaveLength(1);
-    expect((stripped[0].content[0] as { text: string }).text).toBe(
-      sampleContext,
-    );
-  });
-
-  test("preserves tool_result blocks during stripping", () => {
-    const messages: Message[] = [
-      {
-        role: "user",
-        content: [
-          { type: "text", text: sampleContext },
-          {
-            type: "tool_result",
-            tool_use_id: "tu_1",
-            content: "result",
-            is_error: false,
-          },
-        ],
-      },
-    ];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-    expect(stripped).toHaveLength(1);
-    expect(stripped[0].content).toHaveLength(1);
-    expect(stripped[0].content[0].type).toBe("tool_result");
-  });
-
-  test("no empty-message artifacts after stripping", () => {
-    const messages: Message[] = [
-      userMsg("Before"),
-      { role: "user", content: [{ type: "text", text: sampleContext }] },
-      assistantMsg("After"),
-    ];
-
-    const stripped = stripWorkspaceTopLevelContext(messages);
-    expect(stripped).toHaveLength(2);
-    expect(stripped[0].role).toBe("user");
-    expect(stripped[1].role).toBe("assistant");
-  });
-});
-
 describe("applyRuntimeInjections — workspace top-level context", () => {
   test("injects workspace context when provided", () => {
     const messages: Message[] = [userMsg("Hello")];

package/src/__tests__/conversation-tool-setup-app-refresh.test.ts

@@ -2,10 +2,12 @@
  * Regression tests for app surface refresh and eventing side effects in
  * createToolExecutor (conversation-tool-setup.ts).
  *
- * The app_refresh hook is the sole hook for app change refresh. These tests
- * verify that app_refresh, app_create, and app_delete hooks fire correctly,
- * and that removed hooks (app_update, app_file_edit, app_file_write) no
- * longer trigger side effects.
+ * Tests verify that app_refresh, app_create, and app_delete hooks fire
+ * correctly, and that removed hooks (app_update, app_file_edit,
+ * app_file_write) no longer trigger side effects.
+ *
+ * File-change detection for file_write/file_edit is handled by
+ * AppSourceWatcher (see app-source-watcher.test.ts).
  */
 
 import { beforeEach, describe, expect, mock, test } from "bun:test";
@@ -42,6 +44,16 @@ mock.module("../tools/browser/browser-screencast.js", () => ({
   registerConversationSender: mock(() => {}),
 }));
 
+// Mock app-store functions used by handleAppChange in tool-side-effects
+mock.module("../memory/app-store.js", () => ({
+  getApp: mock(() => null),
+  getAppDirPath: mock(() => "/tmp/test-apps/dummy"),
+  isMultifileApp: mock(() => false),
+  getAppsDir: mock(() => "/tmp/test-apps"),
+  resolveAppIdByDirName: mock(() => null),
+  resolveAppIdFromPath: mock(() => null),
+}));
+
 // ---------------------------------------------------------------------------
 // Import createToolExecutor after mocks are in place
 // ---------------------------------------------------------------------------
@@ -423,4 +435,5 @@ describe("session-tool-setup app refresh side effects", () => {
       expect(updatePublishedSpy).toHaveBeenCalledTimes(1);
     });
   });
+
 });

package/src/__tests__/conversation-wipe.test.ts

@@ -94,7 +94,7 @@ describe("wipeConversation", () => {
 
   test("cancels pending memory jobs", async () => {
     const conv = createConversation("test");
-    const msg = await addMessage(conv.id, "user", "hello", undefined, {
+    await addMessage(conv.id, "user", "hello", undefined, {
       skipIndexing: true,
     });
 
@@ -102,7 +102,7 @@ describe("wipeConversation", () => {
     const db = getDb();
     db.run(`DELETE FROM memory_jobs`);
 
-    enqueueMemoryJob("extract_items", { messageId: msg.id });
+    enqueueMemoryJob("graph_extract", { conversationId: conv.id });
     enqueueMemoryJob("build_conversation_summary", {
       conversationId: conv.id,
     });
@@ -121,8 +121,6 @@ describe("wipeConversation", () => {
       .all() as Array<{ status: string; last_error: string | null }>;
 
     for (const job of jobs) {
-      // Skip embed_item jobs enqueued by wipeConversation's unsupersede logic
-      if (job.status === "pending") continue;
       expect(job.status).toBe("failed");
       expect(job.last_error).toContain("conversation_wiped");
     }
@@ -137,8 +135,6 @@ describe("wipeConversation", () => {
 
     expect(getConversation(conv.id)).toBeNull();
     expect(result.segmentIds).toEqual([]);
-    expect(result.orphanedItemIds).toEqual([]);
-    expect(result.unsupersededItemIds).toEqual([]);
     expect(result.deletedSummaryIds).toEqual([]);
     expect(result.cancelledJobCount).toBe(0);
   });

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

@@ -91,7 +91,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
   updateConversationContextWindow: () => {},
-  deleteMessageById: () => ({ segmentIds: [], orphanedItemIds: [] }),
+  deleteMessageById: () => ({ segmentIds: [], deletedSummaryIds: [] }),
   deleteLastExchange: () => 0,
 }));
 
@@ -227,16 +227,13 @@ describe("Conversation workspace cache state", () => {
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
     expect(conversation.getWorkspaceTopLevelContext()).not.toBeNull();
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
-      "<workspace_top_level>",
+      "<workspace>",
     );
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
-      "</workspace_top_level>",
+      "</workspace>",
     );
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
-      `Current conversation folder: ${conversationPath}`,
-    );
-    expect(conversation.getWorkspaceTopLevelContext()!).toContain(
-      `Attachment files: ${conversationAttachmentsPath}`,
+      `Current conversation attachments: ${conversationAttachmentsPath}`,
     );
   });
 
@@ -267,7 +264,7 @@ describe("Conversation workspace cache state", () => {
 
     expect(conversation.getWorkspaceTopLevelContext()).not.toBeNull();
     expect(conversation.getWorkspaceTopLevelContext()!).toContain(
-      "<workspace_top_level>",
+      "<workspace>",
     );
     expect(conversation.isWorkspaceTopLevelDirty()).toBe(false);
   });
@@ -286,10 +283,7 @@ describe("Conversation workspace cache state", () => {
       tempConversation.refreshWorkspaceTopLevelContextIfNeeded();
 
       expect(tempConversation.getWorkspaceTopLevelContext()!).toContain(
-        `Current conversation folder: conversations/${legacyDirName}/`,
-      );
-      expect(tempConversation.getWorkspaceTopLevelContext()!).toContain(
-        `Attachment files: conversations/${legacyDirName}/attachments/`,
+        `Current conversation attachments: conversations/${legacyDirName}/attachments/`,
       );
     } finally {
       rmSync(workspaceRoot, { recursive: true, force: true });

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

@@ -1,7 +1,6 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 import type { AgentEvent } from "../agent/loop.js";
-import { getConversationDirName } from "../memory/conversation-disk-view.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
 
 // ---------------------------------------------------------------------------
@@ -124,7 +123,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
   updateConversationContextWindow: () => {},
-  deleteMessageById: () => ({ segmentIds: [], orphanedItemIds: [] }),
+  deleteMessageById: () => ({ segmentIds: [], deletedSummaryIds: [] }),
   deleteLastExchange: () => 0,
 }));
 
@@ -274,13 +273,6 @@ function messageText(message: Message): string {
     .join("\n");
 }
 
-const conversationDirName = getConversationDirName(
-  "conv-1",
-  Date.parse("2026-03-19T12:00:00.000Z"),
-);
-const conversationPath = `conversations/${conversationDirName}/`;
-const conversationAttachmentsPath = `${conversationPath}attachments/`;
-
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
@@ -302,8 +294,8 @@ describe("Conversation workspace injection", () => {
     const runtimeUser = runCalls[0][runCalls[0].length - 1];
     expect(runtimeUser.role).toBe("user");
     const text = messageText(runtimeUser);
-    expect(text).toContain("<workspace_top_level>");
-    expect(text).toContain("</workspace_top_level>");
+    expect(text).toContain("<workspace>");
+    expect(text).toContain("</workspace>");
   });
 
   test("workspace context includes root path and directories", async () => {
@@ -316,8 +308,8 @@ describe("Conversation workspace injection", () => {
     const runtimeUser = runCalls[0][runCalls[0].length - 1];
     const text = messageText(runtimeUser);
     expect(text).toContain("Root: /tmp");
-    expect(text).toContain(`Current conversation folder: ${conversationPath}`);
-    expect(text).toContain(`Attachment files: ${conversationAttachmentsPath}`);
+    expect(text).toContain("Directories: src, tests, docs");
+    expect(text).toContain("Files: README.md, package.json");
   });
 
   test("workspace context is prepended before user text", async () => {
@@ -331,33 +323,40 @@ describe("Conversation workspace injection", () => {
     const firstBlock = runtimeUser.content[0];
     expect(firstBlock.type).toBe("text");
     const firstText = (firstBlock as { type: "text"; text: string }).text;
-    expect(firstText).toContain("<workspace_top_level>");
+    expect(firstText).toContain("<workspace>");
   });
 
-  test("workspace context is stripped from persisted history", async () => {
+  test("workspace context persists in history (not stripped between turns)", async () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
     await conversation.processMessage("Hello", [], () => {});
 
+    // Workspace blocks use <workspace> tag which is intentionally NOT stripped.
     const persistedMessages = conversation.getMessages();
-    for (const msg of persistedMessages) {
-      const text = messageText(msg);
-      expect(text).not.toContain("<workspace_top_level>");
-    }
+    const userMsg = persistedMessages.find((m) => m.role === "user");
+    expect(userMsg).toBeDefined();
+    const text = messageText(userMsg!);
+    expect(text).toContain("<workspace>");
   });
 
-  test("no empty user messages after stripping workspace context", async () => {
+  test("second message does NOT include workspace block", async () => {
     const conversation = makeConversation();
     await conversation.loadFromDb();
 
+    // First message — workspace is injected
     await conversation.processMessage("Hello", [], () => {});
-
-    const persistedMessages = conversation.getMessages();
-    const emptyUserMsgs = persistedMessages.filter(
-      (m) => m.role === "user" && m.content.length === 0,
-    );
-    expect(emptyUserMsgs).toHaveLength(0);
+    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", [], () => {});
+    expect(runCalls).toHaveLength(2);
+    const secondCallUser = runCalls[1][runCalls[1].length - 1];
+    const secondText = messageText(secondCallUser);
+    expect(secondText).not.toContain("<workspace>");
   });
 });
 

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

@@ -120,7 +120,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
   updateConversationContextWindow: () => {},
-  deleteMessageById: () => ({ segmentIds: [], orphanedItemIds: [] }),
+  deleteMessageById: () => ({ segmentIds: [], deletedSummaryIds: [] }),
   deleteLastExchange: () => 0,
 }));