turbollm 1.9.6 → 1.9.7

package/dist/cli.js

@@ -30,10 +30,10 @@ function hideChildConsoleWindows() {
 }
 
 // src/cli.ts
-import { spawn as spawn8 } from "child_process";
+import { spawn as spawn9 } from "child_process";
 import { openSync as openSync3, readFileSync as readFileSync19 } from "fs";
 import { serve } from "@hono/node-server";
-import { dirname as dirname12, join as join35 } from "path";
+import { dirname as dirname12, join as join36 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/config/config.ts
@@ -5435,6 +5435,7 @@ function rowToAgentRun(r) {
     useWorktree: r.use_worktree === null ? void 0 : r.use_worktree === 1,
     worktreeBranch: r.worktree_branch ?? void 0,
     worktreeBase: r.worktree_base ?? void 0,
+    worktreePath: r.worktree_path ?? void 0,
     linesAdded: r.lines_added ?? void 0,
     linesRemoved: r.lines_removed ?? void 0,
     compactionSummary: r.compaction_summary ?? void 0,
@@ -5752,6 +5753,10 @@ var ConversationStore = class {
       if (!this.hasColumn("api_usage", "gen_tps")) this.db.exec(`ALTER TABLE api_usage ADD COLUMN gen_tps REAL;`);
       this.db.exec(`PRAGMA user_version = 39;`);
     }
+    if (v < 40) {
+      if (!this.hasColumn("agent_runs", "worktree_path")) this.db.exec(`ALTER TABLE agent_runs ADD COLUMN worktree_path TEXT;`);
+      this.db.exec(`PRAGMA user_version = 40;`);
+    }
   }
   listConversations(q, kind = "all") {
     if (q) {
@@ -6404,7 +6409,7 @@ var ConversationStore = class {
     const id = randomUUID3();
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const agentId = params.agentId ?? null;
-    this.db.prepare(`INSERT INTO agent_runs (id,conv_id,title,status,allowed_tools,agent_id,repo_root,repo_branch,use_worktree,worktree_branch,worktree_base,lines_added,lines_removed,code_agent,created_at,updated_at) VALUES ($id,$cid,$title,'queued',$at,$aid,$rr,$rb,$uw,$wb,$wbase,$la,$lr,$ca,$now,$now)`).run({
+    this.db.prepare(`INSERT INTO agent_runs (id,conv_id,title,status,allowed_tools,agent_id,repo_root,repo_branch,use_worktree,worktree_branch,worktree_base,worktree_path,lines_added,lines_removed,code_agent,created_at,updated_at) VALUES ($id,$cid,$title,'queued',$at,$aid,$rr,$rb,$uw,$wb,$wbase,$wpath,$la,$lr,$ca,$now,$now)`).run({
       $id: id,
       $cid: params.convId,
       $title: params.title,
@@ -6415,6 +6420,7 @@ var ConversationStore = class {
       $uw: params.useWorktree === void 0 ? null : params.useWorktree ? 1 : 0,
       $wb: params.worktreeBranch ?? null,
       $wbase: params.worktreeBase ?? null,
+      $wpath: params.worktreePath ?? null,
       // Phase 1: diff stats are not computed yet — seed a code run's counters at 0 so the
       // sidebar shows +0/-0 rather than a blank; a background 'agent' run leaves them NULL.
       $la: params.repoRoot !== void 0 ? 0 : null,
@@ -11610,14 +11616,14 @@ import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { existsSync as existsSync24, readFileSync as readFileSync17, statSync as statSync6 } from "fs";
 import { fileURLToPath } from "url";
-import { dirname as dirname11, join as join32, normalize as normalize2 } from "path";
+import { dirname as dirname11, join as join33, normalize as normalize2 } from "path";
 import { Agent, setGlobalDispatcher } from "undici";
 
 // src/api/routes.ts
 import { streamSSE as streamSSE2 } from "hono/streaming";
 import { existsSync as existsSync22, mkdirSync as mkdirSync16, readFileSync as readFileSync14, readdirSync as readdirSync10, realpathSync, rmSync as rmSync14, statSync as statSync5, writeFileSync as writeFileSync14 } from "fs";
 import { execFileSync as execFileSync6 } from "child_process";
-import { basename as basename3, dirname as dirname9, join as join28, resolve } from "path";
+import { basename as basename3, dirname as dirname9, join as join29, resolve } from "path";
 
 // src/comfyui/gate-template.ts
 var GATE_VERSION = 2;
@@ -13701,7 +13707,7 @@ function resolveClaudePermissionMode(mode, choices) {
   return prefs.find((p) => choices.includes(p)) ?? null;
 }
 var realHelpRunner = async () => {
-  const { spawn: spawn9 } = await import("child_process");
+  const { spawn: spawn10 } = await import("child_process");
   const { buildShellCommand: buildShellCommand2 } = await import("./shell-command-QI6VPNNL.js");
   const { requiresShell: requiresShell2, resolveExecutable: resolveExecutable2 } = await import("./resolve-executable-ZWQDUVY3.js");
   return await new Promise((resolve5) => {
@@ -13716,7 +13722,7 @@ var realHelpRunner = async () => {
     try {
       const resolved = resolveExecutable2("claude");
       const stdio = ["ignore", "pipe", "ignore"];
-      const child = requiresShell2(resolved) ? spawn9(buildShellCommand2("claude", ["--help"]), { shell: true, stdio }) : spawn9(resolved ?? "claude", ["--help"], { stdio });
+      const child = requiresShell2(resolved) ? spawn10(buildShellCommand2("claude", ["--help"]), { shell: true, stdio }) : spawn10(resolved ?? "claude", ["--help"], { stdio });
       const timer = setTimeout(() => {
         try {
           child.kill();
@@ -14158,6 +14164,143 @@ var TerminalManager = class {
   }
 };
 
+// src/code/worktree.ts
+import { spawn as spawn5 } from "child_process";
+import { appendFile, readFile as readFile2, mkdir as mkdir2 } from "fs/promises";
+import { join as join25 } from "path";
+var WORKTREES_SUBDIR = join25(".turbollm", "worktrees");
+var EXCLUDE_LINE = "/.turbollm/";
+var MAX_BRANCH_SUFFIX = 20;
+function runGit(cwd, args, timeoutMs = 3e4) {
+  return new Promise((resolve5) => {
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    const done = (r) => {
+      if (!settled) {
+        settled = true;
+        resolve5(r);
+      }
+    };
+    try {
+      const child = spawn5("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+      const timer = setTimeout(() => {
+        try {
+          child.kill();
+        } catch {
+        }
+        done({ ok: false, stdout, stderr: stderr || `git ${args[0]} timed out after ${timeoutMs}ms` });
+      }, timeoutMs);
+      child.stdout?.on("data", (b) => {
+        stdout += b.toString("utf8");
+      });
+      child.stderr?.on("data", (b) => {
+        stderr += b.toString("utf8");
+      });
+      child.on("error", (e) => {
+        clearTimeout(timer);
+        done({ ok: false, stdout, stderr: e.message });
+      });
+      child.on("close", (code) => {
+        clearTimeout(timer);
+        done({ ok: code === 0, stdout, stderr });
+      });
+    } catch (e) {
+      done({ ok: false, stdout: "", stderr: e.message });
+    }
+  });
+}
+async function isGitRepo(root) {
+  const r = await runGit(root, ["rev-parse", "--is-inside-work-tree"]);
+  return r.ok && r.stdout.trim() === "true";
+}
+function sanitizeBranchName(raw) {
+  const cleaned = raw.trim().toLowerCase().replace(/\s+/g, "-").replace(/[~^:?*[\]\\]/g, "").replace(/\.\.+/g, "-").replace(/\/+/g, "/").replace(/^[/.]+/, "").replace(/\.lock$/, "").replace(/-+/g, "-").slice(0, 80).replace(/[-./]+$/, "");
+  return cleaned || "turbollm-session";
+}
+async function refExists(repoRoot, name) {
+  const r = await runGit(repoRoot, ["rev-parse", "--verify", "--quiet", `refs/heads/${name}`]);
+  return r.ok && r.stdout.trim().length > 0;
+}
+async function findFreeBranchName(repoRoot, desired) {
+  if (!await refExists(repoRoot, desired)) return desired;
+  for (let n = 2; n <= MAX_BRANCH_SUFFIX; n++) {
+    const candidate = `${desired}-${n}`;
+    if (!await refExists(repoRoot, candidate)) return candidate;
+  }
+  return null;
+}
+async function ensureLocalExclude(repoRoot) {
+  try {
+    const gitDir = await resolveGitDir(repoRoot);
+    if (!gitDir) return;
+    const infoDir = join25(gitDir, "info");
+    const excludePath = join25(infoDir, "exclude");
+    let current = "";
+    try {
+      current = await readFile2(excludePath, "utf8");
+    } catch {
+    }
+    if (current.split(/\r?\n/).some((l) => l.trim() === EXCLUDE_LINE)) return;
+    await mkdir2(infoDir, { recursive: true });
+    await appendFile(excludePath, `${current.endsWith("\n") || current === "" ? "" : "\n"}${EXCLUDE_LINE}
+`, "utf8");
+  } catch {
+  }
+}
+async function resolveGitDir(repoRoot) {
+  const r = await runGit(repoRoot, ["rev-parse", "--absolute-git-dir"]);
+  const p = r.stdout.trim();
+  return r.ok && p ? p : null;
+}
+function agentCwd(run) {
+  return run.worktreePath ?? run.repoRoot ?? "";
+}
+async function createSessionWorktree(params) {
+  const { repoRoot, base: base2 } = params;
+  if (!await isGitRepo(repoRoot)) {
+    return {
+      ok: false,
+      code: "not_a_repo",
+      message: `Cannot create a worktree: ${repoRoot} is not a git repository. Untick "Use worktree" to work in the folder directly, or run \`git init\` there first.`
+    };
+  }
+  const desired = sanitizeBranchName(params.branch);
+  const branch = await findFreeBranchName(repoRoot, desired);
+  if (!branch) {
+    return {
+      ok: false,
+      code: "branch_unavailable",
+      message: `Cannot create a worktree: branches "${desired}" through "${desired}-${MAX_BRANCH_SUFFIX}" all already exist. Choose a different branch name.`
+    };
+  }
+  await ensureLocalExclude(repoRoot);
+  const path = join25(repoRoot, WORKTREES_SUBDIR, branch);
+  const baseArgs = base2 && await refExists(repoRoot, base2) ? [base2] : [];
+  const r = await runGit(repoRoot, ["worktree", "add", "-b", branch, path, ...baseArgs], 12e4);
+  if (!r.ok) {
+    return {
+      ok: false,
+      code: "git_failed",
+      message: `Cannot create a worktree: ${(r.stderr || r.stdout).trim().slice(0, 400)}`
+    };
+  }
+  return { ok: true, path, branch };
+}
+async function removeSessionWorktree(repoRoot, worktreePath) {
+  const r = await runGit(repoRoot, ["worktree", "remove", worktreePath], 6e4);
+  if (r.ok) return { ok: true };
+  const err7 = (r.stderr || r.stdout).trim();
+  if (/contains modified or untracked files|use --force/i.test(err7)) {
+    return {
+      ok: false,
+      code: "dirty",
+      message: `The worktree at ${worktreePath} still has uncommitted changes, so it was left in place. Commit or discard them, then remove it with: git worktree remove "${worktreePath}"`
+    };
+  }
+  return { ok: false, code: "git_failed", message: err7.slice(0, 400) };
+}
+
 // src/terminal/terminal-routes.ts
 async function body2(c) {
   try {
@@ -14269,7 +14412,7 @@ function registerTerminalRoutes(app2, d) {
         mode,
         firstMessage
       );
-      const terminalId = m.create(run.repoRoot, run.id, cols, rows, launchCommand);
+      const terminalId = m.create(agentCwd(run), run.id, cols, rows, launchCommand);
       if (!run.terminalLaunchedOnce) d.db.updateAgentRun(run.id, { terminalLaunchedOnce: true });
       return c.json({ terminalId }, 201);
     } catch (e) {
@@ -14797,7 +14940,7 @@ function catalogEngine(id) {
 import { execFile as execFile11 } from "child_process";
 import { cpSync as cpSync2, existsSync as existsSync20, mkdirSync as mkdirSync14, readdirSync as readdirSync9, rmSync as rmSync13 } from "fs";
 import { tmpdir } from "os";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 import { promisify as promisify8 } from "util";
 var execFileP8 = promisify8(execFile11);
 var REDIST_BASE = "https://developer.download.nvidia.com/compute/cuda/redist/";
@@ -14852,9 +14995,9 @@ async function provisionCuda(dataDir, onProgress, signal) {
     phase: "resolving",
     message: `Using CUDA ${version2}${driverMax ? ` (driver supports up to ${driverMax})` : ""}.`
   });
-  const root = join25(dataDir, "cuda", version2);
-  const binDir = join25(root, "bin");
-  if (existsSync20(join25(binDir, "nvcc.exe"))) {
+  const root = join26(dataDir, "cuda", version2);
+  const binDir = join26(root, "bin");
+  if (existsSync20(join26(binDir, "nvcc.exe"))) {
     onProgress({ phase: "assembling", message: `CUDA ${version2} already downloaded \u2014 reusing it.` });
     return { root, binDir, version: version2 };
   }
@@ -14869,7 +15012,7 @@ async function provisionCuda(dataDir, onProgress, signal) {
     const rel = relOf(id);
     if (rel) components.push({ id, url: REDIST_BASE + rel });
   }
-  const work = join25(tmpdir(), `tllm-cuda-${version2}`);
+  const work = join26(tmpdir(), `tllm-cuda-${version2}`);
   rmSync13(work, { recursive: true, force: true });
   mkdirSync14(work, { recursive: true });
   const stageRoot = `${root}.partial`;
@@ -14878,23 +15021,23 @@ async function provisionCuda(dataDir, onProgress, signal) {
   try {
     for (let i = 0; i < components.length; i++) {
       const { id, url } = components[i];
-      const zip = join25(work, `${id}.zip`);
+      const zip = join26(work, `${id}.zip`);
       onProgress({ phase: "downloading", message: `Downloading ${id} (${i + 1}/${components.length})\u2026`, pct: 0 });
       await downloadFile(url, zip, (p) => onProgress({ phase: "downloading", message: `Downloading ${id} (${i + 1}/${components.length})\u2026`, pct: p.pct }), signal);
-      const exDir = join25(work, id);
+      const exDir = join26(work, id);
       mkdirSync14(exDir, { recursive: true });
       onProgress({ phase: "extracting", message: `Extracting ${id}\u2026` });
       await extractArchive(zip, exDir);
-      const inner = readdirSync9(exDir).map((n) => join25(exDir, n)).find((p) => existsSync20(join25(p, "include")) || existsSync20(join25(p, "bin")) || existsSync20(join25(p, "lib")));
-      const srcRoot = inner ?? join25(exDir, readdirSync9(exDir)[0] ?? "");
+      const inner = readdirSync9(exDir).map((n) => join26(exDir, n)).find((p) => existsSync20(join26(p, "include")) || existsSync20(join26(p, "bin")) || existsSync20(join26(p, "lib")));
+      const srcRoot = inner ?? join26(exDir, readdirSync9(exDir)[0] ?? "");
       cpSync2(srcRoot, stageRoot, { recursive: true, force: true });
       rmSync13(zip, { force: true });
     }
-    if (!existsSync20(join25(stageRoot, "bin", "nvcc.exe"))) {
+    if (!existsSync20(join26(stageRoot, "bin", "nvcc.exe"))) {
       throw new Error("Assembled CUDA toolkit is missing bin/nvcc.exe \u2014 the component set may have changed.");
     }
     rmSync13(root, { recursive: true, force: true });
-    mkdirSync14(join25(dataDir, "cuda"), { recursive: true });
+    mkdirSync14(join26(dataDir, "cuda"), { recursive: true });
     cpSync2(stageRoot, root, { recursive: true, force: true });
     onProgress({ phase: "assembling", message: `CUDA ${version2} ready.` });
     return { root, binDir, version: version2 };
@@ -14977,7 +15120,7 @@ function recommendEngines(p, engines) {
 // src/artifacts/screenshot.ts
 import { existsSync as existsSync21 } from "fs";
 import { execFileSync as execFileSync5 } from "child_process";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 function chromeCandidates() {
   const env = process.env.PUPPETEER_EXECUTABLE_PATH || process.env.CHROME_PATH;
   const out = env ? [env] : [];
@@ -14986,10 +15129,10 @@ function chromeCandidates() {
     const pfx86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
     const local = process.env["LOCALAPPDATA"] || "";
     for (const base2 of [pf, pfx86, local].filter(Boolean)) {
-      out.push(join26(base2, "Google", "Chrome", "Application", "chrome.exe"));
+      out.push(join27(base2, "Google", "Chrome", "Application", "chrome.exe"));
     }
     for (const base2 of [pfx86, pf].filter(Boolean)) {
-      out.push(join26(base2, "Microsoft", "Edge", "Application", "msedge.exe"));
+      out.push(join27(base2, "Microsoft", "Edge", "Application", "msedge.exe"));
     }
   } else if (process.platform === "darwin") {
     out.push(
@@ -15072,10 +15215,10 @@ async function screenshotArtifact(html, opts) {
 
 // src/telemetry/log.ts
 import { readFileSync as readFileSync13, writeFileSync as writeFileSync13, mkdirSync as mkdirSync15 } from "fs";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 var MAX_LOGGED = 200;
 function logPath(dataDir) {
-  return join27(dataDir, "telemetry", "sent.json");
+  return join28(dataDir, "telemetry", "sent.json");
 }
 function readSentLog(dataDir) {
   try {
@@ -15090,7 +15233,7 @@ function recordSent(dataDir, events) {
     const sentAt = (/* @__PURE__ */ new Date()).toISOString();
     const fresh = events.map((event) => ({ sentAt, event })).reverse();
     const next = [...fresh, ...readSentLog(dataDir)].slice(0, MAX_LOGGED);
-    mkdirSync15(join27(dataDir, "telemetry"), { recursive: true });
+    mkdirSync15(join28(dataDir, "telemetry"), { recursive: true });
     writeFileSync13(logPath(dataDir), JSON.stringify(next));
   } catch {
   }
@@ -15213,7 +15356,7 @@ function registerApi(app2, d) {
         let installedVersion = null;
         if (gatePath) {
           try {
-            const src = readFileSync14(join28(gatePath, "__init__.py"), "utf-8");
+            const src = readFileSync14(join29(gatePath, "__init__.py"), "utf-8");
             const m = src.match(/^GATE_VERSION\s*=\s*(\d+)/m);
             if (m) installedVersion = Number(m[1]);
           } catch {
@@ -15253,7 +15396,7 @@ function registerApi(app2, d) {
     const sys = getSysInfo();
     const vendor = primaryVendor(sys);
     const recommended = recommendBackendId(vendor, sys.gpus.length > 0);
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const active = d.registry.active();
     const regEngines = d.registry.list().engines;
     const backendOf = (p) => p.match(/llama\.cpp-[^/\\]+-(cuda|rocm|sycl|vulkan|metal|cpu)/i)?.[1]?.toLowerCase();
@@ -15274,7 +15417,7 @@ function registerApi(app2, d) {
         engineId: eng?.id ?? ""
       };
     });
-    const mlxVenvPy = join28(root, "mlx", "venv", process.platform === "win32" ? "Scripts/python.exe" : "bin/python");
+    const mlxVenvPy = join29(root, "mlx", "venv", process.platform === "win32" ? "Scripts/python.exe" : "bin/python");
     const mlxInstalledOnDisk = existsSync22(mlxVenvPy);
     const mlxEngine = regEngines.find((e) => e.kind === "mlx");
     const mlx = {
@@ -15290,7 +15433,7 @@ function registerApi(app2, d) {
     const b = await body3(c);
     const def = availableBackends().find((x) => x.id === b.backend);
     if (!def) return err3(c, 400, "invalid_config_value", "Unknown backend for this platform.");
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const existing = installedBackendBuild(root, def.id);
     if (existing) {
       return c.json({ accepted: false, alreadyInstalled: true, build: existing.tag });
@@ -15334,7 +15477,7 @@ function registerApi(app2, d) {
   app2.post("/api/v1/engines/backends/:id/update", async (c) => {
     const def = availableBackends().find((x) => x.id === c.req.param("id"));
     if (!def) return err3(c, 400, "invalid_config_value", "Unknown backend for this platform.");
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const oldBin = installedBackendBuild(root, def.id)?.bin ?? null;
     if (!oldBin) return err3(c, 409, "not_installed", "Backend is not installed \u2014 download it first.");
     {
@@ -15393,7 +15536,7 @@ function registerApi(app2, d) {
   app2.post("/api/v1/engines/backends/:id/enable", async (c) => {
     const def = availableBackends().find((x) => x.id === c.req.param("id"));
     if (!def) return err3(c, 400, "invalid_config_value", "Unknown backend for this platform.");
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const build2 = installedBackendBuild(root, def.id);
     if (!build2) return err3(c, 409, "not_installed", "Backend is not installed on disk \u2014 download it first.");
     let eng = d.registry.list().engines.find((e) => e.binPath === build2.bin);
@@ -15404,7 +15547,7 @@ function registerApi(app2, d) {
   app2.delete("/api/v1/engines/backends/:id", async (c) => {
     const def = availableBackends().find((x) => x.id === c.req.param("id"));
     if (!def) return err3(c, 400, "invalid_config_value", "Unknown backend for this platform.");
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const backendDirRe = new RegExp(`[\\\\/]engines[\\\\/]llama\\.cpp-[^\\\\/]+-${def.id}[\\\\/]`);
     const engs = d.registry.list().engines.filter((e) => backendDirRe.test(e.binPath));
     const activeId = d.registry.active()?.id;
@@ -15426,7 +15569,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
@@ -15449,7 +15592,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
@@ -15466,12 +15609,12 @@ function registerApi(app2, d) {
   });
   app2.get("/api/v1/engines/catalog", (c) => {
     const regEngines = d.registry.list().engines;
-    const enginesRoot = join28(d.store.dir(), "engines");
+    const enginesRoot = join29(d.store.dir(), "engines");
     const items = catalogForPlatform().map((e) => {
       let installed2;
       let enabled;
       if (e.provision === "pip") {
-        const pyPath = join28(
+        const pyPath = join29(
           enginesRoot,
           e.id,
           "venv",
@@ -15480,7 +15623,7 @@ function registerApi(app2, d) {
         installed2 = existsSync22(pyPath);
         enabled = regEngines.some((x) => x.kind === e.kind);
       } else if (e.id === "turboquant") {
-        const tqDir = join28(enginesRoot, "turboquant");
+        const tqDir = join29(enginesRoot, "turboquant");
         installed2 = existsSync22(tqDir);
         enabled = regEngines.some((x) => /[\\/]engines[\\/]turboquant[\\/]/.test(x.binPath));
       } else if (e.id === "koboldcpp") {
@@ -15550,9 +15693,9 @@ function registerApi(app2, d) {
     const busy = engineWorkBusy(d);
     if (busy) return err3(c, 409, "engine_already_running", busy);
     const name = (b.name ?? "").trim() || void 0;
-    const enginesRoot = join28(d.store.dir(), "engines");
+    const enginesRoot = join29(d.store.dir(), "engines");
     const toolchainDirs = d.store.snapshot().build.toolchainDirs;
-    const buildRoot = join28(enginesRoot, "build", buildDirName(repoUrl, branch, commit));
+    const buildRoot = join29(enginesRoot, "build", buildDirName(repoUrl, branch, commit));
     const ac = new AbortController();
     buildAbort = ac;
     d.build.start(name ?? repoUrl);
@@ -15662,7 +15805,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
@@ -15682,7 +15825,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
@@ -15707,13 +15850,13 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
         d.provision.start("turboquant");
         if (upgrade) {
-          const tqDir = join28(root, "turboquant");
+          const tqDir = join29(root, "turboquant");
           if (existsSync22(tqDir)) rmSync14(tqDir, { recursive: true, force: true });
         }
         const bin = await provisionTurboquant(
@@ -15742,7 +15885,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     const hasNvidia = primaryVendor(getSysInfo()) === "nvidia";
     void (async () => {
@@ -15773,7 +15916,7 @@ function registerApi(app2, d) {
       const busy = engineWorkBusy(d);
       if (busy) return err3(c, 409, "engine_already_running", busy);
     }
-    const root = join28(d.store.dir(), "engines");
+    const root = join29(d.store.dir(), "engines");
     const upgrade = c.req.query("update") === "1";
     void (async () => {
       try {
@@ -15880,7 +16023,7 @@ function registerApi(app2, d) {
       }
       d.registry.remove(id);
       if (purge && eng) {
-        const enginesRoot = join28(d.store.dir(), "engines");
+        const enginesRoot = join29(d.store.dir(), "engines");
         const purgeDir = engineInstallDir(eng, enginesRoot);
         if (purgeDir && existsSync22(purgeDir)) {
           rmSync14(purgeDir, { recursive: true, force: true });
@@ -15969,12 +16112,12 @@ function registerApi(app2, d) {
         let isDir = d2.isDirectory();
         if (d2.isSymbolicLink()) {
           try {
-            isDir = statSync5(join28(real, d2.name)).isDirectory();
+            isDir = statSync5(join29(real, d2.name)).isDirectory();
           } catch {
             isDir = false;
           }
         }
-        return { name: d2.name, path: join28(real, d2.name), isDir };
+        return { name: d2.name, path: join29(real, d2.name), isDir };
       }).sort((a, b) => a.isDir === b.isDir ? a.name.localeCompare(b.name) : a.isDir ? -1 : 1);
     } catch {
       return err3(c, 400, "fs_read_failed", "Could not read that folder (permission denied or not a directory).");
@@ -16117,17 +16260,17 @@ function registerApi(app2, d) {
     }
     let customNodes;
     if (basename3(root).toLowerCase() === "custom_nodes") customNodes = root;
-    else if (existsSync22(join28(root, "custom_nodes"))) customNodes = join28(root, "custom_nodes");
+    else if (existsSync22(join29(root, "custom_nodes"))) customNodes = join29(root, "custom_nodes");
     else {
       return err3(c, 400, "invalid_config_value", "No 'custom_nodes' folder here. Point me at your ComfyUI folder or its custom_nodes folder.");
     }
     const reqUrl = new URL(c.req.url);
     const port2 = reqUrl.port || (reqUrl.protocol === "https:" ? "443" : "80");
     const base2 = `http://127.0.0.1:${port2}`;
-    const gateDir = join28(customNodes, "turbollm_gate");
+    const gateDir = join29(customNodes, "turbollm_gate");
     try {
       mkdirSync16(gateDir, { recursive: true });
-      writeFileSync14(join28(gateDir, "__init__.py"), gateNodeSource(base2));
+      writeFileSync14(join29(gateDir, "__init__.py"), gateNodeSource(base2));
     } catch (e) {
       return err3(c, 500, "fs_write_failed", `Could not write the gate node: ${e instanceof Error ? e.message : e}`);
     }
@@ -16494,7 +16637,7 @@ function registerApi(app2, d) {
     };
     const isMemoryServer = server2.transport === "stdio" && (server2.command?.includes("server-memory") || server2.args?.some((a) => a.includes("server-memory")));
     if (isMemoryServer && !server2.env?.MEMORY_FILE_PATH) {
-      server2.env = { ...server2.env, MEMORY_FILE_PATH: join28(homedir4(), ".turbollm", "mcp-memory.jsonl") };
+      server2.env = { ...server2.env, MEMORY_FILE_PATH: join29(homedir4(), ".turbollm", "mcp-memory.jsonl") };
     }
     d.store.update((cfg2) => {
       cfg2.mcp.servers.push(server2);
@@ -16953,19 +17096,19 @@ function engineInstallDir(eng, enginesRoot) {
     return n.startsWith(norm + "/") || n.startsWith(norm + "\\");
   };
   if (eng.kind === "mlx") {
-    const d = join28(enginesRoot, "mlx", "venv");
+    const d = join29(enginesRoot, "mlx", "venv");
     return inside(d) ? d : null;
   }
   if (eng.kind === "rapid-mlx") {
-    const d = join28(enginesRoot, "rapid-mlx", "venv");
+    const d = join29(enginesRoot, "rapid-mlx", "venv");
     return inside(d) ? d : null;
   }
   if (eng.kind === "vllm") {
-    const d = join28(enginesRoot, "vllm", "venv");
+    const d = join29(enginesRoot, "vllm", "venv");
     return inside(d) ? d : null;
   }
   if (/[\\/]engines[\\/]turboquant[\\/]/.test(eng.binPath)) {
-    const d = join28(enginesRoot, "turboquant");
+    const d = join29(enginesRoot, "turboquant");
     return inside(d) ? d : null;
   }
   if (eng.kind === "koboldcpp") {
@@ -16980,7 +17123,7 @@ function engineInstallDir(eng, enginesRoot) {
   if (srcDir) return inside(srcDir) ? srcDir : null;
   const llamaMatch = eng.binPath.replace(/\\/g, "/").match(/\/(llama\.cpp-[^/]+)\//i);
   if (llamaMatch) {
-    const d = join28(enginesRoot, llamaMatch[1]);
+    const d = join29(enginesRoot, llamaMatch[1]);
     return inside(d) ? d : null;
   }
   return null;
@@ -17402,8 +17545,8 @@ import { streamSSE as streamSSE3 } from "hono/streaming";
 import { EventEmitter as EventEmitter2 } from "events";
 
 // src/code/code-session.ts
-import { join as join31, resolve as resolve3 } from "path";
-import { readFile as readFile2 } from "fs/promises";
+import { join as join32, resolve as resolve3 } from "path";
+import { readFile as readFile3 } from "fs/promises";
 import { Type, Unsafe } from "typebox";
 import {
   createAgentSession,
@@ -17419,7 +17562,7 @@ import {
 // src/code/robust-bash.ts
 import { access as fsAccess } from "fs/promises";
 import { constants } from "fs";
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 import { getShellConfig } from "@earendil-works/pi-coding-agent";
 var EXIT_STDIO_GRACE_MS = 100;
 function waitForChildProcess(child) {
@@ -17506,7 +17649,7 @@ function sleep3(ms) {
 async function killDescendantsViaWmi(rootPid) {
   const psScript = `$all = Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId; $ids = @(${rootPid}); $frontier = @(${rootPid}); for ($i = 0; $i -lt 8; $i++) {   $children = $all | Where-Object { $frontier -contains $_.ParentProcessId } | Select-Object -ExpandProperty ProcessId;   if (-not $children) { break }; $ids += $children; $frontier = $children }; $ids | Select-Object -Unique | ForEach-Object { Write-Output $_ }`;
   const pids = await new Promise((resolve5) => {
-    const proc = spawn5("powershell", ["-NoProfile", "-NonInteractive", "-Command", psScript], {
+    const proc = spawn6("powershell", ["-NoProfile", "-NonInteractive", "-Command", psScript], {
       stdio: ["ignore", "pipe", "ignore"],
       windowsHide: true
     });
@@ -17522,7 +17665,7 @@ async function killDescendantsViaWmi(rootPid) {
   });
   for (const pid of pids) {
     try {
-      spawn5("taskkill", ["/F", "/PID", String(pid)], { stdio: "ignore", detached: true, windowsHide: true });
+      spawn6("taskkill", ["/F", "/PID", String(pid)], { stdio: "ignore", detached: true, windowsHide: true });
     } catch {
     }
   }
@@ -17531,7 +17674,7 @@ async function killDescendantsViaWmi(rootPid) {
 function killProcessTreeFast(pid) {
   if (process.platform === "win32") {
     try {
-      spawn5("taskkill", ["/F", "/T", "/PID", String(pid)], { stdio: "ignore", detached: true, windowsHide: true });
+      spawn6("taskkill", ["/F", "/T", "/PID", String(pid)], { stdio: "ignore", detached: true, windowsHide: true });
     } catch {
     }
   } else {
@@ -17583,7 +17726,7 @@ function createRobustBashOperations(options) {
 Cannot execute bash commands.`);
       }
       const commandFromStdin = shellConfig.commandTransport === "stdin";
-      const child = spawn5(
+      const child = spawn6(
         shellConfig.shell,
         commandFromStdin ? shellConfig.args : [...shellConfig.args, command],
         {
@@ -17631,7 +17774,7 @@ Cannot execute bash commands.`);
 
 // src/code/containment.ts
 import { realpathSync as realpathSync2 } from "fs";
-import { resolve as resolve2, dirname as dirname10, basename as basename4, join as join29, sep } from "path";
+import { resolve as resolve2, dirname as dirname10, basename as basename4, join as join30, sep } from "path";
 var isWin = process.platform === "win32";
 function canonicalize(input) {
   if (typeof input !== "string" || input.length === 0) return null;
@@ -17647,7 +17790,7 @@ function canonicalize(input) {
   for (let i = 0; i < 4096; i++) {
     try {
       const real = realpathSync2(cur);
-      const full = tail.length ? join29(real, ...[...tail].reverse()) : real;
+      const full = tail.length ? join30(real, ...[...tail].reverse()) : real;
       return normForCompare(full);
     } catch {
       const parent = dirname10(cur);
@@ -17691,7 +17834,7 @@ function isContainedFromRoot(input, root) {
 
 // src/code/persona.ts
 import { readFileSync as readFileSync15 } from "fs";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var MAX_SKILL_CATALOG_CHARS = 16e3;
 var MAX_AGENTS_MD_CHARS = 2e4;
 var MAX_AGENTS_MD_CANDIDATES = 8;
@@ -17819,7 +17962,7 @@ function readAgentsFile(path) {
 function resolveAgentsFile(root, candidates) {
   for (const entry of candidates.slice(0, MAX_AGENTS_MD_CANDIDATES)) {
     if (!isContainedFromRoot(entry, root)) continue;
-    const text = readAgentsFile(join30(root, entry));
+    const text = readAgentsFile(join31(root, entry));
     if (text !== null) return { name: entry, text };
   }
   return null;
@@ -17914,7 +18057,7 @@ function isDependencyAddCommand(command) {
 }
 
 // src/code/lsp-client.ts
-import { spawn as spawn6 } from "child_process";
+import { spawn as spawn7 } from "child_process";
 import { createMessageConnection, StreamMessageReader, StreamMessageWriter } from "vscode-jsonrpc/node";
 import { URI } from "vscode-uri";
 var toFileUri = (path) => URI.file(path).toString();
@@ -17931,7 +18074,7 @@ function resolveFallbackTsserverPath() {
     cachedTsserverPath = new Promise((resolvePromise) => {
       const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
       const script = "process.stdout.write(require.resolve('typescript/lib/tsserver.js'))";
-      const proc = spawn6(npxCmd, ["-y", "-p", "typescript", "node", "-e", script], npxSpawnOptions());
+      const proc = spawn7(npxCmd, ["-y", "-p", "typescript", "node", "-e", script], npxSpawnOptions());
       let out = "";
       proc.stdout?.on("data", (d) => {
         out += String(d);
@@ -17977,7 +18120,7 @@ var LspClient = class {
     try {
       const fallbackTsserverPath = this.spec.language === "typescript" ? await resolveFallbackTsserverPath() : null;
       const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
-      const proc = spawn6(npxCmd, this.spec.npxArgs, npxSpawnOptions(this.rootDir));
+      const proc = spawn7(npxCmd, this.spec.npxArgs, npxSpawnOptions(this.rootDir));
       this.proc = proc;
       const spawnFailure = new Promise((resolve5) => {
         proc.once("error", (e) => resolve5(e instanceof Error ? e.message : String(e)));
@@ -18353,7 +18496,7 @@ async function runCodeSession(params) {
     console.warn(`[code-session] history seed for session ${sessionId} produced ${sessionManager.getEntries().length}/${expectedEntries} expected entries \u2014 falling back to a plain-text history prefix on this turn's prompt`);
     task = `${HISTORY_FALLBACK_PREFIX}${renderHistoryFallbackText(summaryText, priorMessages)}${HISTORY_FALLBACK_SUFFIX}${rawTask}`;
   }
-  const agentDir = join31(d.store.dir(), "pi-agent");
+  const agentDir = join32(d.store.dir(), "pi-agent");
   modelRegistry.registerProvider("local", {
     baseUrl: `${target}/v1`,
     apiKey: "agent-key",
@@ -18484,7 +18627,7 @@ async function runCodeSession(params) {
         await sink({ event: "tool_call", data });
       });
     };
-    const skillAgentDir = join31(d.store.dir(), "pi-agent");
+    const skillAgentDir = join32(d.store.dir(), "pi-agent");
     const skillResourceLoader = new DefaultResourceLoader({
       cwd: repoRoot,
       agentDir: skillAgentDir,
@@ -18627,7 +18770,7 @@ async function runCodeSession(params) {
         await sink({ event: "tool_call", data });
       });
     };
-    const subAgentDir = join31(d.store.dir(), "pi-agent");
+    const subAgentDir = join32(d.store.dir(), "pi-agent");
     const subResourceLoader = new DefaultResourceLoader({
       cwd: repoRoot,
       agentDir: subAgentDir,
@@ -18829,7 +18972,7 @@ async function runCodeSession(params) {
         if (spec) {
           try {
             const absPath = resolve3(repoRoot, relPath);
-            const content = await readFile2(absPath, "utf8");
+            const content = await readFile3(absPath, "utf8");
             const diagnostics = await getLspClient(spec).getDiagnostics(absPath, content);
             if (diagnostics.length > 0) {
               const shown = diagnostics.slice(0, 20);
@@ -19185,7 +19328,7 @@ async function compactCodeSession(params) {
       return payload;
     });
   };
-  const compactAgentDir = join31(d.store.dir(), "pi-agent");
+  const compactAgentDir = join32(d.store.dir(), "pi-agent");
   const compactResourceLoader = new DefaultResourceLoader({
     cwd: repoRoot,
     agentDir: compactAgentDir,
@@ -19287,7 +19430,7 @@ async function lookbackPreCompactionHistory(params) {
       return payload;
     });
   };
-  const lookbackAgentDir = join31(d.store.dir(), "pi-agent");
+  const lookbackAgentDir = join32(d.store.dir(), "pi-agent");
   const lookbackResourceLoader = new DefaultResourceLoader({
     cwd: repoRoot,
     agentDir: lookbackAgentDir,
@@ -20150,7 +20293,10 @@ function toSidebarRow(run) {
     convId: run.convId,
     title: run.title,
     status: toSessionStatus(run.status),
-    branch: run.repoBranch ?? "",
+    // A worktree session's real branch is the one git created for it — `repoBranch` is only ever
+    // set for a session working directly in the repo, so without this the sidebar showed a blank
+    // branch for exactly the sessions that have a dedicated one (caught in end-to-end testing).
+    branch: run.worktreeBranch ?? run.repoBranch ?? "",
     when: relativeTime(run.createdAt),
     add: run.linesAdded ?? 0,
     del: run.linesRemoved ?? 0,
@@ -20159,7 +20305,11 @@ function toSidebarRow(run) {
     running: void 0,
     // filled from CodeRunManager below when available
     createdAt: run.createdAt,
+    // `repoRoot` stays the PROJECT — that's what the user picked and what identifies the session.
+    // `worktreePath` is where the agent actually works; surfaced alongside rather than replacing
+    // it, so the UI can show both without either being a lie.
     repoRoot: run.repoRoot ?? "",
+    worktreePath: run.worktreePath ?? "",
     codeAgent: run.codeAgent ?? "turbollm",
     error: run.error,
     archivedAt: run.archivedAt,
@@ -20179,6 +20329,18 @@ function registerCodeRoutes(app2, d) {
     if (!repoRoot) return err6(c, 400, "invalid_input", "repoRoot is required.");
     if (!task) return err6(c, 400, "invalid_input", "A task description is required.");
     if (!VALID_MODES.has(mode)) return err6(c, 400, "invalid_input", "mode must be one of: auto, plan, ask.");
+    let worktreePath;
+    let worktreeBranch = b.worktreeBranch;
+    if (b.useWorktree) {
+      const created = await createSessionWorktree({
+        repoRoot,
+        branch: b.worktreeBranch || task,
+        base: b.worktreeBase
+      });
+      if (!created.ok) return err6(c, 400, created.code, created.message);
+      worktreePath = created.path;
+      worktreeBranch = created.branch;
+    }
     const conv = db2.createConversation({ kind: "code", modelKey: b.modelKey });
     db2.setConversationMode(conv.id, mode);
     const codeAgent = d.store.snapshot().code.defaultAgent;
@@ -20189,11 +20351,13 @@ function registerCodeRoutes(app2, d) {
       repoRoot,
       repoBranch: b.repoBranch,
       useWorktree: b.useWorktree,
-      // captured; NOT acted on in Phase 1 (fast-follow)
-      worktreeBranch: b.worktreeBranch,
-      // captured; NOT acted on in Phase 1
+      worktreeBranch,
+      // the branch git actually created, not the one requested
       worktreeBase: b.worktreeBase,
-      // captured; NOT acted on in Phase 1
+      // Absent unless a worktree was really created above. `repoRoot` deliberately stays the BASE
+      // repository: it is what `git worktree remove` has to run from, and what the session should
+      // still show as its project. `agentCwd()` is the single place that picks between them.
+      worktreePath,
       codeAgent
     });
     db2.addMessage(conv.id, "user", task, { textAttachments: b.contextFiles });
@@ -20245,7 +20409,9 @@ function registerCodeRoutes(app2, d) {
       // with the SAME lookup persona.ts injects into the prompt, so "shown as loaded" == "actually
       // fed to the model". Both false when the session has no repoRoot.
       hasAgentsMd: run.repoRoot ? agentsMdPresence(
-        run.repoRoot,
+        // The worktree when there is one — that is the tree the model's prompt is built from,
+        // so "shown as loaded" must be resolved against the same directory persona.ts reads.
+        agentCwd(run),
         d.store.dir(),
         d.store.snapshot().code.agentsMdProjectCandidates,
         d.store.snapshot().code.agentsMdGlobalCandidates
@@ -20311,14 +20477,19 @@ function registerCodeRoutes(app2, d) {
     db2.setAgentRunArchived(id, archived);
     return c.json({ ok: true, archived });
   });
-  app2.delete("/api/v1/code/sessions/:id", (c) => {
+  app2.delete("/api/v1/code/sessions/:id", async (c) => {
     const id = c.req.param("id");
     const run = db2.getAgentRun(id);
     if (!run) return err6(c, 404, "not_found", "Session not found.");
     if (runs.isActive(id)) return err6(c, 409, "run_active", "Stop the current run before deleting this session.");
     disposeLspClientsForConv(run.convId);
+    let worktreeNote;
+    if (run.worktreePath && run.repoRoot) {
+      const removed = await removeSessionWorktree(run.repoRoot, run.worktreePath);
+      if (!removed.ok) worktreeNote = removed.message;
+    }
     db2.deleteCodeSession(id);
-    return c.json({ ok: true });
+    return c.json(worktreeNote ? { ok: true, worktreeNote } : { ok: true });
   });
   app2.post("/api/v1/code/sessions/:id/compact", async (c) => {
     const id = c.req.param("id");
@@ -20335,7 +20506,7 @@ function registerCodeRoutes(app2, d) {
         d,
         convId: run.convId,
         sessionId: id,
-        repoRoot: run.repoRoot,
+        repoRoot: agentCwd(run),
         customInstructions: b.instructions?.trim() || void 0
       });
       return c.json({ ok: true, ...result });
@@ -20398,7 +20569,7 @@ function registerCodeRoutes(app2, d) {
     let failedFiles = [];
     if (b.revertFiles) {
       const rangeMessages = db2.getMessagesFromIncludingInactive(run.convId, messageId);
-      const result = revertFileEdits(rangeMessages, run.repoRoot);
+      const result = revertFileEdits(rangeMessages, agentCwd(run));
       revertedFiles = result.reverted;
       failedFiles = result.failed;
     }
@@ -20410,7 +20581,7 @@ function registerCodeRoutes(app2, d) {
     const run = db2.getAgentRun(c.req.param("id"));
     if (!run) return err6(c, 404, "not_found", "Session not found.");
     if (!run.repoRoot) return err6(c, 400, "invalid_input", "Session has no repo root.");
-    const status = await getGitStatus(run.repoRoot);
+    const status = await getGitStatus(agentCwd(run));
     return c.json({ ok: true, status });
   });
   app2.post("/api/v1/code/sessions/:id/git/commit", async (c) => {
@@ -20421,7 +20592,7 @@ function registerCodeRoutes(app2, d) {
     if (runs.isActive(id)) return err6(c, 409, "run_active", "Stop or wait for the current run before committing.");
     const b = await body6(c);
     try {
-      const result = await commitGitChanges(run.repoRoot, b.message ?? "", b.files);
+      const result = await commitGitChanges(agentCwd(run), b.message ?? "", b.files);
       return c.json({ ok: true, ...result });
     } catch (e) {
       const message = e instanceof Error ? e.message : "Commit failed.";
@@ -20438,21 +20609,21 @@ function registerCodeRoutes(app2, d) {
     if (!run) return err6(c, 404, "not_found", "Session not found.");
     if (!run.repoRoot) return err6(c, 400, "invalid_input", "Session has no repo root.");
     if (runs.isActive(id)) return err6(c, 409, "run_active", "Stop or wait for the current run before pushing.");
-    const result = await pushGitBranch(run.repoRoot);
+    const result = await pushGitBranch(agentCwd(run));
     if (!result.ok) {
       const status = result.reason === "diverged" ? 409 : 400;
       return err6(c, status, result.reason, result.message);
     }
-    const compareUrl = await getGithubCompareUrl(run.repoRoot, result.branch);
+    const compareUrl = await getGithubCompareUrl(agentCwd(run), result.branch);
     return c.json({ ok: true, remote: result.remote, branch: result.branch, compareUrl });
   });
   app2.get("/api/v1/code/sessions/:id/git/compare-url", async (c) => {
     const run = db2.getAgentRun(c.req.param("id"));
     if (!run) return err6(c, 404, "not_found", "Session not found.");
     if (!run.repoRoot) return err6(c, 400, "invalid_input", "Session has no repo root.");
-    const status = await getGitStatus(run.repoRoot);
+    const status = await getGitStatus(agentCwd(run));
     if (!status.isRepo || status.detached || !status.branch) return c.json({ ok: true, compareUrl: null });
-    const compareUrl = await getGithubCompareUrl(run.repoRoot, status.branch);
+    const compareUrl = await getGithubCompareUrl(agentCwd(run), status.branch);
     return c.json({ ok: true, compareUrl });
   });
   app2.post("/api/v1/code/sessions/:id/exec", async (c) => {
@@ -20467,7 +20638,7 @@ function registerCodeRoutes(app2, d) {
     const feedToModel = b.feedToModel !== false;
     let result;
     try {
-      result = await runShellCommand(command, run.repoRoot, id);
+      result = await runShellCommand(command, agentCwd(run), id);
     } catch (e) {
       return err6(c, 500, "exec_failed", e instanceof Error ? e.message : "Command failed to run.");
     }
@@ -20528,7 +20699,7 @@ function registerCodeRoutes(app2, d) {
       userMsgId = lastUser.id;
       task = contextFilesBlock(lastUser.textAttachments) + lastUser.content;
     }
-    const enqueueParams = { convId: run.convId, repoRoot: run.repoRoot, task, userMsgId, thinkingBudget: b.thinkingBudget };
+    const enqueueParams = { convId: run.convId, repoRoot: agentCwd(run), task, userMsgId, thinkingBudget: b.thinkingBudget };
     if (kind === "steer") {
       const { steered, queued: queued2 } = await runs.steer(id, enqueueParams);
       return c.json({ ok: true, queued: queued2, steered, userMessageId: userMsgId }, 202);
@@ -21709,7 +21880,7 @@ function featureForPath(path) {
 
 // src/server.ts
 setGlobalDispatcher(new Agent({ keepAliveMaxTimeout: 6e4, connections: 10 }));
-var WEB_ROOT = join32(dirname11(fileURLToPath(import.meta.url)), "webdist");
+var WEB_ROOT = join33(dirname11(fileURLToPath(import.meta.url)), "webdist");
 function createApp(d) {
   const app2 = new Hono();
   app2.use(
@@ -21752,9 +21923,9 @@ function createApp(d) {
     if (path.startsWith("api/") || path.startsWith("v1/")) {
       return c.json({ error: { code: "not_found", message: "Unknown endpoint." } }, 404);
     }
-    let file = normalize2(join32(WEB_ROOT, path || "index.html"));
+    let file = normalize2(join33(WEB_ROOT, path || "index.html"));
     if (!file.startsWith(WEB_ROOT) || !existsSync24(file) || statSync6(file).isDirectory()) {
-      file = join32(WEB_ROOT, "index.html");
+      file = join33(WEB_ROOT, "index.html");
     }
     if (!existsSync24(file)) return c.text("web ui not built \u2014 run `npm run build:web`", 500);
     return new Response(readFileSync17(file), { status: 200, headers: { "Content-Type": contentType(file) } });
@@ -21782,22 +21953,22 @@ function contentType(file) {
 }
 
 // src/tunnel/manager.ts
-import { execFile as execFile13, spawn as spawn7, spawnSync as spawnSync3 } from "child_process";
+import { execFile as execFile13, spawn as spawn8, spawnSync as spawnSync3 } from "child_process";
 import { mkdirSync as mkdirSync18, readFileSync as readFileSync18, readdirSync as readdirSync11, rmSync as rmSync16, writeFileSync as writeFileSync16 } from "fs";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 
 // src/tunnel/provision.ts
 import { chmodSync as chmodSync3, existsSync as existsSync25, mkdirSync as mkdirSync17, rmSync as rmSync15 } from "fs";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 var CLOUDFLARED_REPO = "cloudflare/cloudflared";
 function cloudflaredDir(dataDir) {
-  return join33(dataDir, "cloudflared");
+  return join34(dataDir, "cloudflared");
 }
 function cloudflaredBinName(platform = process.platform) {
   return platform === "win32" ? "cloudflared.exe" : "cloudflared";
 }
 function cloudflaredBinPath(dataDir, platform = process.platform) {
-  return join33(cloudflaredDir(dataDir), cloudflaredBinName(platform));
+  return join34(cloudflaredDir(dataDir), cloudflaredBinName(platform));
 }
 function cloudflaredAssetName(platform = process.platform, archStr = process.arch) {
   if (platform === "win32") {
@@ -21829,7 +22000,7 @@ async function ensureCloudflared(dataDir, onProgress, signal) {
   mkdirSync17(dir, { recursive: true });
   onProgress?.({ phase: "downloading", pct: 0 });
   if (asset.name.endsWith(".tgz")) {
-    const tmp = join33(dir, asset.name);
+    const tmp = join34(dir, asset.name);
     try {
       await downloadFile(asset.browser_download_url, tmp, onProgress, signal);
       onProgress?.({ phase: "extracting", pct: -1 });
@@ -21873,10 +22044,10 @@ function forceKill2(child) {
   else child.kill("SIGKILL");
 }
 function tunnelPidDir(dataDir) {
-  return join34(dataDir, "run");
+  return join35(dataDir, "run");
 }
 function tunnelPidFile(dataDir, pid) {
-  return join34(tunnelPidDir(dataDir), `tunnel-${pid}.pid`);
+  return join35(tunnelPidDir(dataDir), `tunnel-${pid}.pid`);
 }
 function writeTunnelPid(dataDir, pid) {
   try {
@@ -21910,7 +22081,7 @@ function readTunnelPidFiles(dataDir) {
   }
   const out = [];
   for (const name of names) {
-    const file = join34(dir, name);
+    const file = join35(dir, name);
     try {
       const { pid, owner } = JSON.parse(readFileSync18(file, "utf8"));
       if (typeof pid === "number" && pid > 0) out.push({ pid, owner: typeof owner === "number" ? owner : 0, file });
@@ -21982,7 +22153,7 @@ var TunnelManager = class {
     this._error = null;
     const { binPath } = await ensureCloudflared(this.dataDir);
     return new Promise((resolve5, reject) => {
-      const child = spawn7(binPath, ["tunnel", "--url", `http://127.0.0.1:${localPort}`], { windowsHide: true });
+      const child = spawn8(binPath, ["tunnel", "--url", `http://127.0.0.1:${localPort}`], { windowsHide: true });
       this.child = child;
       writeTunnelPid(this.dataDir, child.pid ?? 0);
       let settled = false;
@@ -22125,7 +22296,7 @@ var Emitter = class {
 hideChildConsoleWindows();
 var version = "0.1.1";
 try {
-  const pkgPath = join35(dirname12(fileURLToPath2(import.meta.url)), "..", "package.json");
+  const pkgPath = join36(dirname12(fileURLToPath2(import.meta.url)), "..", "package.json");
   version = JSON.parse(readFileSync19(pkgPath, "utf8")).version ?? version;
 } catch {
 }
@@ -22277,7 +22448,7 @@ if (pruned > 0) console.log(`pruned ${pruned} dangling engine build(s)`);
 var provision = new ProvisionState();
 var build = new BuildState();
 var updates = new UpdateChecker();
-var enginesDir = join35(store.dir(), "engines");
+var enginesDir = join36(store.dir(), "engines");
 void seedDefaultEngines(registry, enginesDir, provision).then(() => registry.ensureProbed());
 var manager = new Manager(store);
 var scanner = new Scanner(store);
@@ -22360,7 +22531,7 @@ function openBrowser(url) {
     cmd = "xdg-open";
     args = [url];
   }
-  const child = spawn8(cmd, args, { detached: true, stdio: "ignore" });
+  const child = spawn9(cmd, args, { detached: true, stdio: "ignore" });
   child.unref();
   child.on("error", () => {
     console.log(`  Could not open browser automatically. Visit the URL above manually.`);
@@ -22464,11 +22635,11 @@ var restarting = false;
 function spawnReplacement() {
   let out = "ignore";
   try {
-    out = openSync3(join35(store.dir(), "restart.log"), "a");
+    out = openSync3(join36(store.dir(), "restart.log"), "a");
   } catch {
     out = "ignore";
   }
-  const child = spawn8(process.execPath, process.argv.slice(1), {
+  const child = spawn9(process.execPath, process.argv.slice(1), {
     cwd: process.cwd(),
     detached: true,
     stdio: ["ignore", out, out]