@vellumai/assistant 0.8.7-dev.202606052232.2ddc989 → 0.8.8

package/src/__tests__/injector-chain.test.ts

@@ -41,28 +41,20 @@ mock.module("../config/loader.js", () => ({
 const { applyRuntimeInjections, composeInjectorChain } =
   await import("../daemon/conversation-runtime-assembly.js");
 const { DEFAULT_INJECTOR_ORDER, defaultInjectors } =
-  await import("../plugins/defaults/memory-retrieval/injectors.js");
+  await import("../plugins/defaults/injectors/register.js");
 const { getInjectorChain } =
   await import("../plugins/defaults/memory-retrieval/injector-chain.js");
-import {
-  clearConversations,
-  setConversation,
-} from "../daemon/conversation-registry.js";
 import { buildPkbReminder } from "../daemon/pkb-reminder-builder.js";
 import { getPkbRoot } from "../memory/pkb/types.js";
 import type { TurnContext } from "../plugins/types.js";
 import type { Message } from "../providers/types.js";
 import { getWorkspacePromptPath } from "../util/platform.js";
 
-// `makeTurnContext` and the workspace registry seed share this id so the
-// `workspace-context` injector resolves the seeded block for the turn.
-const TEST_CONVERSATION_ID = "conv-test-1";
-
 /** A fake TurnContext sufficient for driving `composeInjectorChain`. */
 function makeTurnContext(): TurnContext {
   return {
     requestId: "req-test-1",
-    conversationId: TEST_CONVERSATION_ID,
+    conversationId: "conv-test-1",
     turnIndex: 0,
     trust: {
       sourceChannel: "vellum",
@@ -102,25 +94,10 @@ function clearNowScratchpad(): void {
   rmSync(getWorkspacePromptPath("NOW.md"), { force: true });
 }
 
-// The workspace-context injector sources its block off the live `Conversation`
-// looked up by `conversationId`. Seed a fake instance carrying a non-dirty
-// workspace cache under the id `makeTurnContext()` uses so the injector emits
-// the block; `clearConversations()` between tests keeps suites that assert the
-// workspace block is absent unaffected.
-function seedWorkspaceContext(text: string): void {
-  setConversation(TEST_CONVERSATION_ID, {
-    conversationId: TEST_CONVERSATION_ID,
-    workingDir: "/sandbox",
-    workspaceTopLevelContext: text,
-    workspaceTopLevelDirty: false,
-  } as never);
-}
-
 describe("injector chain", () => {
   beforeEach(() => {
     clearPkbContent();
     clearNowScratchpad();
-    clearConversations();
   });
 
   test("defaultInjectors lists the defaults in the documented order", () => {
@@ -276,9 +253,9 @@ describe("injector chain", () => {
     const subagentBlock =
       '<active_subagents>\n- [running] "worker" (sub-1) | elapsed: 5s\n</active_subagents>';
 
-    seedWorkspaceContext(workspaceText);
     const result = await applyRuntimeInjections(runMessages, {
       turnContext: makeTurnContext(),
+      workspaceTopLevelContext: workspaceText,
       unifiedTurnContext: unifiedTurn,
       subagentStatusBlock: subagentBlock,
     });
@@ -350,11 +327,8 @@ describe("injector chain", () => {
       },
     ];
 
-    setConversation(TEST_CONVERSATION_ID, {
-      conversationId: TEST_CONVERSATION_ID,
-      workingDir: "/sandbox",
-      workspaceTopLevelContext: "",
-      workspaceTopLevelDirty: false,
+    const result = await applyRuntimeInjections(originalRun, {
+      turnContext: makeTurnContext(),
       channelCapabilities: {
         channel: "slack",
         dashboardCapable: false,
@@ -362,9 +336,6 @@ describe("injector chain", () => {
         supportsVoiceInput: false,
         chatType: "channel",
       },
-    } as never);
-    const result = await applyRuntimeInjections(originalRun, {
-      turnContext: makeTurnContext(),
       slackChronologicalMessages: slackTranscript,
     });
 
@@ -402,6 +373,7 @@ describe("injector chain", () => {
       {
         turnContext: makeTurnContext(),
         mode: "minimal",
+        workspaceTopLevelContext: "<workspace>...</workspace>",
         unifiedTurnContext: "<turn_context>...</turn_context>",
         subagentStatusBlock: "<active_subagents>...</active_subagents>",
       },

package/src/__tests__/injector-disk-pressure.test.ts

@@ -1,10 +1,5 @@
-import { beforeEach, describe, expect, test } from "bun:test";
+import { describe, expect, test } from "bun:test";
 
-import {
-  clearConversations,
-  setConversation,
-} from "../daemon/conversation-registry.js";
-import type { ChannelCapabilities } from "../daemon/conversation-runtime-assembly.js";
 import {
   applyRuntimeInjections,
   stripInjectionsForCompaction,
@@ -13,14 +8,10 @@ import {
   DEFAULT_INJECTOR_ORDER,
   defaultInjectors,
   DISK_PRESSURE_WARNING_PROMPT,
-} from "../plugins/defaults/memory-retrieval/injectors.js";
+} from "../plugins/defaults/injectors/register.js";
 import type { Injector, TurnContext } from "../plugins/types.js";
 import type { Message } from "../providers/types.js";
 
-// `makeContext` and the workspace registry seed share this id so the
-// `workspace-context` injector resolves the seeded block for the turn.
-const TEST_CONVERSATION_ID = "conv-test";
-
 function findInjector(name: string): Injector {
   const injector = defaultInjectors.find(
     (candidate) => candidate.name === name,
@@ -34,7 +25,7 @@ function findInjector(name: string): Injector {
 function makeContext(overrides: Partial<TurnContext> = {}): TurnContext {
   return {
     requestId: "req-test",
-    conversationId: TEST_CONVERSATION_ID,
+    conversationId: "conv-test",
     turnIndex: 0,
     trust: { sourceChannel: "vellum", trustClass: "guardian" },
     ...overrides,
@@ -52,58 +43,15 @@ function tailTexts(messages: Message[]): string[] {
 }
 
 const diskPressureInjector = findInjector("disk-pressure-warning");
-
-// The disk-pressure-warning and workspace-context injectors both read their
-// per-conversation state off the live `Conversation` looked up by
-// `conversationId`. Seed a single fake instance under the id `makeContext()`
-// uses, carrying the disk-pressure flag and the workspace top-level cache, so a
-// turn can exercise both; the seed helpers mutate and re-register the same
-// instance. An empty (non-dirty) workspace cache resolves to no block, so
-// disk-pressure-only tests don't trigger a directory scan.
-let liveConversation: {
-  conversationId: string;
-  workingDir: string;
-  workspaceTopLevelContext: string | null;
-  workspaceTopLevelDirty: boolean;
-  diskPressureCleanupModeActive: boolean;
-  channelCapabilities?: ChannelCapabilities;
-};
-
-function resetLiveConversation(): void {
-  liveConversation = {
-    conversationId: TEST_CONVERSATION_ID,
-    workingDir: "/workspace",
-    workspaceTopLevelContext: "",
-    workspaceTopLevelDirty: false,
-    diskPressureCleanupModeActive: false,
-  };
-}
-
-function seedChannelCapabilities(caps: ChannelCapabilities): void {
-  liveConversation.channelCapabilities = caps;
-  setConversation(TEST_CONVERSATION_ID, liveConversation as never);
-}
-
-function seedDiskPressure(cleanupModeActive: boolean): void {
-  liveConversation.diskPressureCleanupModeActive = cleanupModeActive;
-  setConversation(TEST_CONVERSATION_ID, liveConversation as never);
-}
-
-function seedWorkspaceContext(text: string): void {
-  liveConversation.workspaceTopLevelContext = text;
-  liveConversation.workspaceTopLevelDirty = false;
-  setConversation(TEST_CONVERSATION_ID, liveConversation as never);
-}
+const cleanupContext = { cleanupModeActive: true };
 
 describe("disk-pressure-warning injector", () => {
-  beforeEach(() => {
-    clearConversations();
-    resetLiveConversation();
-  });
-
   test("emits the exact cleanup prompt during disk pressure cleanup mode", async () => {
-    seedDiskPressure(true);
-    const block = await diskPressureInjector.produce(makeContext());
+    const block = await diskPressureInjector.produce(
+      makeContext({
+        injectionInputs: { diskPressureContext: cleanupContext },
+      }),
+    );
 
     expect(block).toEqual({
       id: "disk-pressure-warning",
@@ -124,14 +72,21 @@ Do not work on unrelated tasks until enough space is freed to clear the lock or
 </disk_pressure_warning>`);
   });
 
-  test("omits the prompt when no cleanup context is registered or it is inactive", async () => {
+  test("omits the prompt when cleanup context is null or inactive", async () => {
     await expect(
-      diskPressureInjector.produce(makeContext()),
+      diskPressureInjector.produce(
+        makeContext({ injectionInputs: { diskPressureContext: null } }),
+      ),
     ).resolves.toBeNull();
 
-    seedDiskPressure(false);
     await expect(
-      diskPressureInjector.produce(makeContext()),
+      diskPressureInjector.produce(
+        makeContext({
+          injectionInputs: {
+            diskPressureContext: { cleanupModeActive: false },
+          },
+        }),
+      ),
     ).resolves.toBeNull();
   });
 
@@ -142,10 +97,10 @@ Do not work on unrelated tasks until enough space is freed to clear the lock or
     const workspace = "<workspace>\nRoot: /workspace\n</workspace>";
     const turnContext = "<turn_context>\ninterface: macos\n</turn_context>";
 
-    seedWorkspaceContext(workspace);
-    seedDiskPressure(true);
     const result = await applyRuntimeInjections(runMessages, {
       turnContext: makeContext(),
+      diskPressureContext: cleanupContext,
+      workspaceTopLevelContext: workspace,
       unifiedTurnContext: turnContext,
     });
 
@@ -163,12 +118,13 @@ Do not work on unrelated tasks until enough space is freed to clear the lock or
   });
 
   test("survives minimal mode as safety-critical context", async () => {
-    seedDiskPressure(true);
     const result = await applyRuntimeInjections(
       [{ role: "user", content: [{ type: "text", text: "status" }] }],
       {
         turnContext: makeContext(),
         mode: "minimal",
+        diskPressureContext: cleanupContext,
+        workspaceTopLevelContext: "<workspace>...</workspace>",
         unifiedTurnContext: "<turn_context>...</turn_context>",
       },
     );
@@ -198,16 +154,16 @@ Do not work on unrelated tasks until enough space is freed to clear the lock or
       },
     ];
 
-    seedDiskPressure(true);
-    seedChannelCapabilities({
-      channel: "slack",
-      dashboardCapable: false,
-      supportsDynamicUi: false,
-      supportsVoiceInput: false,
-      chatType: "channel",
-    });
     const result = await applyRuntimeInjections(originalRun, {
       turnContext: makeContext(),
+      diskPressureContext: cleanupContext,
+      channelCapabilities: {
+        channel: "slack",
+        dashboardCapable: false,
+        supportsDynamicUi: false,
+        supportsVoiceInput: false,
+        chatType: "channel",
+      },
       slackChronologicalMessages: slackTranscript,
     });
 
@@ -225,15 +181,16 @@ Do not work on unrelated tasks until enough space is freed to clear the lock or
       { role: "user", content: [{ type: "text", text: "find large files" }] },
     ];
 
-    seedDiskPressure(true);
     const first = await applyRuntimeInjections(runMessages, {
       turnContext: makeContext(),
+      diskPressureContext: cleanupContext,
     });
     const stripped = stripInjectionsForCompaction(first.messages);
     expect(tailTexts(stripped)).toEqual(["find large files"]);
 
     const second = await applyRuntimeInjections(stripped, {
       turnContext: makeContext(),
+      diskPressureContext: cleanupContext,
     });
     expect(
       tailTexts(second.messages).filter(

package/src/__tests__/injector-document-comments.test.ts

@@ -9,7 +9,7 @@ mock.module("../documents/document-comments-store.js", () => ({
 }));
 
 const { DEFAULT_INJECTOR_ORDER, defaultInjectors } =
-  await import("../plugins/defaults/memory-retrieval/injectors.js");
+  await import("../plugins/defaults/injectors/register.js");
 import type { Injector, TurnContext } from "../plugins/types.js";
 
 function findInjector(name: string): Injector {

package/src/__tests__/list-messages-hidden-metadata.test.ts

@@ -96,44 +96,6 @@ describe("handleListMessages metadata.hidden filtering", () => {
     expect(llmRows[1].metadata).toContain('"hidden":true');
   });
 
-  test("UI serializer omits system rows but LLM-side getMessages includes them", async () => {
-    // GIVEN a conversation with a system row sandwiched between two
-    // renderable turns (e.g. a skill-authored context message)
-    const conv = createConversation();
-    await addMessage(
-      conv.id,
-      "user",
-      JSON.stringify([{ type: "text", text: "first visible" }]),
-    );
-    await addMessage(
-      conv.id,
-      "system",
-      JSON.stringify([{ type: "text", text: "system scaffolding" }]),
-    );
-    await addMessage(
-      conv.id,
-      "assistant",
-      JSON.stringify([{ type: "text", text: "second visible" }]),
-    );
-
-    // WHEN the UI history list is serialized
-    const response = handleListMessages({
-      queryParams: { conversationId: conv.id },
-    });
-    const body = response as { messages: MessagePayload[] };
-
-    // THEN only the user/assistant turns are returned, never the system row
-    expect(body.messages.map((m) => m.role)).toEqual(["user", "assistant"]);
-    expect(
-      body.messages.some((m) => plainText(m).includes("system scaffolding")),
-    ).toBe(false);
-
-    // AND the LLM-side loader still includes the system row for agent context
-    const llmRows = getMessages(conv.id);
-    expect(llmRows).toHaveLength(3);
-    expect(llmRows[1].role).toBe("system");
-  });
-
   test("messages without metadata or with hidden=false are returned", async () => {
     const conv = createConversation();
     await addMessage(

package/src/__tests__/memory-v2-static-injector.test.ts

@@ -35,7 +35,7 @@ mock.module("../config/loader.js", () => ({
 }));
 
 const { defaultInjectors } =
-  await import("../plugins/defaults/memory-retrieval/injectors.js");
+  await import("../plugins/defaults/injectors/register.js");
 import type { Injector, TurnContext } from "../plugins/types.js";
 import type { Message } from "../providers/types.js";
 import { getWorkspacePromptPath } from "../util/platform.js";