@vellumai/assistant 0.7.0 → 0.7.2

package/src/memory/v2/__tests__/migration.test.ts

@@ -546,7 +546,7 @@ describe("derivePromotions", () => {
 // ---------------------------------------------------------------------------
 
 describe("collapseEdges", () => {
-  test("maps v1 ids to v2 slugs and emits canonical tuples after writeEdges", () => {
+  test("maps v1 ids to v2 slugs and preserves direction (source → target)", () => {
     const v1: V1Edge[] = [
       { sourceNodeId: "node-a", targetNodeId: "node-b" },
       { sourceNodeId: "node-b", targetNodeId: "node-c" },
@@ -556,9 +556,13 @@ describe("collapseEdges", () => {
       ["node-b", "bob"],
       ["node-c", "carol"],
     ]);
-    const idx = collapseEdges(v1, slugMap);
-    expect(idx.version).toBe(1);
-    expect(idx.edges.length).toBe(2);
+    const outgoing = collapseEdges(v1, slugMap);
+    // Two distinct sources, each pointing at one target.
+    expect(outgoing.size).toBe(2);
+    expect([...(outgoing.get("alice") ?? new Set<string>())]).toEqual(["bob"]);
+    expect([...(outgoing.get("bob") ?? new Set<string>())]).toEqual(["carol"]);
+    // Direction is preserved — carol's outgoing list is empty (it's a sink).
+    expect(outgoing.has("carol")).toBe(false);
   });
 
   test("drops edges whose endpoints aren't in the slug map", () => {
@@ -570,21 +574,48 @@ describe("collapseEdges", () => {
       ["node-a", "alice"],
       ["node-b", "bob"],
     ]);
-    const idx = collapseEdges(v1, slugMap);
-    expect(idx.edges).toEqual([]);
+    const outgoing = collapseEdges(v1, slugMap);
+    expect(outgoing.size).toBe(0);
   });
 
   test("drops self-loops introduced by the slug mapping", () => {
     // Two distinct v1 nodes mapped to the same v2 slug (e.g. clustered
-    // together) cannot produce an edge — `addEdge`/writeEdges reject self
-    // loops, so we must filter at collapse time.
+    // together) cannot produce a self-edge — concept-page graphs are simple,
+    // so we filter at collapse time.
     const v1: V1Edge[] = [{ sourceNodeId: "node-a", targetNodeId: "node-b" }];
     const slugMap = new Map([
       ["node-a", "merged"],
       ["node-b", "merged"],
     ]);
-    const idx = collapseEdges(v1, slugMap);
-    expect(idx.edges).toEqual([]);
+    const outgoing = collapseEdges(v1, slugMap);
+    expect(outgoing.size).toBe(0);
+  });
+
+  test("collapses duplicate (source, target) pairs into a single entry", () => {
+    const v1: V1Edge[] = [
+      { sourceNodeId: "node-a", targetNodeId: "node-b" },
+      { sourceNodeId: "node-a", targetNodeId: "node-b" },
+    ];
+    const slugMap = new Map([
+      ["node-a", "alice"],
+      ["node-b", "bob"],
+    ]);
+    const outgoing = collapseEdges(v1, slugMap);
+    expect([...(outgoing.get("alice") ?? new Set<string>())]).toEqual(["bob"]);
+  });
+
+  test("keeps A→B and B→A as separate directed edges", () => {
+    const v1: V1Edge[] = [
+      { sourceNodeId: "node-a", targetNodeId: "node-b" },
+      { sourceNodeId: "node-b", targetNodeId: "node-a" },
+    ];
+    const slugMap = new Map([
+      ["node-a", "alice"],
+      ["node-b", "bob"],
+    ]);
+    const outgoing = collapseEdges(v1, slugMap);
+    expect([...(outgoing.get("alice") ?? new Set<string>())]).toEqual(["bob"]);
+    expect([...(outgoing.get("bob") ?? new Set<string>())]).toEqual(["alice"]);
   });
 });
 
@@ -648,13 +679,22 @@ describe("runMemoryV2Migration", () => {
     expect(pages.length).toBe(3);
     expect(result.pagesCreated).toBe(3);
 
-    // -- edges.json reflects the v1 edge collapse. --
-    const edgesRaw = readFileSync(
-      join(workspaceDir, "memory", "edges.json"),
-      "utf-8",
-    );
-    const edges = JSON.parse(edgesRaw) as { edges: [string, string][] };
-    expect(edges.edges.length).toBe(1);
+    // -- Outgoing edges live in source-page frontmatter (no edges.json). --
+    expect(existsSync(join(workspaceDir, "memory", "edges.json"))).toBe(false);
+    expect(result.edgesWritten).toBe(1);
+    // Find the page whose frontmatter has the outgoing edge — that's the
+    // source slug. Exactly one page should carry the surviving v1 edge.
+    let pagesWithEdges = 0;
+    for (const file of pages) {
+      const body = readFileSync(join(conceptDir, file), "utf-8");
+      if (
+        /\nedges:\s*\n?\s*-\s*/.test(body) ||
+        /edges:\s*\[[^\]]+\]/.test(body)
+      ) {
+        pagesWithEdges += 1;
+      }
+    }
+    expect(pagesWithEdges).toBe(1);
 
     // -- Promotions appended to the right files. --
     const essentials = readFileSync(
@@ -664,23 +704,13 @@ describe("runMemoryV2Migration", () => {
     expect(essentials).toContain("User is Alice and works at Vellum");
     expect(result.essentialsLines).toBe(1);
 
-    // -- Embed jobs enqueued (one per page) plus a single trailing
-    //    rebuild-edges enqueue so page frontmatter picks up edges.json. --
-    expect(enqueuedJobs.length).toBe(4);
+    // -- Embed jobs enqueued (one per page). No rebuild-edges follow-up:
+    //    the migration writes outgoing edges directly into page frontmatter. --
+    expect(enqueuedJobs.length).toBe(3);
     const embedJobs = enqueuedJobs.filter(
       (j) => j.type === "embed_concept_page",
     );
     expect(embedJobs.length).toBe(3);
-    const rebuildJobs = enqueuedJobs.filter(
-      (j) => j.type === "memory_v2_rebuild_edges",
-    );
-    expect(rebuildJobs.length).toBe(1);
-    // Rebuild-edges must come last — the embeds depend only on pages on disk,
-    // but rebuild-edges should observe the final edges.json from this run.
-    expect(enqueuedJobs[enqueuedJobs.length - 1].type).toBe(
-      "memory_v2_rebuild_edges",
-    );
-    expect(result.rebuildEdgesJobId).toBe(`job-${enqueuedJobs.length}`);
 
     // -- Sentinel written. --
     expect(existsSync(join(workspaceDir, MIGRATION_SENTINEL_RELATIVE))).toBe(
@@ -785,13 +815,11 @@ describe("runMemoryV2Migration", () => {
     });
     expect(result.pagesCreated).toBe(0);
     expect(result.embedsEnqueued).toBe(0);
+    expect(result.edgesWritten).toBe(0);
     expect(result.sentinelWritten).toBe(true);
-    // Rebuild-edges still runs even with zero pages — the job is idempotent
-    // and ensures any pre-seeded frontmatter aligns with edges.json.
-    expect(result.rebuildEdgesJobId).toBeTruthy();
-    expect(
-      enqueuedJobs.filter((j) => j.type === "memory_v2_rebuild_edges").length,
-    ).toBe(1);
+    // No rebuild-edges follow-up — outgoing edges live directly in page
+    // frontmatter, so a workspace with no pages has nothing to rebuild.
+    expect(enqueuedJobs).toEqual([]);
   });
 });
 

package/src/memory/v2/__tests__/page-store.test.ts

@@ -1,14 +1,17 @@
 /**
  * Tests for `assistant/src/memory/v2/page-store.ts`.
  *
- * Coverage matrix (from PR 8 acceptance criteria):
+ * Coverage matrix:
  *   - slugify: lowercase / kebab-case / ascii / 80-char cap / empty fallback.
+ *   - validateSlug: accept set, reject set (path-traversal, malformed shapes).
  *   - readPage / writePage round-trip: frontmatter survives, body preserved.
  *   - readPage on missing file: returns null.
  *   - writePage atomicity: a fault between temp-write and rename leaves the
  *     prior file intact (or the new one) — never a half-written page.
- *   - listPages: excludes non-.md entries, returns slugs only, missing dir → [].
- *   - deletePage: idempotent on missing file.
+ *   - writePage creates parent directories for nested slugs.
+ *   - listPages: walks subdirectories, returns nested slugs in `/`-form,
+ *     excludes hidden dirs / non-.md / temp files, missing dir → [].
+ *   - deletePage / pageExists: nested-slug round-trip, idempotent on missing.
  *
  * Tests use temp workspaces under `os.tmpdir()` per the cross-cutting safety
  * rule in the v2 plan; they never touch `~/.vellum/`.
@@ -33,6 +36,7 @@ import {
   pageExists,
   readPage,
   slugify,
+  validateSlug,
   writePage,
 } from "../page-store.js";
 import type { ConceptPage } from "../types.js";
@@ -90,6 +94,12 @@ describe("slugify", () => {
     expect(slugify("café résumé")).toMatch(/^[a-z0-9-]+$/);
   });
 
+  test("collapses '/' to hyphen — slugify produces a single segment", () => {
+    // Path-shaped slugs are constructed by writing to nested paths, not by
+    // passing slash-bearing input through slugify.
+    expect(slugify("People/Alice")).toBe("people-alice");
+  });
+
   test("caps slug length at 80 chars and re-trims trailing hyphen", () => {
     const long = "a".repeat(120);
     const slug = slugify(long);
@@ -109,6 +119,56 @@ describe("slugify", () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// validateSlug
+// ---------------------------------------------------------------------------
+
+describe("validateSlug", () => {
+  test.each([
+    ["alice"],
+    ["a"],
+    ["alice-preferences"],
+    ["people/alice"],
+    ["procs/git-flow"],
+    ["arcs/2025-04-cutover"],
+    ["a/b/c/d/e"],
+    ["people/colleagues/alice"],
+  ])("accepts %p", (slug) => {
+    expect(() => validateSlug(slug)).not.toThrow();
+  });
+
+  test.each([
+    ["empty string", ""],
+    ["leading slash", "/alice"],
+    ["trailing slash", "alice/"],
+    ["double slash", "people//alice"],
+    ["dot-dot segment", "people/../alice"],
+    ["pure dot-dot", ".."],
+    ["leading dot segment", ".hidden/alice"],
+    ["backslash", "people\\alice"],
+    ["null byte", "alice\0evil"],
+    ["whitespace", "alice bob"],
+    ["uppercase", "Alice"],
+    ["non-ascii", "café"],
+    ["leading hyphen", "-alice"],
+    ["non-alphanumeric", "alice!"],
+  ])("rejects %s (%p)", (_label, slug) => {
+    expect(() => validateSlug(slug)).toThrow(/Invalid concept-page slug/);
+  });
+
+  test("rejects slugs longer than 200 chars", () => {
+    expect(() => validateSlug("a".repeat(201))).toThrow(
+      /Invalid concept-page slug/,
+    );
+  });
+
+  test("rejects segments longer than 80 chars even if total is under 200", () => {
+    expect(() => validateSlug("a".repeat(81))).toThrow(
+      /Invalid concept-page slug/,
+    );
+  });
+});
+
 // ---------------------------------------------------------------------------
 // readPage / writePage round-trip
 // ---------------------------------------------------------------------------
@@ -188,6 +248,50 @@ describe("writePage + readPage round-trip", () => {
     const read = await readPage(workspaceDir, page1.slug);
     expect(read!.body).toBe("second version\n");
   });
+
+  test("writePage creates parent directories for nested slugs", async () => {
+    const page = makePage({ slug: "people/alice" });
+    await writePage(workspaceDir, page);
+
+    const filePath = join(
+      workspaceDir,
+      "memory",
+      "concepts",
+      "people",
+      "alice.md",
+    );
+    expect(existsSync(filePath)).toBe(true);
+
+    const read = await readPage(workspaceDir, "people/alice");
+    expect(read!.slug).toBe("people/alice");
+    expect(read!.body).toBe(page.body);
+  });
+
+  test("writePage round-trips deeply nested slugs", async () => {
+    const page = makePage({ slug: "people/colleagues/alice" });
+    await writePage(workspaceDir, page);
+
+    const read = await readPage(workspaceDir, "people/colleagues/alice");
+    expect(read!.slug).toBe("people/colleagues/alice");
+    expect(read!.frontmatter.edges).toEqual(page.frontmatter.edges);
+    expect(read!.body).toBe(page.body);
+  });
+
+  test("writePage rejects malicious slugs and writes nothing at the escape target", async () => {
+    await expect(
+      writePage(workspaceDir, makePage({ slug: "../escape" })),
+    ).rejects.toThrow(/Invalid concept-page slug/);
+
+    // `../escape` would resolve to `<workspace>/memory/escape.md`. Confirm
+    // the validation throw fired before any I/O — no file at that target.
+    expect(existsSync(join(workspaceDir, "memory", "escape.md"))).toBe(false);
+  });
+
+  test("readPage rejects malicious slugs", async () => {
+    await expect(readPage(workspaceDir, "../escape")).rejects.toThrow(
+      /Invalid concept-page slug/,
+    );
+  });
 });
 
 // ---------------------------------------------------------------------------
@@ -239,6 +343,40 @@ describe("writePage atomicity", () => {
     expect(orphanTmps).toEqual([]);
   });
 
+  test("nested-slug write that fails leaves no orphan tmp in nested folder", async () => {
+    // Seed a nested page so the parent dir exists.
+    const original = makePage({
+      slug: "people/alice",
+      body: "original body\n",
+    });
+    await writePage(workspaceDir, original);
+
+    const targetPath = join(
+      workspaceDir,
+      "memory",
+      "concepts",
+      "people",
+      "alice.md",
+    );
+    rmSync(targetPath);
+    mkdirSync(targetPath);
+    writeFileSync(join(targetPath, "blocker"), "x", "utf-8");
+
+    await expect(
+      writePage(
+        workspaceDir,
+        makePage({ slug: "people/alice", body: "interrupted\n" }),
+      ),
+    ).rejects.toThrow();
+
+    rmSync(targetPath, { recursive: true, force: true });
+
+    const peopleDir = join(workspaceDir, "memory", "concepts", "people");
+    const remaining = readdirSync(peopleDir);
+    const orphanTmps = remaining.filter((name) => name.includes(".tmp."));
+    expect(orphanTmps).toEqual([]);
+  });
+
   test("successful write produces no orphan tmp files", async () => {
     await writePage(workspaceDir, makePage());
 
@@ -274,15 +412,51 @@ describe("listPages", () => {
     expect(slugs).toEqual(["alice"]);
   });
 
-  test("excludes subdirectories (only files count)", async () => {
+  test("walks subdirectories and returns nested slugs in '/'-form", async () => {
     await writePage(workspaceDir, makePage({ slug: "alice" }));
+    await writePage(workspaceDir, makePage({ slug: "people/bob" }));
+    await writePage(workspaceDir, makePage({ slug: "people/carol" }));
+    await writePage(workspaceDir, makePage({ slug: "arcs/2025-04/cutover" }));
 
-    mkdirSync(join(workspaceDir, "memory", "concepts", "subdir"), {
-      recursive: true,
-    });
+    const slugs = await listPages(workspaceDir);
+    expect(slugs).toEqual([
+      "alice",
+      "arcs/2025-04/cutover",
+      "people/bob",
+      "people/carol",
+    ]);
+  });
+
+  test("skips hidden subdirectories and non-.md files inside nested dirs", async () => {
+    await writePage(workspaceDir, makePage({ slug: "people/alice" }));
+
+    const conceptsDir = join(workspaceDir, "memory", "concepts");
+    mkdirSync(join(conceptsDir, ".git"), { recursive: true });
+    writeFileSync(join(conceptsDir, ".git", "config.md"), "fake", "utf-8");
+    writeFileSync(join(conceptsDir, "people", "notes.txt"), "ignore", "utf-8");
 
     const slugs = await listPages(workspaceDir);
-    expect(slugs).toEqual(["alice"]);
+    expect(slugs).toEqual(["people/alice"]);
+  });
+
+  test("skips orphaned .tmp.* files at any depth", async () => {
+    const conceptsDir = join(workspaceDir, "memory", "concepts");
+    await writePage(workspaceDir, makePage({ slug: "people/alice" }));
+
+    // Synthesize an orphan tmp file at root and inside the people/ subdir.
+    writeFileSync(
+      join(conceptsDir, "alice.md.tmp.123.abc-def"),
+      "stranded",
+      "utf-8",
+    );
+    writeFileSync(
+      join(conceptsDir, "people", "bob.md.tmp.123.abc-def"),
+      "stranded",
+      "utf-8",
+    );
+
+    const slugs = await listPages(workspaceDir);
+    expect(slugs).toEqual(["people/alice"]);
   });
 
   test("returns [] when the concepts directory does not exist", async () => {
@@ -316,6 +490,15 @@ describe("deletePage", () => {
     expect(await readPage(workspaceDir, page.slug)).toBeNull();
   });
 
+  test("removes nested pages", async () => {
+    const page = makePage({ slug: "people/alice" });
+    await writePage(workspaceDir, page);
+    expect(await pageExists(workspaceDir, "people/alice")).toBe(true);
+
+    await deletePage(workspaceDir, "people/alice");
+    expect(await pageExists(workspaceDir, "people/alice")).toBe(false);
+  });
+
   test("is idempotent — deleting a missing page does not throw", async () => {
     await deletePage(workspaceDir, "never-existed");
     // Second call still does not throw.

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

@@ -0,0 +1,181 @@
+/**
+ * Tests for `assistant/src/memory/v2/prompts/consolidation.ts` —
+ * specifically `resolveConsolidationPrompt` which loads an optional
+ * file-based override and falls back to the bundled prompt when the
+ * override is missing/empty/unreadable.
+ */
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { homedir, tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  mock,
+  test,
+} from "bun:test";
+
+const warnCalls: Array<{ data: unknown; msg: string }> = [];
+const recordingLogger = {
+  warn: (data: unknown, msg: string) => {
+    warnCalls.push({ data, msg });
+  },
+  info: () => {},
+  debug: () => {},
+  error: () => {},
+  trace: () => {},
+  fatal: () => {},
+  child: () => recordingLogger,
+};
+
+mock.module("../../../util/logger.js", () => ({
+  getLogger: () => recordingLogger,
+}));
+
+let tmpWorkspace: string;
+let previousWorkspaceEnv: string | undefined;
+
+beforeAll(() => {
+  tmpWorkspace = mkdtempSync(join(tmpdir(), "memory-v2-prompt-test-"));
+  previousWorkspaceEnv = process.env.VELLUM_WORKSPACE_DIR;
+  process.env.VELLUM_WORKSPACE_DIR = tmpWorkspace;
+});
+
+afterAll(() => {
+  if (previousWorkspaceEnv === undefined) {
+    delete process.env.VELLUM_WORKSPACE_DIR;
+  } else {
+    process.env.VELLUM_WORKSPACE_DIR = previousWorkspaceEnv;
+  }
+  rmSync(tmpWorkspace, { recursive: true, force: true });
+});
+
+const { CONSOLIDATION_PROMPT, CUTOFF_PLACEHOLDER, resolveConsolidationPrompt } =
+  await import("../prompts/consolidation.js");
+
+const CUTOFF = "2026-05-01T12:00:00.000Z";
+
+const bundledPrompt = (): string =>
+  (CONSOLIDATION_PROMPT as string).replaceAll(CUTOFF_PLACEHOLDER, CUTOFF);
+
+beforeEach(() => {
+  warnCalls.length = 0;
+  mkdirSync(tmpWorkspace, { recursive: true });
+});
+
+afterEach(() => {
+  for (const entry of ["custom-prompt.md", "empty.md", "no-placeholder.md"]) {
+    rmSync(join(tmpWorkspace, entry), { force: true });
+  }
+});
+
+describe("resolveConsolidationPrompt — no override", () => {
+  test("returns the bundled prompt with {{CUTOFF}} substituted when overridePath is null", () => {
+    const result = resolveConsolidationPrompt(null, CUTOFF);
+    expect(result).toContain("You are running memory consolidation");
+    expect(result).toContain(CUTOFF);
+    expect(result).not.toContain(CUTOFF_PLACEHOLDER);
+    expect(warnCalls).toHaveLength(0);
+  });
+});
+
+describe("resolveConsolidationPrompt — with override", () => {
+  test("loads an absolute path verbatim and substitutes {{CUTOFF}}", () => {
+    const path = join(tmpWorkspace, "custom-prompt.md");
+    writeFileSync(path, "Custom prompt at {{CUTOFF}}\n");
+
+    const result = resolveConsolidationPrompt(path, CUTOFF);
+
+    expect(result).toBe(`Custom prompt at ${CUTOFF}\n`);
+    expect(warnCalls).toHaveLength(0);
+  });
+
+  test("resolves a relative path against the workspace dir", () => {
+    writeFileSync(
+      join(tmpWorkspace, "custom-prompt.md"),
+      "Workspace-relative {{CUTOFF}}\n",
+    );
+
+    const result = resolveConsolidationPrompt("custom-prompt.md", CUTOFF);
+
+    expect(result).toBe(`Workspace-relative ${CUTOFF}\n`);
+    expect(warnCalls).toHaveLength(0);
+  });
+
+  test("expands a leading ~/ to the home directory", () => {
+    const filename = `.vellum-prompt-test-${process.pid}.md`;
+    const path = join(homedir(), filename);
+    writeFileSync(path, "Home dir {{CUTOFF}}\n");
+    try {
+      const result = resolveConsolidationPrompt(`~/${filename}`, CUTOFF);
+      expect(result).toBe(`Home dir ${CUTOFF}\n`);
+      expect(warnCalls).toHaveLength(0);
+    } finally {
+      rmSync(path, { force: true });
+    }
+  });
+
+  test("returns the file body verbatim when {{CUTOFF}} is absent", () => {
+    const body = "No placeholder here. Just a plain prompt.\n";
+    writeFileSync(join(tmpWorkspace, "no-placeholder.md"), body);
+
+    const result = resolveConsolidationPrompt("no-placeholder.md", CUTOFF);
+
+    expect(result).toBe(body);
+    expect(warnCalls).toHaveLength(0);
+  });
+
+  test("substitutes every {{CUTOFF}} occurrence (replaceAll, not replace)", () => {
+    writeFileSync(
+      join(tmpWorkspace, "custom-prompt.md"),
+      "{{CUTOFF}} ... {{CUTOFF}} ... {{CUTOFF}}",
+    );
+
+    const result = resolveConsolidationPrompt("custom-prompt.md", CUTOFF);
+
+    expect(result).toBe(`${CUTOFF} ... ${CUTOFF} ... ${CUTOFF}`);
+    expect(result).not.toContain(CUTOFF_PLACEHOLDER);
+  });
+});
+
+describe("resolveConsolidationPrompt — failure modes", () => {
+  test("falls back to bundled prompt and logs a warning when the file is missing", () => {
+    const result = resolveConsolidationPrompt(
+      "/this/path/does/not/exist.md",
+      CUTOFF,
+    );
+
+    expect(result).toBe(bundledPrompt());
+    expect(warnCalls).toHaveLength(1);
+    const data = warnCalls[0].data as Record<string, unknown>;
+    expect(data.code).toBe("ENOENT");
+    expect(data.fallback).toBe("bundled");
+  });
+
+  test("falls back to bundled prompt when the file is empty", () => {
+    const path = join(tmpWorkspace, "empty.md");
+    writeFileSync(path, "");
+
+    const result = resolveConsolidationPrompt(path, CUTOFF);
+
+    expect(result).toBe(bundledPrompt());
+    expect(warnCalls).toHaveLength(1);
+    const data = warnCalls[0].data as Record<string, unknown>;
+    expect(data.reason).toBe("empty_override");
+  });
+
+  test("falls back to bundled prompt when the file is whitespace-only", () => {
+    const path = join(tmpWorkspace, "empty.md");
+    writeFileSync(path, "   \n\n\t\n");
+
+    const result = resolveConsolidationPrompt(path, CUTOFF);
+
+    expect(result).toBe(bundledPrompt());
+    expect(warnCalls).toHaveLength(1);
+    const data = warnCalls[0].data as Record<string, unknown>;
+    expect(data.reason).toBe("empty_override");
+  });
+});