@andyqiu/codeforge 0.7.3 → 0.7.4

package/dist/index.js

@@ -20180,7 +20180,7 @@ import * as https from "node:https";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.7.3";
+    const v = "0.7.4";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -21082,7 +21082,7 @@ function escapeRegex(s) {
 }
 function buildGitVcsWriteRegex(mainRoot) {
   const esc = escapeRegex(mainRoot);
-  return new RegExp(`git\\b[^\\n]*(?:-C\\s+|--work-tree[=\\s])${esc}`);
+  return new RegExp(`git\\b[^\\n]*(?:-C\\s+|--work-tree[=\\s])${esc}` + `(?:(?!/\\.git/codeforge-worktrees/)(?=$|[\\s'"\\x60)/])|(?=/\\.git/codeforge-worktrees/\\S*\\.\\.))`);
 }
 var WRITE_TOOLS = new Set(["write", "edit", "ast_edit"]);
 var TOUCH_THROTTLE_MS = 5 * 60000;
@@ -21201,6 +21201,62 @@ function isInsideAnyWorktreeDir(absPath, mainRoot) {
   const prefix = root.endsWith(path30.sep) ? root : root + path30.sep;
   return absPath.startsWith(prefix);
 }
+function worktreeRootOf(absPath, mainRoot) {
+  const root = worktreesRoot(mainRoot);
+  const prefix = root.endsWith(path30.sep) ? root : root + path30.sep;
+  if (!absPath.startsWith(prefix))
+    return null;
+  const seg = absPath.slice(prefix.length).split(path30.sep)[0];
+  if (!seg || seg === "..")
+    return null;
+  return path30.join(root, seg);
+}
+function stripPairedQuotes(raw) {
+  if (raw.length >= 2) {
+    const head = raw[0];
+    const tail = raw[raw.length - 1];
+    if (head === '"' && tail === '"' || head === "'" && tail === "'") {
+      return raw.slice(1, -1);
+    }
+  }
+  return raw;
+}
+function resolveExplicitWorktreeTarget(argsObj, mainRoot) {
+  try {
+    const candidates = [];
+    const workdir = argsObj["workdir"];
+    if (typeof workdir === "string" && workdir.length > 0) {
+      candidates.push(stripPairedQuotes(workdir));
+    }
+    const command = argsObj["command"];
+    if (typeof command === "string" && command.length > 0) {
+      for (const m of command.matchAll(/--work-tree(?:=|\s+)('[^']*'|"[^"]*"|\S+)/g)) {
+        candidates.push(stripPairedQuotes(m[1]));
+      }
+      for (const m of command.matchAll(/(?:^|\s)-C\s+('[^']*'|"[^"]*"|\S+)/g)) {
+        candidates.push(stripPairedQuotes(m[1]));
+      }
+    }
+    for (const cand of candidates) {
+      if (!cand)
+        continue;
+      const abs = path30.resolve(mainRoot, cand);
+      if (isInsideAnyWorktreeDir(abs, mainRoot)) {
+        const wtRoot = worktreeRootOf(abs, mainRoot);
+        if (wtRoot)
+          return wtRoot;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function stripSharedGitDirRef(command, mainRoot) {
+  const escGitDir = escapeRegex(path30.join(mainRoot, ".git"));
+  const re = new RegExp(`--git-dir(?:=|\\s+)['"]?${escGitDir}(?:/[^\\s'"\\x60)]*)?['"]?`, "g");
+  return command.replace(re, " ");
+}
 function rewritePath(value, mainRoot, worktreeRoot) {
   if (!value)
     return null;
@@ -21746,7 +21802,27 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
         }
         if (toolName === "bash") {
           const command = argsObj["command"];
-          if (typeof command === "string" && commandContainsMainRootExcludingWorktree(command, mainRoot, worktreePath) && detectBashWriteIntent(command, mainRoot)) {
+          const explicitWt = typeof command === "string" || typeof argsObj["workdir"] === "string" ? resolveExplicitWorktreeTarget(argsObj, mainRoot) : null;
+          const effectiveWt = explicitWt ?? worktreePath;
+          let hitMainRoot = typeof command === "string" && commandContainsMainRootExcludingWorktree(command, mainRoot, effectiveWt);
+          if (hitMainRoot && explicitWt !== null && typeof command === "string") {
+            const stillHit = commandContainsMainRootExcludingWorktree(stripSharedGitDirRef(command, mainRoot), mainRoot, effectiveWt);
+            if (!stillHit) {
+              hitMainRoot = false;
+              if (detectBashWriteIntent(command, mainRoot)) {
+                safeWriteLog(PLUGIN_NAME22, {
+                  hook: "tool.execute.before",
+                  tool: toolName,
+                  sessionID: input.sessionID,
+                  action: "allow-explicit-worktree",
+                  source: "explicit-worktree-target",
+                  explicitWorktree: explicitWt,
+                  command: command.slice(0, 200)
+                });
+              }
+            }
+          }
+          if (typeof command === "string" && hitMainRoot && detectBashWriteIntent(command, mainRoot)) {
             if (midMerge) {
               const snippet = command.length > 60 ? command.slice(0, 60) + "…" : command;
               emitMergeBypassNotice("classB", { command: snippet });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andyqiu/codeforge",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "CodeForge — opencode 的零侵入扩展包",
   "type": "module",
   "private": false,