@node9/proxy 2.43.0 → 2.43.1

package/dist/cli.js

@@ -5483,7 +5483,10 @@ function classify(inv) {
     out.push({ ...f, shown: inv.shown, reason: `${f.reason}: ${inv.shown}` });
   };
   if (hooksBypass(inv)) found(HOOKS_BYPASS);
-  if (stagesEverything(inv)) found(STAGE_ALL);
+  const staged = stagesEverything(inv);
+  if (staged) {
+    found(staged.ifWorkTreeTop === void 0 ? STAGE_ALL : { ...STAGE_ALL, ...staged });
+  }
   if (inv.sub === null) {
     found(UNREADABLE);
     return out;
@@ -5544,12 +5547,35 @@ function appliedValue(env, name) {
   const word = f?.Stmts?.[0]?.Cmd?.Args?.[1];
   return word ? resolveWordLiteral(word) : null;
 }
+function lexicalPath(p) {
+  if (/^[\\/~$]/.test(p) || /^[A-Za-z]:/.test(p)) return null;
+  const parts = [];
+  let climbed = false;
+  for (const part of p.split(/[\\/]+/)) {
+    if (part === "" || part === ".") continue;
+    if (part === "..") {
+      if (parts.length === 0) climbed = true;
+      else parts.pop();
+    } else parts.push(part);
+  }
+  return { parts, climbed };
+}
+function hooksPathBypasses(value) {
+  if (value === null || value === void 0) return true;
+  const v = value.trim();
+  if (v === "" || v === "true") return true;
+  const lp = lexicalPath(v);
+  if (lp === null || lp.climbed || lp.parts.length === 0) return true;
+  return lp.parts[0] === ".git" && lp.parts[1] !== "hooks";
+}
 function hooksBypass(inv) {
-  if (inv.config.has("core.hookspath")) return true;
+  if (inv.config.has("core.hookspath") && hooksPathBypasses(inv.config.get("core.hookspath")))
+    return true;
   for (const [name, value] of inv.env) {
     if (name === "GIT_CONFIG_PARAMETERS" && value !== null && /core\.hookspath/i.test(value))
       return true;
-    if (/^GIT_CONFIG_KEY_\d+$/.test(name) && value !== null && value.toLowerCase() === "core.hookspath")
+    const key = /^GIT_CONFIG_KEY_(\d+)$/.exec(name);
+    if (key && value !== null && value.toLowerCase() === "core.hookspath" && hooksPathBypasses(inv.env.get(`GIT_CONFIG_VALUE_${key[1]}`)))
       return true;
   }
   for (const name of HOOK_KILL_SWITCHES) {
@@ -5591,7 +5617,10 @@ function configWritesHooksPath(args) {
   }
   const key = args[i];
   if (key === null || key === void 0 || key.toLowerCase() !== "core.hookspath") return false;
-  return write2 || i + 1 < args.length;
+  const unset = args.slice(0, i).some((w) => w === "--unset" || w === "--unset-all") || args[0] === "unset";
+  if (unset) return true;
+  if (i + 1 < args.length) return hooksPathBypasses(args[i + 1]);
+  return write2;
 }
 function isHookPath(word) {
   return /(^|[\\/])(\.git[\\/]hooks|\.husky)([\\/]|$)/.test(word);
@@ -5626,31 +5655,49 @@ function chmodDisarmsHook(args, shown) {
 function wholeTree(operand) {
   if (/^:\(top\)\.?$/.test(operand) || operand === ":/" || operand === "*") return true;
   if (operand.startsWith(":")) return false;
+  const lp = lexicalPath(operand);
+  return lp !== null && lp.parts.length === 0;
+}
+function chdirPrefix(inv) {
+  const dirs = inv.chdir ?? [];
+  if (dirs.length === 0) return null;
   const parts = [];
-  for (const part of operand.split("/")) {
-    if (!part || part === ".") continue;
-    if (part === "..") parts.pop();
-    else parts.push(part);
+  for (const d of dirs) {
+    if (d === null || d === "") return null;
+    const lp = lexicalPath(d);
+    if (lp === null || lp.climbed) return null;
+    parts.push(...lp.parts);
   }
-  return parts.length === 0 && !operand.startsWith("/");
+  return parts.length === 0 ? null : parts.join("/");
 }
 function stagesEverything(inv) {
   const sub = inv.sub?.toLowerCase();
+  const prefix = chdirPrefix(inv);
+  const judge = (operands2) => {
+    let conditional = false;
+    for (const operand of operands2) {
+      if (!wholeTree(operand)) continue;
+      if (prefix === null || operand.startsWith(":") || operand.startsWith("/")) return {};
+      if (wholeTree(`${prefix}/${operand === "*" ? "." : operand}`)) return {};
+      conditional = true;
+    }
+    return conditional && prefix !== null ? { ifWorkTreeTop: prefix } : null;
+  };
   if (sub === "add") {
     const o = parseOptions(inv.args, "", ADD_LONG_VALUE);
     if (o.flags.has("-n") || o.flags.has("--dry-run") || o.flags.has("-i") || o.flags.has("--interactive") || o.flags.has("-p") || o.flags.has("--patch") || o.flags.has("-e") || o.flags.has("--edit"))
-      return false;
+      return null;
     const all = o.flags.has("-A") || o.flags.has("--all") || o.flags.has("--no-ignore-removal") || o.flags.has("-u") || o.flags.has("--update");
-    if (all && o.operands.length === 0) return true;
-    return o.operands.some(wholeTree);
+    if (all && o.operands.length === 0) return {};
+    return judge(o.operands);
   }
   if (sub === "commit") {
     const o = parseOptions(inv.args, "mFCcut", COMMIT_LONG_VALUE);
-    if (o.flags.has("--dry-run")) return false;
-    if (o.flags.has("-a") || o.flags.has("--all")) return true;
-    return o.operands.some(wholeTree);
+    if (o.flags.has("--dry-run")) return null;
+    if (o.flags.has("-a") || o.flags.has("--all")) return {};
+    return judge(o.operands);
   }
-  return false;
+  return null;
 }
 function hookTextRunsNothing(text) {
   return text.split(/\r?\n/).every((line) => INERT_LINE_RE.test(line.trim()));
@@ -7703,7 +7750,7 @@ async function evaluatePolicy(config, toolName, args, context = {}, hostHooks =
 }
 async function evaluatePolicyCore(config, toolName, args, context = {}, hooks = {}) {
   const { agent, cwd, activeEnvironment } = context;
-  const { checkProvenance: checkProvenance2, isTrustedHost: isTrustedHost2, isConfiguredRegistry } = hooks;
+  const { checkProvenance: checkProvenance2, isTrustedHost: isTrustedHost2, isConfiguredRegistry, isGitWorkTreeTop: isGitWorkTreeTop2 } = hooks;
   const settingsView = catalogSettings(config);
   const layers = inspectionLayers(config.policy);
   const cv = (id) => checkValue(settingsView, id);
@@ -7857,6 +7904,8 @@ async function evaluatePolicyCore(config, toolName, args, context = {}, hooks =
         const action = cv(id);
         const finding = action === "off" ? void 0 : git.findings.find((f) => f.checkId === id);
         if (!finding) continue;
+        if (finding.ifWorkTreeTop !== void 0 && isGitWorkTreeTop2 && cwd && !isGitWorkTreeTop2(finding.ifWorkTreeTop, cwd))
+          continue;
         const v = applyCheckValue(action, {
           decision: "review",
           blockedByLabel: `Node9 (AST): ${finding.ruleName}`,
@@ -17196,6 +17245,7 @@ zoo`.split("\n");
       /** The words after `git`: global options, then the subcommand. */
       visitGit(rest, env, depth, viaXargs, fromAlias, shown) {
         const config = /* @__PURE__ */ new Map();
+        const chdir = [];
         let i = 0;
         while (i < rest.length) {
           const w = rest[i];
@@ -17210,6 +17260,7 @@ zoo`.split("\n");
               i++;
               value = i < rest.length ? rest[i] : null;
             }
+            if (name === "-C") chdir.push(viaXargs || (value ?? "").includes("{}") ? null : value);
             if (name === "-c" && value !== null) {
               const ceq = value.indexOf("=");
               const key = (ceq > 0 ? value.slice(0, ceq) : value).toLowerCase();
@@ -17226,7 +17277,7 @@ zoo`.split("\n");
         }
         const subWord = i < rest.length ? rest[i] : void 0;
         const args = rest.slice(i + 1);
-        const inv = { sub: null, args, config, env, shown };
+        const inv = { sub: null, args, config, env, shown, chdir };
         if (subWord === void 0) {
           if (!viaXargs) return;
           this.emit(inv);
@@ -17240,16 +17291,23 @@ zoo`.split("\n");
         const fromConfig = config.get(`alias.${subWord.toLowerCase()}`);
         const alias = fromConfig !== void 0 ? fromConfig : this.aliases.get(subWord);
         if (alias !== void 0 && !fromAlias) {
-          this.expandAlias(subWord, alias, args, env, depth, 0, shown);
+          this.expandAlias(subWord, alias, args, env, depth, 0, shown, chdir);
           return;
         }
         inv.sub = subWord;
         this.emit(inv);
         this.recordAliasDefinition(inv, env, depth);
       }
-      expandAlias(name, value, args, env, depth, level, shown) {
+      expandAlias(name, value, args, env, depth, level, shown, chdir) {
         if (value === null) {
-          this.emit({ sub: null, args, config: /* @__PURE__ */ new Map(), env, shown: `${shown} (alias ${name})` });
+          this.emit({
+            sub: null,
+            args,
+            config: /* @__PURE__ */ new Map(),
+            env,
+            shown: `${shown} (alias ${name})`,
+            chdir
+          });
           return;
         }
         if (value.startsWith("!")) {
@@ -17263,7 +17321,16 @@ zoo`.split("\n");
         const nested = this.aliases.get(sub);
         const expandedShown = `${shown} (alias ${name} = ${value})`;
         if (nested !== void 0 && level < MAX_ALIAS_DEPTH) {
-          this.expandAlias(sub, nested, [...words.slice(1), ...args], env, depth, level + 1, shown);
+          this.expandAlias(
+            sub,
+            nested,
+            [...words.slice(1), ...args],
+            env,
+            depth,
+            level + 1,
+            shown,
+            chdir
+          );
           return;
         }
         this.emit({
@@ -17271,7 +17338,8 @@ zoo`.split("\n");
           args: [...words.slice(1), ...args],
           config: /* @__PURE__ */ new Map(),
           env,
-          shown: expandedShown
+          shown: expandedShown,
+          chdir
         });
       }
       /**
@@ -17305,7 +17373,7 @@ zoo`.split("\n");
         if (i + 1 >= args.length) return;
         const value = args[i + 1];
         this.aliases.set(m[1], value);
-        this.expandAlias(m[1], value, [], env, depth, 0, `${inv.shown}`);
+        this.expandAlias(m[1], value, [], env, depth, 0, `${inv.shown}`, []);
       }
     };
     POSITIONAL2 = "\0positional";
@@ -18851,7 +18919,7 @@ zoo`.split("\n");
       { view: "separators-stripped", decoder: "separators", stripped: true }
     ];
     LONG_OUTPUT_THRESHOLD_BYTES = 100 * 1024;
-    CANONICAL_EXTRACTOR_VERSION = "canonical-v34";
+    CANONICAL_EXTRACTOR_VERSION = "canonical-v35";
     DEDUPE_PREVIEW_LEN = 120;
     ENGINE_VERSION = "1.4.0";
   }
@@ -22929,10 +22997,19 @@ async function evaluatePolicy2(toolName, args, agent, cwd, opts) {
       // reaches a long-lived in-process authorizer (the gateway) within seconds.
       isTrustedHost: config.policy.trustedHostsManaged ? (host2) => matchesTrustedHost(host2, config.policy.trustedHosts) : isTrustedHost,
       readAgentSettings,
-      isConfiguredRegistry: (host2, at) => configuredRegistryHosts(at).has(host2)
+      isConfiguredRegistry: (host2, at) => configuredRegistryHosts(at).has(host2),
+      isGitWorkTreeTop
     }
   );
 }
+function isGitWorkTreeTop(dir2, cwd) {
+  if (!import_path13.default.isAbsolute(cwd)) return true;
+  try {
+    return import_fs13.default.existsSync(import_path13.default.join(import_path13.default.resolve(cwd, dir2), ".git"));
+  } catch {
+    return true;
+  }
+}
 function readAgentSettings(absPath) {
   const r = readCappedText(
     absPath,

package/dist/cli.mjs

@@ -5504,7 +5504,10 @@ function classify(inv) {
     out.push({ ...f, shown: inv.shown, reason: `${f.reason}: ${inv.shown}` });
   };
   if (hooksBypass(inv)) found(HOOKS_BYPASS);
-  if (stagesEverything(inv)) found(STAGE_ALL);
+  const staged = stagesEverything(inv);
+  if (staged) {
+    found(staged.ifWorkTreeTop === void 0 ? STAGE_ALL : { ...STAGE_ALL, ...staged });
+  }
   if (inv.sub === null) {
     found(UNREADABLE);
     return out;
@@ -5565,12 +5568,35 @@ function appliedValue(env, name) {
   const word = f?.Stmts?.[0]?.Cmd?.Args?.[1];
   return word ? resolveWordLiteral(word) : null;
 }
+function lexicalPath(p) {
+  if (/^[\\/~$]/.test(p) || /^[A-Za-z]:/.test(p)) return null;
+  const parts = [];
+  let climbed = false;
+  for (const part of p.split(/[\\/]+/)) {
+    if (part === "" || part === ".") continue;
+    if (part === "..") {
+      if (parts.length === 0) climbed = true;
+      else parts.pop();
+    } else parts.push(part);
+  }
+  return { parts, climbed };
+}
+function hooksPathBypasses(value) {
+  if (value === null || value === void 0) return true;
+  const v = value.trim();
+  if (v === "" || v === "true") return true;
+  const lp = lexicalPath(v);
+  if (lp === null || lp.climbed || lp.parts.length === 0) return true;
+  return lp.parts[0] === ".git" && lp.parts[1] !== "hooks";
+}
 function hooksBypass(inv) {
-  if (inv.config.has("core.hookspath")) return true;
+  if (inv.config.has("core.hookspath") && hooksPathBypasses(inv.config.get("core.hookspath")))
+    return true;
   for (const [name, value] of inv.env) {
     if (name === "GIT_CONFIG_PARAMETERS" && value !== null && /core\.hookspath/i.test(value))
       return true;
-    if (/^GIT_CONFIG_KEY_\d+$/.test(name) && value !== null && value.toLowerCase() === "core.hookspath")
+    const key = /^GIT_CONFIG_KEY_(\d+)$/.exec(name);
+    if (key && value !== null && value.toLowerCase() === "core.hookspath" && hooksPathBypasses(inv.env.get(`GIT_CONFIG_VALUE_${key[1]}`)))
       return true;
   }
   for (const name of HOOK_KILL_SWITCHES) {
@@ -5612,7 +5638,10 @@ function configWritesHooksPath(args) {
   }
   const key = args[i];
   if (key === null || key === void 0 || key.toLowerCase() !== "core.hookspath") return false;
-  return write2 || i + 1 < args.length;
+  const unset = args.slice(0, i).some((w) => w === "--unset" || w === "--unset-all") || args[0] === "unset";
+  if (unset) return true;
+  if (i + 1 < args.length) return hooksPathBypasses(args[i + 1]);
+  return write2;
 }
 function isHookPath(word) {
   return /(^|[\\/])(\.git[\\/]hooks|\.husky)([\\/]|$)/.test(word);
@@ -5647,31 +5676,49 @@ function chmodDisarmsHook(args, shown) {
 function wholeTree(operand) {
   if (/^:\(top\)\.?$/.test(operand) || operand === ":/" || operand === "*") return true;
   if (operand.startsWith(":")) return false;
+  const lp = lexicalPath(operand);
+  return lp !== null && lp.parts.length === 0;
+}
+function chdirPrefix(inv) {
+  const dirs = inv.chdir ?? [];
+  if (dirs.length === 0) return null;
   const parts = [];
-  for (const part of operand.split("/")) {
-    if (!part || part === ".") continue;
-    if (part === "..") parts.pop();
-    else parts.push(part);
+  for (const d of dirs) {
+    if (d === null || d === "") return null;
+    const lp = lexicalPath(d);
+    if (lp === null || lp.climbed) return null;
+    parts.push(...lp.parts);
   }
-  return parts.length === 0 && !operand.startsWith("/");
+  return parts.length === 0 ? null : parts.join("/");
 }
 function stagesEverything(inv) {
   const sub = inv.sub?.toLowerCase();
+  const prefix = chdirPrefix(inv);
+  const judge = (operands2) => {
+    let conditional = false;
+    for (const operand of operands2) {
+      if (!wholeTree(operand)) continue;
+      if (prefix === null || operand.startsWith(":") || operand.startsWith("/")) return {};
+      if (wholeTree(`${prefix}/${operand === "*" ? "." : operand}`)) return {};
+      conditional = true;
+    }
+    return conditional && prefix !== null ? { ifWorkTreeTop: prefix } : null;
+  };
   if (sub === "add") {
     const o = parseOptions(inv.args, "", ADD_LONG_VALUE);
     if (o.flags.has("-n") || o.flags.has("--dry-run") || o.flags.has("-i") || o.flags.has("--interactive") || o.flags.has("-p") || o.flags.has("--patch") || o.flags.has("-e") || o.flags.has("--edit"))
-      return false;
+      return null;
     const all = o.flags.has("-A") || o.flags.has("--all") || o.flags.has("--no-ignore-removal") || o.flags.has("-u") || o.flags.has("--update");
-    if (all && o.operands.length === 0) return true;
-    return o.operands.some(wholeTree);
+    if (all && o.operands.length === 0) return {};
+    return judge(o.operands);
   }
   if (sub === "commit") {
     const o = parseOptions(inv.args, "mFCcut", COMMIT_LONG_VALUE);
-    if (o.flags.has("--dry-run")) return false;
-    if (o.flags.has("-a") || o.flags.has("--all")) return true;
-    return o.operands.some(wholeTree);
+    if (o.flags.has("--dry-run")) return null;
+    if (o.flags.has("-a") || o.flags.has("--all")) return {};
+    return judge(o.operands);
   }
-  return false;
+  return null;
 }
 function hookTextRunsNothing(text) {
   return text.split(/\r?\n/).every((line) => INERT_LINE_RE.test(line.trim()));
@@ -7724,7 +7771,7 @@ async function evaluatePolicy(config, toolName, args, context = {}, hostHooks =
 }
 async function evaluatePolicyCore(config, toolName, args, context = {}, hooks = {}) {
   const { agent, cwd, activeEnvironment } = context;
-  const { checkProvenance: checkProvenance2, isTrustedHost: isTrustedHost2, isConfiguredRegistry } = hooks;
+  const { checkProvenance: checkProvenance2, isTrustedHost: isTrustedHost2, isConfiguredRegistry, isGitWorkTreeTop: isGitWorkTreeTop2 } = hooks;
   const settingsView = catalogSettings(config);
   const layers = inspectionLayers(config.policy);
   const cv = (id) => checkValue(settingsView, id);
@@ -7878,6 +7925,8 @@ async function evaluatePolicyCore(config, toolName, args, context = {}, hooks =
         const action = cv(id);
         const finding = action === "off" ? void 0 : git.findings.find((f) => f.checkId === id);
         if (!finding) continue;
+        if (finding.ifWorkTreeTop !== void 0 && isGitWorkTreeTop2 && cwd && !isGitWorkTreeTop2(finding.ifWorkTreeTop, cwd))
+          continue;
         const v = applyCheckValue(action, {
           decision: "review",
           blockedByLabel: `Node9 (AST): ${finding.ruleName}`,
@@ -17200,6 +17249,7 @@ zoo`.split("\n");
       /** The words after `git`: global options, then the subcommand. */
       visitGit(rest, env, depth, viaXargs, fromAlias, shown) {
         const config = /* @__PURE__ */ new Map();
+        const chdir = [];
         let i = 0;
         while (i < rest.length) {
           const w = rest[i];
@@ -17214,6 +17264,7 @@ zoo`.split("\n");
               i++;
               value = i < rest.length ? rest[i] : null;
             }
+            if (name === "-C") chdir.push(viaXargs || (value ?? "").includes("{}") ? null : value);
             if (name === "-c" && value !== null) {
               const ceq = value.indexOf("=");
               const key = (ceq > 0 ? value.slice(0, ceq) : value).toLowerCase();
@@ -17230,7 +17281,7 @@ zoo`.split("\n");
         }
         const subWord = i < rest.length ? rest[i] : void 0;
         const args = rest.slice(i + 1);
-        const inv = { sub: null, args, config, env, shown };
+        const inv = { sub: null, args, config, env, shown, chdir };
         if (subWord === void 0) {
           if (!viaXargs) return;
           this.emit(inv);
@@ -17244,16 +17295,23 @@ zoo`.split("\n");
         const fromConfig = config.get(`alias.${subWord.toLowerCase()}`);
         const alias = fromConfig !== void 0 ? fromConfig : this.aliases.get(subWord);
         if (alias !== void 0 && !fromAlias) {
-          this.expandAlias(subWord, alias, args, env, depth, 0, shown);
+          this.expandAlias(subWord, alias, args, env, depth, 0, shown, chdir);
           return;
         }
         inv.sub = subWord;
         this.emit(inv);
         this.recordAliasDefinition(inv, env, depth);
       }
-      expandAlias(name, value, args, env, depth, level, shown) {
+      expandAlias(name, value, args, env, depth, level, shown, chdir) {
         if (value === null) {
-          this.emit({ sub: null, args, config: /* @__PURE__ */ new Map(), env, shown: `${shown} (alias ${name})` });
+          this.emit({
+            sub: null,
+            args,
+            config: /* @__PURE__ */ new Map(),
+            env,
+            shown: `${shown} (alias ${name})`,
+            chdir
+          });
           return;
         }
         if (value.startsWith("!")) {
@@ -17267,7 +17325,16 @@ zoo`.split("\n");
         const nested = this.aliases.get(sub);
         const expandedShown = `${shown} (alias ${name} = ${value})`;
         if (nested !== void 0 && level < MAX_ALIAS_DEPTH) {
-          this.expandAlias(sub, nested, [...words.slice(1), ...args], env, depth, level + 1, shown);
+          this.expandAlias(
+            sub,
+            nested,
+            [...words.slice(1), ...args],
+            env,
+            depth,
+            level + 1,
+            shown,
+            chdir
+          );
           return;
         }
         this.emit({
@@ -17275,7 +17342,8 @@ zoo`.split("\n");
           args: [...words.slice(1), ...args],
           config: /* @__PURE__ */ new Map(),
           env,
-          shown: expandedShown
+          shown: expandedShown,
+          chdir
         });
       }
       /**
@@ -17309,7 +17377,7 @@ zoo`.split("\n");
         if (i + 1 >= args.length) return;
         const value = args[i + 1];
         this.aliases.set(m[1], value);
-        this.expandAlias(m[1], value, [], env, depth, 0, `${inv.shown}`);
+        this.expandAlias(m[1], value, [], env, depth, 0, `${inv.shown}`, []);
       }
     };
     POSITIONAL2 = "\0positional";
@@ -18855,7 +18923,7 @@ zoo`.split("\n");
       { view: "separators-stripped", decoder: "separators", stripped: true }
     ];
     LONG_OUTPUT_THRESHOLD_BYTES = 100 * 1024;
-    CANONICAL_EXTRACTOR_VERSION = "canonical-v34";
+    CANONICAL_EXTRACTOR_VERSION = "canonical-v35";
     DEDUPE_PREVIEW_LEN = 120;
     ENGINE_VERSION = "1.4.0";
   }
@@ -22932,10 +23000,19 @@ async function evaluatePolicy2(toolName, args, agent, cwd, opts) {
       // reaches a long-lived in-process authorizer (the gateway) within seconds.
       isTrustedHost: config.policy.trustedHostsManaged ? (host2) => matchesTrustedHost(host2, config.policy.trustedHosts) : isTrustedHost,
       readAgentSettings,
-      isConfiguredRegistry: (host2, at) => configuredRegistryHosts(at).has(host2)
+      isConfiguredRegistry: (host2, at) => configuredRegistryHosts(at).has(host2),
+      isGitWorkTreeTop
     }
   );
 }
+function isGitWorkTreeTop(dir2, cwd) {
+  if (!path13.isAbsolute(cwd)) return true;
+  try {
+    return fs13.existsSync(path13.join(path13.resolve(cwd, dir2), ".git"));
+  } catch {
+    return true;
+  }
+}
 function readAgentSettings(absPath) {
   const r = readCappedText(
     absPath,