zames_pro 2.7.0 → 2.9.0

package/dist/xml-toolcall.js

@@ -13,6 +13,71 @@ function readAttr(attrs, name) {
     const m = attrs.match(re);
     return m ? m[2] : null;
 }
+// The model sometimes produces a "hybrid" call: the tool name is an attribute
+// AND the arguments are inline JSON in the SAME opening tag, without any
+// <parameter> children. A real case from the transcript:
+//   <|DSML|invoke name="GitAdd", "args" {"paths": "AGENTS.md src/index.ts"}>
+// The standard <parameter> parser misses it, and the call is silently lost
+// (the agent then stalls). Here we look for the first JSON object inside the
+// attributes/body and parse it as args.
+function parseInlineJsonArgs(s) {
+    const Q = String.fromCharCode(34);
+    // Find a plausible start of a JSON object: `{` or `"args" {`/`'args' {`.
+    const startRe = /\{|["']args["']\s*[:=]?\s*\{/i;
+    const m = startRe.exec(s);
+    if (!m)
+        return null;
+    const from = m.index;
+    // Scan for a balanced {...} block (string-aware) and try to parse it.
+    let depth = 0;
+    let inStr = false;
+    let esc = false;
+    let end = -1;
+    for (let i = from; i < s.length; i++) {
+        const c = s[i];
+        if (esc) {
+            esc = false;
+            continue;
+        }
+        if (c === '\\') {
+            esc = true;
+            continue;
+        }
+        if (c === Q) {
+            inStr = !inStr;
+            continue;
+        }
+        if (inStr)
+            continue;
+        if (c === '{')
+            depth++;
+        else if (c === '}') {
+            depth--;
+            if (depth === 0) {
+                end = i + 1;
+                break;
+            }
+        }
+    }
+    if (end === -1)
+        return null;
+    let frag = s.slice(from, end).trim();
+    // Drop a leading `"args" {` / `'args' {` / `args = {` prefix so only the
+    // object itself is left.
+    const lead = /^["']?args["']?\s*[:=]?\s*/.exec(frag);
+    if (lead)
+        frag = frag.slice(lead[0].length);
+    for (const candidate of [frag, frag.replace(/'/g, Q)]) {
+        try {
+            const parsed = JSON.parse(candidate);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                return parsed;
+            }
+        }
+        catch { }
+    }
+    return null;
+}
 // Extracts parameters from an <invoke> body. The opening and closing tags may
 // carry an arbitrary prefix (DSML, etc.), and some models confuse tag pairs
 // (<parameter …> … </|DSML| parameter>). The regex below matches any pair
@@ -57,6 +122,16 @@ export function parseXmlToolCalls(text) {
         const closeMatch = closeRe.exec(rest);
         const body = closeMatch ? rest.slice(0, closeMatch.index) : rest;
         const args = parseParameters(body);
+        // Hybrid form: the arguments are inline JSON in the SAME invoke tag
+        // (e.g. `<|DSML|invoke name="GitAdd", "args" {"paths": "..."}>`), with no
+        // <parameter> children. Fall back to the raw invoke head + body.
+        if (Object.keys(args).length === 0) {
+            const inline = parseInlineJsonArgs(m[0] + body);
+            if (inline) {
+                calls.push({ tool: name, args: inline });
+                continue;
+            }
+        }
         // Some models put the whole JSON arguments object into a single
         // parameter named args. We unwrap it so there's no
         // {args: {args: {...}}}.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zames_pro",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "description": "Terminal coding agent over chat.deepseek.com via Playwright",
   "type": "module",
   "bin": {

package/scripts/postinstall.mjs

@@ -1,67 +1,94 @@
-// Automatically install the Chromium build and system dependencies
-// that Playwright needs.
-//
-// Runs when the zames package is installed so the user does not have to run
-// "npx playwright install chromium" / "install-deps chromium" by hand.
-//
-// On Linux (including WSL) the browser binary also needs system libraries.
-// They are installed via "install-deps", which requires root (sudo).
-// If we are not root and sudo is not passwordless, we skip it and tell the
-// user the exact command to run.
-//
-// Install failure is NOT fatal: without network access (or in CI) the
-// package install must still succeed.
-
 import { spawnSync } from 'node:child_process'
 
+const NL = String.fromCharCode(10)
 const isWin = process.platform === 'win32'
+const isMac = process.platform === 'darwin'
+const isLinux = process.platform === 'linux'
+
+function run(cmd, args, opts) {
+ return spawnSync(cmd, args, Object.assign({ stdio: 'inherit', shell: isWin }, opts || {}))
+}
 
-// npm puts node_modules/.bin on PATH for lifecycle scripts, so the local
-// playwright CLI is resolvable. On Windows npm runs scripts through cmd.exe,
-// so shell: true is needed for the .cmd shim to be found.
-function run(cmd, args) {
-  return spawnSync(cmd, args, {
-    stdio: 'inherit',
-    shell: isWin,
-  })
+function has(cmd) {
+ if (isWin) {
+ const r = spawnSync('where', [cmd], { stdio: 'ignore' })
+ return !r.error && r.status === 0
+ }
+ const r = spawnSync('sh', ['-c', 'command -v "$1"', 'sh', cmd], { stdio: 'ignore' })
+ return !r.error && r.status === 0
+}
+
+function isRoot() {
+ return typeof process.getuid === 'function' && process.getuid() === 0
 }
 
 function canSudo() {
-  // Already root? No sudo needed.
-  if (typeof process.getuid === 'function' && process.getuid() === 0) return true
-  // Passwordless sudo (common in WSL / CI images).
-  const r = run('sudo', ['-n', 'true'])
-  return !r.error && r.status === 0
+ if (isRoot()) return true
+ const r = spawnSync('sudo', ['-n', 'true'], { stdio: 'ignore' })
+ return !r.error && r.status === 0
+}
+
+const MANAGERS = [
+ { bin: 'apt-get', args: (p) => ['install', '-y', p], update: ['update'] },
+ { bin: 'dnf', args: (p) => ['install', '-y', p] },
+ { bin: 'yum', args: (p) => ['install', '-y', p] },
+ { bin: 'pacman', args: (p) => ['-S', '--noconfirm', p] },
+ { bin: 'zypper', args: (p) => ['install', '-y', p] },
+ { bin: 'apk', args: (p) => ['add', p] },
+]
+
+function asRoot(cmd, args) {
+ if (isRoot()) return run(cmd, args)
+ return run('sudo', [cmd].concat(args))
+}
+
+function installPackages(pkgs) {
+ const mgr = MANAGERS.find((m) => has(m.bin))
+ if (!mgr) return false
+ if (mgr.update) asRoot(mgr.bin, mgr.update)
+ let any = false
+ for (const p of pkgs) {
+ const r = asRoot(mgr.bin, mgr.args(p))
+ if (!r.error && r.status === 0) any = true
+ }
+ return any
 }
 
-// 1) Browser binary for this Playwright version.
 const browser = run('playwright', ['install', 'chromium'])
 if (browser.error || browser.status !== 0) {
-  console.warn(
-    '\nzames: could not install Chromium for Playwright automatically.\n' +
-      '   Run it manually: npx playwright install chromium\n',
-  )
-  process.exit(0)
+ console.warn(NL + 'zames: could not install Chromium for Playwright automatically.' + NL +
+ ' Run it manually: npx playwright install chromium' + NL)
+ process.exit(0)
+}
+
+if (isLinux) {
+ if (canSudo()) {
+ const deps = run('playwright', ['install-deps', 'chromium'])
+ if (deps.error || deps.status !== 0) {
+ console.warn(NL + 'zames: could not install Chromium system dependencies automatically.' + NL +
+ ' Run it manually: sudo npx playwright install-deps chromium' + NL)
+ }
+ } else {
+ console.warn(NL + 'zames: on Linux/WSL Chromium needs system libraries (sudo required).' + NL +
+ ' Run it once manually: sudo npx playwright install-deps chromium' + NL)
+ }
 }
 
-// 2) System libraries (Linux / WSL only). Without them Chromium fails
-// to launch with "error while loading shared libraries".
-if (!isWin) {
-  if (canSudo()) {
-    const deps = run('playwright', ['install-deps', 'chromium'])
-    if (deps.error || deps.status !== 0) {
-      console.warn(
-        '\nzames: could not install Chromium system dependencies automatically.\n' +
-          '   Run it manually: sudo npx playwright install-deps chromium\n',
-      )
-    }
-  } else {
-    console.warn(
-      '\nzames: on Linux/WSL Chromium needs system libraries (sudo required).\n' +
-        '   Run it once manually: sudo npx playwright install-deps chromium\n',
-    )
-  }
+if (isLinux) {
+ const haveXclip = has('xclip') || has('xsel')
+ const haveWayland = has('wl-paste')
+ if (!haveXclip || !haveWayland) {
+ if (!canSudo()) {
+ console.warn(NL + 'zames: pasting images from the clipboard needs a clipboard tool.' + NL +
+ ' Install one (root required), e.g.:' + NL +
+ ' sudo apt install xclip # X11 (Debian/Ubuntu)' + NL +
+ ' sudo apt install wl-clipboard # Wayland' + NL +
+ ' Without it, paste a file path or use the attach button in the browser.' + NL)
+ } else if (!installPackages(['xclip', 'wl-clipboard'])) {
+ console.warn(NL + 'zames: could not install a clipboard tool automatically.' + NL +
+ ' Install xclip (X11) or wl-clipboard (Wayland) manually.' + NL)
+ }
+ }
 }
 
-// Never fail the package install because of a browser download.
 process.exit(0)