@band-app/server 0.5.5 → 0.6.0

package/dist/start-server.mjs

@@ -5648,7 +5648,7 @@ var require_thread_stream = __commonJS({
     var { version: version2 } = require_package();
     var { EventEmitter } = __require("events");
     var { Worker } = __require("worker_threads");
-    var { join: join23 } = __require("path");
+    var { join: join24 } = __require("path");
     var { pathToFileURL } = __require("url");
     var { wait } = require_wait();
     var {
@@ -5684,7 +5684,7 @@ var require_thread_stream = __commonJS({
     function createWorker(stream, opts) {
       const { filename, workerData } = opts;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-      const toExecute = bundlerOverrides["thread-stream-worker"] || join23(__dirname, "lib", "worker.js");
+      const toExecute = bundlerOverrides["thread-stream-worker"] || join24(__dirname, "lib", "worker.js");
       const worker = new Worker(toExecute, {
         ...opts.workerOpts,
         trackUnmanagedFds: false,
@@ -6070,7 +6070,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire: createRequire2 } = __require("module");
     var getCallers = require_caller();
-    var { join: join23, isAbsolute, sep: sep2 } = __require("node:path");
+    var { join: join24, isAbsolute, sep: sep2 } = __require("node:path");
     var sleep2 = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -6133,7 +6133,7 @@ var require_transport = __commonJS({
         throw new Error("only one of target or targets can be specified");
       }
       if (targets) {
-        target = bundlerOverrides["pino-worker"] || join23(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join24(__dirname, "worker.js");
         options2.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
@@ -6151,7 +6151,7 @@ var require_transport = __commonJS({
           });
         });
       } else if (pipeline) {
-        target = bundlerOverrides["pino-worker"] || join23(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join24(__dirname, "worker.js");
         options2.pipelines = [pipeline.map((dest) => {
           return {
             ...dest,
@@ -6173,7 +6173,7 @@ var require_transport = __commonJS({
           return origin;
         }
         if (origin === "pino/file") {
-          return join23(__dirname, "..", "file.js");
+          return join24(__dirname, "..", "file.js");
         }
         let fixTarget2;
         for (const filePath of callers) {
@@ -7162,7 +7162,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join23 = ",";
+            let join24 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -7176,7 +7176,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join23 = `,
+                join24 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -7184,13 +7184,13 @@ ${indentation}`;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyFnReplacer(String(i2), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join23;
+                res += join24;
               }
               const tmp = stringifyFnReplacer(String(i2), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join23}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join24}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -7211,7 +7211,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join23 = `,
+              join24 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -7225,13 +7225,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join23;
+                separator = join24;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join23;
+              separator = join24;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -7272,7 +7272,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join23 = ",";
+            let join24 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -7285,7 +7285,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join23 = `,
+                join24 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -7293,13 +7293,13 @@ ${indentation}`;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyArrayReplacer(String(i2), value[i2], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join23;
+                res += join24;
               }
               const tmp = stringifyArrayReplacer(String(i2), value[i2], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join23}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join24}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -7312,7 +7312,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join23 = `,
+              join24 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -7321,7 +7321,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join23;
+                separator = join24;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -7379,20 +7379,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join24 = `,
+              const join25 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i2 = 0;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyIndent(String(i2), value[i2], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join24;
+                res2 += join25;
               }
               const tmp = stringifyIndent(String(i2), value[i2], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join24}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join25}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -7408,16 +7408,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join23 = `,
+            const join24 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join23, maximumBreadth);
+              res += stringifyTypedArray(value, join24, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join23;
+              separator = join24;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -7428,13 +7428,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}: ${tmp}`;
-                separator = join23;
+                separator = join24;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join23;
+              separator = join24;
             }
             if (separator !== "") {
               res = `
@@ -29557,7 +29557,9 @@ var init_skills = __esm({
 // ../../packages/coding-agent/src/adapters/claude-code.ts
 var claude_code_exports = {};
 __export(claude_code_exports, {
-  ClaudeCodeAdapter: () => ClaudeCodeAdapter
+  CLAUDE_CODE_DEFAULT_BINARY: () => CLAUDE_CODE_DEFAULT_BINARY,
+  ClaudeCodeAdapter: () => ClaudeCodeAdapter,
+  getClaudeCodeInstallSkillsDir: () => getClaudeCodeInstallSkillsDir
 });
 import { readdirSync as readdirSync4, readFileSync as readFileSync3, statSync as statSync5 } from "node:fs";
 import { open, stat } from "node:fs/promises";
@@ -29838,6 +29840,9 @@ function* mapClaudeCodeEvent(message, state2) {
     }
   }
 }
+function getClaudeCodeInstallSkillsDir(home = homedir()) {
+  return join4(home, ".claude", "skills");
+}
 function discoverClaudeSkills(workspaceDir) {
   const globalSkillsDir = join4(homedir(), ".claude", "skills");
   const projectSkillsDir = join4(workspaceDir, ".claude", "skills");
@@ -29852,7 +29857,7 @@ function discoverClaudeSkills(workspaceDir) {
   }
   return Array.from(skillMap.values()).sort((a6, b10) => a6.name.localeCompare(b10.name));
 }
-var log2, SESSION_TAIL_BYTES, cumulativeUsageBySession, MAX_CUMULATIVE_SESSIONS, ClaudeCodeAdapter;
+var log2, SESSION_TAIL_BYTES, cumulativeUsageBySession, MAX_CUMULATIVE_SESSIONS, ClaudeCodeAdapter, CLAUDE_CODE_DEFAULT_BINARY;
 var init_claude_code = __esm({
   "../../packages/coding-agent/src/adapters/claude-code.ts"() {
     init_sdk();
@@ -30200,6 +30205,7 @@ var init_claude_code = __esm({
         ];
       }
     };
+    CLAUDE_CODE_DEFAULT_BINARY = "claude";
   }
 });
 
@@ -30847,10 +30853,16 @@ var init_cursor_cli = __esm({
 // ../../packages/coding-agent/src/adapters/openai-codex.ts
 var openai_codex_exports = {};
 __export(openai_codex_exports, {
-  OpenAICodexAdapter: () => OpenAICodexAdapter
+  OPENAI_CODEX_DEFAULT_BINARY: () => OPENAI_CODEX_DEFAULT_BINARY,
+  OpenAICodexAdapter: () => OpenAICodexAdapter,
+  getOpenAICodexInstallSkillsDir: () => getOpenAICodexInstallSkillsDir
 });
 import { homedir as homedir2 } from "node:os";
 import { join as join5 } from "node:path";
+function getOpenAICodexInstallSkillsDir(home = homedir2()) {
+  const codexHome = process.env.CODEX_HOME ?? join5(home, ".codex");
+  return join5(codexHome, "skills");
+}
 function discoverCodexSkills(workspaceDir) {
   const globalSkillsDir = join5(CODEX_HOME, "skills");
   const systemSkillsDir = join5(CODEX_HOME, "skills", ".system");
@@ -30883,7 +30895,7 @@ function parseInput(args) {
   }
   return {};
 }
-var log4, OpenAICodexAdapter, CODEX_HOME;
+var log4, OpenAICodexAdapter, CODEX_HOME, OPENAI_CODEX_DEFAULT_BINARY;
 var init_openai_codex = __esm({
   "../../packages/coding-agent/src/adapters/openai-codex.ts"() {
     init_src();
@@ -31033,6 +31045,7 @@ var init_openai_codex = __esm({
       }
     };
     CODEX_HOME = process.env.CODEX_HOME || join5(homedir2(), ".codex");
+    OPENAI_CODEX_DEFAULT_BINARY = "codex";
   }
 });
 
@@ -31501,7 +31514,9 @@ var init_dist2 = __esm({
 // ../../packages/coding-agent/src/adapters/codex.ts
 var codex_exports = {};
 __export(codex_exports, {
-  CodexAdapter: () => CodexAdapter
+  CODEX_DEFAULT_BINARY: () => CODEX_DEFAULT_BINARY,
+  CodexAdapter: () => CodexAdapter,
+  getCodexInstallSkillsDir: () => getCodexInstallSkillsDir
 });
 import { execFileSync } from "node:child_process";
 import { createReadStream as createReadStream2 } from "node:fs";
@@ -31526,6 +31541,10 @@ function resolveCodexBinary() {
     return void 0;
   }
 }
+function getCodexInstallSkillsDir(home = homedir3()) {
+  const codexHome = process.env.CODEX_HOME ?? join6(home, ".codex");
+  return join6(codexHome, "skills");
+}
 function discoverCodexSkills2(workspaceDir) {
   const globalSkillsDir = join6(CODEX_HOME2, "skills");
   const systemSkillsDir = join6(CODEX_HOME2, "skills", ".system");
@@ -31864,7 +31883,7 @@ async function readCodexSessionMessages(sessionId, options2) {
   const slice = hasMore ? collected.slice(0, requested) : collected;
   return { messages: slice, hasMore, firstOffset: offset4 };
 }
-var log5, cumulativeUsageBySession2, MAX_CUMULATIVE_SESSIONS2, CodexAdapter, CODEX_CTX, CODEX_MODELS, CODEX_HOME2, SESSIONS_DIR;
+var log5, cumulativeUsageBySession2, MAX_CUMULATIVE_SESSIONS2, CodexAdapter, CODEX_CTX, CODEX_MODELS, CODEX_DEFAULT_BINARY, CODEX_HOME2, SESSIONS_DIR;
 var init_codex = __esm({
   "../../packages/coding-agent/src/adapters/codex.ts"() {
     init_src();
@@ -32184,6 +32203,7 @@ var init_codex = __esm({
         contextWindow: CODEX_CTX
       }
     ];
+    CODEX_DEFAULT_BINARY = "codex";
     CODEX_HOME2 = process.env.CODEX_HOME || join6(homedir3(), ".codex");
     SESSIONS_DIR = join6(CODEX_HOME2, "sessions");
   }
@@ -32192,12 +32212,17 @@ var init_codex = __esm({
 // ../../packages/coding-agent/src/adapters/gemini-cli.ts
 var gemini_cli_exports = {};
 __export(gemini_cli_exports, {
-  GeminiCliAdapter: () => GeminiCliAdapter
+  GEMINI_CLI_DEFAULT_BINARY: () => GEMINI_CLI_DEFAULT_BINARY,
+  GeminiCliAdapter: () => GeminiCliAdapter,
+  getGeminiCliInstallSkillsDir: () => getGeminiCliInstallSkillsDir
 });
 import { spawn as spawn3 } from "node:child_process";
 import { homedir as homedir4 } from "node:os";
 import { join as join7 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline";
+function getGeminiCliInstallSkillsDir(home = homedir4()) {
+  return join7(home, ".gemini", "skills");
+}
 function discoverGeminiSkills(workspaceDir) {
   const globalSkillsDir = join7(homedir4(), ".gemini", "skills");
   const projectSkillsDir = join7(workspaceDir, ".gemini", "skills");
@@ -32212,7 +32237,7 @@ function discoverGeminiSkills(workspaceDir) {
   }
   return Array.from(skillMap.values()).sort((a6, b10) => a6.name.localeCompare(b10.name));
 }
-var log6, GeminiCliAdapter;
+var log6, GeminiCliAdapter, GEMINI_CLI_DEFAULT_BINARY;
 var init_gemini_cli = __esm({
   "../../packages/coding-agent/src/adapters/gemini-cli.ts"() {
     init_src();
@@ -32385,13 +32410,16 @@ var init_gemini_cli = __esm({
         ];
       }
     };
+    GEMINI_CLI_DEFAULT_BINARY = "gemini";
   }
 });
 
 // ../../packages/coding-agent/src/adapters/opencode.ts
 var opencode_exports = {};
 __export(opencode_exports, {
-  OpenCodeAdapter: () => OpenCodeAdapter
+  OPENCODE_DEFAULT_BINARY: () => OPENCODE_DEFAULT_BINARY,
+  OpenCodeAdapter: () => OpenCodeAdapter,
+  getOpenCodeInstallSkillsDir: () => getOpenCodeInstallSkillsDir
 });
 import { execFile, spawn as spawn4 } from "node:child_process";
 import { homedir as homedir5 } from "node:os";
@@ -32557,6 +32585,9 @@ async function fetchOpenCodeSessionMessages(executablePath, sessionId, options2)
   const slice = hasMore ? collected.slice(0, requested) : collected;
   return { messages: slice, hasMore, firstOffset: offset4 };
 }
+function getOpenCodeInstallSkillsDir(home = homedir5()) {
+  return join8(home, ".config", "opencode", "skills");
+}
 function discoverOpenCodeSkills(workspaceDir) {
   const home = homedir5();
   const dirs = [
@@ -32577,7 +32608,7 @@ function discoverOpenCodeSkills(workspaceDir) {
   }
   return Array.from(skillMap.values()).sort((a6, b10) => a6.name.localeCompare(b10.name));
 }
-var log7, OpenCodeAdapter, DEFAULT_MODELS;
+var log7, OpenCodeAdapter, DEFAULT_MODELS, OPENCODE_DEFAULT_BINARY;
 var init_opencode = __esm({
   "../../packages/coding-agent/src/adapters/opencode.ts"() {
     init_src();
@@ -32831,6 +32862,7 @@ var init_opencode = __esm({
       { id: "opencode/big-pickle", name: "Big Pickle" },
       { id: "opencode/gpt-5-nano", name: "GPT-5 Nano" }
     ];
+    OPENCODE_DEFAULT_BINARY = "opencode";
   }
 });
 
@@ -89169,9 +89201,9 @@ var require_dist5 = __commonJS({
 });
 
 // start-server.ts
-import { appendFileSync as appendFileSync2, createReadStream as createReadStream3, mkdirSync as mkdirSync7, readFileSync as readFileSync8, statSync as statSync6 } from "node:fs";
+import { appendFileSync as appendFileSync2, createReadStream as createReadStream3, mkdirSync as mkdirSync8, readFileSync as readFileSync9, statSync as statSync7 } from "node:fs";
 import { createServer } from "node:http";
-import { basename as basename2, join as join22, resolve as resolve7 } from "node:path";
+import { basename as basename2, join as join23, resolve as resolve7 } from "node:path";
 
 // ../../node_modules/.pnpm/@trpc+server@11.12.0_typescript@5.9.3/node_modules/@trpc/server/dist/codes-DagpWZLc.mjs
 function mergeWithoutOverrides(obj1, ...objs) {
@@ -108340,7 +108372,7 @@ init_src();
 
 // src/lib/agent-pool.ts
 import { readFileSync as readFileSync5 } from "node:fs";
-import { homedir as homedir7 } from "node:os";
+import { homedir as homedir8 } from "node:os";
 import { join as join12 } from "node:path";
 
 // ../../packages/coding-agent/src/config.ts
@@ -108440,13 +108472,68 @@ async function createCodingAgent(config2) {
   }
 }
 
+// ../../packages/coding-agent/src/install-skills.ts
+import { homedir as homedir6 } from "node:os";
+async function getInstallSkillsDir(type, home = homedir6()) {
+  switch (type) {
+    case "claude-code": {
+      const { getClaudeCodeInstallSkillsDir: getClaudeCodeInstallSkillsDir2 } = await Promise.resolve().then(() => (init_claude_code(), claude_code_exports));
+      return getClaudeCodeInstallSkillsDir2(home);
+    }
+    case "codex": {
+      const { getCodexInstallSkillsDir: getCodexInstallSkillsDir2 } = await Promise.resolve().then(() => (init_codex(), codex_exports));
+      return getCodexInstallSkillsDir2(home);
+    }
+    case "openai-codex": {
+      const { getOpenAICodexInstallSkillsDir: getOpenAICodexInstallSkillsDir2 } = await Promise.resolve().then(() => (init_openai_codex(), openai_codex_exports));
+      return getOpenAICodexInstallSkillsDir2(home);
+    }
+    case "gemini-cli": {
+      const { getGeminiCliInstallSkillsDir: getGeminiCliInstallSkillsDir2 } = await Promise.resolve().then(() => (init_gemini_cli(), gemini_cli_exports));
+      return getGeminiCliInstallSkillsDir2(home);
+    }
+    case "opencode": {
+      const { getOpenCodeInstallSkillsDir: getOpenCodeInstallSkillsDir2 } = await Promise.resolve().then(() => (init_opencode(), opencode_exports));
+      return getOpenCodeInstallSkillsDir2(home);
+    }
+    default:
+      return null;
+  }
+}
+async function getDefaultAgentBinary(type) {
+  switch (type) {
+    case "claude-code": {
+      const { CLAUDE_CODE_DEFAULT_BINARY: CLAUDE_CODE_DEFAULT_BINARY2 } = await Promise.resolve().then(() => (init_claude_code(), claude_code_exports));
+      return CLAUDE_CODE_DEFAULT_BINARY2;
+    }
+    case "codex": {
+      const { CODEX_DEFAULT_BINARY: CODEX_DEFAULT_BINARY2 } = await Promise.resolve().then(() => (init_codex(), codex_exports));
+      return CODEX_DEFAULT_BINARY2;
+    }
+    case "openai-codex": {
+      const { OPENAI_CODEX_DEFAULT_BINARY: OPENAI_CODEX_DEFAULT_BINARY2 } = await Promise.resolve().then(() => (init_openai_codex(), openai_codex_exports));
+      return OPENAI_CODEX_DEFAULT_BINARY2;
+    }
+    case "gemini-cli": {
+      const { GEMINI_CLI_DEFAULT_BINARY: GEMINI_CLI_DEFAULT_BINARY2 } = await Promise.resolve().then(() => (init_gemini_cli(), gemini_cli_exports));
+      return GEMINI_CLI_DEFAULT_BINARY2;
+    }
+    case "opencode": {
+      const { OPENCODE_DEFAULT_BINARY: OPENCODE_DEFAULT_BINARY2 } = await Promise.resolve().then(() => (init_opencode(), opencode_exports));
+      return OPENCODE_DEFAULT_BINARY2;
+    }
+    default:
+      return null;
+  }
+}
+
 // src/lib/agent-pool.ts
 init_src();
 
 // src/lib/state.ts
 import { randomBytes } from "node:crypto";
 import { mkdirSync as mkdirSync3, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { dirname, join as join11 } from "node:path";
 
 // ../../node_modules/.pnpm/@radix-ui+react-visually-hidden@1.2.3_@types+react-dom@19.2.3_@types+react@19.2.14__@ty_fa89646d7248b32d1762bf88948f6339/node_modules/@radix-ui/react-visually-hidden/dist/index.mjs
@@ -116877,7 +116964,7 @@ var buttonVariants = cva(
       variant: {
         default: "bg-primary text-primary-foreground hover:bg-primary/90",
         destructive: "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40",
-        outline: "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50",
+        outline: "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/60 dark:hover:bg-input/80",
         secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
         ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
         link: "text-primary underline-offset-4 hover:underline"
@@ -119948,7 +120035,6 @@ var import_jsx_runtime58 = __toESM(require_jsx_runtime(), 1);
 
 // ../../packages/dashboard-core/src/components/DashboardShell.tsx
 var import_jsx_runtime59 = __toESM(require_jsx_runtime(), 1);
-var isTauri = typeof window !== "undefined" && "__TAURI_INTERNALS__" in window;
 var isElectron = typeof window !== "undefined" && "__BAND_DESKTOP__" in window;
 
 // ../../packages/dashboard-core/src/components/DiffView.tsx
@@ -122968,7 +123054,7 @@ function sql(strings, ...params) {
     return new SQL([new StringChunk(str)]);
   }
   _sql.raw = raw;
-  function join23(chunks, separator) {
+  function join24(chunks, separator) {
     const result = [];
     for (const [i2, chunk] of chunks.entries()) {
       if (i2 > 0 && separator !== void 0) result.push(separator);
@@ -122976,7 +123062,7 @@ function sql(strings, ...params) {
     }
     return new SQL(result);
   }
-  _sql.join = join23;
+  _sql.join = join24;
   function identifier(value) {
     return new Name(value);
   }
@@ -127424,7 +127510,7 @@ var SQLiteSelectQueryBuilderBase = class extends TypedQueryBuilder {
       const baseTableName = this.tableName;
       const tableName = getTableLikeName(table);
       for (const item of extractUsedTable(table)) this.usedTables.add(item);
-      if (typeof tableName === "string" && this.config.joins?.some((join23) => join23.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+      if (typeof tableName === "string" && this.config.joins?.some((join24) => join24.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
       if (!this.isPartialSelect) {
         if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === "string") this.config.fields = { [baseTableName]: this.config.fields };
         if (typeof tableName === "string" && !is(table, SQL)) {
@@ -128632,7 +128718,7 @@ var SQLiteDialect = class {
       if (!joins2) return;
       const withEntries = Object.entries(joins2).filter(([_4, v4]) => v4);
       if (!withEntries.length) return;
-      return sql.join(withEntries.map(([k4, join23]) => {
+      return sql.join(withEntries.map(([k4, join24]) => {
         const relation = tableConfig.relations[k4];
         const isSingle2 = is(relation, One);
         const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
@@ -128643,7 +128729,7 @@ var SQLiteDialect = class {
           table: targetTable,
           mode: isSingle2 ? "first" : "many",
           schema,
-          queryConfig: join23,
+          queryConfig: join24,
           tableConfig: schema[relation.targetTableName],
           relationWhere: filter2,
           isNested: true,
@@ -128657,7 +128743,7 @@ var SQLiteDialect = class {
           key: k4,
           selection: innerQuery.selection,
           isArray: !isSingle2,
-          isOptional: (relation.optional ?? false) || join23 !== true && !!join23.where
+          isOptional: (relation.optional ?? false) || join24 !== true && !!join24.where
         });
         const jsonColumns = sql.join(innerQuery.selection.map((s6) => {
           return sql`${sql.raw(this.escapeString(s6.key))}, ${s6.selection ? sql`${jsonb2}(${sql.identifier(s6.key)})` : sql.identifier(s6.key)}`;
@@ -129126,7 +129212,7 @@ var SQLiteUpdateBase = class extends QueryPromise {
   createJoin(joinType) {
     return ((table, on) => {
       const tableName = getTableLikeName(table);
-      if (typeof tableName === "string" && this.config.joins.some((join23) => join23.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+      if (typeof tableName === "string" && this.config.joins.some((join24) => join24.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
       if (typeof on === "function") {
         const from = this.config.from ? is(table, SQLiteTable) ? table[Table.Symbol.Columns] : is(table, Subquery) ? table._.selectedFields : is(table, SQLiteViewBase) ? table[ViewBaseConfig].selectedFields : void 0 : void 0;
         on = on(new Proxy(this.config.table[Table.Symbol.Columns], new SelectionProxyHandler({
@@ -130018,7 +130104,7 @@ function closeDb() {
 // src/lib/state.ts
 function bandHome() {
   if (process.env.BAND_HOME) return process.env.BAND_HOME;
-  return join11(homedir6(), ".band");
+  return join11(homedir7(), ".band");
 }
 function loadState() {
   const db2 = getDb();
@@ -130224,7 +130310,7 @@ var pool = g2[POOL_KEY];
 var pending = g2[PENDING_KEY];
 function loadClaudeSettingsModel() {
   try {
-    const data = readFileSync5(join12(homedir7(), ".claude", "settings.json"), "utf-8");
+    const data = readFileSync5(join12(homedir8(), ".claude", "settings.json"), "utf-8");
     const parsed = JSON.parse(data);
     return typeof parsed.model === "string" ? parsed.model : void 0;
   } catch {
@@ -133752,17 +133838,166 @@ function resolveCliPaths() {
   return { binaryPath, symlinkPath: SYMLINK_PATH };
 }
 
-// src/lib/hooks.ts
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "node:fs";
-import { homedir as homedir8 } from "node:os";
+// src/lib/cli-skills.ts
+import { execFile as execFile4 } from "node:child_process";
+import {
+  accessSync as accessSync2,
+  existsSync as existsSync5,
+  constants as fsConstants,
+  mkdirSync as mkdirSync5,
+  mkdtempSync,
+  readFileSync as readFileSync7,
+  rmSync as rmSync2,
+  statSync as statSync6,
+  writeFileSync as writeFileSync2
+} from "node:fs";
+import { homedir as homedir9, tmpdir } from "node:os";
 import { dirname as dirname4, join as join19 } from "node:path";
+var BAND_SKILL_NAMES = ["band", "band-chat", "band-terminal", "band-browser"];
+var SKILL_FILE = "SKILL.md";
+async function isAgentInstalled(agent) {
+  if (agent.command) {
+    try {
+      accessSync2(agent.command, fsConstants.X_OK);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  const binaryName = await getDefaultAgentBinary(agent.type);
+  if (!binaryName) return false;
+  const found = await whichBinary(binaryName);
+  return found !== null;
+}
+async function resolveSkillTargets(agents, home = homedir9()) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const agent of agents) {
+    if (!await isAgentInstalled(agent)) continue;
+    const skillsDir = await getInstallSkillsDir(agent.type, home);
+    if (!skillsDir) continue;
+    if (seen.has(skillsDir)) continue;
+    seen.add(skillsDir);
+    out.push({ agentType: agent.type, skillsDir });
+  }
+  return out;
+}
+async function findBandBinary() {
+  try {
+    const stat5 = statSync6("/usr/local/bin/band");
+    if (stat5) return "/usr/local/bin/band";
+  } catch {
+  }
+  const onPath = await whichBinary("band");
+  if (onPath) return onPath;
+  return findCliBinary();
+}
+async function generateSkills(bandPath, outputDir) {
+  await new Promise((resolve8, reject) => {
+    execFile4(
+      bandPath,
+      ["generate-skills", "--output-dir", outputDir],
+      { timeout: 3e4 },
+      (err, _stdout, stderr) => {
+        if (err) {
+          const detail = stderr?.toString().trim();
+          reject(new Error(detail ? `${err.message}: ${detail}` : err.message));
+          return;
+        }
+        resolve8();
+      }
+    );
+  });
+}
+async function installSkills(opts = {}) {
+  const result = {
+    written: [],
+    updated: [],
+    unchanged: [],
+    skipped: []
+  };
+  const home = opts.home ?? homedir9();
+  const agents = opts.agents ?? loadSettings().codingAgents ?? [];
+  const targets = await resolveSkillTargets(agents, home);
+  if (targets.length === 0) {
+    return result;
+  }
+  const bandPath = await findBandBinary();
+  if (!bandPath) {
+    opts.log?.warn(
+      "Skipping CLI skills sync \u2014 band binary not found (no symlink, not on PATH, no bundled sidecar)"
+    );
+    for (const target of targets) {
+      for (const name24 of BAND_SKILL_NAMES) {
+        result.skipped.push(join19(target.skillsDir, name24, SKILL_FILE));
+      }
+    }
+    return result;
+  }
+  const stagingDir = mkdtempSync(join19(tmpdir(), "band-skills-"));
+  try {
+    await generateSkills(bandPath, stagingDir);
+    for (const target of targets) {
+      for (const name24 of BAND_SKILL_NAMES) {
+        const sourcePath = join19(stagingDir, name24, SKILL_FILE);
+        const destPath = join19(target.skillsDir, name24, SKILL_FILE);
+        if (!existsSync5(sourcePath)) {
+          opts.log?.warn("Generated skill missing from staging dir: %s (skipping)", sourcePath);
+          continue;
+        }
+        const sourceContent = readFileSync7(sourcePath);
+        let existingContent = null;
+        try {
+          existingContent = readFileSync7(destPath);
+        } catch (err) {
+          const code = err.code;
+          if (code !== "ENOENT") {
+            opts.log?.warn(
+              "Failed to read existing skill at %s: %s \u2014 overwriting",
+              destPath,
+              err instanceof Error ? err.message : String(err)
+            );
+          }
+        }
+        if (existingContent?.equals(sourceContent)) {
+          result.unchanged.push(destPath);
+          continue;
+        }
+        mkdirSync5(dirname4(destPath), { recursive: true });
+        writeFileSync2(destPath, sourceContent);
+        if (existingContent) {
+          result.updated.push(destPath);
+          opts.log?.info(
+            "Updated %s skill at %s (content differed \u2014 local edits, if any, were overwritten)",
+            name24,
+            destPath
+          );
+        } else {
+          result.written.push(destPath);
+          opts.log?.info("Installed %s skill at %s", name24, destPath);
+        }
+      }
+    }
+  } finally {
+    try {
+      rmSync2(stagingDir, { recursive: true, force: true });
+    } catch {
+    }
+  }
+  return result;
+}
+
+// src/lib/hooks.ts
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync8, writeFileSync as writeFileSync3 } from "node:fs";
+import { homedir as homedir10 } from "node:os";
+import { dirname as dirname5, join as join20 } from "node:path";
 var HOOK_EVENTS = ["PreToolUse", "PermissionRequest", "UserPromptSubmit", "PostToolUse", "Stop"];
 function claudeSettingsPath() {
-  return join19(homedir8(), ".claude", "settings.json");
+  return join20(homedir10(), ".claude", "settings.json");
 }
 function loadClaudeSettings() {
   try {
-    const data = readFileSync7(claudeSettingsPath(), "utf-8");
+    const data = readFileSync8(claudeSettingsPath(), "utf-8");
     return JSON.parse(data);
   } catch {
     return {};
@@ -133814,7 +134049,7 @@ async function installHooks() {
     throw new Error("Could not find band CLI binary. Please install it first.");
   }
   const settingsPath = claudeSettingsPath();
-  mkdirSync5(dirname4(settingsPath), { recursive: true });
+  mkdirSync6(dirname5(settingsPath), { recursive: true });
   const settings = loadClaudeSettings();
   const hooks = settings.hooks || {};
   for (const [event, eventHooks] of Object.entries(hooks)) {
@@ -133844,7 +134079,7 @@ async function installHooks() {
     hooks[event] = filtered;
   }
   settings.hooks = hooks;
-  writeFileSync2(settingsPath, JSON.stringify(settings, null, 2), "utf-8");
+  writeFileSync3(settingsPath, JSON.stringify(settings, null, 2), "utf-8");
 }
 
 // src/lib/setup.ts
@@ -133859,6 +134094,7 @@ async function runFirstTimeSetup() {
   await ensureDefaultCodingAgents();
   ensureNotificationDefaults();
   await ensureClaudeHooks();
+  await ensureSkillsInstalled();
 }
 async function ensureCliInstalled() {
   let cliStatus;
@@ -133937,11 +134173,28 @@ async function ensureClaudeHooks() {
     );
   }
 }
+async function ensureSkillsInstalled() {
+  try {
+    const result = await installSkills({ log: log16 });
+    const wrote = result.written.length + result.updated.length;
+    if (wrote > 0) {
+      log16.info(
+        "Synced CLI skills (%d written, %d updated, %d unchanged, %d skipped)",
+        result.written.length,
+        result.updated.length,
+        result.unchanged.length,
+        result.skipped.length
+      );
+    }
+  } catch (err) {
+    log16.warn("Failed to sync CLI skills: %s", err instanceof Error ? err.message : String(err));
+  }
+}
 
 // src/lib/terminal-manager.ts
 init_src();
-import { existsSync as existsSync5 } from "node:fs";
-import { join as join20 } from "node:path";
+import { existsSync as existsSync6 } from "node:fs";
+import { join as join21 } from "node:path";
 
 // src/lib/terminal-layout-manager.ts
 var manager2 = new DockviewLayoutManager("terminal_layout");
@@ -133996,19 +134249,19 @@ async function spawnTerminal(workspaceId, terminalId, options2) {
   const workspaceRoot = workspace.worktree.path;
   let cwd = workspaceRoot;
   if (options2?.cwd) {
-    const resolved = join20(workspaceRoot, options2.cwd);
+    const resolved = join21(workspaceRoot, options2.cwd);
     if (!resolved.startsWith(workspaceRoot)) {
       log17.warn("Ignoring cwd %s \u2014 resolves outside workspace root %s", options2.cwd, workspaceRoot);
-    } else if (existsSync5(resolved)) {
+    } else if (existsSync6(resolved)) {
       cwd = resolved;
     } else {
       log17.warn("Ignoring cwd %s \u2014 directory does not exist", options2.cwd);
     }
   }
-  if (!existsSync5(cwd)) {
+  if (!existsSync6(cwd)) {
     throw new Error(`Workspace directory does not exist: ${cwd}`);
   }
-  if (!existsSync5(shell)) {
+  if (!existsSync6(shell)) {
     throw new Error(`Shell not found: ${shell}`);
   }
   log17.debug(
@@ -141326,11 +141579,11 @@ function createContext7() {
 }
 
 // src/trpc/router.ts
-import { execFile as execFile4, execFileSync as execFileSync2 } from "node:child_process";
+import { execFile as execFile5, execFileSync as execFileSync2 } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync6, unlinkSync as unlinkSync3 } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync7, unlinkSync as unlinkSync3 } from "node:fs";
 import { readdir as readdir2, readFile as readFile2, rm, stat as stat4, writeFile as writeFile2 } from "node:fs/promises";
-import { basename, extname as extname2, join as join21, resolve as resolve6 } from "node:path";
+import { basename, extname as extname2, join as join22, resolve as resolve6 } from "node:path";
 import { promisify } from "node:util";
 init_src();
 init_zod();
@@ -141908,7 +142161,7 @@ function loadWorkspaceTerminalConfig(worktreePath, projectPath) {
 }
 
 // src/trpc/router.ts
-var execFileAsync = promisify(execFile4);
+var execFileAsync = promisify(execFile5);
 var log23 = createLogger("trpc");
 var t2 = initTRPC.context().create();
 var publicProcedure = t2.procedure;
@@ -141920,10 +142173,11 @@ var projectsRouter = t2.router({
     const statusMap = new Map(statuses.map((s6) => [s6.workspaceId, s6]));
     const projects2 = await Promise.all(
       state2.projects.map(async (project) => {
+        const trackedBranches = new Set(project.worktrees.map((wt) => wt.branch));
         let worktrees2 = project.worktrees;
         try {
           const gitWorktrees = await listWorktrees(project.path);
-          worktrees2 = gitWorktrees.filter((wt) => !wt.isBare).map((wt) => ({
+          worktrees2 = gitWorktrees.filter((wt) => !wt.isBare && trackedBranches.has(wt.branch)).map((wt) => ({
             branch: wt.branch,
             path: wt.path,
             head: wt.head
@@ -141951,7 +142205,7 @@ var projectsRouter = t2.router({
   }),
   checkPath: publicProcedure.input(external_exports2.object({ path: external_exports2.string() })).query(({ input }) => {
     const resolvedPath = resolve6(input.path);
-    const isGitRepo = existsSync6(join21(resolvedPath, ".git"));
+    const isGitRepo = existsSync7(join22(resolvedPath, ".git"));
     return { isGitRepo };
   }),
   gitInit: publicProcedure.input(external_exports2.object({ path: external_exports2.string() })).mutation(async ({ input }) => {
@@ -142060,8 +142314,8 @@ var workspacesRouter = t2.router({
       return { ok: true, path: existing.path };
     }
     const wtDir = worktreesDir();
-    const worktreePath = join21(wtDir, input.project, input.branch);
-    mkdirSync6(join21(wtDir, input.project), { recursive: true });
+    const worktreePath = join22(wtDir, input.project, input.branch);
+    mkdirSync7(join22(wtDir, input.project), { recursive: true });
     const { command, env } = gitCmd();
     const args = ["worktree", "add"];
     if (input.base) {
@@ -142125,7 +142379,7 @@ var workspacesRouter = t2.router({
           saveState(state2);
           const workspaceId = toWorkspaceId(input.project, input.branch);
           try {
-            unlinkSync3(join21(bandHome(), "workspace-prompts", `${workspaceId}.json`));
+            unlinkSync3(join22(bandHome(), "workspace-prompts", `${workspaceId}.json`));
           } catch {
           }
           deleteWorkspaceStatus(workspaceId);
@@ -142229,12 +142483,12 @@ var workspacesRouter = t2.router({
     return { ok: true };
   }),
   runScript: publicProcedure.input(external_exports2.object({ path: external_exports2.string(), scriptType: external_exports2.string() })).mutation(({ input }) => {
-    const scriptPath = join21(input.path, ".band", input.scriptType);
-    if (!existsSync6(scriptPath)) {
+    const scriptPath = join22(input.path, ".band", input.scriptType);
+    if (!existsSync7(scriptPath)) {
       throw new Error(`Script "${input.scriptType}" not found`);
     }
     return new Promise((resolve8, reject) => {
-      execFile4("bash", [scriptPath], { cwd: input.path }, (err) => {
+      execFile5("bash", [scriptPath], { cwd: input.path }, (err) => {
         if (err) {
           reject(new Error(err.message));
         } else {
@@ -142314,6 +142568,69 @@ var LANG_MAP = {
   ".svelte": "svelte",
   ".diff": "diff"
 };
+var compareBranchSchema = external_exports2.string().min(1).regex(/^[^-]/, "branch name must not start with '-'").optional();
+var EMPTY_TREE_ARGS = ["hash-object", "-t", "tree", "/dev/null"];
+async function resolveDiffContext(cwd, defaultBranch, diffMode, compareBranchInput) {
+  const compareBranch = diffMode === "uncommitted" ? defaultBranch : compareBranchInput ?? defaultBranch;
+  let headBranch;
+  try {
+    headBranch = (await execGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd)).trim();
+  } catch {
+    headBranch = defaultBranch;
+  }
+  let mergeBase;
+  if (diffMode === "uncommitted") {
+    try {
+      mergeBase = (await execGit(["rev-parse", "HEAD"], cwd)).trim();
+    } catch {
+      mergeBase = (await execGit(EMPTY_TREE_ARGS, cwd)).trim();
+    }
+  } else {
+    try {
+      mergeBase = (await execGit(["merge-base", compareBranch, "HEAD"], cwd)).trim();
+    } catch {
+      mergeBase = (await execGit(EMPTY_TREE_ARGS, cwd)).trim();
+    }
+  }
+  return { compareBranch, headBranch, mergeBase };
+}
+function parseDiffStatSummary(statOutput) {
+  const statLines = statOutput.trim().split("\n");
+  const summaryLine = statLines[statLines.length - 1] || "";
+  const filesMatch = summaryLine.match(/(\d+)\s+files?\s+changed/);
+  const insertMatch = summaryLine.match(/(\d+)\s+insertions?\(\+\)/);
+  const deleteMatch = summaryLine.match(/(\d+)\s+deletions?\(-\)/);
+  return {
+    filesChanged: filesMatch ? Number.parseInt(filesMatch[1], 10) : 0,
+    insertions: insertMatch ? Number.parseInt(insertMatch[1], 10) : 0,
+    deletions: deleteMatch ? Number.parseInt(deleteMatch[1], 10) : 0
+  };
+}
+function parseFileStatuses(nameStatusOutput) {
+  const fileStatuses = {};
+  for (const line2 of nameStatusOutput.trim().split("\n").filter(Boolean)) {
+    const parts = line2.split("	");
+    const statusCode = parts[0][0];
+    if (statusCode === "R" && parts[2]) {
+      fileStatuses[parts[2]] = "R";
+    } else if (parts[1]) {
+      fileStatuses[parts[1]] = statusCode;
+    }
+  }
+  return fileStatuses;
+}
+async function readUntrackedFileLines(cwd, file2) {
+  try {
+    const content2 = await readFile2(join22(cwd, file2), "utf-8");
+    const lines = content2.split("\n");
+    if (lines.length > 0 && lines[lines.length - 1] === "") {
+      lines.pop();
+    }
+    return lines;
+  } catch {
+    return null;
+  }
+}
 var workspaceRouter = t2.router({
   getTerminalConfig: publicProcedure.input(external_exports2.object({ workspaceId: external_exports2.string() })).query(({ input }) => {
     const workspace = resolveWorkspace(input.workspaceId);
@@ -142321,39 +142638,64 @@ var workspaceRouter = t2.router({
     const config2 = loadWorkspaceTerminalConfig(workspace.worktree.path, workspace.project.path);
     return { config: config2 };
   }),
-  getDiff: publicProcedure.input(
-    external_exports2.object({
-      workspaceId: external_exports2.string(),
-      contextLines: external_exports2.number().int().min(0).max(99999).optional(),
-      diffMode: external_exports2.enum(["uncommitted", "branch"]).optional()
-    })
-  ).query(async ({ input }) => {
+  listBranches: publicProcedure.input(external_exports2.object({ workspaceId: external_exports2.string() })).query(async ({ input }) => {
     const workspace = resolveWorkspace(input.workspaceId);
     if (!workspace) {
       throw new Error("Workspace not found");
     }
     const cwd = workspace.worktree.path;
     const defaultBranch = workspace.project.defaultBranch;
-    let headBranch;
+    let headBranch = null;
     try {
       headBranch = (await execGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd)).trim();
     } catch {
-      headBranch = defaultBranch;
     }
-    let mergeBase;
-    if (input.diffMode === "uncommitted") {
-      try {
-        mergeBase = (await execGit(["rev-parse", "HEAD"], cwd)).trim();
-      } catch {
-        mergeBase = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
-      }
-    } else {
-      try {
-        mergeBase = (await execGit(["merge-base", defaultBranch, "HEAD"], cwd)).trim();
-      } catch {
-        mergeBase = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
+    let branches = [];
+    try {
+      const output = await execGit(
+        ["for-each-ref", "--format=%(refname:short)", "refs/heads/"],
+        cwd
+      );
+      branches = output.trim().split("\n").map((b10) => b10.trim()).filter(Boolean);
+    } catch (err) {
+      log23.error(
+        `listBranches: for-each-ref failed for ${cwd}: ${err instanceof Error ? err.message : err}`
+      );
+    }
+    const filtered = branches.filter((b10) => b10 !== headBranch);
+    if (defaultBranch !== headBranch) {
+      const idx = filtered.indexOf(defaultBranch);
+      if (idx >= 0) {
+        filtered.splice(idx, 1);
       }
+      filtered.unshift(defaultBranch);
+    }
+    return {
+      branches: filtered,
+      defaultBranch,
+      headBranch: headBranch ?? defaultBranch
+    };
+  }),
+  getDiff: publicProcedure.input(
+    external_exports2.object({
+      workspaceId: external_exports2.string(),
+      contextLines: external_exports2.number().int().min(0).max(99999).optional(),
+      diffMode: external_exports2.enum(["uncommitted", "branch"]).optional(),
+      compareBranch: compareBranchSchema
+    })
+  ).query(async ({ input }) => {
+    const workspace = resolveWorkspace(input.workspaceId);
+    if (!workspace) {
+      throw new Error("Workspace not found");
     }
+    const cwd = workspace.worktree.path;
+    const defaultBranch = workspace.project.defaultBranch;
+    const { compareBranch, headBranch, mergeBase } = await resolveDiffContext(
+      cwd,
+      defaultBranch,
+      input.diffMode ?? "branch",
+      input.compareBranch
+    );
     const diffArgs = ["diff"];
     if (input.contextLines !== void 0) {
       diffArgs.push(`-U${input.contextLines}`);
@@ -142361,57 +142703,36 @@ var workspaceRouter = t2.router({
     diffArgs.push(mergeBase);
     let diff = await execGit(diffArgs, cwd);
     const statOutput = await execGit(["diff", "--stat", mergeBase], cwd);
-    const statLines = statOutput.trim().split("\n");
-    const summaryLine = statLines[statLines.length - 1] || "";
-    let filesChanged = 0;
-    let insertions = 0;
-    let deletions = 0;
-    const filesMatch = summaryLine.match(/(\d+)\s+files?\s+changed/);
-    const insertMatch = summaryLine.match(/(\d+)\s+insertions?\(\+\)/);
-    const deleteMatch = summaryLine.match(/(\d+)\s+deletions?\(-\)/);
-    if (filesMatch) filesChanged = Number.parseInt(filesMatch[1], 10);
-    if (insertMatch) insertions = Number.parseInt(insertMatch[1], 10);
-    if (deleteMatch) deletions = Number.parseInt(deleteMatch[1], 10);
-    const fileStatuses = {};
+    const stats = parseDiffStatSummary(statOutput);
     const nameStatusOutput = await execGit(["diff", "--name-status", mergeBase], cwd);
-    for (const line2 of nameStatusOutput.trim().split("\n").filter(Boolean)) {
-      const parts = line2.split("	");
-      const statusCode = parts[0][0];
-      if (statusCode === "R" && parts[2]) {
-        fileStatuses[parts[2]] = "R";
-      } else if (parts[1]) {
-        fileStatuses[parts[1]] = statusCode;
-      }
-    }
+    const fileStatuses = parseFileStatuses(nameStatusOutput);
     const untrackedOutput = await execGit(["ls-files", "--others", "--exclude-standard"], cwd);
     const untrackedFiles = untrackedOutput.trim().split("\n").filter(Boolean);
     for (const file2 of untrackedFiles) {
-      try {
-        const content2 = await readFile2(join21(cwd, file2), "utf-8");
-        const lines = content2.split("\n");
-        if (lines.length > 0 && lines[lines.length - 1] === "") {
-          lines.pop();
-        }
-        diff += `diff --git a/${file2} b/${file2}
+      const lines = await readUntrackedFileLines(cwd, file2);
+      if (lines === null) continue;
+      diff += `diff --git a/${file2} b/${file2}
 `;
-        diff += "new file mode 100644\n";
-        diff += "--- /dev/null\n";
-        diff += `+++ b/${file2}
+      diff += "new file mode 100644\n";
+      diff += "--- /dev/null\n";
+      diff += `+++ b/${file2}
 `;
-        diff += `@@ -0,0 +1,${lines.length} @@
+      diff += `@@ -0,0 +1,${lines.length} @@
 `;
-        diff += lines.map((l) => `+${l}`).join("\n");
-        diff += "\n";
-        filesChanged++;
-        insertions += lines.length;
-        fileStatuses[file2] = "U";
-      } catch {
-      }
+      diff += lines.map((l) => `+${l}`).join("\n");
+      diff += "\n";
+      stats.filesChanged++;
+      stats.insertions += lines.length;
+      fileStatuses[file2] = "U";
     }
     return {
       diff,
-      stats: { filesChanged, insertions, deletions },
-      baseBranch: defaultBranch,
+      stats,
+      // `compareBranch` is the branch we diffed against (the user's pick, or
+      // the project default). `defaultBranch` is the project default. They
+      // diverge once a non-default branch is picked.
+      compareBranch,
+      defaultBranch,
       headBranch,
       fileStatuses
     };
@@ -142419,7 +142740,8 @@ var workspaceRouter = t2.router({
   getDiffSummary: publicProcedure.input(
     external_exports2.object({
       workspaceId: external_exports2.string(),
-      diffMode: external_exports2.enum(["uncommitted", "branch"]).optional()
+      diffMode: external_exports2.enum(["uncommitted", "branch"]).optional(),
+      compareBranch: compareBranchSchema
     })
   ).query(async ({ input }) => {
     const workspace = resolveWorkspace(input.workspaceId);
@@ -142428,67 +142750,29 @@ var workspaceRouter = t2.router({
     }
     const cwd = workspace.worktree.path;
     const defaultBranch = workspace.project.defaultBranch;
-    let headBranch;
-    try {
-      headBranch = (await execGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd)).trim();
-    } catch {
-      headBranch = defaultBranch;
-    }
-    let mergeBase;
-    if (input.diffMode === "uncommitted") {
-      try {
-        mergeBase = (await execGit(["rev-parse", "HEAD"], cwd)).trim();
-      } catch {
-        mergeBase = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
-      }
-    } else {
-      try {
-        mergeBase = (await execGit(["merge-base", defaultBranch, "HEAD"], cwd)).trim();
-      } catch {
-        mergeBase = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
-      }
-    }
+    const { compareBranch, headBranch, mergeBase } = await resolveDiffContext(
+      cwd,
+      defaultBranch,
+      input.diffMode ?? "branch",
+      input.compareBranch
+    );
     const statOutput = await execGit(["diff", "--stat", mergeBase], cwd);
-    const statLines = statOutput.trim().split("\n");
-    const summaryLine = statLines[statLines.length - 1] || "";
-    let filesChanged = 0;
-    let insertions = 0;
-    let deletions = 0;
-    const filesMatch = summaryLine.match(/(\d+)\s+files?\s+changed/);
-    const insertMatch = summaryLine.match(/(\d+)\s+insertions?\(\+\)/);
-    const deleteMatch = summaryLine.match(/(\d+)\s+deletions?\(-\)/);
-    if (filesMatch) filesChanged = Number.parseInt(filesMatch[1], 10);
-    if (insertMatch) insertions = Number.parseInt(insertMatch[1], 10);
-    if (deleteMatch) deletions = Number.parseInt(deleteMatch[1], 10);
-    const fileStatuses = {};
+    const stats = parseDiffStatSummary(statOutput);
     const nameStatusOutput = await execGit(["diff", "--name-status", mergeBase], cwd);
-    for (const line2 of nameStatusOutput.trim().split("\n").filter(Boolean)) {
-      const parts = line2.split("	");
-      const statusCode = parts[0][0];
-      if (statusCode === "R" && parts[2]) {
-        fileStatuses[parts[2]] = "R";
-      } else if (parts[1]) {
-        fileStatuses[parts[1]] = statusCode;
-      }
-    }
+    const fileStatuses = parseFileStatuses(nameStatusOutput);
     const untrackedOutput = await execGit(["ls-files", "--others", "--exclude-standard"], cwd);
     const untrackedFiles = untrackedOutput.trim().split("\n").filter(Boolean);
     for (const file2 of untrackedFiles) {
-      try {
-        const content2 = await readFile2(join21(cwd, file2), "utf-8");
-        const lines = content2.split("\n");
-        if (lines.length > 0 && lines[lines.length - 1] === "") {
-          lines.pop();
-        }
-        filesChanged++;
-        insertions += lines.length;
-        fileStatuses[file2] = "U";
-      } catch {
-      }
+      const lines = await readUntrackedFileLines(cwd, file2);
+      if (lines === null) continue;
+      stats.filesChanged++;
+      stats.insertions += lines.length;
+      fileStatuses[file2] = "U";
     }
     return {
-      stats: { filesChanged, insertions, deletions },
-      baseBranch: defaultBranch,
+      stats,
+      compareBranch,
+      defaultBranch,
       headBranch,
       fileStatuses,
       mergeBase
@@ -142511,7 +142795,7 @@ var workspaceRouter = t2.router({
     const untrackedFiles = untrackedOutput.trim().split("\n").filter(Boolean);
     if (untrackedFiles.includes(input.filePath)) {
       try {
-        const content2 = await readFile2(join21(cwd, input.filePath), "utf-8");
+        const content2 = await readFile2(join22(cwd, input.filePath), "utf-8");
         const lines = content2.split("\n");
         if (lines.length > 0 && lines[lines.length - 1] === "") {
           lines.pop();
@@ -142543,7 +142827,8 @@ var workspaceRouter = t2.router({
     external_exports2.object({
       workspaceId: external_exports2.string(),
       filePath: external_exports2.string(),
-      diffMode: external_exports2.enum(["uncommitted", "branch"])
+      diffMode: external_exports2.enum(["uncommitted", "branch"]),
+      compareBranch: compareBranchSchema
     })
   ).mutation(async ({ input }) => {
     const workspace = resolveWorkspace(input.workspaceId);
@@ -142555,24 +142840,15 @@ var workspaceRouter = t2.router({
     const untrackedOutput = await execGit(["ls-files", "--others", "--exclude-standard"], cwd);
     const untrackedFiles = untrackedOutput.trim().split("\n").filter(Boolean);
     if (untrackedFiles.includes(filePath)) {
-      await rm(join21(cwd, filePath), { force: true });
+      await rm(join22(cwd, filePath), { force: true });
       return { ok: true };
     }
-    let ref;
-    if (diffMode === "uncommitted") {
-      try {
-        ref = (await execGit(["rev-parse", "HEAD"], cwd)).trim();
-      } catch {
-        ref = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
-      }
-    } else {
-      const defaultBranch = workspace.project.defaultBranch;
-      try {
-        ref = (await execGit(["merge-base", defaultBranch, "HEAD"], cwd)).trim();
-      } catch {
-        ref = (await execGit(["hash-object", "-t", "tree", "/dev/null"], cwd)).trim();
-      }
-    }
+    const { mergeBase: ref } = await resolveDiffContext(
+      cwd,
+      workspace.project.defaultBranch,
+      diffMode,
+      input.compareBranch
+    );
     const nameStatusOutput = await execGit(["diff", "--name-status", ref, "--", filePath], cwd);
     const statusLine = nameStatusOutput.trim().split("\n").filter(Boolean)[0];
     const fileStatus = statusLine ? statusLine[0] : null;
@@ -142589,7 +142865,7 @@ var workspaceRouter = t2.router({
       throw new Error("Workspace not found");
     }
     const root = workspace.worktree.path;
-    const target = resolve6(join21(root, input.path));
+    const target = resolve6(join22(root, input.path));
     if (!target.startsWith(root)) {
       throw new Error("Invalid path");
     }
@@ -142612,7 +142888,7 @@ var workspaceRouter = t2.router({
       throw new Error("Path is required");
     }
     const root = workspace.worktree.path;
-    const target = resolve6(join21(root, input.path));
+    const target = resolve6(join22(root, input.path));
     if (!target.startsWith(root)) {
       throw new Error("Invalid path");
     }
@@ -142646,7 +142922,7 @@ var workspaceRouter = t2.router({
       throw new Error("Workspace not found");
     }
     const root = workspace.worktree.path;
-    const target = resolve6(join21(root, input.path));
+    const target = resolve6(join22(root, input.path));
     if (!target.startsWith(root)) {
       throw new Error("Invalid path");
     }
@@ -142787,7 +143063,7 @@ var prereqsRouter = t2.router({
   installTunnel: publicProcedure.mutation(async () => {
     const resolvedPath = await shellPath();
     await new Promise((resolve8, reject) => {
-      execFile4(
+      execFile5(
         "brew",
         ["install", "cloudflared"],
         { env: { ...process.env, PATH: resolvedPath }, timeout: 12e4 },
@@ -143912,8 +144188,8 @@ function getScalarHtml(specUrl) {
 // start-server.ts
 function logCrash(message) {
   try {
-    mkdirSync7(bandHome(), { recursive: true });
-    appendFileSync2(join22(bandHome(), "server.log"), message, "utf-8");
+    mkdirSync8(bandHome(), { recursive: true });
+    appendFileSync2(join23(bandHome(), "server.log"), message, "utf-8");
   } catch {
   }
 }
@@ -143938,7 +144214,7 @@ ${error40.stack || error40.message}
 `);
   process.exit(1);
 });
-var clientDir = join22(import.meta.dirname, "client");
+var clientDir = join23(import.meta.dirname, "client");
 var port = parseInt(process.env.PORT || "3456", 10);
 delete process.env.PORT;
 process.env.BAND_PORT = String(port);
@@ -143949,7 +144225,7 @@ var assets = build_default(clientDir, {
   gzip: true,
   etag: true
 });
-var openApiDoc = JSON.parse(readFileSync8(join22(import.meta.dirname, "openapi.json"), "utf-8"));
+var openApiDoc = JSON.parse(readFileSync9(join23(import.meta.dirname, "openapi.json"), "utf-8"));
 openApiDoc.servers = [{ url: "/trpc" }];
 var openApiSpec = JSON.stringify(openApiDoc, null, 2);
 var scalarHtml = getScalarHtml("/api/openapi.json");
@@ -143960,9 +144236,9 @@ function serveStaticFile(res, root, subdir, rawFilename) {
     res.end("Bad request");
     return;
   }
-  const filePath = join22(root, subdir, filename);
+  const filePath = join23(root, subdir, filename);
   try {
-    const fileStat = statSync6(filePath);
+    const fileStat = statSync7(filePath);
     const contentType = mimeTypeFromFilename(filename);
     res.writeHead(200, {
       "Content-Type": contentType,
@@ -143983,14 +144259,14 @@ function serveWorkspaceFile(res, workspaceId, rawPath) {
     return;
   }
   const root = workspace.worktree.path;
-  const target = resolve7(join22(root, rawPath));
+  const target = resolve7(join23(root, rawPath));
   if (!target.startsWith(`${root}/`) && target !== root) {
     res.writeHead(400);
     res.end("Bad request");
     return;
   }
   try {
-    const fileStat = statSync6(target);
+    const fileStat = statSync7(target);
     const contentType = mimeTypeFromFilename(basename2(target));
     res.writeHead(200, {
       "Content-Type": contentType,
@@ -144035,7 +144311,7 @@ async function main() {
         res.end("Bad request");
         return;
       }
-      serveStaticFile(res, bandHome(), join22("shared", partition), rest.slice(slashIdx + 1));
+      serveStaticFile(res, bandHome(), join23("shared", partition), rest.slice(slashIdx + 1));
       return;
     }
     if (req.url?.startsWith("/api/workspace-file/")) {