@cueloop/client 0.1.0-alpha.7 → 0.1.0-alpha.70

package/src/editor.test.ts

@@ -0,0 +1,149 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { editInEditor, resolveEditor, resolveEditorCommand } from "./editor";
+
+describe("resolveEditor", () => {
+  test("a clean environment falls back to nano so editing always works", () => {
+    // Assert
+    expect(resolveEditor(undefined, {})).toBe("nano");
+  });
+
+  test("the environment chain wins in order: CUELOOP_EDITOR, VISUAL, EDITOR", () => {
+    // Assert
+    expect(resolveEditor(undefined, { EDITOR: "vim", VISUAL: "code", CUELOOP_EDITOR: "hx" })).toBe(
+      "hx",
+    );
+    expect(resolveEditor(undefined, { EDITOR: "vim", VISUAL: "code" })).toBe("code");
+    expect(resolveEditor(undefined, { EDITOR: "vim" })).toBe("vim");
+  });
+
+  test("the [ui] editor config overrides the environment", () => {
+    // Assert
+    expect(resolveEditor("code --wait", { EDITOR: "vim" })).toBe("code --wait");
+  });
+});
+
+describe("resolveEditorCommand", () => {
+  test("a known GUI editor gets its wait flag appended and is trusted to wait", () => {
+    // Assert
+    expect(resolveEditorCommand("code")).toEqual({ argv: ["code", "--wait"], waits: true });
+    expect(resolveEditorCommand("subl")).toEqual({
+      argv: ["subl", "--new-window", "--wait"],
+      waits: true,
+    });
+  });
+
+  test("an existing wait flag is not duplicated", () => {
+    // Assert
+    expect(resolveEditorCommand("code --wait").argv).toEqual(["code", "--wait"]);
+  });
+
+  test("a terminal editor is left alone and trusted to hold the tty", () => {
+    // Assert
+    expect(resolveEditorCommand("vim")).toEqual({ argv: ["vim"], waits: true });
+  });
+
+  test("an unknown editor is neither flagged nor trusted to wait", () => {
+    // Assert
+    expect(resolveEditorCommand("my-editor")).toEqual({ argv: ["my-editor"], waits: false });
+  });
+});
+
+describe("editInEditor", () => {
+  let dir: string;
+
+  beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), "cueloop-edit-test-"));
+  });
+  afterEach(() => {
+    rmSync(dir, { recursive: true, force: true });
+  });
+
+  /** A runnable editor stub with a chosen base name and body. */
+  function stubEditor(name: string, body: string): string {
+    const script = join(dir, name);
+
+    writeFileSync(script, `#!/bin/sh\n${body}\n`);
+    chmodSync(script, 0o755);
+
+    return script;
+  }
+
+  const instant = (): (() => number) => {
+    let value = 0;
+
+    return () => (value += 5);
+  };
+
+  test("an editor that changes the file reports the new content", () => {
+    // Act
+    const result = editInEditor("old", "plan.md", {
+      editor: stubEditor("writer.sh", `printf 'new' > "$1"`),
+    });
+
+    // Assert
+    expect(result).toEqual({ content: "new", changed: true });
+  });
+
+  test("a fast, unchanged return opens the gate; confirming re-reads the saved file", () => {
+    // Arrange
+    let askedLabel = "";
+
+    // Act
+    const result = editInEditor("keep", "plan.md", {
+      editor: stubEditor("gui-like.sh", "exit 0"),
+      now: instant(),
+      confirmSaved: (label, path) => {
+        askedLabel = label;
+        writeFileSync(path, "saved in the GUI");
+
+        return true;
+      },
+    });
+
+    // Assert
+    expect(askedLabel).toContain("gui-like.sh");
+    expect(result).toEqual({ content: "saved in the GUI", changed: true });
+  });
+
+  test("declining the gate keeps the original content", () => {
+    // Act
+    const result = editInEditor("keep", "plan.md", {
+      editor: stubEditor("gui-like.sh", "exit 0"),
+      now: instant(),
+      confirmSaved: () => false,
+    });
+
+    // Assert
+    expect(result).toEqual({ content: "keep", changed: false });
+  });
+
+  test("a terminal editor that makes no change never opens the gate", () => {
+    // Arrange
+    let asked = false;
+
+    // Act
+    const result = editInEditor("keep", "plan.md", {
+      editor: stubEditor("vi", "exit 0"),
+      now: instant(),
+      confirmSaved: () => {
+        asked = true;
+
+        return true;
+      },
+    });
+
+    // Assert
+    expect(asked).toBeFalse();
+    expect(result).toEqual({ content: "keep", changed: false });
+  });
+
+  test("a nonzero editor exit throws", () => {
+    // Assert
+    expect(() => editInEditor("x", "plan.md", { editor: stubEditor("fail.sh", "exit 3") })).toThrow(
+      "editor exited 3",
+    );
+  });
+});

package/src/editor.ts

@@ -1,7 +1,11 @@
 /**
- * File-level edit mode = the $EDITOR hand-off (#22, #11): write the working
- * copy to a temp file, run the user's editor on it, read the result back.
- * Tests point CUELOOP_EDITOR at a non-interactive command.
+ * File-level edit mode = the editor hand-off: write the working copy to a temp
+ * file, run the reviewer's editor on it, read the result back. Editing must
+ * work with zero configuration, so the resolution chain ends in a terminal
+ * fallback that is always present. A GUI editor launched without a wait flag
+ * forks and returns instantly, losing the edit silently; known GUI editors get
+ * their wait flag applied, and any editor that still returns right away with an
+ * untouched file drops to a confirm gate rather than discarding the work.
  */
 
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
@@ -13,20 +17,146 @@ export interface EditResult {
   changed: boolean;
 }
 
-export function editInEditor(content: string, filename = "plan.md"): EditResult {
-  const editor = process.env.CUELOOP_EDITOR ?? process.env.VISUAL ?? process.env.EDITOR;
-  if (!editor) throw new Error("no editor: set $EDITOR (or $CUELOOP_EDITOR)");
+/** Present on every POSIX system, so a clean shell can still edit. */
+const DEFAULT_EDITOR = "nano";
+
+/** GUI editors fork and return immediately unless given their wait flag. */
+interface GuiWaitFlags {
+  [editor: string]: string[];
+}
+
+const GUI_WAIT_FLAGS: GuiWaitFlags = {
+  code: ["--wait"],
+  "code-insiders": ["--wait"],
+  codium: ["--wait"],
+  cursor: ["--wait"],
+  windsurf: ["--wait"],
+  subl: ["--new-window", "--wait"],
+  sublime_text: ["--new-window", "--wait"],
+  zed: ["--wait"],
+  bbedit: ["--wait"],
+  mate: ["--wait"],
+  gedit: ["--wait"],
+  kate: ["--block"],
+  idea: ["--wait"],
+  webstorm: ["--wait"],
+};
+
+/** Editors that hold the terminal themselves - never GUI, never a wait gate. */
+const TERMINAL_EDITORS = new Set([
+  "vi",
+  "vim",
+  "nvim",
+  "nano",
+  "pico",
+  "emacs",
+  "emacsclient",
+  "micro",
+  "hx",
+  "helix",
+  "kak",
+  "ed",
+  "joe",
+  "mcedit",
+]);
+
+export interface ResolvedEditor {
+  argv: string[];
+  /** True when this editor blocks the hand-off until the file is closed - a
+   * terminal editor, or a known GUI editor with its wait flag applied. */
+  waits: boolean;
+}
+
+/** The editor to run: [ui] editor, then the environment chain, then nano. */
+export function resolveEditor(
+  configuredEditor: string | undefined,
+  env: Record<string, string | undefined> = process.env,
+): string {
+  const candidates = [configuredEditor, env.CUELOOP_EDITOR, env.VISUAL, env.EDITOR];
+
+  return candidates.find((candidate) => candidate && candidate.trim())?.trim() ?? DEFAULT_EDITOR;
+}
+
+function editorBaseName(command: string): string {
+  return (command.split(/[\\/]/).pop() ?? command).toLowerCase();
+}
+
+/** Split the editor string and apply a GUI wait flag when we know one. */
+export function resolveEditorCommand(rawEditor: string): ResolvedEditor {
+  const parts = rawEditor.trim().split(/\s+/);
+  const base = editorBaseName(parts[0] ?? "");
+
+  if (TERMINAL_EDITORS.has(base)) return { argv: parts, waits: true };
+  const waitFlags = GUI_WAIT_FLAGS[base];
+
+  if (waitFlags) {
+    const alreadyWaits = parts.some(
+      (part) => part === "--wait" || part === "-w" || part === "--block",
+    );
+
+    return { argv: alreadyWaits ? parts : [...parts, ...waitFlags], waits: true };
+  }
+
+  return { argv: parts, waits: false };
+}
+
+/** A fast return with an untouched file means the editor probably did not wait. */
+const NO_WAIT_THRESHOLD_MS = 1000;
+
+function suspectsNoWait(resolved: ResolvedEditor, elapsedMs: number, unchanged: boolean): boolean {
+  if (resolved.waits) return false; // holds the terminal or has a wait flag - trust the exit
+  if (!unchanged) return false; // edits landed, so it waited after all
+
+  return elapsedMs < NO_WAIT_THRESHOLD_MS;
+}
+
+export interface EditHandOff {
+  /** Editor from [ui] editor config; overrides the environment. */
+  editor?: string;
+  env?: Record<string, string | undefined>;
+  /** Confirm gate for a suspected no-wait return; true re-reads the file. */
+  confirmSaved?: (editorLabel: string, path: string) => boolean;
+  now?: () => number;
+}
+
+/** Prompt on the released terminal during the suspend window. */
+function promptSaved(editorLabel: string, path: string): boolean {
+  const answer = prompt(
+    `${editorLabel} returned immediately and the plan is unchanged - a GUI editor needs its wait flag. Save and close ${path}, then press Enter to load your edits (or type n to skip):`,
+  );
+
+  return answer !== null && answer.trim().toLowerCase() !== "n";
+}
+
+export function editInEditor(
+  content: string,
+  filename = "plan.md",
+  handOff: EditHandOff = {},
+): EditResult {
+  const env = handOff.env ?? process.env;
+  const now = handOff.now ?? Date.now;
+  const resolved = resolveEditorCommand(resolveEditor(handOff.editor, env));
   const dir = mkdtempSync(join(tmpdir(), "cueloop-edit-"));
   const path = join(dir, filename);
+
   writeFileSync(path, content);
   try {
-    const proc = Bun.spawnSync([...editor.split(" "), path], {
+    const startedAt = now();
+    const editorProcess = Bun.spawnSync([...resolved.argv, path], {
       stdin: "inherit",
       stdout: "inherit",
       stderr: "inherit",
     });
-    if (proc.exitCode !== 0) throw new Error(`editor exited ${proc.exitCode}`);
-    const next = readFileSync(path, "utf8");
+
+    if (editorProcess.exitCode !== 0) throw new Error(`editor exited ${editorProcess.exitCode}`);
+    let next = readFileSync(path, "utf8");
+
+    if (suspectsNoWait(resolved, now() - startedAt, next === content)) {
+      const confirm = handOff.confirmSaved ?? promptSaved;
+
+      if (confirm(resolved.argv[0] ?? "the editor", path)) next = readFileSync(path, "utf8");
+    }
+
     return { content: next, changed: next !== content };
   } finally {
     rmSync(dir, { recursive: true, force: true });

package/src/ghostty-terminal.test.ts

@@ -0,0 +1,85 @@
+/** The libghostty-vt FFI wrapper round-trips VT: fed bytes come back as decoded cells with colors and attributes. Skipped where no prebuilt dylib ships for the platform. */
+
+import { describe, expect, test } from "bun:test";
+import { loadGhosttyTerminals } from "./ghostty-terminal";
+
+const factory = loadGhosttyTerminals();
+
+describe("ghostty-terminal FFI", () => {
+  test("reports platform support without throwing", () => {
+    // Assert - null on unsupported platforms, a factory where a dylib ships
+    expect(factory === null || factory.create !== undefined).toBe(true);
+  });
+
+  test.skipIf(!factory)("writes VT bytes and reads back decoded cells", () => {
+    // Arrange
+    const term = factory!.create(80, 24)!;
+
+    expect(term).not.toBeNull();
+
+    // Act - plain text then bold + palette-green "GO"
+    term.write(new TextEncoder().encode("hi\x1b[1;32mGO\x1b[0m"));
+    const cells = [0, 1, 2, 3].map((x) => term.readCell(x, 0));
+
+    // Assert - glyphs decode, the row reads as text, and the green run is bold on ANSI palette index 2
+    expect(
+      cells.map((c) => (c?.codepoint ? String.fromCodePoint(c.codepoint) : " ")).join(""),
+    ).toBe("hiGO");
+    expect(term.rowText(0, 80)).toBe("hiGO");
+    expect(cells[2]!.bold).toBe(true);
+    expect(cells[2]!.fg).toEqual({ kind: "palette", index: 2 });
+    term.free();
+  });
+
+  test.skipIf(!factory)("tracks the cursor position as text is written", () => {
+    // Arrange
+    const term = factory!.create(80, 24)!;
+
+    // Act
+    term.write(new TextEncoder().encode("abc"));
+
+    // Assert - cursor advanced past the three glyphs on row 0
+    const cursor = term.readCursor();
+
+    expect(cursor.y).toBe(0);
+    expect(cursor.x).toBe(3);
+    term.free();
+  });
+
+  test.skipIf(!factory)(
+    "preserves the native screen contract across resize and styled text",
+    () => {
+      // Arrange
+      const term = factory!.create(8, 2)!;
+
+      // Act - resize first, then write RGB colors, every supported style, and a wide glyph
+      term.resize(6, 3);
+      term.write(
+        new TextEncoder().encode(
+          "\x1b[38;2;12;34;56;48;2;78;90;123;1;3;4;7;9mA\x1b[0m\x1b[2mF\x1b[0m\u754c",
+        ),
+      );
+
+      // Assert - the flat native ABI retains cell data and rejects coordinates outside the viewport
+      expect(term.readCell(0, 0)).toEqual({
+        codepoint: 0x41,
+        fg: { kind: "rgb", r: 12, g: 34, b: 56 },
+        bg: { kind: "rgb", r: 78, g: 90, b: 123 },
+        width: 0,
+        bold: true,
+        italic: true,
+        underline: true,
+        inverse: true,
+        faint: false,
+        strikethrough: true,
+      });
+      expect(term.readCell(1, 0)?.faint).toBe(true);
+      expect(term.readCell(2, 0)?.codepoint).toBe("\u754c".codePointAt(0));
+      expect(term.readCell(2, 0)?.width).toBe(1);
+      expect(term.readCell(3, 0)?.width).toBe(2);
+      expect(term.readCell(6, 0)).toBeNull();
+      expect(term.readCell(0, 3)).toBeNull();
+      term.free();
+    },
+  );
+});

package/src/ghostty-terminal.ts

@@ -0,0 +1,199 @@
+/**
+ * A live in-process terminal emulator backed by Ghostty's VT core (libghostty-vt)
+ * through a flat FFI shim (native/src/shim.zig). Feed it a child process's PTY
+ * output with `write`, then read the rendered screen cell-by-cell with `readCell`
+ * to paint it anywhere - this is what lets a real `cc`/shell render inside an
+ * OpenTUI box. Load with `loadGhosttyTerminals`, which returns null when no
+ * prebuilt dylib exists for this platform (callers fall back to a herdr split).
+ */
+
+import { dlopen, FFIType, ptr } from "bun:ffi";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+
+/** How a cell's color arrived from Ghostty: the terminal default, an ANSI palette index, or true RGB. */
+export type GhosttyColor =
+  | { kind: "default" }
+  | { kind: "palette"; index: number }
+  | { kind: "rgb"; r: number; g: number; b: number };
+
+/** The cursor's viewport position and whether it should be drawn. */
+export interface GhosttyCursor {
+  x: number;
+  y: number;
+  visible: boolean;
+}
+
+/** One decoded screen cell: its glyph, colors, cell width, and text decorations. */
+export interface GhosttyCell {
+  /** Unicode code point; 0 = blank. */
+  codepoint: number;
+  fg: GhosttyColor;
+  bg: GhosttyColor;
+  /** Ghostty width tag: 0 = normal, 1 = double-width lead, 2 = trailing cell. */
+  width: number;
+  bold: boolean;
+  italic: boolean;
+  underline: boolean;
+  inverse: boolean;
+  faint: boolean;
+  strikethrough: boolean;
+}
+
+const CVT_SYMBOLS = {
+  cvt_new: { args: [FFIType.u16, FFIType.u16], returns: FFIType.ptr },
+  cvt_free: { args: [FFIType.ptr], returns: FFIType.void },
+  cvt_write: { args: [FFIType.ptr, FFIType.ptr, FFIType.u64], returns: FFIType.void },
+  cvt_resize: { args: [FFIType.ptr, FFIType.u16, FFIType.u16], returns: FFIType.void },
+  cvt_cell: { args: [FFIType.ptr, FFIType.u16, FFIType.u32, FFIType.ptr], returns: FFIType.i32 },
+  cvt_cursor: { args: [FFIType.ptr, FFIType.ptr], returns: FFIType.void },
+} as const;
+
+type CvtLib = ReturnType<typeof dlopen<typeof CVT_SYMBOLS>>["symbols"];
+
+/** The prebuilt shim dylib for this platform, or null when none ships for it. */
+function nativeLibraryPath(): string | null {
+  const suffix = process.platform === "darwin" ? "dylib" : "so";
+  const dir = `${process.platform}-${process.arch}`;
+  const path = join(import.meta.dir, "..", "native", dir, `libcueloopvt.${suffix}`);
+
+  return existsSync(path) ? path : null;
+}
+
+/** One shared load of the VT library; null when no dylib ships or it failed to load. */
+let ghosttyFactory: GhosttyTerminalFactory | null | undefined;
+
+/**
+ * Open the Ghostty VT library for this platform, or return null when the prebuilt
+ * dylib is missing (the caller degrades to a herdr split instead of embedding).
+ * The library is opened once per process; later calls return the same factory.
+ */
+export function loadGhosttyTerminals(): GhosttyTerminalFactory | null {
+  if (ghosttyFactory !== undefined) return ghosttyFactory;
+  const path = nativeLibraryPath();
+
+  if (!path) return (ghosttyFactory = null);
+  try {
+    const lib = dlopen(path, CVT_SYMBOLS);
+
+    ghosttyFactory = new GhosttyTerminalFactory(lib.symbols);
+  } catch (error) {
+    // The file exists but failed to load (bad arch, missing symbol) - a real
+    // fault, not the expected no-prebuilt case; surface it, then degrade.
+    console.error(`cueloop: failed to load ${path}:`, error);
+    ghosttyFactory = null;
+  }
+
+  return ghosttyFactory;
+}
+
+/** Creates `GhosttyTerminal`s that share one loaded copy of the VT library. */
+export class GhosttyTerminalFactory {
+  constructor(private readonly lib: CvtLib) {}
+  /** A fresh terminal sized to cols x rows, or null if allocation failed. */
+  create(cols: number, rows: number): GhosttyTerminal | null {
+    const handle = this.lib.cvt_new(cols, rows);
+
+    return handle ? new GhosttyTerminal(this.lib, handle) : null;
+  }
+}
+
+// The flat CvtCell struct the shim writes: u32 codepoint, fg rgba-ish (4 bytes),
+// bg (4 bytes), u8 width, u8 flags, u16 pad = 16 bytes.
+const CELL_STRUCT_BYTES = 16;
+const FLAG_BOLD = 1;
+const FLAG_ITALIC = 2;
+const FLAG_UNDERLINE = 4;
+const FLAG_INVERSE = 8;
+const FLAG_FAINT = 16;
+const FLAG_STRIKETHROUGH = 32;
+
+/** A live Ghostty terminal: feed PTY bytes, read the screen, resize, free. */
+export class GhosttyTerminal {
+  private readonly out = new Uint8Array(CELL_STRUCT_BYTES);
+  private readonly outView = new DataView(this.out.buffer);
+  private readonly cursorOut = new Uint8Array(8);
+  private freed = false;
+
+  constructor(
+    private readonly lib: CvtLib,
+    private readonly handle: NonNullable<ReturnType<CvtLib["cvt_new"]>>,
+  ) {}
+
+  /** Process a chunk of the child's PTY output into the screen state. */
+  write(bytes: Uint8Array): void {
+    if (this.freed || bytes.length === 0) return;
+    this.lib.cvt_write(this.handle, ptr(bytes), BigInt(bytes.length));
+  }
+
+  /** Resize the screen (and the child's tty, via the caller) to cols x rows. */
+  resize(cols: number, rows: number): void {
+    if (this.freed) return;
+    this.lib.cvt_resize(this.handle, cols, rows);
+  }
+
+  /** The rendered cell at viewport (x, y), or null when out of range. */
+  readCell(x: number, y: number): GhosttyCell | null {
+    if (this.freed) return null;
+    if (this.lib.cvt_cell(this.handle, x, y, ptr(this.out)) !== 0) return null;
+    const flags = this.out[13]!;
+
+    return {
+      codepoint: this.outView.getUint32(0, true),
+      fg: decodeColor(this.out[7]!, this.out[4]!, this.out[5]!, this.out[6]!),
+      bg: decodeColor(this.out[11]!, this.out[8]!, this.out[9]!, this.out[10]!),
+      width: this.out[12]!,
+      bold: (flags & FLAG_BOLD) !== 0,
+      italic: (flags & FLAG_ITALIC) !== 0,
+      underline: (flags & FLAG_UNDERLINE) !== 0,
+      inverse: (flags & FLAG_INVERSE) !== 0,
+      faint: (flags & FLAG_FAINT) !== 0,
+      strikethrough: (flags & FLAG_STRIKETHROUGH) !== 0,
+    };
+  }
+
+  /**
+   * Row `y` as text: blank cells read as spaces, the trailing half of a wide
+   * glyph is skipped, and trailing spaces are trimmed.
+   */
+  rowText(y: number, cols: number): string {
+    let line = "";
+
+    for (let x = 0; x < cols; x++) {
+      const cell = this.readCell(x, y);
+
+      if (cell === null || cell.width === 2) continue;
+      line += cell.codepoint === 0 ? " " : String.fromCodePoint(cell.codepoint);
+    }
+
+    return line.trimEnd();
+  }
+
+  /** The cursor's current viewport position and visibility. */
+  readCursor(): GhosttyCursor {
+    if (this.freed) return { x: 0, y: 0, visible: false };
+    this.lib.cvt_cursor(this.handle, ptr(this.cursorOut));
+    const view = new DataView(this.cursorOut.buffer);
+
+    return {
+      x: view.getUint16(0, true),
+      y: view.getUint16(2, true),
+      visible: this.cursorOut[4] === 1,
+    };
+  }
+
+  /** Release the terminal; further calls are no-ops. Call once on teardown. */
+  free(): void {
+    if (this.freed) return;
+    this.freed = true;
+    this.lib.cvt_free(this.handle);
+  }
+}
+
+/** Decode the shim's (kind, r, g, b) color triple; palette carries its index in r. */
+function decodeColor(kind: number, r: number, g: number, b: number): GhosttyColor {
+  if (kind === 2) return { kind: "rgb", r, g, b };
+  if (kind === 1) return { kind: "palette", index: r };
+
+  return { kind: "default" };
+}

package/src/herdr.test.ts

@@ -2,50 +2,23 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { focusHerdrPane, returnPaneFor } from "./herdr";
+import { focusHerdrPane } from "./herdr";
 
 let dir: string;
-const savedEnv: Record<string, string | undefined> = {};
 
 beforeEach(() => {
   dir = mkdtempSync(join(tmpdir(), "cueloop-herdr-"));
-  for (const k of ["HERDR_ENV", "HERDR_PANE_ID", "HERDR_BIN_PATH", "CUELOOP_RETURN_PANE"]) {
-    savedEnv[k] = process.env[k];
-    delete process.env[k];
-  }
 });
 afterEach(() => {
-  for (const [k, v] of Object.entries(savedEnv)) {
-    if (v === undefined) delete process.env[k];
-    else process.env[k] = v;
-  }
   rmSync(dir, { recursive: true, force: true });
 });
 
-describe("returnPaneFor", () => {
-  test("outside herdr there is never a return target", () => {
-    expect(returnPaneFor("w1:p1")).toBeUndefined();
-  });
-
-  test("env override wins, session meta is the fallback", () => {
-    process.env.HERDR_ENV = "1";
-    process.env.HERDR_PANE_ID = "w1:p9";
-    expect(returnPaneFor("w1:p1")).toBe("w1:p1");
-    process.env.CUELOOP_RETURN_PANE = "w1:p2";
-    expect(returnPaneFor("w1:p1")).toBe("w1:p2");
-  });
-
-  test("returning to our own pane is a no-op", () => {
-    process.env.HERDR_ENV = "1";
-    process.env.HERDR_PANE_ID = "w1:p1";
-    expect(returnPaneFor("w1:p1")).toBeUndefined();
-  });
-});
-
 describe("focusHerdrPane", () => {
   test("resolves the pane's tab and focuses it", () => {
+    // Arrange
     const log = join(dir, "calls.log");
     const stub = join(dir, "herdr");
+
     writeFileSync(
       stub,
       `#!/bin/sh
@@ -54,15 +27,17 @@ if [ "$1" = "pane" ]; then echo '{"result":{"pane":{"tab_id":"w1:t3"}}}'; fi
 `,
     );
     Bun.spawnSync(["chmod", "+x", stub]);
-    process.env.HERDR_BIN_PATH = stub;
-    expect(focusHerdrPane("w1:p1")).toBe(true);
+
+    // Assert
+    expect(focusHerdrPane(stub, "w1:p1")).toBe(true);
     const calls = readFileSync(log, "utf8").trim().split("\n");
+
     expect(calls[0]).toBe("pane get w1:p1");
     expect(calls[1]).toBe("tab focus w1:t3");
   });
 
   test("a missing binary never throws", () => {
-    process.env.HERDR_BIN_PATH = join(dir, "nope");
-    expect(focusHerdrPane("w1:p1")).toBe(false);
+    // Assert
+    expect(focusHerdrPane(join(dir, "nope"), "w1:p1")).toBe(false);
   });
 });