surf-cli 2.9.0 → 2.11.0

package/native/do-parser.cjs

@@ -1,250 +1,9 @@
-/**
- * Parser for surf `do` workflow commands
- * 
- * Parses newline-separated commands into structured step arrays:
- * 
- * Input:
- *   'go "https://example.com"
- *    click e5
- *    screenshot'
- * 
- * Output:
- *   [
- *     { cmd: 'navigate', args: { url: 'https://example.com' } },
- *     { cmd: 'click', args: { ref: 'e5' } },
- *     { cmd: 'screenshot', args: {} }
- *   ]
- */
-
-// Aliases mapping (matches cli.cjs)
-const ALIASES = {
-  snap: "screenshot",
-  read: "page.read",
-  find: "search",
-  go: "navigate",
-  net: "network",
-  "network.dump": "network.get",
-};
-
-// Primary argument mapping for positional args (matches cli.cjs)
-const PRIMARY_ARG_MAP = {
-  ai: "query",
-  gemini: "query",
-  chatgpt: "query",
-  perplexity: "query",
-  grok: "query",
-  navigate: "url",
-  go: "url",
-  js: "code",
-  javascript_tool: "code",
-  key: "key",
-  wait: "duration",
-  health: "url",
-  new_tab: "url",
-  "tab.new": "url",
-  switch_tab: "tab_id",
-  "tab.switch": "id",
-  close_tab: "tab_id",
-  "tab.close": "id",
-  "tab.name": "name",
-  "tab.unname": "name",
-  scroll_to_position: "position",
-  type: "text",
-  smart_type: "text",
-  "emulate.network": "preset",
-  "emulate.cpu": "rate",
-  search: "term",
-  find: "term",
-  "wait.element": "selector",
-  "wait.url": "pattern",
-  zoom: "level",
-  "history.search": "query",
-  "network.get": "id",
-  "network.body": "id",
-  "network.curl": "id",
-  "network.path": "id",
-  "window.new": "url",
-  "window.focus": "id",
-  "window.close": "id",
-  "locate.role": "role",
-  "locate.text": "text",
-  "locate.label": "label",
-  "emulate.device": "device",
-  "frame.js": "code",
-  "element.styles": "selector",
-  "select": "selector",
-};
-
-/**
- * Tokenize a command line, respecting single and double quotes
- * @param {string} line - Single line to tokenize
- * @returns {string[]} - Array of tokens
- */
-function tokenize(line) {
-  const tokens = [];
-  let current = '';
-  let inQuote = null;
-  
-  for (let i = 0; i < line.length; i++) {
-    const ch = line[i];
-    
-    if (inQuote) {
-      if (ch === inQuote) {
-        // End of quoted string
-        inQuote = null;
-      } else {
-        current += ch;
-      }
-    } else if (ch === '"' || ch === "'") {
-      // Start of quoted string
-      inQuote = ch;
-    } else if (ch === ' ' || ch === '\t') {
-      // Whitespace separator
-      if (current) {
-        tokens.push(current);
-        current = '';
-      }
-    } else {
-      current += ch;
-    }
-  }
-  
-  // Don't forget last token
-  if (current) {
-    tokens.push(current);
-  }
-  
-  return tokens;
-}
-
-/**
- * Parse a single command line into a step object
- * @param {string} line - Single command line
- * @returns {{ cmd: string, args: object } | null}
- */
-function parseCommandLine(line) {
-  const tokens = tokenize(line);
-  if (tokens.length === 0) return null;
-  
-  // Get command and apply alias
-  let cmd = tokens[0];
-  cmd = ALIASES[cmd] || cmd;
-  
-  const args = {};
-  let i = 1;
-  
-  // Handle first positional argument based on command type
-  if (i < tokens.length && !tokens[i].startsWith('--')) {
-    const firstArg = tokens[i];
-    
-    // Special handling for click command
-    if (cmd === 'click') {
-      if (/^e\d+$/.test(firstArg)) {
-        // Element reference: e5 -> ref
-        args.ref = firstArg;
-        i++;
-      } else if (/^\d+$/.test(firstArg) && tokens[i + 1] && /^\d+$/.test(tokens[i + 1])) {
-        // Coordinates: 100 200 -> x, y
-        args.x = parseInt(firstArg, 10);
-        args.y = parseInt(tokens[i + 1], 10);
-        i += 2;
-      }
-    } else if (cmd === 'select') {
-      // Select takes selector + one or more values: select e5 "US" or select e5 "opt1" "opt2"
-      args.selector = firstArg;
-      i++;
-      // Collect remaining positional args as values
-      const values = [];
-      while (i < tokens.length && !tokens[i].startsWith('--')) {
-        values.push(tokens[i]);
-        i++;
-      }
-      // Host expects 'values' (always), matching CLI behavior
-      if (values.length === 1) {
-        args.values = values[0];  // Single value as string (host will wrap in array)
-      } else if (values.length > 1) {
-        args.values = values;     // Multiple values as array
-      }
-    } else if (cmd === 'scroll') {
-      if (firstArg === 'top' || firstArg === 'bottom') {
-        cmd = `scroll.${firstArg}`;
-        i++;
-      } else if (['up', 'down', 'left', 'right'].includes(firstArg)) {
-        args.direction = firstArg;
-        i++;
-        if (i < tokens.length && /^-?\d+$/.test(tokens[i])) {
-          args.scroll_pixels = parseInt(tokens[i], 10);
-          i++;
-        }
-      }
-    } else {
-      // Use PRIMARY_ARG_MAP for other commands
-      const primaryKey = PRIMARY_ARG_MAP[cmd];
-      if (primaryKey) {
-        args[primaryKey] = firstArg;
-        i++;
-      }
-    }
-  }
-  
-  // Parse --flag value pairs
-  while (i < tokens.length) {
-    const token = tokens[i];
-    if (token.startsWith('--')) {
-      const key = token.slice(2);
-      const next = tokens[i + 1];
-      if (next && !next.startsWith('--')) {
-        // Flag with value
-        let val = next;
-        // Type coercion
-        if (val === "true") val = true;
-        else if (val === "false") val = false;
-        else if (/^-?\d+$/.test(val)) val = parseInt(val, 10);
-        else if (/^-?\d+\.\d+$/.test(val)) val = parseFloat(val);
-        args[key] = val;
-        i += 2;
-      } else {
-        // Boolean flag
-        args[key] = true;
-        i++;
-      }
-    } else {
-      // Skip unrecognized positional (shouldn't happen normally)
-      i++;
-    }
-  }
-  
-  return { cmd, args };
-}
-
-/**
- * Parse a workflow string into step array
- * Supports pipe-separated (inline) or newline-separated (file) commands
- * @param {string} input - Workflow string
- * @returns {Array<{ cmd: string, args: object }>}
- */
-function parseDoCommands(input) {
-  // Determine separator: use pipe if present, otherwise newlines
-  // Pipe is preferred for inline: 'go "url" | click e5 | screenshot'
-  // Newlines for files or heredocs
-  const hasPipe = input.includes('|');
-  const separator = hasPipe ? '|' : '\n';
-  
-  // Also handle literal \n for backwards compatibility
-  const normalized = hasPipe ? input : input.replace(/\\n/g, '\n');
-  
-  return normalized
-    .split(separator)
-    .map(line => line.trim())
-    .filter(line => line && !line.startsWith('#'))
-    .map(line => parseCommandLine(line))
-    .filter(step => step !== null);
-}
-
-module.exports = { 
-  parseDoCommands, 
-  parseCommandLine, 
-  tokenize,
-  ALIASES,
-  PRIMARY_ARG_MAP
+const definition = require("./workflow-definition.cjs");
+
+module.exports = {
+  ALIASES: definition.ALIASES,
+  PRIMARY_ARG_MAP: definition.PRIMARY_ARG_MAP,
+  parseCommandLine: definition.parseCommandLine,
+  parseDoCommands: definition.parseDoCommands,
+  tokenize: definition.tokenize,
 };

package/native/host-helpers.cjs

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const networkFormatters = require("./formatters/network.cjs");
-const networkStore = require("./network-store.cjs");
 
 function buildProviderUploadMessage(provider, tabId, filePaths, id) {
   const normalizedProvider = String(provider || "").toLowerCase();
@@ -14,6 +13,21 @@ function normalizeModelString(model) {
   return String(model || "").trim().toLowerCase();
 }
 
+function formatToolError(error) {
+  const message = error instanceof Error
+    ? error.message
+    : typeof error === "string"
+      ? error
+      : error?.message || String(error);
+  const result = { content: [{ type: "text", text: message }] };
+  if (error && typeof error === "object") {
+    result.message = message;
+    if (typeof error.code === "string") result.code = error.code;
+    if (typeof error.jobId === "string") result.jobId = error.jobId;
+  }
+  return result;
+}
+
 /**
  * Format tool result content for MCP response
  * @param {*} result - The result object from the extension
@@ -123,19 +137,6 @@ function formatToolContent(result, log = () => {}, options = {}) {
   // Handle both requests (basic) and entries (full) formats
   const items = result.requests || result.entries;
   if (items && Array.isArray(items)) {
-    // Persist entries with full data to disk
-    if (result.entries && items.length > 0) {
-      (async () => {
-        for (const entry of items) {
-          try {
-            await networkStore.appendEntry(entry);
-          } catch (err) {
-            log(`Failed to persist network entry: ${err.message}`);
-          }
-        }
-      })();
-    }
-    
     if (items.length === 0) {
       return text("No network requests captured");
     }
@@ -679,6 +680,9 @@ function mapToolToMessage(tool, args, tabId) {
         limit: a.limit || a.last,
         format: a.format,
         verbose: a.v ? 1 : (a.vv ? 2 : 0),
+        bodyMode: a["body-mode"] || a.bodyMode,
+        perBodyBytes: a["per-body-bytes"] || a.perBodyBytes,
+        totalBodyBytes: a["total-body-bytes"] || a.totalBodyBytes,
         ...baseMsg 
       };
 
@@ -732,6 +736,9 @@ function mapToolToMessage(tool, args, tabId) {
         type: "EXPORT_NETWORK_REQUESTS",
         har: a.har,
         jsonl: a.jsonl,
+        bodyMode: a["body-mode"] || a.bodyMode,
+        perBodyBytes: a["per-body-bytes"] || a.perBodyBytes,
+        totalBodyBytes: a["total-body-bytes"] || a.totalBodyBytes,
         ...baseMsg 
       };
 
@@ -1090,6 +1097,16 @@ function mapToolToMessage(tool, args, tabId) {
     case "history.search":
       if (!a.query) throw new Error("query required");
       return { type: "HISTORY_SEARCH", query: a.query, limit: a.limit !== undefined ? parseInt(a.limit, 10) : 20 };
+    case "oracle.ask":
+      if (!a.prompt) throw new Error("prompt required");
+      return { ...a, type: "ORACLE_ASK" };
+    case "oracle.status":
+      return { ...a, type: "ORACLE_STATUS" };
+    case "oracle.result":
+      if (!a.id) throw new Error("id required");
+      return { ...a, type: "ORACLE_RESULT" };
+    case "oracle.list":
+      return { type: "ORACLE_LIST" };
     case "chatgpt":
       if (!a.query) throw new Error("query required");
       return { 
@@ -1204,4 +1221,4 @@ function mapToolToMessage(tool, args, tabId) {
   }
 }
 
-module.exports = { mapToolToMessage, mapComputerAction, formatToolContent, buildProviderUploadMessage };
+module.exports = { mapToolToMessage, mapComputerAction, formatToolContent, formatToolError, buildProviderUploadMessage };

package/native/host-sessions.cjs

@@ -23,13 +23,18 @@ const PROVIDER_DEFAULT_TIMEOUT_SECONDS = {
   gemini: 300,
   grok: 300,
   perplexity: 120,
+  "oracle.result": 300,
+  "playbook.run": 600,
 };
 
 function resolveRequestDeadlineMs(tool, args = {}) {
   const defaultSeconds = PROVIDER_DEFAULT_TIMEOUT_SECONDS[tool];
   if (defaultSeconds === undefined) return DEFAULT_DEADLINE_MS;
+  const rawTimeout = tool === "playbook.run" && args && typeof args === "object" && !Array.isArray(args)
+    ? args.timeout ?? args.args?.timeout
+    : args?.timeout;
   const requestedSeconds = Number(
-    args && typeof args === "object" && !Array.isArray(args) ? args.timeout : undefined,
+    rawTimeout,
   );
   const seconds = Number.isFinite(requestedSeconds) && requestedSeconds > 0
     ? requestedSeconds