openzoo 0.48.92 → 0.48.94

package/lib/grokui.mjs

@@ -221,10 +221,12 @@ subtasks), you may instead reply with EXACTLY one line, no prose, using one of:
                                                      independent agent and give it a task
   SEND: <name> | <message>                          message an agent thread that already
                                                      exists (yours or one you spawned)
-  PING: <name>                                       one-line status: still working, or
-                                                       its last result
+  PING: <name>                                       wake that agent to take a turn now
+                                                       (* / all / everyone = the whole project).
+                                                       You get back "pinged, working" — that is
+                                                       an ack, not the child's result
   PEEK: <name>                                       a fuller look — its last few messages,
-                                                       not just the latest one
+                                                       not just the latest one. Read-only.
 You are given the result before your next line, so none of these block you — check back
 later if it's still working.
 
@@ -500,7 +502,7 @@ spawn/delegate/create agents AND no other bot has already done it this round, re
 EXACTLY one line, no prose, using one of:
   SPAWN: <short name> | <task for the new agent>   create a new thread with its own agent
   SEND: <name> | <message>                          message an existing agent thread
-  PING: <name>                                       one-line status, or its last result
+  PING: <name>                                       wake that agent (* / all = the project)
   PEEK: <name>                                       a fuller look at its last few messages
 
 You ALSO have real (sandboxed) filesystem access, scoped to THIS group's own directory —
@@ -661,6 +663,32 @@ const NUDGE = 'That reply announced work instead of doing it — no directive li
 const AUTO_CONTINUE = 'AUTO is still on — do not stop and do not ask the user to type continue. '
   + 'Emit the next directive now (RUN:/SPAWN:/SEND:/READ:/WRITE:/GLOB:/FETCH:/MCP:/SERVE:), '
   + 'or DONE: if the job is actually finished.';
+// PING used to be a read: last-line status, no turn. Idle children stayed idle
+// while the parent treated the dump as evidence they had acted. A ping is a
+// wake — the same harness continue AUTO already uses, unless a custom message
+// was given. Thinking threads are left alone; pendingRun stays on the human.
+let runTurnOverride = null;
+function setRunTurnForTest(fn) {
+  runTurnOverride = typeof fn === 'function' ? fn : null;
+}
+function kickTurn(threadId, userText, onEvent, images) {
+  return (runTurnOverride || runTurn)(threadId, userText, onEvent, images);
+}
+function pingWakeText(extra) {
+  const msg = String(extra || '').trim();
+  // A restated spawn brief is not a nudge. MEASURED live: existing-SPAWN
+  // wrapped children in childKickoff({fresh:false}) → "CONTEXT REFRESH —
+  // you already exist" and they thought, then refused to redo the job.
+  if (!msg || /CONTEXT REFRESH|--- your specific job ---|ROOT ASK —/.test(msg)) return AUTO_CONTINUE;
+  return msg;
+}
+function pingCanWake(x) {
+  return Boolean(x) && !x.pendingRun && x.status !== 'thinking';
+}
+function wakeOnPing(x, extra) {
+  // Never childKickoff. Ping is a short continue, not a first-day re-brief.
+  kickTurn(x.id, pingWakeText(extra)).catch(() => {});
+}
 // Ceiling on subagents per thread. Spawning is fire-and-forget and each child
 // can spawn too, so without a count it is unbounded — MEASURED as 15+ threads
 // all named tetris-contract, every one of them a live agent making paid calls.
@@ -927,7 +955,7 @@ const SLASH_COMMANDS = [
   { name: '/memory', args: '[text|clear]', help: 'facts injected into every turn' },
   { name: '/sessions', args: '', help: 'list all threads' },
   { name: '/all', args: '<message>', help: 'send a message to every bot in this project' },
-  { name: '/ping', args: '', help: 'status of every bot in this project' },
+  { name: '/ping', args: '', help: 'wake idle bots below you to take a turn now' },
   { name: '/cron', args: '<mins> | <message>', help: 'repeat a message on a timer' },
   { name: '/crons', args: '', help: 'list timers  (/cron del <id> removes one)' },
   { name: '/dir', args: '<path>', help: 'set this thread’s working directory' },
@@ -1037,7 +1065,8 @@ async function handleSlash(task, t) {
       + '  SPAWN: <name> | <task>              a NEW subagent (names are unique —\n'
       + '                                      spawning an existing one sends to it)\n'
       + '  SEND: <name> | <msg>                more work for an EXISTING subagent\n'
-      + '  PING / PEEK                         reach or inspect another bot\n\n'
+      + '  PING: <name>                        wake that bot (* wakes the project)\n'
+      + '  PEEK: <name>                        read-only look at another bot\n\n'
       + 'READ, LS, GLOB, GREP, FETCH, PEEK and MCP run CONCURRENTLY when several\n'
       + 'appear in one reply — four files cost one round trip, not four.';
   }
@@ -1210,19 +1239,26 @@ async function handleSlash(task, t) {
     return `Sent down your branch to ${crew.length} bot(s): ${crew.map((x) => x.name).join(', ')}`;
   }
 
-  // Read the room without spending anything: who is working, who is blocked on
-  // an approval, what each said last.
+  // Wake the room. Used to be a free last-line dump — idle children stayed
+  // idle, and a parent reading "kid: <old reply>" thought they had acted.
+  // Empty extra is a nudge (AUTO_CONTINUE), not a cancel. Thinking stays
+  // thinking; pendingRun stays on the human. Same branch scope as /all.
   if (cmd === 'ping') {
-    // Same scoping as /all: your branch, not the whole project.
     const crew = subtreeOf(t.id, true);
     if (crew.length < 2) return 'You have no subagents yet.';
     return crew.map((x) => {
       const mark = x.id === t.id ? ' (here)' : '';
-      const last = x.history[x.history.length - 1];
-      return x.pendingRun ? `  ${x.name}${mark}: BLOCKED — waiting for your approval`
-        : x.status === 'thinking' ? `  ${x.name}${mark}: working`
-        : last ? `  ${x.name}${mark}: ${String(last.text).replace(/\s+/g, ' ').slice(0, 90)}`
-        : `  ${x.name}${mark}: nothing yet`;
+      if (x.id === t.id) {
+        const last = x.history[x.history.length - 1];
+        return x.pendingRun ? `  ${x.name}${mark}: BLOCKED — waiting for your approval`
+          : x.status === 'thinking' ? `  ${x.name}${mark}: working`
+          : last ? `  ${x.name}${mark}: ${String(last.text).replace(/\s+/g, ' ').slice(0, 90)}`
+          : `  ${x.name}${mark}: nothing yet`;
+      }
+      if (x.pendingRun) return `  ${x.name}${mark}: BLOCKED — waiting for your approval`;
+      if (x.status === 'thinking') return `  ${x.name}${mark}: working`;
+      wakeOnPing(x, arg);
+      return `  ${x.name}${mark}: pinged, working`;
     }).join('\n');
   }
 
@@ -1767,14 +1803,15 @@ async function tryDirective(reply, originId, onEvent) {
     const notes = [];
     for (const { name, task } of parsed) {
       const existing = findByName(name);
-      if (existing) { notes.push(`${name} already exists — sending it the task.`); made.push({ t: existing, task, fresh: false }); continue; }
+      if (existing) { notes.push(`${name} already exists — woke it to keep working.`); made.push({ t: existing, task, fresh: false }); continue; }
       const siblings = [...threads.values()].filter((x) => x.parent === originId).length;
       if (siblings >= SPAWN_MAX_CHILDREN) { notes.push(`Not spawning "${name}": already at ${SPAWN_MAX_CHILDREN} subagents.`); continue; }
       made.push({ t: newThread(name, originId), task, fresh: true });
     }
     // Every thread now exists, so spawnPosition sees the COMPLETE cohort.
     for (const { t: sub, task, fresh } of made) {
-      runTurn(sub.id, childKickoff(parent, sub.name, task, { fresh })).catch(() => {});
+      if (fresh) runTurn(sub.id, childKickoff(parent, sub.name, task, { fresh })).catch(() => {});
+      else wakeOnPing(sub);
     }
     const fresh = made.filter((m) => m.fresh).map((m) => m.t.name);
     return [fresh.length ? `Spawned ${fresh.length} together (they can each see the full crew): ${fresh.join(', ')}` : '', ...notes]
@@ -1793,8 +1830,11 @@ async function tryDirective(reply, originId, onEvent) {
     // is what SEND already does.
     const existing = findByName(name);
     if (existing) {
-      runTurn(existing.id, childKickoff(threads.get(originId), existing.name, task, { fresh: false })).catch(() => {});
-      return `${name} already exists — sent it the task instead of spawning a duplicate.`;
+      // Repeat SPAWN is a wake, not a CONTEXT REFRESH. childKickoff({fresh:false})
+      // restates the original job and tells the child it already exists — MEASURED,
+      // the crew flipped to that preview, thought once, and sat.
+      wakeOnPing(existing);
+      return `${name} already exists — woke it to keep working.`;
     }
     // Storm guard. Fire-and-forget spawning is unbounded by construction: each
     // child can spawn, and nothing above it is counting.
@@ -1861,27 +1901,29 @@ async function tryDirective(reply, originId, onEvent) {
   const ping = pingAll.length === 1 ? [null, pingAll[0]] : null;
   if (ping) {
     const name = ping[1].trim();
-    // PING: * (or 'all' / 'project') reaches EVERY bot in this project.
+    // PING: * (or 'all' / 'project') WAKES every other bot in this project.
     // Coordinating a spawn tree by naming siblings one at a time is a chore
     // the parent should not have to do, and it cannot know who else exists.
+    // The return is an ack ("pinged, working"), not a last-line dump that
+    // lets the parent think the child already acted.
     if (/^(\*|all|project|everyone)$/i.test(name)) {
       const me = threads.get(originId);
       const root = me ? rootOf(me).rootId : null;
       const crew = [...threads.values()].filter((x) => x.id !== originId && rootOf(x).rootId === root);
       if (!crew.length) return 'No other bots in this project yet.';
       return crew.map((x) => {
-        const last = x.history[x.history.length - 1];
-        return x.pendingRun ? x.name + ': BLOCKED — waiting for approval'
-          : x.status === 'thinking' ? x.name + ': still working'
-          : last ? x.name + ': ' + String(last.text).slice(0, 200)
-          : x.name + ': no reply yet';
+        if (x.pendingRun) return x.name + ': BLOCKED — waiting for approval';
+        if (x.status === 'thinking') return x.name + ': still working';
+        wakeOnPing(x);
+        return x.name + ': pinged, working';
       }).join('\n');
     }
     const target = findByName(name);
-    const last = target?.history[target.history.length - 1];
-    return !target ? `No thread named "${name}".`
-      : target.status === 'thinking' ? `${name} is still working.`
-      : last ? `${name}: ${last.text}` : `${name} hasn't replied yet.`;
+    if (!target) return `No thread named "${name}".`;
+    if (target.pendingRun) return `${name}: BLOCKED — waiting for approval`;
+    if (target.status === 'thinking') return `${name} is still working.`;
+    wakeOnPing(target);
+    return `${name}: pinged, working`;
   }
   const peek = /^[ \t>*-]*PEEK:\s*(.+)/m.exec(reply);
   if (peek) {
@@ -3121,12 +3163,9 @@ const APP_HTML = `<!doctype html>
   </div>
   <div id="walletOverlay" data-component="wallet-modal">
     <div id="walletBox">
-      <h3>Your wallet</h3>
-      <div class="wsub">Two ways to pay, side by side. Wallet/x402 stays. A card subscription sits next to it — not instead of it.</div>
-      <div class="wlanetitle">Wallet / x402</div>
-      <div class="wsub">This is <b>your</b> local burner on this machine (or this box). Keys stay in ~/.openzoo/wallet.json. It is not openzoo’s wallet, not a shared zoo account, not the model’s. You fund these deposit addresses; the app pays x402 per call from this wallet. Public addresses only — the UI never shows the key.</div>
-      <div id="walletBody">loading…</div>
-      <div class="wlane" id="subLane" data-component="subscribe-lane">
+      <h3>Pay with a card</h3>
+      <div class="wsub">Pay with a card. Basic, Pro, and Ultra are first. Wallet/x402 is the other option below — it stays; it is not the lead.</div>
+      <div id="subLane" data-component="subscribe-lane">
         <div class="wlanetitle">Subscribe with a card</div>
         <div class="wtag">Subscription key · no x402</div>
         <div class="wsub">Same plans as the public page. Checkout opens in the system browser — never an in-app Stripe window. After Stripe, this app polls the site’s key endpoint with the checkout session, or you paste the key from the success page.</div>
@@ -3142,6 +3181,11 @@ const APP_HTML = `<!doctype html>
         <div class="wnote" id="subNote"></div>
         <div class="wquiet"><a id="subPageLink" href="${SUBSCRIPTIONS_PAGE}" target="_blank" rel="noopener">Full subscriptions page</a></div>
       </div>
+      <div class="wlane" id="x402Lane" data-component="x402-lane">
+        <div class="wlanetitle">Wallet / x402</div>
+        <div class="wsub">This is <b>your</b> local burner on this machine (or this box). Keys stay in ~/.openzoo/wallet.json. It is not openzoo’s wallet, not a shared zoo account, not the model’s. You fund these deposit addresses; the app pays x402 per call from this wallet. Public addresses only — the UI never shows the key.</div>
+        <div id="walletBody">loading…</div>
+      </div>
     </div>
   </div>
   <div id="main">
@@ -3176,7 +3220,7 @@ const APP_HTML = `<!doctype html>
         </optgroup>
       </select>
       <button class="dial" id="walletBtn" data-component="wallet-open"
-              title="Wallet/x402 or subscribe with a card — deposit addresses, live balances, Stripe plans">wallet</button>
+              title="Pay with a card, or use wallet/x402">pay</button>
       <button class="icon-btn" id="reloadBtn" title="Restart grokui on this box">&#8635;</button>
       <button class="icon-btn" id="hudBtn">◎</button>
       </div>
@@ -3486,7 +3530,7 @@ const APP_HTML = `<!doctype html>
         // subagents without retyping — and pressing it addressed the WHOLE
         // project, cousins included. Now every thread with descendants gets
         // one, scoped to its own branch.
-        (t.kids ? '<button class="pingall trow-ping" data-testid="ping-all" title="Message all '
+        (t.kids ? '<button class="pingall trow-ping" data-testid="ping-all" title="Wake all '
           + t.kids + ' bot(s) below ' + escapeHtml(t.name) + '">\u21f2 ' + t.kids + '</button>' : '') +
         '<button class="tclose" title="Remove">✕</button>';
       row.addEventListener('click', () => {
@@ -3501,18 +3545,17 @@ const APP_HTML = `<!doctype html>
       if (pingBtn) {
         pingBtn.addEventListener('click', async (e) => {
           e.stopPropagation();
-          const msg = prompt('Send to all ' + t.kids + ' bot(s) below ' + t.name + ':');
-          // Empty is a cancel — sending "" would spend a paid turn on every
-          // bot in the branch for nothing.
-          if (msg === null || !msg.trim()) return;
+          // Default click = wake with the harness continue. window.prompt is
+          // missing or blocked in Electron, so a modal here silently no-op'd
+          // the only UI path that tried to reach the crew. /all still sends
+          // exact text; ping is "poke them to work".
           pingBtn.disabled = true;
           const was = pingBtn.textContent;
           pingBtn.textContent = '…';
           try {
-            // Routed through THIS thread, so /all scopes to its own subtree.
             await fetch(API + '/drive', { method: 'POST', headers: { 'content-type': 'application/json' },
-              body: JSON.stringify({ threadId: t.id, task: '/all ' + msg.trim() }) });
-            pingBtn.textContent = 'sent';
+              body: JSON.stringify({ threadId: t.id, task: '/ping' }) });
+            pingBtn.textContent = 'pinged';
           } catch (err) { pingBtn.textContent = 'failed'; }
           setTimeout(() => { pingBtn.disabled = false; pingBtn.textContent = was; }, 1500);
           await loadThreads();
@@ -3623,7 +3666,7 @@ const APP_HTML = `<!doctype html>
     if (!w || (!w.solana && !w.evm && w.creditUsd == null)) {
       const p = document.createElement('div');
       p.className = 'wnote wempty';
-      p.textContent = 'Could not reach the local openzoo proxy on :8402. It may still be starting — try again in a few seconds. You can still subscribe with a card below.';
+      p.textContent = 'Could not reach the local openzoo proxy on :8402. It may still be starting — try again in a few seconds. You can still subscribe with a card above.';
       walletBody.appendChild(p);
       renderSubLane(w && w.subscription ? w.subscription : null);
       return;
@@ -3665,7 +3708,7 @@ const APP_HTML = `<!doctype html>
     note.textContent = subOn
       ? ('Wallet is optional while a subscription is active. ' + (w.funding || ''))
       : (w.funded === false
-        ? 'This wallet is EMPTY — wallet/x402 calls will fail with HTTP 402 until you fund the addresses above, or subscribe with a card below. ' + (w.funding || '')
+        ? 'This wallet is EMPTY — wallet/x402 calls will fail with HTTP 402 until you fund the addresses above, or subscribe with a card at the top. ' + (w.funding || '')
         : (w.funding || ''));
     if (w.funded === false && !subOn) note.classList.add('wempty');
     if (note.textContent.trim()) walletBody.appendChild(note);
@@ -3832,8 +3875,9 @@ const APP_HTML = `<!doctype html>
     if (e.key === 'Enter') { e.preventDefault(); savePastedSub(); }
   });
   // First launch: if the burner is empty AND there is no subscription, open
-  // the wallet once so they see addresses — and the card lane. localStorage
-  // so a funded session, a saved key, or a dismiss does not keep popping it.
+  // the pay modal once so they see card plans first — and burner addresses
+  // below. localStorage so a funded session, a saved key, or a dismiss does
+  // not keep popping it.
   (async function maybeOpenWalletOnce() {
     if (localStorage.getItem('openzoo.wallet.seen')) return;
     for (let i = 0; i < 8; i++) {
@@ -5237,4 +5281,6 @@ server.listen(PORT, BIND, () => console.log(`[grokui] http://${BIND === '0.0.0.0
 export {
   tryDirective, ensureWorkspacePort, isPreviewableRel, previewAck, workspaceFileUrl,
   parseRun, looksLikeMcpAsBash, stripThinkTags, safeResolveIn, inDir, listDir,
+  handleSlash, newThread, setRunTurnForTest, AUTO_CONTINUE, pingWakeText, pingCanWake,
+  childKickoff,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.48.92",
+  "version": "0.48.94",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun \u2014 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",