@vellumai/assistant 0.12.1-dev.202609141913.5e16607 → 0.12.1-staging.2

package/src/workspace/git-service.ts

@@ -17,10 +17,6 @@ import { getLogger } from "../util/logger.js";
 import { Mutex } from "../util/mutex.js";
 import { addToPathEnv, getExtraToolPathDirs } from "../util/platform.js";
 import { PromiseGuard } from "../util/promise-guard.js";
-import {
-  collectDirtyPathsFromPorcelain,
-  parsePorcelainZ,
-} from "./git-porcelain.js";
 
 const execFileAsync = promisify(execFile);
 const log = getLogger("workspace-git");
@@ -230,6 +226,59 @@ done
 exit 0
 `;
 
+/**
+ * Parse NUL-terminated `git status --porcelain -z` output into status/path
+ * pairs. NUL termination is required so paths with special characters
+ * (non-ASCII, quotes, newlines) arrive verbatim instead of C-style quoted.
+ * A rename/copy record is followed by a bare origin-path entry, which is
+ * skipped.
+ */
+function parsePorcelainZ(
+  stdout: string,
+): Array<{ status: string; path: string }> {
+  const entries = stdout.split("\0");
+  const parsed: Array<{ status: string; path: string }> = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i] ?? "";
+    if (entry.length < 4) {
+      continue;
+    }
+    const status = entry.substring(0, 2);
+    parsed.push({ status, path: entry.substring(3) });
+    if (status[0] === "R" || status[0] === "C") {
+      i++;
+    }
+  }
+  return parsed;
+}
+
+/**
+ * Every path git status knows about, including rename/copy origins.
+ * Origins are skipped by {@link parsePorcelainZ} (they have no status
+ * prefix) but still need to be staged so a deletion is not left behind
+ * when a rename is split across add batches.
+ */
+function collectDirtyPathsFromPorcelain(stdout: string): string[] {
+  const entries = stdout.split("\0");
+  const paths: string[] = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i] ?? "";
+    if (entry.length < 4) {
+      continue;
+    }
+    const status = entry.substring(0, 2);
+    paths.push(entry.substring(3));
+    if (status[0] === "R" || status[0] === "C") {
+      i++;
+      const origin = entries[i];
+      if (origin && origin.length > 0) {
+        paths.push(origin);
+      }
+    }
+  }
+  return paths;
+}
+
 /** Properties added by Node's child_process errors. */
 interface ExecError extends Error {
   killed?: boolean;
@@ -384,7 +433,7 @@ export class WorkspaceGitService {
    *
    * This method is always called inside the mutex, so no git operation from
    * our code can be concurrently holding the lock. However, an external git
-   * git process (user running `git add`, IDE tooling, etc.) could legitimately
+   * process (user running `git add`, IDE tooling, etc.) could legitimately
    * hold the lock. We use `lsof` to check — if any process has the file
    * open, we leave it alone. If no process holds it, it's stale (crashed
    * process) and safe to remove.

package/src/workspace/migrations/registry.ts

@@ -151,9 +151,6 @@ import { sttFluxProviderToModelFamilyMigration } from "./150-stt-flux-provider-t
 import { repairRenamedFireworksDeepseekProModelIdMigration } from "./151-repair-renamed-fireworks-deepseek-pro-model-id.js";
 import { repairRetiredFireworksMinimaxM2p7ModelIdMigration } from "./152-repair-retired-fireworks-minimax-m2p7-model-id.js";
 import { stripMcpPolicyFieldsMigration } from "./153-strip-mcp-policy-fields.js";
-import { repairRetiredCodexGpt54ModelIdsMigration } from "./154-repair-retired-codex-gpt-5-4-model-ids.js";
-import { moveFrontModelConfigToVoiceMigration } from "./155-move-front-model-config-to-voice.js";
-import { extractWorkspaceMcpJsonMigration } from "./156-extract-workspace-mcp-json.js";
 import { migrateToWorkspaceVolumeMigration } from "./migrate-to-workspace-volume.js";
 import type { WorkspaceMigration } from "./types.js";
 
@@ -320,7 +317,4 @@ export const WORKSPACE_MIGRATIONS: WorkspaceMigration[] = [
   repairRenamedFireworksDeepseekProModelIdMigration,
   repairRetiredFireworksMinimaxM2p7ModelIdMigration,
   stripMcpPolicyFieldsMigration,
-  repairRetiredCodexGpt54ModelIdsMigration,
-  moveFrontModelConfigToVoiceMigration,
-  extractWorkspaceMcpJsonMigration,
 ];

package/scripts/smoke-desktop-window-theme.ts

@@ -1,186 +0,0 @@
-import assert from "node:assert/strict";
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { writeDesktopWindowTheme } from "../src/desktop/desktop-window-theme.js";
-
-if (process.platform !== "linux") {
-  throw new Error(
-    "Run in a disposable Linux environment with Xvfb, Openbox, xterm, xdotool, xwininfo and xmllint installed",
-  );
-}
-
-const directory = await mkdtemp(join(tmpdir(), "window-theme-smoke-"));
-const env = { ...process.env, DISPLAY: ":97" };
-const children: ReturnType<typeof Bun.spawn>[] = [];
-const start = (cmd: string[]) => {
-  const child = Bun.spawn(cmd, {
-    env,
-    stdout: "ignore",
-    stderr: "inherit",
-    windowsHide: true,
-  });
-  children.push(child);
-  return child;
-};
-const run = (...cmd: string[]) => {
-  const result = Bun.spawnSync(cmd, {
-    env,
-
-    windowsHide: true,
-  });
-  assert.equal(result.exitCode, 0, result.stderr.toString());
-  return result.stdout.toString();
-};
-const waitFor = async (predicate: () => boolean) => {
-  for (let attempt = 0; attempt < 100; attempt++) {
-    try {
-      if (predicate()) {
-        return;
-      }
-    } catch {}
-    await Bun.sleep(50);
-  }
-  throw new Error("Window theme smoke condition timed out");
-};
-const pointer = async (...args: string[]) => {
-  run("xdotool", ...args);
-  await Bun.sleep(200);
-};
-const geometry = () => {
-  const info = run("xwininfo", "-name", "Theme smoke");
-  return [
-    "Absolute upper-left X",
-    "Absolute upper-left Y",
-    "Width",
-    "Height",
-  ].map((label) =>
-    Number(new RegExp(`${label}:\\s+(-?\\d+)`).exec(info)?.[1]),
-  ) as [number, number, number, number];
-};
-const state = () => run("xprop", "-name", "Theme smoke", "_NET_WM_STATE");
-const button = async (offset: number) => {
-  const [x, y, width] = geometry();
-  await pointer(
-    "mousemove",
-    String(x + width - offset),
-    String(y - 16),
-    "click",
-    "1",
-  );
-};
-
-try {
-  const home = join(directory, "home");
-  const sourceDir = join(home, ".config", "openbox");
-  await mkdir(sourceDir, { recursive: true });
-  const original = await readFile("/etc/xdg/openbox/rc.xml", "utf8");
-  const mouse = original.match(/<mouse>[^]*?<\/mouse>/)![0];
-  const keyboard = original.match(/<keyboard>[^]*?<\/keyboard>/)![0];
-  const source = original
-    .replace(
-      mouse,
-      `<xi:include href="bindings.xml" xpointer="xpointer(/*/*)"/>`,
-    )
-    .replace(keyboard, "");
-  const sourcePath = join(sourceDir, "rc.xml");
-  await writeFile(sourcePath, source);
-  await writeFile(
-    join(sourceDir, "bindings.xml"),
-    `<bindings xmlns="http://openbox.org/3.4/rc">${mouse}${keyboard}</bindings>`,
-  );
-  const configDir = join(directory, "managed & theme");
-  const config = writeDesktopWindowTheme(configDir, home, "#53b7aa");
-  const expanded = run("xmllint", "--xinclude", config);
-  assert(
-    expanded.includes("NextWindow") && expanded.includes("Move"),
-    "Relative includes must retain the actual keyboard and mouse bindings",
-  );
-  assert.equal(await readFile(sourcePath, "utf8"), source);
-  writeDesktopWindowTheme(configDir, home, "#bc7799");
-  writeDesktopWindowTheme(configDir, home, "#53b7aa");
-  assert.equal(await readFile(sourcePath, "utf8"), source);
-  const blocked = join(directory, "blocked");
-  await writeFile(blocked, "not a directory");
-  assert.throws(() => writeDesktopWindowTheme(blocked, home));
-  assert.equal(await readFile(sourcePath, "utf8"), source);
-  const customBase = source.replace(
-    "<openbox_config",
-    '<openbox_config xml:base="./custom/"',
-  );
-  await writeFile(sourcePath, customBase);
-  assert.throws(() => writeDesktopWindowTheme(configDir, home));
-  assert.equal(await readFile(sourcePath, "utf8"), customBase);
-  await writeFile(sourcePath, source);
-
-  start(["Xvfb", ":97", "-screen", "0", "1100x700x24"]);
-  await waitFor(
-    () => run("xdotool", "getdisplaygeometry").trim() === "1100 700",
-  );
-  start(["openbox", "--config-file", config]);
-  await waitFor(() =>
-    run("xprop", "-root", "_OB_THEME").includes("window-theme"),
-  );
-  start([
-    "xterm",
-    "-title",
-    "Theme smoke",
-    "-geometry",
-    "48x12+450+250",
-    "-e",
-    "sleep",
-    "60",
-  ]);
-  await waitFor(
-    () => run("xdotool", "search", "--name", "^Theme smoke$").trim().length > 0,
-  );
-  await Bun.sleep(300);
-  const id = run("xdotool", "search", "--name", "^Theme smoke$").trim();
-  await button(39);
-  assert(
-    state().includes("MAXIMIZED_HORZ") && state().includes("MAXIMIZED_VERT"),
-  );
-  await button(39);
-  assert(!state().includes("MAXIMIZED"));
-  await button(62);
-  assert(state().includes("HIDDEN"));
-  await pointer("windowactivate", id);
-  assert(!state().includes("HIDDEN"));
-  let [x, y, width, height] = geometry();
-  await pointer("mousemove", String(x + 100), String(y - 16), "mousedown", "1");
-  await pointer("mousemove", String(x + 90), String(y - 26));
-  await pointer("mousemove", String(x + 45), String(y - 65));
-  await pointer("mouseup", "1");
-  const [movedX, movedY] = geometry();
-  assert(Math.abs(movedX - x) >= 30 && Math.abs(movedY - y) >= 30);
-  [x, y, width, height] = geometry();
-  await pointer(
-    "mousemove",
-    String(x + width - 2),
-    String(y + height + 2),
-    "mousedown",
-    "1",
-  );
-  await pointer("mousemove", String(x + width + 10), String(y + height + 10));
-  await pointer("mousemove", String(x + width + 60), String(y + height + 40));
-  await pointer("mouseup", "1");
-  const [, , resizedWidth, resizedHeight] = geometry();
-  assert(resizedWidth > width && resizedHeight > height);
-  await pointer("key", "alt+F4");
-  await waitFor(
-    () =>
-      !run("xprop", "-root", "_NET_CLIENT_LIST").includes(
-        `0x${Number(id).toString(16)}`,
-      ),
-  );
-  console.log(
-    "PASS: relative includes, preserved source, repeated theme updates, maximize/restore, minimize/activation, dragging, resizing, and keyboard close",
-  );
-} finally {
-  for (const child of children.reverse()) {
-    child.kill();
-  }
-  await Promise.all(children.map((child) => child.exited));
-  await rm(directory, { recursive: true, force: true });
-}

package/src/__tests__/git-porcelain.test.ts

@@ -1,47 +0,0 @@
-import { describe, expect, test } from "bun:test";
-
-import {
-  collectDirtyPathsFromPorcelain,
-  parsePorcelainZ,
-} from "../workspace/git-porcelain.js";
-
-describe("parsePorcelainZ", () => {
-  test("parses ordinary modified and untracked records", () => {
-    expect(parsePorcelainZ("M  tracked.txt\0?? new.txt\0")).toEqual([
-      { status: "M ", path: "tracked.txt" },
-      { status: "??", path: "new.txt" },
-    ]);
-  });
-
-  test("captures rename origin on the same record", () => {
-    expect(parsePorcelainZ("R  dest.txt\0src.txt\0")).toEqual([
-      { status: "R ", path: "dest.txt", origin: "src.txt" },
-    ]);
-  });
-
-  test("captures copy origin on the same record", () => {
-    expect(parsePorcelainZ("C  dest.txt\0src.txt\0")).toEqual([
-      { status: "C ", path: "dest.txt", origin: "src.txt" },
-    ]);
-  });
-
-  test("skips short leftover NUL entries", () => {
-    expect(parsePorcelainZ("M  a.txt\0\0")).toEqual([
-      { status: "M ", path: "a.txt" },
-    ]);
-  });
-});
-
-describe("collectDirtyPathsFromPorcelain", () => {
-  test("flattens rename origin so both paths are staged", () => {
-    expect(
-      collectDirtyPathsFromPorcelain("R  dest.txt\0src.txt\0?? extra.txt\0"),
-    ).toEqual(["dest.txt", "src.txt", "extra.txt"]);
-  });
-
-  test("dedupes a path that appears as both origin and destination", () => {
-    expect(collectDirtyPathsFromPorcelain("R  same.txt\0same.txt\0")).toEqual([
-      "same.txt",
-    ]);
-  });
-});

package/src/__tests__/helpers/set-workspace-mcp.ts

@@ -1,11 +0,0 @@
-/**
- * Seed `$VELLUM_WORKSPACE_DIR/mcp.json` for tests that go through the
- * real workspace MCP loader.
- */
-
-import type { McpConfig } from "../../config/schemas/mcp.js";
-import { saveWorkspaceMcpConfig } from "../../mcp/workspace-mcp-config.js";
-
-export function setWorkspaceMcp(servers: McpConfig["servers"]): void {
-  saveWorkspaceMcpConfig({ servers });
-}

package/src/__tests__/message-deleted-hook-dispatch.test.ts

@@ -1,119 +0,0 @@
-/**
- * The `message-deleted` hook is dispatched by every primitive that removes
- * individual message rows, carrying each row's `(createdAt, id)`, so a plugin
- * keeping a cursor on a row learns where it sat once the row is gone.
- * DB-backed: exercises the real delete primitives against the test database.
- */
-import { beforeEach, describe, expect, test } from "bun:test";
-
-import { registerPluginHooks } from "../hooks/registry.js";
-import type { MessageDeletedContext } from "../hooks/types.js";
-import {
-  addMessage,
-  deleteLastExchange,
-  deleteMessageById,
-  getMessages,
-} from "../persistence/conversation-crud.js";
-import { getDb } from "../persistence/db-connection.js";
-import { initializeDb } from "../persistence/db-init.js";
-import { conversations, messages } from "../persistence/schema/index.js";
-import type { PluginHooks } from "../plugins/types.js";
-
-await initializeDb();
-
-const CONV_ID = "conv-message-deleted-hook";
-
-const received: Array<{
-  conversationId: string;
-  messageId: string;
-  createdAt: number;
-}> = [];
-registerPluginHooks("test-message-deleted-spy", {
-  "message-deleted": async (ctx: MessageDeletedContext) => {
-    received.push({
-      conversationId: ctx.conversationId,
-      messageId: ctx.messageId,
-      createdAt: ctx.createdAt,
-    });
-  },
-} as PluginHooks);
-
-/** Poll until the fire-and-forget hook chain has delivered `count` calls. */
-async function waitForCalls(count: number): Promise<void> {
-  const deadline = Date.now() + 2_000;
-  while (received.length < count && Date.now() < deadline) {
-    await Bun.sleep(10);
-  }
-}
-
-const text = (t: string) => JSON.stringify([{ type: "text", text: t }]);
-
-beforeEach(() => {
-  received.length = 0;
-  getDb().delete(messages).run();
-  getDb().delete(conversations).run();
-  const now = Date.now();
-  getDb()
-    .insert(conversations)
-    .values({
-      id: CONV_ID,
-      title: "message-deleted hook",
-      createdAt: now,
-      updatedAt: now,
-      source: "test",
-      conversationType: "standard",
-    })
-    .run();
-});
-
-describe("message-deleted hook dispatch", () => {
-  test("deleteMessageById dispatches once with the row's position", async () => {
-    await addMessage(CONV_ID, "user", text("hello"));
-    const reply = await addMessage(CONV_ID, "assistant", text("hi"));
-    const replyCreatedAt = getMessages(CONV_ID).find(
-      (m) => m.id === reply.id,
-    )!.createdAt;
-
-    deleteMessageById(reply.id);
-    await waitForCalls(1);
-
-    expect(received).toEqual([
-      {
-        conversationId: CONV_ID,
-        messageId: reply.id,
-        createdAt: replyCreatedAt,
-      },
-    ]);
-  });
-
-  test("deleteLastExchange dispatches for every row of the undone tail", async () => {
-    await addMessage(CONV_ID, "user", text("first"));
-    await addMessage(CONV_ID, "assistant", text("one"));
-    const user2 = await addMessage(CONV_ID, "user", text("second"));
-    const reply2 = await addMessage(CONV_ID, "assistant", text("two"));
-    const byId = new Map(getMessages(CONV_ID).map((m) => [m.id, m.createdAt]));
-
-    expect(deleteLastExchange(CONV_ID)).toBe(2);
-    await waitForCalls(2);
-
-    expect([...received].sort((a, b) => a.createdAt - b.createdAt)).toEqual([
-      {
-        conversationId: CONV_ID,
-        messageId: user2.id,
-        createdAt: byId.get(user2.id)!,
-      },
-      {
-        conversationId: CONV_ID,
-        messageId: reply2.id,
-        createdAt: byId.get(reply2.id)!,
-      },
-    ]);
-  });
-
-  test("a delete of a missing row dispatches nothing", async () => {
-    deleteMessageById("no-such-row");
-    await Bun.sleep(50);
-
-    expect(received).toEqual([]);
-  });
-});

package/src/__tests__/resolve-app.test.ts

@@ -1,135 +0,0 @@
-/**
- * Tests for resolving an app query by name, slug, or id.
- */
-
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-
-import { createApp } from "../apps/app-store.js";
-import { resolveAppQuery } from "../apps/resolve-app.js";
-import { getWorkspacePluginsDir } from "../util/platform.js";
-
-let workspaceDir: string;
-let previousWorkspaceDir: string | undefined;
-
-function freshWorkspace(): string {
-  return join(
-    tmpdir(),
-    `vellum-resolve-app-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-  );
-}
-
-function installPlugin(name: string): string {
-  const pluginDir = join(getWorkspacePluginsDir(), name);
-  mkdirSync(pluginDir, { recursive: true });
-  writeFileSync(
-    join(pluginDir, "package.json"),
-    JSON.stringify({ name, version: "1.0.0" }),
-  );
-  return pluginDir;
-}
-
-function bundleApp(pluginDir: string, app: string): void {
-  const appDir = join(pluginDir, "apps", app);
-  mkdirSync(appDir, { recursive: true });
-  writeFileSync(join(appDir, "index.html"), "<h1>Plugin app</h1>");
-}
-
-beforeEach(() => {
-  previousWorkspaceDir = process.env.VELLUM_WORKSPACE_DIR;
-  workspaceDir = freshWorkspace();
-  process.env.VELLUM_WORKSPACE_DIR = workspaceDir;
-});
-
-afterEach(() => {
-  rmSync(workspaceDir, { recursive: true, force: true });
-  if (previousWorkspaceDir === undefined) {
-    delete process.env.VELLUM_WORKSPACE_DIR;
-  } else {
-    process.env.VELLUM_WORKSPACE_DIR = previousWorkspaceDir;
-  }
-});
-
-describe("resolveAppQuery", () => {
-  test("resolves a workspace app by display name, slug, and id", () => {
-    const created = createApp({
-      name: "Budget",
-      schemaJson: "{}",
-      htmlDefinition: "<h1>Budget</h1>",
-    });
-
-    const byName = resolveAppQuery("Budget");
-    expect(byName.ok).toBe(true);
-    if (byName.ok) {
-      expect(byName.app.id).toBe(created.id);
-    }
-
-    const byNameCase = resolveAppQuery("budget");
-    expect(byNameCase.ok).toBe(true);
-    if (byNameCase.ok) {
-      expect(byNameCase.app.id).toBe(created.id);
-    }
-
-    const slug = created.dirName ?? "";
-    expect(slug.length).toBeGreaterThan(0);
-    const bySlug = resolveAppQuery(slug);
-    expect(bySlug.ok).toBe(true);
-    if (bySlug.ok) {
-      expect(bySlug.app.id).toBe(created.id);
-    }
-
-    const byId = resolveAppQuery(created.id);
-    expect(byId.ok).toBe(true);
-    if (byId.ok) {
-      expect(byId.app.id).toBe(created.id);
-    }
-  });
-
-  test("returns not_found for an unknown name", () => {
-    const result = resolveAppQuery("missing");
-    expect(result).toEqual({
-      ok: false,
-      reason: "not_found",
-      query: "missing",
-    });
-  });
-
-  test("returns ambiguous when two apps share a display name", () => {
-    const first = createApp({
-      name: "Notes",
-      schemaJson: "{}",
-      htmlDefinition: "<h1>One</h1>",
-    });
-    const second = createApp({
-      name: "Notes",
-      schemaJson: "{}",
-      htmlDefinition: "<h1>Two</h1>",
-    });
-
-    const result = resolveAppQuery("Notes");
-    expect(result.ok).toBe(false);
-    if (!result.ok && result.reason === "ambiguous") {
-      const ids = result.matches.map((m) => m.id).sort();
-      expect(ids).toEqual([first.id, second.id].sort());
-    } else {
-      throw new Error("expected ambiguous resolution");
-    }
-  });
-
-  test("resolves a plugin app by directory name", () => {
-    const pluginDir = installPlugin("charts");
-    bundleApp(pluginDir, "viewer");
-
-    const result = resolveAppQuery("viewer");
-    expect(result.ok).toBe(true);
-    if (result.ok) {
-      expect(result.app.origin).toEqual({
-        kind: "plugin",
-        pluginName: "charts",
-      });
-      expect(result.app.id).toBe("plugins~charts~viewer");
-    }
-  });
-});