@vellumai/assistant 0.8.8 → 0.8.9-staging.1

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

@@ -25,20 +25,20 @@
 
 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";
-import { stripAllMemoryInjections } from "../../graph/conversation-graph-memory.js";
+} from "../../../../providers/types.js";
 import type { NeedleIndex } from "../needle.js";
 import type {
   LeafNode,
   LeafPath,
   LeafTree,
+  MemoryRoutingTurn,
   Slug,
-  TurnContext,
 } from "../types.js";
 import liveTurns from "./fixtures/live-turns.json" with { type: "json" };
 
@@ -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" ? () => ({}) : () => {}),
@@ -117,7 +117,10 @@ const contentOf = async (slug: Slug): Promise<string> => `body for ${slug}`;
 /** Needle that never hits — routing alone drives the open set in this fixture. */
 const emptyNeedle: NeedleIndex = { query: () => [] };
 
-function makeTurn(turnNumber: number, currentMessage: string): TurnContext {
+function makeTurn(
+  turnNumber: number,
+  currentMessage: string,
+): MemoryRoutingTurn {
   return {
     conversationId: "conv-xyz",
     turnNumber,

package/src/{memory/v3 → plugins/defaults/memory-v3-shadow}/__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 "../../jobs-store.js";
-import { readPage, writePage } from "../../v2/page-store.js";
-import type { ConceptPage } from "../../v2/types.js";
+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 type { AssignPageResult, AssignPagesOptions } from "../assign.js";
 import {
   type ClassifyCandidate,

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

@@ -17,14 +17,14 @@ import type {
   Message,
   Provider,
   ProviderResponse,
-} from "../../../providers/types.js";
+} from "../../../../providers/types.js";
 import type { NeedleIndex } from "../needle.js";
 import type {
   LeafNode,
   LeafPath,
   LeafTree,
+  MemoryRoutingTurn,
   Slug,
-  TurnContext,
 } from "../types.js";
 import evalTurns from "./fixtures/eval-turns.json" with { type: "json" };
 
@@ -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" ? () => ({}) : () => {}),
@@ -104,7 +104,10 @@ function fakeNeedle(hits: Slug[]): NeedleIndex {
   return { query: (_text, k) => hits.slice(0, k) };
 }
 
-function makeTurn(turnNumber: number, currentMessage: string): TurnContext {
+function makeTurn(
+  turnNumber: number,
+  currentMessage: string,
+): MemoryRoutingTurn {
   return {
     conversationId: "conv-xyz",
     turnNumber,

package/src/{memory/v3 → plugins/defaults/memory-v3-shadow}/__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 type { Provider } from "../../../providers/types.js";
-import { readPage, writePage } from "../../v2/page-store.js";
+import { readPage, writePage } from "../../../../memory/v2/page-store.js";
+import type { Provider } from "../../../../providers/types.js";
 import { type LeafRef, reconcileTree } from "../reconcile.js";
 
 /**

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

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

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

@@ -25,8 +25,13 @@ import type {
   ProviderResponse,
   SendMessageOptions,
   ToolUseContent,
-} from "../../../providers/types.js";
-import type { LeafNode, LeafPath, LeafTree, TurnContext } from "../types.js";
+} from "../../../../providers/types.js";
+import type {
+  LeafNode,
+  LeafPath,
+  LeafTree,
+  MemoryRoutingTurn,
+} from "../types.js";
 
 // ---------------------------------------------------------------------------
 // Mocks installed BEFORE the router import so the module observes them at
@@ -41,13 +46,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" ? () => ({}) : () => {}),
@@ -143,7 +148,7 @@ function makeTree(): LeafTree {
   };
 }
 
-function makeTurn(currentMessage: string): TurnContext {
+function makeTurn(currentMessage: string): MemoryRoutingTurn {
   return {
     conversationId: "conv-xyz",
     turnNumber: 1,

package/src/{memory/v3 → plugins/defaults/memory-v3-shadow}/__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 "../../migrations/268-add-memory-v3-selections.js";
-import * as schema from "../../schema.js";
+import { migrateAddMemoryV3Selections } from "../../../../memory/migrations/268-add-memory-v3-selections.js";
+import * as schema from "../../../../memory/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("../../db-connection.js")) };
+const realLoader = { ...(await import("../../../../config/loader.js")) };
+const realDb = { ...(await import("../../../../memory/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("../../db-connection.js", () => ({
+mock.module("../../../../memory/db-connection.js", () => ({
   ...realDb,
   getDb: () => (storeMockActive ? testDb : realDb.getDb()),
   getSqliteFrom: (db: unknown) =>

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

@@ -26,13 +26,13 @@ import type {
   ProviderResponse,
   SendMessageOptions,
   ToolUseContent,
-} from "../../../providers/types.js";
+} from "../../../../providers/types.js";
 import type {
   LeafNode,
   LeafPath,
   LeafTree,
+  MemoryRoutingTurn,
   Slug,
-  TurnContext,
 } from "../types.js";
 
 // ---------------------------------------------------------------------------
@@ -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" ? () => ({}) : () => {}),
@@ -155,7 +155,7 @@ function makeTree(): LeafTree {
 
 const ALICE_MEMBERS = ["alice-bio", "alice-1on1", "alice-feedback"];
 
-function makeTurn(currentMessage: string): TurnContext {
+function makeTurn(currentMessage: string): MemoryRoutingTurn {
   return {
     conversationId: "conv-xyz",
     turnNumber: 1,

package/src/{memory/v3 → plugins/defaults/memory-v3-shadow}/__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 "../../migrations/268-add-memory-v3-selections.js";
-import * as schema from "../../schema.js";
+import { migrateAddMemoryV3Selections } from "../../../../memory/migrations/268-add-memory-v3-selections.js";
+import * as schema from "../../../../memory/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,12 @@ 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("../../v2/page-store.js")) };
+const realPlatform = { ...(await import("../../../../util/platform.js")) };
+const realPageStore = {
+  ...(await import("../../../../memory/v2/page-store.js")),
+};
 const realConversationCrud = {
-  ...(await import("../../conversation-crud.js")),
+  ...(await import("../../../../memory/conversation-crud.js")),
 };
 
 let shadowMockActive = false;
@@ -95,7 +97,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 +106,7 @@ mock.module("../../../config/assistant-feature-flags.js", () => ({
         : false,
 }));
 
-mock.module("../../../config/loader.js", () => ({
+mock.module("../../../../config/loader.js", () => ({
   getConfig: () => ({
     memory: {
       v3: {
@@ -119,12 +121,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("../../conversation-crud.js", () => ({
+mock.module("../../../../memory/conversation-crud.js", () => ({
   ...realConversationCrud,
   getMessages: () => messages.map((m, i) => ({ ...m, id: `m${i}` })),
 }));
 
-mock.module("../../db-connection.js", () => ({
+mock.module("../../../../memory/db-connection.js", () => ({
   getDb: () => testDb,
   getSqliteFrom: () => testSqlite,
 }));
@@ -136,7 +138,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("../../v2/page-store.js", () => ({
+mock.module("../../../../memory/v2/page-store.js", () => ({
   ...realPageStore,
   readPage: async (workspaceDir: string, slug: string) =>
     shadowMockActive
@@ -150,7 +152,7 @@ mock.module("../../v2/page-store.js", () => ({
         ),
 }));
 
-mock.module("../../../util/platform.js", () => ({
+mock.module("../../../../util/platform.js", () => ({
   ...realPlatform,
   getWorkspaceDir: () =>
     shadowMockActive
@@ -205,12 +207,9 @@ mock.module("../orchestrate.js", () => ({
 }));
 
 // Import AFTER mocks so the plugin binds to them.
-const {
-  runShadowObservation,
-  resetShadowLanesForTests,
-  invalidateLanes,
-  memoryV3Injector,
-} = await import("../shadow-plugin.js");
+const { runShadowObservation, resetShadowLanesForTests, invalidateLanes } =
+  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/{memory/v3 → plugins/defaults/memory-v3-shadow}/__tests__/types.test.ts

@@ -5,9 +5,9 @@ import type {
   LeafNode,
   LeafPath,
   LeafTree,
+  MemoryRoutingTurn,
   SelectionSource,
   Slug,
-  TurnContext,
   WorkingSetEntry,
 } from "../types.js";
 
@@ -37,7 +37,7 @@ test("v3 core types instantiate", () => {
     lastSeenTurn: 2,
   };
 
-  const turnContext: TurnContext = {
+  const turnContext: MemoryRoutingTurn = {
     conversationId: "conv-xyz",
     turnNumber: 3,
     currentMessage: "hello",

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

@@ -18,15 +18,19 @@
  * 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";
-import { listPages, readPage, writePage } from "../v2/page-store.js";
-import type { ConceptPage } from "../v2/types.js";
+} from "../../../providers/provider-send-message.js";
+import type { Provider, ToolDefinition } from "../../../providers/types.js";
+import { getLogger } from "../../../util/logger.js";
 import type { LeafPath, LeafTree, Slug } from "./types.js";
 
 const log = getLogger("memory-v3-assign");

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

@@ -28,8 +28,11 @@
 import {
   getCliCommandCapability,
   isCliCommandSlug,
-} from "../v2/cli-command-store.js";
-import { getSkillCapability, isSkillSlug } from "../v2/skill-store.js";
+} from "../../../memory/v2/cli-command-store.js";
+import {
+  getSkillCapability,
+  isSkillSlug,
+} from "../../../memory/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. */

package/src/plugins/defaults/memory-v3-shadow/hooks/post-compact.ts

@@ -0,0 +1,14 @@
+/**
+ * No-op `post-compact` scaffolding for the memory-v3-shadow plugin.
+ *
+ * v3 re-injection after mid-turn compaction is not yet owned by this plugin —
+ * the active injector still runs through the static chain. Once the
+ * post-compaction hook API stabilizes we will import `memoryV3Injector` from
+ * `../injector.js` and re-apply it here. Until then this hook does nothing.
+ */
+
+import type { PluginHookFn } from "@vellumai/plugin-api";
+
+const postCompact: PluginHookFn = async () => {};
+
+export default postCompact;

package/src/plugins/defaults/memory-v3-shadow/hooks/user-prompt-submit.ts

@@ -0,0 +1,19 @@
+/**
+ * No-op `user-prompt-submit` scaffolding for the memory-v3-shadow plugin.
+ *
+ * The v3 injector currently runs through the static injector chain
+ * (`memory-retrieval/injector-chain.ts`), not through this hook. Once the
+ * prompt-submit hook API stabilizes we will import `memoryV3Injector` from
+ * `../injector.js` and run it here, so v3 injection is owned by the plugin's
+ * own lifecycle rather than the loop-driven chain. Until then this hook
+ * intentionally does nothing.
+ */
+
+import type {
+  PluginHookFn,
+  UserPromptSubmitContext,
+} from "@vellumai/plugin-api";
+
+const userPromptSubmit: PluginHookFn<UserPromptSubmitContext> = async () => {};
+
+export default userPromptSubmit;

package/src/plugins/defaults/memory-v3-shadow/injector.ts

@@ -0,0 +1,75 @@
+/**
+ * The memory-v3 {@link Injector}. Reads both v3 flags:
+ *   - `memory-v3-live` on → orchestrate, log, render the working-set selection
+ *     into a `<memory>` block, and return it at v2's dynamic-memory placement.
+ *   - `memory-v3-shadow` on (live off) → orchestrate + log only, return `null`.
+ *   - both off → return `null` (no orchestration).
+ *
+ * Empty selection and any failure return `null` (no v3 injection). v2
+ * suppression keys off BOTH the flag AND this return value, so a `null` here
+ * (failure or empty selection) falls back to v2 memory rather than dropping all
+ * memory.
+ *
+ * Orchestration and telemetry live in {@link observeTurn}; this module is the
+ * thin injector wrapper that renders the result for live injection.
+ */
+
+import { isAssistantFeatureFlagEnabled } from "../../../config/assistant-feature-flags.js";
+import { getConfig } from "../../../config/loader.js";
+import { getLogger } from "../../../util/logger.js";
+import {
+  type InjectionBlock,
+  type Injector,
+  type TurnContext,
+} from "../../types.js";
+import { renderV3PageContent } from "./page-content.js";
+import { renderMemoryBlock } from "./render-injection.js";
+import {
+  MEMORY_V3_LIVE,
+  MEMORY_V3_SHADOW,
+  observeTurn,
+} from "./shadow-plugin.js";
+import { MEMORY_V3_BLOCK_ID } from "./types.js";
+
+const log = getLogger("memory-v3-shadow");
+
+export const memoryV3Injector: Injector = {
+  name: "memory-v3-shadow",
+  // High order so it sorts last; the live `<memory>` block uses the
+  // after-memory-prefix placement so it lands at the memory boundary regardless
+  // of this sort key, which only orders content-producing injectors.
+  order: 1000,
+  async produce(ctx: TurnContext): Promise<InjectionBlock | null> {
+    const config = getConfig();
+    const live = isAssistantFeatureFlagEnabled(MEMORY_V3_LIVE, config);
+    const shadow = isAssistantFeatureFlagEnabled(MEMORY_V3_SHADOW, config);
+    if (!live && !shadow) return null;
+
+    const result = await observeTurn(ctx.conversationId, ctx.turnIndex);
+    if (!live || !result) return null;
+
+    try {
+      // `renderMemoryBlock` returns "" for an empty selection; inject nothing.
+      const text = await renderMemoryBlock(
+        result.finalInjection,
+        renderV3PageContent,
+      );
+      if (text.length === 0) return null;
+      return {
+        id: MEMORY_V3_BLOCK_ID,
+        text,
+        // Mirror v2's dynamic `<memory>` block placement.
+        placement: "after-memory-prefix",
+      };
+    } catch (err) {
+      log.warn(
+        {
+          err: err instanceof Error ? err.message : String(err),
+          conversationId: ctx.conversationId,
+        },
+        "memory-v3 live render failed (non-fatal) — falling back to v2",
+      );
+      return null;
+    }
+  },
+};

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

@@ -25,14 +25,21 @@
  * `assignPages`, and `invalidateLanes` without process-global module mocks.
  */
 
-import { isAssistantFeatureFlagEnabled } from "../../config/assistant-feature-flags.js";
-import type { AssistantConfig } from "../../config/types.js";
-import { getLogger } from "../../util/logger.js";
-import { getWorkspaceDir } from "../../util/platform.js";
-import { getMemoryCheckpoint, setMemoryCheckpoint } from "../checkpoints.js";
-import type { MemoryJob } from "../jobs-store.js";
-import { getPageIndex } from "../v2/page-index.js";
-import { listPages, readPage, writePage } from "../v2/page-store.js";
+import { isAssistantFeatureFlagEnabled } from "../../../config/assistant-feature-flags.js";
+import type { AssistantConfig } from "../../../config/types.js";
+import {
+  getMemoryCheckpoint,
+  setMemoryCheckpoint,
+} from "../../../memory/checkpoints.js";
+import type { MemoryJob } from "../../../memory/jobs-store.js";
+import { getPageIndex } from "../../../memory/v2/page-index.js";
+import {
+  listPages,
+  readPage,
+  writePage,
+} from "../../../memory/v2/page-store.js";
+import { getLogger } from "../../../util/logger.js";
+import { getWorkspaceDir } from "../../../util/platform.js";
 import { assignPages as realAssignPages } from "./assign.js";
 import { invalidateLanes as realInvalidateLanes } from "./shadow-plugin.js";
 import { loadLeafTree as realLoadLeafTree, resolveDataDir } from "./tree.js";

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

@@ -30,7 +30,7 @@ import { routeL1 } from "./router.js";
 import type { SelectedPage } from "./selector.js";
 import { selectAcrossLeaves } from "./selector.js";
 import { coreSlugs, leavesOf } from "./tree.js";
-import type { LeafPath, LeafTree, Slug, TurnContext } from "./types.js";
+import type { LeafPath, LeafTree, MemoryRoutingTurn, Slug } from "./types.js";
 import { WorkingSet } from "./working-set.js";
 
 /** Default number of needle hits to fold into the open set when unspecified. */
@@ -66,7 +66,7 @@ function unique<T>(items: Iterable<T>): T[] {
 }
 
 export async function orchestrate(
-  turn: TurnContext,
+  turn: MemoryRoutingTurn,
   deps: OrchestrateDeps,
 ): Promise<OrchestrateResult> {
   // Step 1: routing (LLM) and needle (sync BM25) run in parallel.

package/src/plugins/defaults/memory-v3-shadow/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "default-memory-v3-shadow",
+  "version": "1.0.0",
+  "description": "First-party default plugin housing the memory-v3 shadow/live orchestration engine and its injector.",
+  "private": true,
+  "license": "MIT",
+  "type": "module",
+  "engines": {
+    "node": ">=20.12.0"
+  },
+  "peerDependencies": {
+    "@vellumai/plugin-api": "^0.8.0"
+  }
+}

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

@@ -1,5 +1,5 @@
-import { getWorkspaceDir } from "../../util/platform.js";
-import { readPage, renderPageContent } from "../v2/page-store.js";
+import { readPage, renderPageContent } from "../../../memory/v2/page-store.js";
+import { getWorkspaceDir } from "../../../util/platform.js";
 import { renderCapabilityContent } from "./capabilities.js";
 import type { Slug } from "./types.js";
 

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

@@ -1,4 +1,4 @@
-import type { ContentBlock } from "../../providers/types.js";
+import type { ContentBlock } from "../../../providers/types.js";
 
 /**
  * Text content block carrying a `cache_control` breakpoint with a 1-hour TTL.

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

@@ -38,9 +38,13 @@ import { join, relative, sep } from "node:path";
 
 import { parse as parseYaml } from "yaml";
 
-import type { Provider } from "../../providers/types.js";
-import { getLogger } from "../../util/logger.js";
-import { listPages, readPage, writePage } from "../v2/page-store.js";
+import {
+  listPages,
+  readPage,
+  writePage,
+} from "../../../memory/v2/page-store.js";
+import type { Provider } from "../../../providers/types.js";
+import { getLogger } from "../../../util/logger.js";
 import { assignPages } from "./assign.js";
 import { loadCore } from "./core.js";
 import { invalidateLanes } from "./shadow-plugin.js";

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

@@ -1,4 +1,4 @@
-import { wrapMemoryBlock } from "../memory-marker.js";
+import { wrapMemoryBlock } from "../../../memory/memory-marker.js";
 import { Slug } from "./types.js";
 
 /**