@vellumai/assistant 0.10.3 → 0.10.4-dev.202607010028.1a4efcc

package/src/__tests__/agent-loop-exit-reason.test.ts

@@ -22,7 +22,7 @@ import type {
   CheckpointDecision,
   CheckpointInfo,
 } from "../agent/loop.js";
-import { AgentLoop, isMaxTokensStopReason } from "../agent/loop.js";
+import { AgentLoop } from "../agent/loop.js";
 import type { ContextWindowConfig } from "../config/types.js";
 import type { TrustContext } from "../daemon/trust-context.js";
 import { HOOKS } from "../plugin-api/constants.js";
@@ -35,6 +35,7 @@ import {
   registerPlugin,
   resetPluginRegistryForTests,
 } from "../plugins/registry.js";
+import { isMaxTokensStopReason } from "../providers/stop-reasons.js";
 import type {
   Message,
   Provider,
@@ -459,6 +460,7 @@ describe("AgentLoop exit-reason instrumentation", () => {
       messages: [userMessage],
       onEvent: () => {},
       trust: { sourceChannel: "vellum", trustClass: "unknown" },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: false, safetyMarginRatio: 0 },
@@ -499,6 +501,7 @@ describe("AgentLoop exit-reason instrumentation", () => {
       onEvent: (event) => {
         events.push(event);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },

package/src/__tests__/agent-loop-override-profile.test.ts

@@ -253,7 +253,7 @@ mock.module("../daemon/conversation.js", () => ({
   Conversation: FakeConversation,
 }));
 
-mock.module("../memory/conversation-bootstrap.js", () => ({
+mock.module("../persistence/conversation-bootstrap.js", () => ({
   bootstrapConversation: () => ({ id: "conv-id" }),
 }));
 
@@ -383,7 +383,7 @@ describe("SubagentManager.spawn — overrideProfile inheritance", () => {
 // conversations regardless. Without preferring the in-memory context, the
 // inheritance chain breaks at the second nesting level.
 
-mock.module("../memory/conversation-crud.js", () => ({
+mock.module("../persistence/conversation-crud.js", () => ({
   setConversationProcessingStartedAt: () => {},
   // Always return undefined for the row read so the test fails fast unless
   // executeSubagentSpawn reads from context.overrideProfile first.

package/src/__tests__/agent-loop-regrowth-guard.test.ts

@@ -148,6 +148,7 @@ async function runOnce(args: {
     onEvent: (event) => {
       events.push(event);
     },
+    modelProfileKey: "balanced",
     resolveContextWindow: () => ({
       maxInputTokens: 10,
       overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -215,6 +216,7 @@ describe("AgentLoop budget-gate regrowth guard", () => {
       onEvent: (event) => {
         events.push(event);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -249,6 +251,7 @@ describe("AgentLoop budget-gate regrowth guard", () => {
       requestId: "req",
       messages: [userMessage],
       onEvent: () => {},
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -310,6 +313,7 @@ describe("AgentLoop budget-gate per-turn proactive-futility suppression", () =>
       onEvent: (event) => {
         events.push(event);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -369,6 +373,7 @@ describe("AgentLoop budget-gate per-turn proactive-futility suppression", () =>
       onEvent: (e) => {
         events.push(e);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -411,6 +416,7 @@ describe("AgentLoop budget-gate per-turn proactive-futility suppression", () =>
       onEvent: (e) => {
         turn1.push(e);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -428,6 +434,7 @@ describe("AgentLoop budget-gate per-turn proactive-futility suppression", () =>
       onEvent: (e) => {
         turn2.push(e);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },
@@ -483,6 +490,7 @@ describe("AgentLoop budget-gate per-turn proactive-futility suppression", () =>
       onEvent: (e) => {
         events.push(e);
       },
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens: 10,
         overflowRecovery: { enabled: true, safetyMarginRatio: 0 },

package/src/__tests__/agent-loop-set-system-prompt.test.ts

@@ -0,0 +1,139 @@
+/**
+ * Tests for `AgentLoop.setSystemPrompt` — the seam that lets a conversation
+ * update the loop's system prompt between turns.
+ *
+ * The loop snapshots `this.systemPrompt` once per `run()`, so a conversation
+ * that resolves its persona context after the loop is constructed (a voice
+ * call binds the caller's trust only after `getOrCreateConversation`) must be
+ * able to push the re-resolved prompt in before the next turn. These tests
+ * drive the REAL loop against a recording provider and assert the prompt the
+ * provider receives, with a pass-through `pre-model-call` hook so the loop's
+ * own prompt — not a hook mutation — is what reaches the wire.
+ */
+
+import { beforeEach, describe, expect, mock, test } from "bun:test";
+
+// Standard logger stub (same shape as the rest of the suite).
+mock.module("../util/logger.js", () => ({
+  getLogger: () =>
+    new Proxy({} as Record<string, unknown>, { get: () => () => {} }),
+}));
+
+// Pass-through plugin pipeline: the `pre-model-call` hook returns its context
+// unchanged, so `providerOptions.systemPrompt` stays exactly the prompt the
+// loop snapshotted for the run.
+mock.module("../plugins/pipeline.js", () => ({
+  runHook: async (_hook: unknown, ctx: unknown): Promise<unknown> => ctx,
+}));
+
+let mockLlmConfig: Record<string, unknown> = {};
+mock.module("../config/loader.js", () => ({
+  getConfig: () => ({ llm: mockLlmConfig }),
+}));
+
+import { AgentLoop } from "../agent/loop.js";
+import { LLMSchema } from "../config/schemas/llm.js";
+import type { TrustContext } from "../daemon/trust-context.js";
+import type {
+  Message,
+  Provider,
+  ProviderResponse,
+  SendMessageOptions,
+} from "../providers/types.js";
+
+const userMessage: Message = {
+  role: "user",
+  content: [{ type: "text", text: "hi" }],
+};
+
+const trust: TrustContext = {
+  sourceChannel: "vellum",
+  trustClass: "guardian",
+};
+
+/**
+ * Provider that records the system prompt of every send and ends the turn
+ * after one call.
+ */
+function makeRecordingProvider(): {
+  provider: Provider;
+  capturedSystemPrompts: () => (string | undefined)[];
+} {
+  const captured: (string | undefined)[] = [];
+  const provider: Provider = {
+    name: "anthropic",
+    async sendMessage(
+      _messages: Message[],
+      options?: SendMessageOptions,
+    ): Promise<ProviderResponse> {
+      captured.push(options?.systemPrompt);
+      return {
+        content: [{ type: "text", text: "done" }],
+        model: "mock-model",
+        usage: { inputTokens: 1, outputTokens: 1 },
+        stopReason: "end_turn",
+      };
+    },
+  };
+  return { provider, capturedSystemPrompts: () => captured };
+}
+
+function makeLoop(provider: Provider, systemPrompt: string): AgentLoop {
+  return new AgentLoop({
+    provider,
+    systemPrompt,
+    config: {},
+    conversationId: "test-conv",
+  });
+}
+
+async function runOnce(loop: AgentLoop): Promise<void> {
+  await loop.run({
+    requestId: "test-request",
+    messages: [userMessage],
+    onEvent: () => {},
+    trust,
+    callSite: "mainAgent",
+  });
+}
+
+beforeEach(() => {
+  mockLlmConfig = LLMSchema.parse({
+    default: { provider: "anthropic", model: "mock-model" },
+  }) as Record<string, unknown>;
+});
+
+describe("AgentLoop.setSystemPrompt", () => {
+  test("a prompt set before the run is what the provider receives", async () => {
+    const { provider, capturedSystemPrompts } = makeRecordingProvider();
+    const loop = makeLoop(provider, "CONSTRUCTION-PERSONA");
+
+    loop.setSystemPrompt("LATE-BOUND-PERSONA");
+    await runOnce(loop);
+
+    expect(capturedSystemPrompts()).toEqual(["LATE-BOUND-PERSONA"]);
+  });
+
+  test("without a push, the construction-time prompt is used", async () => {
+    const { provider, capturedSystemPrompts } = makeRecordingProvider();
+    const loop = makeLoop(provider, "CONSTRUCTION-PERSONA");
+
+    await runOnce(loop);
+
+    expect(capturedSystemPrompts()).toEqual(["CONSTRUCTION-PERSONA"]);
+  });
+
+  test("a prompt pushed between turns takes effect on the next run", async () => {
+    const { provider, capturedSystemPrompts } = makeRecordingProvider();
+    const loop = makeLoop(provider, "FIRST-PERSONA");
+
+    await runOnce(loop);
+    loop.setSystemPrompt("SECOND-PERSONA");
+    await runOnce(loop);
+
+    expect(capturedSystemPrompts()).toEqual([
+      "FIRST-PERSONA",
+      "SECOND-PERSONA",
+    ]);
+  });
+});

package/src/__tests__/agent-loop.test.ts

@@ -204,6 +204,7 @@ describe("AgentLoop", () => {
       trust: { sourceChannel: "vellum", trustClass: "unknown" },
       requestId: "req-1",
       callSite: "mainAgent",
+      modelProfileKey: "balanced",
       resolveContextWindow: () => ({
         maxInputTokens,
         overflowRecovery: { enabled: false, safetyMarginRatio: 0 },

package/src/__tests__/agent-wake-disk-pressure-callsite.test.ts

@@ -20,9 +20,9 @@ import type {
 } from "../daemon/disk-pressure-policy.js";
 import type { Message } from "../providers/types.js";
 
-mock.module("../memory/conversation-crud.js", () => ({
-    setConversationProcessingStartedAt: () => {},
-    isConversationProcessing: () => false,
+mock.module("../persistence/conversation-crud.js", () => ({
+  setConversationProcessingStartedAt: () => {},
+  isConversationProcessing: () => false,
   getConversationOverrideProfile: () => undefined,
 }));
 

package/src/__tests__/agent-wake-override-profile.test.ts

@@ -30,9 +30,9 @@ import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
 let mockOverrideProfile: string | undefined = undefined;
 
-mock.module("../memory/conversation-crud.js", () => ({
-    setConversationProcessingStartedAt: () => {},
-    isConversationProcessing: () => false,
+mock.module("../persistence/conversation-crud.js", () => ({
+  setConversationProcessingStartedAt: () => {},
+  isConversationProcessing: () => false,
   getConversationOverrideProfile: (_id: string) => mockOverrideProfile,
   reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));

package/src/__tests__/annotate-activity-metadata.test.ts

@@ -54,9 +54,9 @@ mock.module("../config/loader.js", () => ({
 let mockedRowContent = "";
 const updates: Array<{ id: string; content: string }> = [];
 
-mock.module("../memory/conversation-crud.js", () => ({
-    setConversationProcessingStartedAt: () => {},
-    isConversationProcessing: () => false,
+mock.module("../persistence/conversation-crud.js", () => ({
+  setConversationProcessingStartedAt: () => {},
+  isConversationProcessing: () => false,
   addMessage: () => ({ id: "mock-msg-id" }),
   getMessageById: (id: string) =>
     mockedRowContent ? { id, content: mockedRowContent } : null,
@@ -67,7 +67,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
-mock.module("../memory/llm-request-log-store.js", () => ({
+mock.module("../persistence/llm-request-log-store.js", () => ({
   recordRequestLog: () => {},
   backfillMessageIdOnLogs: () => {},
 }));

package/src/__tests__/annotate-risk-options.test.ts

@@ -49,9 +49,9 @@ mock.module("../config/loader.js", () => ({
 let mockedRowContent = "";
 const updates: Array<{ id: string; content: string }> = [];
 
-mock.module("../memory/conversation-crud.js", () => ({
-    setConversationProcessingStartedAt: () => {},
-    isConversationProcessing: () => false,
+mock.module("../persistence/conversation-crud.js", () => ({
+  setConversationProcessingStartedAt: () => {},
+  isConversationProcessing: () => false,
   addMessage: () => ({ id: "mock-msg-id" }),
   getMessageById: (id: string) =>
     mockedRowContent ? { id, content: mockedRowContent } : null,
@@ -62,7 +62,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
-mock.module("../memory/llm-request-log-store.js", () => ({
+mock.module("../persistence/llm-request-log-store.js", () => ({
   recordRequestLog: () => {},
   backfillMessageIdOnLogs: () => {},
 }));

package/src/__tests__/anthropic-provider.test.ts

@@ -2087,6 +2087,54 @@ describe("AnthropicProvider — Cache-Control Characterization", () => {
     expect(emitted).toEqual([]);
   });
 
+  test("suppresses a leading-space-corrupted sentinel echo (proxy dropped the guard byte)", async () => {
+    // OpenRouter's Anthropic-compat path returns the `\x00` guard as a leading
+    // space; the normalized prefix check must still hold and drop it.
+    scriptedStream = [
+      { kind: "blockStart" },
+      { kind: "text", text: " __PLACEHOLDER__[empty assistant turn]" },
+      { kind: "blockStop" },
+    ];
+    const emitted: string[] = [];
+    await provider.sendMessage([userMsg("Hi")], {
+      onEvent: (event) => {
+        if (event.type === "text_delta") emitted.push(event.text);
+      },
+    });
+    expect(emitted).toEqual([]);
+  });
+
+  test("suppresses a leading-space-corrupted sentinel split across chunks", async () => {
+    scriptedStream = [
+      { kind: "blockStart" },
+      { kind: "text", text: " __PLACE" },
+      { kind: "text", text: "HOLDER__[empty assistant turn]" },
+      { kind: "blockStop" },
+    ];
+    const emitted: string[] = [];
+    await provider.sendMessage([userMsg("Hi")], {
+      onEvent: (event) => {
+        if (event.type === "text_delta") emitted.push(event.text);
+      },
+    });
+    expect(emitted).toEqual([]);
+  });
+
+  test("still streams real text that begins with whitespace", async () => {
+    scriptedStream = [
+      { kind: "blockStart" },
+      { kind: "text", text: " hello there" },
+      { kind: "blockStop" },
+    ];
+    const emitted: string[] = [];
+    await provider.sendMessage([userMsg("Hi")], {
+      onEvent: (event) => {
+        if (event.type === "text_delta") emitted.push(event.text);
+      },
+    });
+    expect(emitted.join("")).toBe(" hello there");
+  });
+
   test("flushes buffered prefix when the continuation diverges from all sentinels", async () => {
     // "__PLACEHOLDER__" is a prefix of the sentinels, so it stays buffered.
     // Once the next chunk diverges (bracket instead of the expected opening),
@@ -3197,11 +3245,14 @@ describe("AnthropicProvider — deprecated sampling params (temperature / top_p
     lastStreamParams = null;
   });
 
-  // opus-4-7 / opus-4-8 (and, conservatively, fable) reject `temperature`,
-  // `top_p`, and `top_k` with a 400; the provider must strip all three.
+  // opus-4-7 / opus-4-8 / sonnet-5 (and, conservatively, fable) reject
+  // `temperature`, `top_p`, and `top_k` with a 400; the provider must strip
+  // all three. The OpenRouter `anthropic/...` form delegates here too.
   for (const model of [
     "claude-opus-4-8",
     "claude-opus-4-7",
+    "claude-sonnet-5",
+    "anthropic/claude-sonnet-5",
     "claude-fable-5",
   ]) {
     test(`strips temperature, top_p, and top_k for ${model}`, async () => {

package/src/__tests__/app-builder-tool-scripts.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
 
-import type { AppDefinition } from "../memory/app-store.js";
+import type { AppDefinition } from "../apps/app-store.js";
 import type { AppStore } from "../tools/apps/executors.js";
 import type { ToolContext } from "../tools/types.js";
 
@@ -53,7 +53,7 @@ function makeContext(overrides: Partial<ToolContext> = {}): ToolContext {
 
 const mockStore = makeMockStore();
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   ...mockStore,
   getAppsDir: () => "/tmp/test-apps",
   getAppDirPath: (appId: string) => `/tmp/test-apps/${appId}`,

package/src/__tests__/app-bundler.test.ts

@@ -25,7 +25,7 @@ const testAppsDir = join(tmpdir(), `app-bundler-test-${Date.now()}`);
 
 // Mock app-store so packageApp can find our test apps
 const mockApps = new Map<string, Record<string, unknown>>();
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getApp: (id: string) => mockApps.get(id) ?? null,
   getAppsDir: () => testAppsDir,
   getAppDirPath: (id: string) => join(testAppsDir, id),

package/src/__tests__/app-conversation-ids-backfill.test.ts

@@ -15,10 +15,10 @@ import {
   backfillAppConversationIds,
   createApp,
   getApp,
-} from "../memory/app-store.js";
-import { getDb } from "../memory/db-connection.js";
-import { initializeDb } from "../memory/db-init.js";
-import { rawRun } from "../memory/raw-query.js";
+} from "../apps/app-store.js";
+import { getDb } from "../persistence/db-connection.js";
+import { initializeDb } from "../persistence/db-init.js";
+import { rawRun } from "../persistence/raw-query.js";
 
 // Initialize db once for all tests
 await initializeDb();

package/src/__tests__/app-conversation-ids.test.ts

@@ -8,7 +8,7 @@ import {
   createApp,
   getApp,
   listAppsByConversation,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 
 // ---------------------------------------------------------------------------
 // Helpers

package/src/__tests__/app-dir-path-guard.test.ts

@@ -16,8 +16,8 @@ import { describe, expect, test } from "bun:test";
 
 /** Files that are permitted to import getAppsDir. */
 const ALLOWLIST = new Set([
-  "assistant/src/memory/app-store.ts", // defines getAppsDir
-  "assistant/src/memory/app-git-service.ts", // uses getAppsDir for git repo root, not per-app paths
+  "assistant/src/apps/app-store.ts", // defines getAppsDir
+  "assistant/src/apps/app-git-service.ts", // uses getAppsDir for git repo root, not per-app paths
   "assistant/src/daemon/app-source-watcher.ts", // uses getAppsDir for recursive fs.watch root, not per-app paths
   "assistant/src/tools/filesystem/write.ts", // uses getAppsDir as an exemption root for the artifact-HTML guard, not per-app paths
 ]);

package/src/__tests__/app-executors.test.ts

@@ -27,7 +27,7 @@ beforeEach(() => {
   };
 });
 
-import type { AppDefinition } from "../memory/app-store.js";
+import type { AppDefinition } from "../apps/app-store.js";
 import type { AppStore } from "../tools/apps/executors.js";
 import {
   executeAppCreate,

package/src/__tests__/app-git-history.test.ts

@@ -13,8 +13,8 @@ import {
   getAppFileAtVersion,
   getAppHistory,
   restoreAppVersion,
-} from "../memory/app-git-service.js";
-import { createApp, getAppDirPath, updateApp } from "../memory/app-store.js";
+} from "../apps/app-git-service.js";
+import { createApp, getAppDirPath, updateApp } from "../apps/app-store.js";
 
 describe("App Git History", () => {
   beforeEach(() => {

package/src/__tests__/app-git-service.test.ts

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { commitAppTurnChanges } from "../memory/app-git-service.js";
+import { commitAppTurnChanges } from "../apps/app-git-service.js";
 import {
   createApp,
   deleteApp,
@@ -12,7 +12,7 @@ import {
   getAppsDir,
   updateApp,
   writeAppFile,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 import { _resetGitServiceRegistry } from "../workspace/git-service.js";
 
 let testDataDir: string;

package/src/__tests__/app-routes-csp.test.ts

@@ -34,7 +34,7 @@ const apps = new Map<string, typeof legacyApp | typeof multifileApp>([
   ["multi-1", multifileApp],
 ]);
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getApp: (id: string) => apps.get(id) ?? null,
   getAppsDir: () => "/fake/apps",
   getAppDirPath: (appId: string) => `/fake/apps/${appId}`,
@@ -42,7 +42,7 @@ mock.module("../memory/app-store.js", () => ({
 }));
 
 // Mock shared-app-links-store (imported by app-routes but unused here)
-mock.module("../memory/shared-app-links-store.js", () => ({
+mock.module("../apps/shared-app-links-store.js", () => ({
   createSharedAppLink: () => ({ shareToken: "tok" }),
   getSharedAppLink: () => null,
   incrementDownloadCount: () => {},

package/src/__tests__/app-source-watcher.test.ts

@@ -44,7 +44,7 @@ mock.module("node:fs", () => {
   };
 });
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getAppsDir: mock(() => TEST_APPS_DIR),
   resolveAppIdByDirName: mock(
     (dirName: string) => testDirNameMap.get(dirName) ?? null,

package/src/__tests__/app-store-dir-names.test.ts

@@ -22,7 +22,7 @@ import {
   slugify,
   updateApp,
   validateDirName,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 
 // ---------------------------------------------------------------------------
 // Helpers

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

@@ -120,9 +120,9 @@ mock.module("../security/secret-allowlist.js", () => ({
   resetAllowlist: () => {},
 }));
 
-mock.module("../memory/conversation-crud.js", () => ({
-    setConversationProcessingStartedAt: () => {},
-    isConversationProcessing: () => false,
+mock.module("../persistence/conversation-crud.js", () => ({
+  setConversationProcessingStartedAt: () => {},
+  isConversationProcessing: () => false,
   setConversationOriginChannelIfUnset: () => {},
   updateConversationContextWindow: () => {},
   deleteMessageById: () => {},
@@ -148,11 +148,11 @@ mock.module("../memory/conversation-crud.js", () => ({
   reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
-mock.module("../memory/conversation-queries.js", () => ({
+mock.module("../persistence/conversation-queries.js", () => ({
   listConversations: () => [],
 }));
 
-mock.module("../memory/attachments-store.js", () => ({
+mock.module("../persistence/attachments-store.js", () => ({
   uploadAttachment: () => ({ id: `att-${Date.now()}` }),
   linkAttachmentToMessage: () => {},
 }));
@@ -195,7 +195,7 @@ mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   getSummaryFromContextMessage: () => null,
 }));
 
-mock.module("../memory/llm-usage-store.js", () => ({
+mock.module("../persistence/llm-usage-store.js", () => ({
   recordUsageEvent: () => ({ id: "mock-id", createdAt: Date.now() }),
   listUsageEvents: () => [],
 }));
@@ -222,7 +222,7 @@ mock.module("../agent/loop.js", () => ({
   },
 }));
 
-mock.module("../memory/canonical-guardian-store.js", () => ({
+mock.module("../contacts/canonical-guardian-store.js", () => ({
   listPendingCanonicalGuardianRequestsByDestinationConversation: () => [],
   listCanonicalGuardianRequests: () => [],
   listPendingRequestsByConversationScope: () => [],

package/src/__tests__/approval-interception-trust-gates.test.ts

@@ -26,7 +26,7 @@ mock.module("../daemon/conversation-registry.js", () => ({
 
 import type { Conversation } from "../daemon/conversation.js";
 import type { TrustContext } from "../daemon/trust-context.js";
-import { initializeDb } from "../memory/db-init.js";
+import { initializeDb } from "../persistence/db-init.js";
 import * as approvalMessageComposer from "../runtime/approval-message-composer.js";
 import * as gatewayClient from "../runtime/gateway-client.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";

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

@@ -13,9 +13,9 @@ import {
   mintGrantFromDecision,
   type MintGrantParams,
 } from "../approvals/approval-primitive.js";
-import { getDb } from "../memory/db-connection.js";
-import { initializeDb } from "../memory/db-init.js";
-import { scopedApprovalGrants } from "../memory/schema.js";
+import { getDb } from "../persistence/db-connection.js";
+import { initializeDb } from "../persistence/db-init.js";
+import { scopedApprovalGrants } from "../persistence/schema/index.js";
 import { computeToolApprovalDigest } from "../security/tool-approval-digest.js";
 
 await initializeDb();

package/src/__tests__/approval-routes-http.test.ts

@@ -139,8 +139,8 @@ mock.module("../daemon/approval-generators.js", () => ({
   createApprovalConversationGenerator: () => undefined,
 }));
 
-import { getDb } from "../memory/db-connection.js";
-import { initializeDb } from "../memory/db-init.js";
+import { getDb } from "../persistence/db-connection.js";
+import { initializeDb } from "../persistence/db-init.js";
 import { AssistantEventHub } from "../runtime/assistant-event-hub.js";
 import { RuntimeHttpServer } from "../runtime/http-server.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";

package/src/__tests__/assistant-event-hub-machine-name.test.ts

@@ -25,7 +25,7 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-import { initializeDb } from "../memory/db-init.js";
+import { initializeDb } from "../persistence/db-init.js";
 import { AssistantEventHub } from "../runtime/assistant-event-hub.js";
 import { handleSubscribeAssistantEvents } from "../runtime/routes/events-routes.js";