openfox 2.0.71 → 2.0.72

package/dist/{chunk-OLXHRPAD.js → chunk-FILRB5QX.js}

@@ -21,7 +21,7 @@ import {
   tokenFromPassword,
   verifyPassword,
   workflowExists
-} from "./chunk-Z42YTK3O.js";
+} from "./chunk-TK4BZIXA.js";
 import {
   agentExists,
   createToolRegistry,
@@ -66,11 +66,18 @@ import {
   setSkillEnabled,
   skillExists,
   updateOwnedSkill
-} from "./chunk-Y4YESMVA.js";
+} from "./chunk-GMF36EZ3.js";
 import {
-  ensureWorktree,
-  syncIgnoredAssets
-} from "./chunk-VLV3XWZS.js";
+  deleteWorkspace,
+  ensureWorkspace,
+  getCommitsBehind,
+  getGitBranch,
+  getWorkspacesDir,
+  loadWorkspaceConfig,
+  runGit,
+  saveWorkspaceConfig,
+  workspaceExists
+} from "./chunk-X2Y3AJPP.js";
 import {
   EventEmitter
 } from "./chunk-EU3WWTFH.js";
@@ -78,16 +85,16 @@ import {
   ALWAYS_ALLOWED,
   ALWAYS_ALLOWED_FOR_SUBAGENTS,
   TOP_LEVEL_ONLY_TOOLS
-} from "./chunk-RKD2FML3.js";
+} from "./chunk-XWBNYU2L.js";
 import {
   getProject
-} from "./chunk-KXVFHMSM.js";
+} from "./chunk-UV3EMWL4.js";
 import {
   createMcpTools
 } from "./chunk-NWO6GRYE.js";
 import {
   VERSION
-} from "./chunk-7NMOWPNY.js";
+} from "./chunk-2M6JM7OR.js";
 import {
   createSession,
   deleteSession,
@@ -115,22 +122,22 @@ import {
   updateSessionProvider,
   updateSessionRunning,
   updateSessionWorkdir
-} from "./chunk-TFDK6VSG.js";
+} from "./chunk-6XKM25OT.js";
 import {
   createContextStateMessage
-} from "./chunk-F4PMNP7S.js";
+} from "./chunk-NOU2QIL5.js";
 import {
   getPathSeparator,
   isAbsolutePath
-} from "./chunk-X5DOUA3Z.js";
+} from "./chunk-S7O77CVO.js";
 import {
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-XUPKS5FL.js";
+} from "./chunk-QNKXZH3Z.js";
 import {
   initDatabase
-} from "./chunk-GMXKJGJ2.js";
+} from "./chunk-I4RWK2L2.js";
 import {
   createProviderManager,
   detectModel,
@@ -165,8 +172,8 @@ import express from "express";
 import cors from "cors";
 import { createServer as createHttpServer } from "http";
 import { fileURLToPath as fileURLToPath7 } from "url";
-import { dirname as dirname8, resolve as resolve7, join as join10 } from "path";
-import { readFile as readFile5 } from "fs/promises";
+import { dirname as dirname8, resolve as resolve7, join as join9 } from "path";
+import { readFile as readFile4 } from "fs/promises";
 import { createServer as createViteServer } from "vite";
 
 // src/server/llm/mock.ts
@@ -1607,34 +1614,8 @@ 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/session/manager.ts
+import { resolve as resolve2 } from "path";
 
 // src/server/lsp/server.ts
 import { spawn } from "child_process";
@@ -2193,14 +2174,14 @@ import { readFileSync as readFileSync2 } from "fs";
 
 // src/server/utils/which.ts
 import { access, constants } from "fs/promises";
-import { join as join2, dirname } from "path";
+import { join, dirname } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __dirname = dirname(fileURLToPath2(import.meta.url));
 function getBundledBinPaths() {
   const paths = [];
-  paths.push(join2(process.cwd(), "node_modules", ".bin"));
-  paths.push(join2(__dirname, "..", "..", "..", "node_modules", ".bin"));
-  paths.push(join2(__dirname, "..", "..", "..", "..", "node_modules", ".bin"));
+  paths.push(join(process.cwd(), "node_modules", ".bin"));
+  paths.push(join(__dirname, "..", "..", "..", "node_modules", ".bin"));
+  paths.push(join(__dirname, "..", "..", "..", "..", "node_modules", ".bin"));
   return paths;
 }
 async function existsExecutable(path) {
@@ -2219,7 +2200,7 @@ function candidateNames(command) {
 }
 async function findInDir(dir, command) {
   for (const name of candidateNames(command)) {
-    const fullPath = join2(dir, name);
+    const fullPath = join(dir, name);
     if (await existsExecutable(fullPath)) {
       return fullPath;
     }
@@ -2240,7 +2221,7 @@ async function which(command, workdir) {
     }
   }
   if (workdir) {
-    const found = await findInDir(join2(workdir, "node_modules", ".bin"), command);
+    const found = await findInDir(join(workdir, "node_modules", ".bin"), command);
     if (found) {
       return found;
     }
@@ -2261,9 +2242,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 as resolve2 } from "path";
+import { dirname as dirname2, resolve } from "path";
 var __dirname2 = dirname2(fileURLToPath3(import.meta.url));
-var languagesJson = JSON.parse(readFileSync(resolve2(__dirname2, "languages.json"), "utf-8"));
+var languagesJson = JSON.parse(readFileSync(resolve(__dirname2, "languages.json"), "utf-8"));
 var LANGUAGES = languagesJson;
 var extensionToLanguage = /* @__PURE__ */ new Map();
 for (const lang of LANGUAGES) {
@@ -2606,7 +2587,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, worktree) {
+  createSession(projectId, title, providerId, providerModel, workspace) {
     const project = getProject(projectId);
     if (!project) {
       throw new Error(`Project not found: ${projectId}`);
@@ -2616,9 +2597,9 @@ var SessionManager = class {
       const existingSessions = listSessionsByProject(projectId, 1e3, 0);
       sessionTitle = `Session ${existingSessions.sessions.length + 1}`;
     }
-    const effectiveWorkdir = worktree ?? project.workdir;
+    const effectiveWorkdir = workspace ?? project.workdir;
     logger.debug("Creating session", { projectId, workdir: effectiveWorkdir, title: sessionTitle });
-    const dbSession = createSession(projectId, effectiveWorkdir, sessionTitle, providerId, providerModel, worktree);
+    const dbSession = createSession(projectId, effectiveWorkdir, sessionTitle, providerId, providerModel, workspace);
     const contextWindowId = crypto.randomUUID();
     emitSessionInitialized(dbSession.id, projectId, effectiveWorkdir, contextWindowId, sessionTitle);
     const session = this.buildSessionFromDb(dbSession);
@@ -3218,71 +3199,70 @@ var SessionManager = class {
   // ============================================================================
   /**
    * Get the LSP manager for a session.
-   * Uses worktree path when active, otherwise the project workdir.
+   * Uses workspace path when active, otherwise the project workdir.
    */
   getLspManager(sessionId) {
     const session = this.requireSession(sessionId);
-    const effectiveWorkdir = session.worktree ?? session.workdir;
+    const effectiveWorkdir = session.workspace ?? session.workdir;
     return getLspManager(sessionId, effectiveWorkdir);
   }
   // ============================================================================
-  // Worktree Lifecycle
+  // Workspace 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.
+   * Switch to a workspace. Target can be "original" (project root) or a workspace name.
+   * If the workspace doesn't exist yet, it's created first.
+   * Emits a single type of event — switching is always "opening" a workspace.
    */
-  async createSessionWorktree(sessionId, name) {
+  async switchWorkspace(sessionId, target, branch) {
     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);
+    if (target === "original" && !session.workspace) return session;
+    if (target !== "original" && session.workspace?.endsWith(`/${target}`)) return session;
+    const previousPath = session.workspace;
+    if (previousPath) {
+      try {
+        await devServerManager.stop(previousPath);
+      } catch (err) {
+        logger.error("Error stopping dev server for workspace switch", {
+          sessionId,
+          workspace: previousPath,
+          error: err
+        });
+      }
     }
-    updateSessionWorkdir(sessionId, project.workdir, result.path);
-    try {
-      await shutdownLspManager(sessionId);
-    } catch (err) {
-      logger.error("Error shutting down LSP for worktree switch", { sessionId, error: err });
+    if (target === "original") {
+      updateSessionWorkdir(sessionId, project.workdir, null);
+    } else {
+      const exists = await workspaceExists(project.name, target);
+      if (!exists) {
+        await ensureWorkspace(project.workdir, target, project.name, branch);
+      }
+      const wsPath = resolve2(getWorkspacesDir(project.name), target);
+      updateSessionWorkdir(sessionId, project.workdir, wsPath);
     }
-    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 });
+      logger.error("Error shutting down LSP for workspace switch", { sessionId, error: err });
+    }
+    const effectiveWorkdir = target === "original" ? project.workdir : resolve2(getWorkspacesDir(project.name), target);
+    const actualBranch = await getGitBranch(effectiveWorkdir);
+    let stalenessHint = "";
+    if (target !== "original" && actualBranch) {
+      await runGit(effectiveWorkdir, ["fetch", "origin", "--no-tags", "--quiet"]).catch(() => {
+      });
+      const behind = await getCommitsBehind(effectiveWorkdir, actualBranch);
+      if (behind !== null && behind > 0) {
+        const plural = behind === 1 ? "" : "s";
+        stalenessHint = `
+(${behind} commit${plural} behind ${actualBranch} on main workspace \u2014 run \`git pull\` to sync)`;
+      }
     }
-    const branchName = wtPath.includes("/worktrees/") ? wtPath.split("/worktrees/")[1] ?? wtPath : wtPath;
+    const wsLabel = target === "original" ? "original" : target;
     const reminderContent = `<system-reminder>
-This session is now operating in a git worktree at ${wtPath}.
+This session is now operating in workspace "${wsLabel}" on branch "${actualBranch ?? "unknown"}" at ${effectiveWorkdir}.${stalenessHint}
 All file and git operations should use this directory.
 </system-reminder>`;
     this.addMessage(sessionId, {
@@ -3290,47 +3270,33 @@ All file and git operations should use this directory.
       content: reminderContent,
       isSystemGenerated: true,
       messageKind: "auto-prompt",
-      metadata: { type: "worktree", name: "Worktree", color: "#22c55e", kind: "definition", branchName }
+      metadata: {
+        type: "workspace",
+        name: "Workspace",
+        color: "#22c55e",
+        kind: "definition",
+        workspaceName: wsLabel,
+        ...actualBranch ? { branchName: actualBranch } : {}
+      }
     });
     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.
+   * Delete a workspace by name. If the session is currently in that workspace,
+   * switches to original first. Throws if target is "original".
    */
-  async closeSessionWorktree(sessionId) {
+  async deleteWorkspace(sessionId, target) {
+    if (target === "original") throw new Error("Cannot delete the original workspace");
     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 });
+    const currentWsName = session.workspace?.split("/").pop();
+    if (currentWsName === target) {
+      await this.switchWorkspace(sessionId, "original");
     }
-    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 }
-    });
+    await deleteWorkspace(project.name, target);
     const updated = this.requireSession(sessionId);
     this.emit({ type: "session_updated", session: updated });
     return updated;
@@ -3436,15 +3402,15 @@ Operating in the original project directory at ${project.workdir}.
 // src/server/routes/skills.ts
 import { Router as Router2 } from "express";
 import multer from "multer";
-import { access as access2, mkdir as mkdir3, realpath, stat } from "fs/promises";
+import { access as access2, mkdir as mkdir2, realpath, stat } from "fs/promises";
 import { constants as constants2 } from "fs";
 import { homedir } from "os";
-import { isAbsolute as isAbsolute2, join as join5, resolve as resolve3 } from "path";
+import { isAbsolute as isAbsolute2, join as join4, resolve as resolve3 } from "path";
 
 // src/server/skills/installer.ts
 import { randomUUID } from "crypto";
-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 { mkdir, readFile, rename, rm, writeFile } from "fs/promises";
+import { dirname as dirname3, isAbsolute, join as join2 } from "path";
 import matter from "gray-matter";
 var SkillInstallError = class extends Error {
   constructor(message, status) {
@@ -3476,17 +3442,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 = join3(libraryDir, packageName);
+  const destination = join2(libraryDir, packageName);
   if (await pathExists(destination)) throw new SkillInstallError("A package with this name already exists", 409);
-  const staging = join3(libraryDir, `.${packageName}.openfox-upload-${randomUUID()}`);
+  const staging = join2(libraryDir, `.${packageName}.openfox-upload-${randomUUID()}`);
   try {
-    await mkdir2(staging, { recursive: false });
+    await mkdir(staging, { recursive: false });
     for (const file of files) {
-      const target = join3(staging, file.path);
-      await mkdir2(dirname3(target), { recursive: true });
-      await writeFile2(target, file.content);
+      const target = join2(staging, file.path);
+      await mkdir(dirname3(target), { recursive: true });
+      await writeFile(target, file.content);
     }
-    const parsed = matter(await readFile2(join3(staging, "SKILL.md"), "utf-8"));
+    const parsed = matter(await readFile(join2(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()) {
@@ -3503,7 +3469,7 @@ async function installSkillPackage(libraryDir, packageName, files) {
 
 // src/server/routes/crud-helpers.ts
 import { Router } from "express";
-import { join as join4 } from "path";
+import { join as join3 } from "path";
 function computeOverrideIds(defaults, userItems) {
   return userItems.filter((u) => defaults.some((d) => d.metadata.id === u.metadata.id)).map((u) => u.metadata.id);
 }
@@ -3515,7 +3481,7 @@ function validateNameIdPrompt(body) {
   return null;
 }
 function getProjectItemPath(projectDir, dirName, id, ext) {
-  return join4(projectDir, ".openfox", dirName, `${id}${ext}`);
+  return join3(projectDir, ".openfox", dirName, `${id}${ext}`);
 }
 async function isProjectItem(projectDir, dirName, id, ext) {
   if (!projectDir) return false;
@@ -3660,7 +3626,7 @@ var upload = multer({
 });
 function expandHome(path) {
   if (path === "~") return homedir();
-  return path.startsWith("~/") ? join5(homedir(), path.slice(2)) : path;
+  return path.startsWith("~/") ? join4(homedir(), path.slice(2)) : path;
 }
 function configuredDirectory() {
   const raw = getSetting(SKILL_DIRECTORIES_SETTING);
@@ -3768,7 +3734,7 @@ function createSkillRoutes(configDir, projectDir) {
       try {
         const configured = configuredDirectory();
         const library = configured ? await resolveLibrary(configured) : defaultLibrary(configDir);
-        await mkdir3(library.resolvedPath, { recursive: true });
+        await mkdir2(library.resolvedPath, { recursive: true });
         const packageName = String(req.body["packageName"] ?? "");
         const paths = JSON.parse(String(req.body["paths"] ?? "[]"));
         const files = req.files;
@@ -3818,19 +3784,19 @@ function createSkillRoutes(configDir, projectDir) {
 }
 
 // src/server/commands/registry.ts
-import { writeFile as writeFile3, mkdir as mkdir4, unlink } from "fs/promises";
-import { join as join6, dirname as dirname4 } from "path";
+import { writeFile as writeFile2, mkdir as mkdir3, unlink } from "fs/promises";
+import { join as join5, 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 = join6(__bundleDir, "defaults");
-var DEFAULTS_DIR_ALT = join6(__bundleDir, "command-defaults");
+var DEFAULTS_DIR = join5(__bundleDir, "defaults");
+var DEFAULTS_DIR_ALT = join5(__bundleDir, "command-defaults");
 var COMMAND_EXTENSION = ".command.md";
 function getCommandsDir(configDir) {
-  return join6(configDir, "commands");
+  return join5(configDir, "commands");
 }
 function getProjectCommandsDir(projectDir) {
-  return join6(projectDir, ".openfox", "commands");
+  return join5(projectDir, ".openfox", "commands");
 }
 async function loadDefaultCommands() {
   let defaults = await loadItemsFromDir(DEFAULTS_DIR, {
@@ -3887,19 +3853,19 @@ function findCommandById(commandId, commands) {
   return commands.find((c) => c.metadata.id === commandId);
 }
 async function commandExists(configDir, commandId, projectDir) {
-  if (await pathExists(join6(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`))) return true;
-  if (projectDir && await pathExists(join6(getProjectCommandsDir(projectDir), `${commandId}${COMMAND_EXTENSION}`)))
+  if (await pathExists(join5(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`))) return true;
+  if (projectDir && await pathExists(join5(getProjectCommandsDir(projectDir), `${commandId}${COMMAND_EXTENSION}`)))
     return true;
   return false;
 }
 async function saveCommand(configDir, command) {
   const commandsDir = getCommandsDir(configDir);
   if (!await pathExists(commandsDir)) {
-    await mkdir4(commandsDir, { recursive: true });
+    await mkdir3(commandsDir, { recursive: true });
   }
-  const filePath = join6(commandsDir, `${command.metadata.id}${COMMAND_EXTENSION}`);
+  const filePath = join5(commandsDir, `${command.metadata.id}${COMMAND_EXTENSION}`);
   const content = matter2.stringify(command.prompt, command.metadata);
-  await writeFile3(filePath, content, "utf-8");
+  await writeFile2(filePath, content, "utf-8");
 }
 async function saveCommandToProject(projectDir, command) {
   await saveItemToDir(
@@ -3917,7 +3883,7 @@ async function deleteCommand(configDir, commandId) {
   if (isDefault) {
     return { success: false, reason: "Cannot delete built-in defaults" };
   }
-  const filePath = join6(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`);
+  const filePath = join5(getCommandsDir(configDir), `${commandId}${COMMAND_EXTENSION}`);
   try {
     await unlink(filePath);
     return { success: true };
@@ -4097,26 +4063,26 @@ function createDevServerRoutes() {
   return router;
 }
 
-// src/server/routes/worktree-config.ts
+// src/server/routes/workspace-config.ts
 import { Router as Router5 } from "express";
-function createWorktreeConfigRoutes() {
+function createWorkspaceConfigRoutes() {
   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);
+    const config3 = await loadWorkspaceConfig(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" });
+    const { setup } = req.body;
+    if (!Array.isArray(setup)) {
+      return res.status(400).json({ error: "setup must be an array of strings" });
     }
     try {
-      const config3 = { ignoredAssets, overrides: overrides ?? void 0 };
-      await saveWorktreeConfig(workdir, config3);
+      const config3 = { setup };
+      await saveWorkspaceConfig(workdir, config3);
       res.json({ config: config3 });
     } catch (err) {
       res.status(500).json({ error: err instanceof Error ? err.message : "Failed to save config" });
@@ -4169,7 +4135,7 @@ function createTerminalRoutes() {
 // src/server/routes/directories.ts
 import { Router as Router7 } from "express";
 import { readdir } from "fs/promises";
-import { resolve as resolve4, join as join7, dirname as dirname5, basename as basename2 } from "path";
+import { resolve as resolve4, join as join6, dirname as dirname5, basename as basename2 } from "path";
 function createDirectoryRoutes() {
   const router = Router7();
   const DEFAULT_BASE_PATH = process.cwd();
@@ -4180,7 +4146,7 @@ function createDirectoryRoutes() {
       const entries = await readdir(resolvedPath, { withFileTypes: true });
       const directories = entries.filter((entry) => entry.isDirectory()).map((entry) => ({
         name: entry.name,
-        path: join7(resolvedPath, entry.name)
+        path: join6(resolvedPath, entry.name)
       })).sort((a, b) => a.name.localeCompare(b.name));
       const parent = dirname5(resolvedPath);
       const hasParent = parent !== resolvedPath;
@@ -4537,8 +4503,8 @@ var ProviderRegistry = class {
 };
 
 // src/server/providers/plugins/loader.ts
-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 { readdir as readdir2, readFile as readFile2, stat as stat2 } from "fs/promises";
+import { dirname as dirname6, join as join7, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath5, pathToFileURL } from "url";
 async function packageDirectories(root) {
   let entries;
@@ -4549,13 +4515,13 @@ async function packageDirectories(root) {
   }
   const directories = [];
   for (const entry of entries) {
-    const entryPath = join8(root, entry.name);
+    const entryPath = join7(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 = join8(entryPath, child.name);
+        const childPath = join7(entryPath, child.name);
         const childIsDirectory = child.isDirectory() || child.isSymbolicLink() && (await stat2(childPath).catch(() => void 0))?.isDirectory();
         if (childIsDirectory) directories.push(childPath);
       }
@@ -4568,8 +4534,8 @@ async function packageDirectories(root) {
 async function loadProviderPlugins(options) {
   const moduleDirectory = dirname6(fileURLToPath5(import.meta.url));
   const roots = [
-    join8(options.configDirectory, "plugins"),
-    join8(options.cwd ?? process.cwd(), "node_modules"),
+    join7(options.configDirectory, "plugins"),
+    join7(options.cwd ?? process.cwd(), "node_modules"),
     resolve5(moduleDirectory, "node_modules"),
     resolve5(moduleDirectory, "../../../../node_modules")
   ];
@@ -4577,10 +4543,10 @@ async function loadProviderPlugins(options) {
   const diagnostics = [];
   for (const root of roots) {
     for (const packageDir of await packageDirectories(root)) {
-      const manifestPath = join8(packageDir, "package.json");
+      const manifestPath = join7(packageDir, "package.json");
       let manifest;
       try {
-        manifest = JSON.parse(await readFile3(manifestPath, "utf8"));
+        manifest = JSON.parse(await readFile2(manifestPath, "utf8"));
       } catch {
         continue;
       }
@@ -4618,7 +4584,7 @@ async function loadProviderPlugins(options) {
         }
       };
       try {
-        const module = await import(pathToFileURL(join8(packageDir, plugin)).href);
+        const module = await import(pathToFileURL(join7(packageDir, plugin)).href);
         if (typeof module.register !== "function") throw new Error("Plugin does not export register(registry)");
         await module.register(trackingRegistry);
         diagnostic.loaded = true;
@@ -4633,9 +4599,9 @@ async function loadProviderPlugins(options) {
 // src/server/routes/plugins.ts
 import { Router as Router11 } from "express";
 import { fileURLToPath as fileURLToPath6, pathToFileURL as pathToFileURL2 } from "url";
-import { dirname as dirname7, resolve as resolve6, join as join9 } from "path";
+import { dirname as dirname7, resolve as resolve6, join as join8 } from "path";
 import { existsSync } from "fs";
-import { readFile as readFile4, readdir as readdir3, rm as rm2, rename as rename2 } from "fs/promises";
+import { readFile as readFile3, readdir as readdir3, rm as rm2, rename as rename2 } from "fs/promises";
 import { platform } from "os";
 import { execFile } from "child_process";
 import { promisify } from "util";
@@ -4665,7 +4631,7 @@ function createPluginRoutes(options) {
       if (!existsSync(registryPath)) {
         registryPath = resolve6(moduleDir, "../../../plugins-registry.json");
       }
-      const data = JSON.parse(await readFile4(registryPath, "utf8"));
+      const data = JSON.parse(await readFile3(registryPath, "utf8"));
       registryCache = { data, ts: now };
       res.json({ plugins: data });
     } catch (err) {
@@ -4686,9 +4652,9 @@ function createPluginRoutes(options) {
     if (!/^[a-zA-Z0-9_-]+$/.test(repoName)) {
       return res.status(400).json({ error: "Invalid repository name" });
     }
-    const pluginsDir = join9(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
-    const targetDir = join9(pluginsDir, repoName);
-    const tmpDir = join9(pluginsDir, `.${repoName}-tmp-${Date.now()}`);
+    const pluginsDir = join8(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
+    const targetDir = join8(pluginsDir, repoName);
+    const tmpDir = join8(pluginsDir, `.${repoName}-tmp-${Date.now()}`);
     try {
       await execFileP("mkdir", ["-p", pluginsDir], { timeout: 5e3 });
     } catch {
@@ -4719,7 +4685,7 @@ function createPluginRoutes(options) {
       }
       if (!loadError) {
         try {
-          const manifest = JSON.parse(await readFile4(join9(targetDir, "package.json"), "utf8"));
+          const manifest = JSON.parse(await readFile3(join8(targetDir, "package.json"), "utf8"));
           const pluginEntry = manifest.openfox?.plugin;
           const apiVersion = manifest.openfox?.apiVersion;
           if (!pluginEntry || !manifest.name) {
@@ -4727,7 +4693,7 @@ function createPluginRoutes(options) {
           } else if (apiVersion !== 1) {
             loadError = `Unsupported plugin API version: ${String(apiVersion)}`;
           } else {
-            const mod = await import(pathToFileURL2(join9(targetDir, pluginEntry)).href);
+            const mod = await import(pathToFileURL2(join8(targetDir, pluginEntry)).href);
             if (typeof mod.register !== "function") {
               loadError = "Plugin does not export register(registry)";
             } else {
@@ -4776,16 +4742,16 @@ function createPluginRoutes(options) {
     }
   });
   router.get("/installed", async (_req, res) => {
-    const pluginsDir = join9(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
+    const pluginsDir = join8(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
     try {
       const entries = await readdir3(pluginsDir, { withFileTypes: true });
       const installed = [];
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const pkgPath = join9(pluginsDir, entry.name, "package.json");
+        const pkgPath = join8(pluginsDir, entry.name, "package.json");
         let version = null;
         try {
-          const pkg = JSON.parse(await readFile4(pkgPath, "utf8"));
+          const pkg = JSON.parse(await readFile3(pkgPath, "utf8"));
           version = pkg.version ?? null;
         } catch {
         }
@@ -4797,13 +4763,13 @@ function createPluginRoutes(options) {
     }
   });
   router.get("/open-folder", async (_req, res) => {
-    const pluginsDir = join9(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
+    const pluginsDir = join8(getGlobalConfigDir(config3.mode ?? "production"), "plugins");
     await openFolder(pluginsDir, res);
   });
   router.get("/:name/open-folder", async (req, res) => {
     const name = req.params.name;
     if (!/^[a-zA-Z0-9_-]+$/.test(name)) return res.status(400).json({ error: "Invalid plugin name" });
-    const targetDir = join9(getGlobalConfigDir(config3.mode ?? "production"), "plugins", name);
+    const targetDir = join8(getGlobalConfigDir(config3.mode ?? "production"), "plugins", name);
     await openFolder(targetDir, res);
   });
   router.delete("/:name", async (req, res) => {
@@ -4811,7 +4777,7 @@ function createPluginRoutes(options) {
     if (!/^[a-zA-Z0-9_-]+$/.test(name)) {
       return res.status(400).json({ error: "Invalid plugin name" });
     }
-    const targetDir = join9(getGlobalConfigDir(config3.mode ?? "production"), "plugins", name);
+    const targetDir = join8(getGlobalConfigDir(config3.mode ?? "production"), "plugins", name);
     try {
       await rm2(targetDir, { recursive: true, force: true });
       for (let i = pluginDiagnostics.length - 1; i >= 0; i--) {
@@ -4923,7 +4889,7 @@ async function createServerHandle(config3) {
       setMcpTools(mcpTools);
       logger.info("MCP tools registered", { count: mcpTools.length });
     }
-    const { signalMcpReady } = await import("./server-T5QDCUBN.js");
+    const { signalMcpReady } = await import("./server-G2J4RAXL.js");
     signalMcpReady();
   });
   const app = express();
@@ -4985,7 +4951,7 @@ async function createServerHandle(config3) {
     res.json({ tools });
   });
   app.get("/api/projects", async (_req, res) => {
-    const { listProjects } = await import("./projects-7HSBZY2D.js");
+    const { listProjects } = await import("./projects-LHRNCUGW.js");
     const projects = listProjects();
     res.json({ projects });
   });
@@ -4994,7 +4960,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-EMGRSPYS.js");
+    const { createDirectoryWithGit } = await import("./project-creator-FQRBN3RG.js");
     try {
       const project = await createDirectoryWithGit(name, workdir);
       res.status(201).json({ project });
@@ -5039,7 +5005,7 @@ async function createServerHandle(config3) {
     }
   });
   app.get("/api/projects/:id", async (req, res) => {
-    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const { getProject: getProject2 } = await import("./projects-LHRNCUGW.js");
     const project = getProject2(req.params.id);
     if (!project) {
       return res.status(404).json({ error: "Project not found" });
@@ -5047,7 +5013,7 @@ async function createServerHandle(config3) {
     res.json({ project });
   });
   app.put("/api/projects/:id", async (req, res) => {
-    const { updateProject } = await import("./projects-7HSBZY2D.js");
+    const { updateProject } = await import("./projects-LHRNCUGW.js");
     const { name, customInstructions, dangerLevel } = req.body;
     const updates = {};
     if (name !== void 0) updates.name = name;
@@ -5060,7 +5026,7 @@ async function createServerHandle(config3) {
     res.json({ project: updated });
   });
   app.delete("/api/projects/:id", async (req, res) => {
-    const { getProject: getProject2, deleteProject } = await import("./projects-7HSBZY2D.js");
+    const { getProject: getProject2, deleteProject } = await import("./projects-LHRNCUGW.js");
     const project = getProject2(req.params.id);
     if (!project) {
       return res.status(404).json({ error: "Project not found" });
@@ -5069,7 +5035,7 @@ async function createServerHandle(config3) {
     res.json({ success: true });
   });
   app.put("/api/projects/:id/star", async (req, res) => {
-    const { toggleStar } = await import("./projects-7HSBZY2D.js");
+    const { toggleStar } = await import("./projects-LHRNCUGW.js");
     const { isStarred } = req.body;
     if (typeof isStarred !== "boolean") {
       return res.status(400).json({ error: "isStarred is required and must be a boolean" });
@@ -5081,20 +5047,20 @@ 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 { getProject: getProject2 } = await import("./projects-LHRNCUGW.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 { listBranches } = await import("./workspace-ET3FHZYN.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 { getProject: getProject2 } = await import("./projects-LHRNCUGW.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");
+    const { checkoutBranch } = await import("./workspace-ET3FHZYN.js");
     try {
       await checkoutBranch(project.workdir, branch);
       res.json({ branch });
@@ -5103,12 +5069,12 @@ async function createServerHandle(config3) {
     }
   });
   app.post("/api/projects/:id/checkout-new", async (req, res) => {
-    const { getProject: getProject2 } = await import("./projects-7HSBZY2D.js");
+    const { getProject: getProject2 } = await import("./projects-LHRNCUGW.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");
+    const { createBranch } = await import("./workspace-ET3FHZYN.js");
     try {
       await createBranch(project.workdir, name);
       res.json({ branch: name });
@@ -5116,17 +5082,17 @@ async function createServerHandle(config3) {
       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");
+  app.get("/api/projects/:id/workspaces", async (req, res) => {
+    const { getProject: getProject2 } = await import("./projects-LHRNCUGW.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 });
+    const { listWorkspaces } = await import("./workspace-ET3FHZYN.js");
+    const all = await listWorkspaces(project.name);
+    const workspacesList = all.filter((ws) => ws.path !== project.workdir);
+    res.json({ workspaces: workspacesList });
   });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-CDQ4HASP.js");
+    const { getRecentUserPromptsForSession } = await import("./events-AEQ6GQXI.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -5158,44 +5124,34 @@ 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) => {
+  app.post("/api/sessions/:id/switch-workspace", 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" });
+    const { target, branch } = req.body;
+    if (!target || typeof target !== "string") return res.status(400).json({ error: "target is required" });
     try {
-      const updated = await sessionManager.createSessionWorktree(req.params.id, name);
+      const updated = await sessionManager.switchWorkspace(req.params.id, target, branch);
       res.json({ session: updated });
     } catch (err) {
-      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to create worktree" });
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to switch workspace" });
     }
   });
-  app.post("/api/sessions/:id/close-worktree", async (req, res) => {
+  app.post("/api/sessions/:id/delete-workspace", async (req, res) => {
     const session = sessionManager.getSession(req.params.id);
     if (!session) return res.status(404).json({ error: "Session not found" });
+    const { target } = req.body;
+    if (!target || typeof target !== "string") return res.status(400).json({ error: "target is required" });
     try {
-      const updated = await sessionManager.closeSessionWorktree(req.params.id);
+      const updated = await sessionManager.deleteWorkspace(req.params.id, target);
       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" });
+      res.status(400).json({ error: err instanceof Error ? err.message : "Failed to delete workspace" });
     }
   });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
-    const { getPendingQuestionsForSession } = await import("./tools-K3SNGBI2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-AEQ6GQXI.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-ONH3D4OK.js");
+    const { getPendingQuestionsForSession } = await import("./tools-X52DFUS6.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
@@ -5214,8 +5170,8 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-IKLQ3ZUN.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-K3SNGBI2.js");
+    const { stopSessionExecution } = await import("./chat-handler-LK5RUAGO.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-X52DFUS6.js");
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
@@ -5234,8 +5190,8 @@ async function createServerHandle(config3) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
+    const { getEventStore: getEventStore2 } = await import("./events-AEQ6GQXI.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-ONH3D4OK.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -5334,18 +5290,20 @@ async function createServerHandle(config3) {
         return res.status(400).json({ error: `entries[${i}].status must be a string` });
       }
     }
-    const mapped = entries.map((c, i) => ({
-      ...c,
-      id: c.id != null ? String(c.id) : String(i),
-      description: c.description ?? "",
-      status: c.status ?? "open"
-    }));
+    const mapped = entries.map(
+      (c, i) => ({
+        ...c,
+        id: c.id != null ? String(c.id) : String(i),
+        description: c.description ?? "",
+        status: c.status ?? "open"
+      })
+    );
     sessionManager.setMetadataEntries(sessionId, key, mapped);
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-CDQ4HASP.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
+    const { getEventStore: getEventStore2 } = await import("./events-AEQ6GQXI.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-ONH3D4OK.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -5401,15 +5359,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-K3SNGBI2.js");
+    const { providePathConfirmation } = await import("./tools-X52DFUS6.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-CDQ4HASP.js");
-    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-V2K34EGN.js");
-    const { createSessionStateMessage } = await import("./protocol-CTNE3ANP.js");
-    const { getPendingQuestionsForSession } = await import("./tools-K3SNGBI2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-AEQ6GQXI.js");
+    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-ONH3D4OK.js");
+    const { createSessionStateMessage } = await import("./protocol-4QFU7WAI.js");
+    const { getPendingQuestionsForSession } = await import("./tools-X52DFUS6.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents(events);
@@ -5430,7 +5388,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-K3SNGBI2.js");
+    const { provideAnswer } = await import("./tools-X52DFUS6.js");
     const found = provideAnswer(callId, answer ?? "", skip ?? false);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
@@ -5458,7 +5416,7 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { getSetting: getSetting2, SETTINGS_KEYS } = await import("./settings-6ZPWOBWL.js");
+    const { getSetting: getSetting2, SETTINGS_KEYS } = await import("./settings-PFXRYXZU.js");
     if (getSetting2(SETTINGS_KEYS.CACHE_WARMING) !== "true") {
       return res.json({ success: false, reason: "disabled" });
     }
@@ -5490,7 +5448,7 @@ async function createServerHandle(config3) {
       backend: activeProvider?.backend ?? llmClient.getBackend(),
       model: llmClient.getModel()
     };
-    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-YGCZZNNV.js");
+    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-RTZVMWQV.js");
     runAgentTurn(
       {
         sessionManager,
@@ -5528,15 +5486,15 @@ async function createServerHandle(config3) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-IKLQ3ZUN.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-K3SNGBI2.js");
+    const { stopSessionExecution } = await import("./chat-handler-LK5RUAGO.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-X52DFUS6.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-CDQ4HASP.js")).getEventStore();
+    const eventStore = (await import("./events-AEQ6GQXI.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true, queuedMessages });
   });
@@ -5550,7 +5508,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-CDQ4HASP.js");
+    const { truncateSessionMessages } = await import("./events-AEQ6GQXI.js");
     truncateSessionMessages(sessionId, messageIndex);
     res.json({ success: true });
   });
@@ -5564,8 +5522,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-CDQ4HASP.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-V2K34EGN.js");
+    const { getEventStore: getEventStore2 } = await import("./events-AEQ6GQXI.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-ONH3D4OK.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents(events);
@@ -5577,7 +5535,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-CDQ4HASP.js");
+    const { truncateSessionMessages } = await import("./events-AEQ6GQXI.js");
     truncateSessionMessages(sessionId, msgIndex - 1);
     sessionManager.queueMessage(sessionId, "asap", msg.content, msg.attachments, msg.messageKind);
     res.json({ success: true });
@@ -5609,7 +5567,7 @@ async function createServerHandle(config3) {
     res.json({ accepted: true });
   });
   app.get("/api/settings", async (req, res) => {
-    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-6ZPWOBWL.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-PFXRYXZU.js");
     const keysParam = req.query["keys"];
     if (!keysParam) {
       return res.status(400).json({ error: "keys query parameter is required" });
@@ -5622,19 +5580,19 @@ async function createServerHandle(config3) {
     res.json(result);
   });
   app.get("/api/settings/:key", async (req, res) => {
-    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-6ZPWOBWL.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-PFXRYXZU.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-6ZPWOBWL.js");
+    const { getSetting: getSetting2, SETTINGS_DEFAULTS } = await import("./settings-PFXRYXZU.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-6ZPWOBWL.js");
+    const { setSetting: setSetting2 } = await import("./settings-PFXRYXZU.js");
     const key = req.params.key;
     const { value } = req.body;
     if (value === void 0) {
@@ -5661,7 +5619,7 @@ async function createServerHandle(config3) {
     }
   });
   app.get("/api/tools/shells", async (_req, res) => {
-    const { listAvailableShells } = await import("./platform-AB3GIEGO.js");
+    const { listAvailableShells } = await import("./platform-XQ7BS3KQ.js");
     res.json({ shells: listAvailableShells() });
   });
   app.get("/api/config", async (_req, res) => {
@@ -6152,7 +6110,7 @@ async function createServerHandle(config3) {
   });
   async function rebuildMcpTools() {
     const { createMcpTools: createMcpTools2 } = await import("./tool-adapter-MOGEI6TP.js");
-    const { setMcpTools: setMcpTools2 } = await import("./tools-K3SNGBI2.js");
+    const { setMcpTools: setMcpTools2 } = await import("./tools-X52DFUS6.js");
     const mcpTools = createMcpTools2(mcpManager);
     setMcpTools2(mcpTools);
   }
@@ -6370,7 +6328,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/workspace", createWorkspaceConfigRoutes());
   app.use("/api/terminals", createTerminalRoutes());
   app.use(
     "/api/auto-update",
@@ -6387,13 +6345,13 @@ async function createServerHandle(config3) {
     })
   );
   app.get("/api/sessions/:id/background-processes", async (req, res) => {
-    const { getSessionProcesses } = await import("./manager-EHIQCIUP.js");
+    const { getSessionProcesses } = await import("./manager-24C2AXVF.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-EHIQCIUP.js");
+    const { stopProcess } = await import("./manager-24C2AXVF.js");
     const sessionId = req.params.id;
     const processId = req.params.processId;
     const session = sessionManager.getSession(sessionId);
@@ -6440,7 +6398,7 @@ async function createServerHandle(config3) {
       }
     });
     app.get("/fox.svg", (_req, res) => {
-      readFile5(join10(webDir, "fox.svg")).then((content) => {
+      readFile4(join9(webDir, "fox.svg")).then((content) => {
         res.set("Content-Type", "image/svg+xml");
         res.send(content);
       }).catch(() => {
@@ -6449,7 +6407,7 @@ async function createServerHandle(config3) {
     });
     app.use(
       "/sounds",
-      express.static(join10(webDir, "public", "sounds"), {
+      express.static(join9(webDir, "public", "sounds"), {
         setHeaders: (res) => {
           res.set("Content-Type", "audio/mpeg");
         }
@@ -6458,13 +6416,13 @@ async function createServerHandle(config3) {
     app.use("/__inspect__.js", (_req, res) => {
       res.set("Access-Control-Allow-Origin", "*");
       res.set("Content-Type", "application/javascript");
-      readFile5(join10(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;
       }
-      readFile5(join10(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");
       });
@@ -6475,7 +6433,7 @@ async function createServerHandle(config3) {
     const distWebDir = resolve7(__dirname3, "web");
     app.use(
       "/assets",
-      express.static(join10(distWebDir, "assets"), {
+      express.static(join9(distWebDir, "assets"), {
         setHeaders: (res, filepath) => {
           if (filepath.endsWith(".css")) {
             res.set("Content-Type", "text/css");
@@ -6483,11 +6441,11 @@ async function createServerHandle(config3) {
         }
       })
     );
-    app.use("/manifest.webmanifest", express.static(join10(distWebDir, "manifest.webmanifest")));
-    app.use("/registerSW.js", express.static(join10(distWebDir, "registerSW.js")));
-    app.use("/sw.js", express.static(join10(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) => {
-      readFile5(join10(distWebDir, "fox.svg")).then((content) => {
+      readFile4(join9(distWebDir, "fox.svg")).then((content) => {
         res.set("Content-Type", "image/svg+xml");
         res.send(content);
       }).catch(() => {
@@ -6496,7 +6454,7 @@ async function createServerHandle(config3) {
     });
     app.use(
       "/sounds",
-      express.static(join10(distWebDir, "sounds"), {
+      express.static(join9(distWebDir, "sounds"), {
         setHeaders: (res) => {
           res.set("Content-Type", "audio/mpeg");
         }
@@ -6505,10 +6463,10 @@ async function createServerHandle(config3) {
     app.use("/__inspect__.js", (_req, res) => {
       res.set("Access-Control-Allow-Origin", "*");
       res.set("Content-Type", "application/javascript");
-      readFile5(join10(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) => {
-      readFile5(join10(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`");
       });
     });
@@ -6516,7 +6474,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;
       }
-      readFile5(join10(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");
       });
     });
@@ -6536,7 +6494,7 @@ async function createServerHandle(config3) {
     const state = sessionManager.getContextState(sessionId);
     wssExports.broadcastForSession(sessionId, createContextStateMessage(state));
   });
-  const { QueueProcessor } = await import("./processor-K6UPVMIP.js");
+  const { QueueProcessor } = await import("./processor-3O26I7DO.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -6578,7 +6536,7 @@ async function createServerHandle(config3) {
       void (async () => {
         await devServerManager.stopAll();
         await mcpManager.disconnectAll();
-        const { stopAllInspectProxies } = await import("./inspect-proxy-OVEFBJ26.js");
+        const { stopAllInspectProxies } = await import("./inspect-proxy-PHVZBZUO.js");
         stopAllInspectProxies();
         const { cleanupAllProcesses } = await import("./store-SARB6V2N.js");
         cleanupAllProcesses();
@@ -6616,4 +6574,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-OLXHRPAD.js.map
+//# sourceMappingURL=chunk-FILRB5QX.js.map