openfox 2.0.65 → 2.0.67

package/dist/{chunk-Z6H7SFQR.js → chunk-2GRUQN2B.js}

@@ -21,7 +21,7 @@ import {
   tokenFromPassword,
   verifyPassword,
   workflowExists
-} from "./chunk-N4K3PNOS.js";
+} from "./chunk-B6JUWVTK.js";
 import {
   agentExists,
   createToolRegistry,
@@ -66,19 +66,22 @@ import {
   setSkillEnabled,
   skillExists,
   updateOwnedSkill
-} from "./chunk-UEIQKG5P.js";
+} from "./chunk-YU6DZAVA.js";
 import {
   ALWAYS_ALLOWED,
   ALWAYS_ALLOWED_FOR_SUBAGENTS,
   TOP_LEVEL_ONLY_TOOLS
-} from "./chunk-X5YCWKNS.js";
+} from "./chunk-TJO4QFDQ.js";
 import {
-  getPathSeparator,
-  isAbsolutePath
-} from "./chunk-BGTEIA2S.js";
+  getProject
+} from "./chunk-KXVFHMSM.js";
 import {
   createMcpTools
 } from "./chunk-NWO6GRYE.js";
+import {
+  ensureWorktree,
+  syncIgnoredAssets
+} from "./chunk-VLV3XWZS.js";
 import {
   createSession,
   deleteSession,
@@ -104,31 +107,33 @@ import {
   updateSessionDangerLevel,
   updateSessionMetadata,
   updateSessionProvider,
-  updateSessionRunning
-} from "./chunk-AIJE3RYH.js";
+  updateSessionRunning,
+  updateSessionWorkdir
+} from "./chunk-TFDK6VSG.js";
 import {
   createContextStateMessage
 } from "./chunk-F4PMNP7S.js";
+import {
+  getPathSeparator,
+  isAbsolutePath
+} from "./chunk-X5DOUA3Z.js";
 import {
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-PXJ4NOP4.js";
+} from "./chunk-XUPKS5FL.js";
+import {
+  initDatabase
+} from "./chunk-GMXKJGJ2.js";
 import {
   EventEmitter
 } from "./chunk-EU3WWTFH.js";
-import {
-  getProject
-} from "./chunk-YQ3SOPBI.js";
-import {
-  initDatabase
-} from "./chunk-ZPIZLTWU.js";
 import {
   createProviderManager,
   detectModel,
   getLlmStatus,
   parseDefaultModelSelection
-} from "./chunk-RYIREJAW.js";
+} from "./chunk-5EO6SEGV.js";
 import {
   getModelProfile
 } from "./chunk-V4IE7HJY.js";
@@ -157,8 +162,8 @@ import express from "express";
 import cors from "cors";
 import { createServer as createHttpServer } from "http";
 import { fileURLToPath as fileURLToPath6 } from "url";
-import { dirname as dirname7, resolve as resolve5, join as join8 } from "path";
-import { readFile as readFile3 } from "fs/promises";
+import { dirname as dirname7, resolve as resolve6, join as join9 } from "path";
+import { readFile as readFile4 } from "fs/promises";
 import { createServer as createViteServer } from "vite";
 
 // src/server/llm/mock.ts
@@ -1599,6 +1604,35 @@ var McpManager = class {
   }
 };
 
+// src/server/git/worktree-config.ts
+import { readFile, writeFile, mkdir } from "fs/promises";
+import { resolve, join } from "path";
+var CONFIG_FILENAME = ".openfox/worktree.json";
+function getConfigPath(workdir) {
+  return join(resolve(workdir), CONFIG_FILENAME);
+}
+async function loadWorktreeConfig(workdir) {
+  try {
+    const configPath = getConfigPath(workdir);
+    const raw = await readFile(configPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (!parsed.ignoredAssets) return null;
+    return {
+      ignoredAssets: parsed.ignoredAssets,
+      overrides: parsed.overrides ?? void 0
+    };
+  } catch {
+    return null;
+  }
+}
+async function saveWorktreeConfig(workdir, config3) {
+  const resolved = resolve(workdir);
+  const dirPath = join(resolved, ".openfox");
+  await mkdir(dirPath, { recursive: true });
+  const configPath = getConfigPath(workdir);
+  await writeFile(configPath, JSON.stringify(config3, null, 2) + "\n", "utf-8");
+}
+
 // src/server/lsp/server.ts
 import { spawn } from "child_process";
 import { extname } from "path";
@@ -1921,19 +1955,19 @@ var LspServer = class {
    */
   async getDiagnosticsWithWait(path, timeoutMs = DIAGNOSTIC_WAIT_MS) {
     if (this.openDocuments.has(path)) {
-      return new Promise((resolve6) => {
+      return new Promise((resolve7) => {
         const existing = this.diagnostics.get(path);
         if (existing !== void 0) {
           setTimeout(() => {
-            resolve6(this.diagnostics.get(path) ?? []);
+            resolve7(this.diagnostics.get(path) ?? []);
           }, 100);
           return;
         }
         const timeout = setTimeout(() => {
           this.pendingDiagnostics.delete(path);
-          resolve6(this.diagnostics.get(path) ?? []);
+          resolve7(this.diagnostics.get(path) ?? []);
         }, timeoutMs);
-        this.pendingDiagnostics.set(path, { resolve: resolve6, timeout });
+        this.pendingDiagnostics.set(path, { resolve: resolve7, timeout });
       });
     }
     return this.diagnostics.get(path) ?? [];
@@ -2144,14 +2178,14 @@ import { readFileSync as readFileSync2 } from "fs";
 
 // src/server/utils/which.ts
 import { access, constants } from "fs/promises";
-import { join, dirname } from "path";
+import { join as join2, dirname } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __dirname = dirname(fileURLToPath2(import.meta.url));
 function getBundledBinPaths() {
   const paths = [];
-  paths.push(join(process.cwd(), "node_modules", ".bin"));
-  paths.push(join(__dirname, "..", "..", "..", "node_modules", ".bin"));
-  paths.push(join(__dirname, "..", "..", "..", "..", "node_modules", ".bin"));
+  paths.push(join2(process.cwd(), "node_modules", ".bin"));
+  paths.push(join2(__dirname, "..", "..", "..", "node_modules", ".bin"));
+  paths.push(join2(__dirname, "..", "..", "..", "..", "node_modules", ".bin"));
   return paths;
 }
 async function existsExecutable(path) {
@@ -2170,13 +2204,13 @@ async function which(command, workdir) {
     return null;
   }
   for (const binDir of getBundledBinPaths()) {
-    const fullPath = join(binDir, command);
+    const fullPath = join2(binDir, command);
     if (await existsExecutable(fullPath)) {
       return fullPath;
     }
   }
   if (workdir) {
-    const projectBin = join(workdir, "node_modules", ".bin", command);
+    const projectBin = join2(workdir, "node_modules", ".bin", command);
     if (await existsExecutable(projectBin)) {
       return projectBin;
     }
@@ -2185,7 +2219,7 @@ async function which(command, workdir) {
   const paths = pathEnv.split(getPathSeparator());
   for (const dir of paths) {
     if (!dir) continue;
-    const fullPath = join(dir, command);
+    const fullPath = join2(dir, command);
     if (await existsExecutable(fullPath)) {
       return fullPath;
     }
@@ -2197,9 +2231,9 @@ async function which(command, workdir) {
 import { extname as extname2, basename } from "path";
 import { readFileSync } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname2, resolve } from "path";
+import { dirname as dirname2, resolve as resolve2 } from "path";
 var __dirname2 = dirname2(fileURLToPath3(import.meta.url));
-var languagesJson = JSON.parse(readFileSync(resolve(__dirname2, "languages.json"), "utf-8"));
+var languagesJson = JSON.parse(readFileSync(resolve2(__dirname2, "languages.json"), "utf-8"));
 var LANGUAGES = languagesJson;
 var extensionToLanguage = /* @__PURE__ */ new Map();
 for (const lang of LANGUAGES) {
@@ -2542,7 +2576,7 @@ var SessionManager = class {
    * Create a new session. Emits session.initialized event.
    * Note: maxTokens is no longer stored in the session - it comes from the current model config
    */
-  createSession(projectId, title, providerId, providerModel) {
+  createSession(projectId, title, providerId, providerModel, worktree) {
     const project = getProject(projectId);
     if (!project) {
       throw new Error(`Project not found: ${projectId}`);
@@ -2552,10 +2586,11 @@ var SessionManager = class {
       const existingSessions = listSessionsByProject(projectId, 1e3, 0);
       sessionTitle = `Session ${existingSessions.sessions.length + 1}`;
     }
-    logger.debug("Creating session", { projectId, workdir: project.workdir, title: sessionTitle });
-    const dbSession = createSession(projectId, project.workdir, sessionTitle, providerId, providerModel);
+    const effectiveWorkdir = worktree ?? project.workdir;
+    logger.debug("Creating session", { projectId, workdir: effectiveWorkdir, title: sessionTitle });
+    const dbSession = createSession(projectId, effectiveWorkdir, sessionTitle, providerId, providerModel, worktree);
     const contextWindowId = crypto.randomUUID();
-    emitSessionInitialized(dbSession.id, projectId, project.workdir, contextWindowId, sessionTitle);
+    emitSessionInitialized(dbSession.id, projectId, effectiveWorkdir, contextWindowId, sessionTitle);
     const session = this.buildSessionFromDb(dbSession);
     this.emit({ type: "session_created", session });
     return session;
@@ -2750,6 +2785,7 @@ var SessionManager = class {
     if (message.attachments !== void 0) options.attachments = message.attachments;
     if (message.subAgentId !== void 0) options.subAgentId = message.subAgentId;
     if (message.subAgentType !== void 0) options.subAgentType = message.subAgentType;
+    if (message.metadata !== void 0) options.metadata = message.metadata;
     const messageId = emitUserMessage(sessionId, message.content, options);
     const result = {
       id: messageId,
@@ -2763,6 +2799,7 @@ var SessionManager = class {
     if (message.attachments !== void 0) result.attachments = message.attachments;
     if (message.subAgentId !== void 0) result.subAgentId = message.subAgentId;
     if (message.subAgentType !== void 0) result.subAgentType = message.subAgentType;
+    if (message.metadata !== void 0) result.metadata = message.metadata;
     this.emit({ type: "message_added", sessionId, message: result });
     return result;
   }
@@ -2902,12 +2939,6 @@ var SessionManager = class {
   // ============================================================================
   // Execution State (runtime tracking, not persisted to events)
   // ============================================================================
-  /**
-   * Record that a file was modified.
-   */
-  addModifiedFile(sessionId, filePath) {
-    logger.debug("addModifiedFile called", { sessionId, filePath });
-  }
   /**
    * Add a criterion. Returns the updated criteria list.
    */
@@ -3157,10 +3188,122 @@ var SessionManager = class {
   // ============================================================================
   /**
    * Get the LSP manager for a session.
+   * Uses worktree path when active, otherwise the project workdir.
    */
   getLspManager(sessionId) {
     const session = this.requireSession(sessionId);
-    return getLspManager(sessionId, session.workdir);
+    const effectiveWorkdir = session.worktree ?? session.workdir;
+    return getLspManager(sessionId, effectiveWorkdir);
+  }
+  // ============================================================================
+  // Worktree Lifecycle
+  // ============================================================================
+  /**
+   * Create a git worktree for an existing session and move the session into it.
+   * Keeps session.workdir as the project root (stable system prompt).
+   * Sets session.worktree to the worktree path for tool execution.
+   * Restarts LSP to pick up the new workdir.
+   * Injects a system reminder to inform the agent about the worktree.
+   */
+  async createSessionWorktree(sessionId, name) {
+    const session = this.requireSession(sessionId);
+    const project = getProject(session.projectId);
+    if (!project) throw new Error(`Project not found: ${session.projectId}`);
+    if (session.worktree) throw new Error("Session already has a worktree");
+    const result = await ensureWorktree(project.workdir, name);
+    const wtConfig = await loadWorktreeConfig(project.workdir);
+    if (wtConfig) {
+      await syncIgnoredAssets(project.workdir, result.path, wtConfig);
+    }
+    updateSessionWorkdir(sessionId, project.workdir, result.path);
+    try {
+      await shutdownLspManager(sessionId);
+    } catch (err) {
+      logger.error("Error shutting down LSP for worktree switch", { sessionId, error: err });
+    }
+    const reminderContent = `<system-reminder>
+This session is now operating in a git worktree at ${result.path}.
+All file and git operations should use this directory.
+</system-reminder>`;
+    this.addMessage(sessionId, {
+      role: "user",
+      content: reminderContent,
+      isSystemGenerated: true,
+      messageKind: "auto-prompt",
+      metadata: { type: "worktree", name: "Worktree", color: "#22c55e", kind: "definition", branchName: name }
+    });
+    const updated = this.requireSession(sessionId);
+    this.emit({ type: "session_updated", session: updated });
+    return updated;
+  }
+  /**
+   * Attach session to an existing worktree by path.
+   * Sets session.worktree to the given path without creating a new worktree.
+   * Restarts LSP to pick up the new workdir.
+   */
+  async attachSessionWorktree(sessionId, wtPath) {
+    const session = this.requireSession(sessionId);
+    if (session.worktree) throw new Error("Session already has a worktree");
+    updateSessionWorkdir(sessionId, session.workdir, wtPath);
+    try {
+      await shutdownLspManager(sessionId);
+    } catch (err) {
+      logger.error("Error shutting down LSP for worktree attach", { sessionId, error: err });
+    }
+    const branchName = wtPath.includes("/worktrees/") ? wtPath.split("/worktrees/")[1] ?? wtPath : wtPath;
+    const reminderContent = `<system-reminder>
+This session is now operating in a git worktree at ${wtPath}.
+All file and git operations should use this directory.
+</system-reminder>`;
+    this.addMessage(sessionId, {
+      role: "user",
+      content: reminderContent,
+      isSystemGenerated: true,
+      messageKind: "auto-prompt",
+      metadata: { type: "worktree", name: "Worktree", color: "#22c55e", kind: "definition", branchName }
+    });
+    const updated = this.requireSession(sessionId);
+    this.emit({ type: "session_updated", session: updated });
+    return updated;
+  }
+  /**
+   * Close the worktree for a session and move it back to the project root.
+   * Clears session.worktree — session.workdir stays as project root.
+   * Restarts LSP to pick up the original workdir.
+   * Injects a system reminder to inform the agent the worktree is closed.
+   */
+  async closeSessionWorktree(sessionId) {
+    const session = this.requireSession(sessionId);
+    if (!session.worktree) throw new Error("Session does not have a worktree");
+    const project = getProject(session.projectId);
+    if (!project) throw new Error(`Project not found: ${session.projectId}`);
+    const closedPath = session.worktree;
+    const branchName = closedPath.includes("/worktrees/") ? closedPath.split("/worktrees/")[1] ?? closedPath : closedPath;
+    try {
+      await devServerManager.stop(closedPath);
+    } catch (err) {
+      logger.error("Error stopping dev server for worktree close", { sessionId, worktree: closedPath, error: err });
+    }
+    updateSessionWorkdir(sessionId, project.workdir, null);
+    try {
+      await shutdownLspManager(sessionId);
+    } catch (err) {
+      logger.error("Error shutting down LSP for worktree close", { sessionId, error: err });
+    }
+    const reminderContent = `<system-reminder>
+The worktree at ${closedPath} has been closed.
+Operating in the original project directory at ${project.workdir}.
+</system-reminder>`;
+    this.addMessage(sessionId, {
+      role: "user",
+      content: reminderContent,
+      isSystemGenerated: true,
+      messageKind: "auto-prompt",
+      metadata: { type: "worktree", name: "Worktree", color: "#ef4444", kind: "reminder", branchName }
+    });
+    const updated = this.requireSession(sessionId);
+    this.emit({ type: "session_updated", session: updated });
+    return updated;
   }
   // ============================================================================
   // Active Session
@@ -3243,8 +3386,18 @@ var SessionManager = class {
       contextWindows: [],
       // Derived from events, not stored separately
       executionState: eventState.cachedSystemPrompt || cachedPrompt ? {
-        cachedSystemPrompt: cachedPrompt?.systemPrompt ?? eventState.cachedSystemPrompt,
-        dynamicContextHash: cachedPrompt?.hash ?? eventState.dynamicContextHash
+        iteration: 0,
+        readFiles: {},
+        consecutiveFailures: 0,
+        currentTokenCount: 0,
+        messageCountAtLastUpdate: messages.length,
+        compactionCount: 0,
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        lastActivityAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...cachedPrompt?.systemPrompt ? { cachedSystemPrompt: cachedPrompt.systemPrompt } : {},
+        ...eventState.cachedSystemPrompt && !cachedPrompt?.systemPrompt ? { cachedSystemPrompt: eventState.cachedSystemPrompt } : {},
+        ...cachedPrompt?.hash ? { dynamicContextHash: cachedPrompt.hash } : {},
+        ...eventState.dynamicContextHash && !cachedPrompt?.hash ? { dynamicContextHash: eventState.dynamicContextHash } : {}
       } : null
     };
   }
@@ -3253,15 +3406,15 @@ var SessionManager = class {
 // src/server/routes/skills.ts
 import { Router as Router2 } from "express";
 import multer from "multer";
-import { access as access2, mkdir as mkdir2, realpath, stat } from "fs/promises";
+import { access as access2, mkdir as mkdir3, realpath, stat } from "fs/promises";
 import { constants as constants2 } from "fs";
 import { homedir } from "os";
-import { isAbsolute as isAbsolute2, join as join4, resolve as resolve2 } from "path";
+import { isAbsolute as isAbsolute2, join as join5, resolve as resolve3 } from "path";
 
 // src/server/skills/installer.ts
 import { randomUUID } from "crypto";
-import { mkdir, readFile, rename, rm, writeFile } from "fs/promises";
-import { dirname as dirname3, isAbsolute, join as join2 } from "path";
+import { mkdir as mkdir2, readFile as readFile2, rename, rm, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname3, isAbsolute, join as join3 } from "path";
 import matter from "gray-matter";
 var SkillInstallError = class extends Error {
   constructor(message, status) {
@@ -3293,17 +3446,17 @@ async function installSkillPackage(libraryDir, packageName, files) {
     totalBytes += file.content.byteLength;
   }
   if (totalBytes > 50 * 1024 * 1024) throw new SkillInstallError("Package exceeds 50 MiB", 413);
-  const destination = join2(libraryDir, packageName);
+  const destination = join3(libraryDir, packageName);
   if (await pathExists(destination)) throw new SkillInstallError("A package with this name already exists", 409);
-  const staging = join2(libraryDir, `.${packageName}.openfox-upload-${randomUUID()}`);
+  const staging = join3(libraryDir, `.${packageName}.openfox-upload-${randomUUID()}`);
   try {
-    await mkdir(staging, { recursive: false });
+    await mkdir2(staging, { recursive: false });
     for (const file of files) {
-      const target = join2(staging, file.path);
-      await mkdir(dirname3(target), { recursive: true });
-      await writeFile(target, file.content);
+      const target = join3(staging, file.path);
+      await mkdir2(dirname3(target), { recursive: true });
+      await writeFile2(target, file.content);
     }
-    const parsed = matter(await readFile(join2(staging, "SKILL.md"), "utf-8"));
+    const parsed = matter(await readFile2(join3(staging, "SKILL.md"), "utf-8"));
     const name = typeof parsed.data["name"] === "string" ? parsed.data["name"].trim() : "";
     const description = typeof parsed.data["description"] === "string" ? parsed.data["description"].trim() : "";
     if (!name || !description || !parsed.content.trim()) {
@@ -3320,7 +3473,7 @@ async function installSkillPackage(libraryDir, packageName, files) {
 
 // src/server/routes/crud-helpers.ts
 import { Router } from "express";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function computeOverrideIds(defaults, userItems) {
   return userItems.filter((u) => defaults.some((d) => d.metadata.id === u.metadata.id)).map((u) => u.metadata.id);
 }
@@ -3332,7 +3485,7 @@ function validateNameIdPrompt(body) {
   return null;
 }
 function getProjectItemPath(projectDir, dirName, id, ext) {
-  return join3(projectDir, ".openfox", dirName, `${id}${ext}`);
+  return join4(projectDir, ".openfox", dirName, `${id}${ext}`);
 }
 async function isProjectItem(projectDir, dirName, id, ext) {
   if (!projectDir) return false;
@@ -3477,7 +3630,7 @@ var upload = multer({
 });
 function expandHome(path) {
   if (path === "~") return homedir();
-  return path.startsWith("~/") ? join4(homedir(), path.slice(2)) : path;
+  return path.startsWith("~/") ? join5(homedir(), path.slice(2)) : path;
 }
 function configuredDirectory() {
   const raw = getSetting(SKILL_DIRECTORIES_SETTING);
@@ -3490,13 +3643,13 @@ function configuredDirectory() {
   }
 }
 function defaultLibrary(configDir) {
-  const path = resolve2(configDir, "skills");
+  const path = resolve3(configDir, "skills");
   return { configuredPath: path, resolvedPath: path, available: true, custom: false };
 }
 async function resolveLibrary(path) {
   const expanded = expandHome(path);
   if (!isAbsolute2(expanded)) throw new Error("Selected path must be absolute");
-  const absolute = resolve2(expanded);
+  const absolute = resolve3(expanded);
   const info = await stat(absolute);
   if (!info.isDirectory()) throw new Error("Selected path is not a directory");
   await access2(absolute, constants2.R_OK);
@@ -3585,7 +3738,7 @@ function createSkillRoutes(configDir, projectDir) {
       try {
         const configured = configuredDirectory();
         const library = configured ? await resolveLibrary(configured) : defaultLibrary(configDir);
-        await mkdir2(library.resolvedPath, { recursive: true });
+        await mkdir3(library.resolvedPath, { recursive: true });
         const packageName = String(req.body["packageName"] ?? "");
         const paths = JSON.parse(String(req.body["paths"] ?? "[]"));
         const files = req.files;
@@ -3635,19 +3788,19 @@ function createSkillRoutes(configDir, projectDir) {
 }
 
 // src/server/commands/registry.ts
-import { writeFile as writeFile2, mkdir as mkdir3, unlink } from "fs/promises";
-import { join as join5, dirname as dirname4 } from "path";
+import { writeFile as writeFile3, mkdir as mkdir4, unlink } from "fs/promises";
+import { join as join6, dirname as dirname4 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import matter2 from "gray-matter";
 var __bundleDir = dirname4(fileURLToPath4(import.meta.url));
-var DEFAULTS_DIR = join5(__bundleDir, "defaults");
-var DEFAULTS_DIR_ALT = join5(__bundleDir, "command-defaults");
+var DEFAULTS_DIR = join6(__bundleDir, "defaults");
+var DEFAULTS_DIR_ALT = join6(__bundleDir, "command-defaults");
 var COMMAND_EXTENSION = ".command.md";
 function getCommandsDir(configDir) {
-  return join5(configDir, "commands");
+  return join6(configDir, "commands");
 }
 function getProjectCommandsDir(projectDir) {
-  return join5(projectDir, ".openfox", "commands");
+  return join6(projectDir, ".openfox", "commands");
 }
 async function loadDefaultCommands() {
   let defaults = await loadItemsFromDir(DEFAULTS_DIR, {
@@ -3704,19 +3857,19 @@ function findCommandById(commandId, commands) {
   return commands.find((c) => c.metadata.id === commandId);
 }
 async function commandExists(configDir, commandId, projectDir) {
-  if (await pathExists(join5(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`))) return true;
-  if (projectDir && await pathExists(join5(getProjectCommandsDir(projectDir), `${commandId}${COMMAND_EXTENSION}`)))
+  if (await pathExists(join6(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`))) return true;
+  if (projectDir && await pathExists(join6(getProjectCommandsDir(projectDir), `${commandId}${COMMAND_EXTENSION}`)))
     return true;
   return false;
 }
 async function saveCommand(configDir, command) {
   const commandsDir = getCommandsDir(configDir);
   if (!await pathExists(commandsDir)) {
-    await mkdir3(commandsDir, { recursive: true });
+    await mkdir4(commandsDir, { recursive: true });
   }
-  const filePath = join5(commandsDir, `${command.metadata.id}${COMMAND_EXTENSION}`);
+  const filePath = join6(commandsDir, `${command.metadata.id}${COMMAND_EXTENSION}`);
   const content = matter2.stringify(command.prompt, command.metadata);
-  await writeFile2(filePath, content, "utf-8");
+  await writeFile3(filePath, content, "utf-8");
 }
 async function saveCommandToProject(projectDir, command) {
   await saveItemToDir(
@@ -3734,7 +3887,7 @@ async function deleteCommand(configDir, commandId) {
   if (isDefault) {
     return { success: false, reason: "Cannot delete built-in defaults" };
   }
-  const filePath = join5(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`);
+  const filePath = join6(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`);
   try {
     await unlink(filePath);
     return { success: true };
@@ -3914,10 +4067,38 @@ function createDevServerRoutes() {
   return router;
 }
 
-// src/server/routes/terminals.ts
+// src/server/routes/worktree-config.ts
 import { Router as Router5 } from "express";
-function createTerminalRoutes() {
+function createWorktreeConfigRoutes() {
   const router = Router5();
+  router.get("/config", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const config3 = await loadWorktreeConfig(workdir);
+    res.json({ config: config3 });
+  });
+  router.post("/config", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const { ignoredAssets, overrides } = req.body;
+    if (!ignoredAssets || !["symlink", "copy", "skip"].includes(ignoredAssets)) {
+      return res.status(400).json({ error: "ignoredAssets must be one of: symlink, copy, skip" });
+    }
+    try {
+      const config3 = { ignoredAssets, overrides: overrides ?? void 0 };
+      await saveWorktreeConfig(workdir, config3);
+      res.json({ config: config3 });
+    } catch (err) {
+      res.status(500).json({ error: err instanceof Error ? err.message : "Failed to save config" });
+    }
+  });
+  return router;
+}
+
+// src/server/routes/terminals.ts
+import { Router as Router6 } from "express";
+function createTerminalRoutes() {
+  const router = Router6();
   router.get("/", (req, res) => {
     const projectId = req.query["projectId"];
     const sessions = projectId ? terminalManager.getByProject(projectId) : [];
@@ -3956,20 +4137,20 @@ function createTerminalRoutes() {
 }
 
 // src/server/routes/directories.ts
-import { Router as Router6 } from "express";
+import { Router as Router7 } from "express";
 import { readdir } from "fs/promises";
-import { resolve as resolve3, join as join6, dirname as dirname5, basename as basename2 } from "path";
+import { resolve as resolve4, join as join7, dirname as dirname5, basename as basename2 } from "path";
 function createDirectoryRoutes() {
-  const router = Router6();
+  const router = Router7();
   const DEFAULT_BASE_PATH = process.cwd();
   router.get("/", async (req, res) => {
     const path = req.query["path"] || DEFAULT_BASE_PATH;
     try {
-      const resolvedPath = resolve3(path);
+      const resolvedPath = resolve4(path);
       const entries = await readdir(resolvedPath, { withFileTypes: true });
       const directories = entries.filter((entry) => entry.isDirectory()).map((entry) => ({
         name: entry.name,
-        path: join6(resolvedPath, entry.name)
+        path: join7(resolvedPath, entry.name)
       })).sort((a, b) => a.name.localeCompare(b.name));
       const parent = dirname5(resolvedPath);
       const hasParent = parent !== resolvedPath;
@@ -3993,10 +4174,10 @@ function createDirectoryRoutes() {
 }
 
 // src/server/routes/file-search.ts
-import { Router as Router7 } from "express";
+import { Router as Router8 } from "express";
 import fg from "fast-glob";
 function createFileSearchRoutes() {
-  const router = Router7();
+  const router = Router8();
   router.get("/", async (req, res) => {
     const query = req.query["q"] || "";
     const workdir = req.query["workdir"] || process.cwd();
@@ -4072,11 +4253,11 @@ function fuzzyScore(filePath, query) {
 }
 
 // src/server/routes/auto-update.ts
-import { Router as Router8 } from "express";
+import { Router as Router9 } from "express";
 import { spawn as spawn2 } from "child_process";
 
 // src/constants.ts
-var VERSION = "2.0.65";
+var VERSION = "2.0.67";
 
 // src/server/routes/auto-update.ts
 var updateInProgress = false;
@@ -4094,12 +4275,12 @@ async function checkAuth(req, opts) {
   return true;
 }
 function createAutoUpdateRoutes(options = {}) {
-  const router = Router8();
+  const router = Router9();
   router.get("/check", async (_req, res) => {
     const isService = isRunningAsService();
     const current = VERSION;
     try {
-      const latest = await new Promise((resolve6, reject) => {
+      const latest = await new Promise((resolve7, reject) => {
         const child = spawn2("npm", ["view", "openfox", "version"], {
           stdio: ["ignore", "pipe", "pipe"],
           windowsHide: true
@@ -4110,7 +4291,7 @@ function createAutoUpdateRoutes(options = {}) {
         });
         child.on("close", (code) => {
           if (code === 0) {
-            resolve6(stdout.trim());
+            resolve7(stdout.trim());
           } else {
             reject(new Error(`npm view exited with code ${code}`));
           }
@@ -4154,9 +4335,9 @@ function createAutoUpdateRoutes(options = {}) {
       const timeout = setTimeout(() => {
         child.kill();
       }, UPDATE_TIMEOUT);
-      const exitCode = await new Promise((resolve6) => {
-        child.on("close", resolve6);
-        child.on("error", () => resolve6(1));
+      const exitCode = await new Promise((resolve7) => {
+        child.on("close", resolve7);
+        child.on("error", () => resolve7(1));
       });
       clearTimeout(timeout);
       if (exitCode === 0) {
@@ -4194,9 +4375,9 @@ function createAutoUpdateRoutes(options = {}) {
 }
 
 // src/server/routes/provider-auth.ts
-import { Router as Router9 } from "express";
+import { Router as Router10 } from "express";
 function createProviderAuthRoutes(config3, providerManager, registry) {
-  const router = Router9();
+  const router = Router10();
   function resolveAuthContext(providerId, res) {
     const provider = providerManager.getProviders().find((item) => item.id === providerId);
     if (!provider) {
@@ -4325,8 +4506,8 @@ var ProviderRegistry = class {
 };
 
 // src/server/providers/plugins/loader.ts
-import { readdir as readdir2, readFile as readFile2, stat as stat2 } from "fs/promises";
-import { dirname as dirname6, join as join7, resolve as resolve4 } from "path";
+import { readdir as readdir2, readFile as readFile3, stat as stat2 } from "fs/promises";
+import { dirname as dirname6, join as join8, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath5, pathToFileURL } from "url";
 async function packageDirectories(root) {
   let entries;
@@ -4337,13 +4518,13 @@ async function packageDirectories(root) {
   }
   const directories = [];
   for (const entry of entries) {
-    const entryPath = join7(root, entry.name);
+    const entryPath = join8(root, entry.name);
     const isDirectory = entry.isDirectory() || entry.isSymbolicLink() && (await stat2(entryPath).catch(() => void 0))?.isDirectory();
     if (!isDirectory) continue;
     if (entry.name.startsWith("@")) {
       const scoped = await readdir2(entryPath, { withFileTypes: true }).catch(() => []);
       for (const child of scoped) {
-        const childPath = join7(entryPath, child.name);
+        const childPath = join8(entryPath, child.name);
         const childIsDirectory = child.isDirectory() || child.isSymbolicLink() && (await stat2(childPath).catch(() => void 0))?.isDirectory();
         if (childIsDirectory) directories.push(childPath);
       }
@@ -4356,19 +4537,19 @@ async function packageDirectories(root) {
 async function loadProviderPlugins(options) {
   const moduleDirectory = dirname6(fileURLToPath5(import.meta.url));
   const roots = [
-    join7(options.configDirectory, "plugins"),
-    join7(options.cwd ?? process.cwd(), "node_modules"),
-    resolve4(moduleDirectory, "node_modules"),
-    resolve4(moduleDirectory, "../../../../node_modules")
+    join8(options.configDirectory, "plugins"),
+    join8(options.cwd ?? process.cwd(), "node_modules"),
+    resolve5(moduleDirectory, "node_modules"),
+    resolve5(moduleDirectory, "../../../../node_modules")
   ];
   const seen = /* @__PURE__ */ new Set();
   const diagnostics = [];
   for (const root of roots) {
     for (const packageDir of await packageDirectories(root)) {
-      const manifestPath = join7(packageDir, "package.json");
+      const manifestPath = join8(packageDir, "package.json");
       let manifest;
       try {
-        manifest = JSON.parse(await readFile2(manifestPath, "utf8"));
+        manifest = JSON.parse(await readFile3(manifestPath, "utf8"));
       } catch {
         continue;
       }
@@ -4406,7 +4587,7 @@ async function loadProviderPlugins(options) {
         }
       };
       try {
-        const module = await import(pathToFileURL(join7(packageDir, plugin)).href);
+        const module = await import(pathToFileURL(join8(packageDir, plugin)).href);
         if (typeof module.register !== "function") throw new Error("Plugin does not export register(registry)");
         await module.register(trackingRegistry);
         diagnostic.loaded = true;
@@ -4516,7 +4697,7 @@ async function createServerHandle(config3) {
       setMcpTools(mcpTools);
       logger.info("MCP tools registered", { count: mcpTools.length });
     }
-    const { signalMcpReady } = await import("./server-PXXGMFBT.js");
+    const { signalMcpReady } = await import("./server-OYE7GERR.js");
     signalMcpReady();
   });
   const app = express();
@@ -4578,7 +4759,7 @@ async function createServerHandle(config3) {
     res.json({ tools });
   });
   app.get("/api/projects", async (_req, res) => {
-    const { listProjects } = await import("./projects-BY227WT2.js");
+    const { listProjects } = await import("./projects-7HSBZY2D.js");
     const projects = listProjects();
     res.json({ projects });
   });
@@ -4587,7 +4768,7 @@ async function createServerHandle(config3) {
     if (!name || !workdir) {
       return res.status(400).json({ error: "name and workdir are required" });
     }
-    const { createDirectoryWithGit } = await import("./project-creator-IDW7RACH.js");
+    const { createDirectoryWithGit } = await import("./project-creator-EMGRSPYS.js");
     try {
       const project = await createDirectoryWithGit(name, workdir);
       res.status(201).json({ project });
@@ -4632,7 +4813,7 @@ async function createServerHandle(config3) {
     }
   });
   app.get("/api/projects/:id", async (req, res) => {
-    const { getProject: getProject2 } = await import("./projects-BY227WT2.js");
+    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
     const project = getProject2(req.params.id);
     if (!project) {
       return res.status(404).json({ error: "Project not found" });
@@ -4640,7 +4821,7 @@ async function createServerHandle(config3) {
     res.json({ project });
   });
   app.put("/api/projects/:id", async (req, res) => {
-    const { updateProject } = await import("./projects-BY227WT2.js");
+    const { updateProject } = await import("./projects-7HSBZY2D.js");
     const { name, customInstructions, dangerLevel } = req.body;
     const updates = {};
     if (name !== void 0) updates.name = name;
@@ -4653,7 +4834,7 @@ async function createServerHandle(config3) {
     res.json({ project: updated });
   });
   app.delete("/api/projects/:id", async (req, res) => {
-    const { getProject: getProject2, deleteProject } = await import("./projects-BY227WT2.js");
+    const { getProject: getProject2, deleteProject } = await import("./projects-7HSBZY2D.js");
     const project = getProject2(req.params.id);
     if (!project) {
       return res.status(404).json({ error: "Project not found" });
@@ -4662,7 +4843,7 @@ async function createServerHandle(config3) {
     res.json({ success: true });
   });
   app.put("/api/projects/:id/star", async (req, res) => {
-    const { toggleStar } = await import("./projects-BY227WT2.js");
+    const { toggleStar } = await import("./projects-7HSBZY2D.js");
     const { isStarred } = req.body;
     if (typeof isStarred !== "boolean") {
       return res.status(400).json({ error: "isStarred is required and must be a boolean" });
@@ -4673,8 +4854,53 @@ async function createServerHandle(config3) {
     }
     res.json({ project });
   });
+  app.get("/api/projects/:id/branches", async (req, res) => {
+    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const project = getProject2(req.params.id);
+    if (!project) return res.status(404).json({ error: "Project not found" });
+    const { listBranches } = await import("./worktree-6U45P63P.js");
+    const branches = await listBranches(project.workdir);
+    res.json({ branches });
+  });
+  app.post("/api/projects/:id/checkout", async (req, res) => {
+    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const project = getProject2(req.params.id);
+    if (!project) return res.status(404).json({ error: "Project not found" });
+    const { branch } = req.body;
+    if (!branch || typeof branch !== "string") return res.status(400).json({ error: "branch is required" });
+    const { checkoutBranch } = await import("./worktree-6U45P63P.js");
+    try {
+      await checkoutBranch(project.workdir, branch);
+      res.json({ branch });
+    } catch (err) {
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to checkout branch" });
+    }
+  });
+  app.post("/api/projects/:id/checkout-new", async (req, res) => {
+    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const project = getProject2(req.params.id);
+    if (!project) return res.status(404).json({ error: "Project not found" });
+    const { name } = req.body;
+    if (!name || typeof name !== "string") return res.status(400).json({ error: "name is required" });
+    const { createBranch } = await import("./worktree-6U45P63P.js");
+    try {
+      await createBranch(project.workdir, name);
+      res.json({ branch: name });
+    } catch (err) {
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to create branch" });
+    }
+  });
+  app.get("/api/projects/:id/worktrees", async (req, res) => {
+    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const project = getProject2(req.params.id);
+    if (!project) return res.status(404).json({ error: "Project not found" });
+    const { listWorktrees } = await import("./worktree-6U45P63P.js");
+    const all = await listWorktrees(project.workdir);
+    const worktrees = all.filter((wt) => wt.path !== project.workdir);
+    res.json({ worktrees });
+  });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-52XADT6Y.js");
+    const { getRecentUserPromptsForSession } = await import("./events-CDQ4HASP.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -4706,10 +4932,44 @@ async function createServerHandle(config3) {
     const session = sessionManager.createSession(projectId, title, providerId ?? null, model ?? null);
     res.status(201).json({ session });
   });
+  app.post("/api/sessions/:id/worktree", async (req, res) => {
+    const session = sessionManager.getSession(req.params.id);
+    if (!session) return res.status(404).json({ error: "Session not found" });
+    const { name } = req.body;
+    if (!name || typeof name !== "string") return res.status(400).json({ error: "name is required" });
+    try {
+      const updated = await sessionManager.createSessionWorktree(req.params.id, name);
+      res.json({ session: updated });
+    } catch (err) {
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to create worktree" });
+    }
+  });
+  app.post("/api/sessions/:id/close-worktree", async (req, res) => {
+    const session = sessionManager.getSession(req.params.id);
+    if (!session) return res.status(404).json({ error: "Session not found" });
+    try {
+      const updated = await sessionManager.closeSessionWorktree(req.params.id);
+      res.json({ session: updated });
+    } catch (err) {
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to close worktree" });
+    }
+  });
+  app.post("/api/sessions/:id/attach-worktree", async (req, res) => {
+    const session = sessionManager.getSession(req.params.id);
+    if (!session) return res.status(404).json({ error: "Session not found" });
+    const { path } = req.body;
+    if (!path || typeof path !== "string") return res.status(400).json({ error: "path is required" });
+    try {
+      const updated = await sessionManager.attachSessionWorktree(req.params.id, path);
+      res.json({ session: updated });
+    } catch (err) {
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to attach worktree" });
+    }
+  });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
-    const { getPendingQuestionsForSession } = await import("./tools-ZZM36DAZ.js");
+    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
+    const { getPendingQuestionsForSession } = await import("./tools-INWP6FGV.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
@@ -4728,8 +4988,8 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-MC3XZ3OV.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-ZZM36DAZ.js");
+    const { stopSessionExecution } = await import("./chat-handler-72DFHK5K.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-INWP6FGV.js");
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
@@ -4748,8 +5008,8 @@ async function createServerHandle(config3) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
+    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -4826,8 +5086,8 @@ async function createServerHandle(config3) {
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
+    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -4883,15 +5143,15 @@ async function createServerHandle(config3) {
     if (!callId || approved === void 0) {
       return res.status(400).json({ error: "callId and approved are required" });
     }
-    const { providePathConfirmation } = await import("./tools-ZZM36DAZ.js");
+    const { providePathConfirmation } = await import("./tools-INWP6FGV.js");
     const result = providePathConfirmation(callId, approved, alwaysAllow);
     if (!result.found) {
       return res.status(404).json({ error: "No pending path confirmation with that ID" });
     }
-    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
-    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-2BGFLV5J.js");
+    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
+    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-V2K34EGN.js");
     const { createSessionStateMessage } = await import("./protocol-CTNE3ANP.js");
-    const { getPendingQuestionsForSession } = await import("./tools-ZZM36DAZ.js");
+    const { getPendingQuestionsForSession } = await import("./tools-INWP6FGV.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents(events);
@@ -4912,7 +5172,7 @@ async function createServerHandle(config3) {
     if (!skip && typeof answer !== "string") {
       return res.status(400).json({ error: "answer is required when not skipping" });
     }
-    const { provideAnswer } = await import("./tools-ZZM36DAZ.js");
+    const { provideAnswer } = await import("./tools-INWP6FGV.js");
     const found = provideAnswer(callId, answer ?? "", skip ?? false);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
@@ -4940,7 +5200,7 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { getSetting: getSetting2, SETTINGS_KEYS } = await import("./settings-JA4XUR3W.js");
+    const { getSetting: getSetting2, SETTINGS_KEYS } = await import("./settings-6ZPWOBWL.js");
     if (getSetting2(SETTINGS_KEYS.CACHE_WARMING) !== "true") {
       return res.json({ success: false, reason: "disabled" });
     }
@@ -4972,7 +5232,7 @@ async function createServerHandle(config3) {
       backend: activeProvider?.backend ?? llmClient.getBackend(),
       model: llmClient.getModel()
     };
-    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-IYJRQQKB.js");
+    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-FEMPJOZD.js");
     runAgentTurn(
       {
         sessionManager,
@@ -5010,15 +5270,15 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-MC3XZ3OV.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-ZZM36DAZ.js");
+    const { stopSessionExecution } = await import("./chat-handler-72DFHK5K.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-INWP6FGV.js");
     const queuedMessages = sessionManager.getQueueState(sessionId);
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
     cancelQuestionsForSession(sessionId, "Session stopped by user");
     cancelPathConfirmationsForSession(sessionId, "Session stopped by user");
-    const eventStore = (await import("./events-52XADT6Y.js")).getEventStore();
+    const eventStore = (await import("./events-CDQ4HASP.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true, queuedMessages });
   });
@@ -5032,7 +5292,7 @@ async function createServerHandle(config3) {
     if (typeof messageIndex !== "number" || messageIndex < 0) {
       return res.status(400).json({ error: "messageIndex must be a non-negative number" });
     }
-    const { truncateSessionMessages } = await import("./events-52XADT6Y.js");
+    const { truncateSessionMessages } = await import("./events-CDQ4HASP.js");
     truncateSessionMessages(sessionId, messageIndex);
     res.json({ success: true });
   });
@@ -5046,8 +5306,8 @@ async function createServerHandle(config3) {
     if (typeof messageId !== "string" || !messageId) {
       return res.status(400).json({ error: "messageId is required" });
     }
-    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
+    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents(events);
@@ -5059,7 +5319,7 @@ async function createServerHandle(config3) {
     if (msg.role !== "user" || msg.isSystemGenerated) {
       return res.status(400).json({ error: "Can only replay user messages" });
     }
-    const { truncateSessionMessages } = await import("./events-52XADT6Y.js");
+    const { truncateSessionMessages } = await import("./events-CDQ4HASP.js");
     truncateSessionMessages(sessionId, msgIndex - 1);
     sessionManager.queueMessage(sessionId, "asap", msg.content, msg.attachments, msg.messageKind);
     res.json({ success: true });
@@ -5091,7 +5351,7 @@ async function createServerHandle(config3) {
     res.json({ accepted: true });
   });
   app.get("/api/settings", async (req, res) => {
-    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-JA4XUR3W.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-6ZPWOBWL.js");
     const keysParam = req.query["keys"];
     if (!keysParam) {
       return res.status(400).json({ error: "keys query parameter is required" });
@@ -5104,19 +5364,19 @@ async function createServerHandle(config3) {
     res.json(result);
   });
   app.get("/api/settings/:key", async (req, res) => {
-    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-JA4XUR3W.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-6ZPWOBWL.js");
     const key = req.params.key;
     const value = getSetting2(key) ?? SETTINGS_DEFAULTS[key] ?? null;
     res.json({ key, value });
   });
   app.get("/api/settings/:key", async (req, res) => {
-    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-JA4XUR3W.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-6ZPWOBWL.js");
     const key = req.params.key;
     const value = getSetting2(key) ?? SETTINGS_DEFAULTS[key] ?? null;
     res.json({ key, value });
   });
   app.put("/api/settings/:key", async (req, res) => {
-    const { setSetting: setSetting2 } = await import("./settings-JA4XUR3W.js");
+    const { setSetting: setSetting2 } = await import("./settings-6ZPWOBWL.js");
     const key = req.params.key;
     const { value } = req.body;
     if (value === void 0) {
@@ -5128,20 +5388,24 @@ async function createServerHandle(config3) {
   app.get("/api/tools/rtk-check", async (_req, res) => {
     const { spawn: spawn3 } = await import("child_process");
     try {
-      const available = await new Promise((resolve6) => {
+      const available = await new Promise((resolve7) => {
         const proc = spawn3("rtk", ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
         let out = "";
         proc.stdout?.on("data", (d) => {
           out += d.toString();
         });
-        proc.on("error", () => resolve6(false));
-        proc.on("close", (code) => resolve6(code === 0 && out.startsWith("rtk ")));
+        proc.on("error", () => resolve7(false));
+        proc.on("close", (code) => resolve7(code === 0 && out.startsWith("rtk ")));
       });
       res.json({ available });
     } catch {
       res.json({ available: false });
     }
   });
+  app.get("/api/tools/shells", async (_req, res) => {
+    const { listAvailableShells } = await import("./platform-AB3GIEGO.js");
+    res.json({ shells: listAvailableShells() });
+  });
   app.get("/api/config", async (_req, res) => {
     const llmClient = getLLMClient();
     const activeProvider = providerManager.getActiveProvider();
@@ -5301,7 +5565,7 @@ async function createServerHandle(config3) {
     const backend = req.query["backend"];
     if (!url) return res.status(400).json({ error: "url is required" });
     try {
-      const { fetchModelsWithContext } = await import("./provider-manager-HRHNF73A.js");
+      const { fetchModelsWithContext } = await import("./provider-manager-D3KIOD5E.js");
       const { getModelProfile: getModelProfile2 } = await import("./profiles-5J7F4BML.js");
       const models = await fetchModelsWithContext(
         url,
@@ -5371,7 +5635,7 @@ async function createServerHandle(config3) {
       }
       const { getModelProfile: getModelProfile2 } = await import("./profiles-5J7F4BML.js");
       const { getBackendCapabilities } = await import("./backend-P3GHHLHJ.js");
-      const { buildNonStreamingCreateParams } = await import("./client-pure-DO3S675T.js");
+      const { buildNonStreamingCreateParams } = await import("./client-pure-U6ZYUPJQ.js");
       const { OpenAIHttpClient } = await import("./http-client-PIWB7BXK.js");
       const { ensureVersionPrefix } = await import("./url-utils-SAJP7AEX.js");
       const profile = getModelProfile2(model);
@@ -5629,7 +5893,7 @@ async function createServerHandle(config3) {
   });
   async function rebuildMcpTools() {
     const { createMcpTools: createMcpTools2 } = await import("./tool-adapter-MOGEI6TP.js");
-    const { setMcpTools: setMcpTools2 } = await import("./tools-ZZM36DAZ.js");
+    const { setMcpTools: setMcpTools2 } = await import("./tools-INWP6FGV.js");
     const mcpTools = createMcpTools2(mcpManager);
     setMcpTools2(mcpTools);
   }
@@ -5784,6 +6048,7 @@ async function createServerHandle(config3) {
   app.use("/api/agents", createAgentRoutes(configDir, projectDir));
   app.use("/api/workflows", createWorkflowRoutes(configDir, config3, projectDir));
   app.use("/api/dev-server", createDevServerRoutes());
+  app.use("/api/worktree", createWorktreeConfigRoutes());
   app.use("/api/terminals", createTerminalRoutes());
   app.use(
     "/api/auto-update",
@@ -5800,13 +6065,13 @@ async function createServerHandle(config3) {
     })
   );
   app.get("/api/sessions/:id/background-processes", async (req, res) => {
-    const { getSessionProcesses } = await import("./manager-344C5JLZ.js");
+    const { getSessionProcesses } = await import("./manager-JXYRGR6B.js");
     const sessionId = req.params.id;
     const processes = getSessionProcesses(sessionId);
     res.json({ processes });
   });
   app.post("/api/sessions/:id/background-process/:processId/stop", async (req, res) => {
-    const { stopProcess } = await import("./manager-344C5JLZ.js");
+    const { stopProcess } = await import("./manager-JXYRGR6B.js");
     const sessionId = req.params.id;
     const processId = req.params.processId;
     const session = sessionManager.getSession(sessionId);
@@ -5820,20 +6085,20 @@ async function createServerHandle(config3) {
       res.status(500).json({ error: err instanceof Error ? err.message : "Failed to stop process" });
     }
   });
-  const { getCurrentBranch } = await import("./branch.api-LAN42BA5.js");
+  const { getCurrentBranch } = await import("./branch.api-3YJSWOZG.js");
   app.get("/api/branch", async (req, res) => {
     await getCurrentBranch(req, res);
   });
   app.use("/api/directories", createDirectoryRoutes());
   app.use("/api/files", createFileSearchRoutes());
-  const webDir = resolve5(__dirname3, "../../web");
+  const webDir = resolve6(__dirname3, "../../web");
   const isDev = config3.mode === "development";
   let viteServer;
   if (isDev) {
     logger.info("Dev mode: using Vite middleware");
     viteServer = await createViteServer({
       root: webDir,
-      configFile: resolve5(__dirname3, "../../web/vite.config.ts"),
+      configFile: resolve6(__dirname3, "../../web/vite.config.ts"),
       server: { middlewareMode: true },
       appType: "spa",
       logLevel: "warn"
@@ -5853,7 +6118,7 @@ async function createServerHandle(config3) {
       }
     });
     app.get("/fox.svg", (_req, res) => {
-      readFile3(join8(webDir, "fox.svg")).then((content) => {
+      readFile4(join9(webDir, "fox.svg")).then((content) => {
         res.set("Content-Type", "image/svg+xml");
         res.send(content);
       }).catch(() => {
@@ -5862,7 +6127,7 @@ async function createServerHandle(config3) {
     });
     app.use(
       "/sounds",
-      express.static(join8(webDir, "public", "sounds"), {
+      express.static(join9(webDir, "public", "sounds"), {
         setHeaders: (res) => {
           res.set("Content-Type", "audio/mpeg");
         }
@@ -5871,13 +6136,13 @@ async function createServerHandle(config3) {
     app.use("/__inspect__.js", (_req, res) => {
       res.set("Access-Control-Allow-Origin", "*");
       res.set("Content-Type", "application/javascript");
-      readFile3(join8(webDir, "public", "__inspect__.js")).then((content) => res.send(content)).catch(() => res.status(404).send("Not found"));
+      readFile4(join9(webDir, "public", "__inspect__.js")).then((content) => res.send(content)).catch(() => res.status(404).send("Not found"));
     });
     app.get("/*path", (req, res) => {
       if (req.path.startsWith("/api/")) {
         return;
       }
-      readFile3(join8(webDir, "index.html"), "utf-8").then((indexHtml) => viteServer.transformIndexHtml(req.originalUrl, indexHtml)).then((transformed) => res.send(transformed)).catch((err) => {
+      readFile4(join9(webDir, "index.html"), "utf-8").then((indexHtml) => viteServer.transformIndexHtml(req.originalUrl, indexHtml)).then((transformed) => res.send(transformed)).catch((err) => {
         logger.error("Error serving index.html", { error: err });
         res.status(500).send("Server error");
       });
@@ -5885,10 +6150,10 @@ async function createServerHandle(config3) {
     logger.info("Vite middleware ready", { port: config3.server.port });
   }
   if (!isDev) {
-    const distWebDir = resolve5(__dirname3, "web");
+    const distWebDir = resolve6(__dirname3, "web");
     app.use(
       "/assets",
-      express.static(join8(distWebDir, "assets"), {
+      express.static(join9(distWebDir, "assets"), {
         setHeaders: (res, filepath) => {
           if (filepath.endsWith(".css")) {
             res.set("Content-Type", "text/css");
@@ -5896,11 +6161,11 @@ async function createServerHandle(config3) {
         }
       })
     );
-    app.use("/manifest.webmanifest", express.static(join8(distWebDir, "manifest.webmanifest")));
-    app.use("/registerSW.js", express.static(join8(distWebDir, "registerSW.js")));
-    app.use("/sw.js", express.static(join8(distWebDir, "sw.js")));
+    app.use("/manifest.webmanifest", express.static(join9(distWebDir, "manifest.webmanifest")));
+    app.use("/registerSW.js", express.static(join9(distWebDir, "registerSW.js")));
+    app.use("/sw.js", express.static(join9(distWebDir, "sw.js")));
     app.get("/fox.svg", (_req, res) => {
-      readFile3(join8(distWebDir, "fox.svg")).then((content) => {
+      readFile4(join9(distWebDir, "fox.svg")).then((content) => {
         res.set("Content-Type", "image/svg+xml");
         res.send(content);
       }).catch(() => {
@@ -5909,7 +6174,7 @@ async function createServerHandle(config3) {
     });
     app.use(
       "/sounds",
-      express.static(join8(distWebDir, "sounds"), {
+      express.static(join9(distWebDir, "sounds"), {
         setHeaders: (res) => {
           res.set("Content-Type", "audio/mpeg");
         }
@@ -5918,10 +6183,10 @@ async function createServerHandle(config3) {
     app.use("/__inspect__.js", (_req, res) => {
       res.set("Access-Control-Allow-Origin", "*");
       res.set("Content-Type", "application/javascript");
-      readFile3(join8(distWebDir, "__inspect__.js")).then((content) => res.send(content)).catch(() => res.status(404).send("Not found"));
+      readFile4(join9(distWebDir, "__inspect__.js")).then((content) => res.send(content)).catch(() => res.status(404).send("Not found"));
     });
     app.get("/", (_req, res) => {
-      readFile3(join8(distWebDir, "index.html"), "utf-8").then((content) => res.send(content)).catch(() => {
+      readFile4(join9(distWebDir, "index.html"), "utf-8").then((content) => res.send(content)).catch(() => {
         res.status(404).send("Web UI not built. Run `npm run build:web`");
       });
     });
@@ -5929,7 +6194,7 @@ async function createServerHandle(config3) {
       if (req.path.startsWith("/api/") || req.path.startsWith("/assets/") || req.path.startsWith("/sounds/") || req.path.startsWith("/manifest.webmanifest") || req.path.startsWith("/registerSW.js") || req.path.startsWith("/sw.js") || req.path === "/fox.svg") {
         return;
       }
-      readFile3(join8(distWebDir, "index.html"), "utf-8").then((content) => res.send(content)).catch(() => {
+      readFile4(join9(distWebDir, "index.html"), "utf-8").then((content) => res.send(content)).catch(() => {
         res.status(404).send("Web UI not built");
       });
     });
@@ -5949,7 +6214,7 @@ async function createServerHandle(config3) {
     const state = sessionManager.getContextState(sessionId);
     wssExports.broadcastForSession(sessionId, createContextStateMessage(state));
   });
-  const { QueueProcessor } = await import("./processor-LUXKVIED.js");
+  const { QueueProcessor } = await import("./processor-QB3NMRMO.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -5972,7 +6237,7 @@ async function createServerHandle(config3) {
   return {
     httpServer,
     ctx: { config: config3, sessionManager, llmClient: getLLMClient(), toolRegistry, providerManager },
-    start: (port) => new Promise((resolve6, reject) => {
+    start: (port) => new Promise((resolve7, reject) => {
       const listenPort = port ?? config3.server.port;
       const host = config3.server.host;
       httpServer.listen(listenPort, host, () => {
@@ -5982,16 +6247,16 @@ async function createServerHandle(config3) {
         logger.info(`OpenFox server running at http://${host}:${actualPort}`);
         logger.info(`WebSocket available at ws://${host}:${actualPort}/ws`);
         logger.info(`LLM backend: ${client.getBackend()}, model: ${client.getModel()}, url: ${config3.llm.baseUrl}`);
-        resolve6({ port: actualPort });
+        resolve7({ port: actualPort });
       });
       httpServer.on("error", reject);
     }),
-    close: () => new Promise((resolve6) => {
+    close: () => new Promise((resolve7) => {
       logger.info("Shutting down...");
       void (async () => {
         await devServerManager.stopAll();
         await mcpManager.disconnectAll();
-        const { stopAllInspectProxies } = await import("./inspect-proxy-BV25JERQ.js");
+        const { stopAllInspectProxies } = await import("./inspect-proxy-OVEFBJ26.js");
         stopAllInspectProxies();
         const { cleanupAllProcesses } = await import("./store-FXTCHBI4.js");
         cleanupAllProcesses();
@@ -6005,7 +6270,7 @@ async function createServerHandle(config3) {
           client.terminate();
         }
         wss.close();
-        httpServer.close(() => resolve6());
+        httpServer.close(() => resolve7());
       })();
     })
   };
@@ -6030,4 +6295,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-Z6H7SFQR.js.map
+//# sourceMappingURL=chunk-2GRUQN2B.js.map