spec-cat 0.1.60 → 0.1.62

package/.output/server/chunks/routes/api/chat/preview.post.mjs

@@ -1,7 +1,9 @@
 import { d as defineEventHandler, b as readBody, c as createError, e as getProjectDir, l as logger } from '../../../nitro/nitro.mjs';
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
 import { existsSync } from 'node:fs';
+import { v as validateWorktreePath } from '../../../_/validateWorktree.mjs';
+import { a as assertSafeBranchName, g as git } from '../../../_/chatGit.mjs';
+import { a as autoCommitChanges } from '../../../_/claudeService.mjs';
+import { w as withLock } from '../../../_/asyncLock.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:crypto';
@@ -22,12 +24,13 @@ import 'node:os';
 import 'node:module';
 import 'node:fs/promises';
 import 'node:url';
+import '../../../_/worktreePaths.mjs';
+import '../../../_/gitExec.mjs';
+import 'child_process';
+import 'util';
+import 'node:child_process';
+import '../../../_/claude.mjs';
 
-const execAsync = promisify(exec);
-async function git(cwd, cmd) {
-  const { stdout } = await execAsync(`git ${cmd}`, { cwd });
-  return stdout.trim();
-}
 const preview_post = defineEventHandler(async (event) => {
   const body = await readBody(event);
   if (!(body == null ? void 0 : body.conversationId) || !(body == null ? void 0 : body.worktreePath) || !(body == null ? void 0 : body.baseBranch)) {
@@ -36,54 +39,56 @@ const preview_post = defineEventHandler(async (event) => {
       message: "conversationId, worktreePath, and baseBranch are required"
     });
   }
-  const { conversationId, worktreePath, baseBranch } = body;
+  const { conversationId, worktreePath } = body;
+  assertSafeBranchName(body.baseBranch, "base branch");
   const projectDir = getProjectDir();
   const previewBranch = "sc/preview";
+  if (existsSync(worktreePath)) {
+    validateWorktreePath(worktreePath);
+  }
   logger.chat.info("Creating preview branch", { conversationId, previewBranch });
-  try {
-    if (!existsSync(worktreePath)) {
-      return { success: false, error: "Worktree directory not found." };
-    }
-    const status = await git(worktreePath, "status --porcelain");
-    if (status) {
-      await git(worktreePath, "add -A");
-      await git(worktreePath, 'commit -m "auto-commit for preview"');
-    }
-    const worktreeHead = await git(worktreePath, "rev-parse HEAD");
-    const mainStatus = await git(projectDir, "status --porcelain");
-    if (mainStatus) {
+  return withLock(projectDir, async () => {
+    try {
+      if (!existsSync(worktreePath)) {
+        return { success: false, error: "Worktree directory not found." };
+      }
+      await autoCommitChanges(worktreePath);
+      const worktreeHead = await git(worktreePath, ["rev-parse", "HEAD"]);
+      const mainStatus = await git(projectDir, ["status", "--porcelain"]);
+      if (mainStatus) {
+        return {
+          success: false,
+          error: "Main worktree has uncommitted changes. Please commit or stash them first."
+        };
+      }
+      let branchExists = false;
+      try {
+        await git(projectDir, ["rev-parse", "--verify", `refs/heads/${previewBranch}`]);
+        branchExists = true;
+      } catch {
+      }
+      if (branchExists) {
+        await git(projectDir, ["checkout", previewBranch]);
+        await git(projectDir, ["reset", "--hard", worktreeHead]);
+      } else {
+        await git(projectDir, ["branch", previewBranch, worktreeHead]);
+        await git(projectDir, ["checkout", previewBranch]);
+      }
+      logger.chat.info("Preview branch active", { previewBranch, worktreeHead });
+      return {
+        success: true,
+        previewBranch,
+        commit: worktreeHead
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logger.chat.error("Failed to create preview", { conversationId, error: errorMessage });
       return {
         success: false,
-        error: "Main worktree has uncommitted changes. Please commit or stash them first."
+        error: errorMessage
       };
     }
-    let branchExists = false;
-    try {
-      await git(projectDir, `rev-parse --verify "refs/heads/${previewBranch}"`);
-      branchExists = true;
-    } catch {
-    }
-    if (branchExists) {
-      await git(projectDir, `checkout "${previewBranch}"`);
-      await git(projectDir, `reset --hard ${worktreeHead}`);
-    } else {
-      await git(projectDir, `branch "${previewBranch}" ${worktreeHead}`);
-      await git(projectDir, `checkout "${previewBranch}"`);
-    }
-    logger.chat.info("Preview branch active", { previewBranch, worktreeHead });
-    return {
-      success: true,
-      previewBranch,
-      commit: worktreeHead
-    };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    logger.chat.error("Failed to create preview", { conversationId, error: errorMessage });
-    return {
-      success: false,
-      error: errorMessage
-    };
-  }
+  });
 });
 
 export { preview_post as default };

package/.output/server/chunks/routes/api/chat/preview.post.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"preview.post.mjs","sources":["../../../../../../server/api/chat/preview.post.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preview.post.mjs","sources":["../../../../../../server/api/chat/preview.post.ts"],"names":[],"mappings":"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"}

package/.output/server/chunks/routes/api/chat/rebase.post.mjs

@@ -1,9 +1,11 @@
 import { d as defineEventHandler, b as readBody, c as createError, e as getProjectDir, l as logger } from '../../../nitro/nitro.mjs';
-import { execSync, exec } from 'node:child_process';
-import { promisify } from 'node:util';
 import { existsSync } from 'node:fs';
 import { r as resolveExistingBaseBranch } from '../../../_/baseBranch.mjs';
 import { g as getChatWorktreePath } from '../../../_/worktreePaths.mjs';
+import { v as validateWorktreePath } from '../../../_/validateWorktree.mjs';
+import { g as git, a as assertSafeBranchName } from '../../../_/chatGit.mjs';
+import { a as autoCommitChanges } from '../../../_/claudeService.mjs';
+import { w as withLock } from '../../../_/asyncLock.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:crypto';
@@ -27,19 +29,9 @@ import 'node:url';
 import '../../../_/gitExec.mjs';
 import 'child_process';
 import 'util';
+import 'node:child_process';
+import '../../../_/claude.mjs';
 
-const execAsync = promisify(exec);
-async function git(cwd, cmd) {
-  const { stdout } = await execAsync(`git ${cmd}`, { cwd });
-  return stdout.trim();
-}
-async function autoCommitChanges(worktreePath) {
-  const status = await git(worktreePath, "status --porcelain");
-  if (!status) return false;
-  await git(worktreePath, "add -A");
-  execSync("git commit -F -", { cwd: worktreePath, input: "auto-commit uncommitted changes", encoding: "utf-8" });
-  return true;
-}
 const rebase_post = defineEventHandler(async (event) => {
   const body = await readBody(event);
   if (!(body == null ? void 0 : body.conversationId)) {
@@ -51,10 +43,13 @@ const rebase_post = defineEventHandler(async (event) => {
   const { conversationId } = body;
   const projectDir = getProjectDir();
   const worktreePath = body.worktreePath || getChatWorktreePath(conversationId);
+  if (existsSync(worktreePath)) {
+    validateWorktreePath(worktreePath);
+  }
   let worktreeBranch = "";
   if (existsSync(worktreePath)) {
     try {
-      worktreeBranch = await git(worktreePath, "rev-parse --abbrev-ref HEAD");
+      worktreeBranch = await git(worktreePath, ["rev-parse", "--abbrev-ref", "HEAD"]);
     } catch {
       worktreeBranch = "";
     }
@@ -67,41 +62,44 @@ const rebase_post = defineEventHandler(async (event) => {
   if (!baseBranch) {
     return { success: false, error: "Unable to resolve a valid base branch for this worktree." };
   }
+  assertSafeBranchName(baseBranch, "base branch");
   logger.chat.info("Rebasing worktree onto base", { conversationId, baseBranch });
-  try {
-    if (!existsSync(worktreePath)) {
-      return { success: false, error: "Worktree directory not found. It may have been cleaned up." };
-    }
-    await autoCommitChanges(worktreePath);
+  return withLock(projectDir, async () => {
     try {
-      await git(worktreePath, `rebase ${baseBranch}`);
-    } catch {
-      logger.chat.warn("Rebase conflict during sync", { conversationId });
-      let conflictFiles = [];
+      if (!existsSync(worktreePath)) {
+        return { success: false, error: "Worktree directory not found. It may have been cleaned up." };
+      }
+      await autoCommitChanges(worktreePath);
       try {
-        const diffOutput = await git(worktreePath, "diff --name-only --diff-filter=U");
-        conflictFiles = diffOutput.split("\n").filter(Boolean);
+        await git(worktreePath, ["rebase", baseBranch]);
       } catch {
+        logger.chat.warn("Rebase conflict during sync", { conversationId });
+        let conflictFiles = [];
         try {
-          const statusOutput = await git(worktreePath, "status --porcelain");
-          conflictFiles = statusOutput.split("\n").filter((line) => /^(UU|AA|DU|UD|UA|AU|DD)\s/.test(line)).map((line) => line.substring(3).trim());
+          const diffOutput = await git(worktreePath, ["diff", "--name-only", "--diff-filter=U"]);
+          conflictFiles = diffOutput.split("\n").filter(Boolean);
         } catch {
+          try {
+            const statusOutput = await git(worktreePath, ["status", "--porcelain"]);
+            conflictFiles = statusOutput.split("\n").filter((line) => /^(UU|AA|DU|UD|UA|AU|DD)\s/.test(line)).map((line) => line.substring(3).trim());
+          } catch {
+          }
         }
+        return {
+          success: false,
+          error: `Rebase conflict with "${baseBranch}". Resolve conflicts to continue.`,
+          conflictFiles,
+          rebaseInProgress: true
+        };
       }
-      return {
-        success: false,
-        error: `Rebase conflict with "${baseBranch}". Resolve conflicts to continue.`,
-        conflictFiles,
-        rebaseInProgress: true
-      };
+      logger.chat.info("Worktree rebased successfully", { conversationId, baseBranch });
+      return { success: true };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logger.chat.error("Rebase sync failed", { conversationId, error: errorMessage });
+      return { success: false, error: errorMessage };
     }
-    logger.chat.info("Worktree rebased successfully", { conversationId, baseBranch });
-    return { success: true };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    logger.chat.error("Rebase sync failed", { conversationId, error: errorMessage });
-    return { success: false, error: errorMessage };
-  }
+  });
 });
 
 export { rebase_post as default };

package/.output/server/chunks/routes/api/chat/rebase.post.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"rebase.post.mjs","sources":["../../../../../../server/api/chat/rebase.post.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rebase.post.mjs","sources":["../../../../../../server/api/chat/rebase.post.ts"],"names":[],"mappings":"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"}

package/.output/server/chunks/routes/api/chat/worktree-commit.post.mjs

@@ -1,7 +1,9 @@
 import { d as defineEventHandler, b as readBody, c as createError, e as getProjectDir, l as logger } from '../../../nitro/nitro.mjs';
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
+import { existsSync } from 'node:fs';
 import { a as autoCommitChanges } from '../../../_/claudeService.mjs';
+import { v as validateWorktreePath } from '../../../_/validateWorktree.mjs';
+import { i as isSafeBranchName, g as git } from '../../../_/chatGit.mjs';
+import { w as withLock } from '../../../_/asyncLock.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:crypto';
@@ -17,15 +19,18 @@ import 'tls';
 import 'url';
 import 'node:events';
 import 'node:buffer';
-import 'node:fs';
 import 'node:path';
 import 'node:os';
 import 'node:module';
 import 'node:fs/promises';
 import 'node:url';
+import 'node:child_process';
 import '../../../_/claude.mjs';
+import '../../../_/worktreePaths.mjs';
+import '../../../_/gitExec.mjs';
+import 'child_process';
+import 'util';
 
-const execAsync = promisify(exec);
 const PROTECTED_BRANCHES = /* @__PURE__ */ new Set(["main", "master", "develop", "dev"]);
 const worktreeCommit_post = defineEventHandler(async (event) => {
   const body = await readBody(event);
@@ -36,54 +41,59 @@ const worktreeCommit_post = defineEventHandler(async (event) => {
     });
   }
   const { worktreePath, conversationId, previousBranch } = body;
-  try {
-    const result = await autoCommitChanges(worktreePath);
-    let deletedPreviousBranch = false;
-    if (result.success) {
-      const branchChanged = Boolean(
-        previousBranch && result.currentBranch && previousBranch !== result.currentBranch
-      );
-      if (branchChanged && previousBranch && !PROTECTED_BRANCHES.has(previousBranch)) {
-        try {
-          await execAsync(`git branch -D "${previousBranch}"`, { cwd: getProjectDir() });
-          deletedPreviousBranch = true;
-          logger.chat.info("Deleted previous worktree branch after branch switch", {
-            conversationId,
-            previousBranch,
-            currentBranch: result.currentBranch
-          });
-        } catch (deleteError) {
-          logger.chat.warn("Failed to delete previous worktree branch after branch switch", {
-            conversationId,
-            previousBranch,
-            currentBranch: result.currentBranch,
-            error: deleteError instanceof Error ? deleteError.message : String(deleteError)
-          });
+  if (existsSync(worktreePath)) {
+    validateWorktreePath(worktreePath);
+  }
+  return withLock(getProjectDir(), async () => {
+    try {
+      const result = await autoCommitChanges(worktreePath);
+      let deletedPreviousBranch = false;
+      if (result.success) {
+        const branchChanged = Boolean(
+          previousBranch && result.currentBranch && previousBranch !== result.currentBranch
+        );
+        if (branchChanged && previousBranch && !PROTECTED_BRANCHES.has(previousBranch) && isSafeBranchName(previousBranch)) {
+          try {
+            await git(getProjectDir(), ["branch", "-D", previousBranch]);
+            deletedPreviousBranch = true;
+            logger.chat.info("Deleted previous worktree branch after branch switch", {
+              conversationId,
+              previousBranch,
+              currentBranch: result.currentBranch
+            });
+          } catch (deleteError) {
+            logger.chat.warn("Failed to delete previous worktree branch after branch switch", {
+              conversationId,
+              previousBranch,
+              currentBranch: result.currentBranch,
+              error: deleteError instanceof Error ? deleteError.message : String(deleteError)
+            });
+          }
         }
+        logger.chat.info("Worktree auto-commit done", {
+          conversationId,
+          message: result.message,
+          currentBranch: result.currentBranch,
+          previousBranch,
+          deletedPreviousBranch
+        });
       }
-      logger.chat.info("Worktree auto-commit done", {
-        conversationId,
+      return {
+        success: result.success,
         message: result.message,
         currentBranch: result.currentBranch,
-        previousBranch,
-        deletedPreviousBranch
+        deletedPreviousBranch,
+        error: result.error
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logger.chat.error("Worktree auto-commit failed", {
+        conversationId,
+        error: errorMessage
       });
+      return { success: false, error: errorMessage };
     }
-    return {
-      success: result.success,
-      message: result.message,
-      currentBranch: result.currentBranch,
-      deletedPreviousBranch,
-      error: result.error
-    };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    logger.chat.error("Worktree auto-commit failed", {
-      conversationId,
-      error: errorMessage
-    });
-    return { success: false, error: errorMessage };
-  }
+  });
 });
 
 export { worktreeCommit_post as default };

package/.output/server/chunks/routes/api/chat/worktree-commit.post.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-commit.post.mjs","sources":["../../../../../../server/api/chat/worktree-commit.post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,MAAA,SAAA,GAAA,UAAA,IAAA,CAAA;AACA,MAAA,kBAAA,uBAAA,GAAA,CAAA,CAAA,QAAA,QAAA,EAAA,SAAA,EAAA,KAAA,CAAA,CAAA;AAEA,4BAAA,kBAAA,CAAA,OAAA,KAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,QAAA,CAIA,KAAA,CAAA;AAEA,EAAA,IAAA,EAAA,6BAAA,YAAA,CAAA,EAAA;AACA,IAAA,MAAA,WAAA,CAAA;AAAA,MACA,UAAA,EAAA,GAAA;AAAA,MACA,OAAA,EAAA;AAAA,KACA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,EAAA,YAAA,EAAA,cAAA,EAAA,cAAA,EAAA,GAAA,IAAA;AAEA,EAAA,IAAA;AACA,IAAA,MAAA,MAAA,GAAA,MAAA,iBAAA,CAAA,YAAA,CAAA;AACA,IAAA,IAAA,qBAAA,GAAA,KAAA;AAEA,IAAA,IAAA,OAAA,OAAA,EAAA;AACA,MAAA,MAAA,aAAA,GAAA,OAAA;AAAA,QACA,cAAA,IACA,MAAA,CAAA,aAAA,IACA,cAAA,KAAA,MAAA,CAAA;AAAA,OACA;AAEA,MAAA,IAAA,iBAAA,cAAA,IAAA,CAAA,kBAAA,CAAA,GAAA,CAAA,cAAA,CAAA,EAAA;AACA,QAAA,IAAA;AACA,UAAA,MAAA,SAAA,CAAA,kBAAA,cAAA,CAAA,CAAA,CAAA,EAAA,EAAA,GAAA,EAAA,aAAA,IAAA,CAAA;AACA,UAAA,qBAAA,GAAA,IAAA;AACA,UAAA,MAAA,CAAA,IAAA,CAAA,KAAA,sDAAA,EAAA;AAAA,YACA,cAAA;AAAA,YACA,cAAA;AAAA,YACA,eAAA,MAAA,CAAA;AAAA,WACA,CAAA;AAAA,QACA,SAAA,WAAA,EAAA;AACA,UAAA,MAAA,CAAA,IAAA,CAAA,KAAA,+DAAA,EAAA;AAAA,YACA,cAAA;AAAA,YACA,cAAA;AAAA,YACA,eAAA,MAAA,CAAA,aAAA;AAAA,YACA,OAAA,WAAA,YAAA,KAAA,GAAA,WAAA,CAAA,OAAA,GAAA,OAAA,WAAA;AAAA,WACA,CAAA;AAAA,QACA;AAAA,MACA;AAEA,MAAA,MAAA,CAAA,IAAA,CAAA,KAAA,2BAAA,EAAA;AAAA,QACA,cAAA;AAAA,QACA,SAAA,MAAA,CAAA,OAAA;AAAA,QACA,eAAA,MAAA,CAAA,aAAA;AAAA,QACA,cAAA;AAAA,QACA;AAAA,OACA,CAAA;AAAA,IACA;AAEA,IAAA,OAAA;AAAA,MACA,SAAA,MAAA,CAAA,OAAA;AAAA,MACA,SAAA,MAAA,CAAA,OAAA;AAAA,MACA,eAAA,MAAA,CAAA,aAAA;AAAA,MACA,qBAAA;AAAA,MACA,OAAA,MAAA,CAAA;AAAA,KACA;AAAA,EACA,SAAA,KAAA,EAAA;AACA,IAAA,MAAA,eAAA,KAAA,YAAA,KAAA,GAAA,KAAA,CAAA,OAAA,GAAA,OAAA,KAAA,CAAA;AACA,IAAA,MAAA,CAAA,IAAA,CAAA,MAAA,6BAAA,EAAA;AAAA,MACA,cAAA;AAAA,MACA,KAAA,EAAA;AAAA,KACA,CAAA;AAEA,IAAA,OAAA,EAAA,OAAA,EAAA,KAAA,EAAA,KAAA,EAAA,YAAA,EAAA;AAAA,EACA;AACA,CAAA,CAAA;;;;"}
+{"version":3,"file":"worktree-commit.post.mjs","sources":["../../../../../../server/api/chat/worktree-commit.post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,MAAA,kBAAA,uBAAA,GAAA,CAAA,CAAA,QAAA,QAAA,EAAA,SAAA,EAAA,KAAA,CAAA,CAAA;AAEA,4BAAA,kBAAA,CAAA,OAAA,KAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,QAAA,CAIA,KAAA,CAAA;AAEA,EAAA,IAAA,EAAA,6BAAA,YAAA,CAAA,EAAA;AACA,IAAA,MAAA,WAAA,CAAA;AAAA,MACA,UAAA,EAAA,GAAA;AAAA,MACA,OAAA,EAAA;AAAA,KACA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,EAAA,YAAA,EAAA,cAAA,EAAA,cAAA,EAAA,GAAA,IAAA;AAEA,EAAA,IAAA,UAAA,CAAA,YAAA,CAAA,EAAA;AACA,IAAA,oBAAA,CAAA,YAAA,CAAA;AAAA,EACA;AAEA,EAAA,OAAA,QAAA,CAAA,aAAA,EAAA,EAAA,YAAA;AACA,IAAA,IAAA;AACA,MAAA,MAAA,MAAA,GAAA,MAAA,iBAAA,CAAA,YAAA,CAAA;AACA,MAAA,IAAA,qBAAA,GAAA,KAAA;AAEA,MAAA,IAAA,OAAA,OAAA,EAAA;AACA,QAAA,MAAA,aAAA,GAAA,OAAA;AAAA,UACA,cAAA,IACA,MAAA,CAAA,aAAA,IACA,cAAA,KAAA,MAAA,CAAA;AAAA,SACA;AAEA,QAAA,IAAA,aAAA,IAAA,kBAAA,CAAA,kBAAA,CAAA,IAAA,cAAA,CAAA,IAAA,gBAAA,CAAA,cAAA,CAAA,EAAA;AACA,UAAA,IAAA;AACA,YAAA,MAAA,IAAA,aAAA,EAAA,EAAA,CAAA,QAAA,EAAA,IAAA,EAAA,cAAA,CAAA,CAAA;AACA,YAAA,qBAAA,GAAA,IAAA;AACA,YAAA,MAAA,CAAA,IAAA,CAAA,KAAA,sDAAA,EAAA;AAAA,cACA,cAAA;AAAA,cACA,cAAA;AAAA,cACA,eAAA,MAAA,CAAA;AAAA,aACA,CAAA;AAAA,UACA,SAAA,WAAA,EAAA;AACA,YAAA,MAAA,CAAA,IAAA,CAAA,KAAA,+DAAA,EAAA;AAAA,cACA,cAAA;AAAA,cACA,cAAA;AAAA,cACA,eAAA,MAAA,CAAA,aAAA;AAAA,cACA,OAAA,WAAA,YAAA,KAAA,GAAA,WAAA,CAAA,OAAA,GAAA,OAAA,WAAA;AAAA,aACA,CAAA;AAAA,UACA;AAAA,QACA;AAEA,QAAA,MAAA,CAAA,IAAA,CAAA,KAAA,2BAAA,EAAA;AAAA,UACA,cAAA;AAAA,UACA,SAAA,MAAA,CAAA,OAAA;AAAA,UACA,eAAA,MAAA,CAAA,aAAA;AAAA,UACA,cAAA;AAAA,UACA;AAAA,SACA,CAAA;AAAA,MACA;AAEA,MAAA,OAAA;AAAA,QACA,SAAA,MAAA,CAAA,OAAA;AAAA,QACA,SAAA,MAAA,CAAA,OAAA;AAAA,QACA,eAAA,MAAA,CAAA,aAAA;AAAA,QACA,qBAAA;AAAA,QACA,OAAA,MAAA,CAAA;AAAA,OACA;AAAA,IACA,SAAA,KAAA,EAAA;AACA,MAAA,MAAA,eAAA,KAAA,YAAA,KAAA,GAAA,KAAA,CAAA,OAAA,GAAA,OAAA,KAAA,CAAA;AACA,MAAA,MAAA,CAAA,IAAA,CAAA,MAAA,6BAAA,EAAA;AAAA,QACA,cAAA;AAAA,QACA,KAAA,EAAA;AAAA,OACA,CAAA;AAEA,MAAA,OAAA,EAAA,OAAA,EAAA,KAAA,EAAA,KAAA,EAAA,YAAA,EAAA;AAAA,IACA;AAAA,EACA,CAAA,CAAA;AACA,CAAA,CAAA;;;;"}

package/.output/server/chunks/routes/api/chat/worktree.delete.mjs

@@ -1,8 +1,9 @@
 import { d as defineEventHandler, b as readBody, c as createError, e as getProjectDir, l as logger } from '../../../nitro/nitro.mjs';
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
 import { existsSync } from 'node:fs';
 import { rm } from 'node:fs/promises';
+import { v as validateWorktreePath } from '../../../_/validateWorktree.mjs';
+import { a as assertSafeBranchName, g as git } from '../../../_/chatGit.mjs';
+import { w as withLock } from '../../../_/asyncLock.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:crypto';
@@ -22,8 +23,11 @@ import 'node:path';
 import 'node:os';
 import 'node:module';
 import 'node:url';
+import '../../../_/worktreePaths.mjs';
+import '../../../_/gitExec.mjs';
+import 'child_process';
+import 'util';
 
-const execAsync = promisify(exec);
 const worktree_delete = defineEventHandler(async (event) => {
   const body = await readBody(event);
   if (!(body == null ? void 0 : body.worktreePath) || !(body == null ? void 0 : body.branch)) {
@@ -32,39 +36,43 @@ const worktree_delete = defineEventHandler(async (event) => {
       message: "worktreePath and branch are required"
     });
   }
-  const { worktreePath, branch } = body;
+  const { worktreePath } = body;
+  const branch = assertSafeBranchName(body.branch, "branch");
   const projectDir = getProjectDir();
+  if (existsSync(worktreePath)) {
+    validateWorktreePath(worktreePath);
+  }
   logger.chat.info("Deleting chat worktree", { worktreePath, branch });
-  try {
-    if (existsSync(worktreePath)) {
+  return withLock(projectDir, async () => {
+    try {
+      if (existsSync(worktreePath)) {
+        try {
+          await git(projectDir, ["worktree", "remove", worktreePath, "--force"]);
+        } catch {
+          await rm(worktreePath, { recursive: true, force: true });
+        }
+      }
+      await git(projectDir, ["worktree", "prune"]);
       try {
-        await execAsync(`git worktree remove "${worktreePath}" --force`, {
-          cwd: projectDir
+        await git(projectDir, ["branch", "-D", branch]);
+        logger.chat.info("Chat branch deleted", { branch });
+      } catch (branchError) {
+        logger.chat.warn("Failed to delete chat branch", {
+          branch,
+          error: branchError instanceof Error ? branchError.message : String(branchError)
         });
-      } catch {
-        await rm(worktreePath, { recursive: true, force: true });
       }
+      logger.chat.info("Chat worktree deleted", { worktreePath, branch });
+      return { success: true };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logger.chat.error("Failed to delete chat worktree", { worktreePath, branch, error: errorMessage });
+      return {
+        success: false,
+        error: errorMessage
+      };
     }
-    await execAsync("git worktree prune", { cwd: projectDir });
-    try {
-      await execAsync(`git branch -D "${branch}"`, { cwd: projectDir });
-      logger.chat.info("Chat branch deleted", { branch });
-    } catch (branchError) {
-      logger.chat.warn("Failed to delete chat branch", {
-        branch,
-        error: branchError instanceof Error ? branchError.message : String(branchError)
-      });
-    }
-    logger.chat.info("Chat worktree deleted", { worktreePath, branch });
-    return { success: true };
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    logger.chat.error("Failed to delete chat worktree", { worktreePath, branch, error: errorMessage });
-    return {
-      success: false,
-      error: errorMessage
-    };
-  }
+  });
 });
 
 export { worktree_delete as default };

package/.output/server/chunks/routes/api/chat/worktree.delete.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.delete.mjs","sources":["../../../../../../server/api/chat/worktree.delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAcA,MAAA,SAAA,GAAA,UAAA,IAAA,CAAA;AAEA,wBAAA,kBAAA,CAAA,OAAA,KAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,QAAA,CAAA,KAAA,CAAA;AAEA,EAAA,IAAA,EAAA,IAAA,IAAA,IAAA,GAAA,MAAA,GAAA,IAAA,CAAA,YAAA,CAAA,IAAA,EAAA,6BAAA,MAAA,CAAA,EAAA;AACA,IAAA,MAAA,WAAA,CAAA;AAAA,MACA,UAAA,EAAA,GAAA;AAAA,MACA,OAAA,EAAA;AAAA,KACA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,EAAA,YAAA,EAAA,MAAA,EAAA,GAAA,IAAA;AACA,EAAA,MAAA,aAAA,aAAA,EAAA;AAEA,EAAA,MAAA,CAAA,KAAA,IAAA,CAAA,wBAAA,EAAA,EAAA,YAAA,EAAA,QAAA,CAAA;AAEA,EAAA,IAAA;AAEA,IAAA,IAAA,UAAA,CAAA,YAAA,CAAA,EAAA;AACA,MAAA,IAAA;AACA,QAAA,MAAA,SAAA,CAAA,CAAA,qBAAA,EAAA,YAAA,CAAA,SAAA,CAAA,EAAA;AAAA,UACA,GAAA,EAAA;AAAA,SACA,CAAA;AAAA,MACA,CAAA,CAAA,MAAA;AAEA,QAAA,MAAA,GAAA,YAAA,EAAA,EAAA,WAAA,IAAA,EAAA,KAAA,EAAA,MAAA,CAAA;AAAA,MACA;AAAA,IACA;AAGA,IAAA,MAAA,SAAA,CAAA,oBAAA,EAAA,EAAA,GAAA,EAAA,YAAA,CAAA;AAGA,IAAA,IAAA;AACA,MAAA,MAAA,UAAA,CAAA,eAAA,EAAA,MAAA,KAAA,EAAA,GAAA,EAAA,YAAA,CAAA;AACA,MAAA,MAAA,CAAA,IAAA,CAAA,IAAA,CAAA,qBAAA,EAAA,EAAA,QAAA,CAAA;AAAA,IACA,SAAA,WAAA,EAAA;AACA,MAAA,MAAA,CAAA,IAAA,CAAA,KAAA,8BAAA,EAAA;AAAA,QACA,MAAA;AAAA,QACA,OAAA,WAAA,YAAA,KAAA,GAAA,WAAA,CAAA,OAAA,GAAA,OAAA,WAAA;AAAA,OACA,CAAA;AAAA,IACA;AAEA,IAAA,MAAA,CAAA,KAAA,IAAA,CAAA,uBAAA,EAAA,EAAA,YAAA,EAAA,QAAA,CAAA;AAEA,IAAA,OAAA,EAAA,SAAA,IAAA,EAAA;AAAA,EACA,SAAA,KAAA,EAAA;AACA,IAAA,MAAA,eAAA,KAAA,YAAA,KAAA,GAAA,KAAA,CAAA,OAAA,GAAA,OAAA,KAAA,CAAA;AACA,IAAA,MAAA,CAAA,IAAA,CAAA,MAAA,gCAAA,EAAA,EAAA,cAAA,MAAA,EAAA,KAAA,EAAA,cAAA,CAAA;AAEA,IAAA,OAAA;AAAA,MACA,OAAA,EAAA,KAAA;AAAA,MACA,KAAA,EAAA;AAAA,KACA;AAAA,EACA;AACA,CAAA,CAAA;;;;"}
+{"version":3,"file":"worktree.delete.mjs","sources":["../../../../../../server/api/chat/worktree.delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,wBAAA,kBAAA,CAAA,OAAA,KAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,QAAA,CAAA,KAAA,CAAA;AAEA,EAAA,IAAA,EAAA,IAAA,IAAA,IAAA,GAAA,MAAA,GAAA,IAAA,CAAA,YAAA,CAAA,IAAA,EAAA,6BAAA,MAAA,CAAA,EAAA;AACA,IAAA,MAAA,WAAA,CAAA;AAAA,MACA,UAAA,EAAA,GAAA;AAAA,MACA,OAAA,EAAA;AAAA,KACA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,EAAA,cAAA,GAAA,IAAA;AACA,EAAA,MAAA,MAAA,GAAA,oBAAA,CAAA,IAAA,CAAA,MAAA,EAAA,QAAA,CAAA;AACA,EAAA,MAAA,aAAA,aAAA,EAAA;AAKA,EAAA,IAAA,UAAA,CAAA,YAAA,CAAA,EAAA;AACA,IAAA,oBAAA,CAAA,YAAA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,CAAA,KAAA,IAAA,CAAA,wBAAA,EAAA,EAAA,YAAA,EAAA,QAAA,CAAA;AAEA,EAAA,OAAA,QAAA,CAAA,YAAA,YAAA;AACA,IAAA,IAAA;AAEA,MAAA,IAAA,UAAA,CAAA,YAAA,CAAA,EAAA;AACA,QAAA,IAAA;AACA,UAAA,MAAA,IAAA,UAAA,EAAA,CAAA,YAAA,QAAA,EAAA,YAAA,EAAA,SAAA,CAAA,CAAA;AAAA,QACA,CAAA,CAAA,MAAA;AAEA,UAAA,MAAA,GAAA,YAAA,EAAA,EAAA,WAAA,IAAA,EAAA,KAAA,EAAA,MAAA,CAAA;AAAA,QACA;AAAA,MACA;AAGA,MAAA,MAAA,GAAA,CAAA,UAAA,EAAA,CAAA,UAAA,EAAA,OAAA,CAAA,CAAA;AAGA,MAAA,IAAA;AACA,QAAA,MAAA,IAAA,UAAA,EAAA,CAAA,QAAA,EAAA,IAAA,EAAA,MAAA,CAAA,CAAA;AACA,QAAA,MAAA,CAAA,IAAA,CAAA,IAAA,CAAA,qBAAA,EAAA,EAAA,QAAA,CAAA;AAAA,MACA,SAAA,WAAA,EAAA;AACA,QAAA,MAAA,CAAA,IAAA,CAAA,KAAA,8BAAA,EAAA;AAAA,UACA,MAAA;AAAA,UACA,OAAA,WAAA,YAAA,KAAA,GAAA,WAAA,CAAA,OAAA,GAAA,OAAA,WAAA;AAAA,SACA,CAAA;AAAA,MACA;AAEA,MAAA,MAAA,CAAA,KAAA,IAAA,CAAA,uBAAA,EAAA,EAAA,YAAA,EAAA,QAAA,CAAA;AAEA,MAAA,OAAA,EAAA,SAAA,IAAA,EAAA;AAAA,IACA,SAAA,KAAA,EAAA;AACA,MAAA,MAAA,eAAA,KAAA,YAAA,KAAA,GAAA,KAAA,CAAA,OAAA,GAAA,OAAA,KAAA,CAAA;AACA,MAAA,MAAA,CAAA,IAAA,CAAA,MAAA,gCAAA,EAAA,EAAA,cAAA,MAAA,EAAA,KAAA,EAAA,cAAA,CAAA;AAEA,MAAA,OAAA;AAAA,QACA,OAAA,EAAA,KAAA;AAAA,QACA,KAAA,EAAA;AAAA,OACA;AAAA,IACA;AAAA,EACA,CAAA,CAAA;AACA,CAAA,CAAA;;;;"}