@vellumai/assistant 0.10.12 → 0.11.0-staging.2

package/src/plugins/defaults/memory/v2/__tests__/backfill-jobs.test.ts

@@ -1,5 +1,5 @@
 /**
- * Tests for `assistant/src/memory/v2/backfill-jobs.ts`.
+ * Tests for `assistant/src/plugins/defaults/memory/v2/backfill-jobs.ts`.
  *
  * Each handler is exercised with the heavy collaborators (migration runner,
  * embedding backend, Qdrant client, activation pipeline) mocked at the
@@ -8,7 +8,6 @@
  * Coverage matrix:
  *   - migrate: wraps `runMemoryV2Migration`; force flag propagates;
  *     `MigrationAlreadyAppliedError` is swallowed (no rethrow).
- *   - reembed: enqueues `N` jobs, one per concept-page slug.
  *   - activation-recompute: walks conversations with rows, runs the pipeline
  *     end-to-end against the real activation module, persists fresh state.
  *
@@ -193,22 +192,18 @@ afterAll(() => {
   rmSync(tmpWorkspace, { recursive: true, force: true });
 });
 
-const { getDb, getMemoryDb, getMemorySqlite } =
+const { getDb, getMemorySqlite } =
   await import("../../../../../persistence/db-connection.js");
 const { resetDbForTesting } =
   await import("../../../../../__tests__/db-test-helpers.js");
 const { initializeDb } = await import("../../../../../persistence/db-init.js");
 const { rawExec } = await import("../../../../../persistence/raw-query.js");
-const { conversations, memoryJobs, messages } =
+const { conversations, messages } =
   await import("../../../../../persistence/schema/index.js");
-const { writePage } = await import("../../v3/substrate/page-store.js");
 const { save: saveActivation, hydrate: hydrateActivation } =
   await import("../activation-store.js");
-const {
-  memoryV2ActivationRecomputeJob,
-  memoryV2MigrateJob,
-  memoryV2ReembedJob,
-} = await import("../backfill-jobs.js");
+const { memoryV2ActivationRecomputeJob, memoryV2MigrateJob } =
+  await import("../backfill-jobs.js");
 
 // `isAssistantFeatureFlagEnabled` ignores its `config` argument (resolution is
 // purely from the overrides + registry caches), and the activation pipeline
@@ -220,10 +215,7 @@ const TEST_CONFIG = { memory: SEEDED_MEMORY_CONFIG } as Parameters<
 >[1];
 
 function makeJob(
-  type:
-    | "memory_v2_migrate"
-    | "memory_v2_reembed"
-    | "memory_v2_activation_recompute",
+  type: "memory_v2_migrate" | "memory_v2_activation_recompute",
   payload: Record<string, unknown> = {},
 ) {
   return {
@@ -271,7 +263,9 @@ beforeEach(async () => {
     "buffer.md",
   ]) {
     const filePath = join(tmpWorkspace, "memory", filename);
-    if (existsSync(filePath)) rmSync(filePath);
+    if (existsSync(filePath)) {
+      rmSync(filePath);
+    }
   }
 
   migrationCalls.length = 0;
@@ -315,122 +309,6 @@ describe("memoryV2MigrateJob", () => {
   });
 });
 
-// ---------------------------------------------------------------------------
-// memoryV2ReembedJob
-// ---------------------------------------------------------------------------
-
-describe("memoryV2ReembedJob", () => {
-  test("returns N (one per concept page) and writes that many job rows", async () => {
-    await writePage(tmpWorkspace, {
-      slug: "alice",
-      frontmatter: { edges: [], ref_files: [], ref_urls: [] },
-      body: "Alice.\n",
-    });
-    await writePage(tmpWorkspace, {
-      slug: "bob",
-      frontmatter: { edges: [], ref_files: [], ref_urls: [] },
-      body: "Bob.\n",
-    });
-
-    const total = await memoryV2ReembedJob(
-      makeJob("memory_v2_reembed"),
-      TEST_CONFIG,
-    );
-
-    // Return value covers the contract: one job per concept page.
-    expect(total).toBe(2);
-
-    // Verify the slugs that were enqueued by reading the memory_jobs table.
-    // Tests that mock `jobs-store.js` skip inserting rows; when this suite
-    // runs in isolation (or before such tests) the rows do land. Either
-    // way, the return value is the canonical contract — the row lookup is
-    // belt-and-suspenders.
-    const rows = getMemoryDb()!.select().from(memoryJobs).all();
-    if (rows.length > 0) {
-      expect(rows).toHaveLength(2);
-      const slugs = rows.map((row) => JSON.parse(row.payload).slug);
-      expect(slugs).toContain("alice");
-      expect(slugs).toContain("bob");
-      for (const row of rows) {
-        expect(row.type).toBe("embed_concept_page");
-      }
-    }
-  });
-
-  test("with no concept pages on disk, enqueues nothing", async () => {
-    const total = await memoryV2ReembedJob(
-      makeJob("memory_v2_reembed"),
-      TEST_CONFIG,
-    );
-    expect(total).toBe(0);
-  });
-
-  test("running the fan-out twice coalesces to one pending job per page", async () => {
-    // Stacked reembed runs (e.g. several consolidations completing before the
-    // embed lane drains) must not multiply the queue: the per-slug coalesce in
-    // the enqueue helper reuses the pending row.
-    await writePage(tmpWorkspace, {
-      slug: "alice",
-      frontmatter: { edges: [], ref_files: [], ref_urls: [] },
-      body: "Alice.\n",
-    });
-    await writePage(tmpWorkspace, {
-      slug: "bob",
-      frontmatter: { edges: [], ref_files: [], ref_urls: [] },
-      body: "Bob.\n",
-    });
-
-    const first = await memoryV2ReembedJob(
-      makeJob("memory_v2_reembed"),
-      TEST_CONFIG,
-    );
-    const second = await memoryV2ReembedJob(
-      makeJob("memory_v2_reembed"),
-      TEST_CONFIG,
-    );
-
-    // Both passes fan out over every page…
-    expect(first).toBe(2);
-    expect(second).toBe(2);
-
-    // …but the queue holds one pending row per slug, not one per pass.
-    const rows = getMemoryDb()!.select().from(memoryJobs).all();
-    if (rows.length > 0) {
-      expect(rows).toHaveLength(2);
-      const slugs = rows.map((row) => JSON.parse(row.payload).slug).sort();
-      expect(slugs).toEqual(["alice", "bob"]);
-    }
-  });
-
-  test("does NOT enqueue reserved meta-file slugs", async () => {
-    // The four prose meta files (essentials/threads/recent/buffer) live at
-    // `memory/<name>.md` and are direct-injected into the system prompt via
-    // `_autoinject.md`. Their underscore-bracketed slug aliases (e.g.
-    // `__essentials__`) fail the concept-page slug validator
-    // (`[a-z0-9][a-z0-9-]*`), so the reembed fan-out must not enqueue them.
-    await writePage(tmpWorkspace, {
-      slug: "alice",
-      frontmatter: { edges: [], ref_files: [], ref_urls: [] },
-      body: "Alice.\n",
-    });
-
-    await memoryV2ReembedJob(makeJob("memory_v2_reembed"), TEST_CONFIG);
-
-    const rows = getMemoryDb()!.select().from(memoryJobs).all();
-    if (rows.length > 0) {
-      const slugs = rows.map((row) => JSON.parse(row.payload).slug);
-      for (const reserved of [
-        "__essentials__",
-        "__threads__",
-        "__recent__",
-        "__buffer__",
-      ]) {
-        expect(slugs).not.toContain(reserved);
-      }
-    }
-  });
-});
-
 // ---------------------------------------------------------------------------
 // memoryV2ActivationRecomputeJob
 // ---------------------------------------------------------------------------

package/src/plugins/defaults/memory/v2/__tests__/harness-compare.test.ts

@@ -10,7 +10,7 @@ import {
   conversations,
   messages,
 } from "../../../../../persistence/schema/index.js";
-import type { MemoryV2ConceptRowRecord } from "../../memory-v2-activation-log-store.js";
+import type { MemoryV2ConceptRowRecord } from "../activation-log-store.js";
 import { runComparisonOverHistory } from "../harness/compare.js";
 import type { RetrievalOutput, Retriever } from "../harness/retriever.js";
 

package/src/plugins/defaults/memory/v2/__tests__/harness-oracle.test.ts

@@ -9,7 +9,7 @@ import {
   conversations,
   messages,
 } from "../../../../../persistence/schema/index.js";
-import type { MemoryV2ConceptRowRecord } from "../../memory-v2-activation-log-store.js";
+import type { MemoryV2ConceptRowRecord } from "../activation-log-store.js";
 import { extractOracleTurns } from "../harness/oracle.js";
 
 await initializeDb();

package/src/plugins/defaults/memory/v2/__tests__/harness-replay-input.test.ts

@@ -10,7 +10,7 @@ import {
   conversations,
   messages,
 } from "../../../../../persistence/schema/index.js";
-import type { MemoryV2ConceptRowRecord } from "../../memory-v2-activation-log-store.js";
+import type { MemoryV2ConceptRowRecord } from "../activation-log-store.js";
 import type { OracleTurn } from "../harness/oracle.js";
 import { reconstructInput } from "../harness/replay-input.js";
 

package/src/plugins/defaults/memory/v2/__tests__/injection.test.ts

@@ -131,7 +131,7 @@ const skillState = {
   entries: new Map<string, SkillEntry>(),
 };
 
-mock.module("../../v3/substrate/skill-store.js", () => ({
+mock.module("../../substrate/skill-store.js", () => ({
   getSkillCapability: (idOrSlug: string) => {
     const id = idOrSlug.startsWith("skills/")
       ? idOrSlug.slice("skills/".length)
@@ -167,7 +167,7 @@ const cliCommandState = {
   entries: new Map<string, CliCommandEntryStub>(),
 };
 
-mock.module("../../v3/substrate/cli-command-store.js", () => ({
+mock.module("../../substrate/cli-command-store.js", () => ({
   getCliCommandCapability: (idOrSlug: string) => {
     const id = idOrSlug.startsWith("cli-commands/")
       ? idOrSlug.slice("cli-commands/".length)
@@ -195,7 +195,7 @@ const telemetryState = {
   recordShouldThrow: false,
 };
 
-mock.module("../../memory-v2-activation-log-store.js", () => ({
+mock.module("../activation-log-store.js", () => ({
   recordMemoryV2ActivationLog: (params: Record<string, unknown>) => {
     if (telemetryState.recordShouldThrow) {
       throw new Error("simulated telemetry write failure");
@@ -220,16 +220,18 @@ mock.module("../../memory-v2-activation-log-store.js", () => ({
 // (not a property lookup) before installing the mock so the pass-through
 // path has a real reference to the underlying implementation.
 
-const realPageStoreModule = await import("../../v3/substrate/page-store.js");
+const realPageStoreModule = await import("../../substrate/page-store.js");
 const realReadPage = realPageStoreModule.readPage;
 const pageStoreState = {
   failingSlugs: new Map<string, Error>(),
 };
-mock.module("../../v3/substrate/page-store.js", () => ({
+mock.module("../../substrate/page-store.js", () => ({
   ...realPageStoreModule,
   readPage: async (workspaceDir: string, slug: string) => {
     const err = pageStoreState.failingSlugs.get(slug);
-    if (err) throw err;
+    if (err) {
+      throw err;
+    }
     return realReadPage(workspaceDir, slug);
   },
 }));
@@ -269,7 +271,9 @@ mock.module("../router.js", () => ({
     // the closest equivalent under the new model.
     if (!result.sourceBySlug) {
       const map = new Map<string, string>();
-      for (const slug of result.selectedSlugs) map.set(slug, "tier3:0");
+      for (const slug of result.selectedSlugs) {
+        map.set(slug, "tier3:0");
+      }
       result.sourceBySlug = map;
     }
     return result;
@@ -383,7 +387,7 @@ afterAll(() => {
 // Static `import type` is fine — types erase, so they don't run module-init
 // code that would race the mocks above.
 import type { DrizzleDb } from "../../../../../persistence/db-connection.js";
-import type { SkillEntry } from "../../v3/substrate/types.js";
+import type { SkillEntry } from "../../substrate/types.js";
 
 const { getSqliteFrom } =
   await import("../../../../../persistence/db-connection.js");
@@ -398,7 +402,7 @@ const { clearEverInjected, hydrate, save } =
   await import("../activation-store.js");
 const { injectMemoryV2Block } = await import("../injection.js");
 const { _resetMemoryV2QdrantForTests } =
-  await import("../../v3/substrate/qdrant.js");
+  await import("../../substrate/qdrant.js");
 
 function createTestDb(): DrizzleDb {
   const sqlite = new Database(":memory:");
@@ -1850,7 +1854,7 @@ describe("injectMemoryV2Block", () => {
 
       // Mark every page in the index as already injected — the state a
       // small workspace reaches a few turns into any conversation.
-      const { getPageIndex } = await import("../../v3/substrate/page-index.js");
+      const { getPageIndex } = await import("../../substrate/page-index.js");
       const index = await getPageIndex(tmpWorkspace);
       const seeded = await hydrate("conv-router-saturated");
       await save("conv-router-saturated", {

package/src/plugins/defaults/memory/v2/__tests__/reranker.test.ts

@@ -22,14 +22,16 @@ const backendState = {
   shouldThrow: false,
   calls: [] as Array<{ queries: string[]; passages: string[] }>,
 };
-mock.module("../../rerank-local.js", () => ({
+mock.module("../rerank-local.js", () => ({
   getOrCreateRerankBackend: (_model: string, _dtype: string) => ({
     score: async (queries: string[], passages: string[]): Promise<number[]> => {
       backendState.calls.push({
         queries: [...queries],
         passages: [...passages],
       });
-      if (backendState.shouldThrow) throw new Error("backend down");
+      if (backendState.shouldThrow) {
+        throw new Error("backend down");
+      }
       return backendState.scores.slice(0, passages.length);
     },
   }),
@@ -42,8 +44,8 @@ const pageState = {
 // Partial mock — Bun's `mock.module` is process-wide, so we re-export every
 // real symbol and override only `readPage`. Without this, sibling test files
 // that import `listPages` etc. would crash with "Export not found".
-const realPageStore = await import("../../v3/substrate/page-store.js");
-mock.module("../../v3/substrate/page-store.js", () => ({
+const realPageStore = await import("../../substrate/page-store.js");
+mock.module("../../substrate/page-store.js", () => ({
   ...realPageStore,
   readPage: async (_dir: string, slug: string) => {
     if (pageState.failingSlugs.has(slug)) {
@@ -294,7 +296,7 @@ describe("rerankCandidates", () => {
     const dtypes: string[] = [];
 
     // Re-mock the factory just for this test to capture the dtype arg.
-    mock.module("../../rerank-local.js", () => ({
+    mock.module("../rerank-local.js", () => ({
       getOrCreateRerankBackend: (_model: string, dtype: string) => {
         dtypes.push(dtype);
         return {

package/src/plugins/defaults/memory/v2/__tests__/router.test.ts

@@ -53,7 +53,9 @@ const warnLogs: Array<{ args: unknown[] }> = [];
 function makeRecordingLogger(): unknown {
   return new Proxy({} as Record<string, unknown>, {
     get: (_target, prop) => {
-      if (prop === "child") return makeRecordingLogger;
+      if (prop === "child") {
+        return makeRecordingLogger;
+      }
       if (prop === "warn") {
         return (...args: unknown[]) => {
           warnLogs.push({ args });
@@ -68,7 +70,7 @@ mock.module("../../../../../util/logger.js", () => ({
   getLogger: () => makeRecordingLogger(),
 }));
 
-mock.module("../../v3/substrate/skill-store.js", () => ({
+mock.module("../../substrate/skill-store.js", () => ({
   SKILL_SLUG_PREFIX: "skills/",
   listSkillEntries: () => skillState.entries,
 }));
@@ -86,7 +88,9 @@ mock.module("../injection-events.js", () => ({
     const out = new Map<string, number>();
     for (const slug of slugs) {
       const score = scoresStub.get(slug);
-      if (score !== undefined && score > 0) out.set(slug, score);
+      if (score !== undefined && score > 0) {
+        out.set(slug, score);
+      }
     }
     return out;
   },
@@ -119,8 +123,8 @@ mock.module("@vellumai/plugin-api", () => ({
 
 const { runRouter, applyHistoricalCharBudget } = await import("../router.js");
 const { getPageIndex, invalidatePageIndex } =
-  await import("../../v3/substrate/page-index.js");
-const { writePage } = await import("../../v3/substrate/page-store.js");
+  await import("../../substrate/page-index.js");
+const { writePage } = await import("../../substrate/page-store.js");
 
 // ---------------------------------------------------------------------------
 // Per-test workspace + reset hooks.
@@ -767,7 +771,9 @@ describe("runRouter — batched (batch_size set)", () => {
           systemPrompt: options?.systemPrompt,
           options,
         });
-        if (callCount === 1) throw new Error("batch 1 boom");
+        if (callCount === 1) {
+          throw new Error("batch 1 boom");
+        }
         return toolUseResponse([1]);
       },
     };

package/src/plugins/defaults/memory/{memory-v2-activation-log-store.ts → v2/activation-log-store.ts}

@@ -1,7 +1,7 @@
 import { v4 as uuid } from "uuid";
 
-import { getLogger } from "./logging.js";
-import { memorySqliteOrNull } from "./memory-db.js";
+import { getLogger } from "../logging.js";
+import { memorySqliteOrNull } from "../memory-db.js";
 
 const log = getLogger("memory-v2-activation-log-store");
 

package/src/plugins/defaults/memory/v2/activation-store.ts

@@ -15,7 +15,7 @@ import {
   type ActivationState,
   ActivationStateSchema,
   type EverInjectedEntry,
-} from "../v3/substrate/types.js";
+} from "../substrate/types.js";
 
 /**
  * Load the activation state for a conversation, or `null` if no row exists.
@@ -26,7 +26,9 @@ export async function hydrate(
   conversationId: string,
 ): Promise<ActivationState | null> {
   const mdb = memoryDbOrNull("hydrateActivationState");
-  if (!mdb) return null;
+  if (!mdb) {
+    return null;
+  }
   const row = mdb
     .select({
       messageId: activationState.messageId,
@@ -38,7 +40,9 @@ export async function hydrate(
     .from(activationState)
     .where(eq(activationState.conversationId, conversationId))
     .get();
-  if (!row) return null;
+  if (!row) {
+    return null;
+  }
 
   return ActivationStateSchema.parse({
     messageId: row.messageId,
@@ -59,7 +63,9 @@ export async function save(
   state: ActivationState,
 ): Promise<void> {
   const mdb = memoryDbOrNull("saveActivationState");
-  if (!mdb) return;
+  if (!mdb) {
+    return;
+  }
   const stateJson = JSON.stringify(state.state);
   const everInjectedJson = JSON.stringify(state.everInjected);
   mdb
@@ -103,7 +109,9 @@ export function forkActivationState(
   newConversationId: string,
 ): void {
   const mdb = memoryDbOrNull("forkActivationState");
-  if (!mdb) return;
+  if (!mdb) {
+    return;
+  }
   const row = mdb
     .select({
       messageId: activationState.messageId,
@@ -115,7 +123,9 @@ export function forkActivationState(
     .from(activationState)
     .where(eq(activationState.conversationId, parentConversationId))
     .get();
-  if (!row) return;
+  if (!row) {
+    return;
+  }
 
   mdb
     .insert(activationState)
@@ -166,9 +176,13 @@ export function seedForkActivationState(
   newConversationId: string,
   inheritedSlugs: string[],
 ): void {
-  if (inheritedSlugs.length === 0) return;
+  if (inheritedSlugs.length === 0) {
+    return;
+  }
   const mdb = memoryDbOrNull("seedForkActivationState");
-  if (!mdb) return;
+  if (!mdb) {
+    return;
+  }
 
   const everInjected: EverInjectedEntry[] = inheritedSlugs.map((slug) => ({
     slug,