agent.libx.js 0.92.3 → 0.92.5

package/cli/cli.ts

@@ -358,27 +358,38 @@ function makeHost(format: 'text' | 'json' | 'stream-json' = 'text', opts?: { str
   };
 }
 
-/** Hooks that render tool activity to stderr: a preToolUse header, and for edits a colorized diff. */
-function displayHooks(fs?: IFilesystem): Hooks {
+/** Hooks that render tool activity to stderr: a preToolUse header, and for edits a colorized diff.
+ *  `opts.background` marks the agent as a BACKGROUND one (duplex workers): its chrome lands async on
+ *  top of a live prompt, so it must never drive the foreground spinner (the 'agentx › '/'⠹ thinking…'
+ *  flicker), clears the prompt line before printing, and repaints via the callback after. `opts.gate`
+ *  is evaluated per call — false renders nothing (minimal mode: task events only). */
+function displayHooks(fs?: IFilesystem, opts?: { gate?: () => boolean; background?: () => void }): Hooks {
   const EDIT = new Set(['Edit', 'MultiEdit', 'Write']);
   const before = new Map<string, string>();
   const MAX = 64 * 1024; // skip diffing very large files
+  const bg = opts?.background;
+  const on = () => !opts?.gate || opts.gate();
   const read = async (p: unknown): Promise<string> => {
     if (!fs || typeof p !== 'string') return '';
     try { return await fs.readFile(p); } catch { return ''; }
   };
   return {
     async preToolUse(call) {
-      spinner.stop(); // a tool is about to run → stop "thinking…"
+      if (!on()) return;
+      if (bg) err('\r\x1b[0J'); else spinner.stop(); // foreground: a tool is about to run → stop "thinking…"
       err(cyan(`\n  ⚙ ${call.name}`) + dim(' ' + summarizeCall(call.name, call.args)) + '\n');
       if (EDIT.has(call.name)) before.set(String(call.args?.path), await read(call.args?.path));
+      bg?.();
     },
     onToolOutput(_call, chunk) {
-      if (!verboseOutput) return; // Ctrl+O verbose: live-tail streaming tool output (default chrome stays calm)
+      if (!verboseOutput || !on()) return; // Ctrl+O verbose: live-tail streaming tool output (default chrome stays calm)
+      if (bg) err('\r\x1b[0J');
       for (const ln of String(chunk).split('\n')) if (ln.trim()) err(dim(`    ⋮ ${ln.length > 200 ? ln.slice(0, 200) + '…' : ln}\n`));
+      bg?.();
     },
     async postToolUse(call, result) {
-      spinner.stop();
+      if (!on()) return;
+      if (bg) err('\r\x1b[0J'); else spinner.stop();
       try {
         if (EDIT.has(call.name)) {
           const path = String(call.args?.path);
@@ -405,7 +416,8 @@ function displayHooks(fs?: IFilesystem): Hooks {
           err(dim('    ⎿ (no output)\n')); // empty result → confirm completion so it doesn't look hung
         }
       } finally {
-        spinner.start(); // tool done → the model is thinking about the next step
+        if (bg) bg(); // background: repaint the live prompt below the chrome — NEVER the spinner
+        else spinner.start(); // foreground: tool done → the model is thinking about the next step
       }
     },
   };
@@ -965,13 +977,17 @@ async function repl(args: Args, ai: ChatLike, cfg: Partial<AgentConfig>, cwd: st
   let voiceIO: VoiceIO | undefined; // real voice I/O (--voice + keys): mic→STT in, text_delta→TTS out
   let editorRef: LineEditor | undefined; // bound once the line editor exists — async chrome repaints the prompt via it
   let workerOptions: AgentOptions | undefined;
+  // Worker UI verbosity: 'full' = ⚙ tool chrome per worker step; 'minimal' = task events only
+  // (started/progress/⦿ done). Voice defaults minimal (chrome is noise next to speech); /workers toggles live.
+  let workerChrome: 'full' | 'minimal' = 'full';
   let duplexPersist: () => void = () => {}; // bound once the session exists (re-voice fires async)
   let duplexAccount: (data: any) => void = () => {}; // worker cost → session meta (bound below)
   // Workers are non-interactive: a permission 'ask' can't pop a menu mid-conversation (it would fight
   // the line editor for raw stdin). Auto-deny with a narratable reason — the worker adapts or reports
   // back and the voice narrates it. Allow/deny rules (config, --allowedTools, --yes) apply as-is.
   const duplexAsk = async (call: ToolUse): Promise<{ decision: 'allow' | 'deny' }> => {
-    err(yellow(`  ⊘ worker asked to run ${call.name} — auto-denied (no interactive approval in duplex; use --yes or --allowedTools)\n`));
+    err('\r\x1b[0J' + yellow(`  ⊘ worker asked to run ${call.name} — auto-denied (no interactive approval in duplex; use --yes or --allowedTools)\n`));
+    editorRef?.redrawNow(); // background event at a live prompt — repaint below the notice
     return { decision: 'deny' };
   };
   if (duplex) {
@@ -982,6 +998,11 @@ async function repl(args: Args, ai: ChatLike, cfg: Partial<AgentConfig>, cwd: st
     if (workerOptions.permissions)
       workerOptions.permissions = new PermissionPolicy({ ...workerOptions.permissions.options, host: undefined, ask: duplexAsk });
     workerOptions.planMode = false; // a worker's plan could never be approved (no host) — it would stall to maxSteps
+    // Workers are BACKGROUND agents: rebuild their display hooks so chrome never drives the foreground
+    // spinner (the 'agentx › '/'⠹ thinking…' flicker) and repaints the live prompt after each print.
+    workerChrome = args.voice ? 'minimal' : (cfg.workerChrome ?? 'full');
+    const workerDisplay = displayHooks(agent.options.fs, { gate: () => workerChrome === 'full', background: () => editorRef?.redrawNow() });
+    workerOptions.hooks = cfg.hooks ? composeHooks(workerDisplay, hooksFromConfig(cfg.hooks)) : workerDisplay;
     // The single voice: markdown-rendered deltas on stdout = the SPOKEN channel. Everything else
     // (⚙ tool chrome, task events, worker results) is VISUAL chrome on stderr — when wired to a
     // real voice API, only text_delta becomes speech; the rest feeds the screen.
@@ -1019,6 +1040,15 @@ async function repl(args: Args, ai: ChatLike, cfg: Partial<AgentConfig>, cwd: st
           editorRef?.redrawNow();
           return;
         }
+        // Remaining task_* events (started/progress/cancelled/error) land ASYNC at a live prompt —
+        // same treatment as task_done: clear the prompt line, print, repaint (bare err() leaves
+        // residue glued to 'agentx › '). task_done returned above; everything else falls through.
+        if (typeof e.kind === 'string' && e.kind.startsWith('task_')) {
+          spinner.stop();
+          err('\r\x1b[0J' + dim(`  · ${e.message}\n`));
+          editorRef?.redrawNow();
+          return;
+        }
         base.notify!(e); // makeHost always provides notify (the HostBridge type just marks it optional)
       },
     };
@@ -1399,7 +1429,13 @@ async function repl(args: Args, ai: ChatLike, cfg: Partial<AgentConfig>, cwd: st
         else err(dim('  ' + (duplex ? `voice ${dx!.options.voiceModel} · worker ${work.model}` : work.model) + '\n'));
       },
     },
-    ...(duplex ? { 'voice-model': {
+    ...(duplex ? { workers: {
+      desc: 'duplex worker chrome — /workers <full|minimal>: per-step ⚙ tool activity vs task events only',
+      run: async (a: string[]) => {
+        if (a[0] === 'full' || a[0] === 'minimal') { workerChrome = a[0]; err(green(`  ✓ worker chrome → ${a[0]}\n`)); return; }
+        err(dim(`  worker chrome: ${workerChrome} (use /workers full|minimal)\n`));
+      },
+    }, 'voice-model': {
       desc: 'switch the duplex voice (fast) model — /voice-model <id>, or alone for a picker',
       run: async (a: string[]) => {
         const apply = (id: string) => {

package/dist/cli.js

@@ -7128,10 +7128,12 @@ function makeHost(format = "text", opts) {
     }
   };
 }
-function displayHooks(fs) {
+function displayHooks(fs, opts) {
   const EDIT = /* @__PURE__ */ new Set(["Edit", "MultiEdit", "Write"]);
   const before = /* @__PURE__ */ new Map();
   const MAX = 64 * 1024;
+  const bg = opts?.background;
+  const on = () => !opts?.gate || opts.gate();
   const read = async (p) => {
     if (!fs || typeof p !== "string") return "";
     try {
@@ -7142,18 +7144,25 @@ function displayHooks(fs) {
   };
   return {
     async preToolUse(call) {
-      spinner.stop();
+      if (!on()) return;
+      if (bg) err("\r\x1B[0J");
+      else spinner.stop();
       err(cyan(`
   \u2699 ${call.name}`) + dim(" " + summarizeCall(call.name, call.args)) + "\n");
       if (EDIT.has(call.name)) before.set(String(call.args?.path), await read(call.args?.path));
+      bg?.();
     },
     onToolOutput(_call, chunk) {
-      if (!verboseOutput) return;
+      if (!verboseOutput || !on()) return;
+      if (bg) err("\r\x1B[0J");
       for (const ln of String(chunk).split("\n")) if (ln.trim()) err(dim(`    \u22EE ${ln.length > 200 ? ln.slice(0, 200) + "\u2026" : ln}
 `));
+      bg?.();
     },
     async postToolUse(call, result) {
-      spinner.stop();
+      if (!on()) return;
+      if (bg) err("\r\x1B[0J");
+      else spinner.stop();
       try {
         if (EDIT.has(call.name)) {
           const path = String(call.args?.path);
@@ -7182,7 +7191,8 @@ function displayHooks(fs) {
           err(dim("    \u23BF (no output)\n"));
         }
       } finally {
-        spinner.start();
+        if (bg) bg();
+        else spinner.start();
       }
     }
   };
@@ -7694,13 +7704,15 @@ async function repl(args, ai, cfg, cwd) {
   let voiceIO;
   let editorRef;
   let workerOptions;
+  let workerChrome = "full";
   let duplexPersist = () => {
   };
   let duplexAccount = () => {
   };
   const duplexAsk = async (call) => {
-    err(yellow(`  \u2298 worker asked to run ${call.name} \u2014 auto-denied (no interactive approval in duplex; use --yes or --allowedTools)
+    err("\r\x1B[0J" + yellow(`  \u2298 worker asked to run ${call.name} \u2014 auto-denied (no interactive approval in duplex; use --yes or --allowedTools)
 `));
+    editorRef?.redrawNow();
     return { decision: "deny" };
   };
   if (duplex) {
@@ -7709,6 +7721,9 @@ async function repl(args, ai, cfg, cwd) {
     if (workerOptions.permissions)
       workerOptions.permissions = new PermissionPolicy({ ...workerOptions.permissions.options, host: void 0, ask: duplexAsk });
     workerOptions.planMode = false;
+    workerChrome = args.voice ? "minimal" : cfg.workerChrome ?? "full";
+    const workerDisplay = displayHooks(agent.options.fs, { gate: () => workerChrome === "full", background: () => editorRef?.redrawNow() });
+    workerOptions.hooks = cfg.hooks ? composeHooks(workerDisplay, hooksFromConfig(cfg.hooks)) : workerDisplay;
     const base = makeHost("text", { stream: true });
     const host = {
       ...base,
@@ -7738,6 +7753,13 @@ async function repl(args, ai, cfg, cwd) {
           editorRef?.redrawNow();
           return;
         }
+        if (typeof e.kind === "string" && e.kind.startsWith("task_")) {
+          spinner.stop();
+          err("\r\x1B[0J" + dim(`  \xB7 ${e.message}
+`));
+          editorRef?.redrawNow();
+          return;
+        }
         base.notify(e);
       }
     };
@@ -8167,7 +8189,19 @@ ${extra}` : body);
         else err(dim("  " + (duplex ? `voice ${dx.options.voiceModel} \xB7 worker ${work.model}` : work.model) + "\n"));
       }
     },
-    ...duplex ? { "voice-model": {
+    ...duplex ? { workers: {
+      desc: "duplex worker chrome \u2014 /workers <full|minimal>: per-step \u2699 tool activity vs task events only",
+      run: async (a) => {
+        if (a[0] === "full" || a[0] === "minimal") {
+          workerChrome = a[0];
+          err(green(`  \u2713 worker chrome \u2192 ${a[0]}
+`));
+          return;
+        }
+        err(dim(`  worker chrome: ${workerChrome} (use /workers full|minimal)
+`));
+      }
+    }, "voice-model": {
       desc: "switch the duplex voice (fast) model \u2014 /voice-model <id>, or alone for a picker",
       run: async (a) => {
         const apply = (id) => {