openzoo 0.50.52 → 0.50.54

package/lib/cursorbackend.js

@@ -40,6 +40,7 @@ import { encodeAvailableModels, encodeForMethod, encodeEnsureSandBox, encodeGetG
 import {
   accountPodPath, accountAgentsPath, rosterForAccount, rosterForEvent,
   readHouseRoster, houseAgentsPath, shapeAgent, agentBrief, briefFromName,
+  preferNamedAgent, looksLikeAgentId,
   readWakeups, writeWakeups, shapeWakeup, parseWakeupEvery, wantsWakeupCron,
   DEFAULT_WAKEUP_PROMPT, addDeletedIds, filterDeleted,
 } from './grokbotAccount.js';
@@ -365,7 +366,12 @@ function useHouseRoster() {
 function loadAgents() {
   const house = filterDeleted(readHouseRoster(HOME, activeAccountId) || [], HOME);
   const shaped = house.map(shapeAgent);
-  const dirty = shaped.some((a, i) => a.brief && a.brief !== String(house[i]?.brief || house[i]?.description || ''));
+  const dirty = shaped.some((a, i) => {
+    const prev = house[i] || {};
+    return (a.brief && a.brief !== String(prev.brief || prev.description || ''))
+      || (a.name && a.name !== String(prev.name || prev.title || ''))
+      || looksLikeAgentId(prev.name, prev.id);
+  });
   if (dirty && shaped.length) {
     writeJsonFile(houseAgentsPath(HOME), shaped);
     if (activeAccountId) {
@@ -944,7 +950,7 @@ function bumpAgent(id, { preview = '', notify = true } = {}) {
   agentActivity.set(id, a);
   const list = cachedAgentList() || [];
   const idx = list.findIndex((x) => x.id === id);
-  const base = idx >= 0 ? list[idx] : { id, name: id };
+  const base = idx >= 0 ? list[idx] : { id, name: 'chat' };
   const agent = shapeAgent(stampActivity({ ...base, updatedAt: now }));
   if (idx >= 0) list[idx] = agent;
   else list.unshift(agent);
@@ -1533,12 +1539,17 @@ async function runGroupQueue({ agentId, humanPrompt, parsed, nonce, log }) {
 }
 function mergeAgentLists(remote) {
   const local = cachedAgentList() || [];
-  const seen = new Set();
+  const seen = new Map();
   const out = [];
   for (const a of [...local, ...(Array.isArray(remote) ? remote : [])]) {
-    if (!a?.id || seen.has(a.id)) continue;
-    seen.add(a.id);
-    out.push(stampActivity(a));
+    if (!a?.id) continue;
+    const idx = seen.get(a.id);
+    if (idx == null) {
+      seen.set(a.id, out.length);
+      out.push(stampActivity(a));
+      continue;
+    }
+    out[idx] = stampActivity(preferNamedAgent(out[idx], a));
   }
   return sortAgentsByActivity(filterDeleted(out, HOME));
 }
@@ -3113,7 +3124,7 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     setHostSettings: { ok: true },
     setBoxSecrets: { ok: true },
     listAgents: rosterForEvent(cachedAgentList()
-      || [...new Set([...transcripts.keys(), ...tailedAgents])].map((id) => ({ id, name: id, status: 'ready' })), agentActivity),
+      || [...new Set([...transcripts.keys(), ...tailedAgents])].map((id) => ({ id, name: 'chat', status: 'ready' })), agentActivity),
     countAgents: (cachedAgentList() || [...new Set([...transcripts.keys(), ...tailedAgents])]).length,
     searchAgents: rosterForEvent(cachedAgentList() || [], agentActivity),
     getAgentTranscriptTail: { tail: '', lines: [], dropped: false, ok: true },

package/lib/grokbotAccount.js

@@ -41,16 +41,21 @@ function readJsonFile(p) {
   try { return JSON.parse(fs.readFileSync(p, 'utf8')); } catch { return null; }
 }
 
-/** First-seen id wins. Account file, then house file, then other account dirs. */
+/** First-seen id wins. A later pile can only *upgrade* a UUID name/stub brief. */
 export function mergeAgentRecords(piles) {
-  const seen = new Set();
+  const seen = new Map();
   const out = [];
   for (const pile of piles) {
     if (!Array.isArray(pile)) continue;
     for (const a of pile) {
-      if (!a?.id || seen.has(a.id)) continue;
-      seen.add(a.id);
-      out.push(a);
+      if (!a?.id) continue;
+      const idx = seen.get(a.id);
+      if (idx == null) {
+        seen.set(a.id, out.length);
+        out.push(a);
+        continue;
+      }
+      out[idx] = preferNamedAgent(out[idx], a);
     }
   }
   return out;
@@ -111,10 +116,94 @@ function activityTs(agent, activity) {
  * nulls, then clears the whole persisted tray. That is how a group vanished
  * after the first send: bumpAgent wrote a partial row, restore returned null.
  */
+const AGENT_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/** bumpAgent used `{id, name:id}` and 1340 listAgents often echoes that — sidebar then paints UUIDs. */
+export function looksLikeAgentId(s, id) {
+  const n = String(s || '').trim();
+  if (!n) return true;
+  if (id && n === String(id)) return true;
+  return AGENT_UUID_RE.test(n);
+}
+
+export function isStubBrief(brief, id) {
+  const b = String(brief || '').trim();
+  if (!b) return true;
+  if (id && b.startsWith(`You are ${id}. Your job is ${id}`)) return true;
+  return /^You are [0-9a-f-]{36}\. Your job is [0-9a-f-]{36}/i.test(b);
+}
+
+/** Pull a human name out of a standing brief: "You are 6 · Content Studio…" / "Job: Product Simplification". */
+export function nameFromBrief(brief, id) {
+  const b = String(brief || '').replace(/^\[brief\]\s*/i, '').trim();
+  if (!b) return '';
+  const job = b.match(/\bJob:\s*([^\n.]+)/i);
+  if (job) {
+    const n = job[1].trim();
+    if (n && !looksLikeAgentId(n, id)) return n.slice(0, 80);
+  }
+  const numbered = b.match(/^You are\s+(\d+\s*[·.•.\-—–]+\s*[^\n.]+)/i);
+  if (numbered) {
+    const n = numbered[1].replace(/\s+for\s+.*$/i, '').trim();
+    if (n && !looksLikeAgentId(n, id)) return n.slice(0, 80);
+  }
+  const you = b.match(/^You are\s+(.+?)(?:\.\s|$)/i);
+  if (you) {
+    const n = you[1].replace(/\s+for\s+Stacc(?:'s)?(?:\s+LLC)?$/i, '').trim();
+    if (n && !looksLikeAgentId(n, id)) return n.slice(0, 80);
+  }
+  return '';
+}
+
+export function nameQuality(a) {
+  const n = String(a?.name || a?.title || '').trim();
+  if (!n || looksLikeAgentId(n, a?.id)) return 0;
+  if (/^(chat|group)$/i.test(n)) return 1;
+  if (/^new bot$/i.test(n)) return 2;
+  return 3;
+}
+
+/** Keep the record that still has a human name / real brief. */
+export function preferNamedAgent(keep, incoming) {
+  if (!keep) return incoming;
+  if (!incoming) return keep;
+  const kq = nameQuality(keep);
+  const iq = nameQuality(incoming);
+  const keepBrief = String(keep.brief || keep.instructions || '').trim();
+  const inBrief = String(incoming.brief || incoming.instructions || '').trim();
+  const keepStub = isStubBrief(keepBrief, keep.id);
+  const inStub = isStubBrief(inBrief, incoming.id);
+  if (iq <= kq && !(keepStub && !inStub)) return keep;
+  const nameSrc = iq > kq ? incoming : keep;
+  const briefSrc = (!inStub && keepStub) ? incoming : keep;
+  return {
+    ...keep,
+    ...incoming,
+    name: nameSrc.name || nameSrc.title,
+    title: nameSrc.title || nameSrc.name,
+    brief: briefSrc.brief || briefSrc.instructions || keepBrief || inBrief,
+  };
+}
+
+export function displayName(raw = {}) {
+  const a = raw && typeof raw === 'object' ? raw : {};
+  const id = String(a.id || '');
+  const isGroup = a.isGroup === true
+    || (Array.isArray(a.memberIds) && a.memberIds.length > 0)
+    || (Array.isArray(a.memberAgentIds) && a.memberAgentIds.length > 0);
+  for (const cand of [a.name, a.title]) {
+    const n = String(cand || '').trim();
+    if (n && !looksLikeAgentId(n, id)) return n.slice(0, 80);
+  }
+  const fromBrief = nameFromBrief(a.brief || a.instructions || a.description, id);
+  if (fromBrief) return fromBrief;
+  return isGroup ? 'group' : 'chat';
+}
+
 /** Standing job from a sidebar name like "6 · Content Studio" or "Bot 1 — Marketing (X)". */
 export function briefFromName(name) {
   const n = String(name || '').trim();
-  if (!n || /^(new bot|chat|group)$/i.test(n)) return '';
+  if (!n || /^(new bot|chat|group)$/i.test(n) || looksLikeAgentId(n)) return '';
   const role = n.replace(/^\d+\s*[·.•.\-—–]+\s*/, '').trim() || n;
   if (role.length < 2) return '';
   return `You are ${n}. Your job is ${role}. Do that job. Do not ask the human to re-brief you. Coordinate with list_agents and message_agent.`;
@@ -123,13 +212,21 @@ export function briefFromName(name) {
 /** Standing job text. shapeAgent used to drop this, so every restart was amnesia. */
 export function agentBrief(raw = {}) {
   const a = raw && typeof raw === 'object' ? raw : {};
+  const id = String(a.id || '');
   for (const k of ['brief', 'instructions', 'customInstructions', 'systemPrompt']) {
     const v = a[k];
-    if (typeof v === 'string' && v.trim()) return v.trim().slice(0, 8000);
+    if (typeof v === 'string' && v.trim() && !isStubBrief(v, id)) {
+      const name = displayName(a);
+      const text = v.trim();
+      if (id && name && !looksLikeAgentId(name, id) && text.startsWith(`You are ${id}`)) {
+        return (`You are ${name}` + text.slice(`You are ${id}`.length)).slice(0, 8000);
+      }
+      return text.slice(0, 8000);
+    }
   }
   const d = String(a.description || '').trim();
-  if (d) return d.slice(0, 8000);
-  return briefFromName(a.name || a.title).slice(0, 8000);
+  if (d && !isStubBrief(d, id)) return d.slice(0, 8000);
+  return briefFromName(displayName(a)).slice(0, 8000);
 }
 
 export function shapeAgent(raw = {}) {
@@ -139,14 +236,14 @@ export function shapeAgent(raw = {}) {
     ? a.memberIds.map((x) => String(x)).filter(Boolean)
     : (Array.isArray(a.memberAgentIds) ? a.memberAgentIds.map((x) => String(x)).filter(Boolean) : []);
   const isGroup = a.isGroup === true || memberIds.length > 0;
-  const name = String(a.name || a.title || (isGroup ? 'group' : 'chat'));
-  const brief = agentBrief(a);
+  const name = displayName({ ...a, isGroup, memberIds });
+  const brief = agentBrief({ ...a, name, title: a.title || name });
   return {
     id,
     name,
     brief,
-    description: String(a.description || brief || ''),
-    title: String(a.title || name),
+    description: String((a.description && !looksLikeAgentId(a.description, id) && a.description) || brief || ''),
+    title: String((!looksLikeAgentId(a.title, id) && a.title) || name),
     origin: String(a.origin || 'user'),
     path: String(a.path || (id ? `/local/${id}` : '/local')),
     createdAt: Number(a.createdAt) || Date.now(),

package/lib/ozSpendChip.js

@@ -159,6 +159,7 @@ function ozEnsureSpendCss() {
   }
   s.textContent = [
     '.oz-spend{margin:.55rem 0 0;font-size:12px;color:inherit;opacity:.82;max-width:36em}',
+    '#oz-spend-float>summary{cursor:grab}',
     '.oz-spend>summary{cursor:help;list-style:none;display:inline-flex;align-items:center;gap:.35rem;',
     'padding:3px 9px;border-radius:999px;border:1px solid rgba(255,255,255,.18);white-space:nowrap;',
     'max-width:100%;overflow:hidden;text-overflow:ellipsis}',
@@ -339,27 +340,78 @@ function ozEnsureFloatSpend() {
     document.body.appendChild(el);
   }
   ozPlaceFloat(el);
+  ozDragFloat(el);
   const sum = el.querySelector('summary');
   if (sum) sum.textContent = 'ⓘ ' + label;
 }
 
+function ozSavedFloatPos() {
+  try {
+    const p = JSON.parse(localStorage.getItem('oz-spend-float-pos') || 'null');
+    if (p && Number.isFinite(+p.left) && Number.isFinite(+p.top)) return { left: +p.left, top: +p.top };
+  } catch (e) {}
+  return null;
+}
+
 function ozPlaceFloat(el) {
   if (!el) return;
-  const ta = document.querySelector('textarea, [contenteditable="true"]');
-  const box = ta && ta.getBoundingClientRect();
   el.style.position = 'fixed';
-  el.style.right = 'auto';
   el.style.zIndex = '2147483646';
   el.style.opacity = '0.95';
-  if (box && box.width > 80 && box.top > 48) {
-    el.style.left = Math.round(box.left) + 'px';
-    el.style.top = Math.round(Math.max(8, box.top - 56)) + 'px';
+  const saved = ozSavedFloatPos();
+  if (saved) {
+    el.style.left = Math.max(8, saved.left) + 'px';
+    el.style.top = Math.max(8, saved.top) + 'px';
+    el.style.right = 'auto';
     el.style.bottom = 'auto';
-  } else {
-    el.style.left = '96px';
-    el.style.bottom = '72px';
-    el.style.top = 'auto';
+    return;
   }
+  el.style.left = 'auto';
+  el.style.right = '16px';
+  el.style.top = '48px';
+  el.style.bottom = 'auto';
+}
+
+function ozDragFloat(el) {
+  if (!el || el.dataset.ozDrag === '1') return;
+  el.dataset.ozDrag = '1';
+  const sum = el.querySelector('summary') || el;
+  let dragging = false;
+  let moved = false;
+  let dx = 0;
+  let dy = 0;
+  sum.addEventListener('pointerdown', (ev) => {
+    if (ev.button !== 0) return;
+    dragging = true;
+    moved = false;
+    const r = el.getBoundingClientRect();
+    dx = ev.clientX - r.left;
+    dy = ev.clientY - r.top;
+    el.style.cursor = 'grabbing';
+    try { sum.setPointerCapture(ev.pointerId); } catch (e) {}
+    ev.preventDefault();
+    ev.stopPropagation();
+  });
+  sum.addEventListener('pointermove', (ev) => {
+    if (!dragging) return;
+    moved = true;
+    el.style.left = Math.max(8, ev.clientX - dx) + 'px';
+    el.style.top = Math.max(8, ev.clientY - dy) + 'px';
+    el.style.right = 'auto';
+    el.style.bottom = 'auto';
+  });
+  const end = () => {
+    if (!dragging) return;
+    dragging = false;
+    el.style.cursor = 'grab';
+    const r = el.getBoundingClientRect();
+    try { localStorage.setItem('oz-spend-float-pos', JSON.stringify({ left: r.left, top: r.top })); } catch (e) {}
+  };
+  sum.addEventListener('pointerup', end);
+  sum.addEventListener('pointercancel', end);
+  sum.addEventListener('click', (ev) => {
+    if (moved) { ev.preventDefault(); ev.stopPropagation(); }
+  }, true);
 }
 
 function ozWatchSpend() {
@@ -385,20 +437,8 @@ export function spendChipSource() {
   return [
     '(function ozSpendChip(){',
     "'use strict';",
-    'if (window.__OZ_SPEND_CHIP__ === 11) {',
-    '  const el = document.getElementById("oz-spend-float");',
-    '  const ta = document.querySelector("textarea, [contenteditable=\\"true\\"]");',
-    '  const box = ta && ta.getBoundingClientRect();',
-    '  if (el && box && box.width > 80) {',
-    '    el.style.position = "fixed";',
-    '    el.style.left = Math.round(box.left) + "px";',
-    '    el.style.top = Math.round(Math.max(8, box.top - 56)) + "px";',
-    '    el.style.right = "auto";',
-    '    el.style.bottom = "auto";',
-    '  }',
-    '  return;',
-    '}',
-    'window.__OZ_SPEND_CHIP__ = 11;',
+    'if (window.__OZ_SPEND_CHIP__ === 12) return;',
+    'window.__OZ_SPEND_CHIP__ = 12;',
     chipUsd.toString(),
     labelFromSpendBody.toString(),
     spendLinesOnly.toString(),
@@ -414,7 +454,9 @@ export function spendChipSource() {
     ozAttachSpendChip.toString(),
     ozCollapseSpend.toString(),
     ozEnsureFloatSpend.toString(),
+    ozSavedFloatPos.toString(),
     ozPlaceFloat.toString(),
+    ozDragFloat.toString(),
     ozWatchSpend.toString(),
     'ozWatchSpend();',
     '})();',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.50.52",
+  "version": "0.50.54",
   "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",