@swifty.js/swifty 0.0.30 → 0.0.31

package/dist/lib/{chunk-RMB3J46W.js → chunk-A4MXZA5Q.js}

@@ -1,13 +1,11 @@
 import {
   mcpCallPermissionContent
-} from "./chunk-KG4MJGKQ.js";
+} from "./chunk-FZ4Y6MBN.js";
 import {
   createChildLogger,
+  isRecord,
   strArg
 } from "./chunk-EY7HE52Q.js";
-import {
-  MCP_CALL_TOOL_NAME
-} from "./chunk-GHF2PSEW.js";
 
 // src/permissions/checker.ts
 import { readFileSync, writeFileSync, mkdirSync, statSync } from "fs";
@@ -47,40 +45,193 @@ function isPathWithin(root, path) {
 var log = createChildLogger({ module: "permissions" });
 var DANGEROUS_PATTERNS = [];
 var SAFE_PREFIXES = [
-  "ls",
-  "pwd",
-  "echo",
+  "basename",
   "cat",
+  "cksum",
+  "cmp",
+  "column",
+  "comm",
+  "cut",
+  "df",
+  "dirname",
+  "du",
+  "echo",
+  "expr",
+  "false",
+  "fold",
+  "fmt",
+  "grep",
+  "groups",
   "head",
+  "id",
+  "jq",
+  "locate",
+  "ls",
+  "md5",
+  "md5sum",
+  "nl",
+  "od",
+  "paste",
+  "pgrep",
+  "printenv",
+  "printf",
+  "ps",
+  "pwd",
+  "readlink",
+  "realpath",
+  "sha1sum",
+  "sha224sum",
+  "sha256sum",
+  "sha384sum",
+  "sha512sum",
+  "shasum",
+  "stat",
+  "strings",
+  "tac",
   "tail",
-  "wc",
-  "date",
-  "whoami",
+  "tr",
+  "true",
+  "tty",
+  "type",
   "uname",
-  "hostname",
+  "uptime",
+  "w",
+  "wc",
+  "whereis",
   "which",
-  "type",
-  "file",
-  "git status",
-  "git log",
-  "git diff",
-  "git branch",
-  "git show",
-  "git rev-parse",
-  "git remote",
-  "bun test",
-  "bun run",
-  "npm test",
-  "npm run",
-  "go test",
-  "go build",
-  "go vet",
-  "python -c",
-  "node -e"
+  "who",
+  "whoami",
+  "ack",
+  "ag",
+  "alias",
+  "arch",
+  "base64",
+  "bat",
+  "bzcat",
+  "cal",
+  "col",
+  "cloc",
+  "diff",
+  "diff3",
+  "dig",
+  "dmesg",
+  "expand",
+  "factor",
+  "free",
+  "help",
+  "hexdump",
+  "host",
+  "iconv",
+  "info",
+  "locale",
+  "lscpu",
+  "lsblk",
+  "lsof",
+  "lspci",
+  "lsusb",
+  "man",
+  "mdfind",
+  "mdls",
+  "ncal",
+  "netstat",
+  "nproc",
+  "nslookup",
+  "objdump",
+  "otool",
+  "pbpaste",
+  "ping",
+  "readelf",
+  "rev",
+  "sdiff",
+  "seq",
+  "sum",
+  "sw_vers",
+  "tldr",
+  "traceroute",
+  "unexpand",
+  "vm_stat",
+  "whois",
+  "xxd",
+  "xzcat",
+  "zcat",
+  "zgrep",
+  "zipinfo",
+  /^command\s+(?:-v|-V)\s+\S+(?:\s+\S+)*$/,
+  /^date(?!.*\s(?:-s|--set)(?:=|\s|$))(?:\s.*)?$/,
+  /^file(?!.*(?:\s--compile(?:=|\s|$)|\s-[^-\s]*C))(?:\s.*)?$/,
+  /^find(?!.*\s(?:-delete|-exec(?:dir)?|-ok(?:dir)?|-fls|-fprint(?:0)?|-fprintf)(?:\s|$))(?:\s.*)?$/,
+  /^fd(?!.*\s(?:-x|-X|--exec|--exec-batch)(?:=|\s|$))(?:\s.*)?$/,
+  /^hostname(?:\s+(?:-[adfFiIsyVh]|--(?:alias|all-fqdns|all-ip-addresses|domain|fqdn|help|ip-address|long|nis|short|version|yp)))*$/,
+  /^rg(?!.*\s(?:--pre|--pre-glob|--hostname-bin)(?:=|\s|$))(?:\s.*)?$/,
+  /^sort(?!.*\s(?:-o|--output|--compress-program)(?:=|\s|$))(?:\s.*)?$/,
+  /^ss(?!.*\s(?:--kill|-[^-\s]*K)(?:\s|$))(?:\s.*)?$/,
+  /^tree(?!.*\s(?:-o|--output)(?:=|\s|$))(?:\s.*)?$/,
+  /^git\s+(?:--version|version)$/,
+  /^git\s+(?:blame|cat-file|count-objects|describe|for-each-ref|ls-files|ls-tree|merge-base|name-rev|rev-parse|shortlog|show-ref|status|verify-pack)(?:\s.*)?$/,
+  /^git\s+(?:diff|log|show)(?!.*\s(?:--ext-diff|--output)(?:=|\s|$))(?:\s.*)?$/,
+  /^git\s+branch$/,
+  /^git\s+branch(?=.*\s(?:-a|--all|-r|--remotes|--list|--show-current|--contains|--no-contains|--merged|--no-merged)(?:=|\s|$))(?!.*\s(?:-[dDmMcCf]|--(?:copy|create-reflog|delete|edit-description|move|set-upstream-to|unset-upstream))(?:=|\s|$))(?:\s.*)?$/,
+  /^git\s+config(?:\s+(?:--blob(?:=|\s)\S+|--file(?:=|\s)\S+|--fixed-value|--global|--local|--null|--show-names|--show-origin|--show-scope|--system|--worktree|-z))*\s+(?:--get|--get-all|--get-regexp|--get-urlmatch|--list|-l)(?:\s.*)?$/,
+  /^git\s+notes\s+(?:list|show)(?:\s.*)?$/,
+  /^git\s+reflog\s+show(?:\s.*)?$/,
+  /^git\s+remote(?:\s+-v)?$/,
+  /^git\s+remote\s+get-url(?:\s+(?:--all|--push))*\s+\S+$/,
+  /^git\s+remote\s+show(?:\s+-n)?(?:\s+\S+)?$/,
+  /^git\s+stash\s+(?:list|show)(?:\s.*)?$/,
+  /^git\s+submodule\s+(?:status|summary)(?:\s.*)?$/,
+  /^git\s+tag(?:\s+(?:-l|--list)(?:\s.*)?)?$/,
+  /^git\s+worktree\s+list(?:\s.*)?$/,
+  /^(?:bun|npm|pnpm|yarn)\s+(?:explain|help|info|list|ls|outdated|prefix|query|root|search|show|view|why)(?:\s.*)?$/,
+  /^(?:npm|pnpm|yarn)\s+config\s+(?:get|list)(?:\s.*)?$/,
+  /^npm\s+pkg\s+get(?:\s.*)?$/,
+  /^bun\s+pm\s+ls(?:\s.*)?$/,
+  /^(?:bun|cargo|clang|cmake|composer|deno|gcc|gem|node|npm|php|pip|pip3|pnpm|python|python3|ruby|rustc|swift|yarn)\s+(?:--version|-V)$/,
+  /^(?:go|helm|kubectl|podman|terraform)\s+version(?:\s.*)?$/,
+  /^(?:java|javac)\s+-version$/,
+  /^dotnet\s+(?:--info|--list-runtimes|--list-sdks|--version)$/,
+  /^(?:docker|podman)\s+(?:diff|events|images|info|inspect|logs|port|ps|stats|top|version)(?:\s.*)?$/,
+  /^(?:docker|podman)\s+(?:container|image|network|volume)\s+(?:inspect|ls)(?:\s.*)?$/,
+  /^docker\s+compose\s+(?:config|images|logs|ps|top|version)(?:\s.*)?$/,
+  /^kubectl\s+(?:api-resources|api-versions|cluster-info|describe|explain|get|logs|top|version)(?:\s.*)?$/,
+  /^kubectl\s+config\s+(?:current-context|get-contexts|view)(?:\s.*)?$/,
+  /^helm\s+(?:env|get|history|list|search|show|status|version)(?:\s.*)?$/,
+  /^terraform\s+(?:output|providers|show|version)(?:\s.*)?$/,
+  /^terraform\s+workspace\s+(?:list|show)(?:\s.*)?$/,
+  /^systemctl\s+(?:is-active|is-enabled|is-failed|list-dependencies|list-jobs|list-sockets|list-timers|list-unit-files|list-units|show|show-environment|status)(?:\s.*)?$/,
+  /^launchctl\s+(?:error|hostinfo|list|managername|managerpid|manageruid|print|print-cache|procinfo|variant|version)(?:\s.*)?$/,
+  /^journalctl(?!.*\s--(?:rotate|vacuum|flush|sync))(?:\s.*)?$/,
+  /^defaults\s+read(?:\s.*)?$/,
+  /^ifconfig$/,
+  /^ipconfig(?:\s+\/(?:all|allcompartments|displaydns))?\s*$/,
+  /^ip\s+(?:addr(?:ess)?|route)$/,
+  /^ip\s+(?:addr(?:ess)?|link|route|neigh(?:bor)?)\s+(?:show|list)\b(?:\s.*)?$/,
+  /^tar\s+(?:--list\b|-[a-zA-Z]*t[a-zA-Z]*)(?:\s.*)?$/,
+  /^unzip\s+-[a-zA-Z]*l(?:\s.*)?$/,
+  /^git\s+(?:grep|fsck|rev-list|whatchanged|help|diff-tree|diff-index|diff-files|ls-remote|verify-tag|verify-commit)(?:\s.*)?$/,
+  /^git\s+archive(?!.*\s(?:-o|--output)(?:=|\s|$))(?:\s.*)?$/,
+  /^svn\s+(?:status|stat|st|diff|di|log|info|list|ls|cat|blame|ann|annotate|proplist|propget|pg)(?:\s.*)?$/,
+  /^hg\s+(?:status|st|log|diff|summary|id|identify|branches|tags|manifest|cat|files|locate|heads|tip|parents|paths|root)(?:\s.*)?$/,
+  /^cargo\s+(?:tree|search|locate-project|verify-project|config\s+get)(?:\s.*)?$/,
+  /^gem\s+(?:list|search|info|env|dependency|contents|specification|sources\s+(?:-l|--list))(?:\s.*)?$/,
+  /^brew\s+(?:--version|-v|list|info|search|outdated|deps|uses|config|leaves|doctor)(?:\s.*)?$/,
+  /^choco\s+(?:--version|list|info|search|outdated)(?:\s.*)?$/,
+  /^apt(?:-get)?\s+list(?:\s.*)?$/,
+  /^apt-cache\s+(?:search|show|showpkg|policy|depends|rdepends|pkgnames)(?:\s.*)?$/,
+  /^dpkg\s+(?:-l|-L|-s|-S|--list|--listfiles|--status|--search)\b(?:\s.*)?$/,
+  /^rpm\s+-q[a-zA-Z]*(?:\s.*)?$/,
+  /^(?:aws|gh|gcloud|az)\s+--version$/,
+  /^aws\s+(?:\S+\s+)?(?:describe|list|get|wait)-\S+(?:\s.*)?$/,
+  /^aws\s+s3\s+ls(?:\s.*)?$/,
+  /^gcloud\s+\S+(?:\s+\S+)*\s+(?:list|describe)(?:\s.*)?$/,
+  /^az\s+\S+(?:\s+\S+)*\s+(?:list|show)(?:\s.*)?$/,
+  /^gh\s+(?:pr|issue|repo|run|release|gist)\s+(?:view|list|status|checks|diff)(?:\s.*)?$/,
+  /^(?:docker|podman)\s+(?:system\s+(?:df|info)|history|context\s+(?:ls|list|show|inspect))(?:\s.*)?$/,
+  /^(?:Get-(?:Acl|Alias|AuthenticodeSignature|ChildItem|CimInstance|Clipboard|Command|ComputerInfo|Content|Counter|Culture|Date|DnsClientCache|EventLog|ExecutionPolicy|FileHash|Help|History|Host|HotFix|Item|ItemProperty|Location|Member|Module|NetAdapter|NetIPAddress|NetNeighbor|NetIPConfiguration|NetRoute|NetTCPConnection|NetUDPEndpoint|Package|PackageProvider|PnpDevice|Printer|Process|PSDrive|PSProvider|PSRepository|PSSnapin|ScheduledTask|Service|TimeZone|UICulture|Variable|Verb|WinEvent|WmiObject)|Compare-Object|Format-(?:Custom|Hex|List|Table|Wide)|Group-Object|Measure-Object|Out-String|Resolve-Path|Select-Object|Select-String|Sort-Object|Test-Path|Where-Object|Write-(?:Debug|Error|Host|Information|Output|Progress|Verbose|Warning))(?:\s.*)?$/i
 ];
 var CONTENT_FIELDS = {
   Bash: "command",
   PowerShell: "command",
+  ComputerUse: "action",
   ReadFile: "file_path",
   WriteFile: "file_path",
   EditFile: "file_path",
@@ -88,9 +239,9 @@ var CONTENT_FIELDS = {
   Grep: "pattern",
   InstallSkill: "source"
 };
-var DEFAULT_DENY_WRITE = [".swifty/permissions.yaml", ".agents/skills/"];
+var DEFAULT_DENY_WRITE = [];
 function extractContent(toolName, args) {
-  if (toolName === MCP_CALL_TOOL_NAME) {
+  if (toolName === "McpCall") {
     return mcpCallPermissionContent(strArg(args, "server", ""), strArg(args, "tool", ""));
   }
   const field = CONTENT_FIELDS[toolName];
@@ -98,7 +249,13 @@ function extractContent(toolName, args) {
     return "";
   }
   const v = args[field];
-  return typeof v === "string" ? v : "";
+  if (typeof v === "string") {
+    return v;
+  }
+  if (toolName === "ComputerUse" && Array.isArray(args.actions)) {
+    return args.actions.map((item) => isRecord(item) ? strArg(item, "type") : "").filter(Boolean).join(",");
+  }
+  return "";
 }
 var PathSandbox = class {
   allowedRoots;
@@ -280,12 +437,16 @@ function detectDangerous(command) {
 }
 function isSafeCommand(command) {
   const trimmed = command.trim();
-  if (trimmed.includes(">") || trimmed.includes("<") || /[\r\n&]/.test(trimmed) || trimmed.includes("|") || trimmed.includes(";") || trimmed.includes("&&") || trimmed.includes("$(") || trimmed.includes("`")) {
+  if (/[\r\n&|;<>`(){}[\]]/.test(trimmed)) {
     return false;
   }
-  return SAFE_PREFIXES.some(
-    (prefix) => trimmed === prefix || trimmed.startsWith(prefix + " ") || trimmed.startsWith(prefix + "	")
-  );
+  return SAFE_PREFIXES.some((prefix) => {
+    if (typeof prefix === "string") {
+      return trimmed === prefix || trimmed.startsWith(prefix + " ") || trimmed.startsWith(prefix + "	");
+    }
+    prefix.lastIndex = 0;
+    return prefix.test(trimmed);
+  });
 }
 function modeDecide(mode, category) {
   switch (mode) {

package/dist/lib/{chunk-7QPDFSQE.js → chunk-EWE5IWZE.js}

@@ -1,8 +1,3 @@
-import {
-  MCP_CALL_TOOL_NAME,
-  TOOL_SEARCH_TOOL_NAME
-} from "./chunk-GHF2PSEW.js";
-
 // src/tools/registry.ts
 var ToolRegistry = class {
   tools = /* @__PURE__ */ new Map();
@@ -32,20 +27,29 @@ var ToolRegistry = class {
   listTools() {
     return [...this.tools.values()];
   }
-  getAllSchemas(protocol = "anthropic") {
-    const isOpenAI = protocol === "openai" || protocol === "openai-compat";
+  getAllSchemas(protocol, filter) {
+    const resolvedProtocol = protocol ?? "anthropic";
+    const isOpenAI = resolvedProtocol === "openai" || resolvedProtocol === "openai-compat";
     const native = this.mcpLoadingMode === "native" && !isOpenAI;
     const schemas = [];
     for (const tool of this.tools.values()) {
-      if (tool.name === TOOL_SEARCH_TOOL_NAME && !this.exposeToolSearch || tool.name === MCP_CALL_TOOL_NAME && !this.exposeMcpCall) {
+      if (filter && !filter(tool.name)) {
+        continue;
+      }
+      if (tool.name === "ToolSearch" && !this.exposeToolSearch || tool.name === "McpCall" && !this.exposeMcpCall) {
         continue;
       }
       const deferred = Boolean(tool.deferred) && !this.discovered.has(tool.name);
       if (deferred && !native) {
         continue;
       }
+      const providerSchema = protocol ? tool.providerSchema?.(resolvedProtocol) : void 0;
+      if (providerSchema) {
+        schemas.push(providerSchema);
+        continue;
+      }
       const s = tool.schema();
-      if (protocol === "openai") {
+      if (resolvedProtocol === "openai") {
         schemas.push({
           strict: s.strict ?? false,
           type: "function",
@@ -53,7 +57,7 @@ var ToolRegistry = class {
           description: s.description,
           parameters: s.input_schema
         });
-      } else if (protocol === "openai-compat") {
+      } else if (resolvedProtocol === "openai-compat") {
         schemas.push({
           type: "function",
           function: {
@@ -120,11 +124,13 @@ var ToolRegistry = class {
 };
 
 // src/subagent/tool-filter.ts
+var MAIN_AGENT_ONLY_TOOLS = /* @__PURE__ */ new Set(["ComputerUse"]);
 var SUBAGENT_DISALLOWED_TOOLS = /* @__PURE__ */ new Set([
   "ExitPlanMode",
   "Agent",
   // Prevents recursive spawning of subagents
   "AskUserQuestion",
+  ...MAIN_AGENT_ONLY_TOOLS,
   "TaskStop"
 ]);
 var TEAMMATE_DISALLOWED_TOOLS = /* @__PURE__ */ new Set(["TeamCreate", "TeamDelete"]);
@@ -193,6 +199,9 @@ function cloneRegistryForFork(registry) {
   const forked = new ToolRegistry();
   forked.mcpLoadingMode = registry.mcpLoadingMode;
   for (const tool of registry.listTools()) {
+    if (MAIN_AGENT_ONLY_TOOLS.has(tool.name)) {
+      continue;
+    }
     if (tool.name === "Agent" && "querySource" in tool) {
       const clone = Object.create(
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -210,6 +219,7 @@ function cloneRegistryForFork(registry) {
 
 export {
   ToolRegistry,
+  MAIN_AGENT_ONLY_TOOLS,
   SUBAGENT_DISALLOWED_TOOLS,
   TEAMMATE_DISALLOWED_TOOLS,
   CUSTOM_AGENT_DISALLOWED_TOOLS,

package/dist/lib/{chunk-KG4MJGKQ.js → chunk-FZ4Y6MBN.js}

@@ -4,9 +4,6 @@ import {
   createChildLogger,
   strArg
 } from "./chunk-EY7HE52Q.js";
-import {
-  MCP_CALL_TOOL_NAME
-} from "./chunk-GHF2PSEW.js";
 
 // src/mcp/tool-wrapper.ts
 var log = createChildLogger({ module: "mcp" });
@@ -148,7 +145,7 @@ var McpCallTool = class {
     this.registry = registry;
   }
   registry;
-  name = MCP_CALL_TOOL_NAME;
+  name = "McpCall";
   description = "Invoke a tool on a connected MCP server. Call ToolSearch first to load the tool's schema, then pass its arguments here exactly as that schema requires, using the same JSON types.";
   category = "command";
   // This tool must stay in tools[] itself, otherwise the model has no entry point