@henryqw/pi-subagent 22.0.0 → 22.1.0

package/README.md

@@ -27,6 +27,8 @@ Ask Main to delegate a bounded task, such as “Have a scout trace sign-in witho
 
 Commands are for you; tools and the packaged skill are for Main. You do not need to call agent tools or manage candidate identities yourself.
 
+In the TUI, the compact widget uses one row per visible agent/task: `D` or `I` marks direct or isolated work, and `[S]` or `[I3]` identifies the Role initial (plus the isolated model class: `1` fast, `2` balanced, `3` frontier, `*` fav). Direct rows show the launched model, thinking level, elapsed time, and measured session tokens (`— tok` until usage is available). Isolated rows show the recorded task state and any retained workspace; their status glyphs use the active TUI theme, while the text still names the status without color. Herdr does not currently provide reliable live model, thinking, or token readings for those rows. Attention appears before ordinary work, with a `+N more` summary when direct rows overflow. A ready isolated candidate is **not promoted** to Main. Use `/subagent` or `subagent_status` for exact identities, failures, and recovery.
+
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | `/subagent` | command | Pick direct or isolated work to inspect; send or edit pending instructions for a locally active isolated changeset. Requires interactive TUI or RPC. |

package/dist/direct-herdr.d.ts

@@ -8,9 +8,11 @@ export interface DirectHandle {
     sessionFile: string;
     prompt: string;
     answer(maxBytes: number): Promise<string>;
+    usageTokens(): Promise<number | undefined>;
     cancel(): Promise<void>;
 }
 export declare function exactDirectAnswer(jsonl: string, prompt: string, maxBytes?: number): string;
+export declare function directSessionTokens(jsonl: string, prompt: string): number | undefined;
 export type DirectTab = Pick<DirectHandle, "name" | "tabId" | "paneId" | "sessionFile">;
 export declare function createDirectHerdr(pi: Pick<ExtensionAPI, "exec">, cwd: string, idleMs: number): {
     start(launch: ResolvedRoleLaunch, name: string, label: string, task: string, signal: AbortSignal, onTab: (tab: DirectTab) => void): Promise<DirectHandle>;

package/dist/direct-herdr.js

@@ -70,6 +70,43 @@ export function exactDirectAnswer(jsonl, prompt, maxBytes = ANSWER_LIMIT) {
         throw new Error(`Pi final answer exceeds the ${maxBytes}-byte workflow limit; read the private session file for recovery.`);
     return text;
 }
+// Ignore a partial trailing JSONL entry while the child is writing it.
+export function directSessionTokens(jsonl, prompt) {
+    let active = false;
+    let total = 0;
+    let observed = false;
+    for (const line of jsonl.split("\n")) {
+        if (!line.trim())
+            continue;
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            break;
+        }
+        if (entry.type !== "message" || !entry.message || typeof entry.message !== "object")
+            continue;
+        const message = entry.message;
+        if (message.role === "user") {
+            active = Array.isArray(message.content) && message.content.length === 1
+                && message.content[0]?.text === prompt;
+            if (active) {
+                total = 0;
+                observed = false;
+            }
+        }
+        else if (active && message.role === "assistant" && message.usage && typeof message.usage === "object") {
+            const usage = message.usage;
+            const values = [usage.input, usage.output, usage.cacheRead, usage.cacheWrite];
+            if (values.every((value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0)) {
+                total += values.reduce((sum, value) => sum + value, 0);
+                observed = true;
+            }
+        }
+    }
+    return observed ? total : undefined;
+}
 export function createDirectHerdr(pi, cwd, idleMs) {
     if (process.env.HERDR_ENV !== "1")
         throw new Error("Direct delegation requires a Herdr-managed Pi pane (HERDR_ENV=1).");
@@ -131,8 +168,20 @@ export function createDirectHerdr(pi, cwd, idleMs) {
                 const state = inspect(accepted, "agent_prompted", name, paneId, tabId);
                 if (state === "blocked" || state === "unknown")
                     throw new Error(`Herdr agent became ${state}; inspect it before retrying.`);
+                let lastUsageSize = -1;
+                let lastTokens;
                 return {
                     name, tabId, paneId, sessionFile, prompt,
+                    async usageTokens() {
+                        const info = await stat(sessionFile);
+                        if (info.size > SESSION_LIMIT)
+                            return undefined;
+                        if (info.size !== lastUsageSize) {
+                            lastTokens = directSessionTokens(await readFile(sessionFile, "utf8"), prompt);
+                            lastUsageSize = info.size;
+                        }
+                        return lastTokens;
+                    },
                     async answer(maxBytes) {
                         const readAnswer = async () => {
                             const info = await stat(sessionFile);

package/dist/git-runtime.js

@@ -321,10 +321,8 @@ export class CheckedGitRuntime {
         if (!await this.isAncestor(requiredBase, identity.head, worktree.cwd, context)) {
             throw new Error(`Task ${task.id} tip does not descend from its recorded base ${requiredBase}.`);
         }
-        if (requireChange) {
-            const count = Number.parseInt(oneLine(await this.requireGit(["rev-list", "--count", `${requiredBase}..${identity.head}`], worktree.cwd, context), "task commit count"), 10);
-            if (!Number.isSafeInteger(count) || count < 1)
-                throw new Error(`Task ${task.id} has no committed change from its recorded base.`);
+        if (requireChange && identity.head === requiredBase) {
+            throw new Error(`Task ${task.id} has no committed change from its recorded base.`);
         }
         return identity;
     }

package/dist/launch-runtime.js

@@ -157,7 +157,7 @@ export class RoleLaunchRuntime {
         if (typeof resolvedRoot !== "string" || !isAbsolute(resolvedRoot) || resolvedRoot.includes("\0")) {
             throw new Error("Pi Subagent root resolver must return an absolute canonical path.");
         }
-        const root = normalize(await realpath(resolvedRoot));
+        const root = await realpath(resolvedRoot);
         if (root !== resolvedRoot)
             throw new Error("Pi Subagent root resolver returned a non-canonical path.");
         const rootInfo = await lstat(root);

package/dist/store.js

@@ -189,7 +189,7 @@ export class FileRunStore {
                 throw new Error(`Pi Subagent request ${state.request.id} already exists.`);
             throw error;
         }
-        const saved = parseRunState(structuredClone(state));
+        const saved = JSON.parse(contents);
         this.onStateSaved?.(structuredClone(saved));
         return this.handle(saved, path);
     }
@@ -282,7 +282,7 @@ export class FileRunStore {
         return new RunStateHandle(state, path, async (contents) => {
             await this.assertSafeDestination(state.root, path);
             await writePrivateTextFileAtomically(path, contents);
-            this.onStateSaved?.(parseRunState(JSON.parse(contents)));
+            this.onStateSaved?.(JSON.parse(contents));
         });
     }
 }

package/extensions/admission.ts

@@ -1,6 +1,6 @@
 import { realpath } from "node:fs/promises";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { Role } from "../src/index.ts";
+import type { Role } from "../dist/index.js";
 
 const READ_ONLY_TOOLS = new Set([
 	"read", "grep", "find", "ffgrep", "fffind", "ls", "codegraph_explore", "subagent_status",

package/extensions/isolated.ts

@@ -1,19 +1,20 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { EphemeralSubagentExecutor } from "../src/ephemeral.ts";
-import { ROLE_TOOL_POLICY_FLAG } from "../src/index.ts";
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import type { EphemeralSubagentExecutor } from "../dist/ephemeral.js";
+import { ROLE_TOOL_POLICY_FLAG } from "../dist/index.js";
 import type { EffectiveExecutionPolicy } from "./config.ts";
 import {
 	createCanonicalGitRootResolver,
 	createExactJudgmentExecutor,
-} from "../src/composition.ts";
+} from "../dist/composition.js";
 import {
 	CheckedGitRuntime,
 	type DirectProcessRunner,
-} from "../src/git-runtime.ts";
-import { HerdrHostRuntime } from "../src/herdr-runtime.ts";
-import { runProcess as directRunProcess } from "../src/process.ts";
-import { RoleLaunchRuntime, type LaunchRuntimeOptions } from "../src/launch-runtime.ts";
-import { IsolatedRunner, type OperationContext, type RunResponse } from "../src/runner.ts";
+} from "../dist/git-runtime.js";
+import { HerdrHostRuntime } from "../dist/herdr-runtime.js";
+import { runProcess as directRunProcess } from "../dist/process.js";
+import { RoleLaunchRuntime, type LaunchRuntimeOptions } from "../dist/launch-runtime.js";
+import { IsolatedRunner, type OperationContext, type RunResponse } from "../dist/runner.js";
 import {
 	IdOnlySchema,
 	ResumeRequestSchema,
@@ -31,14 +32,15 @@ import {
 	type RunState,
 	type WorktreeAllocationIntent,
 	type WorkspaceAllocationIntent,
-} from "../src/schema.ts";
-import { FileRunStore } from "../src/store.ts";
+} from "../dist/schema.js";
+import { FileRunStore } from "../dist/store.js";
 import type { IsolatedInventory } from "./subagent-command.ts";
 
 const LOOKUP_ROOT_TIMEOUT_MS = 5_000;
 const PUBLIC_EVIDENCE_MAX_BYTES = 512;
 const WORKSPACE_WIDGET_KEY = "pi-subagent-workspaces";
 const WIDGET_FIELD_MAX_CHARS = 32;
+const MAX_WORKSPACE_WIDGET_LINES = 6;
 
 export interface IsolatedExtensionComponents {
 	runner: IsolatedRunner;
@@ -112,18 +114,26 @@ function workspaceStatus(status: RunState["tasks"][number]["status"]): string {
 
 export function workspaceWidgetLines(state: RunState): string[] | undefined {
 	const rows = state.tasks.flatMap((taskState) => {
-		if (taskState.kind !== "changeset") return [];
+		const task = state.request.tasks.find((candidate) => candidate.id === taskState.taskId);
+		if (!task) return [];
+		const status = state.status === "aborted" ? "aborted" : workspaceStatus(taskState.status);
+		if (taskState.kind === "text") {
+			return taskState.status === "running" || taskState.status === "needs_attention"
+				? [`${status === "attention" ? "!" : status === "aborted" ? "■" : "◌"} I ${workspaceBadge(task.role, task.modelClass)} ${compactWidgetField(task.id)} · ${status === "attention" ? `attention · ${compactWidgetField(taskState.failure ?? status)}` : status}`]
+				: [];
+		}
 		const attempt = taskState.attempts.at(-1);
 		const allocation = [...(attempt?.allocations ?? [])].reverse().find(
 			(candidate): candidate is WorkspaceAllocationIntent =>
 				candidate.kind === "workspace" && candidate.status !== "absent",
 		);
 		const workspaceCleanup = attempt?.cleanup.find((step) => step.kind === "workspace");
-		if (!allocation || workspaceCleanup?.status === "completed") return [];
-		const task = state.request.tasks.find((candidate) => candidate.id === taskState.taskId);
-		if (!task || task.kind !== "changeset") return [];
-		const status = state.status === "aborted" ? "aborted" : workspaceStatus(taskState.status);
-		return `${workspaceBadge(task.role, task.modelClass)} ${compactWidgetField(allocation.label)} · ${status} · ${compactWidgetField(task.id)}`;
+		if (workspaceCleanup?.status === "completed" || (!allocation && !["allocating", "working", "attention"].includes(status))) return [];
+		const symbol = status === "attention" ? "!" : status === "ready" || status === "completed" ? "✓"
+			: ["working", "allocating", "integrating", "cleanup"].includes(status) ? "◌" : "■";
+		const detail = status === "ready" ? "candidate ready · Main not promoted"
+			: status === "attention" ? `attention · ${compactWidgetField(taskState.failure ?? "needs attention")}` : status;
+		return `${symbol} I ${workspaceBadge(task.role, task.modelClass)} ${compactWidgetField(task.id)} · ${detail}${allocation ? ` · ${compactWidgetField(allocation.label)}` : ""}`;
 	});
 	return rows.length ? rows : undefined;
 }
@@ -134,8 +144,21 @@ function updateWorkspaceWidget(ctx: ExtensionContext, state: RunState, rowsByReq
 	if (rows) rowsByRequest.set(key, rows);
 	else rowsByRequest.delete(key);
 	if (!ctx.hasUI) return;
-	const allRows = [...rowsByRequest.values()].flat();
-	ctx.ui.setWidget(WORKSPACE_WIDGET_KEY, allRows.length ? allRows : undefined);
+	const allRows = [...rowsByRequest.values()].flat().sort((a, b) =>
+		(a.startsWith("!") ? 0 : a.startsWith("◌") ? 1 : 2) - (b.startsWith("!") ? 0 : b.startsWith("◌") ? 1 : 2));
+	const shown = allRows.length > MAX_WORKSPACE_WIDGET_LINES
+		? [...allRows.slice(0, MAX_WORKSPACE_WIDGET_LINES - 1), `+${allRows.length - MAX_WORKSPACE_WIDGET_LINES + 1} more · /subagent`]
+		: allRows;
+	ctx.ui.setWidget(WORKSPACE_WIDGET_KEY, shown.length ? (_tui, theme) => ({
+		invalidate() {},
+		render(width) {
+			return shown.map((line) => {
+				const color = line.startsWith("!") ? "error" : line.startsWith("◌") ? "accent"
+					: line.startsWith("✓") ? "success" : line.startsWith("■") ? "warning" : undefined;
+				return truncateToWidth(color ? theme.fg(color, line[0]!) + line.slice(1) : line, width);
+			});
+		},
+	}) : undefined);
 }
 
 function updateWorkspaceWidgetSafely(ctx: ExtensionContext, state: RunState, rowsByRequest: Map<string, string[]>): void {

package/extensions/result-transport.ts

@@ -49,10 +49,6 @@ export type WorkflowTransport = {
 
 type Evidence = { heading: string; preview: string; remainder: string };
 
-function compareEntries(left: WorkflowTransportEntry, right: WorkflowTransportEntry): number {
-	return left.index - right.index || (left.id < right.id ? -1 : left.id > right.id ? 1 : 0);
-}
-
 function splitEvidence(text: string): [string, string] {
 	const preview = Array.from(text).slice(0, EVIDENCE_PREVIEW_CODE_POINTS).join("");
 	return [preview, text.slice(preview.length)];
@@ -114,7 +110,7 @@ function evidenceFor(entry: WorkflowTransportEntry, position: number, total: num
 }
 
 export function formatWorkflowResult(mode: WorkflowMode, entries: readonly WorkflowTransportEntry[]): WorkflowTransport {
-	const ordered = [...entries].sort(compareEntries);
+	const ordered = [...entries].sort((left, right) => left.index - right.index);
 	if (ordered.some(({ status }) => status === "pending" || status === "running")) {
 		throw new TypeError("Final workflow transport requires terminal entry states.");
 	}

package/extensions/subagent.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
-import { type Component, Text, type TUI, truncateToWidth } from "@earendil-works/pi-tui";
+import { type Component, Text, type TUI, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { availableTaskModels, loadTaskModelsConfig, modelReference, registerModelTask, resolveAvailableModel, type ResolvedTaskRoute, taskThinkingLevels } from "@henryqw/pi-task-models";
 import { capEphemeralSubagentOutput as capOutput, createEphemeralSubagentExecutor, DELEGATE_TASK, formatDuration, loadRoles, prepareRoleLaunch, ROLE_TOOL_POLICY_FLAG, type EphemeralSubagentTimeout, type Role } from "@henryqw/pi-subagent";
 import { DEFAULT_EXECUTION_POLICY, DEFAULT_TIMEOUT_CONFIG, readSubagentConfig, resolveExecutionPolicy, type EffectiveExecutionPolicy } from "./config.ts";
@@ -10,13 +10,12 @@ import { registerSubagentCommand, type DirectTask } from "./subagent-command.ts"
 import { MODEL_CLASS_GUIDANCE } from "./model-class-policy.ts";
 import { formatWorkflowResult, presentWorkflowEntryStatus, type BackgroundWorkflowTransportDetails, type WorkflowTransportEntry } from "./result-transport.ts";
 import { DelegateTaskSchema, identifyWorkflowEntries, parseDelegateTask, runForegroundWorkflow, type Delegation, type ParsedWorkflow, type WorkflowEntry } from "./workflow.ts";
-import { createDirectHerdr, type DirectHandle, type DirectTab } from "../src/direct-herdr.ts";
-import { materializeTransientLaunch } from "../src/launch-runtime.ts";
+import { createDirectHerdr, type DirectHandle, type DirectTab } from "../dist/direct-herdr.js";
+import { materializeTransientLaunch } from "../dist/launch-runtime.js";
 const WIDGET_KEY = "subagent-status";
-const WIDGET_INTERVAL_MS = 80;
+const WIDGET_INTERVAL_MS = 1_000;
 const MAX_WIDGET_ITEMS = 8;
 const MAX_WIDGET_LINES = 6;
-const MAX_WIDGET_GROUP_ROWS = 3;
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 
 type TimeoutPolicy = EphemeralSubagentTimeout;
@@ -30,6 +29,7 @@ type WidgetItem = {
 	startedAt: number;
 	status: WidgetStatus;
 	finishedAt?: number;
+	tokens?: number;
 };
 
 function roleBadge(role: string): string {
@@ -55,15 +55,8 @@ function statusLabel(status: WidgetStatus): string {
 	}
 }
 
-function activityLabel(item: WidgetItem): string {
-	if (item.status === "success") return "Done";
-	if (item.status === "failure") return "Failed";
-	if (item.status === "aborted") return "Stopped";
-	return "working…";
-}
-
-function activityMetrics(item: WidgetItem, now: number): string {
-	return `${item.model}·${item.thinkingLevel} · ${formatDuration((item.finishedAt ?? now) - item.startedAt)}`;
+function tokenLabel(tokens: number | undefined): string {
+	return tokens === undefined ? "— tok" : `${tokens < 1_000 ? tokens : `${(tokens / 1_000).toFixed(1).replace(/\.0$/, "")}k`} tok`;
 }
 
 function renderWidgetRows(
@@ -73,36 +66,26 @@ function renderWidgetRows(
 	spinnerIndex: number,
 	theme: Theme,
 ): string[] {
-	const ordered = [...items.filter(({ status }) => status === "working"), ...items.filter(({ status }) => status !== "working")];
-	if (!ordered.length) return [];
-	const groups = new Map<string, { name: string; items: WidgetItem[] }>();
-	for (const item of ordered) {
-		const group = groups.get(item.taskId);
-		if (group) group.items.push(item);
-		else groups.set(item.taskId, { name: item.name, items: [item] });
-	}
-	const maxVisibleLines = ordered.length + groups.size > MAX_WIDGET_LINES ? MAX_WIDGET_LINES - 1 : MAX_WIDGET_LINES;
-	const workingGroups = [...groups.values()].filter(({ items }) => items.some(({ status }) => status === "working"));
-	const visibleWorkingGroups = new Set(workingGroups.slice(0, Math.floor(maxVisibleLines / 2)));
-	let remainingWorkingGroups = visibleWorkingGroups.size;
-	const visible = new Set<WidgetItem>();
-	const lines: string[] = [];
-	for (const group of groups.values()) {
-		const working = group.items.some(({ status }) => status === "working");
-		if (working && !visibleWorkingGroups.has(group)) continue;
-		const reservedLines = working ? --remainingWorkingGroups * 2 : 0;
-		const childCount = Math.min(MAX_WIDGET_GROUP_ROWS, group.items.length, maxVisibleLines - lines.length - reservedLines - 1);
-		if (childCount < 1) continue;
-		lines.push(truncateToWidth(theme.fg("text", group.name), width));
-		for (const item of group.items.slice(0, childCount)) {
-			visible.add(item);
-			lines.push(truncateToWidth(
-				`  ${statusGlyph(item.status, spinnerIndex, theme)} ${theme.fg("accent", item.role)} ${theme.fg("text", activityLabel(item))} · ${theme.fg("muted", activityMetrics(item, now))}`,
-				width,
-			));
+	const ordered = [...items].sort((a, b) =>
+		(a.status === "failure" ? 0 : a.status === "working" ? 1 : 2)
+		- (b.status === "failure" ? 0 : b.status === "working" ? 1 : 2));
+	const visible = ordered.slice(0, ordered.length > MAX_WIDGET_LINES ? MAX_WIDGET_LINES - 1 : MAX_WIDGET_LINES);
+	const lines = visible.map((item) => {
+		const prefix = `${statusGlyph(item.status, spinnerIndex, theme)} ${theme.fg("accent", `D ${item.role}`)} ${item.status === "working" ? "" : `${statusLabel(item.status)} · `}`;
+		const metrics = [
+			`${item.model}/${item.thinkingLevel}`,
+			tokenLabel(item.tokens),
+			formatDuration((item.finishedAt ?? now) - item.startedAt),
+		];
+		while (metrics.length && width - visibleWidth(prefix) - visibleWidth(` · ${metrics.join(" · ")}`) < 8) {
+			if (metrics.length === 2) metrics.shift(); // Preserve measured tokens ahead of route details.
+			else metrics.pop();
 		}
-	}
-	const hidden = ordered.filter((item) => !visible.has(item));
+		const suffix = metrics.length ? ` · ${theme.fg("muted", metrics.join(" · "))}` : "";
+		const name = truncateToWidth(theme.fg("text", item.name), Math.max(0, width - visibleWidth(prefix) - visibleWidth(suffix)));
+		return truncateToWidth(`${prefix}${name}${suffix}`, width);
+	});
+	const hidden = ordered.slice(visible.length);
 	if (hidden.length) {
 		const counts: Record<WidgetStatus, number> = { working: 0, success: 0, failure: 0, aborted: 0 };
 		for (const { status } of hidden) counts[status] += 1;
@@ -177,6 +160,8 @@ export default function subagentExtension(
 		].join("\n"), outputPad, 0);
 	});
 	const widgetItems = new Map<string, WidgetItem>();
+	const tokenHandles = new Map<string, DirectHandle>();
+	const samplingTokens = new Set<string>();
 	const loadedConfig = readSubagentConfig();
 	let initialPolicy: EffectiveExecutionPolicy;
 	try {
@@ -252,6 +237,7 @@ export default function subagentExtension(
 	let widgetInstalled = false;
 	let widgetTimer: ReturnType<typeof setInterval> | undefined;
 	let spinnerIndex = 0;
+	let widgetTicks = 0;
 	let activeTui: TUI | undefined;
 	const stopWidgetTimer = () => {
 		if (!widgetTimer) return;
@@ -266,6 +252,19 @@ export default function subagentExtension(
 		widgetTimer = setInterval(() => {
 			spinnerIndex = (spinnerIndex + 1) % SPINNER_FRAMES.length;
 			requestWidgetRender();
+			if (++widgetTicks % 2 !== 0) return;
+			for (const [id, handle] of tokenHandles) {
+				if (samplingTokens.has(id)) continue;
+				samplingTokens.add(id);
+				void handle.usageTokens().then((tokens) => {
+					const item = widgetItems.get(id);
+					if (tokens !== undefined && item?.status === "working" && tokenHandles.get(id) === handle) {
+						item.tokens = tokens;
+						requestWidgetRender();
+					}
+				}).catch(() => { /* Usage is optional; never interrupt work for telemetry. */ })
+					.finally(() => samplingTokens.delete(id));
+			}
 		}, WIDGET_INTERVAL_MS);
 		widgetTimer.unref();
 	};
@@ -316,6 +315,7 @@ export default function subagentExtension(
 	const finishWidgetItem = (id: string, status: Exclude<WidgetStatus, "working">) => {
 		const item = widgetItems.get(id);
 		if (!item) return;
+		tokenHandles.delete(id);
 		item.status = status;
 		item.finishedAt = Date.now();
 		if (![...widgetItems.values()].some(({ status }) => status === "working")) stopWidgetTimer();
@@ -357,6 +357,8 @@ export default function subagentExtension(
 	pi.on("session_shutdown", async (_event, ctx) => {
 		stopWidgetTimer();
 		widgetItems.clear();
+		tokenHandles.clear();
+		samplingTokens.clear();
 		activeTui = undefined;
 		widgetInstalled = false;
 		if (ctx.hasUI) ctx.ui.setWidget(WIDGET_KEY, undefined);
@@ -506,6 +508,7 @@ export default function subagentExtension(
 				}
 				await transient.cleanup();
 				handles.push(handle);
+				if (widgetItems.has(entry.id)) tokenHandles.set(entry.id, handle);
 				return handle;
 			};
 			// The first tab is verified before returning a handle; subsequent independent
@@ -538,12 +541,16 @@ export default function subagentExtension(
 						active++;
 						return () => { active--; queue.shift()?.(); };
 					};
-					await runForegroundWorkflow(toolCallId, workflow, async (entry) => {
+					await runForegroundWorkflow(workflow.mode, entries, async (entry) => {
 						const release = await permit();
 						try {
 							controller.signal.throwIfAborted();
 							const handle = entry.index === 0 ? first : await launch(entry, controller.signal);
 							const answer = await handle.answer(Math.floor(40 * 1024 / entries.length));
+							try {
+								const tokens = await handle.usageTokens();
+								if (tokens !== undefined && widgetItems.has(entry.id)) widgetItems.get(entry.id)!.tokens = tokens;
+							} catch { /* Optional telemetry. */ }
 							const base = states.get(entry.id)!;
 							states.set(entry.id, { id: base.id, index: base.index, name: base.name, role: base.role,
 								...(base.model ? { model: base.model } : {}), ...(base.thinkingLevel ? { thinkingLevel: base.thinkingLevel } : {}),

package/extensions/workflow.ts

@@ -3,11 +3,18 @@ import { DISPLAY_TEXT_CONTRACT } from "@henryqw/pi-subagent";
 import { PROFILE_NAMES } from "@henryqw/pi-task-models";
 import { Type, type Static } from "typebox";
 import { Check, Errors } from "typebox/value";
-import { ExecuteRequestSchema, parseExecuteRequest, type ExecuteRequest } from "../src/schema.ts";
-import { TaskNameSchema, normalizeTaskName } from "./task-name.ts";
+import { ExecuteRequestSchema, parseExecuteRequest, type ExecuteRequest } from "../dist/schema.js";
 
 export const MAX_WORKFLOW_ENTRIES = 8;
 
+const TASK_NAME_MAX_LENGTH = 29;
+const TaskNameSchema = Type.String({
+	minLength: 1,
+	maxLength: TASK_NAME_MAX_LENGTH,
+	description: `Short descriptive task name, about five words and fewer than ${TASK_NAME_MAX_LENGTH + 1} characters; C0/C1 control characters are rejected.`,
+	pattern: DISPLAY_TEXT_CONTRACT.pattern,
+});
+
 const RoleSchema = Type.String({ minLength: 1, pattern: DISPLAY_TEXT_CONTRACT.pattern, description: "Configured Subagent role name" });
 const TaskSchema = Type.String({ minLength: 1, description: "Bounded task packet" });
 const ModelSchema = Type.String({ minLength: 1, pattern: DISPLAY_TEXT_CONTRACT.pattern, description: "Designated model as provider/modelId; replaces the selected route model" });
@@ -55,6 +62,12 @@ function text(value: string, path: string): string {
 	return normalized;
 }
 
+function normalizeTaskName(value: string, path: string): string {
+	const normalized = value.trim();
+	if (!normalized) throw new Error(`${path} must be non-empty text.`);
+	return normalized;
+}
+
 function normalizeDelegation(value: Static<typeof DelegationSchema>, path: string): Delegation {
 	return {
 		role: text(value.role, `${path}.role`),
@@ -118,19 +131,18 @@ async function runEntry(entry: WorkflowEntry, run: DelegationRunner): Promise<st
 }
 
 export async function runForegroundWorkflow(
-	toolCallId: string,
-	workflow: ParsedWorkflow,
+	mode: WorkflowMode,
+	entries: readonly WorkflowEntry[],
 	run: DelegationRunner,
 	signal?: AbortSignal,
 ): Promise<void> {
 	signal?.throwIfAborted();
-	const entries = identifyWorkflowEntries(toolCallId, workflow);
-	if (workflow.mode === "single") {
+	if (mode === "single") {
 		await runEntry(entries[0]!, run);
 		signal?.throwIfAborted();
 		return;
 	}
-	if (workflow.mode === "parallel") {
+	if (mode === "parallel") {
 		await Promise.all(entries.map((entry) => runEntry(entry, run)));
 		signal?.throwIfAborted();
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-subagent",
-  "version": "22.0.0",
+  "version": "22.1.0",
   "description": "Delegate bounded direct work or durable checked isolated task graphs to Pi roles.",
   "keywords": [
     "pi-package",

package/extensions/task-name.ts

@@ -1,28 +0,0 @@
-import { DISPLAY_TEXT_CONTRACT } from "@henryqw/pi-subagent";
-import { Type, type Static } from "typebox";
-
-const TASK_NAME_MAX_LENGTH = 29 as const;
-const TASK_NAME_LIMIT_WORDING = `about five words and fewer than ${TASK_NAME_MAX_LENGTH + 1} characters`;
-
-export const TASK_NAME_CONTRACT = {
-	minLength: 1,
-	maxLength: TASK_NAME_MAX_LENGTH,
-	description: `Short descriptive task name, ${TASK_NAME_LIMIT_WORDING}; C0/C1 control characters are rejected.`,
-	controlRanges: DISPLAY_TEXT_CONTRACT.controlRanges,
-	pattern: DISPLAY_TEXT_CONTRACT.pattern,
-} as const;
-
-export const TaskNameSchema = Type.String({
-	minLength: TASK_NAME_CONTRACT.minLength,
-	maxLength: TASK_NAME_CONTRACT.maxLength,
-	description: TASK_NAME_CONTRACT.description,
-	pattern: TASK_NAME_CONTRACT.pattern,
-});
-
-export type TaskName = Static<typeof TaskNameSchema>;
-
-export function normalizeTaskName(value: TaskName, path: string): TaskName {
-	const normalized = value.trim();
-	if (!normalized) throw new Error(`${path} must be non-empty text.`);
-	return normalized;
-}