@yagni-app/code-staging 0.3.0-staging.1071.1 → 0.3.0-staging.1077.1

package/dist/extension/askYagniTool.js

@@ -1,10 +1,24 @@
+import { Container, Spacer, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { collectRepoDocs } from "./repoDocs.js";
 import { friendlyFetchError, METERED_POST_FETCH_POLICY, resilientFetch } from "./resilientFetch.js";
+import { markdownOrPlain } from "./subagentRender.js";
 const parameters = Type.Object({
     question: Type.String(),
     context: Type.Optional(Type.String()),
 });
+/** Collapsed answer preview length, in lines. */
+const ANSWER_PREVIEW_LINES = 4;
+/** Collapse whitespace and clip to `max`, appending an ellipsis when cut. */
+function clipLine(text, max) {
+    const collapsed = text.replace(/\s+/g, " ").trim();
+    if (collapsed.length <= max)
+        return collapsed;
+    return `${collapsed.slice(0, max - 1)}…`;
+}
+function citationCount(n) {
+    return n === 1 ? "1 citation" : `${n} citations`;
+}
 /**
  * Build the `ask_yagni` tool definition.
  *
@@ -28,6 +42,41 @@ export function makeAskYagniTool(opts) {
             "When you use an answer, quote or reference its citations so the user can verify the source.",
         ],
         parameters,
+        renderCall(args, theme) {
+            const t = theme;
+            let text = `${t.fg("toolTitle", t.bold("ask_yagni"))} ${t.fg("dim", clipLine(args?.question ?? "…", 100))}`;
+            if (args?.context)
+                text += t.fg("muted", " (+context)");
+            return new Text(text, 0, 0);
+        },
+        renderResult(result, { expanded, isPartial }, theme) {
+            const t = theme;
+            const answer = result.content.find((c) => c.type === "text")?.text ?? "";
+            const citations = result.details?.citations ?? [];
+            if (isPartial)
+                return new Text(t.fg("muted", answer || "Asking YAGNI…"), 0, 0);
+            if (expanded) {
+                const container = new Container();
+                container.addChild(markdownOrPlain(answer || "(no answer)", t));
+                if (citations.length > 0) {
+                    container.addChild(new Spacer(1));
+                    for (const c of citations) {
+                        container.addChild(new Text(`  ${t.fg("muted", "•")} ${t.fg("accent", c.title)} ${t.fg("dim", c.url)}`, 0, 0));
+                    }
+                }
+                return container;
+            }
+            const lines = answer.trim().split("\n");
+            const out = lines.slice(0, ANSWER_PREVIEW_LINES).map((l) => t.fg("toolOutput", l));
+            const meta = [];
+            if (citations.length > 0)
+                meta.push(citationCount(citations.length));
+            if (lines.length > ANSWER_PREVIEW_LINES || citations.length > 0)
+                meta.push("(ctrl+o to expand)");
+            if (meta.length > 0)
+                out.push(t.fg("muted", `  ${meta.join(" · ")}`));
+            return new Text(out.join("\n"), 0, 0);
+        },
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
             onUpdate?.({ content: [{ type: "text", text: "Asking YAGNI…" }], details: { citations: [] } });
             // Era-correct repo grounding: gather the working tree's most relevant docs

package/dist/extension/config.d.ts

@@ -72,13 +72,23 @@ export interface FetchCatalogOptions {
     getToken: () => string | undefined;
     fetchImpl?: typeof fetch;
 }
+/** The startup catalog response from GET /api/yagni-code/models. */
+export interface CatalogResult {
+    models: ModelEntry[];
+    /**
+     * Per-workspace Guardian kill switch (yagni_code.guardian). Fail-safe:
+     * only an explicit `false` from the backend disables the Guardian — a
+     * missing field (older backend) reads as enabled.
+     */
+    guardianEnabled: boolean;
+}
 /**
  * Fetch the YAGNI model catalog at startup.
  *
  * @throws an actionable Error (mentioning `yagni login`) on any non-2xx
  * response so the launcher can surface a clear re-authentication prompt.
  */
-export declare function fetchCatalog(opts: FetchCatalogOptions): Promise<ModelEntry[]>;
+export declare function fetchCatalog(opts: FetchCatalogOptions): Promise<CatalogResult>;
 /** The startup company brief returned by GET /api/yagni-code/context. */
 export interface ContextBrief {
     brief: string;

package/dist/extension/config.js

@@ -85,7 +85,7 @@ export async function fetchCatalog(opts) {
         throw new Error(`Failed to fetch YAGNI model catalog (HTTP ${res.status}). Run \`yagni login\` to re-authenticate.`);
     }
     const data = (await res.json());
-    return data.models;
+    return { models: data.models, guardianEnabled: data.guardianEnabled !== false };
 }
 /** Shape-check for a caller label: mirrors the model proxy's own validation regex. */
 const CALLER_LABEL_RE = /^[a-z0-9][a-z0-9:_.-]{0,63}$/i;

package/dist/extension/execPolicy.d.ts

@@ -39,6 +39,14 @@ export interface PrefixRule {
     pattern: (string | string[])[];
     decision: ExecDecision;
     justification: string;
+    /**
+     * Escape hatch for allow rules whose command has a mutating flag: if any
+     * token AFTER the matched prefix equals one of these (or, for entries ending
+     * in "*", starts with the part before the star), the rule does NOT match and
+     * evaluation falls through to later rules (usually landing in the prompt
+     * band). Example: sed is read-only except with -i/--in-place.
+     */
+    unlessTokens?: string[];
     /** Positive test invocations (validated at load if present). */
     match?: string[][];
     /** Negative test invocations (validated at load if present). */

package/dist/extension/execPolicy.js

@@ -243,6 +243,17 @@ function matchRule(tokens, rule) {
                 return false;
         }
     }
+    if (rule.unlessTokens) {
+        for (const tok of tokens.slice(rule.pattern.length)) {
+            for (const unless of rule.unlessTokens) {
+                const matches = unless.endsWith("*")
+                    ? tok.startsWith(unless.slice(0, -1))
+                    : tok === unless;
+                if (matches)
+                    return false;
+            }
+        }
+    }
     return true;
 }
 /** Classify a single command segment (no shell constructs). */
@@ -340,11 +351,43 @@ export const DEFAULT_EXEC_POLICY = {
         { pattern: ["true"], decision: "allow", justification: "no-op success" },
         { pattern: ["false"], decision: "allow", justification: "no-op failure" },
         { pattern: ["test"], decision: "allow", justification: "test condition" },
-        { pattern: ["find", ".", "-name"], decision: "allow", justification: "search for files by name" },
-        { pattern: ["find", ".", "-type"], decision: "allow", justification: "search for files by type" },
+        {
+            pattern: ["find"],
+            decision: "allow",
+            justification: "search for files (read-only without -delete/-exec)",
+            unlessTokens: ["-delete", "-exec", "-execdir", "-ok", "-okdir", "-fprint*", "-fls"],
+        },
         { pattern: ["grep"], decision: "allow", justification: "search text" },
         { pattern: ["rg"], decision: "allow", justification: "search text (ripgrep)" },
         { pattern: ["ag"], decision: "allow", justification: "search text (silver searcher)" },
+        { pattern: ["cd"], decision: "allow", justification: "change directory (scoped to this bash invocation)" },
+        {
+            pattern: ["sed"],
+            decision: "allow",
+            justification: "stream-edit text to stdout (read-only without -i)",
+            unlessTokens: ["-i*", "--in-place*"],
+        },
+        { pattern: ["awk"], decision: "allow", justification: "text processing to stdout" },
+        { pattern: ["sort"], decision: "allow", justification: "sort lines" },
+        { pattern: ["uniq"], decision: "allow", justification: "filter duplicate lines" },
+        { pattern: ["cut"], decision: "allow", justification: "extract columns" },
+        { pattern: ["tr"], decision: "allow", justification: "translate characters" },
+        { pattern: ["diff"], decision: "allow", justification: "compare files" },
+        { pattern: ["nl"], decision: "allow", justification: "number lines" },
+        { pattern: ["jq"], decision: "allow", justification: "filter JSON to stdout" },
+        { pattern: ["stat"], decision: "allow", justification: "show file metadata" },
+        { pattern: ["file"], decision: "allow", justification: "identify file type" },
+        { pattern: ["basename"], decision: "allow", justification: "strip directory from path" },
+        { pattern: ["dirname"], decision: "allow", justification: "extract directory from path" },
+        { pattern: ["realpath"], decision: "allow", justification: "resolve a path" },
+        { pattern: ["readlink"], decision: "allow", justification: "resolve a symlink" },
+        { pattern: ["tree"], decision: "allow", justification: "list directory tree" },
+        { pattern: ["du"], decision: "allow", justification: "show disk usage" },
+        { pattern: ["df"], decision: "allow", justification: "show filesystem usage" },
+        { pattern: ["date"], decision: "allow", justification: "show date/time" },
+        { pattern: ["printf"], decision: "allow", justification: "print formatted text" },
+        { pattern: ["whoami"], decision: "allow", justification: "show current user" },
+        { pattern: ["uname"], decision: "allow", justification: "show system info" },
         { pattern: ["git", "status"], decision: "allow", justification: "show working tree status" },
         { pattern: ["git", "log"], decision: "allow", justification: "show commit log" },
         { pattern: ["git", "diff"], decision: "allow", justification: "show changes" },
@@ -353,6 +396,17 @@ export const DEFAULT_EXEC_POLICY = {
         { pattern: ["git", "remote"], decision: "allow", justification: "list remotes" },
         { pattern: ["git", "rev-parse"], decision: "allow", justification: "resolve git refs" },
         { pattern: ["git", "worktree", "list"], decision: "allow", justification: "list worktrees" },
+        { pattern: ["git", "blame"], decision: "allow", justification: "show line authorship" },
+        { pattern: ["git", "grep"], decision: "allow", justification: "search tracked files" },
+        { pattern: ["git", "ls-files"], decision: "allow", justification: "list tracked files" },
+        { pattern: ["git", "describe"], decision: "allow", justification: "describe a commit" },
+        { pattern: ["git", "shortlog"], decision: "allow", justification: "summarize commit log" },
+        { pattern: ["git", "stash", "list"], decision: "allow", justification: "list stashes" },
+        { pattern: ["gh", "pr", ["view", "list", "diff", "checks", "status"]], decision: "allow", justification: "read pull request data" },
+        { pattern: ["gh", "issue", ["view", "list", "status"]], decision: "allow", justification: "read issue data" },
+        { pattern: ["gh", "run", ["view", "list"]], decision: "allow", justification: "read workflow run data" },
+        { pattern: ["gh", "repo", "view"], decision: "allow", justification: "read repository data" },
+        { pattern: ["gh", "search"], decision: "allow", justification: "search GitHub" },
         { pattern: ["node", "--version"], decision: "allow", justification: "check node version" },
         { pattern: ["node", "-v"], decision: "allow", justification: "check node version" },
         { pattern: ["npm", "ls"], decision: "allow", justification: "list installed packages" },

package/dist/extension/guardian.d.ts

@@ -37,6 +37,12 @@ export interface GuardianLimits {
     timeoutMs: number;
 }
 export declare const DEFAULT_GUARDIAN_LIMITS: GuardianLimits;
+/**
+ * Resolve Guardian limits from the environment. `YAGNI_GUARDIAN_MAX_REVIEWS`
+ * overrides the session review cap; anything non-numeric or < 1 falls back to
+ * the default (a bad value must never zero out the cap and lock the session).
+ */
+export declare function resolveGuardianLimits(env?: Record<string, string | undefined>): GuardianLimits;
 /** The model tier the Guardian runs on. Configurable via YAGNI_GUARDIAN_TIER. */
 export declare const GUARDIAN_MODEL_TIER = "efficient";
 /** Read-only tools — the Guardian can read files for context but cannot write or execute. */

package/dist/extension/guardian.js

@@ -25,6 +25,17 @@ export const DEFAULT_GUARDIAN_LIMITS = {
     maxConsecutiveDenials: 3,
     timeoutMs: 15_000,
 };
+/**
+ * Resolve Guardian limits from the environment. `YAGNI_GUARDIAN_MAX_REVIEWS`
+ * overrides the session review cap; anything non-numeric or < 1 falls back to
+ * the default (a bad value must never zero out the cap and lock the session).
+ */
+export function resolveGuardianLimits(env = process.env) {
+    const raw = env.YAGNI_GUARDIAN_MAX_REVIEWS?.trim();
+    const parsed = raw ? Number.parseInt(raw, 10) : NaN;
+    const maxReviews = Number.isFinite(parsed) && parsed >= 1 ? parsed : DEFAULT_GUARDIAN_LIMITS.maxReviews;
+    return { ...DEFAULT_GUARDIAN_LIMITS, maxReviews };
+}
 /** The model tier the Guardian runs on. Configurable via YAGNI_GUARDIAN_TIER. */
 export const GUARDIAN_MODEL_TIER = "efficient";
 /** Read-only tools — the Guardian can read files for context but cannot write or execute. */

package/dist/extension/index.d.ts

@@ -4,7 +4,7 @@ import { runInitPass as defaultRunInitPass } from "./initPass.js";
 import { fetchMcpServers as defaultFetchMcpServers } from "./mcpTools.js";
 import { type FlushOutcome, type SpoolClientOpts } from "./spool.js";
 import { type TokenProvider } from "./tokenProvider.js";
-import { type ContextBrief, type ModelEntry } from "./config.js";
+import { type CatalogResult, type ContextBrief } from "./config.js";
 /**
  * YAGNI Code extension entry point.
  *
@@ -31,7 +31,7 @@ export interface RegisterYagniDeps {
         baseUrl: string;
         getToken: () => string | undefined;
         fetchImpl?: typeof fetch;
-    }) => Promise<ModelEntry[]>;
+    }) => Promise<CatalogResult>;
     fetchContextBrief?: (opts: {
         baseUrl: string;
         getToken: () => string | undefined;
@@ -106,7 +106,7 @@ export { makeAskYagniTool } from "./askYagniTool.js";
 export { makeFileTicketTool, makeUpdateTicketStatusTool } from "./ticketTools.js";
 export { makeAskAdvisorTool, registerAdviseCommand } from "./askAdvisorTool.js";
 export { ADVISOR_TIER, DEFAULT_ADVISOR_LIMITS, decideConsult, formatAdvisorSubtotal, makeAdvisorState, } from "./advisor.js";
-export { DEFAULT_GUARDIAN_LIMITS, GUARDIAN_MODEL_TIER, formatGuardianSubtotal, makeGuardianState, reviewCommand, } from "./guardian.js";
+export { DEFAULT_GUARDIAN_LIMITS, GUARDIAN_MODEL_TIER, formatGuardianSubtotal, makeGuardianState, resolveGuardianLimits, reviewCommand, } from "./guardian.js";
 export type { GuardianOutcome, GuardianVerdict, GuardianState, GuardianStateHandle, GuardianLimits, ReviewResult, ReviewCommandDeps, } from "./guardian.js";
 export type { Citation, MakeAskYagniToolOptions } from "./askYagniTool.js";
 export { makeReviewBusinessMatchTool } from "./reviewTool.js";
@@ -124,7 +124,7 @@ export type { RunInitPassDeps, InitPassOutcome, RunTeamSetupDeps, TeamSetupOutco
 export { isInitDone, markInitDone, initDoneMarkerFile, _setInitDoneHomeForTest } from "./initDone.js";
 export { brandSystemPrompt, YAGNI_IDENTITY, YAGNI_IDENTITY_DRIVER, BRAND_NAME } from "./branding.js";
 export { attributionHeaders, isDriverCaller, fetchCatalog, getToken, getWorkspaceId, resolveBaseUrl, sanitizeCallerSegment, } from "./config.js";
-export type { FetchCatalogOptions, ModelEntry } from "./config.js";
+export type { CatalogResult, FetchCatalogOptions, ModelEntry } from "./config.js";
 export { buildYagniProvider } from "./provider.js";
 export { registerGoCommand } from "./pipeline/goCommand.js";
 export type { RegisterGoDeps } from "./pipeline/goCommand.js";

package/dist/extension/index.js

@@ -2,7 +2,7 @@ import { appendFileSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { Text } from "@earendil-works/pi-tui";
 import { DEFAULT_ADVISOR_LIMITS, formatAdvisorSubtotal, makeAdvisorState } from "./advisor.js";
-import { DEFAULT_GUARDIAN_LIMITS, formatGuardianSubtotal, GUARDIAN_MODEL_TIER, makeGuardianState, reviewCommand } from "./guardian.js";
+import { formatGuardianSubtotal, GUARDIAN_MODEL_TIER, makeGuardianState, resolveGuardianLimits, reviewCommand } from "./guardian.js";
 import { makeAskAdvisorTool, registerAdviseCommand } from "./askAdvisorTool.js";
 import { makeAskYagniTool } from "./askYagniTool.js";
 import { makeFileTicketTool, makeUpdateTicketStatusTool } from "./ticketTools.js";
@@ -127,7 +127,7 @@ export async function registerYagni(pi, deps = {}) {
     // after_provider_response event does NOT fire on a 401 (the OpenAI SDK throws
     // before onResponse is reached), so message_end is the only seam.
     let lastAuthRecovery = null;
-    const fullCatalog = await fetchCatalog({ baseUrl, getToken: getTokenFn, fetchImpl: authedFetch });
+    const { models: fullCatalog, guardianEnabled: workspaceGuardianEnabled } = await fetchCatalog({ baseUrl, getToken: getTokenFn, fetchImpl: authedFetch });
     // Lock the interactive session to the `advanced` tier only. The backend
     // catalog returns all tiers, but only `advanced` is registered with the
     // `yagni` provider, so /model and Ctrl+P show a single entry. Child
@@ -236,12 +236,19 @@ export async function registerYagni(pi, deps = {}) {
     // holds them, review mode confirms them.
     const modeHolder = createModeHolder();
     const guardianState = makeGuardianState();
-    const guardianDisabled = env.YAGNI_DISABLE_GUARDIAN === "1" || env.YAGNI_DISABLE_GUARDIAN === "true";
+    // Disabled by the local env override OR the workspace kill switch
+    // (yagni_code.guardian, read from the catalog response at launch). The env
+    // var wins for a single developer's debugging; the flag turns it off for
+    // every session in the workspace.
+    const guardianDisabled = env.YAGNI_DISABLE_GUARDIAN === "1" ||
+        env.YAGNI_DISABLE_GUARDIAN === "true" ||
+        !workspaceGuardianEnabled;
     const guardianTier = env.YAGNI_GUARDIAN_TIER ?? GUARDIAN_MODEL_TIER;
+    const guardianLimits = resolveGuardianLimits(env);
     registerPermissionGate(pi, {
         modeHolder,
         guardianState,
-        guardianLimits: DEFAULT_GUARDIAN_LIMITS,
+        guardianLimits,
         guardianTier,
         guardianDisabled,
         guardianReview: (command, deps) => reviewCommand(command, { ...deps, modelTier: guardianTier }),
@@ -292,7 +299,7 @@ export async function registerYagni(pi, deps = {}) {
         // spend as an ordinary caller row.
         advisorSubtotal: () => {
             const advisor = formatAdvisorSubtotal(advisorState.read(), DEFAULT_ADVISOR_LIMITS);
-            const guardian = formatGuardianSubtotal(guardianState.read(), DEFAULT_GUARDIAN_LIMITS);
+            const guardian = formatGuardianSubtotal(guardianState.read(), guardianLimits);
             return [advisor, guardian].filter(Boolean).join(" ");
         },
         fetchHeadroom: async (signal) => {
@@ -674,7 +681,7 @@ export { makeAskYagniTool } from "./askYagniTool.js";
 export { makeFileTicketTool, makeUpdateTicketStatusTool } from "./ticketTools.js";
 export { makeAskAdvisorTool, registerAdviseCommand } from "./askAdvisorTool.js";
 export { ADVISOR_TIER, DEFAULT_ADVISOR_LIMITS, decideConsult, formatAdvisorSubtotal, makeAdvisorState, } from "./advisor.js";
-export { DEFAULT_GUARDIAN_LIMITS, GUARDIAN_MODEL_TIER, formatGuardianSubtotal, makeGuardianState, reviewCommand, } from "./guardian.js";
+export { DEFAULT_GUARDIAN_LIMITS, GUARDIAN_MODEL_TIER, formatGuardianSubtotal, makeGuardianState, resolveGuardianLimits, reviewCommand, } from "./guardian.js";
 export { makeReviewBusinessMatchTool } from "./reviewTool.js";
 export { makeRecordEngineeringContextTool } from "./recordContextTool.js";
 export { makeRecordDecisionTool } from "./recordDecisionTool.js";

package/dist/extension/subagentRender.d.ts

@@ -0,0 +1,129 @@
+/**
+ * Live progress model + TUI renderers for the `subagent` tool.
+ *
+ * The model half is PURE (mirrors `pipeline/activity.ts`): `applyChildEvent`
+ * folds one NDJSON event from a child into a bounded per-task progress record,
+ * and `finalizeTask` stamps the outcome from the runner's `StageResult`. The
+ * tool carries the folded records in its `details`, so every partial update the
+ * TUI sees is a complete picture of all tasks.
+ *
+ * The renderer half implements pi's per-tool rendering seam (`renderCall` /
+ * `renderResult`). Collapsed-while-running is the two-line pattern: a stable
+ * `agent — task` title over a churning `↳ current tool` line. Completion is a
+ * one-line receipt (`✓ agent · N tool uses · Xk tokens · Ys`); expanded shows
+ * the curated action log and the full report as markdown. String assembly is
+ * kept in pure helpers over a minimal {@link RenderTheme} so tests run against
+ * plain text — renderer exceptions are swallowed by pi (silently degrading to
+ * the bare title bar), so everything here must stay boringly total.
+ */
+import { type Component } from "@earendil-works/pi-tui";
+import type { JsonEvent, StageResult, StageUsage } from "./pipeline/types.js";
+/** The minimal slice of pi's `Theme` the renderers style with (same shape as FeedTheme). */
+export interface RenderTheme {
+    bold(text: string): string;
+    fg(color: string, text: string): string;
+}
+/** One curated line of a child's activity (tool action or narration headline). */
+export interface SubagentActionEntry {
+    kind: "action" | "narration";
+    text: string;
+    state: "running" | "done" | "error";
+    /** Resolves a running tool start against its end event. */
+    toolCallId?: string;
+}
+/** Live/final progress of one subagent task; rides the tool's `details`. */
+export interface SubagentTaskProgress {
+    agent: string;
+    task: string;
+    status: "running" | "done" | "error";
+    /** -1 while the child is still running (mirrors the pi subagent example). */
+    exitCode: number;
+    startedAt: number;
+    endedAt?: number;
+    toolCalls: number;
+    toolErrors: number;
+    usage: StageUsage;
+    /** Bounded curated log; oldest entries are dropped past ACTION_LOG_MAX. */
+    actions: SubagentActionEntry[];
+    droppedActions: number;
+    /** The child's final report, present once the task resolved. */
+    report?: string;
+    stopReason?: string;
+    errorMessage?: string;
+}
+export interface SubagentDetails {
+    tasks: SubagentTaskProgress[];
+}
+/** Bound on the retained action log so a chatty child cannot grow details unbounded. */
+export declare const ACTION_LOG_MAX = 120;
+export declare function newTaskProgress(agent: string, task: string, startedAt: number): SubagentTaskProgress;
+/**
+ * Fold one child NDJSON event into the task's progress. Returns true when the
+ * record changed (the tool emits an update), false for events we drop.
+ */
+export declare function applyChildEvent(p: SubagentTaskProgress, ev: JsonEvent): boolean;
+/** Stamp the runner's outcome onto the progress record. */
+export declare function finalizeTask(p: SubagentTaskProgress, result: StageResult, endedAt: number): void;
+/** 532 → "532", 41_234 → "41.2k", 1_240_000 → "1.2M". */
+export declare function formatTokens(n: number): string;
+/** 42_000 → "42s", 81_000 → "1m 21s", 3_720_000 → "1h 2m". */
+export declare function formatDuration(ms: number): string;
+/**
+ * The two-line live status for one running task: a stable `agent — task` title
+ * over the churning current-action line with elapsed time and live tokens.
+ */
+export declare function runningLines(p: SubagentTaskProgress, theme: RenderTheme, now: number, frame: string): string[];
+/** One-line completion receipt: `✓ agent · N tool uses · Xk tokens · Ys · $c`. */
+export declare function receiptLine(p: SubagentTaskProgress, theme: RenderTheme): string;
+/**
+ * Plain-text (no theme) summary for the partial result's `content`, so headless
+ * consumers and pi's fallback renderer still see live progress.
+ */
+export declare function progressSummaryText(tasks: SubagentTaskProgress[], now: number): string;
+/** The harness "Working…" replacement while subagents run. */
+export declare function formatWorkingMessage(tasks: SubagentTaskProgress[], now: number): string;
+/** The subagent tool's argument shape, partial while the model streams it. */
+interface SubagentCallArgs {
+    task?: string;
+    agent?: string;
+    tasks?: Array<{
+        task?: string;
+        agent?: string;
+    }>;
+}
+/** Renderer-row state shared across renders of one tool call (context.state). */
+interface LiveRenderState {
+    timer?: ReturnType<typeof setInterval>;
+}
+interface RenderContextSlice {
+    state?: LiveRenderState;
+    invalidate: () => void;
+}
+/** Title painted the moment the call streams in (before any execution output). */
+export declare function renderSubagentCall(args: SubagentCallArgs | undefined, theme: RenderTheme, _context: unknown): Component;
+/**
+ * A prose body as markdown when the TUI's markdown theme is available.
+ * `getMarkdownTheme()` hands back a lazy proxy that only throws when a style is
+ * first USED, so the fallback must wrap `render`, not construction — otherwise
+ * an uninitialized theme would blow up mid-paint and pi would silently degrade
+ * the whole row to the bare title bar.
+ */
+export declare function markdownOrPlain(body: string, theme: RenderTheme): Component;
+/**
+ * Result renderer: live two-line status per task while partial; receipts plus
+ * report preview when collapsed; action log plus full markdown report when
+ * expanded. Drives its own refresh while running via an unref'd interval on
+ * `context.state` (pi has no unmount hook — the final render clears it).
+ */
+export declare function renderSubagentResult(result: {
+    content: Array<{
+        type: string;
+        text?: string;
+    }>;
+    details?: unknown;
+}, options: {
+    expanded: boolean;
+    isPartial: boolean;
+}, theme: RenderTheme, context: RenderContextSlice): Component;
+export {};
+//# sourceMappingURL=subagentRender.d.ts.map

package/dist/extension/subagentRender.js

@@ -0,0 +1,441 @@
+/**
+ * Live progress model + TUI renderers for the `subagent` tool.
+ *
+ * The model half is PURE (mirrors `pipeline/activity.ts`): `applyChildEvent`
+ * folds one NDJSON event from a child into a bounded per-task progress record,
+ * and `finalizeTask` stamps the outcome from the runner's `StageResult`. The
+ * tool carries the folded records in its `details`, so every partial update the
+ * TUI sees is a complete picture of all tasks.
+ *
+ * The renderer half implements pi's per-tool rendering seam (`renderCall` /
+ * `renderResult`). Collapsed-while-running is the two-line pattern: a stable
+ * `agent — task` title over a churning `↳ current tool` line. Completion is a
+ * one-line receipt (`✓ agent · N tool uses · Xk tokens · Ys`); expanded shows
+ * the curated action log and the full report as markdown. String assembly is
+ * kept in pure helpers over a minimal {@link RenderTheme} so tests run against
+ * plain text — renderer exceptions are swallowed by pi (silently degrading to
+ * the bare title bar), so everything here must stay boringly total.
+ */
+import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
+import { narrationHeadline, toolLabel } from "./pipeline/activity.js";
+import { SPINNER_FRAMES } from "./pipeline/activityFeed.js";
+/** Bound on the retained action log so a chatty child cannot grow details unbounded. */
+export const ACTION_LOG_MAX = 120;
+/** How many of the newest actions the expanded view paints. */
+const EXPANDED_ACTIONS_SHOWN = 30;
+/** Collapsed report preview length, in lines. */
+const REPORT_PREVIEW_LINES = 3;
+/** Task preview width on the running title line. */
+const TASK_PREVIEW_MAX = 64;
+/** Spinner cadence; matches the /go feed's SPINNER_TICK_MS. */
+const SPINNER_TICK_MS = 120;
+const EMPTY_USAGE = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
+export function newTaskProgress(agent, task, startedAt) {
+    return {
+        agent,
+        task,
+        status: "running",
+        exitCode: -1,
+        startedAt,
+        toolCalls: 0,
+        toolErrors: 0,
+        usage: { ...EMPTY_USAGE },
+        actions: [],
+        droppedActions: 0,
+    };
+}
+function pushAction(p, entry) {
+    if (p.actions.length >= ACTION_LOG_MAX) {
+        p.actions.shift();
+        p.droppedActions += 1;
+    }
+    p.actions.push(entry);
+}
+/** Last text part of an assistant message, or undefined. */
+function lastMessageText(ev) {
+    const parts = ev.message?.content ?? [];
+    for (let i = parts.length - 1; i >= 0; i--) {
+        const part = parts[i];
+        if (part?.type === "text" && typeof part.text === "string")
+            return part.text;
+    }
+    return undefined;
+}
+/**
+ * Fold one child NDJSON event into the task's progress. Returns true when the
+ * record changed (the tool emits an update), false for events we drop.
+ */
+export function applyChildEvent(p, ev) {
+    switch (ev.type) {
+        case "tool_execution_start": {
+            const entry = {
+                kind: "action",
+                text: toolLabel(ev.toolName ?? "", ev.args),
+                state: "running",
+            };
+            if (ev.toolCallId !== undefined)
+                entry.toolCallId = ev.toolCallId;
+            pushAction(p, entry);
+            return true;
+        }
+        case "tool_execution_end": {
+            p.toolCalls += 1;
+            if (ev.isError)
+                p.toolErrors += 1;
+            for (let i = p.actions.length - 1; i >= 0; i--) {
+                const a = p.actions[i];
+                if (a.kind !== "action" || a.state !== "running")
+                    continue;
+                if (ev.toolCallId !== undefined && a.toolCallId !== ev.toolCallId)
+                    continue;
+                a.state = ev.isError ? "error" : "done";
+                break;
+            }
+            return true;
+        }
+        case "message_end": {
+            const msg = ev.message;
+            if (msg?.role !== "assistant")
+                return false;
+            p.usage.turns += 1;
+            const u = msg.usage;
+            if (u) {
+                p.usage.input += u.input ?? 0;
+                p.usage.output += u.output ?? 0;
+                p.usage.cacheRead += u.cacheRead ?? 0;
+                p.usage.cacheWrite += u.cacheWrite ?? 0;
+                p.usage.cost += u.cost?.total ?? 0;
+            }
+            const text = lastMessageText(ev);
+            const headline = text !== undefined ? narrationHeadline(text) : null;
+            if (headline)
+                pushAction(p, { kind: "narration", text: headline, state: "done" });
+            return true;
+        }
+        default:
+            return false;
+    }
+}
+/** Stamp the runner's outcome onto the progress record. */
+export function finalizeTask(p, result, endedAt) {
+    // An aborted child can close with exit 0 (SIGTERM close reports a null code),
+    // so the stop reason outranks the exit code for the status glyph.
+    p.status = result.exitCode === 0 && result.stopReason !== "aborted" ? "done" : "error";
+    p.exitCode = result.exitCode;
+    p.endedAt = endedAt;
+    p.usage = { ...result.usage };
+    p.toolCalls = result.toolCalls;
+    p.toolErrors = result.toolErrors;
+    p.report = result.finalOutput;
+    if (result.stopReason)
+        p.stopReason = result.stopReason;
+    if (result.errorMessage)
+        p.errorMessage = result.errorMessage;
+}
+// ── Formatting helpers ────────────────────────────────────────────────────────
+/** Collapse whitespace and clip to `max`, appending an ellipsis when cut. */
+function clip(text, max) {
+    const collapsed = text.replace(/\s+/g, " ").trim();
+    if (collapsed.length <= max)
+        return collapsed;
+    return `${collapsed.slice(0, max - 1)}…`;
+}
+function trimTrailingZero(v) {
+    const s = v.toFixed(1);
+    return s.endsWith(".0") ? s.slice(0, -2) : s;
+}
+/** 532 → "532", 41_234 → "41.2k", 1_240_000 → "1.2M". */
+export function formatTokens(n) {
+    if (n < 1000)
+        return String(n);
+    if (n < 1_000_000)
+        return `${trimTrailingZero(n / 1000)}k`;
+    return `${trimTrailingZero(n / 1_000_000)}M`;
+}
+/** 42_000 → "42s", 81_000 → "1m 21s", 3_720_000 → "1h 2m". */
+export function formatDuration(ms) {
+    const s = Math.max(0, Math.floor(ms / 1000));
+    if (s < 60)
+        return `${s}s`;
+    const m = Math.floor(s / 60);
+    if (m < 60)
+        return `${m}m ${s % 60}s`;
+    return `${Math.floor(m / 60)}h ${m % 60}m`;
+}
+function countToolUses(n) {
+    return n === 1 ? "1 tool use" : `${n} tool uses`;
+}
+/** Tokens the child actually generated/consumed (cache reads excluded). */
+function taskTokens(p) {
+    return p.usage.input + p.usage.output;
+}
+/** The most recent still-running tool action, if any. */
+function currentActionText(p) {
+    for (let i = p.actions.length - 1; i >= 0; i--) {
+        const a = p.actions[i];
+        if (a.kind === "action" && a.state === "running")
+            return a.text;
+    }
+    return undefined;
+}
+/** What the child is doing right now: current tool → tool-use count → starting. */
+function liveDetailText(p) {
+    return currentActionText(p) ?? (p.toolCalls > 0 ? countToolUses(p.toolCalls) : "starting…");
+}
+/**
+ * The two-line live status for one running task: a stable `agent — task` title
+ * over the churning current-action line with elapsed time and live tokens.
+ */
+export function runningLines(p, theme, now, frame) {
+    const title = `${frame} ${theme.fg("accent", p.agent)} — ${theme.fg("dim", clip(p.task, TASK_PREVIEW_MAX))}`;
+    let detail = `  ${theme.fg("muted", "↳")} ${theme.fg("toolOutput", liveDetailText(p))}`;
+    detail += theme.fg("dim", ` · ${formatDuration(now - p.startedAt)}`);
+    const tokens = taskTokens(p);
+    if (tokens > 0)
+        detail += theme.fg("dim", ` · ${formatTokens(tokens)} tokens`);
+    return [title, detail];
+}
+/** One-line completion receipt: `✓ agent · N tool uses · Xk tokens · Ys · $c`. */
+export function receiptLine(p, theme) {
+    const parts = [
+        countToolUses(p.toolCalls),
+        `${formatTokens(taskTokens(p))} tokens`,
+        formatDuration((p.endedAt ?? p.startedAt) - p.startedAt),
+    ];
+    if (p.toolErrors > 0)
+        parts.push(`${p.toolErrors} tool ${p.toolErrors === 1 ? "error" : "errors"}`);
+    if (p.usage.cost > 0)
+        parts.push(`$${p.usage.cost.toFixed(2)}`);
+    const name = theme.bold(theme.fg("accent", p.agent));
+    if (p.status === "error") {
+        const reason = p.stopReason ?? (p.exitCode >= 0 ? `exit ${p.exitCode}` : "failed");
+        return `${theme.fg("error", "✗")} ${name} ${theme.fg("error", `failed (${reason})`)} ${theme.fg("dim", `· ${parts.join(" · ")}`)}`;
+    }
+    return `${theme.fg("success", "✓")} ${name} ${theme.fg("dim", `· ${parts.join(" · ")}`)}`;
+}
+/** Aggregate receipt across parallel tasks. */
+function totalLine(tasks, theme) {
+    const toolCalls = tasks.reduce((n, p) => n + p.toolCalls, 0);
+    const tokens = tasks.reduce((n, p) => n + taskTokens(p), 0);
+    const cost = tasks.reduce((n, p) => n + p.usage.cost, 0);
+    const start = Math.min(...tasks.map((p) => p.startedAt));
+    const end = Math.max(...tasks.map((p) => p.endedAt ?? p.startedAt));
+    const parts = [countToolUses(toolCalls), `${formatTokens(tokens)} tokens`, formatDuration(end - start)];
+    if (cost > 0)
+        parts.push(`$${cost.toFixed(2)}`);
+    return theme.fg("dim", `${tasks.length} subagents · ${parts.join(" · ")}`);
+}
+/**
+ * Plain-text (no theme) summary for the partial result's `content`, so headless
+ * consumers and pi's fallback renderer still see live progress.
+ */
+export function progressSummaryText(tasks, now) {
+    const plain = { bold: (s) => s, fg: (_c, s) => s };
+    return tasks
+        .map((p) => p.status === "running"
+        ? `${p.agent}: ${liveDetailText(p)} · ${formatDuration(now - p.startedAt)}`
+        : receiptLine(p, plain))
+        .join("\n");
+}
+/** The harness "Working…" replacement while subagents run. */
+export function formatWorkingMessage(tasks, now) {
+    const toolCalls = tasks.reduce((n, p) => n + p.toolCalls, 0);
+    const started = Math.min(...tasks.map((p) => p.startedAt));
+    const elapsed = formatDuration(now - started);
+    if (tasks.length === 1) {
+        return `subagent ${tasks[0].agent} · ${countToolUses(toolCalls)} · ${elapsed}`;
+    }
+    const running = tasks.filter((p) => p.status === "running").length;
+    const label = running > 0 && running < tasks.length ? `${running}/${tasks.length} subagents` : `${tasks.length} subagents`;
+    return `${label} · ${countToolUses(toolCalls)} · ${elapsed}`;
+}
+/** Title painted the moment the call streams in (before any execution output). */
+export function renderSubagentCall(args, theme, _context) {
+    const title = theme.fg("toolTitle", theme.bold("subagent"));
+    const a = args ?? {};
+    if (a.tasks && a.tasks.length > 0) {
+        let text = `${title} ${theme.fg("accent", `${a.tasks.length} parallel tasks`)}`;
+        for (const t of a.tasks) {
+            text += `\n  ${theme.fg("accent", t.agent ?? "general")} ${theme.fg("dim", clip(t.task ?? "…", TASK_PREVIEW_MAX))}`;
+        }
+        return new Text(text, 0, 0);
+    }
+    let text = `${title} ${theme.fg("accent", a.agent ?? "general")}`;
+    if (a.task)
+        text += `\n  ${theme.fg("dim", clip(a.task, 2 * TASK_PREVIEW_MAX))}`;
+    return new Text(text, 0, 0);
+}
+function fallbackText(result) {
+    const first = result.content.find((c) => c.type === "text" && typeof c.text === "string");
+    return new Text(first?.text ?? "(no output)", 0, 0);
+}
+function actionGlyph(a, theme) {
+    if (a.kind === "narration")
+        return theme.fg("muted", "·");
+    if (a.state === "error")
+        return theme.fg("error", "✗");
+    if (a.state === "running")
+        return theme.fg("muted", "→");
+    return theme.fg("muted", "→");
+}
+function actionLogLines(p, theme, shown) {
+    const lines = [];
+    const tail = p.actions.slice(-shown);
+    const skipped = p.droppedActions + (p.actions.length - tail.length);
+    if (skipped > 0)
+        lines.push(theme.fg("muted", `  … ${skipped} earlier actions`));
+    for (const a of tail) {
+        const color = a.kind === "narration" ? "dim" : a.state === "error" ? "error" : "toolOutput";
+        lines.push(`  ${actionGlyph(a, theme)} ${theme.fg(color, clip(a.text, 110))}`);
+    }
+    return lines;
+}
+/**
+ * Fail-open degradation is still worth seeing: warn (not error — falling back to
+ * plain text is recoverable, nothing to page on) so an unexpected markdown
+ * failure is observable. Once per component, because the render path repaints on
+ * every frame and the "no TUI" case would otherwise flood the log.
+ */
+function warnMarkdownFallback(phase, err) {
+    const message = err instanceof Error ? err.message : String(err);
+    try {
+        console.warn(JSON.stringify({
+            source: "yagni-subagent-render",
+            level: "warning",
+            message: "markdown rendering unavailable; falling back to plain text",
+            phase,
+            error: message,
+        }));
+    }
+    catch {
+        console.warn(`[yagni-subagent-render] markdown ${phase} failed: ${message}`);
+    }
+}
+/**
+ * A prose body as markdown when the TUI's markdown theme is available.
+ * `getMarkdownTheme()` hands back a lazy proxy that only throws when a style is
+ * first USED, so the fallback must wrap `render`, not construction — otherwise
+ * an uninitialized theme would blow up mid-paint and pi would silently degrade
+ * the whole row to the bare title bar.
+ */
+export function markdownOrPlain(body, theme) {
+    const plain = new Text(theme.fg("toolOutput", body.trim()), 0, 0);
+    let markdown;
+    try {
+        markdown = new Markdown(body.trim(), 0, 0, getMarkdownTheme());
+    }
+    catch (err) {
+        warnMarkdownFallback("construct", err);
+        return plain;
+    }
+    let warned = false;
+    return {
+        render(width) {
+            try {
+                return markdown.render(width);
+            }
+            catch (err) {
+                if (!warned) {
+                    warned = true;
+                    warnMarkdownFallback("render", err);
+                }
+                return plain.render(width);
+            }
+        },
+        invalidate() {
+            markdown.invalidate?.();
+            plain.invalidate();
+        },
+    };
+}
+/**
+ * Result renderer: live two-line status per task while partial; receipts plus
+ * report preview when collapsed; action log plus full markdown report when
+ * expanded. Drives its own refresh while running via an unref'd interval on
+ * `context.state` (pi has no unmount hook — the final render clears it).
+ */
+export function renderSubagentResult(result, options, theme, context) {
+    const details = result.details;
+    const tasks = details?.tasks;
+    const state = context.state ?? {};
+    if (options.isPartial) {
+        if (!state.timer) {
+            state.timer = setInterval(() => context.invalidate(), SPINNER_TICK_MS);
+            state.timer.unref?.();
+        }
+    }
+    else if (state.timer) {
+        clearInterval(state.timer);
+        delete state.timer;
+    }
+    if (!tasks || tasks.length === 0)
+        return fallbackText(result);
+    if (options.isPartial) {
+        const now = Date.now();
+        const frame = SPINNER_FRAMES[Math.floor(now / SPINNER_TICK_MS) % SPINNER_FRAMES.length];
+        const lines = [];
+        for (const p of tasks) {
+            if (lines.length > 0)
+                lines.push("");
+            if (p.status === "running")
+                lines.push(...runningLines(p, theme, now, frame));
+            else
+                lines.push(receiptLine(p, theme));
+            if (options.expanded)
+                lines.push(...actionLogLines(p, theme, EXPANDED_ACTIONS_SHOWN));
+        }
+        return new Text(lines.join("\n"), 0, 0);
+    }
+    if (options.expanded) {
+        const container = new Container();
+        tasks.forEach((p, i) => {
+            if (i > 0)
+                container.addChild(new Spacer(1));
+            container.addChild(new Text(receiptLine(p, theme), 0, 0));
+            container.addChild(new Text(theme.fg("dim", `  ${clip(p.task, 2 * TASK_PREVIEW_MAX)}`), 0, 0));
+            if (p.errorMessage)
+                container.addChild(new Text(theme.fg("error", `  ${clip(p.errorMessage, 200)}`), 0, 0));
+            const log = actionLogLines(p, theme, EXPANDED_ACTIONS_SHOWN);
+            if (log.length > 0)
+                container.addChild(new Text(log.join("\n"), 0, 0));
+            const report = (p.report ?? "").trim();
+            if (report) {
+                container.addChild(new Spacer(1));
+                container.addChild(markdownOrPlain(report, theme));
+            }
+        });
+        if (tasks.length > 1) {
+            container.addChild(new Spacer(1));
+            container.addChild(new Text(totalLine(tasks, theme), 0, 0));
+        }
+        return container;
+    }
+    // Collapsed, final: receipts + a short report preview per task.
+    const lines = [];
+    let truncated = false;
+    for (const p of tasks) {
+        if (lines.length > 0)
+            lines.push("");
+        lines.push(receiptLine(p, theme));
+        if (p.errorMessage)
+            lines.push(theme.fg("error", `  ${clip(p.errorMessage, 160)}`));
+        const report = (p.report ?? "").trim();
+        if (report) {
+            const reportLines = report.split("\n");
+            for (const l of reportLines.slice(0, REPORT_PREVIEW_LINES)) {
+                lines.push(theme.fg("toolOutput", `  ${l}`));
+            }
+            if (reportLines.length > REPORT_PREVIEW_LINES)
+                truncated = true;
+        }
+        if (p.actions.length > 0)
+            truncated = true;
+    }
+    if (tasks.length > 1)
+        lines.push("", totalLine(tasks, theme));
+    if (truncated)
+        lines.push(theme.fg("muted", "  (ctrl+o to expand)"));
+    return new Text(lines.join("\n"), 0, 0);
+}
+//# sourceMappingURL=subagentRender.js.map

package/dist/extension/subagents.d.ts

@@ -21,6 +21,7 @@ import { type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-cod
 import { Type } from "typebox";
 import { runStage } from "./pipeline/runner.js";
 import type { ModelTier, PipelineStage } from "./pipeline/types.js";
+import { renderSubagentCall, renderSubagentResult } from "./subagentRender.js";
 export declare const SUBAGENT_TOOL_NAME = "subagent";
 export declare const GENERAL_AGENT_NAME = "general";
 export declare const MAX_PARALLEL_SUBAGENTS = 4;
@@ -105,6 +106,8 @@ export declare function makeSubagentTool(deps?: MakeSubagentToolDeps): {
             agent: Type.TOptional<Type.TString>;
         }>>>;
     }>;
+    renderCall: typeof renderSubagentCall;
+    renderResult: typeof renderSubagentResult;
     execute(_toolCallId: string, params: SubagentParams, signal?: AbortSignal, onUpdate?: (update: {
         content: Array<{
             type: "text";
@@ -125,13 +128,7 @@ export declare function makeSubagentTool(deps?: MakeSubagentToolDeps): {
             text: string;
         }[];
         details: {
-            tasks: {
-                agent: string;
-                task: string;
-                exitCode: number;
-                usage: import("./pipeline/types.js").StageUsage;
-                toolCalls: number;
-            }[];
+            tasks: import("./subagentRender.js").SubagentTaskProgress[];
         };
     }>;
 };

package/dist/extension/subagents.js

@@ -24,6 +24,7 @@ import { parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { sanitizeCallerSegment } from "./config.js";
 import { runStage } from "./pipeline/runner.js";
+import { applyChildEvent, finalizeTask, formatWorkingMessage, newTaskProgress, progressSummaryText, renderSubagentCall, renderSubagentResult, } from "./subagentRender.js";
 /**
  * YAG-471 attribution: the `x-yagni-caller` prefix for a subagent invocation.
  * The sanitized agent name is capped so the WHOLE label (prefix + name) stays
@@ -276,6 +277,8 @@ export function makeSubagentTool(deps = {}) {
             "(list them with /agents); omit `agent` for the general-purpose one.",
         promptSnippet: "subagent: delegate a self-contained task (or parallel tasks) to a fresh-context agent; returns its report.",
         parameters,
+        renderCall: renderSubagentCall,
+        renderResult: renderSubagentResult,
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
             const fail = (text) => ({
                 content: [{ type: "text", text }],
@@ -304,31 +307,56 @@ export function makeSubagentTool(deps = {}) {
                 }
                 resolved.push({ def, task: req.task });
             }
-            onUpdate?.({
-                content: [
-                    {
-                        type: "text",
-                        text: resolved.length === 1
-                            ? `Running ${resolved[0].def.name} subagent…`
-                            : `Running ${resolved.length} subagents in parallel…`,
+            // Live progress: one folded record per task rides every partial update's
+            // `details` (rendered by renderSubagentResult), the plain-text summary
+            // rides `content` (pi's fallback renderer and headless consumers), and
+            // the harness "Working…" line mirrors the aggregate while children run.
+            const progresses = resolved.map(({ def, task }) => newTaskProgress(def.name, task, Date.now()));
+            const ui = ctx?.hasUI ? ctx.ui : undefined;
+            let lastWorking;
+            const emit = () => {
+                const now = Date.now();
+                onUpdate?.({
+                    content: [{ type: "text", text: progressSummaryText(progresses, now) }],
+                    details: {
+                        tasks: progresses.map((p) => ({ ...p, actions: [...p.actions], usage: { ...p.usage } })),
                     },
-                ],
-                details: {},
-            });
-            const outcomes = await Promise.all(resolved.map(async ({ def, task }) => {
-                const { stage, ctx: stageCtx } = buildSubagentStage(def, task);
-                const result = await run(stage, stageCtx, {
-                    cwd,
-                    signal,
-                    personaBody: () => def.body,
-                    // YAG-471: attribute this child's completions to the specific
-                    // subagent, not the generic /go stage label the runner would
-                    // otherwise derive from stage.id ("implement", reused as the
-                    // synthetic subagent stage — see buildSubagentStage).
-                    callerLabel: `${SUBAGENT_CALLER_PREFIX}${sanitizeCallerSegment(def.name, 64 - SUBAGENT_CALLER_PREFIX.length)}`,
                 });
-                return { agent: def.name, task, result };
-            }));
+                const working = formatWorkingMessage(progresses, now);
+                if (ui && working !== lastWorking) {
+                    lastWorking = working;
+                    ui.setWorkingMessage?.(working);
+                }
+            };
+            emit();
+            let outcomes;
+            try {
+                outcomes = await Promise.all(resolved.map(async ({ def, task }, index) => {
+                    const progress = progresses[index];
+                    const { stage, ctx: stageCtx } = buildSubagentStage(def, task);
+                    const result = await run(stage, stageCtx, {
+                        cwd,
+                        signal,
+                        personaBody: () => def.body,
+                        // YAG-471: attribute this child's completions to the specific
+                        // subagent, not the generic /go stage label the runner would
+                        // otherwise derive from stage.id ("implement", reused as the
+                        // synthetic subagent stage — see buildSubagentStage).
+                        callerLabel: `${SUBAGENT_CALLER_PREFIX}${sanitizeCallerSegment(def.name, 64 - SUBAGENT_CALLER_PREFIX.length)}`,
+                        onEvent: (ev) => {
+                            if (applyChildEvent(progress, ev))
+                                emit();
+                        },
+                    });
+                    finalizeTask(progress, result, Date.now());
+                    emit();
+                    return { agent: def.name, task, result };
+                }));
+            }
+            finally {
+                // Restore the default "Working…" text whether we resolved or threw.
+                ui?.setWorkingMessage?.();
+            }
             const allFailed = outcomes.every((o) => o.result.exitCode !== 0);
             const sections = outcomes.map((o) => {
                 const output = o.result.finalOutput.trim();
@@ -342,15 +370,10 @@ export function makeSubagentTool(deps = {}) {
             });
             return {
                 content: [{ type: "text", text: sections.join("\n\n") }],
-                details: {
-                    tasks: outcomes.map((o) => ({
-                        agent: o.agent,
-                        task: o.task,
-                        exitCode: o.result.exitCode,
-                        usage: o.result.usage,
-                        toolCalls: o.result.toolCalls,
-                    })),
-                },
+                // The folded progress records ARE the final details: a superset of the
+                // old {agent, task, exitCode, usage, toolCalls} shape, plus the action
+                // log and report that renderSubagentResult paints.
+                details: { tasks: progresses },
                 ...(allFailed ? { isError: true } : {}),
             };
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "0.3.0-staging.1071.1",
+  "version": "0.3.0-staging.1077.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": "9a7610bc34b0cbed0b665ea246880ea23470db78"
+  "yagniSourceSha": "38b2372ff55b9374b52e94a3836be6e8c942b8df"
 }