test(worktree): fix concurrent test worktree conflict and biome lint warnings

Author: gracefullight

cli/commands/install/cross-platform.test.ts

@@ -96,7 +96,7 @@ describe("applyWin32LongPathPrefix — Task 23 (T2.12) — cross-platform invari
       value: "win32",
       configurable: true,
     });
-    const path = "C:\\" + "a".repeat(260 - 3); // total 260
+    const path = `C:\\${"a".repeat(260 - 3)}`; // total 260
     expect(applyWin32LongPathPrefix(path)).toBe(path);
   });
 
@@ -105,7 +105,7 @@ describe("applyWin32LongPathPrefix — Task 23 (T2.12) — cross-platform invari
       value: "win32",
       configurable: true,
     });
-    const path = "C:\\" + "a".repeat(261 - 3); // total 261
+    const path = `C:\\${"a".repeat(261 - 3)}`; // total 261
     const out = applyWin32LongPathPrefix(path);
     expect(out.startsWith("\\\\?\\")).toBe(true);
     expect(out.endsWith(path)).toBe(true);
@@ -116,7 +116,7 @@ describe("applyWin32LongPathPrefix — Task 23 (T2.12) — cross-platform invari
       value: "win32",
       configurable: true,
     });
-    const prefixed = "\\\\?\\C:\\" + "a".repeat(300);
+    const prefixed = `\\\\?\\C:\\${"a".repeat(300)}`;
     expect(applyWin32LongPathPrefix(prefixed)).toBe(prefixed);
   });
 
@@ -125,7 +125,7 @@ describe("applyWin32LongPathPrefix — Task 23 (T2.12) — cross-platform invari
       value: "darwin",
       configurable: true,
     });
-    const path = "/tmp/" + "a".repeat(300);
+    const path = `/tmp/${"a".repeat(300)}`;
     expect(applyWin32LongPathPrefix(path)).toBe(path);
   });
 
@@ -134,7 +134,7 @@ describe("applyWin32LongPathPrefix — Task 23 (T2.12) — cross-platform invari
       value: "linux",
       configurable: true,
     });
-    const path = "/home/" + "a".repeat(300);
+    const path = `/home/${"a".repeat(300)}`;
     expect(applyWin32LongPathPrefix(path)).toBe(path);
   });
 });

cli/commands/install/install-global.test.ts

@@ -293,8 +293,10 @@ describe("install --global: _install.json schema and meta", () => {
     ).mock.calls.filter((call: unknown[]) => call[0] === configPath);
 
     // At least one write to oma-config.yaml should have occurred
-    expect(writes.length).toBeGreaterThan(0);
-    const lastWrite = writes[writes.length - 1]!;
+    const lastWrite = writes[writes.length - 1];
+    if (!lastWrite) {
+      throw new Error("Expected at least one write");
+    }
     const writtenContent = String(lastWrite[1]);
     expect(writtenContent).toContain("custom_user_field: my_value");
   });

cli/commands/update/update-global.test.ts

@@ -280,7 +280,7 @@ describe("update --global: _install.json lifecycle", () => {
     fs.mkdirSync(path.join(repoDir, ".agents", "skills"), { recursive: true });
     fs.writeFileSync(
       path.join(repoDir, ".agents", "skills", "_version.json"),
-      JSON.stringify({ version: "8.1.0" }) + "\n",
+      `${JSON.stringify({ version: "8.1.0" })}\n`,
     );
     tarballState.downloadAndExtract.mockResolvedValue({
       dir: repoDir,

cli/io/worktree.test.ts

@@ -14,8 +14,10 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { createWorktree, formatWorktreeSummary } from "./worktree.js";
 
 let repoDir: string;
+let sessionsToCleanup: string[] = [];
 
 beforeEach(() => {
+  sessionsToCleanup = [];
   repoDir = mkdtempSync(path.join(tmpdir(), "oma-worktree-test-"));
   execSync("git init -b main", { cwd: repoDir, stdio: "pipe" });
   execSync('git config user.email "test@example.com"', {
@@ -52,16 +54,32 @@ afterEach(() => {
   } catch {
     // ignore — repo may already be torn down
   }
+
+  // Clean up any worktree directories from tmp
+  for (const sess of sessionsToCleanup) {
+    try {
+      const wtRoot = path.join(tmpdir(), "oma-worktrees", sess);
+      if (existsSync(wtRoot)) {
+        rmSync(wtRoot, { recursive: true, force: true });
+      }
+    } catch {
+      // ignore
+    }
+  }
+
   if (existsSync(repoDir)) {
     rmSync(repoDir, { recursive: true, force: true });
   }
 });
 
 describe("createWorktree", () => {
   it("creates a worktree + branch from the current HEAD", () => {
-    const handle = createWorktree("sess-001", "oma-backend", repoDir);
+    const sessId = `sess-001-${Math.random().toString(36).slice(2)}`;
+    sessionsToCleanup.push(sessId);
+
+    const handle = createWorktree(sessId, "oma-backend", repoDir);
     expect(existsSync(handle.path)).toBe(true);
-    expect(handle.branch).toBe("oma/sess-001/oma-backend");
+    expect(handle.branch).toBe(`oma/${sessId}/oma-backend`);
     expect(handle.base).toBe("main");
 
     // The branch should be checked out at the new path
@@ -73,8 +91,12 @@ describe("createWorktree", () => {
   });
 
   it("sanitizes unsafe characters in sessionId / agentId for the branch", () => {
-    const handle = createWorktree("sess with space", "agent$weird", repoDir);
-    expect(handle.branch).toMatch(/^oma\/sess-with-space\/agent-weird$/);
+    const sessId = `sess with space-${Math.random().toString(36).slice(2)}`;
+    sessionsToCleanup.push(sessId);
+
+    const handle = createWorktree(sessId, "agent$weird", repoDir);
+    const safeSess = sessId.replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 64);
+    expect(handle.branch).toBe(`oma/${safeSess}/agent-weird`);
   });
 
   it("throws when source is not a git repo", () => {
@@ -86,8 +108,11 @@ describe("createWorktree", () => {
   });
 
   it("throws when the target worktree path already exists", () => {
-    createWorktree("dup-session", "agent", repoDir);
-    expect(() => createWorktree("dup-session", "agent", repoDir)).toThrow(
+    const sessId = `dup-session-${Math.random().toString(36).slice(2)}`;
+    sessionsToCleanup.push(sessId);
+
+    createWorktree(sessId, "agent", repoDir);
+    expect(() => createWorktree(sessId, "agent", repoDir)).toThrow(
       /Worktree path already exists/,
     );
   });

cli/platform/hooks-composer.test.ts

@@ -15,8 +15,10 @@ describe("hook self-dedup preamble (EC-6 / T2.1)", () => {
     expect(withoutShebang.startsWith(HOOK_DEDUP_PREAMBLE)).toBe(true);
   });
 
+  // biome-ignore lint/suspicious/noTemplateCurlyInString: Bash variables
   it("dedup preamble references /tmp/oma-hook-${UID}-${OMA_SESSION_ID:-default}.lock", () => {
     expect(HOOK_DEDUP_PREAMBLE).toContain(
+      // biome-ignore lint/suspicious/noTemplateCurlyInString: Bash variables
       '"/tmp/oma-hook-${UID:-${EUID:-0}}-${OMA_SESSION_ID:-default}.lock"',
     );
   });

cli/utils/i18n.test.ts

@@ -51,13 +51,13 @@ describe("t()", () => {
   it("returns ko text when LANG=ko_KR.UTF-8", () => {
     process.env.LANG = "ko_KR.UTF-8";
     const result = t("install.sudoRefused");
-    expect(result).toBe(MESSAGES["install.sudoRefused"]!.ko);
+    expect(result).toBe(MESSAGES["install.sudoRefused"]?.ko);
   });
 
   it("returns en text when LANG=en_US.UTF-8", () => {
     process.env.LANG = "en_US.UTF-8";
     const result = t("install.sudoRefused");
-    expect(result).toBe(MESSAGES["install.sudoRefused"]!.en);
+    expect(result).toBe(MESSAGES["install.sudoRefused"]?.en);
   });
 
   it("interpolates {pid} correctly", () => {
@@ -77,6 +77,6 @@ describe("t()", () => {
   it("returns message without interpolation when no vars passed", () => {
     process.env.LANG = "en_US.UTF-8";
     const result = t("install.sudoRefused");
-    expect(result).toBe(MESSAGES["install.sudoRefused"]!.en);
+    expect(result).toBe(MESSAGES["install.sudoRefused"]?.en);
   });
 });