@yagni-app/code-staging 0.3.0-staging.1085.1 → 0.3.0-staging.1088.1

package/dist/extension/askAdvisorTool.d.ts

@@ -26,10 +26,12 @@
  * this module is the I/O.
  */
 import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { type Component } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { type AdvisorLimits, type AdvisorStateHandle } from "./advisor.js";
 import { runStage as defaultRunStage } from "./pipeline/runner.js";
 import type { PipelineStage } from "./pipeline/types.js";
+import { type RenderTheme, type SubagentTaskProgress } from "./subagentRender.js";
 /**
  * Read-only recon plus grounding. Mirrors the `plan` stage's allowlist for the
  * reason documented there: enough tools to navigate instead of flailing on a
@@ -66,10 +68,18 @@ export declare function buildConsultBrief(params: {
  * persona, and that is the advisor's own.
  */
 export declare function advisorStage(): PipelineStage;
-export declare function makeAskAdvisorTool(opts: MakeAskAdvisorToolOptions): ToolDefinition<typeof parameters, {
+/** The ask_advisor result details: consult accounting plus the live progress
+ * record the subagent renderers paint (one task, the consult itself). */
+export interface AdvisorToolDetails {
     consults: number;
     cost: number;
-}>;
+    tasks?: SubagentTaskProgress[];
+}
+/** Title painted the moment the ask_advisor call streams in. */
+export declare function renderAdvisorCall(args: {
+    question?: string;
+} | undefined, theme: RenderTheme, _context: unknown): Component;
+export declare function makeAskAdvisorTool(opts: MakeAskAdvisorToolOptions): ToolDefinition<typeof parameters, AdvisorToolDetails>;
 /**
  * `/advise <question>` — the manual escalation lever.
  *
@@ -77,6 +87,11 @@ export declare function makeAskAdvisorTool(opts: MakeAskAdvisorToolOptions): Too
  * consult draws on the same cap rather than opening a side channel around it.
  * The advice is sent into the conversation (like /go-compare's report) so the
  * driver sees it in context and can act on it.
+ *
+ * A command has no tool row for pi to render, so the live view is an
+ * aboveEditor widget painted from the tool's partial updates: the same
+ * two-line `agent — task` / `↳ current tool` status the subagent tool shows,
+ * driven by a spinner ticker so it visibly moves between child events.
  */
 export declare function registerAdviseCommand(pi: ExtensionAPI, tool: ReturnType<typeof makeAskAdvisorTool>): void;
 export {};

package/dist/extension/askAdvisorTool.js

@@ -25,9 +25,12 @@
  * The gate, the cap and the spend ceiling live in `advisor.ts` and are pure;
  * this module is the I/O.
  */
+import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { ADVISOR_MODEL_TIER, DEFAULT_ADVISOR_LIMITS, decideConsult, formatConsultCost, } from "./advisor.js";
+import { SPINNER_FRAMES } from "./pipeline/activityFeed.js";
 import { runStage as defaultRunStage } from "./pipeline/runner.js";
+import { applyChildEvent, finalizeTask, formatWorkingMessage, newTaskProgress, progressSummaryText, receiptLine, renderSubagentResult, runningLines, } from "./subagentRender.js";
 /**
  * Read-only recon plus grounding. Mirrors the `plan` stage's allowlist for the
  * reason documented there: enough tools to navigate instead of flailing on a
@@ -71,6 +74,24 @@ export function advisorStage() {
         taskTemplate: "{ticket}",
     };
 }
+/** Spinner cadence for the advisor's live views; matches subagentRender. */
+const SPINNER_TICK_MS = 120;
+/** Question preview width on the call title line. */
+const QUESTION_PREVIEW_MAX = 128;
+function clip(text, max) {
+    const collapsed = text.replace(/\s+/g, " ").trim();
+    if (collapsed.length <= max)
+        return collapsed;
+    return `${collapsed.slice(0, max - 1)}…`;
+}
+/** Title painted the moment the ask_advisor call streams in. */
+export function renderAdvisorCall(args, theme, _context) {
+    const title = theme.fg("toolTitle", theme.bold("advisor"));
+    let text = `${title} ${theme.fg("accent", "peak-tier consult")}`;
+    if (args?.question)
+        text += `\n  ${theme.fg("dim", clip(args.question, QUESTION_PREVIEW_MAX))}`;
+    return new Text(text, 0, 0);
+}
 export function makeAskAdvisorTool(opts) {
     const limits = opts.limits ?? DEFAULT_ADVISOR_LIMITS;
     const runStage = opts.runStage ?? defaultRunStage;
@@ -95,6 +116,8 @@ export function makeAskAdvisorTool(opts) {
             "The advice comes back as plain text: act on it, and call record_decision when it settles a product-intent call so the next agent inherits it.",
         ],
         parameters,
+        renderCall: renderAdvisorCall,
+        renderResult: renderSubagentResult,
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
             // Read the LIVE session model: pi's picker can change it after this tool
             // was registered, in both directions.
@@ -109,19 +132,51 @@ export function makeAskAdvisorTool(opts) {
                     details: { consults: opts.state.read().consults, cost: 0 },
                 };
             }
-            onUpdate?.({
-                content: [{ type: "text", text: "Consulting the advisor…" }],
-                details: { consults: opts.state.read().consults, cost: 0 },
-            });
-            const result = await runStage(advisorStage(), { ticket: buildConsultBrief(params) }, {
-                cwd: ctx?.cwd ?? process.cwd(),
-                ...(signal ? { signal } : {}),
-                // YAG-471: attribute the consult's completions to the advisor, not
-                // the "plan" stage id advisorStage() borrows (see its docblock).
-                callerLabel: "advisor",
-            });
+            // Live progress, exactly the subagent tool's shape: the folded record
+            // rides every partial update's `details.tasks` (painted by
+            // renderSubagentResult), the plain-text summary rides `content` for
+            // headless consumers, and the harness "Working…" line mirrors it.
+            const progress = newTaskProgress("advisor", params.question, Date.now());
+            const ui = ctx?.hasUI ? ctx.ui : undefined;
+            let lastWorking;
+            const emit = () => {
+                const now = Date.now();
+                onUpdate?.({
+                    content: [{ type: "text", text: progressSummaryText([progress], now) }],
+                    details: {
+                        consults: opts.state.read().consults,
+                        cost: progress.usage.cost,
+                        tasks: [{ ...progress, actions: [...progress.actions], usage: { ...progress.usage } }],
+                    },
+                });
+                const working = formatWorkingMessage([progress], now);
+                if (ui && working !== lastWorking) {
+                    lastWorking = working;
+                    ui.setWorkingMessage?.(working);
+                }
+            };
+            emit();
+            let result;
+            try {
+                result = await runStage(advisorStage(), { ticket: buildConsultBrief(params) }, {
+                    cwd: ctx?.cwd ?? process.cwd(),
+                    ...(signal ? { signal } : {}),
+                    // YAG-471: attribute the consult's completions to the advisor, not
+                    // the "plan" stage id advisorStage() borrows (see its docblock).
+                    callerLabel: "advisor",
+                    onEvent: (ev) => {
+                        if (applyChildEvent(progress, ev))
+                            emit();
+                    },
+                });
+            }
+            finally {
+                // Restore the default "Working…" text whether we resolved or threw.
+                ui?.setWorkingMessage?.();
+            }
             const cost = result.usage?.cost ?? 0;
             const state = opts.state.record(cost);
+            finalizeTask(progress, result, Date.now());
             if (result.exitCode !== 0 && !result.finalOutput.trim()) {
                 // Fail honestly rather than returning an empty recommendation. The
                 // consult still counts: it spawned, and it may well have spent.
@@ -134,7 +189,7 @@ export function makeAskAdvisorTool(opts) {
                                 `Decide this one yourself.`,
                         },
                     ],
-                    details: { consults: state.consults, cost },
+                    details: { consults: state.consults, cost, tasks: [progress] },
                 };
             }
             return {
@@ -144,11 +199,13 @@ export function makeAskAdvisorTool(opts) {
                         text: `${result.finalOutput.trim()}\n\n${formatConsultCost({ cost, consults: state.consults, limits })}`,
                     },
                 ],
-                details: { consults: state.consults, cost },
+                details: { consults: state.consults, cost, tasks: [progress] },
             };
         },
     };
 }
+/** The widget key the /advise live panel paints under. */
+const ADVISE_WIDGET_KEY = "yagni-advise";
 /**
  * `/advise <question>` — the manual escalation lever.
  *
@@ -156,6 +213,11 @@ export function makeAskAdvisorTool(opts) {
  * consult draws on the same cap rather than opening a side channel around it.
  * The advice is sent into the conversation (like /go-compare's report) so the
  * driver sees it in context and can act on it.
+ *
+ * A command has no tool row for pi to render, so the live view is an
+ * aboveEditor widget painted from the tool's partial updates: the same
+ * two-line `agent — task` / `↳ current tool` status the subagent tool shows,
+ * driven by a spinner ticker so it visibly moves between child events.
  */
 export function registerAdviseCommand(pi, tool) {
     pi.registerCommand("advise", {
@@ -175,8 +237,41 @@ export function registerAdviseCommand(pi, tool) {
                 return;
             }
             notify("Consulting the peak-tier advisor. This reads the repo, so it takes a moment.", "info");
+            // Live panel state: the newest folded progress record from the tool's
+            // partial updates, repainted on a spinner tick until the consult ends.
+            let progress;
+            let paintTimer;
+            const theme = ctx.hasUI ? ctx.ui.theme : undefined;
+            const paint = () => {
+                if (!ctx.hasUI || !theme || !progress)
+                    return;
+                const now = Date.now();
+                const lines = progress.status === "running"
+                    ? runningLines(progress, theme, now, SPINNER_FRAMES[Math.floor(now / SPINNER_TICK_MS) % SPINNER_FRAMES.length])
+                    : [receiptLine(progress, theme)];
+                ctx.ui.setWidget?.(ADVISE_WIDGET_KEY, lines, { placement: "aboveEditor" });
+            };
+            const onUpdate = (update) => {
+                const task = update.details?.tasks?.[0];
+                if (!task)
+                    return;
+                progress = task;
+                if (ctx.hasUI && theme && !paintTimer) {
+                    paintTimer = setInterval(paint, SPINNER_TICK_MS);
+                    paintTimer.unref?.();
+                }
+                paint();
+            };
+            const clearPanel = () => {
+                if (paintTimer) {
+                    clearInterval(paintTimer);
+                    paintTimer = undefined;
+                }
+                if (ctx.hasUI)
+                    ctx.ui.setWidget?.(ADVISE_WIDGET_KEY, undefined);
+            };
             try {
-                const out = await tool.execute("advise", { question }, ctx.signal, undefined, ctx);
+                const out = await tool.execute("advise", { question }, ctx.signal, onUpdate, ctx);
                 const text = out.content
                     .map((c) => c.text ?? "")
                     .join("\n")
@@ -188,6 +283,9 @@ export function registerAdviseCommand(pi, tool) {
                 notify(`/advise failed: ${message}`, "error");
                 await pi.sendUserMessage(`/advise failed: ${message}`);
             }
+            finally {
+                clearPanel();
+            }
         },
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "0.3.0-staging.1085.1",
+  "version": "0.3.0-staging.1088.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -38,5 +38,5 @@
     "@earendil-works/pi-tui": "0.84.1",
     "typebox": "^1.3.11"
   },
-  "yagniSourceSha": "2af1762b42b06fc1e55b7f85fbbed71ce3bd3272"
+  "yagniSourceSha": "eebceee1a0d1673dd4b2755942aa027a89f18611"
 }