@swifty.js/swifty 0.0.30 → 0.0.32

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

@@ -1,13 +1,11 @@
 import {
   mcpCallPermissionContent
-} from "./chunk-KG4MJGKQ.js";
+} from "./chunk-BCBD34D2.js";
 import {
   createChildLogger,
+  isRecord,
   strArg
-} from "./chunk-EY7HE52Q.js";
-import {
-  MCP_CALL_TOOL_NAME
-} from "./chunk-GHF2PSEW.js";
+} from "./chunk-3XCGUKGJ.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-I7OPU4K2.js → chunk-TJLAJGG4.js}

@@ -11,7 +11,7 @@ import {
   getThinkingLevel,
   resolveAPIKey,
   toReasoningEffort
-} from "./chunk-OQIQOU5S.js";
+} from "./chunk-3OFLDUAW.js";
 import {
   asRecord,
   asString,
@@ -19,12 +19,89 @@ import {
   createChildLogger,
   isRecord,
   strArg
-} from "./chunk-EY7HE52Q.js";
+} from "./chunk-3XCGUKGJ.js";
 
 // src/llm/openai.ts
 import OpenAI from "openai";
 var log = createChildLogger({ module: "llm" });
+function computerActionArguments(action) {
+  switch (action.type) {
+    case "scroll":
+      return {
+        type: "scroll",
+        x: action.x,
+        y: action.y,
+        scrollX: action.scroll_x,
+        scrollY: action.scroll_y,
+        ...action.keys?.length ? { keys: action.keys } : {}
+      };
+    case "click":
+    case "double_click":
+    case "drag":
+    case "move": {
+      const { keys, ...rest } = action;
+      return {
+        ...rest,
+        ...keys?.length ? { keys } : {}
+      };
+    }
+    default:
+      return { ...action };
+  }
+}
+function computerCallArguments(item) {
+  const actions = item.actions ?? (item.action ? [item.action] : []);
+  return {
+    actions: actions.map(computerActionArguments),
+    pendingSafetyChecks: item.pending_safety_checks.map((check) => ({
+      id: check.id,
+      ...check.code ? { code: check.code } : {},
+      ...check.message ? { message: check.message } : {}
+    })),
+    status: item.status
+  };
+}
+function toOpenAIResponsesTool(schema) {
+  if ("type" in schema && schema.type === "computer") {
+    return { ...schema };
+  }
+  if ("input_schema" in schema) {
+    const tool = schema;
+    return {
+      type: "function",
+      name: tool.name,
+      description: tool.description,
+      parameters: tool.input_schema,
+      strict: tool.strict ?? false
+    };
+  }
+  if ("type" in schema && schema.type === "function" && "parameters" in schema) {
+    return { ...schema };
+  }
+  throw new Error("OpenAI Responses received a tool schema serialized for another protocol.");
+}
+function toOpenAICompatTool(schema) {
+  if ("input_schema" in schema) {
+    const tool = schema;
+    return {
+      type: "function",
+      function: {
+        name: tool.name,
+        description: tool.description,
+        parameters: tool.input_schema,
+        strict: tool.strict ?? false
+      }
+    };
+  }
+  if ("function" in schema) {
+    return { ...schema };
+  }
+  throw new Error(
+    "OpenAI Chat Completions received a tool schema serialized for another protocol."
+  );
+}
 var OpenAIClient = class {
+  protocol = "openai";
   client;
   model;
   systemPrompt;
@@ -58,16 +135,7 @@ var OpenAIClient = class {
     for (const message of messages) {
       input.push(message);
     }
-    const tools = toolSchemas.map((s) => {
-      const schema = s.input_schema;
-      return {
-        type: "function",
-        name: s.name,
-        description: s.description,
-        parameters: schema,
-        strict: s.strict ?? false
-      };
-    });
+    const tools = toolSchemas.map(toOpenAIResponsesTool);
     const effort = toReasoningEffort(this.getThinkingLevel(), this.config);
     const params = {
       model: this.model,
@@ -124,6 +192,12 @@ var OpenAIClient = class {
               toolName: currentToolName,
               toolId: currentToolId
             };
+          } else if (event.item.type === "computer_call") {
+            yield {
+              type: "tool_call_start",
+              toolName: "ComputerUse",
+              toolId: event.item.call_id
+            };
           } else if (event.item.type === "reasoning") {
             reasoningId = event.item.id ?? "";
             reasoningText = "";
@@ -149,6 +223,14 @@ var OpenAIClient = class {
             currentToolName = "";
             currentToolId = "";
             jsonAccumulate = "";
+          } else if (event.item.type === "computer_call") {
+            yield {
+              type: "tool_call_complete",
+              toolId: event.item.call_id,
+              toolName: "ComputerUse",
+              arguments: computerCallArguments(event.item),
+              providerItemId: event.item.id
+            };
           }
         } else if (event.type === "response.completed" || event.type === "response.incomplete") {
           sawTerminalResponse = true;
@@ -292,6 +374,56 @@ function toolOutputForResponses(tr) {
   }
   return rich.length > 0 ? rich : tr.content;
 }
+function computerActionsForResponses(args) {
+  if (!Array.isArray(args.actions)) {
+    return [];
+  }
+  const actions = [];
+  for (const raw of args.actions) {
+    if (!isRecord(raw) || typeof raw.type !== "string") {
+      continue;
+    }
+    if (raw.type === "scroll") {
+      actions.push({
+        type: "scroll",
+        x: Number(raw.x),
+        y: Number(raw.y),
+        scroll_x: Number(raw.scrollX),
+        scroll_y: Number(raw.scrollY),
+        ...Array.isArray(raw.keys) ? { keys: raw.keys.map(String) } : {}
+      });
+      continue;
+    }
+    actions.push(raw);
+  }
+  return actions;
+}
+function safetyChecksForResponses(args) {
+  if (!Array.isArray(args.pendingSafetyChecks)) {
+    return [];
+  }
+  return args.pendingSafetyChecks.flatMap((raw) => {
+    if (!isRecord(raw) || typeof raw.id !== "string") {
+      return [];
+    }
+    return [
+      {
+        id: raw.id,
+        ...typeof raw.code === "string" ? { code: raw.code } : {},
+        ...typeof raw.message === "string" ? { message: raw.message } : {}
+      }
+    ];
+  });
+}
+function computerScreenshotUrl(tr) {
+  for (const block of tr.contentBlocks ?? []) {
+    const url = imageDataUrl(block);
+    if (url) {
+      return url;
+    }
+  }
+  return void 0;
+}
 function collectRichParts(tr) {
   if (!tr.contentBlocks?.length) {
     return [];
@@ -349,6 +481,14 @@ function userPartsFor(content) {
 }
 function buildOpenAIInput(messages) {
   const result = [];
+  const computerCalls = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    for (const toolUse of message.toolUses ?? []) {
+      if (toolUse.toolName === "ComputerUse") {
+        computerCalls.set(toolUse.toolUseId, toolUse);
+      }
+    }
+  }
   for (const m of messages) {
     if (m.thinkingBlocks) {
       for (const tb of m.thinkingBlocks) {
@@ -368,20 +508,49 @@ function buildOpenAIInput(messages) {
         });
       }
       for (const tu of m.toolUses) {
-        result.push({
-          type: "function_call",
-          name: tu.toolName,
-          call_id: tu.toolUseId,
-          arguments: JSON.stringify(tu.arguments)
-        });
+        if (tu.toolName === "ComputerUse") {
+          const status = tu.arguments.status;
+          result.push({
+            type: "computer_call",
+            id: tu.providerItemId ?? tu.toolUseId,
+            call_id: tu.toolUseId,
+            status: status === "in_progress" || status === "incomplete" ? status : "completed",
+            actions: computerActionsForResponses(tu.arguments),
+            pending_safety_checks: safetyChecksForResponses(tu.arguments)
+          });
+        } else {
+          result.push({
+            type: "function_call",
+            name: tu.toolName,
+            call_id: tu.toolUseId,
+            arguments: JSON.stringify(tu.arguments)
+          });
+        }
       }
     } else if (m.toolResults && m.toolResults.length > 0) {
       for (const tr of m.toolResults) {
-        result.push({
-          type: "function_call_output",
-          call_id: tr.toolUseId,
-          output: toolOutputForResponses(tr)
-        });
+        const computerCall = computerCalls.get(tr.toolUseId);
+        if (computerCall) {
+          const imageUrl = computerScreenshotUrl(tr);
+          result.push({
+            type: "computer_call_output",
+            call_id: tr.toolUseId,
+            output: {
+              type: "computer_screenshot",
+              ...imageUrl ? { image_url: imageUrl } : {}
+            },
+            acknowledged_safety_checks: safetyChecksForResponses(computerCall.arguments)
+          });
+          if (tr.isError || !imageUrl) {
+            result.push({ role: "user", content: tr.content });
+          }
+        } else {
+          result.push({
+            type: "function_call_output",
+            call_id: tr.toolUseId,
+            output: toolOutputForResponses(tr)
+          });
+        }
       }
       if (m.content.length > 0) {
         result.push({ role: "user", content: userContentsFor(m.content) });
@@ -404,6 +573,7 @@ function containsContextLengthError(msg) {
   return /context_length_exceeded/i.test(msg) || /maximum\scontext\slength/i.test(msg) || /prompts?\s+too\s+long/i.test(msg);
 }
 var OpenAICompatClient = class {
+  protocol = "openai-compat";
   client;
   model;
   systemPrompt;
@@ -448,17 +618,7 @@ var OpenAICompatClient = class {
       },
       ...buildChatCompletionMessages(ensureToolPairing(conversation.getMessages()))
     ];
-    const tools = toolSchemas.map((ts) => ({
-      // name: ts.name,
-      // description: ts.description,
-      type: "function",
-      function: {
-        name: ts.name,
-        description: ts.description,
-        parameters: ts.input_schema,
-        strict: ts.strict ?? false
-      }
-    }));
+    const tools = toolSchemas.map(toOpenAICompatTool);
     const effort = toReasoningEffort(this.getThinkingLevel(), this.config);
     const params = {
       model: this.model,