@iowarp/clio-coder 0.5.0 → 0.5.2

package/src/interactive/footer/dashboard.ts

@@ -1,5 +1,6 @@
 import type { ClioSettings } from "../../core/config.js";
 import { readClioVersion } from "../../core/package-root.js";
+import type { LiveBudgetView } from "../../domains/context/budget/live-view.js";
 import type { ContextState } from "../../domains/context/index.js";
 import type { TaskMemoryOperatorStatus } from "../../domains/memory/index.js";
 import {
@@ -14,6 +15,7 @@ import {
 	resolveModelCapabilities,
 	resolveModelRuntimeCapabilitiesForProviders,
 } from "../../domains/providers/index.js";
+import type { UsageSnapshot } from "../../domains/quota/types.js";
 import type { LocalCapacity } from "../../domains/scheduling/local-capacity.js";
 import type { ContextUsageSnapshot } from "../../domains/session/context-accounting.js";
 import type { ContextLedger } from "../../domains/session/context-ledger.js";
@@ -88,6 +90,7 @@ export type { ToolTallySnapshot } from "./widgets.js";
 export type FooterDashboardMode = "compact" | "expanded";
 
 export interface FooterDashboardDeps {
+	getQuotaSnapshots?: () => ReadonlyArray<UsageSnapshot>;
 	getConnections?: () => { mcp: string[]; plugins: string[] };
 	getExtensionStatus?: () => ReadonlyArray<string>;
 	providers: ProvidersContract;
@@ -98,7 +101,8 @@ export interface FooterDashboardDeps {
 	getSessionTokens?: () => UsageBreakdown;
 	getTokenThroughput?: () => TokenThroughputSnapshot | null;
 	getSessionCost?: () => CostAggregate;
-	getContextUsage?: () => ContextUsageSnapshot;
+	getContextUsage?: () => ContextUsageSnapshot &
+		Partial<Pick<LiveBudgetView, "revision" | "historical" | "inputSource">>;
 	getContextLedger?: () => ContextLedger;
 	getDispatchRows?: () => ReadonlyArray<DispatchBoardRow>;
 	getTaskBoard?: () => TaskBoardSnapshot | null;
@@ -127,6 +131,8 @@ export interface FooterDashboardDeps {
 }
 
 export interface FooterDashboardRenderState {
+	quota?: ReadonlyArray<UsageSnapshot>;
+	quotaRoute?: Pick<DispatchBoardRow, "runtimeId" | "wireModelId" | "node">;
 	demoHint?: string | null;
 	resources?: LocalMachineMetrics | null;
 	connections?: { mcp: string[]; plugins: string[] };
@@ -413,6 +419,15 @@ export function buildFooterDashboard(deps: FooterDashboardDeps): FooterDashboard
 
 		return {
 			resources: machine.snapshot(),
+			quota: deps.getQuotaSnapshots?.() ?? [],
+			...(current?.runtime && wireModelId
+				? {
+						quotaRoute: {
+							runtimeId: current.runtime.id,
+							wireModelId,
+						},
+					}
+				: {}),
 			...(deps.getConnections ? { connections: deps.getConnections() } : {}),
 			...(settings ? { costCeilingUsd: settings.safety.limits.sessionCostUsd } : {}),
 
@@ -445,6 +460,15 @@ export function buildFooterDashboard(deps: FooterDashboardDeps): FooterDashboard
 					: null,
 			},
 			context: {
+				...(contextUsage?.revision
+					? {
+							budget: {
+								revision: contextUsage.revision,
+								historical: contextUsage.historical ?? true,
+								inputSource: contextUsage.inputSource ?? "unknown",
+							},
+						}
+					: {}),
 				label: null,
 				used: contextUsage?.tokens ?? null,
 				contextWindow: contextUsage?.contextWindow ?? null,

package/src/interactive/footer/key-hints.ts

@@ -14,8 +14,8 @@ export function footerKeyHint(now: number, narrow = false): string | null {
 		}),
 	];
 	const count = narrow ? 1 : 2;
-	const page = Math.floor(now / 12_000) % (Math.ceil(entries.length / count) + 1);
-	if (page === Math.ceil(entries.length / count)) return null;
+	if (!entries.length) return null;
+	const page = Math.floor(now / 12_000) % Math.ceil(entries.length / count);
 	const start = page * count;
 	return entries.slice(start, start + count).join(" · ");
 }

package/src/interactive/footer/pages.ts

@@ -1,24 +1,31 @@
 import { costAggregateForAmount, formatCostAggregate } from "../../domains/observability/index.js";
+import type { UsageSnapshot } from "../../domains/quota/types.js";
 /** Expanded footer pages: dense inspection, separate from transcript output style. */
 import { sanitizeCallTargetText } from "../../domains/safety/call-target.js";
 import { redactSecretString } from "../../domains/safety/redaction.js";
 import { getKeybindings, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "../../engine/tui.js";
-import { contextCategorySwatch, renderContextMeterBar, renderContextMeterGrid } from "../context-meter.js";
+import { contextCategorySwatch, renderContextMeterGrid } from "../context-meter.js";
 import { type DispatchBoardRow, dispatchStatusPresentation, renderDispatchActivity } from "../dispatch-board.js";
 import { formatFooterTokens } from "../footer-panel.js";
+import { renderQuotaAccounts, routeWeeklyQuota } from "../quota-view.js";
 import { previewRows } from "../renderers/preview.js";
 import { clioTheme, formatCompactMs, rule } from "../theme/index.js";
 import { fitIdentityLabel } from "../theme/labels.js";
 import type { FooterDashboardRenderState } from "./dashboard.js";
 import { footerKeyHint } from "./key-hints.js";
-import { activityQuadrant, contextQuadrant, zipColumns } from "./widgets.js";
+import { activityQuadrant, contextOccupancyBar, contextQuadrant, contextUsageText, zipColumns } from "./widgets.js";
 
 export const DASHBOARD_PAGES = ["Activity", "Context", "Status"] as const;
 export type DashboardPage = (typeof DASHBOARD_PAGES)[number];
 const ACTIVE_AGENT_STATUSES = new Set(["running", "enqueued", "cancelling", "retrying", "stale"]);
 const clean = (value: string) => sanitizeCallTargetText(redactSecretString(value));
 
-function agentCard(row: DispatchBoardRow, width: number, compact = false): string[] {
+function agentCard(
+	row: DispatchBoardRow,
+	width: number,
+	compact = false,
+	quota: ReadonlyArray<UsageSnapshot> = [],
+): string[] {
 	const theme = clioTheme();
 	const presentation = dispatchStatusPresentation(row.status, { compact: false });
 	const name = clean(row.agentId).replace(
@@ -34,6 +41,9 @@ function agentCard(row: DispatchBoardRow, width: number, compact = false): strin
 	const field = (label: string, value: string) =>
 		wrapTextWithAnsi(`${theme.fg("dim", `${label}  `)}${clean(value)}`, width);
 	lines.push(...previewRows(field("Route", `${row.targetId}/${row.wireModelId}`), 2, width));
+	const weekly = routeWeeklyQuota(row, quota);
+	if (weekly)
+		lines.push(...previewRows(field("Account", `Shared ${weekly.account} · ${weekly.label}`), compact ? 1 : 2, width));
 	if (row.taskSummary)
 		lines.push(...(compact ? previewRows(field("Task", row.taskSummary), 2, width) : field("Task", row.taskSummary)));
 	const activity = renderDispatchActivity(row, width);
@@ -107,8 +117,8 @@ function activityPage(state: FooterDashboardRenderState, width: number, budget:
 		if (first && second) {
 			cards.push(
 				...zipColumns(
-					agentCard(first, col, true),
-					agentCard(second, width - col - 5, true),
+					agentCard(first, col, true, state.quota),
+					agentCard(second, width - col - 5, true, state.quota),
 					col,
 					width - col - 5,
 					`  ${theme.fg("frame", "│")}  `,
@@ -119,7 +129,7 @@ function activityPage(state: FooterDashboardRenderState, width: number, budget:
 		}
 	} else
 		for (const row of active) {
-			const card = agentCard(row, width, active.length > 1 || cardBudget < 18);
+			const card = agentCard(row, width, active.length > 1 || cardBudget < 18, state.quota);
 			if (cards.length + card.length + 2 > cardBudget && shown > 0) break;
 			cards.push(...card, "");
 			shown++;
@@ -173,16 +183,19 @@ function contextPage(state: FooterDashboardRenderState, width: number): string[]
 		...wrapTextWithAnsi(
 			theme.style(
 				"accent",
-				`${formatFooterTokens(ledger.usedTokens)} / ${ledger.contextWindow > 0 ? formatFooterTokens(ledger.contextWindow) : "unknown window"} tokens${ledger.percent === null ? "" : ` · ${ledger.percent.toFixed(1)}% occupied`}`,
+				state.context.budget
+					? `${contextUsageText(state.context)} tokens`
+					: `${formatFooterTokens(ledger.usedTokens)} / ${ledger.contextWindow > 0 ? formatFooterTokens(ledger.contextWindow) : "unknown window"} tokens${ledger.percent === null ? "" : ` · ${ledger.percent.toFixed(1)}% occupied`}`,
 				{ bold: true },
 			),
 			width,
 		),
 		...wrapTextWithAnsi(
-			`Free ${ledger.contextWindow > 0 ? formatFooterTokens(ledger.freeTokens) : "unknown"} · reserved ${formatFooterTokens(ledger.reserveTokens)} · ${ledger.toolCount} tool definitions · compaction ${ledger.compactionAuto ? `auto${ledger.compactionThreshold === null ? "" : ` @${Math.round(ledger.compactionThreshold * 100)}%`}` : "manual"}`,
+			`${state.context.budget ? "Capture diagnostics: " : ""}Free ${ledger.contextWindow > 0 ? formatFooterTokens(ledger.freeTokens) : "unknown"} · reserved ${formatFooterTokens(ledger.reserveTokens)} · ${ledger.toolCount} tool definitions · compaction ${ledger.compactionAuto ? `auto${ledger.compactionThreshold === null ? "" : ` @${Math.round(ledger.compactionThreshold * 100)}%`}` : "manual"}`,
 			width,
 		),
 	];
+	out.push(theme.fg("dim", "Context occupancy is per request; subscription limits are account-wide · /usage"));
 	const gridWidth = Math.max(12, Math.min(64, width >= 76 ? Math.floor(width * 0.38) : width));
 	const gridHeight = width >= 76 ? 8 : 3;
 	const grid = renderContextMeterGrid(ledger, gridWidth, gridHeight, theme);
@@ -195,7 +208,13 @@ function contextPage(state: FooterDashboardRenderState, width: number): string[]
 				legendWidth,
 			),
 		);
-	out.push("", rule(theme, width, { left: "CONTEXT COMPOSITION", leftToken: "accent" }));
+	out.push(
+		"",
+		rule(theme, width, {
+			left: state.context.budget ? "CAPTURE DIAGNOSTICS" : "CONTEXT COMPOSITION",
+			leftToken: "accent",
+		}),
+	);
 	out.push(...(width >= 76 ? zipColumns(grid, legend, gridWidth, legendWidth, "    ") : [...grid, "", ...legend]));
 	out.push(
 		...wrapTextWithAnsi(
@@ -248,7 +267,7 @@ function contextPage(state: FooterDashboardRenderState, width: number): string[]
 	return out;
 }
 
-/** Two-line ambient strip. Notices borrow workspace space until dismissed/expired. */
+/** Model and context above; persistent workspace and a rotating hint area below. */
 export function renderCompactDashboard(state: FooterDashboardRenderState, width: number): string[] {
 	const theme = clioTheme();
 	const w = Math.max(1, width);
@@ -259,11 +278,24 @@ export function renderCompactDashboard(state: FooterDashboardRenderState, width:
 	const activity = `${theme.fg("accent", phase)}${workers ? theme.fg("agent", ` · ${workers} active`) : ""}`;
 	const identity = clean(state.session.target ?? "No model selected");
 	const thinking = theme.fg("reason", `think ${clean(state.session.thinking ?? "off")}`);
-	const usage = `${formatFooterTokens(ledger?.usedTokens ?? state.context.used ?? 0)} / ${(ledger?.contextWindow ?? state.context.contextWindow) ? formatFooterTokens(ledger?.contextWindow ?? state.context.contextWindow ?? 0) : "?"}`;
-	const context = `${ledger ? renderContextMeterBar(ledger, w >= 100 ? 14 : 8, theme) : ""} ${usage}`;
+	const usage = contextUsageText(state.context);
+	const context = `${ledger || state.context.budget ? contextOccupancyBar(state.context, w >= 100 ? 14 : 8, theme) : ""} ${usage}`;
 	const rightWidth = Math.min(Math.floor(w * 0.48), visibleWidth(context));
-	const identityRoom = Math.max(8, w - rightWidth - visibleWidth(thinking) - visibleWidth(activity) - 10);
-	const left = `${activity}  ·  ${theme.fg("muted", fitIdentityLabel(identity, identityRoom))} · ${thinking}`;
+
+	const weekly = state.quotaRoute ? routeWeeklyQuota(state.quotaRoute, state.quota ?? []) : null;
+	const leftRoom = Math.max(1, w - rightWidth - 3);
+	const activityLabel = fit(activity, Math.min(visibleWidth(activity), Math.max(5, Math.floor(leftRoom / 3))));
+	const badge =
+		weekly && leftRoom - visibleWidth(activityLabel) - visibleWidth(weekly.label) >= 16
+			? theme.fg(
+					weekly.severity === "critical" ? "error" : weekly.severity === "normal" ? "muted" : "warning",
+					weekly.label,
+				)
+			: "";
+	const baseRoom = leftRoom - visibleWidth(activityLabel) - (badge ? visibleWidth(badge) + 3 : 0) - 5;
+	const showThinking = baseRoom - visibleWidth(thinking) - 3 >= 12;
+	const identityRoom = Math.max(1, baseRoom - (showThinking ? visibleWidth(thinking) + 3 : 0));
+	const left = `${activityLabel}  ·  ${theme.fg("muted", fitIdentityLabel(identity, identityRoom))}${badge ? ` · ${badge}` : ""}${showThinking ? ` · ${thinking}` : ""}`;
 	const pair = (l: string, r: string, rw: number) => `${fit(l, w - rw - 3)}   ${fit(r, rw)}`;
 	const notice = [...state.notices]
 		.filter((n) => n.expiresAt === null || n.expiresAt > state.now)
@@ -283,21 +315,31 @@ export function renderCompactDashboard(state: FooterDashboardRenderState, width:
 				)
 			: state.demoHint
 				? `${theme.fg("accent", "Tip")} ${theme.fg("muted", clean(state.demoHint))}`
-				: theme.fg(
-						"dim",
-						footerKeyHint(state.now, w < 80) ??
-							`${clean(state.workspace.cwd)} · ${clean(state.workspace.branch ?? "no Git branch")}${state.workspace.dirty ? " *" : ""}`,
-					);
-	const hint = theme.fg("muted", `${state.session.throughput ? `${state.session.throughput}  ·  ` : ""}${key}`);
-	return [
-		fit(pair(left, context, rightWidth)),
-		fit(pair(foot, hint, Math.min(Math.floor(w * 0.4), visibleWidth(hint)))),
-	];
+				: theme.fg("dim", footerKeyHint(state.now, w < 120) ?? `${key} Dashboard`);
+	const hintWidth = Math.min(Math.floor(w * 0.48), visibleWidth(foot));
+	const workspaceWidth = Math.max(1, w - hintWidth - 3);
+	const git = `${clean(state.workspace.branch ?? "no Git branch")}${state.workspace.dirty ? " *" : ""}`;
+	const gitWidth = Math.min(visibleWidth(git), Math.max(4, Math.floor(workspaceWidth * 0.45)));
+	const cwdWidth = Math.max(1, workspaceWidth - gitWidth - 3);
+	const workspace = theme.fg(
+		"dim",
+		`${fitIdentityLabel(clean(state.workspace.cwd), cwdWidth)} · ${fitIdentityLabel(git, gitWidth)}`,
+	);
+	return [fit(pair(left, context, rightWidth)), fit(pair(workspace, foot, hintWidth))];
 }
 
 function statusPage(state: FooterDashboardRenderState, width: number): string[] {
 	const theme = clioTheme();
 
+	const quotaRows = [
+		theme.style(
+			"accent",
+			`SESSION · ${formatFooterTokens(state.sessionTokens?.totalTokens ?? 0)} recorded tokens · ${formatCostAggregate(state.sessionCost) ?? "cost not yet priced"}`,
+			{ bold: true },
+		),
+		...renderQuotaAccounts(state.quota ?? [], width, { compact: true, now: state.now }),
+	];
+
 	const active = state.dispatchRows.filter((row) => ACTIVE_AGENT_STATUSES.has(row.status));
 	const completed = state.dispatchRows.filter((row) => row.status === "completed").length;
 	const failed = state.dispatchRows.filter((row) => ["failed", "dead", "aborted"].includes(row.status)).length;
@@ -334,7 +376,6 @@ function statusPage(state: FooterDashboardRenderState, width: number): string[]
 		["Target", state.session.target ?? "not selected"],
 		["Tracked cost", formatCostAggregate(state.sessionCost) ?? "not yet priced"],
 		["Clio ceiling", state.costCeilingUsd === undefined ? "unknown" : `$${state.costCeilingUsd} · tracked pricing only`],
-		["Provider quota", "not reported by provider"],
 		["MCP connected", names(state.connections?.mcp)],
 		["Plugins active", names(state.connections?.plugins)],
 		[
@@ -404,6 +445,7 @@ function statusPage(state: FooterDashboardRenderState, width: number): string[]
 	];
 	if (width < 76)
 		return [
+			...quotaRows,
 			...section("COST & CONNECTIONS", left, width),
 			...section("LOCAL MACHINE", right, width),
 			theme.fg("accent", "CONTEXT ENGINE"),
@@ -414,6 +456,7 @@ function statusPage(state: FooterDashboardRenderState, width: number): string[]
 		];
 	const col = Math.floor((width - 5) / 2);
 	return [
+		...quotaRows,
 		...zipColumns(
 			section("COST & CONNECTIONS", left, col),
 			section("LOCAL MACHINE", right, width - col - 5),
@@ -457,7 +500,7 @@ export function renderDashboardPage(
 	const hint = truncateToWidth(
 		theme.fg(
 			"muted",
-			`${cycleKey || "Dashboard"} → ${next}   ·   ${page === "Status" ? "/cost · /mcp · /library" : "composer stays active"}`,
+			`${cycleKey || "Dashboard"} → ${next}   ·   ${page === "Status" ? "/usage · /mcp · /library" : "composer stays active"}`,
 		),
 		safeWidth,
 		"…",
@@ -475,7 +518,7 @@ export function renderDashboardPage(
 				? `${getKeybindings().getKeys("clio-coder.dispatchBoard.toggle").join("/") || "Fleet Runs"} · /view`
 				: page === "Context"
 					? "/context"
-					: "/cost · /context";
+					: "/usage · /context";
 		content = [
 			...content.slice(0, available - 1),
 			truncateToWidth(theme.fg("dim", `More detail: ${detail}`), safeWidth, "…", true),

package/src/interactive/footer/widgets.ts

@@ -1,5 +1,6 @@
 import type { OutputStyle } from "../../core/defaults.js";
 import { ToolNames } from "../../core/tool-names.js";
+import type { LiveBudgetView } from "../../domains/context/budget/live-view.js";
 import {
 	type CostAggregate,
 	formatCostAggregate,
@@ -99,6 +100,8 @@ export interface SessionFacts {
 
 /** Context engine telemetry. */
 export interface ContextEngineFacts {
+	/** Identifies the published accounting used by the meter; ledger stays diagnostic. */
+	budget?: Pick<LiveBudgetView, "revision" | "historical" | "inputSource">;
 	label: string | null;
 	used: number | null;
 	contextWindow: number | null;
@@ -393,14 +396,36 @@ function contextComposition(context: ContextEngineFacts): {
 		system: finiteNonNegative(breakdown?.systemPromptTokens),
 		tools: finiteNonNegative(breakdown?.toolSchemaTokens),
 		chat: finiteNonNegative(breakdown?.messageTokens) + finiteNonNegative(breakdown?.pendingUserTokens),
-		free: window > 0 ? Math.max(0, window - used) : null,
+		free:
+			window > 0 && typeof context.used === "number" && Number.isFinite(context.used) ? Math.max(0, window - used) : null,
 	};
 }
 
+/** Short truthful occupancy label shared by compact and expanded surfaces. */
+export function contextUsageText(context: ContextEngineFacts): string {
+	const used = context.budget ? context.used : (context.ledger?.usedTokens ?? context.used);
+	const window = context.budget ? context.contextWindow : (context.ledger?.contextWindow ?? context.contextWindow);
+	const source = context.budget?.inputSource === "historical" ? "saved " : context.budget && used !== null ? "~" : "";
+	return `${source}${used === null ? "?" : formatFooterTokens(used)} / ${window ? formatFooterTokens(window) : "?"}`;
+}
+
+/** Reads published numbers only; never refreshes accounting from a renderer. */
+export function contextOccupancyBar(context: ContextEngineFacts, cells: number, theme: ClioTheme): string {
+	if (!context.budget && context.ledger) return renderContextMeterBar(context.ledger, cells, theme);
+	return buildSegmentedContextBar(
+		theme,
+		cells,
+		context.contextWindow ?? 0,
+		context.used === null ? undefined : contextBreakdownForBar(context),
+	);
+}
+
 /** The live window after the percent; null when unknown or the row is too narrow to carry it. */
 export function compactContextWindowLabel(context: ContextEngineFacts, width: number): string | null {
 	if (width < 72) return null;
-	const window = finiteNonNegative(context.ledger?.contextWindow ?? context.contextWindow);
+	const window = finiteNonNegative(
+		context.budget ? context.contextWindow : (context.ledger?.contextWindow ?? context.contextWindow),
+	);
 	return window > 0 ? formatFooterTokens(window) : null;
 }
 
@@ -427,7 +452,7 @@ export function compactSecondaryLine(
 	const safeWidth = Math.max(1, Math.floor(width));
 	const barCells = compactContextBarWidth(safeWidth);
 	let left = "";
-	if (context.ledger) {
+	if (context.ledger && !context.budget) {
 		// The row follows the kv grammar: dim key, muted value. An unmeasured
 		// percent renders the ?% placeholder dim because it is scaffolding for a
 		// number that has not arrived, not a measurement.
@@ -437,7 +462,7 @@ export function compactSecondaryLine(
 		);
 		left = `${theme.fg("dim", "ctx")} ${renderContextMeterBar(context.ledger, barCells, theme)} ${percent}`;
 	} else {
-		left = buildSegmentedContextBar(theme, barCells, context.contextWindow ?? 0, contextBreakdownForBar(context));
+		left = `${context.budget?.inputSource === "historical" ? theme.fg("dim", "saved ") : ""}${contextOccupancyBar(context, barCells, theme)}`;
 	}
 	// A percentage alone does not say whether the window is 128k or 1M, so at
 	// widths that can afford it the live window follows the percent. It comes
@@ -713,7 +738,7 @@ function ledgerBar(theme: ClioTheme, ledger: ContextLedger, cells: number): stri
 export function contextQuadrant(facts: ContextEngineFacts, options: ExpandedQuadrantOptions = {}): string[] {
 	const theme = clioTheme();
 	const ledger = facts.ledger ?? null;
-	const hasLedger = ledger !== null && ledger.contextWindow > 0;
+	const hasLedger = !facts.budget && ledger !== null && ledger.contextWindow > 0;
 	const barCells = expandedContextBarCells(options.width);
 
 	let bar: string;
@@ -737,7 +762,7 @@ export function contextQuadrant(facts: ContextEngineFacts, options: ExpandedQuad
 				? theme.style("frame", `free ${formatFooterTokens(composition.free)}`, { dim: true })
 				: null,
 		]);
-		bar = buildSegmentedContextBar(theme, barCells, facts.contextWindow ?? 0, contextBreakdownForBar(facts));
+		bar = contextOccupancyBar(facts, barCells, theme);
 		const filledChar = visibleWidth(GLYPH.contextFull) === 1 ? GLYPH.contextFull : GLYPH.barFull;
 		const freeChar = visibleWidth(GLYPH.contextFree) === 1 ? GLYPH.contextFree : GLYPH.barEmpty;
 		legendRows = [
@@ -752,7 +777,7 @@ export function contextQuadrant(facts: ContextEngineFacts, options: ExpandedQuad
 		"Context",
 		[
 			statusRow(bar),
-			kv("used", formatUsedWindow(usedTokens, windowTokens)),
+			kv("used", facts.budget ? contextUsageText(facts) : formatUsedWindow(usedTokens, windowTokens)),
 			fill ? styledKv("fill", fill) : statusRow(null),
 			chatFree ? styledKv("budget", chatFree) : statusRow(null),
 			kv("compact", formatCompaction(facts)),

package/src/interactive/footer-panel.ts

@@ -30,7 +30,7 @@ export function formatFooterTokens(n: number): string {
  * Build the token-counter footer segment. Returns `null` when no usage has
  * landed yet so the footer stays uncluttered at session start. Cache-read
  * tokens are omitted here to keep the line scannable; reasoning tokens are
- * shown only when the provider exposes them. The `/cost` overlay exposes the
+ * shown only when the provider exposes them. The `/usage` overlay exposes the
  * full breakdown.
  */
 export function tokensSegment(usage: UsageBreakdown | null | undefined): string | null {

package/src/interactive/interactive-application.ts

@@ -252,6 +252,7 @@ export interface InteractiveDeps {
 	 * engine, and persists a compactionSummary entry.
 	 */
 	onCompact?: (instructions: string | undefined) => Promise<void>;
+	onRecoverHandoff?: (handoffId: string, action: "reduce" | "deliver") => Promise<void>;
 	/** Run /context init for the current working directory. */
 	onInit?: (options: InitCommandOptions, io?: RunIo) => Promise<void>;
 	/** Run /context reset for the current working directory. */
@@ -827,6 +828,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		...(deps.onSelectModel ? { onSelectModel: deps.onSelectModel } : {}),
 		...(deps.onSetThinkingLevel ? { onSetThinkingLevel: deps.onSetThinkingLevel } : {}),
 		...(deps.onCompact ? { onCompact: deps.onCompact } : {}),
+		...(deps.onRecoverHandoff ? { onRecoverHandoff: deps.onRecoverHandoff } : {}),
 		...(deps.onInit ? { onInit: deps.onInit } : {}),
 		...(deps.onContextClear ? { onContextClear: deps.onContextClear } : {}),
 		...(deps.onContextRefresh ? { onContextRefresh: deps.onContextRefresh } : {}),
@@ -840,7 +842,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		expandSubmit: (text) => expandInteractiveSubmitAsync(text, deps.resources),
 		openAskUser: (questions, options) => openAskUserOverlayState(questions, options),
 		openSkillsHub: (request) => openSkillsHubState(request),
-		openCost: () => openCostOverlayState(),
+		openUsage: () => openUsageOverlayState(),
 		openSideQuestion: (question) => openSideQuestionOverlayState(question),
 		startHandoff: (goal) => startHandoffState(goal),
 		startFleetRun: (name, vars) => startFleetRunState(name, vars),
@@ -901,6 +903,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	editor.onSubmit = editorSubmit.submitEditorText;
 
 	const interactiveTickers = createInteractiveTickers({
+		getQuotaSnapshots: presentation.getQuotaSnapshots,
 		tui,
 		dispatchBoardStore,
 		contextActivityStore,
@@ -937,6 +940,8 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		resetTranscript();
 	};
 	overlayLifecycle = createOverlayLifecycle({
+		getQuotaSnapshots: presentation.getQuotaSnapshots,
+		getDispatchRows: () => dispatchBoardStore.rows(),
 		app: deps,
 		tui,
 		footer,
@@ -972,7 +977,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	const {
 		closeOverlay,
 		openAskUserOverlayState,
-		openCostOverlayState,
+		openUsageOverlayState,
 		openSideQuestionOverlayState,
 		startHandoffState,
 		startFleetRunState,

package/src/interactive/interactive-input-runtime.ts

@@ -326,7 +326,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		},
 		cancelFocusedOwner: () => {
 			const state = deps.overlay.getState();
-			if (["permission-confirm", "cost", "context-view", "side-question", "dispatch-board", "auth"].includes(state))
+			if (["permission-confirm", "usage", "context-view", "side-question", "dispatch-board", "auth"].includes(state))
 				deps.overlay.closeOverlay();
 			else if (focused()?.handleInput) {
 				focused()?.handleInput?.("\x1b");
@@ -531,7 +531,7 @@ function overlayScopeLabel(state: OverlayState): string {
 		"permission-confirm": "Permission",
 		"dispatch-board": "Workers",
 		auth: "Authentication",
-		cost: "Usage",
+		usage: "Usage",
 		"context-view": "Context",
 		"context-reset": "Context reset",
 		tasks: "Tasks",

package/src/interactive/interactive-presentation.ts

@@ -13,6 +13,8 @@ import type {
 	TokenThroughputSnapshot,
 } from "../domains/observability/index.js";
 import { type ProvidersContract, resolveModelRuntimeCapabilitiesForProviders } from "../domains/providers/index.js";
+import { createQuotaSummaryFeed } from "../domains/quota/summary-feed.js";
+import type { UsageSnapshot } from "../domains/quota/types.js";
 import type { ResourcesContract } from "../domains/resources/index.js";
 import type { LocalCapacity } from "../domains/scheduling/local-capacity.js";
 import { ceilChars, contentChars } from "../domains/session/context-accounting.js";
@@ -160,6 +162,7 @@ export interface InteractivePresentation {
 	changeOutputStyle(mutation: () => void): void;
 	setLocalBashRunning(running: boolean): void;
 	getObservabilitySnapshot(): ObservabilitySnapshot;
+	getQuotaSnapshots(): ReadonlyArray<UsageSnapshot>;
 	/** Fold one raw chat event into the ephemeral throughput shown only while this turn is active. */
 	recordChatEvent(event: ChatLoopEvent): void;
 	recordToolStart(toolCallId: string, toolName: string): void;
@@ -234,6 +237,12 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		return key === undefined || key.length === 0 ? null : formatKeyLabel(key, "");
 	};
 
+	const quotaSummary = createQuotaSummaryFeed({
+		onUpdate: () => {
+			footer?.refresh();
+			requestRender();
+		},
+	});
 	const banner = factories.createBanner({
 		providers: deps.providers,
 		...(deps.agents ? { getAgentCount: () => deps.agents?.listSpecs().filter(isUserVisibleAgent).length ?? 0 } : {}),
@@ -248,6 +257,9 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 			return key ? formatKeyLabel(key, "") : null;
 		},
 		onFactsRefreshed: requestRender,
+		// Subscription usage is read lazily off the render path and cached, so the
+		// banner reads a string and never awaits a provider.
+		getQuotaSummary: () => quotaSummary.peek(),
 		...(deps.getSettings ? { getSettings: deps.getSettings } : {}),
 	});
 	// A boot-time `--continue`/`--session` resume opens onto an existing
@@ -391,6 +403,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		getTokenThroughput: () =>
 			liveThroughput === null ? observabilitySnapshot.session.latestThroughput : currentLiveThroughput(),
 		getSessionCost: () => observabilitySnapshot.session.cost,
+		getQuotaSnapshots: () => quotaSummary.peekSnapshots(),
 		getContextUsage: () => deps.chat.contextUsage(),
 		getContextLedger: () => deps.chat.contextLedger(),
 		getDispatchRows: () => dispatchBoardStore.rows(),
@@ -622,6 +635,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		beforeStatusDisposed = true;
 		// Before the subscriptions go: a project-context refresh already in flight
 		// must not land afterwards and ask a torn-down presentation for a frame.
+		quotaSummary.dispose();
 		banner.dispose();
 		footer.dispose();
 		unsubscribeObservability();
@@ -664,6 +678,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		changeOutputStyle: (mutation) =>
 			chatRenderer.mutate(() => preserveTranscriptScroll(transcriptView, deps.terminal.columns, mutation), "output-style"),
 		getObservabilitySnapshot: () => observabilitySnapshot,
+		getQuotaSnapshots: () => quotaSummary.peekSnapshots(),
 		recordChatEvent,
 		recordToolStart: (toolCallId, toolName) => {
 			footerActiveTools.add(toolCallId);

package/src/interactive/interactive-slash-runtime.ts

@@ -36,6 +36,7 @@ import { appendNotice, appendOperatorAside, appendOperatorCommand, appendReferen
 import { runOperatorRecall } from "./context-recall-command.js";
 import { renderSessionHtml } from "./export-html/index.js";
 import { dateLocal } from "./format-time.js";
+import { withContinuityReplay } from "./model-session-replay.js";
 import type { OracleDigestSources } from "./oracle.js";
 import type { PendingModelScope } from "./overlays/model-scope.js";
 import { renderDoctorReport } from "./renderers/doctor-report.js";
@@ -57,6 +58,15 @@ import type { WorkerEntryState } from "./worker-stream.js";
 
 const EXPORT_RENDER_WIDTH = 100;
 
+/** Longest run of consecutive backticks in the rendered transcript, for fence sizing. */
+function longestBacktickRun(lines: ReadonlyArray<string>): number {
+	let longest = 0;
+	for (const line of lines) {
+		for (const run of line.match(/`+/gu) ?? []) longest = Math.max(longest, run.length);
+	}
+	return longest;
+}
+
 export interface InteractiveSlashSubmitExpansion {
 	text: string;
 	images: ImageContent[];
@@ -104,6 +114,7 @@ export interface InteractiveSlashRuntimeDeps {
 	onSelectModel?: (ref: { target: string; model: string }, scope: "session" | "global") => void;
 	onSetThinkingLevel?: (level: ThinkingLevel, scope?: "session" | "global") => void;
 	onCompact?: (instructions: string | undefined) => Promise<void>;
+	onRecoverHandoff?: (handoffId: string, action: "reduce" | "deliver") => Promise<void>;
 	onInit?: (options: InitCommandOptions, io?: RunIo) => Promise<void>;
 	onContextClear?: (options: ContextClearCommandOptions, io?: RunIo) => Promise<void>;
 	onContextRefresh?: (io?: RunIo) => Promise<void>;
@@ -127,7 +138,7 @@ export interface InteractiveSlashRuntimeDeps {
 	expandSubmit: (text: string) => Promise<InteractiveSlashSubmitExpansion>;
 	openAskUser: AskUserHandler;
 	openSkillsHub: (request?: LibraryBrowseRequest) => void;
-	openCost: () => void;
+	openUsage: () => void;
 	/** Run one `/btw` side question in its own overlay. */
 	openSideQuestion: (question: string) => void;
 	/** Run one `/handoff <goal>`: extract, review, and seed a successor session. */
@@ -461,7 +472,7 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 				? deps.share.planImport(resolve(archivePath), importOptions)
 				: deps.share.importArchive(resolve(archivePath), importOptions);
 		},
-		openCost: deps.openCost,
+		openUsage: deps.openUsage,
 		openSideQuestion: deps.openSideQuestion,
 		// `/oracle` is refused, never queued, while a turn streams: the digest it
 		// packs describes the record as it stands.
@@ -584,6 +595,17 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			deps.setEditorText(text);
 			deps.requestRender();
 		},
+		runHandoffRecovery: (handoffId, action) => {
+			if (!deps.onRecoverHandoff) {
+				appendCommandNotice("error", "[/context recover] native handoff recovery is unavailable");
+				return;
+			}
+			void deps
+				.onRecoverHandoff(handoffId, action)
+				.catch((error) =>
+					appendCommandNotice("error", `[/context recover] ${error instanceof Error ? error.message : String(error)}`),
+				);
+		},
 		runCompact: (instructions) => {
 			runCompactWithNotice(deps.onCompact, appendCommandNotice, instructions);
 		},
@@ -608,10 +630,19 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 				// rehydrate exported it as ordinary history (issue #109). No session
 				// contract means no pin can exist for this reader, so the file replays whole.
 				const leafTurnId = deps.session?.tree(sessionId).leafId ?? null;
-				rehydrateChatPanelFromTurns(exportPanel, turns, {
-					unboundedToolBodies: true,
-					...(leafTurnId ? { activeLeafTurnId: leafTurnId } : {}),
-				});
+				// The export shows the same continuity the model sees, resolved from
+				// the same ledger through the same helper, so the two cannot drift.
+				// It is labelled as assistant handoff text and is never rendered as an
+				// operator turn.
+				rehydrateChatPanelFromTurns(
+					exportPanel,
+					turns,
+					withContinuityReplay(
+						turns,
+						{ unboundedToolBodies: true, ...(leafTurnId ? { activeLeafTurnId: leafTurnId } : {}) },
+						deps.session,
+					),
+				);
 				const ansiLines = exportPanel.render(EXPORT_RENDER_WIDTH);
 				// The operator names this file by the day they ran the export, so the
 				// date in it is their calendar date. The header below keeps the ISO
@@ -626,8 +657,14 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 				mkdirSync(resolve(target, ".."), { recursive: true });
 				if (markdown) {
 					const lines = ansiLines.map(stripTerminalSequences);
-					const header = [`# Clio session ${sessionId}`, "", `Exported ${exportedAt.toISOString()}`, "", "```text"];
-					writeFileSync(target, `${[...header, ...lines, "```", ""].join("\n")}`, "utf8");
+					// The fence has to be longer than the longest backtick run the
+					// transcript contains, or a body that includes its own fence closes
+					// the block early and the rest of the session renders as Markdown.
+					// A handoff note is assistant-authored prose that routinely carries
+					// fenced code, so this is reachable content, not a hypothetical.
+					const fence = "`".repeat(Math.max(3, longestBacktickRun(lines) + 1));
+					const header = [`# Clio session ${sessionId}`, "", `Exported ${exportedAt.toISOString()}`, "", `${fence}text`];
+					writeFileSync(target, `${[...header, ...lines, fence, ""].join("\n")}`, "utf8");
 				} else {
 					writeFileSync(target, renderSessionHtml({ sessionId, exportedAt: exportedAt.toISOString(), ansiLines }), "utf8");
 				}