@vellumai/assistant 0.8.8-dev.202606081859.f7bdc00 → 0.8.8-dev.202606081950.5bd40e7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/assistant",
-  "version": "0.8.8-dev.202606081859.f7bdc00",
+  "version": "0.8.8-dev.202606081950.5bd40e7",
   "license": "MIT",
   "type": "module",
   "exports": {

package/src/__tests__/approval-cascade.test.ts

@@ -173,7 +173,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/compaction-direct.test.ts

@@ -3,19 +3,29 @@
  *
  * The agent loop calls {@link defaultCompact} directly with a
  * {@link CompactionContext} rather than routing through a middleware pipeline.
- * These tests assert that the default implementation delegates to the
- * supplied {@link ContextWindowManager} and forwards the request's
- * conversational options verbatim. The orchestrator integration path
- * (conversation-agent-loop) is exercised by
+ * These tests assert that the default implementation resolves the
+ * conversation's {@link ContextWindowManager} from the compaction store and
+ * forwards the request's conversational options verbatim. The orchestrator
+ * integration path (conversation-agent-loop) is exercised by
  * `conversation-agent-loop-overflow.test.ts`.
  */
 
-import { describe, expect, test } from "bun:test";
+import { describe, expect, mock, test } from "bun:test";
 
-import {
-  type CompactionContext,
-  defaultCompact,
-} from "../plugins/defaults/compaction/compact.js";
+// `defaultCompact` resolves the manager from the per-conversation compaction
+// store. Register each test's canned stub in a map the mocked store reads from.
+const fakeContextWindowManagers = new Map<string, unknown>();
+mock.module("../plugins/defaults/compaction/manager-store.js", () => ({
+  createContextWindowManager: () => undefined,
+  getContextWindowManager: (conversationId: string) =>
+    fakeContextWindowManagers.get(conversationId),
+  disposeContextWindowManager: (conversationId: string) => {
+    fakeContextWindowManagers.delete(conversationId);
+  },
+}));
+
+const { defaultCompact } =
+  await import("../plugins/defaults/compaction/compact.js");
 
 type ContextWindowResultShape = {
   compacted: boolean;
@@ -55,13 +65,17 @@ function makeResult(
   };
 }
 
-function makeManager(result: ContextWindowResultShape) {
+/** Register a stub manager under a conversation id and return its recorder. */
+function registerManager(
+  conversationId: string,
+  result: ContextWindowResultShape,
+) {
   const observed: {
     messages: unknown;
     signal: unknown;
     options: unknown;
   }[] = [];
-  const manager = {
+  fakeContextWindowManagers.set(conversationId, {
     maybeCompact: async (
       messages: unknown,
       signal: unknown,
@@ -70,8 +84,8 @@ function makeManager(result: ContextWindowResultShape) {
       observed.push({ messages, signal, options });
       return result;
     },
-  } as unknown as CompactionContext["manager"];
-  return { manager, observed };
+  });
+  return observed;
 }
 
 describe("defaultCompact", () => {
@@ -81,13 +95,13 @@ describe("defaultCompact", () => {
       summaryText: "manager-summary",
       compactedMessages: 7,
     });
-    const { manager, observed } = makeManager(expected);
+    const observed = registerManager("conv-delegates", expected);
     const messages = [{ role: "user", content: "hi" }] as never;
     const signal = new AbortController().signal;
 
     // WHEN defaultCompact runs with those messages and a signal
     const result = (await defaultCompact({
-      manager,
+      conversationId: "conv-delegates",
       messages,
       signal,
     })) as unknown as ContextWindowResultShape;
@@ -105,11 +119,11 @@ describe("defaultCompact", () => {
 
   test("forwards the request's compaction options to the manager", async () => {
     // GIVEN a manager and a fully-populated compaction context
-    const { manager, observed } = makeManager(makeResult());
+    const observed = registerManager("conv-options", makeResult());
 
     // WHEN defaultCompact runs with force/profile/trust options
     await defaultCompact({
-      manager,
+      conversationId: "conv-options",
       messages: [] as never,
       force: true,
       overrideProfile: "fast-profile",
@@ -118,7 +132,7 @@ describe("defaultCompact", () => {
       actorTrustClass: "guardian",
     });
 
-    // THEN the manager received exactly those options, and the manager,
+    // THEN the manager received exactly those options, and the conversation id,
     // messages, and signal are not leaked into the options bag
     expect(observed).toHaveLength(1);
     expect(observed[0]!.options).toEqual({

package/src/__tests__/compaction-events.test.ts

@@ -12,8 +12,8 @@ import { describe, expect, mock, test } from "bun:test";
 
 import { CompactionCircuit } from "../agent/compaction-circuit.js";
 import type { AgentEvent } from "../agent/loop.js";
-import type { ContextWindowResult } from "../context/window-manager.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { ContextWindowResult } from "../plugins/defaults/compaction/window-manager.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
 
 // ---------------------------------------------------------------------------
@@ -187,7 +187,7 @@ let mockCompactResult: ContextWindowResult = {
   summaryText: "",
 };
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     nonPersistedPrefixCount = 0;
     constructor() {}

package/src/__tests__/compaction.benchmark.test.ts

@@ -12,7 +12,7 @@ import { describe, expect, mock, test } from "bun:test";
 
 import { DEFAULT_CONFIG } from "../config/defaults.js";
 import { estimatePromptTokens } from "../context/token-estimator.js";
-import { ContextWindowManager } from "../context/window-manager.js";
+import { ContextWindowManager } from "../plugins/defaults/compaction/window-manager.js";
 import type { Message, Provider } from "../providers/types.js";
 
 mock.module("../util/logger.js", () => ({

package/src/__tests__/context-overflow-reducer.test.ts

@@ -1,17 +1,17 @@
 import { describe, expect, test } from "bun:test";
 
 import { estimatePromptTokens } from "../context/token-estimator.js";
-import type {
-  ContextWindowCompactOptions,
-  ContextWindowResult,
-} from "../context/window-manager.js";
-import { createContextSummaryMessage } from "../context/window-manager.js";
 import {
   createInitialReducerState,
   reduceContextOverflow,
   type ReducerConfig,
   type ReducerState,
 } from "../plugins/defaults/compaction/context-overflow-reducer.js";
+import type {
+  ContextWindowCompactOptions,
+  ContextWindowResult,
+} from "../plugins/defaults/compaction/window-manager.js";
+import { createContextSummaryMessage } from "../plugins/defaults/compaction/window-manager.js";
 import type { Message } from "../providers/types.js";
 
 function msg(role: "user" | "assistant", text: string): Message {

package/src/__tests__/context-window-manager-compact-retry.test.ts

@@ -94,7 +94,7 @@ mock.module("../context/compactor.js", () => ({
   },
 }));
 
-import { ContextWindowManager } from "../context/window-manager.js";
+import { ContextWindowManager } from "../plugins/defaults/compaction/window-manager.js";
 import type { Message, Provider } from "../providers/types.js";
 
 function makeProvider(): Provider {

package/src/__tests__/conversation-abort-tool-results.test.ts

@@ -167,7 +167,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -164,7 +164,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-media-retry.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
-import { createContextSummaryMessage } from "../context/window-manager.js";
 import { stripMediaPayloadsForRetry } from "../daemon/conversation-media-retry.js";
+import { createContextSummaryMessage } from "../plugins/defaults/compaction/window-manager.js";
 import type { ContentBlock, Message } from "../providers/types.js";
 
 // ---------------------------------------------------------------------------

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

@@ -249,7 +249,7 @@ mock.module("../agent/loop.js", () => ({
   },
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -221,7 +221,7 @@ mock.module("../memory/retriever.js", () => ({
 let maybeCompactCalls: Array<{ force: boolean }> = [];
 let forceCompactionEnabled = false;
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -262,7 +262,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -86,12 +86,14 @@ import {
   loadSlackChronologicalContext,
   loadSlackChronologicalMessages,
   resolveChannelCapabilities,
+  resolveTurnInboundActorContext,
   stripChannelCapabilityContext,
   stripInjectionsForCompaction,
   stripNowScratchpad,
 } from "../daemon/conversation-runtime-assembly.js";
 import type { SurfaceData, SurfaceType } from "../daemon/message-protocol.js";
 import { buildPkbReminder } from "../daemon/pkb-reminder-builder.js";
+import type { TrustContext } from "../daemon/trust-context.js";
 import type { MessageRow } from "../memory/conversation-crud.js";
 import { getDb } from "../memory/db-connection.js";
 import { initializeDb } from "../memory/db-init.js";
@@ -1438,6 +1440,75 @@ describe("applyRuntimeInjections with nowScratchpad", () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// resolveTurnInboundActorContext
+// ---------------------------------------------------------------------------
+
+describe("resolveTurnInboundActorContext", () => {
+  /**
+   * No trust context means there is no inbound actor to ground the turn on, so
+   * the actor section is suppressed.
+   */
+  test("returns null when there is no trust context", () => {
+    // GIVEN a turn with no trust context
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(undefined, "asst-1");
+
+    // THEN there is no actor context to inject
+    expect(actorContext).toBeNull();
+  });
+
+  /**
+   * Guardian (owner) turns suppress the actor section — the unified turn context
+   * only renders actor fields for non-guardian actors.
+   */
+  test("returns null on guardian turns", () => {
+    // GIVEN a guardian trust context (no requester chat id, so the direct
+    // projection branch is taken)
+    const trustContext: TrustContext = {
+      sourceChannel: "vellum",
+      trustClass: "guardian",
+      requesterDisplayName: "Alice",
+    };
+
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(trustContext, "asst-1");
+
+    // THEN the actor section is suppressed for the owner
+    expect(actorContext).toBeNull();
+  });
+
+  /**
+   * A non-guardian trust context without the identity fields needed for the
+   * unified actor-trust lookup is projected directly into the actor context.
+   */
+  test("projects a non-guardian trust context directly", () => {
+    // GIVEN a trusted-contact trust context lacking requester chat/user ids
+    const trustContext: TrustContext = {
+      sourceChannel: "telegram",
+      trustClass: "trusted_contact",
+      requesterIdentifier: "@bob_handle",
+      requesterDisplayName: "Bob",
+      requesterSenderDisplayName: "Bobby",
+    };
+
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(trustContext, "asst-1");
+
+    // THEN the trust context is projected into the model-facing actor context
+    expect(actorContext).toEqual({
+      sourceChannel: "telegram",
+      canonicalActorIdentity: null,
+      actorIdentifier: "@bob_handle",
+      actorDisplayName: "Bob",
+      actorSenderDisplayName: "Bobby",
+      actorMemberDisplayName: undefined,
+      trustClass: "trusted_contact",
+      guardianIdentity: undefined,
+    });
+  });
+});
+
 // ---------------------------------------------------------------------------
 // buildUnifiedTurnContextBlock
 // ---------------------------------------------------------------------------

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

@@ -153,7 +153,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-slash-unknown.test.ts

@@ -154,7 +154,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-speed-override.test.ts

@@ -170,7 +170,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -1,10 +1,10 @@
 import { describe, expect, test } from "bun:test";
 
+import { findLastUndoableUserMessageIndex } from "../daemon/conversation.js";
 import {
   CONTEXT_SUMMARY_MARKER,
   createContextSummaryMessage,
-} from "../context/window-manager.js";
-import { findLastUndoableUserMessageIndex } from "../daemon/conversation.js";
+} from "../plugins/defaults/compaction/window-manager.js";
 import type { Message } from "../providers/types.js";
 
 function textMessage(role: "user" | "assistant", text: string): Message {

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

@@ -137,7 +137,7 @@ mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -181,7 +181,7 @@ mock.module("../memory/query-builder.js", () => ({
 mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     updateConfig() {}
     shouldCompact() {

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

@@ -178,7 +178,7 @@ mock.module("../memory/query-builder.js", () => ({
 mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     updateConfig() {}
     shouldCompact() {

package/src/__tests__/memory-retrieval-hook.test.ts

@@ -36,6 +36,7 @@ const applyRuntimeInjectionsMock = mock(async (messages: unknown) => ({
 }));
 mock.module("../daemon/conversation-runtime-assembly.js", () => ({
   applyRuntimeInjections: applyRuntimeInjectionsMock,
+  resolveTurnInboundActorContext: () => null,
 }));
 
 // The hook self-resolves the live conversation and its trust class; both are
@@ -148,7 +149,6 @@ function makeHookCtx(
     requestId: "req-test",
     isNonInteractive: false,
     modelProfile: null,
-    actorContext: null,
     ...overrides,
   };
 }

package/src/agent/loop.ts

@@ -10,7 +10,6 @@ import {
   estimateToolsTokens,
   getCalibrationProviderKey,
 } from "../context/token-estimator.js";
-import type { ContextWindowResult } from "../context/window-manager.js";
 import type { InboundActorContext } from "../daemon/conversation-runtime-assembly.js";
 import type { ToolActivityMetadata } from "../daemon/message-types/web-activity.js";
 import type { TrustContext } from "../daemon/trust-context.js";
@@ -22,15 +21,11 @@ import type {
   PreModelCallContext,
   StopContext,
 } from "../plugin-api/types.js";
-import {
-  DEFAULT_COMPACTION_PLUGIN_NAME,
-  defaultCompact,
-} from "../plugins/defaults/compaction/compact.js";
-import { getContextWindowManager } from "../plugins/defaults/compaction/manager-store.js";
+import { defaultCompact } from "../plugins/defaults/compaction/compact.js";
+import type { ContextWindowResult } from "../plugins/defaults/compaction/window-manager.js";
 import postCompact from "../plugins/defaults/memory-retrieval/hooks/post-compact.js";
 import { runHook } from "../plugins/pipeline.js";
 import type { CompactionCircuitEvent } from "../plugins/types.js";
-import { PluginExecutionError } from "../plugins/types.js";
 import { normalizeThinkingConfigForWire } from "../providers/thinking-config.js";
 import type {
   ContentBlock,
@@ -730,17 +725,8 @@ export class AgentLoop {
     // Record the history-stripped marker right after stripping, before the
     // pipeline runs.
     await onEvent({ type: "history_stripped" });
-    // The compaction module owns the per-conversation manager; resolve it from
-    // the store rather than holding a handle on the loop. Absent for callers
-    // without a compaction path (agent wakes, standalone unit tests), which
-    // never reach this gate.
-    const manager = getContextWindowManager(this.conversationId);
-    if (manager == null) {
-      throw new PluginExecutionError(
-        `default-compaction: no ContextWindowManager registered for conversation ${this.conversationId} — the compaction store must construct one before compaction runs`,
-        DEFAULT_COMPACTION_PLUGIN_NAME,
-      );
-    }
+    // The compaction module owns the per-conversation manager; pass the
+    // conversation id and let `defaultCompact` resolve it from the store.
     // The mid-loop budget gate is reached only when this turn decides to
     // compact in place, so `force` past the auto-threshold check.
     // `actorTrustClass` comes from the turn's trust snapshot (the actor whose
@@ -748,7 +734,7 @@ export class AgentLoop {
     // guardian-only attachments for untrusted actors. `overrideProfile` is the
     // turn's resolved inference-profile override for the summary call.
     const compactResult = await defaultCompact({
-      manager,
+      conversationId: this.conversationId,
       messages: rawHistory,
       signal,
       force: true,