@vellumai/assistant 0.10.3-dev.202606300731.35e9ab8 → 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.202606300731.35e9ab8",
+  "version": "0.10.3-dev.202606300917.a9da5f8",
   "license": "MIT",
   "type": "module",
   "exports": {

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;
   },

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 () => {},
 }));
 

package/src/__tests__/file-write-tool.test.ts

@@ -28,7 +28,7 @@ const enqueueCalls: Array<{
 }> = [];
 let enqueueThrows = false;
 
-mock.module("../memory/jobs/embed-pkb-file.js", () => ({
+mock.module("../plugins/defaults/memory/jobs/embed-pkb-file.js", () => ({
   enqueuePkbIndexJob: (input: {
     pkbRoot: string;
     absPath: string;
@@ -49,7 +49,7 @@ function setWorkspaceDir(dir: string): void {
   process.env.VELLUM_WORKSPACE_DIR = dir;
 }
 
-import { PKB_WORKSPACE_SCOPE } from "../memory/pkb/types.js";
+import { PKB_WORKSPACE_SCOPE } from "../plugins/defaults/memory/pkb/types.js";
 import { getTool } from "../tools/registry.js";
 import type { Tool, ToolContext } from "../tools/types.js";
 
@@ -267,7 +267,7 @@ describe("file_write artifact-HTML guard", () => {
     const html =
       "<!doctype html><html><head><title>Food Market</title></head>" +
       "<body><canvas id='c'></canvas><script>" +
-      ("const data=[{x:1,y:2}];").padEnd(4000, "/") +
+      "const data=[{x:1,y:2}];".padEnd(4000, "/") +
       "new Chart(document.getElementById('c'), {data});</script></body></html>";
 
     const result = await fileWriteTool.execute(

package/src/__tests__/get-skill-detail-audit.test.ts

@@ -165,7 +165,7 @@ mock.module("../skills/managed-store.js", () => ({
   validateManagedSkillId: () => null,
 }));
 
-mock.module("../memory/graph/capability-seed.js", () => ({
+mock.module("../plugins/defaults/memory/graph/capability-seed.js", () => ({
   deleteSkillCapabilityNode: () => {},
   seedSkillGraphNodes: () => {},
   seedUninstalledCatalogSkillMemories: async () => {},

package/src/__tests__/graph-extraction-event-date.test.ts

@@ -5,7 +5,7 @@ import {
   EVENT_DATE_PROMPT_RULES,
   parseEpochMs,
   parseExtractionResponse,
-} from "../memory/graph/extraction.js";
+} from "../plugins/defaults/memory/graph/extraction.js";
 
 // ---------------------------------------------------------------------------
 // parseEpochMs unit tests

package/src/__tests__/handlers-skills-memory-v2-reseed.test.ts

@@ -148,7 +148,7 @@ mock.module("../skills/managed-store.js", () => ({
   validateManagedSkillId: () => null,
 }));
 
-mock.module("../memory/graph/capability-seed.js", () => ({
+mock.module("../plugins/defaults/memory/graph/capability-seed.js", () => ({
   deleteSkillCapabilityNode: () => {},
 }));
 

package/src/__tests__/init-feature-flag-overrides.test.ts

@@ -7,15 +7,12 @@
  */
 import { afterEach, beforeEach, describe, expect, it } from "bun:test";
 
-import {
-  mockGatewayIpc,
-  resetMockGatewayIpc,
-} from "../__tests__/mock-gateway-ipc.js";
 import {
   clearFeatureFlagOverridesCache,
   initFeatureFlagOverrides,
   isAssistantFeatureFlagEnabled,
 } from "../config/assistant-feature-flags.js";
+import { mockGatewayIpc, resetMockGatewayIpc } from "./mock-gateway-ipc.js";
 
 beforeEach(() => {
   clearFeatureFlagOverridesCache();

package/src/__tests__/injection-block.test.ts

@@ -3,8 +3,11 @@ import { describe, expect, test } from "bun:test";
 import {
   assembleContextBlock,
   assembleInjectionBlock,
-} from "../memory/graph/injection.js";
-import type { MemoryNode, ScoredNode } from "../memory/graph/types.js";
+} from "../plugins/defaults/memory/graph/injection.js";
+import type {
+  MemoryNode,
+  ScoredNode,
+} from "../plugins/defaults/memory/graph/types.js";
 
 function makeScoredNode(
   overrides: Partial<MemoryNode> & { content: string },

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

@@ -68,7 +68,6 @@ import {
   setConversation,
 } from "../daemon/conversation-registry.js";
 import { buildPkbReminder } from "../daemon/pkb-reminder-builder.js";
-import { getPkbRoot } from "../memory/pkb/types.js";
 import {
   type SlackMessageMetadata,
   writeSlackMetadata,
@@ -76,6 +75,7 @@ import {
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { conversations, messages } from "../persistence/schema/index.js";
+import { getPkbRoot } from "../plugins/defaults/memory/pkb/types.js";
 import { buildUnifiedTurnContextBlock } from "../plugins/defaults/turn-context/unified-turn-context.js";
 import type { TurnContext } from "../plugins/types.js";
 import type { Message } from "../providers/types.js";

package/src/__tests__/injector-pkb-v2-silenced.test.ts

@@ -30,7 +30,7 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-mock.module("../memory/pkb/pkb-search.js", () => ({
+mock.module("../plugins/defaults/memory/pkb/pkb-search.js", () => ({
   searchPkbFiles: async () => [],
 }));
 
@@ -38,7 +38,7 @@ const { applyRuntimeInjections } =
   await import("../daemon/conversation-runtime-assembly.js");
 const { registerDefaultPluginInjectors } =
   await import("../plugins/defaults/index.js");
-import { getPkbRoot } from "../memory/pkb/types.js";
+import { getPkbRoot } from "../plugins/defaults/memory/pkb/types.js";
 import type { TurnContext } from "../plugins/types.js";
 import type { Message } from "../providers/types.js";
 import { getWorkspacePromptPath } from "../util/platform.js";

package/src/__tests__/injector-v3-suppression.test.ts

@@ -32,9 +32,9 @@
 
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
-import { ConversationGraphMemory } from "../memory/graph/conversation-graph-memory.js";
-import { wrapMemorySpotlightBlock } from "../memory/memory-marker.js";
-import { INJECTION_HEADER } from "../memory/v2/injection.js";
+import { ConversationGraphMemory } from "../plugins/defaults/memory/graph/conversation-graph-memory.js";
+import { wrapMemorySpotlightBlock } from "../plugins/defaults/memory/memory-marker.js";
+import { INJECTION_HEADER } from "../plugins/defaults/memory/v2/injection.js";
 import { V3_CARDS_INJECTION_HEADER } from "../plugins/defaults/memory/v3/render-injection.js";
 import { MEMORY_V3_COMMIT_META_KEY } from "../plugins/defaults/memory/v3/types.js";
 import type {

package/src/__tests__/install-skill-routing.test.ts

@@ -148,7 +148,7 @@ mock.module("../skills/managed-store.js", () => ({
   deleteManagedSkill: () => ({ deleted: true }),
   validateManagedSkillId: () => null,
 }));
-mock.module("../memory/graph/capability-seed.js", () => ({
+mock.module("../plugins/defaults/memory/graph/capability-seed.js", () => ({
   deleteSkillCapabilityNode: () => {},
   seedSkillGraphNodes: mockSeedSkillGraphNodes,
   seedUninstalledCatalogSkillMemories: async () => {},