@vellumai/assistant 0.8.8 → 0.8.9-staging.2

package/src/__tests__/conversation-clean-command.test.ts

@@ -120,7 +120,7 @@ describe("stripInjectionsForCompaction preserves history shape", () => {
     expect(out[3]).toEqual(messages[3]);
   });
 
-  test("leaves <turn_context>, <workspace>, and <memory __injected> alone", () => {
+  test("strips <workspace> but leaves <turn_context> and <memory __injected> alone", () => {
     const messages: Message[] = [
       {
         role: "user",
@@ -132,6 +132,9 @@ describe("stripInjectionsForCompaction preserves history shape", () => {
       },
     ];
     const out = stripInjectionsForCompaction(messages);
-    expect(out[0].content).toEqual(messages[0].content);
+    expect(out[0].content).toEqual([
+      { type: "text", text: "<turn_context>\nnow\n</turn_context>" },
+      { type: "text", text: "<memory __injected>\nrecent\n</memory>" },
+    ]);
   });
 });

package/src/__tests__/conversation-confirmation-signals.test.ts

@@ -167,6 +167,7 @@ mock.module("../memory/retriever.js", () => ({
 mock.module("../context/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
+    updateConfig() {}
     shouldCompact() {
       return { needed: false, estimatedTokens: 0 };
     }
@@ -199,10 +200,10 @@ mock.module("../agent/loop.js", () => ({
     getActiveModel() {
       return undefined;
     }
-    async run(
-      _messages: Message[],
-      _onEvent: (event: AgentEvent) => void,
-    ): Promise<Message[]> {
+    async run(_options: {
+      messages: Message[];
+      onEvent: (event: AgentEvent) => void;
+    }): Promise<Message[]> {
       return [];
     }
   },

package/src/__tests__/conversation-crud-inference-profile.test.ts

@@ -9,7 +9,7 @@ mock.module("../util/logger.js", () => ({
 import {
   createConversation,
   getConversation,
-  getConversationOverrideProfileFromRow,
+  resolveOverrideProfile,
   setConversationInferenceProfile,
   setConversationInferenceProfileSession,
 } from "../memory/conversation-crud.js";
@@ -55,7 +55,7 @@ describe("setConversationInferenceProfile", () => {
   });
 });
 
-describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
+describe("resolveOverrideProfile — lazy expiry check", () => {
   beforeEach(() => {
     const db = getDb();
     db.run(`DELETE FROM messages`);
@@ -73,7 +73,7 @@ describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
     );
     const row = getConversation(conv.id);
     expect(row).not.toBeNull();
-    expect(getConversationOverrideProfileFromRow(row)).toBeUndefined();
+    expect(resolveOverrideProfile(row)).toBeUndefined();
   });
 
   test("returns the profile when inferenceProfileExpiresAt is in the future", () => {
@@ -86,7 +86,7 @@ describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
     );
     const row = getConversation(conv.id);
     expect(row).not.toBeNull();
-    expect(getConversationOverrideProfileFromRow(row)).toBe("balanced");
+    expect(resolveOverrideProfile(row)).toBe("balanced");
   });
 
   test("returns undefined at the exact-expiry boundary (expiresAt === now)", () => {
@@ -110,7 +110,7 @@ describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
     const realNow = Date.now;
     Date.now = () => now;
     try {
-      expect(getConversationOverrideProfileFromRow(row)).toBeUndefined();
+      expect(resolveOverrideProfile(row)).toBeUndefined();
     } finally {
       Date.now = realNow;
     }
@@ -126,9 +126,7 @@ describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
     );
     const row = getConversation(conv.id);
     expect(row).not.toBeNull();
-    expect(getConversationOverrideProfileFromRow(row)).toBe(
-      "quality-optimized",
-    );
+    expect(resolveOverrideProfile(row)).toBe("quality-optimized");
   });
 
   test.each<"background" | "scheduled">(["background", "scheduled"])(
@@ -148,7 +146,7 @@ describe("getConversationOverrideProfileFromRow — lazy expiry check", () => {
       expect(row).not.toBeNull();
       expect(row?.conversationType).toBe(conversationType);
       expect(row?.inferenceProfile).toBe("quality-optimized");
-      expect(getConversationOverrideProfileFromRow(row)).toBeUndefined();
+      expect(resolveOverrideProfile(row)).toBeUndefined();
     },
   );
 });

package/src/__tests__/conversation-history-web-search.test.ts

@@ -807,7 +807,7 @@ describe("web_search_tool_result structural guard", () => {
     // Media token counting iterates tool_result.contentBlocks for nested
     // image/file blocks. web_search_tool_result has opaque content with no
     // contentBlocks property, so it cannot contain nested media.
-    "daemon/context-overflow-reducer.ts",
+    "plugins/defaults/compaction/context-overflow-reducer.ts",
 
     // Final orphan-pair safety pass in the Slack transcript renderer.
     // Server-side block types (`server_tool_use`, `web_search_tool_result`)

package/src/__tests__/conversation-process-app-control-preactivation.test.ts

@@ -92,7 +92,7 @@ mock.module("../daemon/conversation-messaging.js", () => ({
 // ---------------------------------------------------------------------------
 
 import type { TurnInterfaceContext } from "../channels/types.js";
-import type { ProcessConversationContext } from "../daemon/conversation-process.js";
+import type { Conversation } from "../daemon/conversation.js";
 import { drainQueue } from "../daemon/conversation-process.js";
 import {
   MessageQueue,
@@ -102,7 +102,7 @@ import { TraceEmitter } from "../daemon/trace-emitter.js";
 
 // ---------------------------------------------------------------------------
 // Fake context — captures preactivation calls, satisfies the bare minimum
-// of `ProcessConversationContext`. `runAgentLoop` resolves immediately so
+// of `Conversation`. `runAgentLoop` resolves immediately so
 // the drain-chain does not recurse forever.
 // ---------------------------------------------------------------------------
 
@@ -113,7 +113,7 @@ interface FakeRecord {
 function makeFakeContext(opts: {
   queue: MessageQueue;
   turnInterfaceContext?: TurnInterfaceContext;
-}): ProcessConversationContext & FakeRecord {
+}): Conversation & FakeRecord {
   const calls: string[] = [];
   let preactivatedSkillIds: string[] | undefined = undefined;
   const ctx = {
@@ -177,7 +177,7 @@ function makeFakeContext(opts: {
     setTransportHints() {},
     applyHostEnvFromTransport() {},
     ensureHostProxiesForTurn() {},
-  } as unknown as ProcessConversationContext & FakeRecord;
+  } as unknown as Conversation & FakeRecord;
   return ctx;
 }
 

package/src/__tests__/conversation-process-callsite.test.ts

@@ -208,14 +208,12 @@ mock.module("../memory/retriever.js", () => ({
 mock.module("../agent/loop.js", () => ({
   AgentLoop: class {
     compactionCircuit = new CompactionCircuit("test-conv");
-    constructor(
-      _provider: unknown,
-      _systemPrompt: string,
-      options?: {
-        config?: Record<string, unknown>;
-        resolveSystemPrompt?: (history: Message[]) => Record<string, unknown>;
-      },
-    ) {
+    constructor(options?: {
+      provider?: unknown;
+      systemPrompt?: string;
+      config?: Record<string, unknown>;
+      resolveSystemPrompt?: (history: Message[]) => Record<string, unknown>;
+    }) {
       captured.constructorMaxTokens = options?.config?.maxTokens;
       const resolved = options?.resolveSystemPrompt?.([]);
       captured.resolvedMaxTokens = resolved?.maxTokens;
@@ -229,12 +227,13 @@ mock.module("../agent/loop.js", () => ({
     getResolvedTools() {
       return [];
     }
-    async run(
-      messages: Message[],
-      onEvent: (event: Record<string, unknown>) => void,
-      options?: { callSite?: string },
-    ): Promise<Message[]> {
-      captured.callSite = options?.callSite;
+    async run(options: {
+      messages: Message[];
+      onEvent: (event: Record<string, unknown>) => void;
+      callSite?: string;
+    }): Promise<Message[]> {
+      const { messages, onEvent } = options;
+      captured.callSite = options.callSite;
       onEvent({
         type: "usage",
         inputTokens: 0,
@@ -253,6 +252,7 @@ mock.module("../agent/loop.js", () => ({
 mock.module("../context/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
+    updateConfig() {}
     shouldCompact() {
       return { needed: false, estimatedTokens: 0 };
     }

package/src/__tests__/conversation-provider-retry-repair.test.ts

@@ -100,56 +100,59 @@ mock.module("../context/token-estimator.js", () => ({
 // but these tests exercise the Conversation-level flow, not the reducer internals.
 // The reducer mock delegates to the compactFn to simulate a forced compaction
 // tier, matching the real reducer's behavior for Tier 1.
-mock.module("../daemon/context-overflow-reducer.js", () => ({
-  createInitialReducerState: () => ({
-    appliedTiers: [],
-    injectionMode: "full" as const,
-    exhausted: false,
-  }),
-  reduceContextOverflow: async (
-    msgs: Message[],
-    _cfg: unknown,
-    _state: unknown,
-    compactFn?: (
-      m: Message[],
-      s: AbortSignal | undefined,
-      o: Record<string, unknown>,
-    ) => Promise<{
-      compacted: boolean;
-      messages: Message[];
-      compactedPersistedMessages?: number;
-      summaryText?: string;
-      [k: string]: unknown;
-    }>,
-    signal?: AbortSignal,
-  ) => {
-    let resultMessages = msgs;
-    let compactionResult;
-    if (compactFn) {
-      const cr = await compactFn(msgs, signal, { force: true });
-      if (cr.compacted) {
-        resultMessages = cr.messages;
-        compactionResult = cr;
+mock.module(
+  "../plugins/defaults/compaction/context-overflow-reducer.js",
+  () => ({
+    createInitialReducerState: () => ({
+      appliedTiers: [],
+      injectionMode: "full" as const,
+      exhausted: false,
+    }),
+    reduceContextOverflow: async (
+      msgs: Message[],
+      _cfg: unknown,
+      _state: unknown,
+      compactFn?: (
+        m: Message[],
+        s: AbortSignal | undefined,
+        o: Record<string, unknown>,
+      ) => Promise<{
+        compacted: boolean;
+        messages: Message[];
+        compactedPersistedMessages?: number;
+        summaryText?: string;
+        [k: string]: unknown;
+      }>,
+      signal?: AbortSignal,
+    ) => {
+      let resultMessages = msgs;
+      let compactionResult;
+      if (compactFn) {
+        const cr = await compactFn(msgs, signal, { force: true });
+        if (cr.compacted) {
+          resultMessages = cr.messages;
+          compactionResult = cr;
+        }
       }
-    }
-    return {
-      messages: resultMessages,
-      tier: "forced_compaction",
-      state: {
-        appliedTiers: [
-          "forced_compaction",
-          "tool_result_truncation",
-          "media_stubbing",
-          "injection_downgrade",
-        ],
-        injectionMode: "full",
-        exhausted: true,
-      },
-      estimatedTokens: 1000,
-      compactionResult,
-    };
-  },
-}));
+      return {
+        messages: resultMessages,
+        tier: "forced_compaction",
+        state: {
+          appliedTiers: [
+            "forced_compaction",
+            "tool_result_truncation",
+            "media_stubbing",
+            "injection_downgrade",
+          ],
+          injectionMode: "full",
+          exhausted: true,
+        },
+        estimatedTokens: 1000,
+        compactionResult,
+      };
+    },
+  }),
+);
 
 mock.module("../daemon/context-overflow-policy.js", () => ({
   resolveOverflowAction: () => "fail_gracefully",
@@ -221,6 +224,7 @@ let forceCompactionEnabled = false;
 mock.module("../context/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
+    updateConfig() {}
     shouldCompact() {
       return { needed: false, estimatedTokens: 0 };
     }
@@ -280,10 +284,11 @@ mock.module("../agent/loop.js", () => ({
     getActiveModel() {
       return undefined;
     }
-    async run(
-      messages: Message[],
-      onEvent: (event: AgentEvent) => void,
-    ): Promise<AgentLoopRunResult> {
+    async run(options: {
+      messages: Message[];
+      onEvent: (event: AgentEvent) => void;
+    }): Promise<AgentLoopRunResult> {
+      const { messages, onEvent } = options;
       // Prime the assistant row anchor — production code emits this from
       // `AgentLoop.run` just before `provider.sendMessage`.
       await onEvent({ type: "llm_call_started" });
@@ -486,11 +491,10 @@ describe("provider ordering error retry", () => {
     firstRunErrorMode = "ordering";
     maybeCompactCalls = [];
     forceCompactionEnabled = false;
-    // Orchestrator pipelines (`overflowReduce`, `persistence`, …) run through
-    // the plugin registry; re-register every default so each pipeline has a
-    // middleware to dispatch to. The `context-overflow-reducer` module itself
-    // (and other collaborators) are mocked above, so the default plugins'
-    // delegates go through the mocked implementations.
+    // The compaction pipeline runs through the plugin registry; re-register
+    // every default so it has a middleware to dispatch to. Collaborators are
+    // mocked above, so the default plugins' delegates go through the mocked
+    // implementations.
     resetPluginRegistryAndRegisterDefaults();
   });
 
@@ -570,7 +574,7 @@ describe("provider ordering error retry", () => {
     });
 
     expect(agentLoopRunCount).toBe(2);
-    expect(maybeCompactCalls).toEqual([{ force: false }, { force: true }]);
+    expect(maybeCompactCalls).toEqual([{ force: true }]);
     expect(events.some((e) => e.type === "message_complete")).toBe(true);
     expect(events.some((e) => e.type === "conversation_error")).toBe(false);
   });
@@ -595,9 +599,10 @@ describe("provider ordering error retry", () => {
     // (forceCompactionEnabled=false), the second run also fails with
     // context_too_large. The overflow policy (fail_gracefully) surfaces error.
     expect(agentLoopRunCount).toBe(2);
-    // Two maybeCompact calls: initial auto-compact (force:false),
-    // reducer's compactFn (force:true).
-    expect(maybeCompactCalls).toEqual([{ force: false }, { force: true }]);
+    // One maybeCompact call: the reducer's compactFn (force:true). The
+    // orchestrator's start-of-turn auto-compact no longer runs — the loop's
+    // pre-call budget gate owns turn-start compaction and doesn't trip here.
+    expect(maybeCompactCalls).toEqual([{ force: true }]);
 
     expect(events.some((e) => e.type === "conversation_error")).toBe(true);
   });
@@ -618,7 +623,7 @@ describe("provider ordering error retry", () => {
 
     // Same as above — convergence loop re-runs agent loop, which also fails.
     expect(agentLoopRunCount).toBe(2);
-    expect(maybeCompactCalls).toEqual([{ force: false }, { force: true }]);
+    expect(maybeCompactCalls).toEqual([{ force: true }]);
     expect(events.some((e) => e.type === "conversation_error")).toBe(true);
   });
 
@@ -637,7 +642,7 @@ describe("provider ordering error retry", () => {
     });
 
     expect(agentLoopRunCount).toBe(2);
-    expect(maybeCompactCalls).toEqual([{ force: false }, { force: true }]);
+    expect(maybeCompactCalls).toEqual([{ force: true }]);
     expect(events.some((e) => e.type === "message_complete")).toBe(true);
     expect(events.some((e) => e.type === "conversation_error")).toBe(false);
   });
@@ -660,7 +665,7 @@ describe("provider ordering error retry", () => {
     // the regex patterns, but classifyConversationError recognizes statusCode 413
     // as CONTEXT_TOO_LARGE and sets contextTooLargeDetected = true.
     expect(agentLoopRunCount).toBe(2);
-    expect(maybeCompactCalls).toEqual([{ force: false }, { force: true }]);
+    expect(maybeCompactCalls).toEqual([{ force: true }]);
     expect(events.some((e) => e.type === "message_complete")).toBe(true);
     expect(events.some((e) => e.type === "conversation_error")).toBe(false);
   });

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

@@ -265,6 +265,7 @@ mock.module("../memory/retriever.js", () => ({
 mock.module("../context/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
+    updateConfig() {}
     shouldCompact() {
       return { needed: false, estimatedTokens: 0 };
     }
@@ -353,15 +354,14 @@ mock.module("../agent/loop.js", () => ({
     getActiveModel() {
       return undefined;
     }
-    async run(
-      messages: Message[],
-      onEvent: (event: AgentEvent) => void | Promise<void>,
-      options?: {
-        onCheckpoint?: (
-          checkpoint: CheckpointInfo,
-        ) => CheckpointDecision | Promise<CheckpointDecision>;
-      },
-    ): Promise<AgentLoopRunResult> {
+    async run(options: {
+      messages: Message[];
+      onEvent: (event: AgentEvent) => void | Promise<void>;
+      onCheckpoint?: (
+        checkpoint: CheckpointInfo,
+      ) => CheckpointDecision | Promise<CheckpointDecision>;
+    }): Promise<AgentLoopRunResult> {
+      const { messages, onEvent } = options;
       return new Promise<AgentLoopRunResult>((resolveResult, reject) => {
         const pending: PendingRun = {
           resolve: (history: Message[]) =>