openzoo 0.50.37 → 0.50.39

package/lib/cursorbackend.js

@@ -38,8 +38,14 @@ import tls from 'node:tls';
 import { randomUUID } from 'node:crypto';
 import { encodeAvailableModels, encodeForMethod, encodeEnsureSandBox, encodeGetGrokBotSendStatus, decodeProtoFields, unwrapConnect } from './cursorapi.js';
 import {
-  accountPodPath, accountAgentsPath, rosterForAccount,
+  accountPodPath, accountAgentsPath, rosterForAccount, rosterForEvent,
+  readHouseRoster, houseAgentsPath, shapeAgent,
 } from './grokbotAccount.js';
+import { formatSpendFooter, mergeTurnProof } from './spendProof.js';
+import { prefixVisitorRichText } from './grokbotweb.js';
+import {
+  ingestUpload, lookupUpload, readUploadChunk, readUploadImage, readUploadText,
+} from './grokbotUploads.js';
 
 const TLS_DIR = path.join(os.homedir(), '.openzoo', 'cursor-tls');
 const CURSOR_HOSTS = ['api2.cursor.sh', 'api3.cursor.sh', 'api4.cursor.sh', 'repo42.cursor.sh'];
@@ -343,31 +349,30 @@ activeAccountId = realPod?.accountId || null;
 if (activeAccountId) migrateLegacyPod(activeAccountId);
 
 function agentsPath() {
-  if (!activeAccountId) return null;
-  return accountAgentsPath(HOME, activeAccountId) || AGENTS_FILE;
+  if (!activeAccountId) return houseAgentsPath(HOME);
+  return accountAgentsPath(HOME, activeAccountId) || houseAgentsPath(HOME);
+}
+/** Cafe/web hijack: one house tray for every visitor. Electron sniff still
+ *  talks to the live 1340 so a second Cursor login stays isolated. */
+function useHouseRoster() {
+  return Boolean(process.env.OZ_HIJACK_POD) && !sniffOn();
 }
 function loadAgents() {
-  // No live account → no tray. Serving the machine-global file here is how a
-  // second household login saw the wrong chats (or none of theirs).
-  if (!activeAccountId) return null;
-  const scoped = readJsonFile(accountAgentsPath(HOME, activeAccountId));
-  if (Array.isArray(scoped)) return scoped;
-  const legacyPod = readJsonFile(POD_FILE);
-  if (legacyPod?.accountId === activeAccountId) {
-    const a = readJsonFile(AGENTS_FILE);
-    return Array.isArray(a) ? a : null;
-  }
-  return null;
+  const house = readHouseRoster(HOME, activeAccountId);
+  return house.length ? house : [];
 }
 function saveAgents(a) {
-  if (!Array.isArray(a) || !a.length || !activeAccountId) return;
-  const p = agentsPath();
-  if (p) writeJsonFile(p, a);
+  if (!Array.isArray(a)) return;
+  // Persist [] too — otherwise delete-all is a no-op and the 65 land back.
+  writeJsonFile(houseAgentsPath(HOME), a);
+  if (activeAccountId) {
+    const p = accountAgentsPath(HOME, activeAccountId);
+    if (p) writeJsonFile(p, a);
+  }
 }
 function cachedAgentList() {
   const a = loadAgents();
-  if (a?.length) return a;
-  return null;
+  return a.length ? a : null;
 }
 
 function sniffOn() { return process.env.OPENZOO_SNIFF === '1'; }
@@ -621,10 +626,10 @@ async function fetchEnsureSandBox(req, body, log) {
   try {
     const remote = await podJson('/api/listAgents', {}, log);
     if (Array.isArray(remote) && remote.length) {
-      const merged = mergeAgentLists(remote);
+      const merged = rosterForEvent(mergeAgentLists(remote), agentActivity);
       saveAgents(merged);
       const active = focusedAgentId || merged[0]?.id;
-      ssePush('agents', { agents: merged.slice(0, 80).map(stampActivity), activeAgentId: active });
+      ssePush('agents', { agents: merged, activeAgentId: active });
       log(`cursor-backend:      discovered roster n=${merged.length} account=${realPod.accountId}`);
     }
   } catch (e) {
@@ -781,23 +786,32 @@ async function proxyPodHttp(req, res, full, body, log) {
       podStale = true;
       log(`cursor-backend:      1340 ${cap.status} ${path0} — pod stale, local`);
       if (path0 === '/api/listAgents') {
+        if (useHouseRoster()) {
+          jsonSend(res, rosterForEvent(loadAgents(), agentActivity));
+          return true;
+        }
         const cached = rosterForAccount({
           liveAccountId: activeAccountId,
           cachedAccountId: activeAccountId,
           cached: loadAgents(),
+          fallback: loadAgents(),
         });
         if (cached.length) {
-          jsonSend(res, mergeAgentLists(cached));
+          jsonSend(res, rosterForEvent(mergeAgentLists(cached), agentActivity));
           return true;
         }
       }
       return false;
     }
     if (path0 === '/api/listAgents' && cap.status === 200) {
+      if (useHouseRoster()) {
+        jsonSend(res, rosterForEvent(loadAgents(), agentActivity));
+        return true;
+      }
       try {
         const parsed = JSON.parse(String(inflateBody(cap.buf, cap.respHeaders)));
         if (Array.isArray(parsed)) {
-          const merged = mergeAgentLists(parsed);
+          const merged = rosterForEvent(mergeAgentLists(parsed), agentActivity);
           saveAgents(merged);
           jsonSend(res, merged);
           log(`cursor-backend:      listAgents 200 merged n=${merged.length} account=${activeAccountId || '?'}`);
@@ -810,9 +824,10 @@ async function proxyPodHttp(req, res, full, body, log) {
         liveAccountId: activeAccountId,
         cachedAccountId: activeAccountId,
         cached: loadAgents(),
+        fallback: loadAgents(),
       });
-      if (cached.length) {
-        jsonSend(res, mergeAgentLists(cached));
+      if (cached.length || useHouseRoster()) {
+        jsonSend(res, rosterForEvent(mergeAgentLists(cached), agentActivity));
         log(`cursor-backend:      listAgents ${cap.status} — cached ${cached.length} named agents account=${activeAccountId}`);
         return true;
       }
@@ -877,6 +892,13 @@ function noteFocus(id) {
   a.unreadCount = 0;
   agentActivity.set(id, a);
 }
+function topConversationId(list) {
+  const arr = Array.isArray(list) ? list : [];
+  return focusedAgentId && arr.some((a) => a.id === focusedAgentId)
+    ? focusedAgentId
+    : (arr[0]?.id || null);
+}
+
 function stampActivity(agent) {
   const a = agentActivity.get(agent.id) || {};
   const updatedAt = a.updatedAt || agent.updatedAt || agent.createdAt || 0;
@@ -908,13 +930,23 @@ function bumpAgent(id, { preview = '', notify = true } = {}) {
   const list = cachedAgentList() || [];
   const idx = list.findIndex((x) => x.id === id);
   const base = idx >= 0 ? list[idx] : { id, name: id };
-  const agent = stampActivity({ ...base, updatedAt: now });
+  const agent = shapeAgent(stampActivity({ ...base, updatedAt: now }));
   if (idx >= 0) list[idx] = agent;
   else list.unshift(agent);
-  saveAgents(sortAgentsByActivity(list));
-  // asar handleGatewaySseEvent: channel agent-upserted → {agent, activeAgentId}
-  ssePush('agent-upserted', { agent, activeAgentId: focusedAgentId || id });
-  ssePush('agents', { agents: sortAgentsByActivity(cachedAgentList() || []).slice(0, 80).map(stampActivity), activeAgentId: focusedAgentId || id });
+  saveAgents(sortAgentsByActivity(list.map(shapeAgent)));
+  pushCreatedAgent(agent);
+}
+
+/** asar ingestAgentsEvent does Ae.agents.map — `{action:"created"}` has no
+ *  agents[] so the picker/tray throws and looks empty. ingestAgentUpserted
+ *  needs {agent, activeAgentId}. Same payload bumpAgent already sends. */
+function pushCreatedAgent(agent, { select = true } = {}) {
+  if (!agent || !agent.id) return;
+  if (select) focusedAgentId = agent.id;
+  const active = focusedAgentId || agent.id;
+  const list = rosterForEvent(cachedAgentList() || [], agentActivity);
+  ssePush('agent-upserted', { agent, activeAgentId: active });
+  ssePush('agents', { agents: list, activeAgentId: active });
 }
 
 /** Grok Bot Helper daemon: GET /local-exec/requests is SSE, POST /local-exec/responses
@@ -1086,6 +1118,7 @@ function appendLine(agentId, role, text, extra = {}) {
       timestampMs: ts,
       ...(nonce ? { clientNonce: nonce } : {}),
       requestId,
+      ...(extra.promptRaw != null ? { promptRaw: String(extra.promptRaw) } : {}),
     };
   } else {
     e = {
@@ -1095,6 +1128,7 @@ function appendLine(agentId, role, text, extra = {}) {
       message: { type: 'text', content: String(text || '') },
       timestampMs: ts,
       requestId,
+      ...(extra.author && typeof extra.author === 'object' ? { author: extra.author } : {}),
     };
   }
   t.entries.push(e);
@@ -1108,29 +1142,106 @@ function fanoutLine(primaryId, role, text, extra = {}) {
 }
 function mintLocalAgent(parsed = {}) {
   const id = String(parsed.id || randomUUID());
-  const name = String(parsed.name || parsed.title || 'new chat');
-  const agent = {
+  const prev = (cachedAgentList() || []).find((a) => a.id === id) || {};
+  const agent = shapeAgent({
+    ...prev,
+    ...parsed,
     id,
-    name,
-    description: String(parsed.description || ''),
-    title: String(parsed.title || name),
-    origin: parsed.origin || 'user',
-    createdAt: Date.now(),
+    createdAt: prev.createdAt || parsed.createdAt || Date.now(),
     updatedAt: Date.now(),
-    avatarShape: parsed.avatarShape || null,
-    avatarColor: parsed.avatarColor || null,
-    path: `/local/${id}`,
-  };
+  });
   const list = cachedAgentList() || [];
   if (!list.some((a) => a.id === id)) list.unshift(agent);
   else {
     const i = list.findIndex((a) => a.id === id);
     list[i] = { ...list[i], ...agent };
   }
-  saveAgents(list);
+  saveAgents(list.map(shapeAgent));
   agentTranscript(id);
   return agent;
 }
+function groupMemberIds(agentId) {
+  const a = (cachedAgentList() || []).find((x) => x.id === agentId);
+  if (!a?.isGroup) return [];
+  return (a.memberIds || []).map(String).filter(Boolean);
+}
+function groupMemberRecords(agentId) {
+  const roster = cachedAgentList() || [];
+  return groupMemberIds(agentId).map((mid) => {
+    const m = roster.find((x) => x.id === mid);
+    return { id: mid, name: String(m?.name || mid) };
+  });
+}
+
+export function groupReplyIsPass(text) {
+  const s = stripSpendFooter(String(text || '')).replace(/^\s*[A-Za-z0-9 _.-]{1,40}:\s*/, '').trim();
+  if (!s) return true;
+  if (/^PASS\b/i.test(s)) return true;
+  if (s.length < 20) return true;
+  return /\b(nothing (more|else) to add|i('m| am) done|that('s| is) (all|my last word)|we (are|'re) (agreed|aligned|done)|i'?ll (stop|leave it)|no further|conversation is over|natural conclusion|i pass)\b/i.test(s);
+}
+
+const GROUP_MAX_ROUNDS = Math.min(12, Math.max(2, Number(process.env.OZ_GROUP_MAX_ROUNDS || 8)));
+const GROUP_MAX_CALLS = Math.min(24, Math.max(4, Number(process.env.OZ_GROUP_MAX_CALLS || 16)));
+
+/** Members speak, then keep peek/ponging until they PASS or hit the cap. */
+async function runGroupQueue({ agentId, humanPrompt, parsed, nonce, log }) {
+  const named = groupMemberRecords(agentId);
+  if (!named.length) return false;
+  const names = named.map((m) => m.name);
+  let calls = 0;
+
+  const oneTurn = async (m, phase) => {
+    const others = names.filter((n) => n !== m.name).join(', ') || 'the group';
+    const persona = phase === 'peek'
+      ? `You are ${m.name} in a group with ${others}. Continue ping/pong with the other members using the prior turns. Do not speak as the human. Do not prefix with visitor shortnames. If the exchange has reached a natural conclusion or you have nothing to add, reply with exactly PASS and nothing else. Otherwise one short in-character turn.`
+      : `You are ${m.name} in a group with ${others}. Answer the human as yourself and leave a hook the others can ping. Do not speak as the human. Do not prefix with visitor shortnames. A few sentences.\n\nThe human said: ${humanPrompt}`;
+    let bit = '';
+    try {
+      bit = (await zooComplete(persona, log, agentId, parsed)).text;
+    } catch (e) {
+      bit = `openzoo error (${m.name}): ${e.message}`;
+      log(`cursor-backend:      group ${phase} ${m.id} failed: ${e.message}`);
+    }
+    calls += 1;
+    const pass = groupReplyIsPass(bit);
+    if (!pass) {
+      const line = fanoutLine(agentId, 'assistant', bit, {
+        clientNonce: nonce,
+        requestId: nonce,
+        author: { kind: 'agent', id: m.id, name: m.name },
+      });
+      ssePush('transcript', { ...gatewayEntry(line), agentId });
+      bumpAgent(agentId, { preview: bit, notify: true });
+      log(`cursor-backend:      group ${phase} ${m.name} seq=${line.seq}`);
+    } else {
+      log(`cursor-backend:      group ${phase} ${m.name} PASS`);
+    }
+    return pass;
+  };
+
+  for (const m of named) {
+    if (calls >= GROUP_MAX_CALLS) break;
+    await oneTurn(m, 'speak');
+  }
+  if (named.length < 2) return true;
+
+  let round = 0;
+  while (round < GROUP_MAX_ROUNDS && calls < GROUP_MAX_CALLS) {
+    round += 1;
+    let passes = 0;
+    for (const m of named) {
+      if (calls >= GROUP_MAX_CALLS) break;
+      if (await oneTurn(m, 'peek')) passes += 1;
+    }
+    if (passes >= named.length) {
+      log(`cursor-backend:      group concluded round=${round} calls=${calls}`);
+      break;
+    }
+  }
+  log(`cursor-backend:      group queue done rounds=${round} calls=${calls}`);
+  return true;
+}
 function mergeAgentLists(remote) {
   const local = cachedAgentList() || [];
   const seen = new Set();
@@ -1143,12 +1254,15 @@ function mergeAgentLists(remote) {
   return sortAgentsByActivity(out);
 }
 function gatewayEntry(e) {
-  const { seq, pulledRemote, ...rest } = e;
+  const { seq, pulledRemote, promptRaw, ...rest } = e;
   return rest;
 }
 
 function stripSpendFooter(s) {
-  return String(s || '').replace(/\n{2,}this call \$[\d.]+[\s\S]*$/i, '').trimEnd();
+  return String(s || '')
+    .replace(/\n{2,}::oz-spend::[\s\S]*$/i, '')
+    .replace(/\n{2,}this call \$[\d.]+[\s\S]*$/i, '')
+    .trimEnd();
 }
 
 function entryPlainText(v) {
@@ -1176,16 +1290,26 @@ function historyMessages(agentId, currentPrompt) {
       text = entryPlainText(e.message ?? e.content ?? e.text);
       role = 'assistant';
       text = stripSpendFooter(text);
+      const who = e.author && e.author.name ? String(e.author.name).trim() : '';
+      if (who && text && !text.toLowerCase().startsWith(`${who.toLowerCase()}:`)) {
+        text = `${who}: ${text}`;
+      }
     } else if (e.kind === 'message' || e.role === 'user' || e.kind === 'user') {
+      // Keep `shortname: ` on the turn the model sees -- stripping it made every
+      // visitor look like one anonymous "you" (rex asked "am I still rex").
       text = entryPlainText(e.content ?? e.message ?? e.text ?? e.prompt);
+      if (!String(text || '').trim() && e.promptRaw != null) text = String(e.promptRaw);
       role = 'user';
     }
     text = String(text || '').trim();
     if (!role || !text) continue;
     out.push({ role, content: text });
   }
-  while (out.length && out[out.length - 1].role === 'user' && String(out[out.length - 1].content).trim() === cur) {
-    out.pop();
+  const curBare = stripVisitorLabel(cur).trim();
+  while (out.length && out[out.length - 1].role === 'user') {
+    const last = String(out[out.length - 1].content).trim();
+    if (last === cur || stripVisitorLabel(last).trim() === curBare) out.pop();
+    else break;
   }
   let chars = 0;
   const kept = [];
@@ -1268,6 +1392,33 @@ function ingestRemoteEntries(agentId, entries) {
   return incoming.length;
 }
 
+function visitorFromSend(parsed) {
+  const v = parsed && parsed.visitor;
+  if (!v || typeof v !== 'object') return null;
+  const id = String(v.id || '').trim();
+  const shortname = String(v.shortname || v.name || '').trim().toLowerCase();
+  const color = String(v.color || '').trim();
+  if (!id || !/^[a-z][a-z0-9]{1,15}$/.test(shortname)) return null;
+  return { id, shortname, color };
+}
+
+/** UI stores `shortname: prompt`; zooComplete / history must see the raw line. */
+function stripVisitorLabel(text) {
+  const s = String(text || '');
+  const m = s.match(/^([a-z][a-z0-9]{1,15}):\s+/);
+  if (!m) return s;
+  if (/^(https?|ftp|mailto|file|data)$/i.test(m[1])) return s;
+  return s.slice(m[0].length);
+}
+
+function labeledVisitorPrompt(visitor, prompt) {
+  const p = String(prompt || '');
+  if (!visitor?.shortname) return p;
+  const prefix = `${visitor.shortname}: `;
+  if (p.startsWith(prefix)) return p;
+  return prefix + p;
+}
+
 function promptFromSendBody(raw) {
   let obj = raw;
   if (Buffer.isBuffer(raw) || typeof raw === 'string') {
@@ -1292,7 +1443,7 @@ function promptFromSendBody(raw) {
 
 let walletUsdCache = { usd: null, at: 0 };
 async function walletUsdCached() {
-  if (walletUsdCache.usd != null && Date.now() - walletUsdCache.at < 60_000) return walletUsdCache.usd;
+  if (walletUsdCache.usd != null && Date.now() - walletUsdCache.at < 8_000) return walletUsdCache.usd;
   try {
     const { affordableUsd } = await import('./info.js');
     const n = await Promise.race([
@@ -1327,13 +1478,16 @@ async function zooSpendOverlay(data) {
   const bal = Number.isFinite(wallet) && wallet > 0.004
     ? wallet
     : (Number.isFinite(credit) && credit > 0.004 ? credit : null);
-  const lines = ['', ''];
-  if (x.billedUsd != null) {
-    lines.push(`this call $${Number(x.billedUsd).toFixed(6)} · OpenRouter $${Number(x.directUsd || 0).toFixed(6)}`);
-  }
-  const balTxt = bal != null ? ` · balance $${bal.toFixed(2)}` : '';
-  lines.push(`spent $${spent.toFixed(4)}${balTxt} · OpenRouter would $${would.toFixed(4)} · saved $${saved.toFixed(4)} (${pct.toFixed(0)}%)`);
-  return lines.join('\n');
+  return formatSpendFooter({
+    billedUsd: x.billedUsd,
+    directUsd: x.directUsd,
+    spent,
+    would,
+    saved,
+    pct,
+    balance: bal,
+    x402: x,
+  });
 }
 
 const MODELS_PATH = path.join(os.homedir(), '.openzoo', 'grokbot-models.json');
@@ -1567,12 +1721,34 @@ function zooTextFromMessage(msg, data) {
 async function zooComplete(prompt, log, agentId, parsed = {}) {
   const model = currentModel(agentId);
   const helper = localExecSse.size > 0;
+  const visitor = visitorFromSend(parsed);
+  const chatOnly = Boolean(visitor);
+  const spoken = visitor && !/^You are /.test(String(prompt || ''))
+    ? labeledVisitorPrompt(visitor, prompt)
+    : prompt;
   await ensureTranscriptHydrated(agentId, log);
-  log(`cursor-backend:      zoo POST :8402 model=${model} helper=${helper ? localExecSse.size : 0} hist=${historyMessages(agentId, prompt).length} ${JSON.stringify((prompt || '').slice(0, 60))}`);
+  log(`cursor-backend:      zoo POST :8402 model=${model} helper=${helper ? localExecSse.size : 0} hist=${historyMessages(agentId, spoken).length}${chatOnly ? ` visitor=${visitor.shortname} chat-only` : ''} ${JSON.stringify((spoken || '').slice(0, 60))}`);
 
   const images = [];
   const textFiles = [];
   for (const { raw, name } of attachmentList(parsed, prompt)) {
+    const uploaded = lookupUpload(raw);
+    if (uploaded) {
+      if (uploaded.mime && uploaded.mime.startsWith('image/')) {
+        images.push({
+          path: raw,
+          mime: uploaded.mime,
+          dataUrl: `data:${uploaded.mime};base64,${uploaded.buf.toString('base64')}`,
+        });
+        log(`cursor-backend:      attached image ${raw} ${uploaded.mime} ${uploaded.bytes}b`);
+      } else {
+        textFiles.push({ path: raw, abs: uploaded.abs, text: uploaded.buf.toString('utf8') });
+      }
+      continue;
+    }
+    // Public visitors must not trigger local file reads on this Mac.
+    // Uploads above are bytes they posted to us, not a host path.
+    if (chatOnly) continue;
     const abs = expandUserPath(raw);
     try {
       const buf = await readLocalBytes(abs, log);
@@ -1595,20 +1771,29 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
   const messages = [
     {
       role: 'system',
-      content: [
-        `You are ${model} served through openzoo inside Grok Bot.`,
-        `You HAVE local tools on the user's computer via ${via}.`,
-        'Tools: read_file, write_file, exec, list_dir. USE THEM. Write files to disk instead of pasting giant HTML into chat.',
-        'Pasted images arrive as attachments — you can see them when present. Do not claim you cannot see images if they are in this turn.',
-        'Never claim you lack filesystem access or local-exec. If a tool errors, report the error.',
-        'After using tools you MUST still write a normal chat reply: what you did, file paths written, and what to open. Empty content is a bug.',
-        'Do not stop mid-task. Do not write "Stopped on research", "nothing to open yet", "no app files written this turn", or "say go again". Keep using tools until the files the user asked for exist on disk THIS turn. Summarize only after those writes succeed.',
-        'A spend footer is appended after your reply by the host — ignore it.',
-        'Prior turns of THIS Grok Bot chat are in the messages below. Do not claim the thread starts blank or that earlier questions did not arrive.',
-      ].join(' '),
+      content: chatOnly
+        ? [
+          `You are ${model} served through openzoo inside Grok Bot.`,
+          'This is a public visitor chat. You do not have filesystem, shell, or local-exec access on the host Mac.',
+          'Reply in chat only. Do not claim you will write files, run commands, or use local tools.',
+          'Each human line is prefixed with that visitor\'s shortname and a colon, like "rex: hello". Different shortnames are different people. Address them by that name.',
+          'A spend footer is appended after your reply by the host -- ignore it.',
+          'Prior turns of THIS Grok Bot chat are in the messages below. Do not claim the thread starts blank or that earlier questions did not arrive.',
+        ].join(' ')
+        : [
+          `You are ${model} served through openzoo inside Grok Bot.`,
+          `You HAVE local tools on the user's computer via ${via}.`,
+          'Tools: read_file, write_file, exec, list_dir. USE THEM. Write files to disk instead of pasting giant HTML into chat.',
+          'Pasted images arrive as attachments — you can see them when present. Do not claim you cannot see images if they are in this turn.',
+          'Never claim you lack filesystem access or local-exec. If a tool errors, report the error.',
+          'After using tools you MUST still write a normal chat reply: what you did, file paths written, and what to open. Empty content is a bug.',
+          'Do not stop mid-task. Do not write "Stopped on research", "nothing to open yet", "no app files written this turn", or "say go again". Keep using tools until the files the user asked for exist on disk THIS turn. Summarize only after those writes succeed.',
+          'A spend footer is appended after your reply by the host — ignore it.',
+          'Prior turns of THIS Grok Bot chat are in the messages below. Do not claim the thread starts blank or that earlier questions did not arrive.',
+        ].join(' '),
     },
   ];
-  for (const m of historyMessages(agentId, prompt)) messages.push(m);
+  for (const m of historyMessages(agentId, spoken)) messages.push(m);
   if (textFiles.length) {
     const bits = textFiles.map((a) => (
       a.error
@@ -1622,7 +1807,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
   for (const img of images) {
     userContent.push({ type: 'image_url', image_url: { url: img.dataUrl } });
   }
-  userContent.push({ type: 'text', text: prompt || (images.length ? '(see attached image)' : 'hello') });
+  userContent.push({ type: 'text', text: spoken || (images.length ? '(see attached image)' : 'hello') });
   messages.push({
     role: 'user',
     content: userContent.length === 1 && userContent[0].type === 'text'
@@ -1633,6 +1818,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
   const maxTok = Number(process.env.OPENZOO_ASK_MAX_TOKENS || 8192);
   const maxSteps = Math.min(64, Math.max(8, Number(process.env.OPENZOO_ASK_TOOL_STEPS || 32)));
   let lastData = {};
+  let turnX402 = {};
   let text = '';
   const usedTools = [];
   const KEEP_GOING = 'Do not stop. Do not wait for another message. Write the files to disk now with write_file / exec. Keep going until the requested paths exist. A summary is only allowed after the files are written.';
@@ -1687,17 +1873,29 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
   };
   let keepGoingNudge = 0;
   for (let step = 0; step < maxSteps; step++) {
-    const { r, data } = await zooPost({
-      model,
-      messages,
-      tools: LOCAL_TOOLS,
-      tool_choice: 'auto',
-      max_tokens: maxTok,
-    });
+    const payload = { model, messages, max_tokens: maxTok };
+    if (!chatOnly) {
+      payload.tools = LOCAL_TOOLS;
+      payload.tool_choice = 'auto';
+    }
+    const { r, data } = await zooPost(payload);
     lastData = data;
+    turnX402 = mergeTurnProof(turnX402, data);
     const msg = data.choices?.[0]?.message || {};
     const calls = Array.isArray(msg.tool_calls) ? msg.tool_calls : [];
     if (calls.length) {
+      if (chatOnly) {
+        log(`cursor-backend:      visitor chat-only ignored ${calls.length} tool calls`);
+        messages.push(msg);
+        for (const c of calls) {
+          messages.push({
+            role: 'tool',
+            tool_call_id: c.id,
+            content: 'local tools are not available to web visitors',
+          });
+        }
+        continue;
+      }
       log(`cursor-backend:      zoo tools step=${step} n=${calls.length} ${calls.map((c) => c.function?.name || c.name).join(',')}`);
       messages.push(msg);
       for (const c of calls) {
@@ -1724,7 +1922,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
     log(`cursor-backend:      << zoo ${r.status} ${text.length}c model=${data.model || model} finish=${finish}`);
     // Model likes to park after research ("Stopped on research", "say go again")
     // instead of writing files. Measured 2026-08-30 on volume track00r.
-    if ((finish === 'length' || looksStoppedReply(text)) && keepGoingNudge < 6) {
+    if (!chatOnly && (finish === 'length' || looksStoppedReply(text)) && keepGoingNudge < 6) {
       keepGoingNudge += 1;
       log(`cursor-backend:      keep-going nudge=${keepGoingNudge} finish=${finish}`);
       messages.push(msg);
@@ -1747,6 +1945,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
       max_tokens: Math.max(800, Math.min(maxTok, 2048)),
     });
     lastData = data;
+    turnX402 = mergeTurnProof(turnX402, data);
     text = zooTextFromMessage(data.choices?.[0]?.message, data);
     log(`cursor-backend:      << zoo summary ${r.status} ${text.length}c`);
   }
@@ -1763,6 +1962,9 @@ async function zooComplete(prompt, log, agentId, parsed = {}) {
       text = '(empty zoo reply)';
     }
   }
+  if (lastData && typeof lastData === 'object') {
+    lastData.x402 = mergeTurnProof(turnX402, lastData);
+  }
   try { text += await zooSpendOverlay(lastData); } catch { /* overlay must never eat the reply */ }
   return { text, data: lastData };
 }
@@ -1796,6 +1998,20 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     });
     res.write('data: {"channel":"ping","payload":{}}\n\n');
     sseClients.add(res);
+    try {
+      const list = rosterForEvent(loadAgents() || [], agentActivity);
+      const active = topConversationId(list);
+      if (active) {
+        focusedAgentId = focusedAgentId || active;
+        res.write(`data: ${JSON.stringify({
+          channel: 'agents',
+          payload: {
+            agents: list.map((a) => ({ ...a, isActive: a.id === active })),
+            activeAgentId: active,
+          },
+        })}\n\n`);
+      }
+    } catch { /* first paint must not break SSE */ }
     const iv = setInterval(() => {
       try { res.write('data: {"channel":"ping","payload":{}}\n\n'); } catch { clearInterval(iv); sseClients.delete(res); }
     }, 15000);
@@ -1816,6 +2032,46 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     log('cursor-backend:      -> getHostStatus ready');
     return true;
   }
+  if (name === 'uploadAttachment' || name === 'readAttachmentImage'
+      || name === 'readAttachmentText' || name === 'readAttachmentChunk') {
+    let parsed = {};
+    try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+    if (name === 'uploadAttachment') {
+      const got = ingestUpload({
+        filename: parsed.filename,
+        bytesBase64: parsed.bytesBase64,
+      });
+      if (!got.ok) {
+        jsonSend(res, { status: 'ok', value: null, ok: false, reason: got.reason });
+        log(`cursor-backend:      uploadAttachment ${got.reason || 'failed'}`);
+        return true;
+      }
+      // Dual shape: sendPrompt-style raw `.path` AND CVr `{status,value}`.
+      jsonSend(res, { status: 'ok', value: { path: got.path }, path: got.path, ok: true });
+      log(`cursor-backend:      uploadAttachment ${got.path} ${got.bytes}b ${got.mime}`);
+      return true;
+    }
+    if (name === 'readAttachmentChunk') {
+      const chunk = readUploadChunk({
+        path: parsed.path,
+        offset: parsed.offset,
+        length: parsed.length,
+      });
+      jsonSend(res, chunk
+        ? { status: 'ok', value: chunk, ...chunk }
+        : { status: 'ok', value: null });
+      log(`cursor-backend:      readAttachmentChunk ${parsed.path || ''} ${chunk ? chunk.totalSize : 'miss'}b`);
+      return true;
+    }
+    if (name === 'readAttachmentImage') {
+      const img = readUploadImage(parsed.path);
+      jsonSend(res, img ? { status: 'ok', value: img, ...img } : { status: 'ok', value: null });
+      return true;
+    }
+    const text = readUploadText(parsed.path);
+    jsonSend(res, text ? { status: 'ok', value: text, ...text } : { status: 'ok', value: null });
+    return true;
+  }
   // Roster/settings come from the REAL 1340 gateway (names, avatars, trays).
   // Chat stays local so inference is zoo. Discovered on EnsureSandBox rewrite.
   const roster = new Set([
@@ -1825,8 +2081,7 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     'getBotTemplateExportPolicy', 'getTeachRecordingStatus', 'isGlobalSearchEnabled',
     'isEgressTunnelAvailable', 'listBoxMcpServers',
     'setWindowFocused', 'getAgentAutomations',
-    'createGroup', 'setGroupMembers',
-    'interruptAgentRun', 'requestDiskSaverAudit', 'broadcastToAgents',
+    'interruptAgentRun', 'requestDiskSaverAudit',
     'setAgentUnread', 'setAgentHiddenFromSidebar', 'setAgentNotificationsEnabled',
     'setAgentNotifyOnUpdates', 'setAgentAvatarBytes', 'getAgentAvatar',
   ]);
@@ -1841,15 +2096,82 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     }
     const agent = mintLocalAgent(parsed);
     jsonSend(res, { agent, id: agent.id, ...agent });
-    ssePush('agents', { action: 'created', agent });
+    pushCreatedAgent(agent);
     log(`cursor-backend:      createAgent local id=${agent.id} name=${JSON.stringify(agent.name)}`);
     return true;
   }
+  if (name === 'kickstartAgent') {
+    let parsed = {};
+    try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+    const id = String(parsed.id || parsed.agentId || '');
+    jsonSend(res, { id, isIntroductionInFlight: false });
+    log(`cursor-backend:      kickstartAgent id=${id || '?'}`);
+    return true;
+  }
+  if (name === 'createGroup') {
+    let parsed = {};
+    try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+    const memberIds = [].concat(parsed.memberAgentIds || parsed.memberIds || []).map(String).filter(Boolean);
+    const agent = mintLocalAgent({
+      ...parsed,
+      isGroup: true,
+      memberIds,
+      name: parsed.name || parsed.title || 'group',
+    });
+    jsonSend(res, { agent, id: agent.id, ...agent });
+    pushCreatedAgent(agent);
+    log(`cursor-backend:      createGroup local id=${agent.id} members=${memberIds.length} name=${JSON.stringify(agent.name)}`);
+    return true;
+  }
+  if (name === 'setGroupMembers') {
+    let parsed = {};
+    try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+    const id = String(parsed.id || parsed.agentId || '');
+    const memberIds = [].concat(parsed.memberAgentIds || parsed.memberIds || []).map(String).filter(Boolean);
+    const list = cachedAgentList() || [];
+    const i = list.findIndex((a) => a.id === id);
+    if (!id || i < 0) {
+      jsonSend(res, null);
+      log(`cursor-backend:      setGroupMembers miss id=${id || '?'}`);
+      return true;
+    }
+    const agent = shapeAgent({ ...list[i], isGroup: true, memberIds, updatedAt: Date.now() });
+    list[i] = agent;
+    saveAgents(list.map(shapeAgent));
+    jsonSend(res, { agent, ...agent });
+    ssePush('agent-upserted', { agent, activeAgentId: focusedAgentId || id });
+    ssePush('agents', { agents: rosterForEvent(list, agentActivity), activeAgentId: focusedAgentId || id });
+    log(`cursor-backend:      setGroupMembers id=${id} n=${memberIds.length}`);
+    return true;
+  }
+  if (name === 'broadcastToAgents') {
+    let parsed = {};
+    try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+    const ids = [].concat(parsed.ids || parsed.agentIds || []).map(String).filter(Boolean);
+    const prompt = String(parsed.prompt || parsed.text || parsed.message || '').trim();
+    jsonSend(res, { ok: true, accepted: true, ids });
+    const target = ids[0] && groupMemberIds(ids[0]).length ? ids[0] : (focusedAgentId || ids[0]);
+    if (target && prompt) {
+      const nonce = parsed.clientNonce || `oz-bc-${Date.now()}`;
+      setImmediate(() => {
+        runGroupQueue({
+          agentId: target,
+          humanPrompt: prompt,
+          parsed,
+          nonce,
+          log,
+        }).catch((e) => log(`cursor-backend:      broadcast queue ${e.message}`));
+      });
+    }
+    log(`cursor-backend:      broadcastToAgents ids=${ids.length} target=${target || 'none'}`);
+    return true;
+  }
   if (name === 'updateAgent') {
     let parsed = {};
     try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
     const agent = mintLocalAgent(parsed);
     jsonSend(res, { agent, ...agent });
+    pushCreatedAgent(agent, { select: false });
     log(`cursor-backend:      updateAgent local id=${agent.id}`);
     return true;
   }
@@ -1880,17 +2202,43 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     return true;
   }
   if (name === 'listAgents' || name === 'getTrays' || name === 'countAgents' || name === 'searchAgents') {
-    if (!sniffOn()) {
+    if (!sniffOn() && !useHouseRoster()) {
       const pod = await waitForAccountPod(log);
       if (pod?.agent) {
         const proxied = await proxyPodHttp(req, res, full, body, log);
         if (proxied) return true;
       }
     }
-    if (name === 'listAgents') {
-      const list = mergeAgentLists([]);
-      jsonSend(res, list);
-      log(`cursor-backend:      listAgents local n=${list.length} account=${activeAccountId || 'none'}`);
+    if (name === 'getTrays') {
+      jsonSend(res, []);
+      return true;
+    }
+    if (name === 'listAgents' || name === 'countAgents' || name === 'searchAgents') {
+      const list = rosterForEvent(mergeAgentLists([]), agentActivity);
+      if (name === 'countAgents') {
+        jsonSend(res, list.length);
+        log(`cursor-backend:      countAgents local n=${list.length} account=${activeAccountId || 'none'}`);
+        return true;
+      }
+      if (name === 'searchAgents') {
+        let parsed = {};
+        try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
+        const q = String(parsed.query || parsed.q || '').toLowerCase();
+        const out = !q ? list : list.filter((a) => String(a?.name || a?.title || a?.id || '').toLowerCase().includes(q));
+        jsonSend(res, out);
+        log(`cursor-backend:      searchAgents local n=${out.length}/${list.length} account=${activeAccountId || 'none'}`);
+        return true;
+      }
+      const active = topConversationId(list);
+      if (active && !focusedAgentId) focusedAgentId = active;
+      jsonSend(res, list.map((a) => ({ ...a, isActive: !!(active && a.id === active) })));
+      if (active) {
+        ssePush('agents', {
+          agents: list.map((a) => ({ ...a, isActive: a.id === active })),
+          activeAgentId: active,
+        });
+      }
+      log(`cursor-backend:      listAgents local n=${list.length} account=${activeAccountId || 'none'} active=${active || 'none'}`);
       return true;
     }
   }
@@ -1905,17 +2253,20 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
   if (name === 'sendPrompt') {
     let parsed = {};
     try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
-    const prompt = promptFromSendBody(parsed);
+    const prompt = stripVisitorLabel(promptFromSendBody(parsed));
+    const visitor = visitorFromSend(parsed);
     const agentId = String(parsed.agentId || parsed.id || 'openzoo');
     const nonce = parsed.clientNonce || `oz-${Date.now()}`;
     const attN = Array.isArray(parsed.attachmentPaths) ? parsed.attachmentPaths.length : 0;
-    log(`cursor-backend:      >> sendPrompt agent=${agentId} keys=${Object.keys(parsed).join(',')} attachments=${attN} prompt=${JSON.stringify((prompt || '').slice(0, 80))}`);
+    const uiText = visitor ? labeledVisitorPrompt(visitor, prompt) : prompt;
+    log(`cursor-backend:      >> sendPrompt agent=${agentId} keys=${Object.keys(parsed).join(',')} attachments=${attN}${visitor ? ` visitor=${visitor.shortname}` : ''} prompt=${JSON.stringify((prompt || '').slice(0, 80))}`);
     lastSendEchoId = String(nonce);
     jsonSend(res, { accepted: true });
-    const userLine = fanoutLine(agentId, 'user', prompt, {
+    const userLine = fanoutLine(agentId, 'user', uiText, {
       clientNonce: nonce,
       requestId: nonce,
-      richText: parsed.richText,
+      richText: visitor ? prefixVisitorRichText(parsed.richText, visitor.shortname, uiText) : parsed.richText,
+      promptRaw: prompt,
     });
     noteFocus(agentId);
     bumpAgent(agentId, { preview: prompt, notify: false });
@@ -1923,6 +2274,7 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     const modelCmd = /^\s*\/model(?:\s+(\S+))?\s*$/i.exec(prompt || '');
     setImmediate(async () => {
       let text = '';
+      let grouped = false;
       try {
         if (modelCmd) {
           const want = modelCmd[1];
@@ -1941,17 +2293,28 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
           }
           try { text += await zooSpendOverlay({}); } catch { /* */ }
         } else {
-          const z = await zooComplete(prompt, log, agentId, parsed);
-          text = z.text;
+          const members = groupMemberIds(agentId);
+          if (members.length) {
+            grouped = true;
+            await runGroupQueue({ agentId, humanPrompt: prompt, parsed, nonce, log });
+          } else {
+            const z = await zooComplete(prompt, log, agentId, parsed);
+            text = z.text;
+          }
         }
       } catch (e) {
+        grouped = false;
         text = `openzoo error: ${e.message}`;
         log(`cursor-backend:      sendPrompt zoo failed: ${e.message}`);
       }
-      const line = fanoutLine(agentId, 'assistant', text, { clientNonce: nonce, requestId: nonce });
-      ssePush('transcript', { ...gatewayEntry(line), agentId });
-      bumpAgent(agentId, { preview: text, notify: true });
-      log(`cursor-backend:      sendPrompt done agent=${agentId} seq=${line.seq} text=${JSON.stringify(text.slice(0, 220))}`);
+      if (!grouped) {
+        const line = fanoutLine(agentId, 'assistant', text, { clientNonce: nonce, requestId: nonce });
+        ssePush('transcript', { ...gatewayEntry(line), agentId });
+        bumpAgent(agentId, { preview: text, notify: true });
+        log(`cursor-backend:      sendPrompt done agent=${agentId} seq=${line.seq} text=${JSON.stringify(text.slice(0, 220))}`);
+      } else {
+        log(`cursor-backend:      sendPrompt group done agent=${agentId}`);
+      }
     });
     return true;
   }
@@ -1962,7 +2325,7 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     noteFocus(id);
     tailedAgents.add(id);
     const t = agentTranscript(id);
-    if (!t.pulledRemote && realPod?.agent) {
+    if (!t.pulledRemote && realPod?.agent && !useHouseRoster()) {
       const remote = await podJson('/api/getAgentTranscriptTail', {
         id, agentId: id, limit: 200, beforeSeq: parsed.beforeSeq,
       }, log);
@@ -2005,11 +2368,13 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     getHostSettings: { settings: {} },
     setHostSettings: { ok: true },
     setBoxSecrets: { ok: true },
-    listAgents: cachedAgentList()
-      || [...new Set([...transcripts.keys(), ...tailedAgents])].map((id) => ({ id, name: id, status: 'ready' })),
+    listAgents: rosterForEvent(cachedAgentList()
+      || [...new Set([...transcripts.keys(), ...tailedAgents])].map((id) => ({ id, name: id, status: 'ready' })), agentActivity),
+    countAgents: (cachedAgentList() || [...new Set([...transcripts.keys(), ...tailedAgents])]).length,
+    searchAgents: rosterForEvent(cachedAgentList() || [], agentActivity),
     getAgentTranscriptTail: { tail: '', lines: [], dropped: false, ok: true },
     getTeachRecordingStatus: { recording: false },
-    getTrays: { trays: [] },
+    getTrays: [],
     isGlobalSearchEnabled: { enabled: false },
     isEgressTunnelAvailable: { available: false },
     getSharingState: { sharing: false },
@@ -2023,7 +2388,7 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
   };
   const payload = stubs[name] !== undefined ? stubs[name] : { ok: true };
   // Live 1340 listAgents is a RAW array, not CVr (measured 104674b 2026-08-29).
-  if (name === 'listAgents') jsonSend(res, payload);
+  if (name === 'listAgents' || name === 'countAgents' || name === 'searchAgents') jsonSend(res, payload);
   else jsonApi(res, payload);
   log(`cursor-backend:      -> pod /api/${name}`);
   return true;