quoxcli 0.4.0 → 0.5.0

package/lib/quoxon/events.js

@@ -11,6 +11,9 @@
  *   turn     : null | { id, status: running|interrupting, startedAt, stage, activity }
  */
 
+import { eventLine } from '../core/announce.js';
+import { isDestructive, isDestructiveTool, destructiveObject } from './destructive.js';
+import { heldReason } from './bulkRisk.js';
 import { approvalSentence } from './approvalSentence.js';
 import { dividerStep } from './dividerAocl.js';
 import { approvalFacts } from './approvalFacts.js';
@@ -80,6 +83,15 @@ export function textGate(st, ev) {
 
 const tms = (v) => { const t = typeof v === 'number' ? v : Date.parse(v); return Number.isFinite(t) ? t : null; };
 
+/** A machine source key (`devsuite_pack_install:<host>:<pack>:<ver>`) is never shown as a requester: it names a human-readable origin instead. */
+const SOURCE_KEY = /^[A-Za-z][\w.-]*(:[^:\s]+){2,}$/;
+const SOURCE_NAMES = [[/^devsuite_/i, 'DevSuite (skill-pack sync)']];
+export function humanRequester(v) {
+  const t = String(v ?? '').trim(); if (!t || !SOURCE_KEY.test(t)) return t || null;
+  const hit = SOURCE_NAMES.find(([re]) => re.test(t)); if (hit) return hit[1];
+  const head = t.split(':')[0].replace(/[_-]+/g, ' ').trim();
+  return head ? head.charAt(0).toUpperCase() + head.slice(1) : 'plugin or workflow';
+}
 const short = (v, n = 120) => { const t = typeof v === 'string' ? v : (v == null ? '' : JSON.stringify(v)); return t.length > n ? t.slice(0, n - 1) + '…' : t; };
 const argText = (a) => a && typeof a === 'object' && !Array.isArray(a) && (a.argv || a.command) ? argText(a.argv ?? a.command) : Array.isArray(a) ? a.join(' ') : (a && typeof a === 'object' ? Object.entries(a).filter(([, v]) => v != null && typeof v !== 'object').slice(0, 4).map(([k, v]) => `${k}=${v}`).join(' ') : (a == null ? '' : String(a)));
 
@@ -97,7 +109,7 @@ export function describeInboxItem(it) {
   const argv = m.argv ?? m.args ?? c.argv ?? c.args ?? p.argv ?? p.args ?? m.command ?? c.command ?? p.command ?? null;
   const cmd = short([m.leaf || c.leaf || p.leaf, argText(argv)].filter(Boolean).join(' ').trim() || null);
   const target = w.target || m.target || c.target || p.target || cmd || w.target_none || c.target_org || c.org_name || p.org_name || c.org_id || p.org_id || null;
-  const by = ob.agent || ob.agent_id || ob.session_name || ob.session || c.requested_by?.agent_label || c.source_label || p.source || it?.source || null;
+  const by = humanRequester(ob.agent || ob.agent_id || ob.session_name || ob.session || c.requested_by?.agent_label || c.source_label || p.source || it?.source || null);
   const what = w.summary ? String(w.summary) : (it?.title ? short(String(it.title), 160) : null);
   return { tool, target: target ? short(target, 200) : null, title: what, by: by ? String(by) : null, at: it?.created_at ?? it?.createdAt ?? null };
 }
@@ -129,6 +141,9 @@ export function cardFromInboxItem(it, { since = 0, userId = null, conversationId
     tool, target: d.target, what: d.title, askedBy: d.by, askedAt: d.at, scope: null, risk: c.risk || null,
     url: it.dashboard_url || null, shownAt: now, undescribable: !d.tool && !d.target && !it._plan,
     plan: it._plan ? { lines: planLines(it._plan.steps), loaded: it._plan.loaded !== false, orgId: it._plan.orgId || null, orgName: it._plan.orgName || null } : null, // the plan's steps + the item's own org
+    destructive: isDestructive(it) ? destructiveObject(it) : null, // typed-name confirm before a y approves it
+    disruptive: [it, it.payload, c, m, it.payload?.what].some(o => o && o.disruptive === true), // server-marked: never batched
+    held: heldReason(it), // a risky ask is never part of a batch card
     facts: approvalFacts(it), // APPROVAL-WWWH: the exact command, hosts, chain, reason, time and read-only class
     // only an item that names THIS conversation is ours; anything else came from another session and must not take the keyboard
     foreign: !here,
@@ -140,7 +155,7 @@ export function cardFromInboxItem(it, { since = 0, userId = null, conversationId
 /** Where an inbox approval came from: its source label, else the payload source, else its type. */
 export function approvalSourceLabel(it) {
   const c = it?.payload?.approval_context || {};
-  return String(c.source_label || it?.payload?.source || it?.source || (c.requested_by && c.requested_by.agent_label) || it?.payload?.type || 'plugin or workflow');
+  return humanRequester(c.source_label || it?.payload?.source || it?.source || (c.requested_by && c.requested_by.agent_label) || it?.payload?.type || 'plugin or workflow');
 }
 
 /**
@@ -377,7 +392,7 @@ function reduceInner(s, a) {
     case 'help':
       return { ...s, history: [...s.history, { id: nid(), kind: 'help', model: a.model }] };
     case 'object': // inline object view (objects/): pure data, rebuilt at render width
-      return { ...s, history: [...s.history, { id: nid(), kind: 'object', obj: a.obj }] };
+      return { ...s, notify: scopeNotify(s.notify, a.obj), history: [...s.history, { id: nid(), kind: 'object', obj: a.obj }] };
     case 'error':
       return flush(addBlock(s, { kind: 'error', text: a.text }), false);
     case 'verbose':
@@ -435,11 +450,11 @@ function reduceInner(s, a) {
       const card = cardFromInboxItem(a.item, { since: s.turn?.startedAt ?? a.since ?? 0, userId: a.userId, conversationId: s.ctx.conversationId, now: a.now || 0 });
       if (card && card.approvalId) { // an event card raised without an inbox id learns it from the poll (else y answers a null id: 404)
         const j = s.approvals.findIndex(x => !x.inboxItemId && x.approvalId === card.approvalId);
-        if (j >= 0) { const approvals = s.approvals.slice(); approvals[j] = { ...approvals[j], inboxItemId: card.inboxItemId, url: approvals[j].url || card.url, facts: approvals[j].facts || card.facts }; return { ...s, approvals, seenInbox: { ...s.seenInbox, [card.inboxItemId]: true } }; }
+        if (j >= 0) { const approvals = s.approvals.slice(); approvals[j] = { ...approvals[j], inboxItemId: card.inboxItemId, url: approvals[j].url || card.url, facts: approvals[j].facts || card.facts, destructive: approvals[j].destructive || card.destructive }; return { ...s, approvals, seenInbox: { ...s.seenInbox, [card.inboxItemId]: true } }; }
       }
       if (card && card.approvalId) { // an event stub that could not be described learns its description from the inbox item
         const j = s.approvals.findIndex(x => x.undescribable && (x.inboxItemId === card.inboxItemId || x.approvalId === card.approvalId));
-        if (j >= 0 && !card.undescribable) { const approvals = s.approvals.slice(); approvals[j] = { ...approvals[j], tool: card.tool, target: card.target, what: card.what, askedBy: card.askedBy, askedAt: card.askedAt, facts: card.facts, undescribable: false }; return { ...s, approvals }; }
+        if (j >= 0 && !card.undescribable) { const approvals = s.approvals.slice(); approvals[j] = { ...approvals[j], tool: card.tool, target: card.target, what: card.what, askedBy: card.askedBy, askedAt: card.askedAt, facts: card.facts, destructive: approvals[j].destructive || card.destructive, undescribable: false }; return { ...s, approvals }; }
       }
       if (!card || s.seenInbox[card.inboxItemId] || s.approvals.some(x => x.inboxItemId === card.inboxItemId || (card.approvalId && x.approvalId === card.approvalId))) return s;
       if (card.foreign) { // another conversation's card: a compact notice, never the focused card
@@ -461,6 +476,10 @@ function reduceInner(s, a) {
       if (a.batch) return rest; // /approve N prints its own one-line summary
       if (a.quiet && a.action === 'approve') return rest;
       if (a.action !== 'approve') return note(rest, approvalSentence(a, false), 'warn');
+      if (a.foreign && a.approvalId) { // tracked: the poll adds one follow-up line with the outcome
+        const run = { callId: a.callId, approvalId: a.approvalId, tool: a.tool, target: a.target };
+        return note({ ...rest, running: [...rest.running.filter(x => x.callId !== a.callId), run] }, approvalSentence(a, true), 'ok');
+      }
       if (a.foreign) return note(rest, approvalSentence(a, true), 'ok');
       if (a.tool === 'hat.switch') { // applied server-side by the inbox approve; nothing to wait for
         const to = String(a.target || '').split('\u2192').pop().replace(/\(privileged\)/, '').trim() || 'the new hat';
@@ -475,7 +494,7 @@ function reduceInner(s, a) {
       const n = { ...s, running: s.running.filter(x => x.callId !== a.callId) };
       const what = run ? `${run.tool || 'approval'}${run.target ? ` on ${run.target}` : ''}` : 'approval';
       if (a.outcome === 'done') return note(n, `result: ${what}: ${a.text || 'completed'}`, 'ok');
-      if (a.outcome === 'failed') return note(n, `failed: ${what}: ${a.text || 'error'}`, 'warn');
+      if (a.outcome === 'failed') return note(n, `${Number.isInteger(a.exit) && a.exit >= 1 ? `ran, exit ${a.exit}` : 'failed'}: ${what}: ${a.text || 'error'}`, 'warn');
       if (a.outcome === 'denied') return note(n, `denied: ${what}`, 'warn');
       // FW4: never silent and never a guess. Say what is unknown and where the authoritative answer is.
       const check = run && run.approvalId ? `quox approvals result ${run.approvalId} (or /approvals)` : '/approvals (no approval id was returned, so it cannot be tracked from here)';
@@ -495,6 +514,15 @@ function reduceInner(s, a) {
 }
 
 /** The first card is armed from the moment it is actually SHOWN, not from when it was received. */
+/** An away/sitrep card that lists older items or a source it cannot see: the approvals bar must not say all-clear next to it. */
+function scopeNotify(n, obj) {
+  const d = obj?.data;
+  if (!d || (obj.type !== 'away' && obj.type !== 'sitrep')) return n;
+  const outstanding = obj.type === 'away' ? (d.standing?.count || 0) : (d.needs || []).length;
+  const blind = Array.isArray(d.blind) ? d.blind.length : 0;
+  return { ...n, outstanding, blind };
+}
+
 export function reduce(s, a) {
   let n = reduceInner(s, a);
   // TUI-DIVIDER: the bottom-rule AOCL strip, moved only by real turn events (dividerAocl.js).
@@ -593,7 +621,8 @@ function reduceEvent(s, ev, now) {
         target: ev.target, scope: ev.scope, risk: ev.risk, url: ev.dashboard_url, shownAt: now,
         undescribable: ev.describable === false || !ev.target,
         turnId: s.turn?.id ?? ev.turn_id ?? null, // the turn this card arrived in (a stream event is always this conversation)
-        privileged: isPrivileged({ tool: ev.tool, risk: ev.risk, flag: ev.privileged === true || ev.elevated === true })
+        privileged: isPrivileged({ tool: ev.tool, risk: ev.risk, flag: ev.privileged === true || ev.elevated === true }),
+        destructive: ev.destructive === true || ev.irreversible === true || isDestructiveTool(ev.tool) ? (() => { const v = String(ev.object_name || ev.target || ev.inbox_item_id || ev.tool || 'item').slice(0, 80); return { label: v, name: v }; })() : null
       };
       if (s.approvals.some(x => x.callId === card.callId)) return s;
       const dup = s.approvals.findIndex(x => (card.inboxItemId && x.inboxItemId === card.inboxItemId) || (card.approvalId && x.approvalId === card.approvalId));
@@ -611,6 +640,13 @@ function reduceEvent(s, ev, now) {
       const n = { ...s, approvals: s.approvals.filter(x => x.callId !== ev.call_id) };
       return card || ev.decision ? note(n, `${ev.decision === 'approved' ? '✔ approved by you' : `approval ${ev.decision || 'resolved'}`}${card ? `: ${card.tool} on ${card.target}` : ''}`, ev.decision === 'approved' ? 'ok' : 'warn') : n;
     }
+    // QUOX-ANNOUNCE A2: a Quox effect of this turn (memory saved, approval held, delegation ...), one line, same renderer as the CLI verbs.
+    case 'quox_event': {
+      const text = eventLine(ev);
+      if (!text) return s;
+      if (ev.status === 'fail') return addBlock(s, { kind: 'error', text });
+      return addBlock(s, { kind: 'note', text, tone: ev.status === 'ok' ? 'ok' : ev.status === 'busy' ? 'accent' : 'warn' });
+    }
     case 'steer.accepted': {
       const i = s.steering.findIndex(x => x.text === ev.text);
       const steering = i >= 0 ? s.steering.filter((_, k) => k !== i) : s.steering.slice(1);