@vellumai/assistant 0.5.15 → 0.6.0

package/src/__tests__/workspace-lifecycle.test.ts

@@ -6,7 +6,13 @@
  * in the same flow a real daemon conversation would follow.
  */
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  rmSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import {
@@ -23,6 +29,7 @@ import {
   getEnrichmentService,
 } from "../workspace/commit-message-enrichment-service.js";
 import {
+  _resetBreaker,
   _resetGitServiceRegistry,
   getWorkspaceGitService,
   WorkspaceGitService,
@@ -184,6 +191,27 @@ describe("Workspace git lifecycle (integration)", () => {
     await commitTurnChanges(testDir, conversationId, 3);
     expect(commitCount(testDir)).toBe(3); // Still 3
 
+    // Drain fire-and-forget enrichment from turn commits before heartbeat
+    // testing. Enrichment's writeNote() can leave a stale index.lock on
+    // some git versions (see heartbeat-service.ts:240-242), causing the
+    // heartbeat commit to fail with "index.lock: File exists".
+    await getEnrichmentService().shutdown();
+    _resetEnrichmentService();
+
+    // On CI, the enrichment service's spawned git child processes may still
+    // be alive briefly after the queue drains, holding index.lock. Remove it
+    // unconditionally and reset the circuit breaker so the heartbeat portion
+    // starts clean.
+    const lockPath = join(testDir, ".git", "index.lock");
+    if (existsSync(lockPath)) {
+      try {
+        unlinkSync(lockPath);
+      } catch {
+        /* race: already gone */
+      }
+    }
+    _resetBreaker(service);
+
     // ----------------------------------------------------------------
     // Step 5: Heartbeat safety net — simulate uncommitted changes
     //         that linger past the age threshold

package/src/__tests__/workspace-migration-009-backfill-conversation-disk-view.test.ts

@@ -1,39 +1,23 @@
 import {
   existsSync,
   mkdirSync,
-  mkdtempSync,
   readdirSync,
   readFileSync,
   rmSync,
   writeFileSync,
 } from "node:fs";
-import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Mocks — must come before any imports that depend on them
 // ---------------------------------------------------------------------------
 
-const testDir = mkdtempSync(join(tmpdir(), "workspace-migration-009-test-"));
-const workspaceDir = join(testDir, "workspace");
+const testDir = process.env.VELLUM_WORKSPACE_DIR!;
+const workspaceDir = testDir;
 const conversationsDir = join(workspaceDir, "conversations");
 mkdirSync(conversationsDir, { recursive: true });
 
-mock.module("../util/platform.js", () => ({
-  getDataDir: () => join(workspaceDir, "data"),
-  getWorkspaceDir: () => workspaceDir,
-  getConversationsDir: () => conversationsDir,
-  isMacOS: () => process.platform === "darwin",
-  isLinux: () => process.platform === "linux",
-  isWindows: () => process.platform === "win32",
-  getPidPath: () => join(testDir, "test.pid"),
-  getDbPath: () => join(testDir, "test.db"),
-  getLogPath: () => join(testDir, "test.log"),
-  ensureDataDir: () => {},
-  getProtectedDir: () => join(testDir, "protected"),
-}));
-
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
@@ -56,7 +40,7 @@ mock.module("../config/loader.js", () => ({
 // ---------------------------------------------------------------------------
 
 import { getConversationDirPath } from "../memory/conversation-disk-view.js";
-import { getDb, initializeDb, resetDb } from "../memory/db.js";
+import { getDb, initializeDb } from "../memory/db.js";
 import {
   attachments,
   conversations,
@@ -67,15 +51,6 @@ import { backfillConversationDiskViewMigration } from "../workspace/migrations/0
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-  try {
-    rmSync(testDir, { recursive: true, force: true });
-  } catch {
-    /* best effort */
-  }
-});
-
 function resetTables() {
   const db = getDb();
   db.run("DELETE FROM message_attachments");

package/src/__tests__/workspace-migration-012-rename-conversation-disk-view-dirs.test.ts

@@ -37,7 +37,7 @@ describe("012-rename-conversation-disk-view-dirs migration", () => {
       const legacyName = legacyConversationDirName("conv-123", createdAt);
       const legacyDir = join(conversationsDir, legacyName);
       mkdirSync(legacyDir, { recursive: true });
-      writeFileSync(join(legacyDir, "meta.json"), "{\"ok\":true}\n", "utf-8");
+      writeFileSync(join(legacyDir, "meta.json"), '{"ok":true}\n', "utf-8");
 
       renameConversationDiskViewDirsMigration.run(workspaceDir);
 
@@ -46,7 +46,7 @@ describe("012-rename-conversation-disk-view-dirs migration", () => {
       expect(existsSync(legacyDir)).toBe(false);
       expect(existsSync(newDir)).toBe(true);
       expect(readFileSync(join(newDir, "meta.json"), "utf-8")).toContain(
-        "\"ok\":true",
+        '"ok":true',
       );
     } finally {
       rmSync(workspaceDir, { recursive: true, force: true });

package/src/__tests__/workspace-migration-013-repair-conversation-disk-view.test.ts

@@ -1,39 +1,23 @@
 import {
   existsSync,
   mkdirSync,
-  mkdtempSync,
   readdirSync,
   readFileSync,
   rmSync,
   writeFileSync,
 } from "node:fs";
-import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 // ---------------------------------------------------------------------------
 // Mocks — must come before any imports that depend on them
 // ---------------------------------------------------------------------------
 
-const testDir = mkdtempSync(join(tmpdir(), "workspace-migration-013-test-"));
-const workspaceDir = join(testDir, "workspace");
+const testDir = process.env.VELLUM_WORKSPACE_DIR!;
+const workspaceDir = testDir;
 const conversationsDir = join(workspaceDir, "conversations");
 mkdirSync(conversationsDir, { recursive: true });
 
-mock.module("../util/platform.js", () => ({
-  getDataDir: () => join(workspaceDir, "data"),
-  getWorkspaceDir: () => workspaceDir,
-  getConversationsDir: () => conversationsDir,
-  isMacOS: () => process.platform === "darwin",
-  isLinux: () => process.platform === "linux",
-  isWindows: () => process.platform === "win32",
-  getPidPath: () => join(testDir, "test.pid"),
-  getDbPath: () => join(testDir, "test.db"),
-  getLogPath: () => join(testDir, "test.log"),
-  ensureDataDir: () => {},
-  getProtectedDir: () => join(testDir, "protected"),
-}));
-
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
@@ -56,7 +40,7 @@ mock.module("../config/loader.js", () => ({
 // ---------------------------------------------------------------------------
 
 import { getConversationDirPath } from "../memory/conversation-disk-view.js";
-import { getDb, initializeDb, rawRun, resetDb } from "../memory/db.js";
+import { getDb, initializeDb, rawRun } from "../memory/db.js";
 import {
   attachments,
   conversations,
@@ -67,15 +51,6 @@ import { repairConversationDiskViewMigration } from "../workspace/migrations/013
 
 initializeDb();
 
-afterAll(() => {
-  resetDb();
-  try {
-    rmSync(testDir, { recursive: true, force: true });
-  } catch {
-    /* best effort */
-  }
-});
-
 function resetTables() {
   const db = getDb();
   db.run("DELETE FROM message_attachments");