@vellumai/assistant 0.10.3-dev.202606300531.247eff8 → 0.10.3-dev.202606300917.a9da5f8

package/eslint-rules/cli-no-daemon-internals.js

@@ -54,9 +54,10 @@ const ALLOWED_PREFIXES = {
     "../../../util/platform",
     // Memory retrospective — the retrospective CLI runs the fork-based
     // retrospective in-process (no daemon, no IPC), so it imports the
-    // job handler directly. Depth-2 for commands/memory/ nesting.
-    "../../memory/memory-retrospective-job",
-    "../../../memory/memory-retrospective-job",
+    // job handler directly from the default-memory plugin. Depth-2 for
+    // commands/memory/ nesting.
+    "../../plugins/defaults/memory/memory-retrospective-job",
+    "../../../plugins/defaults/memory/memory-retrospective-job",
     // Standalone tool execution — `tools run` executes a single tool
     // in-process from the filesystem (no daemon, no IPC), so it imports the
     // standalone runner directly. Depth-2 for commands/ nesting.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/assistant",
-  "version": "0.10.3-dev.202606300531.247eff8",
+  "version": "0.10.3-dev.202606300917.a9da5f8",
   "license": "MIT",
   "type": "module",
   "exports": {

package/scripts/generate-openapi.ts

@@ -16,7 +16,7 @@
  *   cd assistant && bun run generate:openapi -- --check  # CI: fail if stale
  */
 
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { readdir, readFile, writeFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 
@@ -32,6 +32,7 @@ import { createDocument } from "zod-openapi";
 
 const ROOT = resolve(import.meta.dir, "..");
 const ROUTES_DIR = join(ROOT, "src/runtime/routes");
+const PLUGIN_DEFAULTS_DIR = join(ROOT, "src/plugins/defaults");
 const OUTPUT_PATH = join(ROOT, "openapi.yaml");
 const PKG_PATH = join(ROOT, "package.json");
 
@@ -147,68 +148,89 @@ function resolveSchemaForDocument(schemaSource: unknown): ContentSchema {
 // ---------------------------------------------------------------------------
 
 /**
- * Dynamically import every route module under `src/runtime/routes/`
- * and collect all exported `ROUTES` arrays.
- *
- * Each route module is expected to export a `ROUTES: RouteDefinition[]`
- * constant. The function automatically picks up new route modules
- * without manual updates.
+ * Directories holding `RouteDefinition` modules: the host `runtime/routes`
+ * tree plus every default plugin's `routes/` subdirectory. A default plugin
+ * that owns model-facing HTTP/IPC routes defines them under
+ * `plugins/defaults/<plugin>/routes/` and the host route aggregator registers
+ * them at runtime; the generator scans those dirs too so the spec stays
+ * complete no matter which package a route lives in. Sorted for reproducible
+ * output (see {@link collectRoutesFromModules}).
+ */
+async function routeModuleDirs(): Promise<string[]> {
+  const dirs = [ROUTES_DIR];
+  for (const entry of await readdir(PLUGIN_DEFAULTS_DIR, {
+    withFileTypes: true,
+  })) {
+    if (!entry.isDirectory()) continue;
+    const routesDir = join(PLUGIN_DEFAULTS_DIR, entry.name, "routes");
+    if (existsSync(routesDir)) dirs.push(routesDir);
+  }
+  return dirs.sort();
+}
+
+/**
+ * Dynamically import every route module under each {@link routeModuleDirs}
+ * entry and collect all exported `ROUTES` / `*_ROUTES` arrays. Each route
+ * module exports a `RouteDefinition[]`; new modules are picked up without
+ * manual updates.
  */
 async function collectRoutesFromModules(): Promise<RouteEntry[]> {
   const routes: RouteEntry[] = [];
 
-  // Skip the `index.ts` barrel: it re-exports every other route module's
-  // ROUTES into a single combined array, so importing it would double-count
-  // every entry. The duplicate `method:endpoint` keys are deduped later by
-  // first-seen, but the surviving entry's `sourceModule` (used to derive
-  // OpenAPI `tags`) depends on `readdir` order — which is filesystem
-  // dependent and diverges between local sandbox and the CI runner, making
-  // the generator non-reproducible. Sort the file list as well so directory
-  // entry order can never affect the output.
-  const files = (await readdir(ROUTES_DIR, { recursive: true }))
-    .filter(
-      (f) =>
-        typeof f === "string" &&
-        f.endsWith(".ts") &&
-        !f.endsWith(".test.ts") &&
-        !f.endsWith(".benchmark.test.ts") &&
-        !f.includes("node_modules") &&
-        f !== "index.ts" &&
-        !f.endsWith("/index.ts"),
-    )
-    .sort();
-
-  for (const file of files) {
-    const filePath = join(ROUTES_DIR, file);
-    let mod: Record<string, unknown>;
-    try {
-      mod = (await import(filePath)) as Record<string, unknown>;
-    } catch (err) {
-      console.warn(
-        `Warning: could not import ${file}: ${err instanceof Error ? err.message : err}`,
-      );
-      continue;
-    }
-
-    // Collect every export whose name is `ROUTES` or ends in `_ROUTES`.
-    // A handful of route files (e.g. `channel-route-definitions.ts`,
-    // `contact-prompt-routes.ts`) export under domain-prefixed names like
-    // `CHANNEL_ROUTES` and `CONTACT_PROMPT_ROUTES` rather than the
-    // canonical `ROUTES`. Without this fan-out the only way those routes
-    // reached the spec was via the `index.ts` barrel — which is excluded
-    // above for reproducibility.
-    const exportNames = Object.keys(mod)
-      .filter((k) => k === "ROUTES" || k.endsWith("_ROUTES"))
+  for (const dir of await routeModuleDirs()) {
+    // Skip the `index.ts` barrel: it re-exports every other route module's
+    // ROUTES into a single combined array, so importing it would double-count
+    // every entry. The duplicate `method:endpoint` keys are deduped later by
+    // first-seen, but the surviving entry's `sourceModule` (used to derive
+    // OpenAPI `tags`) depends on `readdir` order — which is filesystem
+    // dependent and diverges between local sandbox and the CI runner, making
+    // the generator non-reproducible. Sort the file list as well so directory
+    // entry order can never affect the output.
+    const files = (await readdir(dir, { recursive: true }))
+      .filter(
+        (f) =>
+          typeof f === "string" &&
+          f.endsWith(".ts") &&
+          !f.endsWith(".test.ts") &&
+          !f.endsWith(".benchmark.test.ts") &&
+          !f.includes("node_modules") &&
+          f !== "index.ts" &&
+          !f.endsWith("/index.ts"),
+      )
       .sort();
-    for (const name of exportNames) {
-      const arr = mod[name];
-      if (!Array.isArray(arr)) continue;
-      for (const raw of arr) {
-        const result = RouteEntrySchema.safeParse({
-          ...(typeof raw === "object" && raw !== null ? raw : {}),
-          sourceModule: file,
-        });
-        if (result.success) routes.push(result.data);
+
+    for (const file of files) {
+      const filePath = join(dir, file);
+      let mod: Record<string, unknown>;
+      try {
+        mod = (await import(filePath)) as Record<string, unknown>;
+      } catch (err) {
+        console.warn(
+          `Warning: could not import ${file}: ${err instanceof Error ? err.message : err}`,
+        );
+        continue;
+      }
+
+      // Collect every export whose name is `ROUTES` or ends in `_ROUTES`.
+      // A handful of route files (e.g. `channel-route-definitions.ts`,
+      // `contact-prompt-routes.ts`) export under domain-prefixed names like
+      // `CHANNEL_ROUTES` and `CONTACT_PROMPT_ROUTES` rather than the
+      // canonical `ROUTES`. Without this fan-out the only way those routes
+      // reached the spec was via the `index.ts` barrel — which is excluded
+      // above for reproducibility.
+      const exportNames = Object.keys(mod)
+        .filter((k) => k === "ROUTES" || k.endsWith("_ROUTES"))
+        .sort();
+      for (const name of exportNames) {
+        const arr = mod[name];
+        if (!Array.isArray(arr)) continue;
+        for (const raw of arr) {
+          const result = RouteEntrySchema.safeParse({
+            ...(typeof raw === "object" && raw !== null ? raw : {}),
+            sourceModule: file,
+          });
+          if (result.success) routes.push(result.data);
+        }
       }
     }
   }

package/src/__tests__/activation-early-marking.test.ts

@@ -29,7 +29,7 @@ mock.module("../util/logger.js", () => ({
 
 const { applyBootstrapTemplate } = await import("../prompts/system-prompt.js");
 const { isActivationSession } =
-  await import("../memory/activation-session-store.js");
+  await import("../plugins/defaults/memory/activation-session-store.js");
 const { ACTIVATION_RAIL_BOOTSTRAP_TEMPLATE } =
   await import("../telemetry/activation-funnel.js");
 const { getDb } = await import("../persistence/db-connection.js");

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),

package/src/__tests__/auto-analysis-end-to-end.test.ts

@@ -130,7 +130,6 @@ mock.module("../runtime/services/analyze-conversation.js", () => ({
 
 // ── Real imports ──────────────────────────────────────────────────
 
-import { indexMessageNow } from "../memory/indexer.js";
 import { createConversation } from "../persistence/conversation-crud.js";
 import { getDb, getMemoryDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
@@ -140,6 +139,7 @@ import {
   memoryJobs,
   messages,
 } from "../persistence/schema/index.js";
+import { indexMessageNow } from "../plugins/defaults/memory/indexer.js";
 import { conversationAnalyzeJob } from "../runtime/services/conversation-analyze-job.js";
 import { setOverridesForTesting } from "./feature-flag-test-helpers.js";
 

package/src/__tests__/cli-memory-v2-reembed-skills.test.ts

@@ -41,7 +41,7 @@ mock.module("../ipc/cli-client.js", () => ({
 }));
 
 let seedCallCount = 0;
-mock.module("../memory/v2/skill-store.js", () => ({
+mock.module("../plugins/defaults/memory/v2/skill-store.js", () => ({
   seedV2SkillEntries: async () => {
     seedCallCount += 1;
   },
@@ -54,7 +54,7 @@ mock.module("../memory/v2/skill-store.js", () => ({
 const { registerMemoryV2Command } =
   await import("../cli/commands/memory/memory-v2.js");
 const { ROUTES: memoryV2Routes, MEMORY_V2_DISABLED_CODE } =
-  await import("../runtime/routes/memory-v2-routes.js");
+  await import("../plugins/defaults/memory/routes/memory-v2-routes.js");
 const { RouteError } = await import("../runtime/routes/errors.js");
 
 // ---------------------------------------------------------------------------

package/src/__tests__/context-search-agent-protocol.test.ts

@@ -9,8 +9,8 @@ import {
   truncateRecallEvidenceToBudget,
   validateFinishRecallPayload,
   validateRecallCitationIds,
-} from "../memory/context-search/agent-protocol.js";
-import type { RecallEvidence } from "../memory/context-search/types.js";
+} from "../plugins/defaults/memory/context-search/agent-protocol.js";
+import type { RecallEvidence } from "../plugins/defaults/memory/context-search/types.js";
 
 function makeEvidence(
   id: string,

package/src/__tests__/context-search-agent-runner.test.ts

@@ -22,13 +22,13 @@ mock.module("../providers/provider-send-message.js", () => ({
   },
 }));
 
-import { runAgenticRecall } from "../memory/context-search/agent-runner.js";
+import { runAgenticRecall } from "../plugins/defaults/memory/context-search/agent-runner.js";
 import type {
   RecallEvidence,
   RecallSearchContext,
   RecallSource,
   RecallSourceAdapter,
-} from "../memory/context-search/types.js";
+} from "../plugins/defaults/memory/context-search/types.js";
 
 interface SearchCall {
   source: RecallSource;

package/src/__tests__/context-search-conversations-source.test.ts

@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import { searchConversationSource } from "../memory/context-search/sources/conversations.js";
-import type { RecallSearchContext } from "../memory/context-search/types.js";
 import { writeSlackMetadata } from "../messaging/providers/slack/message-metadata.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { rawRun } from "../persistence/raw-query.js";
+import { searchConversationSource } from "../plugins/defaults/memory/context-search/sources/conversations.js";
+import type { RecallSearchContext } from "../plugins/defaults/memory/context-search/types.js";
 await initializeDb();
 
 let seedId = 0;

package/src/__tests__/context-search-fanout.test.ts

@@ -1,14 +1,14 @@
 import { describe, expect, test } from "bun:test";
 
 import type { AssistantConfig } from "../config/schema.js";
-import { formatDeterministicRecallAnswer } from "../memory/context-search/format.js";
-import { runDeterministicRecallSearch } from "../memory/context-search/search.js";
+import { formatDeterministicRecallAnswer } from "../plugins/defaults/memory/context-search/format.js";
+import { runDeterministicRecallSearch } from "../plugins/defaults/memory/context-search/search.js";
 import type {
   RecallEvidence,
   RecallSearchContext,
   RecallSource,
   RecallSourceAdapter,
-} from "../memory/context-search/types.js";
+} from "../plugins/defaults/memory/context-search/types.js";
 
 function makeContext(): RecallSearchContext {
   return {

package/src/__tests__/context-search-memory-source.test.ts

@@ -5,18 +5,19 @@ import type {
   RecallEvidence,
   RecallSearchContext,
   RecallSearchResult,
-} from "../memory/context-search/types.js";
-import type { MemoryNode } from "../memory/graph/types.js";
+} from "../plugins/defaults/memory/context-search/types.js";
+import type { MemoryNode } from "../plugins/defaults/memory/graph/types.js";
 
 const loggerModule = import.meta.resolve("../util/logger.js");
 const embedModule = import.meta.resolve("../persistence/embeddings/embed.js");
 const embeddingBackendModule = import.meta
   .resolve("../persistence/embeddings/embedding-backend.js");
 const graphSearchModule = import.meta
-  .resolve("../memory/graph/graph-search.js");
-const graphStoreModule = import.meta.resolve("../memory/graph/store.js");
+  .resolve("../plugins/defaults/memory/graph/graph-search.js");
+const graphStoreModule = import.meta
+  .resolve("../plugins/defaults/memory/graph/store.js");
 const memoryV2SourceModule = import.meta
-  .resolve("../memory/context-search/sources/memory-v2.js");
+  .resolve("../plugins/defaults/memory/context-search/sources/memory-v2.js");
 
 const warnCalls: unknown[][] = [];
 mock.module(loggerModule, () => ({
@@ -118,7 +119,7 @@ mock.module(memoryV2SourceModule, () => ({
 }));
 
 const { searchMemorySource } =
-  await import("../memory/context-search/sources/memory.js");
+  await import("../plugins/defaults/memory/context-search/sources/memory.js");
 
 describe("searchMemorySource", () => {
   beforeEach(() => {

package/src/__tests__/context-search-memory-v2-source.test.ts

@@ -25,9 +25,9 @@ import { dirname, join } from "node:path";
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import type { AssistantConfig } from "../config/schema.js";
-import type { RecallSearchContext } from "../memory/context-search/types.js";
-import type { EdgeIndex } from "../memory/v2/edge-index.js";
-import type { ConceptPage } from "../memory/v2/types.js";
+import type { RecallSearchContext } from "../plugins/defaults/memory/context-search/types.js";
+import type { EdgeIndex } from "../plugins/defaults/memory/v2/edge-index.js";
+import type { ConceptPage } from "../plugins/defaults/memory/v2/types.js";
 import { makeMockLogger } from "./helpers/mock-logger.js";
 
 mock.module("../util/logger.js", () => ({
@@ -54,7 +54,7 @@ let qdrantHits: QdrantHit[] = [];
 let qdrantThrows: Error | null = null;
 const qdrantCalls: Array<{ limit: number }> = [];
 
-mock.module("../memory/v2/qdrant.js", () => ({
+mock.module("../plugins/defaults/memory/v2/qdrant.js", () => ({
   hybridQueryConceptPages: async (
     _dense: number[],
     _sparse: { indices: number[]; values: number[] },
@@ -71,7 +71,7 @@ let edgeIndex: EdgeIndex = {
   incoming: new Map<string, Set<string>>(),
 };
 
-mock.module("../memory/v2/edge-index.js", () => ({
+mock.module("../plugins/defaults/memory/v2/edge-index.js", () => ({
   getEdgeIndex: async (): Promise<EdgeIndex> => edgeIndex,
   invalidateEdgeIndex: () => {},
   getReachable: () => new Set<string>(),
@@ -81,7 +81,7 @@ mock.module("../memory/v2/edge-index.js", () => ({
 
 const pageStore = new Map<string, ConceptPage>();
 
-mock.module("../memory/v2/page-store.js", () => ({
+mock.module("../plugins/defaults/memory/v2/page-store.js", () => ({
   getConceptsDir: (workspaceDir: string): string =>
     join(workspaceDir, "memory", "concepts"),
   listPages: async (): Promise<string[]> => [...pageStore.keys()],
@@ -101,7 +101,7 @@ mock.module("../memory/v2/page-store.js", () => ({
 }));
 
 const { searchMemoryV2Source } =
-  await import("../memory/context-search/sources/memory-v2.js");
+  await import("../plugins/defaults/memory/context-search/sources/memory-v2.js");
 
 const testDirs: string[] = [];
 

package/src/__tests__/context-search-types.test.ts

@@ -9,12 +9,12 @@ import {
   RECALL_EVIDENCE_TEXT_CAP_PER_SOURCE,
   RECALL_SOURCE_ROUNDS_BY_DEPTH,
   RECALL_TOTAL_EVIDENCE_TEXT_CAP,
-} from "../memory/context-search/limits.js";
+} from "../plugins/defaults/memory/context-search/limits.js";
 import type {
   RecallInput,
   RecallSource,
   RecallSourceAdapter,
-} from "../memory/context-search/types.js";
+} from "../plugins/defaults/memory/context-search/types.js";
 
 describe("normalizeRecallInput", () => {
   test("defaults omitted sources, max results, and depth", () => {

package/src/__tests__/context-search-workspace-source.test.ts

@@ -16,8 +16,8 @@ import {
   searchWorkspaceSource,
   WORKSPACE_SOURCE_MAX_FILE_SIZE_BYTES,
   WORKSPACE_SOURCE_MAX_SCANNED_FILES,
-} from "../memory/context-search/sources/workspace.js";
-import type { RecallSearchContext } from "../memory/context-search/types.js";
+} from "../plugins/defaults/memory/context-search/sources/workspace.js";
+import type { RecallSearchContext } from "../plugins/defaults/memory/context-search/types.js";
 
 const testDirs: string[] = [];
 

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

@@ -329,7 +329,7 @@ const indexMessageNowMock = mock(async () => ({
 }));
 const projectAssistantMessageMock = mock(() => false);
 const publishSyncInvalidationMock = mock(async () => {});
-mock.module("../memory/indexer.js", () => ({
+mock.module("../plugins/defaults/memory/indexer.js", () => ({
   indexMessageNow: indexMessageNowMock,
 }));
 mock.module("../persistence/conversation-attention-store.js", () => ({

package/src/__tests__/conversation-fork-crud.test.ts

@@ -21,16 +21,6 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-import {
-  loadGraphMemoryState,
-  saveGraphMemoryState,
-} from "../memory/graph/graph-memory-state-store.js";
-import {
-  bumpRetrospectiveLastRunAt,
-  getRetrospectiveState,
-  upsertRetrospectiveState,
-} from "../memory/memory-retrospective-state.js";
-import { hydrate as hydrateActivationState } from "../memory/v2/activation-store.js";
 import {
   getAttachmentsForMessage,
   linkAttachmentToMessage,
@@ -65,6 +55,16 @@ import {
   memoryRetrospectiveState,
   toolInvocations,
 } from "../persistence/schema/index.js";
+import {
+  loadGraphMemoryState,
+  saveGraphMemoryState,
+} from "../plugins/defaults/memory/graph/graph-memory-state-store.js";
+import {
+  bumpRetrospectiveLastRunAt,
+  getRetrospectiveState,
+  upsertRetrospectiveState,
+} from "../plugins/defaults/memory/memory-retrospective-state.js";
+import { hydrate as hydrateActivationState } from "../plugins/defaults/memory/v2/activation-store.js";
 import {
   getInjected as getV3Injected,
   markPruned as markV3Pruned,

package/src/__tests__/conversation-fork-retrospective.test.ts

@@ -19,10 +19,6 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-import {
-  loadGraphMemoryState,
-  saveGraphMemoryState,
-} from "../memory/graph/graph-memory-state-store.js";
 import {
   getAttachmentsForMessage,
   linkAttachmentToMessage,
@@ -54,6 +50,10 @@ import {
   memoryRetrospectiveState,
   toolInvocations,
 } from "../persistence/schema/index.js";
+import {
+  loadGraphMemoryState,
+  saveGraphMemoryState,
+} from "../plugins/defaults/memory/graph/graph-memory-state-store.js";
 
 await initializeDb();
 

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

@@ -75,7 +75,7 @@ let pkbSearchResults: Array<{
   hybridScore?: number;
 }> = [];
 let pkbSearchThrows: Error | null = null;
-mock.module("../memory/pkb/pkb-search.js", () => ({
+mock.module("../plugins/defaults/memory/pkb/pkb-search.js", () => ({
   searchPkbFiles: async () => {
     if (pkbSearchThrows) throw pkbSearchThrows;
     return pkbSearchResults;
@@ -132,8 +132,6 @@ import {
 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 { ConversationGraphMemory } from "../memory/graph/conversation-graph-memory.js";
-import { getPkbRoot } from "../memory/pkb/types.js";
 import {
   type SlackMessageMetadata,
   writeSlackMetadata,
@@ -144,7 +142,9 @@ import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { conversations, messages } from "../persistence/schema/index.js";
 import { registerDefaultPluginInjectors } from "../plugins/defaults/index.js";
+import { ConversationGraphMemory } from "../plugins/defaults/memory/graph/conversation-graph-memory.js";
 import postCompact from "../plugins/defaults/memory/hooks/post-compact.js";
+import { getPkbRoot } from "../plugins/defaults/memory/pkb/types.js";
 import {
   buildUnifiedTurnContextBlock,
   type UnifiedTurnContextOptions,

package/src/__tests__/conversation-surfaces-activation-emit.test.ts

@@ -35,10 +35,6 @@ const { createSurfaceMutex, handleSurfaceAction, surfaceProxyResolver } =
 
 import type { SurfaceConversationContext } from "../daemon/conversation-surfaces.js";
 import type { SurfaceType, UiSurfaceShow } from "../daemon/message-protocol.js";
-import {
-  isActivationSession,
-  markActivationSession,
-} from "../memory/activation-session-store.js";
 import { queryUnreportedOnboardingEvents } from "../onboarding/onboarding-events-store.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
@@ -46,6 +42,10 @@ import {
   activationSessions,
   onboardingEvents,
 } from "../persistence/schema/index.js";
+import {
+  isActivationSession,
+  markActivationSession,
+} from "../plugins/defaults/memory/activation-session-store.js";
 
 await initializeDb();
 

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

@@ -135,7 +135,7 @@ mock.module("../memory/query-builder.js", () => ({
   buildMemoryQuery: () => "",
 }));
 
-mock.module("../memory/retrieval-budget.js", () => ({
+mock.module("../plugins/defaults/memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
 

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

@@ -175,7 +175,7 @@ mock.module("../memory/retriever.js", () => ({
 mock.module("../memory/query-builder.js", () => ({
   buildMemoryQuery: () => "",
 }));
-mock.module("../memory/retrieval-budget.js", () => ({
+mock.module("../plugins/defaults/memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
 mock.module("../plugins/defaults/compaction/window-manager.js", () => ({

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

@@ -172,7 +172,7 @@ mock.module("../memory/retriever.js", () => ({
 mock.module("../memory/query-builder.js", () => ({
   buildMemoryQuery: () => "",
 }));
-mock.module("../memory/retrieval-budget.js", () => ({
+mock.module("../plugins/defaults/memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
 mock.module("../plugins/defaults/compaction/window-manager.js", () => ({

package/src/__tests__/conversations-import-system-filter.test.ts

@@ -24,7 +24,7 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-mock.module("../memory/indexer.js", () => ({
+mock.module("../plugins/defaults/memory/indexer.js", () => ({
   indexMessageNow: async () => {},
 }));