@staff0rd/assist 0.184.0 → 0.184.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.184.0",
+  version: "0.184.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4591,6 +4591,70 @@ function registerBacklog(program2) {
   registerUpdateCommands(cmd);
 }
 
+// src/shared/splitCompound.ts
+import { parse } from "shell-quote";
+
+// src/shared/hasUnquotedBackticks.ts
+var QUOTED_OR_BACKTICK_RE = /\\.|'[^']*'|"[^"]*"|(`)/g;
+function hasUnquotedBackticks(command) {
+  QUOTED_OR_BACKTICK_RE.lastIndex = 0;
+  for (let m = QUOTED_OR_BACKTICK_RE.exec(command); m !== null; m = QUOTED_OR_BACKTICK_RE.exec(command)) {
+    if (m[1] !== void 0) return true;
+  }
+  return false;
+}
+
+// src/shared/splitCompound.ts
+var SEPARATOR_OPS = /* @__PURE__ */ new Set(["|", "&&", "||", ";"]);
+var UNSAFE_OPS = /* @__PURE__ */ new Set(["(", ")", ">", ">>", "<", "<&", "|&", ">&"]);
+var FD_REDIRECT_RE = /\d+>&\d+/g;
+var FD_DEVNULL_RE = /\d*>\/dev\/null/g;
+function splitCompound(command) {
+  const tokens = tokenizeCommand(command);
+  if (!tokens) return void 0;
+  const groups = groupByOperator(tokens);
+  if (!groups) return void 0;
+  const result = groups.map((parts) => stripEnvPrefix(parts).join(" ")).filter((cmd) => cmd !== "");
+  return result.length > 0 ? result : void 0;
+}
+function tokenizeCommand(command) {
+  const trimmed = command.trim().replace(FD_DEVNULL_RE, "").replace(FD_REDIRECT_RE, "");
+  if (!trimmed) return void 0;
+  if (hasUnquotedBackticks(trimmed)) return void 0;
+  try {
+    return parse(trimmed);
+  } catch {
+    return void 0;
+  }
+}
+function getOp(token) {
+  return typeof token === "object" && token !== null && "op" in token ? token.op : void 0;
+}
+function groupByOperator(tokens) {
+  const groups = [[]];
+  for (const token of tokens) {
+    const op = getOp(token);
+    if (op === void 0) {
+      if (typeof token !== "string") return void 0;
+      groups[groups.length - 1].push(token);
+    } else if (op === "glob") {
+      groups[groups.length - 1].push(token.pattern);
+    } else if (SEPARATOR_OPS.has(op)) {
+      groups.push([]);
+    } else if (UNSAFE_OPS.has(op)) {
+      return void 0;
+    } else {
+      return void 0;
+    }
+  }
+  return groups;
+}
+function stripEnvPrefix(parts) {
+  let i = 0;
+  while (i < parts.length && /^[A-Za-z_]\w*=/.test(parts[i])) i++;
+  return i > 0 ? parts.slice(i) : parts;
+}
+
 // src/shared/isApprovedRead.ts
 import { resolve as resolve3 } from "path";
 
@@ -4761,8 +4825,8 @@ var denyCache;
 var TOOL_RE = /^(Bash|PowerShell)\((.+?)(:.*)?\)$/;
 var SHELL_TOOLS = ["Bash", "PowerShell"];
 var DOTSLASH_RE = /^\.[\\/]/;
-var FD_REDIRECT_RE = /\d+>&\d+/g;
-var FD_DEVNULL_RE = /\d*>\/dev\/null/g;
+var FD_REDIRECT_RE2 = /\d+>&\d+/g;
+var FD_DEVNULL_RE2 = /\d*>\/dev\/null/g;
 function loadPerms(key) {
   return parsePerms(readSettingsPerms(key));
 }
@@ -4773,7 +4837,7 @@ function shellEntries(map, toolName) {
   return map.get(toolName) ?? [];
 }
 function normCmd(cmd) {
-  return cmd.replace(FD_DEVNULL_RE, "").replace(FD_REDIRECT_RE, "").trim().replace(DOTSLASH_RE, "");
+  return cmd.replace(FD_DEVNULL_RE2, "").replace(FD_REDIRECT_RE2, "").trim().replace(DOTSLASH_RE, "");
 }
 function findMatch2(entries, command) {
   const norm = normCmd(command);
@@ -4838,72 +4902,7 @@ function matchesConfigDeny(command) {
   );
 }
 
-// src/shared/splitCompound.ts
-import { parse } from "shell-quote";
-
-// src/shared/hasUnquotedBackticks.ts
-var QUOTED_OR_BACKTICK_RE = /\\.|'[^']*'|"[^"]*"|(`)/g;
-function hasUnquotedBackticks(command) {
-  QUOTED_OR_BACKTICK_RE.lastIndex = 0;
-  for (let m = QUOTED_OR_BACKTICK_RE.exec(command); m !== null; m = QUOTED_OR_BACKTICK_RE.exec(command)) {
-    if (m[1] !== void 0) return true;
-  }
-  return false;
-}
-
-// src/shared/splitCompound.ts
-var SEPARATOR_OPS = /* @__PURE__ */ new Set(["|", "&&", "||", ";"]);
-var UNSAFE_OPS = /* @__PURE__ */ new Set(["(", ")", ">", ">>", "<", "<&", "|&", ">&"]);
-var FD_REDIRECT_RE2 = /\d+>&\d+/g;
-var FD_DEVNULL_RE2 = /\d*>\/dev\/null/g;
-function splitCompound(command) {
-  const tokens = tokenizeCommand(command);
-  if (!tokens) return void 0;
-  const groups = groupByOperator(tokens);
-  if (!groups) return void 0;
-  const result = groups.map((parts) => stripEnvPrefix(parts).join(" ")).filter((cmd) => cmd !== "");
-  return result.length > 0 ? result : void 0;
-}
-function tokenizeCommand(command) {
-  const trimmed = command.trim().replace(FD_DEVNULL_RE2, "").replace(FD_REDIRECT_RE2, "");
-  if (!trimmed) return void 0;
-  if (hasUnquotedBackticks(trimmed)) return void 0;
-  try {
-    return parse(trimmed);
-  } catch {
-    return void 0;
-  }
-}
-function getOp(token) {
-  return typeof token === "object" && token !== null && "op" in token ? token.op : void 0;
-}
-function groupByOperator(tokens) {
-  const groups = [[]];
-  for (const token of tokens) {
-    const op = getOp(token);
-    if (op === void 0) {
-      if (typeof token !== "string") return void 0;
-      groups[groups.length - 1].push(token);
-    } else if (op === "glob") {
-      groups[groups.length - 1].push(token.pattern);
-    } else if (SEPARATOR_OPS.has(op)) {
-      groups.push([]);
-    } else if (UNSAFE_OPS.has(op)) {
-      return void 0;
-    } else {
-      return void 0;
-    }
-  }
-  return groups;
-}
-function stripEnvPrefix(parts) {
-  let i = 0;
-  while (i < parts.length && /^[A-Za-z_]\w*=/.test(parts[i])) i++;
-  return i > 0 ? parts.slice(i) : parts;
-}
-
-// src/commands/cliHook/index.ts
-var SUPPORTED_TOOLS = /* @__PURE__ */ new Set(["Bash", "PowerShell"]);
+// src/commands/cliHook/resolvePermission.ts
 function findDeny(toolName, parts) {
   for (const part of parts) {
     const configDeny = matchesConfigDeny(part);
@@ -4939,25 +4938,31 @@ function resolvePermission(toolName, parts) {
     permissionDecisionReason: reasons.join("; ")
   };
 }
-function tryParseJson(raw) {
+
+// src/commands/cliHook/index.ts
+var SUPPORTED_TOOLS = /* @__PURE__ */ new Set(["Bash", "PowerShell"]);
+function tryParseInput(raw) {
   try {
-    return JSON.parse(raw);
+    const data = JSON.parse(raw);
+    if (!SUPPORTED_TOOLS.has(data.tool_name) || !data.tool_input?.command)
+      return void 0;
+    return {
+      toolName: data.tool_name,
+      command: data.tool_input.command.trim()
+    };
   } catch {
     return void 0;
   }
 }
-function extractCommand(data) {
-  if (!SUPPORTED_TOOLS.has(data.tool_name) || !data.tool_input?.command)
-    return void 0;
-  const parts = splitCompound(data.tool_input.command.trim());
-  return parts ? { toolName: data.tool_name, parts } : void 0;
+function decide(toolName, rawCommand) {
+  const parts = splitCompound(rawCommand);
+  if (parts) return resolvePermission(toolName, parts);
+  return findDeny(toolName, [rawCommand]);
 }
 async function cliHook() {
-  const data = tryParseJson(await readStdin());
-  if (!data) return;
-  const cmd = extractCommand(data);
-  if (!cmd) return;
-  const decision = resolvePermission(cmd.toolName, cmd.parts);
+  const input = tryParseInput(await readStdin());
+  if (!input) return;
+  const decision = decide(input.toolName, input.command);
   if (!decision) return;
   console.log(
     JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.184.0",
+	"version": "0.184.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {