openzoo 0.50.67 → 0.50.69

package/lib/cursorbackend.js

@@ -1836,9 +1836,12 @@ const MODEL_ALIASES = {
   opus: 'anthropic/claude-opus-5',
   'opus-5': 'anthropic/claude-opus-5',
   sonnet: 'anthropic/claude-sonnet-5',
-  grok: 'x-ai/grok-4.6',
-  'grok-4': 'x-ai/grok-4.6',
-  'grok-4.6': 'x-ai/grok-4.6',
+  // BARE grok-4.6 is the bazaar (x402 door) row; x-ai/grok-4.6 is OpenRouter's
+  // and drains OpenRouter credits. Every spelling lands on the bare id.
+  grok: 'grok-4.6',
+  'grok-4': 'grok-4.6',
+  'grok-4.6': 'grok-4.6',
+  'x-ai/grok-4.6': 'grok-4.6',
   glm: 'zai-org/glm-5.3-flash',
   'glm-5': 'zai-org/glm-5.3-flash',
   'glm-5.3': 'zai-org/glm-5.3-flash',
@@ -1872,10 +1875,14 @@ async function resolveModelId(raw) {
     return ids.find((id) => id === s) || ids.find((id) => id.toLowerCase() === lower) || null;
   } catch { return null; }
 }
+export function canonicalZooModel(id) {
+  const s = String(id || '').trim();
+  return MODEL_ALIASES[s.toLowerCase()] || s;
+}
 function currentModel(agentId) {
-  return agentModels.get(agentId)
+  return canonicalZooModel(agentModels.get(agentId)
     || process.env.OPENZOO_DEFAULT_MODEL
-    || DEFAULT_ZOO_MODEL;
+    || DEFAULT_ZOO_MODEL);
 }
 
 const execFileAsync = promisify(execFile);
@@ -2453,10 +2460,16 @@ export function selectedPageId(text) {
 }
 async function callBrowserForAgent(server, tool, args, agentId) {
   const pinned = pinnedPage(agentId, server);
+  if (pinned != null && tool === 'select_page' && Number(args?.pageId) !== Number(pinned)) {
+    // A pinned bot stays on its own tab. Answer with its tab, do not switch.
+    return callHostMcp(`${server}__select_page`, { pageId: pinned });
+  }
   if (pinned != null && !/^(new_page|list_pages|select_page|close_page)$/.test(tool)) {
     try { await callHostMcp(`${server}__select_page`, { pageId: pinned }); } catch { /* page gone; fall through */ }
   }
-  return callHostMcp(`${server}__${tool}`, args);
+  const out = await callHostMcp(`${server}__${tool}`, args);
+  if (tool === 'new_page') { const pid = selectedPageId(out); if (pid != null) pinPage(agentId, server, pid); }
+  return out;
 }
 async function runLocalTool(name, args, log, ctx = {}) {
   try {
@@ -2595,16 +2608,21 @@ async function runLocalTool(name, args, log, ctx = {}) {
       }
       if (name === 'x_compose') {
         const server = String(args.browser || 'chrome').toLowerCase() === 'brave' ? 'brave-devtools' : 'chrome-devtools';
-        const plan = xclaims.composePlan(args.text);
+        for (const t of ['evaluate_script', 'click_at', 'type_text', 'press_key']) {
+          if (!hostMcpHas(`${server}__${t}`)) return JSON.stringify({ ok: false, error: `${server}__${t} not attached` });
+        }
+        const probeRaw = String(await callBrowserForAgent(server, 'evaluate_script', { function: xclaims.composeProbeScript() }, ctx.agentId));
+        const probe = (() => { try { return JSON.parse(probeRaw.match(/\{[\s\S]*\}/)?.[0] || '{}'); } catch { return {}; } })();
+        if (!probe.ok) return JSON.stringify({ ok: false, error: probe.error || `composer probe failed: ${probeRaw.slice(0, 200)}` });
+        const plan = xclaims.composePlan(args.text, probe);
         let last = '';
-        for (const op of plan.ops) {
-          const tname = `${server}__${op.tool}`;
-          if (!hostMcpHas(tname)) return JSON.stringify({ ok: false, error: `${tname} not attached` });
-          last = String(await callBrowserForAgent(server, op.tool, op.args, ctx.agentId));
-          if (op.tool === 'evaluate_script' && /"ok":\s*false/.test(last)) return JSON.stringify({ ok: false, error: last.slice(0, 300) });
+        for (const op of plan.ops) last = String(await callBrowserForAgent(server, op.tool, op.args, ctx.agentId));
+        const back = (() => { try { return JSON.parse(last.match(/\{[\s\S]*\}/)?.[0] || '{}'); } catch { return {}; } })();
+        log(`cursor-backend:      x_compose ${server} lines=${plan.lines} back=${back.lines} replyEnabled=${back.replyEnabled}`);
+        if (!back.replyEnabled) {
+          return JSON.stringify({ ok: false, browser: server, error: 'typed, but X did not register it (Reply still disabled). Click the reply box yourself with a real click (find [data-testid="tweetTextarea_0"] and use click_at on its centre), then call x_compose again.', composer: back });
         }
-        log(`cursor-backend:      x_compose ${server} lines=${plan.lines}`);
-        return JSON.stringify({ ok: true, browser: server, linesTyped: plan.lines, composer: last.slice(0, 700), next: 'verify the composer text above shows separate lines, then click the Reply button' });
+        return JSON.stringify({ ok: true, browser: server, linesTyped: plan.lines, composer: back, next: 'lines are in and Reply is enabled: click the Reply button ([data-testid="tweetButtonInline"]) now' });
       }
     }
     if (hostMcpHas(name)) {

package/lib/xclaims.js

@@ -106,19 +106,27 @@ export function listClaims({ home = os.homedir(), now = Date.now() } = {}) {
 }
 
 /**
- * X's composer is a Draft-style contenteditable: one `fill` flattens every
- * newline (measured: "openzoo.fun/core" + "x402 · PAID…" fused into
- * "corex402"). Real keystrokes work: type a line, press Enter, type the next.
- * Pure planner — the host executes these against chrome-devtools / brave-devtools.
+ * X's composer is a Draft-style contenteditable. Two things measured 2026-09-01:
+ *   1. one `fill` flattens every newline ("openzoo.fun/core" + "x402 · PAID…"
+ *      fused into "corex402");
+ *   2. `el.focus()` + keyboard typing puts text in the DOM but NOT in React's
+ *      state — the Reply button stays disabled and the draft is wiped on the
+ *      next render. Only a REAL mouse click on the box initialises Draft.
+ * So: probe the box's rect, click_at its centre, type line / Enter / line,
+ * then read back both the text and whether Reply is enabled.
  */
 export const X_COMPOSER_SELECTOR = '[data-testid="tweetTextarea_0"], [data-testid="tweetTextarea_0RichTextInputContainer"] [contenteditable="true"], div[role="textbox"][contenteditable="true"]';
-export function composePlan(text) {
+export const X_REPLY_BUTTON_SELECTOR = '[data-testid="tweetButtonInline"], [data-testid="tweetButton"]';
+export const composeProbeScript = () => `() => { const el = document.querySelector(${JSON.stringify(X_COMPOSER_SELECTOR)}); if (!el) return { ok: false, error: 'no composer on this page — open the tweet and click Reply first' }; el.scrollIntoView({ block: 'center' }); const r = el.getBoundingClientRect(); return { ok: true, x: Math.round(r.left + Math.min(r.width / 2, 120)), y: Math.round(r.top + Math.min(r.height / 2, 20)), w: Math.round(r.width), h: Math.round(r.height) }; }`;
+export const composeReadbackScript = () => `() => { const el = document.querySelector(${JSON.stringify(X_COMPOSER_SELECTOR)}); const b = document.querySelector(${JSON.stringify(X_REPLY_BUTTON_SELECTOR)}); const t = el ? (el.innerText || el.textContent || '') : ''; const dis = b ? (b.disabled || b.getAttribute('aria-disabled') === 'true') : true; return { ok: !!el, lines: t.split('\\n').filter(Boolean).length, replyEnabled: !dis, text: t.slice(0, 600) }; }`;
+export function composePlan(text, rect) {
   const lines = String(text || '').replace(/\r\n?/g, '\n').split('\n');
-  const ops = [{ tool: 'evaluate_script', args: { function: `() => { const el = document.querySelector(${JSON.stringify(X_COMPOSER_SELECTOR)}); if (!el) return { ok: false, error: 'no composer on this page' }; el.focus(); return { ok: true }; }` } }];
+  const ops = [];
+  if (rect && Number.isFinite(rect.x) && Number.isFinite(rect.y)) ops.push({ tool: 'click_at', args: { x: rect.x, y: rect.y } });
   lines.forEach((line, i) => {
     if (i) ops.push({ tool: 'press_key', args: { key: 'Enter' } });
     if (line) ops.push({ tool: 'type_text', args: { text: line } });
   });
-  ops.push({ tool: 'evaluate_script', args: { function: `() => { const el = document.querySelector(${JSON.stringify(X_COMPOSER_SELECTOR)}); const t = el ? (el.innerText || el.textContent || '') : ''; return { ok: !!el, lines: t.split('\\n').filter(Boolean).length, text: t.slice(0, 600) }; }` } });
+  ops.push({ tool: 'evaluate_script', args: { function: composeReadbackScript() } });
   return { lines: lines.length, ops };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.50.67",
+  "version": "0.50.69",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",