@cnwenf/occ 2.1.312 → 2.1.313

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.312","BINARY_NAME":"occ","BUILD_TIME":"2026-08-25T20:28:13.846Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.313","BINARY_NAME":"occ","BUILD_TIME":"2026-08-26T18:15:46.386Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -59313,7 +59313,39 @@ function hasUnescapedEmptyParens(str) {
   }
   return false;
 }
-function validatePermissionRule(rule) {
+function isOperatorToken(token) {
+  return OPERATOR_TOKEN_RE.test(token);
+}
+function hasUnescapedStar(str) {
+  for (let i2 = 0;i2 < str.length; i2++) {
+    if (str[i2] === "*" && !isEscaped(str, i2))
+      return true;
+  }
+  return false;
+}
+function wildcardBeforeSubcommand(content) {
+  if (content.endsWith(":*"))
+    return;
+  const tokens = content.trim().split(/\s+/).filter(Boolean);
+  const first = tokens[0];
+  if (tokens.length < 3 || first === undefined || hasUnescapedStar(first)) {
+    return;
+  }
+  let sawWildcard = false;
+  for (const token of tokens.slice(1)) {
+    if (isOperatorToken(token))
+      return;
+    if (hasUnescapedStar(token)) {
+      sawWildcard = true;
+      continue;
+    }
+    if (token.startsWith("-"))
+      continue;
+    return sawWildcard ? first : undefined;
+  }
+  return;
+}
+function validatePermissionRule(rule, behavior) {
   if (!rule || rule.trim() === "") {
     return { valid: false, error: "Permission rule cannot be empty" };
   }
@@ -59397,6 +59429,18 @@ function validatePermissionRule(rule) {
         examples: ["Bash(npm:*)", "Bash(git:*)"]
       };
     }
+    if (behavior === "allow") {
+      const flaggedCommand = wildcardBeforeSubcommand(content);
+      if (flaggedCommand !== undefined) {
+        const isGit = flaggedCommand === "git";
+        const gitNote = isGit ? " For git, options such as -c and --exec-path can run arbitrary commands." : "";
+        const gitExample = isGit ? " (for example Bash(git status *))" : "";
+        return {
+          valid: true,
+          warning: `${permissionRuleValueToString(parsed)} has a wildcard before the rest of the command, so it also matches any options inserted at that position and approves them without a prompt.${gitNote} Replace that * with the exact value you mean, or only use * after the subcommand${gitExample}.`
+        };
+      }
+    }
   }
   if (isFilePatternTool(parsed.toolName) && parsed.ruleContent !== undefined) {
     const content = parsed.ruleContent;
@@ -59436,13 +59480,14 @@ function validatePermissionRule(rule) {
   }
   return { valid: true };
 }
-var PermissionRuleSchema;
+var OPERATOR_TOKEN_RE, PermissionRuleSchema;
 var init_permissionValidation = __esm(() => {
   init_v4();
   init_mcpStringUtils();
   init_permissionRuleParser();
   init_stringUtils();
   init_toolValidationConfig();
+  OPERATOR_TOKEN_RE = /^(?:[|&;<>]|\d+[<>])/;
   PermissionRuleSchema = lazySchema(() => exports_external.string().superRefine((val, ctx) => {
     const result = validatePermissionRule(val);
     if (!result.valid) {
@@ -385289,6 +385334,35 @@ function hasQuotedBracketCloserInConditional(command4) {
   }
   return false;
 }
+function hasDanglingBooleanOperator(command4) {
+  if (!command4.includes("&&") && !command4.includes("||"))
+    return false;
+  let inSingle = false;
+  let inDouble = false;
+  let lastBoolOpEnd = -1;
+  for (let i6 = 0;i6 < command4.length; i6++) {
+    const ch2 = command4[i6];
+    if (ch2 === "\\" && !inSingle) {
+      i6++;
+      continue;
+    }
+    if (ch2 === "'" && !inDouble) {
+      inSingle = !inSingle;
+      continue;
+    }
+    if (ch2 === '"' && !inSingle) {
+      inDouble = !inDouble;
+      continue;
+    }
+    if (inSingle || inDouble)
+      continue;
+    if (ch2 === "&" && command4[i6 + 1] === "&" || ch2 === "|" && command4[i6 + 1] === "|") {
+      lastBoolOpEnd = i6 + 2;
+      i6++;
+    }
+  }
+  return lastBoolOpEnd !== -1 && command4.slice(lastBoolOpEnd).trim() === "";
+}
 async function bashToolHasPermission(input, context4, getCommandSubcommandPrefixFn = getCommandSubcommandPrefix) {
   let appState = context4.getAppState();
   {
@@ -385388,6 +385462,15 @@ async function bashToolHasPermission(input, context4, getCommandSubcommandPrefix
       };
     }
   }
+  {
+    const mode = appState.toolPermissionContext.mode;
+    if (mode !== "bypassPermissions" && hasDanglingBooleanOperator(input.command)) {
+      return {
+        behavior: "ask",
+        message: "Malformed command with a dangling && or || operator requires confirmation."
+      };
+    }
+  }
   const injectionCheckDisabled = isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_COMMAND_INJECTION_CHECK);
   const shadowEnabled = feature("TREE_SITTER_BASH_SHADOW") ? getFeatureValue_CACHED_MAY_BE_STALE("tengu_birch_trellis", true) : false;
   let astRoot = injectionCheckDisabled ? null : feature("TREE_SITTER_BASH_SHADOW") && !shadowEnabled ? null : await parseCommandRaw(input.command);
@@ -635547,19 +635630,19 @@ async function initializeToolPermissionContext({
   }
   for (const rule of rulesFromDisk) {
     const ruleStr = permissionRuleValueToString(rule.ruleValue);
-    const result = validatePermissionRule(ruleStr);
+    const result = validatePermissionRule(ruleStr, rule.ruleBehavior);
     if (result.valid && result.warning) {
       warnings.push(`Permission ${rule.ruleBehavior} rule (${formatPermissionSource(rule.source)}): ${result.warning}`);
     }
   }
   for (const ruleStr of parsedAllowedToolsCli) {
-    const result = validatePermissionRule(ruleStr);
+    const result = validatePermissionRule(ruleStr, "allow");
     if (result.valid && result.warning) {
       warnings.push(`Permission allow rule (--allowed-tools): ${result.warning}`);
     }
   }
   for (const ruleStr of parsedDisallowedToolsCli) {
-    const result = validatePermissionRule(ruleStr);
+    const result = validatePermissionRule(ruleStr, "deny");
     if (result.valid && result.warning) {
       warnings.push(`Permission deny rule (--disallowed-tools): ${result.warning}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.312",
+  "version": "2.1.313",
   "license": "MIT",
   "type": "module",
   "bin": {