@vellumai/assistant 0.8.7-dev.202606052232.2ddc989 → 0.8.8

package/src/heartbeat/heartbeat-service.ts

@@ -25,7 +25,6 @@ import { stripCommentLines } from "../util/strip-comment-lines.js";
 import {
   completeHeartbeatRun,
   countCompletedHeartbeatRuns,
-  countCompletedRunsToday,
   countRecentConsecutiveRuns,
   insertPendingHeartbeatRun,
   markStaleRunningAsError,
@@ -188,13 +187,6 @@ export class HeartbeatService {
     );
   }
 
-  /** Whether the daily run cap has been reached. */
-  get isDailyCapReached(): boolean {
-    const config = getConfig().heartbeat;
-    if (config.maxDailyRuns == null) return false;
-    return countCompletedRunsToday() >= config.maxDailyRuns;
-  }
-
   async runManagedWakeIfDue(
     options: ManagedWakeHeartbeatRunOptions = {},
   ): Promise<ManagedWakeHeartbeatRunResult> {
@@ -559,24 +551,6 @@ export class HeartbeatService {
       return false;
     }
 
-    // Daily run cap — stop burning tokens when the daily budget is exhausted.
-    // Force runs bypass the cap.
-    if (
-      !force &&
-      config.maxDailyRuns != null &&
-      countCompletedRunsToday() >= config.maxDailyRuns
-    ) {
-      log.debug(
-        { maxDailyRuns: config.maxDailyRuns },
-        "Daily run cap reached, skipping",
-      );
-      if (runId) skipHeartbeatRun(runId, "max_daily_runs");
-      if (!this.cronMode) {
-        this.scheduleNextRun(config.intervalMs);
-      }
-      return false;
-    }
-
     // Overlap prevention
     if (this.activeRun) {
       log.debug("Previous heartbeat run still active, skipping");

package/src/ipc/__tests__/browser-ipc.test.ts

@@ -55,7 +55,7 @@ mock.module("../../browser/operations.js", () => ({
   },
 }));
 
-mock.module("../../daemon/conversation-registry.js", () => ({
+mock.module("../../daemon/conversation-store.js", () => ({
   findConversation: (conversationId: string) => {
     mockFindConversationCalls.push(conversationId);
     return mockConversation ?? undefined;

package/src/ipc/__tests__/ui-request-route.test.ts

@@ -32,9 +32,9 @@ let mockSurfaceResult: InteractiveUiResult = {
 let mockSurfaceThrows: Error | null = null;
 
 // Re-export the real module and override only findConversation.
-const realRegistry = await import("../../daemon/conversation-registry.js");
-mock.module("../../daemon/conversation-registry.js", () => ({
-  ...realRegistry,
+const realStore = await import("../../daemon/conversation-store.js");
+mock.module("../../daemon/conversation-store.js", () => ({
+  ...realStore,
   findConversation: (_conversationId: string) => mockConversation ?? undefined,
 }));
 

package/src/ipc/skill-routes/__tests__/memory.test.ts

@@ -137,21 +137,6 @@ describe("host.memory.addMessage", () => {
       }),
     ).rejects.toThrow();
   });
-
-  test("rejects the non-renderable system role", async () => {
-    // GIVEN the messages store is UI-facing (ConversationMessage), so only
-    // renderable turns may be persisted via this facet
-    // WHEN a skill attempts to add a system row
-    // THEN the route rejects it instead of persisting agent-context scaffolding
-    await expect(
-      memoryAddMessageRoute.handler({
-        conversationId: "c",
-        role: "system",
-        content: "agent-context scaffolding",
-      }),
-    ).rejects.toThrow();
-    expect(addMessageSpy).not.toHaveBeenCalled();
-  });
 });
 
 describe("host.memory.wakeAgentForOpportunity", () => {

package/src/ipc/skill-routes/memory.ts

@@ -17,9 +17,7 @@ import type { SkillIpcRoute } from "../skill-ipc-types.js";
 
 /**
  * IPC params for `addMessage()`. `role` is constrained to the
- * renderable conversation roles (`user`/`assistant`): the messages store
- * is UI-facing (`ConversationMessage`), so agent-context `system` rows are
- * not accepted here. `metadata` is a free-form record (validated
+ * `MessageRole` union. `metadata` is a free-form record (validated
  * downstream by `messageMetadataSchema` with a warn-and-store fallback).
  * `skipIndexing` and `clientMessageId` mirror `AddMessageOptions`.
  *
@@ -30,7 +28,7 @@ import type { SkillIpcRoute } from "../skill-ipc-types.js";
  */
 const MemoryAddMessageParams = z.object({
   conversationId: z.string().min(1),
-  role: z.enum(["user", "assistant"]),
+  role: z.enum(["user", "assistant", "system"]),
   content: z.string(),
   metadata: z.record(z.string(), z.unknown()).optional(),
   skipIndexing: z.boolean().optional(),

package/src/memory/conversation-starter-checkpoints.ts

@@ -15,7 +15,6 @@ import { memoryCheckpoints } from "./schema.js";
 export const CK_ITEM_COUNT = "conversation_starters:item_count_at_last_gen";
 export const CK_BATCH = "conversation_starters:generation_batch";
 export const CK_LAST_GEN_AT = "conversation_starters:last_gen_at";
-export const CK_LAST_ATTEMPT_AT = "conversation_starters:last_attempt_at";
 
 export function checkpointKey(base: string, scopeId: string): string {
   return `${base}:${scopeId}`;

package/src/memory/db-init.ts

@@ -41,7 +41,6 @@ import {
   migrate230AcpSessionHistory,
   migrate231RepairMemoryGraphEventDates,
   migrateA2ATasks,
-  migrateAcpSessionHistoryCwd,
   migrateActivationState,
   migrateActivationStateFkCascade,
   migrateAddConversationInferenceProfile,
@@ -479,7 +478,6 @@ export function initializeDb(): void {
     migrateScheduleSourceConversation,
     migrateMessagesRoleCreatedAtIndex,
     createAuthFallbackEventsTable,
-    migrateAcpSessionHistoryCwd,
   ];
 
   // Run each migration step, catching and logging individual failures so one

package/src/memory/job-handlers/conversation-starters.ts

@@ -22,7 +22,6 @@ import {
   checkpointKey,
   CK_BATCH,
   CK_ITEM_COUNT,
-  CK_LAST_ATTEMPT_AT,
   CK_LAST_GEN_AT,
   countActiveMemoryNodes,
   getCheckpointValue,
@@ -337,7 +336,6 @@ Bad → Good (incomplete phrase → complete):
         config: {
           callSite: "conversationStarters" as const,
           max_tokens: 2048,
-          temperature: 0.7,
           tool_choice: {
             type: "tool" as const,
             name: "store_conversation_starters",
@@ -397,27 +395,18 @@ export async function generateConversationStartersJob(
   const db = getDb();
   const now = Date.now();
 
-  // Record attempt time so the route handler's cooldown prevents rapid retries
-  // even when generation produces 0 valid starters.
-  upsertCheckpoint(
-    checkpointKey(CK_LAST_ATTEMPT_AT, scopeId),
-    String(now),
-    now,
-  );
-
   const starters = await generateStarters(scopeId);
   if (starters.length === 0) {
     log.info({ scopeId }, "No conversation starters generated");
 
-    // Sync the item count checkpoint so `checkpointAhead` clears, but do NOT
-    // update `CK_LAST_GEN_AT` — the stale TTL should trigger a retry on the
-    // next GET rather than blocking retries for the full TTL window.
+    // Sync checkpoints so both `staleByAge` and `checkpointAhead` clear.
     const totalActive = countActiveMemoryNodes(scopeId);
     upsertCheckpoint(
       checkpointKey(CK_ITEM_COUNT, scopeId),
       String(totalActive),
       now,
     );
+    upsertCheckpoint(checkpointKey(CK_LAST_GEN_AT, scopeId), String(now), now);
     return;
   }
 

package/src/memory/jobs-worker.ts

@@ -8,7 +8,6 @@ import {
   diskPressureBackgroundSkipLogFields,
   shouldLogDiskPressureBackgroundSkip,
 } from "../daemon/disk-pressure-background-gate.js";
-import { maintainJob as memoryV3MaintainJob } from "../plugins/defaults/memory-v3-shadow/maintain-job.js";
 import { getLogger } from "../util/logger.js";
 import { getWorkspaceDir } from "../util/platform.js";
 import { getMemoryCheckpoint, setMemoryCheckpoint } from "./checkpoints.js";
@@ -88,6 +87,7 @@ import {
   memoryV2ConsolidateJob,
 } from "./v2/consolidation-job.js";
 import { memoryV2SweepJob } from "./v2/sweep-job.js";
+import { maintainJob as memoryV3MaintainJob } from "./v3/maintain-job.js";
 
 const log = getLogger("memory-jobs-worker");
 

package/src/memory/migrations/index.ts

@@ -259,7 +259,6 @@ export { migrateScheduleScriptTimeout } from "./269-schedule-script-timeout.js";
 export { migrateMessagesRoleCreatedAtIndex } from "./270-messages-role-created-at-index.js";
 export { migrateScheduleSourceConversation } from "./270-schedule-source-conversation.js";
 export { createAuthFallbackEventsTable } from "./271-create-auth-fallback-events.js";
-export { migrateAcpSessionHistoryCwd } from "./272-acp-session-history-cwd.js";
 export {
   MIGRATION_REGISTRY,
   type MigrationRegistryEntry,

package/src/memory/schema/acp.ts

@@ -20,10 +20,6 @@ export const acpSessionHistory = sqliteTable(
     stopReason: text("stop_reason"),
     error: text("error"),
     eventLogJson: text("event_log_json").notNull().default("[]"),
-    // Working directory the agent process was spawned with. Required to
-    // resume a persisted session; null for rows written before migration
-    // 272 (those sessions are not resumable).
-    cwd: text("cwd"),
   },
   (table) => [
     index("idx_acp_session_history_started_at").on(table.startedAt),

package/src/memory/v2/__tests__/consolidation-job.test.ts

@@ -121,7 +121,7 @@ mock.module("../../../config/assistant-feature-flags.js", () => ({
 
 let renderedHealth = "";
 let computeThrows = false;
-mock.module("../../../plugins/defaults/memory-v3-shadow/health.js", () => ({
+mock.module("../../v3/health.js", () => ({
   computeV3Health: () => {
     if (computeThrows) throw new Error("simulated health compute failure");
     return {};
@@ -129,12 +129,12 @@ mock.module("../../../plugins/defaults/memory-v3-shadow/health.js", () => ({
   renderV3Health: () => renderedHealth,
 }));
 
-mock.module("../../../plugins/defaults/memory-v3-shadow/tree.js", () => ({
+mock.module("../../v3/tree.js", () => ({
   loadLeafTree: async () => ({ leaves: new Map(), byPage: new Map() }),
   resolveDataDir: () => "/tmp/v3-data-stub",
 }));
 
-mock.module("../../../plugins/defaults/memory-v3-shadow/core.js", () => ({
+mock.module("../../v3/core.js", () => ({
   loadCore: async () => new Set<string>(),
 }));
 

package/src/memory/v2/consolidation-job.ts

@@ -63,19 +63,6 @@ import { dirname, join } from "node:path";
 
 import { isAssistantFeatureFlagEnabled } from "../../config/assistant-feature-flags.js";
 import type { AssistantConfig } from "../../config/types.js";
-import { loadCore } from "../../plugins/defaults/memory-v3-shadow/core.js";
-import {
-  computeV3Health,
-  renderV3Health,
-} from "../../plugins/defaults/memory-v3-shadow/health.js";
-import {
-  loadLeafTree,
-  resolveDataDir,
-} from "../../plugins/defaults/memory-v3-shadow/tree.js";
-import type {
-  LeafPath,
-  Slug,
-} from "../../plugins/defaults/memory-v3-shadow/types.js";
 import { runBackgroundJob } from "../../runtime/background-job-runner.js";
 import { getLogger } from "../../util/logger.js";
 import { getWorkspaceDir } from "../../util/platform.js";
@@ -87,6 +74,10 @@ import {
   type MemoryJobType,
 } from "../jobs-store.js";
 import { getPageIndex } from "../v2/page-index.js";
+import { loadCore } from "../v3/core.js";
+import { computeV3Health, renderV3Health } from "../v3/health.js";
+import { loadLeafTree, resolveDataDir } from "../v3/tree.js";
+import type { LeafPath, Slug } from "../v3/types.js";
 import { MEMORY_V2_CONSOLIDATION_SOURCE } from "./constants.js";
 import { resolveConsolidationPrompt } from "./prompts/consolidation.js";
 

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/assign.test.ts

@@ -8,15 +8,15 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
-import { readPage, writePage } from "../../../../memory/v2/page-store.js";
-import type { ConceptPageFrontmatter } from "../../../../memory/v2/types.js";
 import type {
   Message,
   Provider,
   ProviderResponse,
   SendMessageOptions,
   ToolUseContent,
-} from "../../../../providers/types.js";
+} from "../../../providers/types.js";
+import { readPage, writePage } from "../../v2/page-store.js";
+import type { ConceptPageFrontmatter } from "../../v2/types.js";
 import type { LeafNode, LeafTree } from "../types.js";
 
 // Stub the provider layer before importing `assign.js` so its static import
@@ -24,7 +24,7 @@ import type { LeafNode, LeafTree } from "../types.js";
 // aren't built in a fresh worktree) never loads. The classifier is
 // provider-injectable, so every test passes its own stub provider — the real
 // `getConfiguredProvider` is never exercised here.
-mock.module("../../../../providers/provider-send-message.js", () => ({
+mock.module("../../../providers/provider-send-message.js", () => ({
   getConfiguredProvider: async () => null,
   extractToolUse: (response: ProviderResponse) =>
     response.content.find((b): b is ToolUseContent => b.type === "tool_use"),

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/live-integration.test.ts

@@ -25,13 +25,13 @@
 
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-import { stripAllMemoryInjections } from "../../../../memory/graph/conversation-graph-memory.js";
 import type {
   ContentBlock,
   Message,
   Provider,
   ProviderResponse,
-} from "../../../../providers/types.js";
+} from "../../../providers/types.js";
+import { stripAllMemoryInjections } from "../../graph/conversation-graph-memory.js";
 import type { NeedleIndex } from "../needle.js";
 import type {
   LeafNode,
@@ -49,13 +49,13 @@ import liveTurns from "./fixtures/live-turns.json" with { type: "json" };
 
 let providerStub: Provider | null = null;
 
-mock.module("../../../../providers/provider-send-message.js", () => ({
+mock.module("../../../providers/provider-send-message.js", () => ({
   getConfiguredProvider: async () => providerStub,
   extractToolUse: (response: ProviderResponse) =>
     response.content.find((b) => b.type === "tool_use"),
 }));
 
-mock.module("../../../../util/logger.js", () => ({
+mock.module("../../../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
       get: (_t, prop) => (prop === "child" ? () => ({}) : () => {}),

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/maintain-job.test.ts

@@ -3,11 +3,11 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { setOverridesForTesting } from "../../../../__tests__/feature-flag-test-helpers.js";
-import type { AssistantConfig } from "../../../../config/types.js";
-import type { MemoryJob } from "../../../../memory/jobs-store.js";
-import { readPage, writePage } from "../../../../memory/v2/page-store.js";
-import type { ConceptPage } from "../../../../memory/v2/types.js";
+import { setOverridesForTesting } from "../../../__tests__/feature-flag-test-helpers.js";
+import type { AssistantConfig } from "../../../config/types.js";
+import type { MemoryJob } from "../../jobs-store.js";
+import { readPage, writePage } from "../../v2/page-store.js";
+import type { ConceptPage } from "../../v2/types.js";
 import type { AssignPageResult, AssignPagesOptions } from "../assign.js";
 import {
   type ClassifyCandidate,

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/orchestrate.test.ts

@@ -17,7 +17,7 @@ import type {
   Message,
   Provider,
   ProviderResponse,
-} from "../../../../providers/types.js";
+} from "../../../providers/types.js";
 import type { NeedleIndex } from "../needle.js";
 import type {
   LeafNode,
@@ -35,13 +35,13 @@ import evalTurns from "./fixtures/eval-turns.json" with { type: "json" };
 
 let providerStub: Provider | null = null;
 
-mock.module("../../../../providers/provider-send-message.js", () => ({
+mock.module("../../../providers/provider-send-message.js", () => ({
   getConfiguredProvider: async () => providerStub,
   extractToolUse: (response: ProviderResponse) =>
     response.content.find((b) => b.type === "tool_use"),
 }));
 
-mock.module("../../../../util/logger.js", () => ({
+mock.module("../../../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
       get: (_t, prop) => (prop === "child" ? () => ({}) : () => {}),

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/reconcile.test.ts

@@ -3,8 +3,8 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { readPage, writePage } from "../../../../memory/v2/page-store.js";
-import type { Provider } from "../../../../providers/types.js";
+import type { Provider } from "../../../providers/types.js";
+import { readPage, writePage } from "../../v2/page-store.js";
 import { type LeafRef, reconcileTree } from "../reconcile.js";
 
 /**

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/render-injection.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { wrapMemoryBlock } from "../../../../memory/memory-marker.js";
+import { wrapMemoryBlock } from "../../memory-marker.js";
 import { renderMemoryBlock } from "../render-injection.js";
 import { Slug } from "../types.js";
 

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/router.test.ts

@@ -25,7 +25,7 @@ import type {
   ProviderResponse,
   SendMessageOptions,
   ToolUseContent,
-} from "../../../../providers/types.js";
+} from "../../../providers/types.js";
 import type { LeafNode, LeafPath, LeafTree, TurnContext } from "../types.js";
 
 // ---------------------------------------------------------------------------
@@ -41,13 +41,13 @@ interface ProviderCall {
 }
 const providerCalls: ProviderCall[] = [];
 
-mock.module("../../../../providers/provider-send-message.js", () => ({
+mock.module("../../../providers/provider-send-message.js", () => ({
   getConfiguredProvider: async () => providerStub,
   extractToolUse: (response: ProviderResponse) =>
     response.content.find((b): b is ToolUseContent => b.type === "tool_use"),
 }));
 
-mock.module("../../../../util/logger.js", () => ({
+mock.module("../../../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
       get: (_t, prop) => (prop === "child" ? () => ({}) : () => {}),

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/selection-log-store.test.ts

@@ -20,14 +20,14 @@ import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import { drizzle } from "drizzle-orm/bun-sqlite";
 
-import { migrateAddMemoryV3Selections } from "../../../../memory/migrations/268-add-memory-v3-selections.js";
-import * as schema from "../../../../memory/schema.js";
+import { migrateAddMemoryV3Selections } from "../../migrations/268-add-memory-v3-selections.js";
+import * as schema from "../../schema.js";
 
 const realFlags = {
-  ...(await import("../../../../config/assistant-feature-flags.js")),
+  ...(await import("../../../config/assistant-feature-flags.js")),
 };
-const realLoader = { ...(await import("../../../../config/loader.js")) };
-const realDb = { ...(await import("../../../../memory/db-connection.js")) };
+const realLoader = { ...(await import("../../../config/loader.js")) };
+const realDb = { ...(await import("../../db-connection.js")) };
 const realPageContent = { ...(await import("../page-content.js")) };
 
 let storeMockActive = false;
@@ -64,7 +64,7 @@ function seed(
   }
 }
 
-mock.module("../../../../config/assistant-feature-flags.js", () => ({
+mock.module("../../../config/assistant-feature-flags.js", () => ({
   ...realFlags,
   isAssistantFeatureFlagEnabled: (key: string, config: unknown) =>
     storeMockActive
@@ -81,12 +81,12 @@ mock.module("../../../../config/assistant-feature-flags.js", () => ({
         ),
 }));
 
-mock.module("../../../../config/loader.js", () => ({
+mock.module("../../../config/loader.js", () => ({
   ...realLoader,
   getConfig: () => (storeMockActive ? {} : realLoader.getConfig()),
 }));
 
-mock.module("../../../../memory/db-connection.js", () => ({
+mock.module("../../db-connection.js", () => ({
   ...realDb,
   getDb: () => (storeMockActive ? testDb : realDb.getDb()),
   getSqliteFrom: (db: unknown) =>

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/selector.test.ts

@@ -26,7 +26,7 @@ import type {
   ProviderResponse,
   SendMessageOptions,
   ToolUseContent,
-} from "../../../../providers/types.js";
+} from "../../../providers/types.js";
 import type {
   LeafNode,
   LeafPath,
@@ -48,13 +48,13 @@ interface ProviderCall {
 }
 const providerCalls: ProviderCall[] = [];
 
-mock.module("../../../../providers/provider-send-message.js", () => ({
+mock.module("../../../providers/provider-send-message.js", () => ({
   getConfiguredProvider: async () => providerStub,
   extractToolUse: (response: ProviderResponse) =>
     response.content.find((b): b is ToolUseContent => b.type === "tool_use"),
 }));
 
-mock.module("../../../../util/logger.js", () => ({
+mock.module("../../../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
       get: (_t, prop) => (prop === "child" ? () => ({}) : () => {}),

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/shadow-plugin.test.ts

@@ -22,8 +22,8 @@ import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import { drizzle } from "drizzle-orm/bun-sqlite";
 
-import { migrateAddMemoryV3Selections } from "../../../../memory/migrations/268-add-memory-v3-selections.js";
-import * as schema from "../../../../memory/schema.js";
+import { migrateAddMemoryV3Selections } from "../../migrations/268-add-memory-v3-selections.js";
+import * as schema from "../../schema.js";
 import type { LeafTree, SelectionSource } from "../types.js";
 
 // `mock.module` is process-global and, in Bun, neither `mock.restore()` nor a
@@ -41,10 +41,10 @@ const realTree = { ...(await import("../tree.js")) };
 const realCore = { ...(await import("../core.js")) };
 const realNeedle = { ...(await import("../needle.js")) };
 const realOrchestrate = { ...(await import("../orchestrate.js")) };
-const realPlatform = { ...(await import("../../../../util/platform.js")) };
-const realPageStore = { ...(await import("../../../../memory/v2/page-store.js")) };
+const realPlatform = { ...(await import("../../../util/platform.js")) };
+const realPageStore = { ...(await import("../../v2/page-store.js")) };
 const realConversationCrud = {
-  ...(await import("../../../../memory/conversation-crud.js")),
+  ...(await import("../../conversation-crud.js")),
 };
 
 let shadowMockActive = false;
@@ -95,7 +95,7 @@ const FAKE_TREE = {
 
 // ─── module mocks (installed before the plugin import) ──────────────────────
 
-mock.module("../../../../config/assistant-feature-flags.js", () => ({
+mock.module("../../../config/assistant-feature-flags.js", () => ({
   isAssistantFeatureFlagEnabled: (key: string) =>
     key === "memory-v3-live"
       ? liveEnabled
@@ -104,7 +104,7 @@ mock.module("../../../../config/assistant-feature-flags.js", () => ({
         : false,
 }));
 
-mock.module("../../../../config/loader.js", () => ({
+mock.module("../../../config/loader.js", () => ({
   getConfig: () => ({
     memory: {
       v3: {
@@ -119,12 +119,12 @@ mock.module("../../../../config/loader.js", () => ({
 // (e.g. `getMessageById` via page-content.ts) stays present — replacing the
 // whole module with a bare `{ getMessages }` made those consumers fail to load.
 // Only `getMessages` is overridden, since that's the one the plugin reads.
-mock.module("../../../../memory/conversation-crud.js", () => ({
+mock.module("../../conversation-crud.js", () => ({
   ...realConversationCrud,
   getMessages: () => messages.map((m, i) => ({ ...m, id: `m${i}` })),
 }));
 
-mock.module("../../../../memory/db-connection.js", () => ({
+mock.module("../../db-connection.js", () => ({
   getDb: () => testDb,
   getSqliteFrom: () => testSqlite,
 }));
@@ -136,7 +136,7 @@ mock.module("../v2/page-index.js", () => ({
 // `pageContent` (live mode) reads the full page via `readPage`/`renderPageContent`.
 // Stub them to return a deterministic body per slug so the rendered `<memory>`
 // block is assertable without touching the filesystem.
-mock.module("../../../../memory/v2/page-store.js", () => ({
+mock.module("../../v2/page-store.js", () => ({
   ...realPageStore,
   readPage: async (workspaceDir: string, slug: string) =>
     shadowMockActive
@@ -150,7 +150,7 @@ mock.module("../../../../memory/v2/page-store.js", () => ({
         ),
 }));
 
-mock.module("../../../../util/platform.js", () => ({
+mock.module("../../../util/platform.js", () => ({
   ...realPlatform,
   getWorkspaceDir: () =>
     shadowMockActive
@@ -209,8 +209,8 @@ const {
   runShadowObservation,
   resetShadowLanesForTests,
   invalidateLanes,
+  memoryV3Injector,
 } = await import("../shadow-plugin.js");
-const { memoryV3Injector } = await import("../injector.js");
 
 // The module stubs above stay installed for the rest of the process (Bun can't
 // reliably uninstall them), but `shadowMockActive` gates their fake behavior to

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/assign.ts

@@ -18,15 +18,15 @@
  * omitted, resolves the `memoryV3RouteL1` callsite provider.
  */
 
-import { listPages, readPage, writePage } from "../../../memory/v2/page-store.js";
-import type { ConceptPage } from "../../../memory/v2/types.js";
 import {
   extractToolUse,
   getConfiguredProvider,
   userMessage,
-} from "../../../providers/provider-send-message.js";
-import type { Provider, ToolDefinition } from "../../../providers/types.js";
-import { getLogger } from "../../../util/logger.js";
+} from "../../providers/provider-send-message.js";
+import type { Provider, ToolDefinition } from "../../providers/types.js";
+import { getLogger } from "../../util/logger.js";
+import { listPages, readPage, writePage } from "../v2/page-store.js";
+import type { ConceptPage } from "../v2/types.js";
 import type { LeafPath, LeafTree, Slug } from "./types.js";
 
 const log = getLogger("memory-v3-assign");

package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/capabilities.ts

@@ -28,8 +28,8 @@
 import {
   getCliCommandCapability,
   isCliCommandSlug,
-} from "../../../memory/v2/cli-command-store.js";
-import { getSkillCapability, isSkillSlug } from "../../../memory/v2/skill-store.js";
+} from "../v2/cli-command-store.js";
+import { getSkillCapability, isSkillSlug } from "../v2/skill-store.js";
 import type { LeafNode, LeafPath, LeafTree, Slug } from "./types.js";
 
 /** Path of the always-on synthetic leaf that owns skill + CLI capability rows. */