@aragon-agent/cli 0.6.15 → 0.6.17

package/dist/team/subagent.js

@@ -13,6 +13,7 @@
 import { Agent, createSkillFindTool, } from '@aragon-agent/core';
 import { formatStreamError } from '../agent/reducer.js';
 import { buildSystemPrompt } from '../agent/system-prompt.js';
+import { buildFastBlock } from '../fast/prompt.js';
 import { createBuiltinTools } from '../tools/index.js';
 import { pickActivityArgs, sanitizeActivity } from './activity.js';
 import { TEAM_LIMITS, TEAM_SUBAGENT_TOOL_NAMES } from './limits.js';
@@ -40,11 +41,17 @@ function assistantText(message) {
  * the security boundary here, so it has to be directly checkable.
  */
 export function buildSubagentTools(spec, deps, getAgent) {
+    // `team_wait`'s ceiling is the STRUCTURAL clamp when the child itself has no
+    // wall clock (`subagentTimeoutMs: 0`): a peer wait must stay bounded even when
+    // the child's run is not, or one forgotten wait would hold a slot forever.
+    const subagentTimeoutMs = deps.config.team.subagentTimeoutMs;
     const commTools = [
         makeTeamSend(deps.bus, spec.label),
         makeTeamWait(deps.bus, spec.label, {
             getAgent,
-            maxWaitMs: deps.config.team.subagentTimeoutMs,
+            maxWaitMs: subagentTimeoutMs > 0
+                ? subagentTimeoutMs
+                : TEAM_LIMITS.waitMaxSeconds * 1000,
         }),
     ];
     const tools = createBuiltinTools({
@@ -141,9 +148,6 @@ export function createSubagent(spec, deps, hooks) {
     const run = {
         label: spec.label,
         description: spec.description,
-        // FROM THE SPEC, which the normalizer already downgraded when the tier was
-        // unavailable — so this is what RAN, not what was asked for (§3.4).
-        tier: spec.tier,
         phase: 'queued',
         turns: 0,
         toolCalls: 0,
@@ -158,37 +162,38 @@ export function createSubagent(spec, deps, hooks) {
     let agentRef = null;
     const getAgent = () => agentRef;
     const tools = buildSubagentTools(spec, deps, getAgent);
-    // THE TWO HARDCODED CONFIG READS THAT USED TO LIVE HERE NOW ROUTE THROUGH ONE
-    // RESOLVER (fast-model-tier §3.4). The fallback reproduces them exactly, so a
-    // caller that passes no `resolveTier` builds a byte-identical child.
+    // THE CHILD'S MODEL IS THE LEAD'S MODEL, READ FROM THE DISPATCH-TIME CONFIG
+    // (main-agent parity). Same provider, same model id, same base URL, same
+    // thinking level: a delegation is never a downgrade, and the only model a
+    // child may surprise its lead with is one a settings-screen edit made live
+    // between two dispatches.
     //
-    // `thinkingLevel` is PER TIER and defaults to `'off'` for the fast tier
-    // (D-13): a "fast" model asked to think for 32 768 tokens is not fast, and
-    // inheriting the session's `xhigh` into a mechanical file-scan child would be
-    // the most expensive possible reading of the word.
-    //
-    // `maxTokens` is deliberately NOT per tier (RV-15). A child inherits
-    // `deps.config.maxTokens` below, which is an ambition sized for the main
-    // model; the adapter clamps it down to whatever the fast model actually
-    // accepts (`llm/provider.ts:44-52`), so a large inherited value degrades to
-    // the right number rather than to an HTTP 400.
-    const resolved = deps.resolveTier
-        ? deps.resolveTier(spec.tier)
-        : {
-            ref: {
-                providerId: deps.config.provider,
-                modelId: deps.config.model,
-                ...(deps.config.baseUrl ? { baseUrl: deps.config.baseUrl } : {}),
-            },
-            thinkingLevel: deps.config.thinkingLevel,
-            role: 'main',
-        };
+    // `maxTokens` inherits `deps.config.maxTokens` below - the same ambition the
+    // lead sends, clamped by the same adapter, so an inherited large value
+    // degrades to the right number rather than to an HTTP 400.
+    const resolved = {
+        ref: {
+            providerId: deps.config.provider,
+            modelId: deps.config.model,
+            ...(deps.config.baseUrl ? { baseUrl: deps.config.baseUrl } : {}),
+        },
+        thinkingLevel: deps.config.thinkingLevel,
+        role: 'main',
+    };
     const model = resolved.ref;
     // HOISTED TO A LOCAL, AND THAT IS WHAT MAKES W3 POSSIBLE AT ALL. This was built
     // INLINE inside the `agentFactory({...})` argument, so there was nothing for the
     // child manager's `getSystemPrompt` accessor to close over - and the accessor
     // cannot read it back off the agent, because `SubagentAgentLike` is narrowed to
     // `state.messages` on purpose.
+    // THE SAME `<fast_tier>` BLOCK THE LEAD GETS, spliced only when this child
+    // will actually have a reviewer. The gating expression is written against
+    // `deps.review` here and the reviewer is built from the SAME predicate
+    // below, so the prompt can never advertise a capability the child lacks -
+    // and a child with a reviewer is never surprised by its first injection.
+    const fastBlock = deps.review !== undefined && deps.review.active()
+        ? buildFastBlock({ model: deps.review.modelId(), review: true })
+        : '';
     const systemPrompt = buildSystemPrompt({
         cwd: deps.getCwd(),
         tools,
@@ -203,6 +208,7 @@ export function createSubagent(spec, deps, hooks) {
             description: spec.description,
             peers: deps.bus.peersOf(spec.label),
         }),
+        ...(fastBlock ? { fastBlock } : {}),
     });
     // LAZY ACCESSORS OVER `agentRef`, WHICH IS ASSIGNED AFTER THIS RETURNS. A
     // non-lazy read here is `undefined` at construction and the child's estimate
@@ -244,6 +250,27 @@ export function createSubagent(spec, deps, hooks) {
         ...(contextManager ? { contextManager } : {}),
     });
     agentRef = agent;
+    // PER-CHILD FAST REVIEW (main-agent parity). GATED ON THE PROVIDER'S OWN
+    // LIVE PREDICATE, read once here so the prompt and the reviewer CANNOT
+    // DISAGREE about whether the child has one: a child told about
+    // `<fast_review>` blocks must be a child that actually receives them, and a
+    // child with a reviewer must have been told. `abortRequested` is the flag
+    // `handle.abort()` sets (see `SubagentHandle`); the reviewer reads it as its
+    // never-steer-into-a-requested-abort fact.
+    let abortRequested = false;
+    const reviewLive = deps.review !== undefined && deps.review.active() === true;
+    const reviewer = reviewLive
+        ? deps.review?.create({
+            label: spec.label,
+            goal: spec.description,
+            agent,
+            isRunning: () => run.phase === 'starting' ||
+                run.phase === 'thinking' ||
+                run.phase === 'tool' ||
+                run.phase === 'waiting',
+            isAbortRequested: () => abortRequested,
+        })
+        : undefined;
     let lastEmit = 0;
     let lastPhase = run.phase;
     /**
@@ -325,8 +352,16 @@ export function createSubagent(spec, deps, hooks) {
                 // an aborted run, which the report renders as partial rather than lost.
                 if (text.length > 0)
                     run.summary = text;
-                if (run.turns >= deps.config.team.maxTurnsPerSubagent) {
+                // `0` MEANS NO CAP (main-agent parity): the lead has no turn ceiling
+                // either, and a child that needs forty turns for a forty-turn job is
+                // not runaway - it is working.
+                const turnCap = deps.config.team.maxTurnsPerSubagent;
+                if (turnCap > 0 && run.turns >= turnCap) {
                     run.truncated = true;
+                    // THE FLAG FIRST, exactly like `handle.abort()`: the child's
+                    // reviewer reads `abortRequested` as its guard-1 fact, and a
+                    // turn-cap stop must be visible to it in the same tick.
+                    abortRequested = true;
                     agent.abort();
                 }
                 break;
@@ -404,5 +439,20 @@ export function createSubagent(spec, deps, hooks) {
         }
         emit();
     });
-    return { spec, run, agent, tools, unsubscribe };
+    return {
+        spec,
+        run,
+        agent,
+        tools,
+        // THE HANDLE-LEVEL ABORT (see `SubagentHandle`): the flag first, then the
+        // agent, so the reviewer's guard observes the request in the same tick.
+        abort: () => {
+            abortRequested = true;
+            agent.abort();
+        },
+        unsubscribe: () => {
+            reviewer?.dispose();
+            unsubscribe();
+        },
+    };
 }

package/dist/team/task-tool.d.ts

@@ -19,6 +19,12 @@
  * `normalizeSubagentSpecs`, which is deterministic and unit-tested. `maxItems`
  * in the schema would behave differently depending on whether `ajv`, an OPTIONAL
  * dependency of core, happened to install.
+ *
+ * EVERY CHILD RUNS THE LEAD'S OWN MODEL (main-agent parity): same provider,
+ * model, thinking level and token ambition, resolved from the LIVE config at
+ * dispatch. There is no per-child `model` property and no cheap tier to pick -
+ * a delegation is never a downgrade, and the fast tier reaches children the
+ * same way it reaches the lead (compaction summaries, per-child reviews).
  */
 import { type AgentTool } from '@aragon-agent/core';
 import type { ModelCost } from '@aragon-agent/core';
@@ -27,38 +33,12 @@ export interface TaskToolDeps {
     runtime: TeamRuntime;
     /** Read LIVE, never cached: `/team off` flips this, it does not unregister. */
     isTeamEnabled: () => boolean;
-    /**
-     * Whether the fast tier was resolvable AT CONSTRUCTION (fast-model-tier §3.3 /
-     * C-2).
-     *
-     * DECIDED ONCE, because the tool array is built once and must never be
-     * rebuilt: `Agent.setTools()` mutates the live `ToolRegistry`, and
-     * `submit_plan` flips the session mode from INSIDE a tool execution. So the
-     * `model` property either exists in this schema for the whole session or never
-     * does — and with it absent, `TASK_DESCRIPTION` and the schema are
-     * BYTE-IDENTICAL to the pre-feature build (AC-3).
-     *
-     * Optional so every existing construction site and test compiles unchanged.
-     */
-    fastRegistered?: boolean;
-    /**
-     * Whether `model:"fast"` is honoured RIGHT NOW. Read LIVE, at dispatch time
-     * (RV-3) — the tier can stop resolving mid-session, and a downgrade is the
-     * honest observable either way.
-     */
-    fastAvailable?: () => boolean;
     maxSubagents: () => number;
     /** Whether a usable key exists for the active provider right now (P2-3). */
     hasApiKey: () => boolean;
     activeProvider: () => string;
     /** The lead's cost table, so the report header states real spend (R-5). */
     modelCost: () => ModelCost | undefined;
-    /** The FAST model's cost table (fast-model-tier §3.4). Absent when the tier is
-     *  off, which is what leaves the report byte-identical. */
-    fastModelCost?: () => ModelCost | undefined;
-    /** Whether the static price table has never heard of the fast model (C-11 /
-     *  RV-4). `unknown` is rendered as unknown, NEVER as `$0.00`. */
-    fastPricingUnknown?: () => boolean;
     /**
      * Run the dispatch with the LEAD's idle watchdog paused, `try/finally` inside.
      *

package/dist/team/task-tool.js

@@ -19,6 +19,12 @@
  * `normalizeSubagentSpecs`, which is deterministic and unit-tested. `maxItems`
  * in the schema would behave differently depending on whether `ajv`, an OPTIONAL
  * dependency of core, happened to install.
+ *
+ * EVERY CHILD RUNS THE LEAD'S OWN MODEL (main-agent parity): same provider,
+ * model, thinking level and token ambition, resolved from the LIVE config at
+ * dispatch. There is no per-child `model` property and no cheap tier to pick -
+ * a delegation is never a downgrade, and the fast tier reaches children the
+ * same way it reaches the lead (compaction summaries, per-child reviews).
  */
 import { errorResult, textResult } from '@aragon-agent/core';
 import { TEAM_LIMITS } from './limits.js';
@@ -33,7 +39,8 @@ const TEAM_OFF_REFUSAL = 'Team mode is off for this session. Do this work yourse
  */
 const TASK_DESCRIPTION = 'Run several independent subagents in parallel and get one combined report. Each ' +
     'subagent is a fresh agent with the same tools and working directory but NO memory of ' +
-    'this conversation - its prompt must be self-contained. Use this when a task splits ' +
+    'this conversation - its prompt must be self-contained. Each runs on the same model ' +
+    'you are running on. Use this when a task splits ' +
     'into 2 or more parts that do not depend on each other\'s output, especially reading or ' +
     'searching several areas at once. Do NOT use it when one part needs another part\'s ' +
     'result (do those yourself, in order), when two parts would edit the same file, or for ' +
@@ -41,37 +48,11 @@ const TASK_DESCRIPTION = 'Run several independent subagents in parallel and get
     'cannot ask the user anything. Give each a description of at most ' +
     `${TEAM_LIMITS.descriptionChars} characters and a complete prompt. Extra entries beyond the ` +
     'configured maximum are dropped, so keep within it.';
-/**
- * The one sentence appended when the fast tier exists (fast-model-tier §4.1).
- *
- * WHEN to use a tier is POLICY and lives here and in `<fast_tier>`, where the
- * model actually reads it; the `enum` below is SHAPE and lives in the schema.
- * That split is what keeps behaviour the same whether or not `ajv` — an OPTIONAL
- * dependency of core — happened to install (C-8).
- */
-const TASK_FAST_SENTENCE = ' Set model:"fast" on a subagent whose job is bulk reading, searching or summarizing; ' +
-    'leave it out for work that needs judgement.';
-/**
- * NOT `as const`: `AgentTool.parameters` is a `JSONSchema7`, whose `enum` is a
- * MUTABLE `unknown[]`, and a readonly tuple is not assignable to it.
- */
-const SUBAGENT_MODEL_PROPERTY = {
-    type: 'string',
-    enum: ['main', 'fast'],
-    default: 'main',
-    description: 'Which tier runs this subagent. "fast" is a cheaper, quicker model - use it for ' +
-        'mechanical, high-volume work (reading or searching many files, summarizing long ' +
-        'output, mechanical edits). Keep "main" for design, tricky debugging, and anything ' +
-        'that must be right the first time.',
-};
 export function createTaskTool(deps) {
-    const fastRegistered = deps.fastRegistered === true;
     return {
         name: 'task',
         label: 'Dispatch subagents',
-        // BYTE-IDENTICAL WITHOUT THE TIER (AC-3): concatenation is conditional, so a
-        // default session's description is the exact string it always was.
-        description: fastRegistered ? `${TASK_DESCRIPTION}${TASK_FAST_SENTENCE}` : TASK_DESCRIPTION,
+        description: TASK_DESCRIPTION,
         parameters: {
             type: 'object',
             properties: {
@@ -99,11 +80,6 @@ export function createTaskTool(deps) {
                                 default: false,
                                 description: 'Refuse all writes and shell for this subagent.',
                             },
-                            // Spread rather than a `?:` property, so with the tier off the
-                            // object has exactly the four keys it always had — `undefined`
-                            // survives `JSON.stringify` as an absent key but not as an
-                            // identical object, and AC-3 is asserted on the schema itself.
-                            ...(fastRegistered ? { model: SUBAGENT_MODEL_PROPERTY } : {}),
                         },
                         required: ['description', 'prompt'],
                     },
@@ -131,31 +107,21 @@ export function createTaskTool(deps) {
                     'yourself, or ask the user to set a key.');
             }
             // 4. Repair, never reject. Zero survivors is the single hard failure.
-            //    `fastAvailable` is read HERE, at dispatch time, not captured at
-            //    construction (RV-3): the tier can stop resolving mid-session, and the
-            //    normalizer and the subagent factory must agree about that at the same
-            //    instant or a child gets built against a provider with no key.
-            const { specs, requested, downgraded } = normalizeSubagentSpecs(params.subagents, deps.maxSubagents(), { fastAvailable: deps.fastAvailable?.() === true });
+            const { specs, requested } = normalizeSubagentSpecs(params.subagents, deps.maxSubagents());
             if (specs.length === 0) {
                 return errorResult('No usable subagent specs: each needs a description and a prompt.');
             }
             // 5. Pause the lead's watchdog for the whole dispatch (I-3).
-            const outcome = await deps.withPausedWatchdog(() => deps.runtime.dispatch(specs, requested, ctx.signal, { downgraded }));
+            const outcome = await deps.withPausedWatchdog(() => deps.runtime.dispatch(specs, requested, ctx.signal));
             // 6. ALWAYS A NON-ERROR RESULT, abort and all-children-failed included.
             //    A cancellation or a partial result rendered as a tool FAILURE invites
             //    the model to retry the whole fan-out, which is the most expensive
             //    possible reaction (the same reasoning as `ask_user`'s cancelled
-            //    shape, and D-14 one level up).
-            //    TWO COST TABLES (§3.4 / R-7). Summing fast-tier tokens at the lead's
-            //    price is not a rounding error: for a Haiku child under a Sonnet lead
-            //    it over-reports by roughly an order of magnitude, and the whole
-            //    justification for the feature is a number in this report.
+            //    shape, and D-14 one level up). Every child ran the lead's own model,
+            //    so the lead's cost table is the one honest price for the total.
             const cost = deps.modelCost();
-            const fastCost = deps.fastModelCost?.();
             return textResult(buildDispatchReport(outcome, {
                 ...(cost ? { cost } : {}),
-                ...(fastCost ? { fastCost } : {}),
-                ...(deps.fastPricingUnknown?.() ? { fastPricingUnknown: true } : {}),
             }));
         },
     };

package/dist/team/types.d.ts

@@ -11,7 +11,6 @@
  * changes ZERO files under `packages/core/` (AC-12).
  */
 import type { TokenUsage } from '@aragon-agent/core';
-import type { FastTierName } from '../fast/types.js';
 import type { ActivityArgs } from './activity.js';
 /** One normalized delegation request. Produced only by `normalizeSubagentSpecs`. */
 export interface SubagentSpec {
@@ -27,34 +26,12 @@ export interface SubagentSpec {
      * permission than the session it was spawned from.
      */
     readOnly: boolean;
-    /**
-     * Which model runs this child (fast-model-tier §3.4).
-     *
-     * THE WIRE NAME IS `model` AND THE INTERNAL NAME IS `tier`, on purpose: a
-     * model expects to see `model:"fast"`, while `SubagentSpec.model` would read
-     * as a model ID at every call site in this package.
-     *
-     * DELEGATION IS A MODEL CHOICE, NEVER A PERMISSION BOUNDARY (D-15 / I-4). A
-     * fast child gets the same tools, the same `--confirm` gate, the same
-     * plan-mode gate and the same skills ceiling as any other; only the model
-     * differs. Restricting a fast child's tools would look like security, would
-     * not be, and would make the report's `[fast]` rows mean two different things.
-     */
-    tier: FastTierName;
 }
 export type SubagentPhase = 'queued' | 'starting' | 'thinking' | 'tool' | 'waiting' | 'done' | 'failed' | 'aborted';
 /** Live, mutable record of one child. Projected into the UI and the report. */
 export interface SubagentRun {
     label: string;
     description: string;
-    /**
-     * The tier this child actually ran on (fast-model-tier §3.4).
-     *
-     * WHAT RAN, NOT WHAT WAS ASKED FOR. A spec the normalizer downgraded arrives
-     * here as `'main'`, which is what makes the report's `[fast]` annotation and
-     * its second cost table agree with the bill.
-     */
-    tier: FastTierName;
     phase: SubagentPhase;
     startedAt?: number;
     endedAt?: number;
@@ -192,26 +169,11 @@ export interface DispatchOutcome {
     /** Messages addressed to `lead`; surfaced in their own report section. */
     leadMail: TeamMessage[];
     /**
-     * Summed across MAIN-TIER children. Real spend; it must reach the status bar
-     * (§3.9).
-     *
-     * THE MEANING NARROWED WHEN THE FAST TIER LANDED, and the split is not a
-     * rounding concern: a Haiku child under a Sonnet lead priced at the lead's
-     * table over-reports by roughly an order of magnitude, and the entire
-     * justification for delegating is a number in this report (R-7).
+     * Summed across all children. Real spend; it must reach the status bar
+     * (§3.9). Every child runs the LEAD's model (main-agent parity), so one
+     * total priced at the lead's table is the honest accounting.
      */
     usage: TokenUsage;
-    /** Summed across FAST-TIER children. Absent when none ran, which is what
-     *  keeps a pre-feature dispatch's report byte-identical. */
-    fastUsage?: TokenUsage;
-    /**
-     * Specs that asked for `model:"fast"` and ran on `main` anyway (§3.4 / R-6).
-     *
-     * REPORTED, NEVER SILENT. A silent downgrade means the model asked for a cheap
-     * child, got an expensive one, and has no way to learn that its cost model is
-     * wrong.
-     */
-    downgraded?: number;
 }
 /**
  * What the UI renders: a cheap immutable projection, rebuilt per event.
@@ -246,7 +208,6 @@ export type TeamEvent = {
     dispatchId: string;
     label: string;
     usage: TokenUsage;
-    tier: FastTierName;
 } | {
     type: 'message';
     dispatchId: string;

package/dist/ui/App.js

@@ -662,10 +662,9 @@ export function App({ controller, version, initialOverlay, initialPrompt, confir
                     // so it closes over the `cfg` object of the render it mounted in, and
                     // `setModel` builds a NEW one.
                     const live = controller.getConfig();
-                    const fastTier = event.tier === 'fast' ? controller.getFastStatus().tier : null;
-                    const ref = fastTier && fastTier.ok
-                        ? fastTier.ref
-                        : { providerId: live.provider, modelId: live.model };
+                    // Every child runs the lead's own model (main-agent parity), so the
+                    // lead's live connection IS the tier that billed.
+                    const ref = { providerId: live.provider, modelId: live.model };
                     // Unknown pricing contributes ZERO rather than a fabricated figure
                     // (C-11 / RV-4); `/fast status` and the dispatch report say `unknown`.
                     const costDelta = controller.isPricedModel(ref)

package/dist/ui/BottomStatusRow.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
 export function BottomStatusRow({ plan, columns, theme }) {
-    const tones = { normal: theme.primary, muted: theme.muted, warning: theme.noticeWarn, error: theme.noticeError };
+    const tones = { normal: theme.primary, muted: theme.muted, warning: theme.noticeWarn, error: theme.noticeError,
+        accent: theme.accent };
     return _jsxs(Box, { height: 1, width: columns, flexShrink: 0, overflow: "hidden", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: " " }) }), plan.fields.map((field, index) => _jsxs(React.Fragment, { children: [index > 0 && _jsx(Box, { width: plan.separatorCells, flexShrink: 0, children: _jsx(Text, { color: theme.muted, children: plan.separator }) }), _jsx(Box, { width: field.cells, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", color: tones[field.tone], children: field.text }) })] }, field.id))] });
 }

package/dist/ui/StatusBar.js

@@ -27,7 +27,8 @@ export function StatusBar(props) {
         ecoRung: props.ecoRung, fastActive: props.fastActive, scrolledLines: props.scrolledLines,
     });
     const tones = { normal: props.theme.primary, muted: props.theme.muted,
-        warning: props.theme.noticeWarn, error: props.theme.noticeError };
+        warning: props.theme.noticeWarn, error: props.theme.noticeError,
+        accent: props.theme.accent };
     return _jsxs(Box, { width: cols, height: 1, flexShrink: 0, flexDirection: "row", overflow: "hidden", children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { children: redrawChar(props.redrawNonce ?? 0) }) }), plan.fields.map((item, index) => _jsxs(React.Fragment, { children: [index > 0 && _jsx(Box, { width: plan.separatorCells, flexShrink: 0, children: _jsx(Text, { color: props.theme.muted, children: plan.separator }) }), _jsx(Box, { width: item.cells, flexShrink: 0, children: _jsx(Text, { color: tones[item.tone], wrap: "truncate", children: item.id === 'phase' && active
                                 ? _jsxs(_Fragment, { children: [spinner ?? glyph, item.text.slice(glyph.length)] })
                                 : item.text }) })] }, item.id))] });

package/dist/ui/TeamPanel.js

@@ -130,7 +130,7 @@ export function TeamPanel({ snapshot, rows, cols, reducedMotion, theme, caps, no
                 // `reducedMotion` and a non-Unicode terminal fall back to the same
                 // static marker, exactly as `AssistantEntry` and `ToolCard` already do.
                 const animate = isRunning(run) && !reducedMotion && caps.unicode;
-                return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: color, children: [' ', animate ? _jsx(Spinner, { type: "dots" }) : marker(run, glyphs), ' '] }), _jsx(Text, { color: theme.primary, children: `${run.label}${run.tier === 'fast' ? '~' : ''}`.padEnd(8).slice(0, 8) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: theme.muted, children: run.description.replace(/\s+/g, ' ') }) }), _jsx(Box, { flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: color, children: ['  ', activityLine(run, cols)] }) }), _jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? at) - run.startedAt)) : ''] })] }, run.label));
+                return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: color, children: [' ', animate ? _jsx(Spinner, { type: "dots" }) : marker(run, glyphs), ' '] }), _jsx(Text, { color: theme.primary, children: run.label.padEnd(8).slice(0, 8) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: theme.muted, children: run.description.replace(/\s+/g, ' ') }) }), _jsx(Box, { flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: color, children: ['  ', activityLine(run, cols)] }) }), _jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? at) - run.startedAt)) : ''] })] }, run.label));
             }), hiddenTotal > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', "+", hiddenTotal, " more", hiddenRunning > 0 ? ` (${hiddenRunning} running)` : ''] })), snapshot.lastMessage && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: [' ', glyphs.teamMail, " ", snapshot.lastMessage.from, " ", glyphs.arrowRight, " ", snapshot.lastMessage.to, ": ", snapshot.lastMessage.subject.replace(/\s+/g, ' ')] }))] }));
 }
 function marker(run, glyphs) {

package/dist/ui/entries/TeamCard.js

@@ -48,12 +48,7 @@ function TeamCardImpl(props) {
             : `${formatDuration(durationMs ?? 0)}  (${ok} ok, ${failed} failed)`;
     const count = `${runs.length} ${runs.length === 1 ? 'subagent' : 'subagents'}`;
     const dropped = requested > runs.length ? `  (${runs.length} of ${requested} requested)` : '';
-    // ABSENT WHEN NO FAST CHILD RAN, so an ordinary dispatch's card is unchanged
-    // (fast-model-tier §6). `n fast` rather than a ratio: the total is already one
-    // column to the left.
-    const fastCount = runs.filter((r) => r.tier === 'fast').length;
-    const fastNote = fastCount > 0 ? `  ${fastCount} fast` : '';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: theme.accent, bold: true, children: "team" }), _jsxs(Text, { color: theme.muted, children: [' ', count, dropped, fastNote, '  '] }), active && !reducedMotion && caps.unicode ? (_jsxs(Text, { color: color, children: [_jsx(Spinner, { type: "dots" }), " ", headline] })) : (_jsxs(Text, { color: color, children: [active ? `${glyphs.spinnerStill} ` : '', headline] }))] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, ...railBorderProps(glyphs.railVertical, theme.border), children: [runs.map((run) => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: isOk(run) ? theme.toolDone : theme.toolError, children: isOk(run) ? glyphs.toolDone : glyphs.toolError }), _jsxs(Text, { color: theme.primary, children: [' ', `${run.label}${run.tier === 'fast' ? '~' : ''}`.padEnd(8).slice(0, 8)] }), _jsxs(Text, { color: theme.muted, children: [' ', run.description, '  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? 0) - run.startedAt)) : '', `  ${run.turns} turns`, run.filesTouched.length > 0 ? `  ${run.filesTouched.length} files` : '', run.error ? `  ${run.error}` : ''] }), run.retry && (_jsxs(Text, { color: theme.noticeWarn, bold: true, children: ['  ', "retry ", run.retry.attempt, "/", run.retry.maxRetries] }))] }, run.label))), expanded &&
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: theme.accent, bold: true, children: "team" }), _jsxs(Text, { color: theme.muted, children: [' ', count, dropped, '  '] }), active && !reducedMotion && caps.unicode ? (_jsxs(Text, { color: color, children: [_jsx(Spinner, { type: "dots" }), " ", headline] })) : (_jsxs(Text, { color: color, children: [active ? `${glyphs.spinnerStill} ` : '', headline] }))] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, paddingLeft: 1, ...railBorderProps(glyphs.railVertical, theme.border), children: [runs.map((run) => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: isOk(run) ? theme.toolDone : theme.toolError, children: isOk(run) ? glyphs.toolDone : glyphs.toolError }), _jsxs(Text, { color: theme.primary, children: [' ', run.label.padEnd(8).slice(0, 8)] }), _jsxs(Text, { color: theme.muted, children: [' ', run.description, '  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? 0) - run.startedAt)) : '', `  ${run.turns} turns`, run.filesTouched.length > 0 ? `  ${run.filesTouched.length} files` : '', run.error ? `  ${run.error}` : ''] }), run.retry && (_jsxs(Text, { color: theme.noticeWarn, bold: true, children: ['  ', "retry ", run.retry.attempt, "/", run.retry.maxRetries] }))] }, run.label))), expanded &&
                         runs.map((run) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.accent, children: [run.label, " ", glyphs.midDot, " ", run.description] }), _jsx(Text, { color: theme.muted, children: run.summary ?? '(no summary)' })] }, `s-${run.label}`))), !expanded && !active && runs.length > 0 && (_jsxs(Text, { color: theme.muted, children: ["+", runs.length, " ", runs.length === 1 ? 'summary' : 'summaries', " (Ctrl+O)"] })), expanded && _jsx(Text, { color: theme.muted, children: "(Ctrl+O to collapse)" })] })] }));
 }
 /**

package/dist/ui/layout/status-detail-layout.js

@@ -1,6 +1,17 @@
 import { formatCost, formatTokens, promptTokensOf } from '../../agent/usage.js';
 import { actionCandidates, clipStatusText, escapeClause } from '../interaction-hints.js';
+import { MODE_LABEL } from '../../agent/agent-mode.js';
 import { statusField, statusLinePlan, validContext } from './status-layout.js';
+/**
+ * Uppercase mode word for the details row, mirroring the primary row's field:
+ * same vocabulary (`MODE_LABEL`), same `CUR>PENDING` deferred-switch shape.
+ */
+function detailModeText(mode, pendingMode) {
+    const word = (value) => MODE_LABEL[value] ?? value.toUpperCase();
+    if (pendingMode)
+        return `${word(mode || 'build')}>${word(pendingMode)}`;
+    return word(mode || 'build');
+}
 export function planStatusDetail(input) {
     const { status, hints } = input;
     const budget = Math.max(0, Math.floor(status.columns) - 1);
@@ -26,8 +37,7 @@ export function planStatusDetail(input) {
     if (status.servicesActive?.live)
         add(statusField('services', 'Svc' + status.servicesActive.live));
     if (status.mode || status.pendingMode)
-        add(statusField('mode', status.pendingMode
-            ? (status.mode ?? 'build') + '>' + status.pendingMode : status.mode));
+        add(statusField('mode', detailModeText(status.mode, status.pendingMode), 'accent'));
     if (validContext(status.context)) {
         const approximate = status.context.source === 'estimate' || status.context.deltaTokens > 0 ? '~' : '';
         add(statusField('context', 'Context ' + approximate + formatTokens(status.context.occupied)

package/dist/ui/layout/status-layout.d.ts

@@ -25,6 +25,7 @@ export interface StatusLayoutInput {
         max: number;
         secondsLeft: number;
     };
+    /** Named on the primary row in EVERY mode - the §6.4 guarantee, restored. */
     mode?: string;
     pendingMode?: string | null;
     servicesActive?: {
@@ -54,7 +55,8 @@ export interface StatusField {
     id: string;
     text: string;
     cells: number;
-    tone: 'normal' | 'muted' | 'warning' | 'error';
+    /** 'accent' carries the mode word - the row's one always-on emphasis. */
+    tone: 'normal' | 'muted' | 'warning' | 'error' | 'accent';
 }
 export interface StatusLinePlan {
     fields: readonly StatusField[];
@@ -68,5 +70,5 @@ export declare function statusLinePlan(fields: readonly StatusField[], separator
 export declare function phaseLabels(input: Pick<StatusLayoutInput, 'phase' | 'activeTool' | 'runOutcome' | 'waitingForConfirmation' | 'stopping' | 'compacting' | 'retryActive'>): readonly [string, string];
 export declare function validContext(context: ContextUsageSnapshot): boolean;
 export declare function shortDuration(ms: number): string;
-/** All five fields survive each width rung; only the redraw carrier is outside this plan. */
+/** Every field survives each width rung; only the redraw carrier is outside this plan. */
 export declare function planPrimaryStatusFields(input: StatusPrimaryInput): StatusLinePlan;

package/dist/ui/layout/status-layout.js

@@ -1,6 +1,7 @@
 import stringWidth from 'string-width';
 import stripAnsi from 'strip-ansi';
 import { formatDuration } from '../../agent/usage.js';
+import { MODE_LABEL } from '../../agent/agent-mode.js';
 import { interactionCopy as copy } from '../interaction-copy.js';
 export function cleanStatusText(text) {
     // eslint-disable-next-line no-control-regex
@@ -89,7 +90,27 @@ function feedbackLabel(input, form) {
     return labels[feedback.kind][form === 'full' ? 0 : form === 'short' ? 1 : 2];
 }
 const thinkingCodes = { off: 'O', minimal: 'N', low: 'L', medium: 'M', high: 'H', xhigh: 'X' };
-/** All five fields survive each width rung; only the redraw carrier is outside this plan. */
+/**
+ * The mode word for the primary row: full rungs name the mode with
+ * `MODE_LABEL`, tight rungs keep only its first letter, and a deferred switch
+ * renders `CUR>PENDING` in both tiers. `null` when the caller names no mode at
+ * all, so callers and tests that predate the field keep a byte-identical plan.
+ * The word must survive every width rung: the border color cannot be the only
+ * mode signal the default view carries (plan-mode P1-6).
+ */
+function modeFieldText(mode, pendingMode, full) {
+    if (!mode && !pendingMode)
+        return null;
+    const word = (value) => {
+        const label = MODE_LABEL[value];
+        if (!label)
+            return full ? value.toUpperCase() : (value[0] ?? '?').toUpperCase();
+        return full ? label : label[0];
+    };
+    const current = word(mode || 'build');
+    return pendingMode ? `${current}>${word(pendingMode)}` : current;
+}
+/** Every field survives each width rung; only the redraw carrier is outside this plan. */
 export function planPrimaryStatusFields(input) {
     const budget = Math.max(0, (Number.isFinite(input.columns) ? Math.floor(input.columns) : 80) - 1);
     const labels = phaseLabels(input);
@@ -104,8 +125,10 @@ export function planPrimaryStatusFields(input) {
         const full = rung === 0;
         const label = feedbackLabel(input, full ? 'full' : rung >= 4 ? 'tiny' : 'short')
             ?? (full ? labels[1] : rung >= 4 ? labels[0].slice(0, 4) : labels[0]);
+        const modeText = modeFieldText(input.mode, input.pendingMode, full);
         return statusLinePlan([
             statusField('phase', glyph + (rung >= 5 ? '' : ' ') + label, tone),
+            ...(modeText ? [statusField('mode', modeText, 'accent')] : []),
             statusField('context', (full ? 'Context ' : 'C') + pct),
             statusField('thinking', full ? 'Think ' + (thinkingCodes[input.thinkingLevel] ? input.thinkingLevel : '?')
                 : (rung >= 2 ? '' : 'Th:') + code),

package/dist/ui/overlays/HelpOverlay.js

@@ -31,6 +31,7 @@ function keyRows(times) {
         ['Drag right edge', 'Scroll messages; input stays fixed; type to return to newest output'],
         ['Bottom rows', 'Fixed input, one status row; Ctrl+G adds one detail row'],
         ['C / Th / t/s', 'Context percent / thinking level / run-average output tokens per second'],
+        ['B / P / P>B', 'Status-row mode word: BUILD / PLAN; CUR>PENDING = switch deferred to run end'],
         ['O/N/L/M/H/X', 'Thinking: off/minimal/low/medium/high/xhigh'],
         ['~ / ? / --', 'Estimated context / unknown context / unavailable output speed'],
         ['Output speed', 'Main Agent reported output tokens / total run time, including tools and waits'],
@@ -40,7 +41,6 @@ function keyRows(times) {
         ['Ctrl+C (with a selection)', 'Copy the pending selection - does not arm exit'],
         ['Native terminal selection', 'Copy-on-select is controlled by your terminal settings'],
         ['Queue / /queue', 'Pending receipt; /queue opens full text, PgUp/PgDn pages, Esc closes'],
-        ['plan>build / build>plan', 'A mode switch pending until the current run ends'],
         ['/bg / /todo status', 'Show full service and TODO counts when status fields are hidden'],
         ['Queue paused', 'Unreceived messages persist after interruption until accepted or cancelled'],
         ['Up / Down', 'Prompt history (empty input)'],
@@ -113,7 +113,6 @@ const FAST_ROWS = [
     ['/fast model <id>', 'Set the fast model; accepts provider:model'],
     ['/fast same', 'Run the fast tier on the main model'],
     ['/fast review <n> | off', 'Turns between automatic reviews, or turn them off'],
-    ['/fast delegate on | off', 'Allow model:"fast" on task subagents'],
     ['--fast / --no-fast', 'Start a session with the tier on or off (also ARAGON_FAST=1)'],
     ['<fast_review>', 'An automated second opinion from the fast model - advice, not the user'],
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon-agent/cli",
-  "version": "0.6.15",
+  "version": "0.6.17",
   "description": "AragonAgent CLI — a Claude-Code / Codex-style interactive terminal UI (TUI) on top of the @aragon-agent/core engine. Installable and runnable via npm / npx.",
   "license": "MIT",
   "author": "AragonAgent contributors",
@@ -56,7 +56,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@aragon-agent/core": "^0.2.27",
+    "@aragon-agent/core": "^0.2.29",
     "chalk": "^5.6.2",
     "cli-highlight": "^2.0.0",
     "commander": "^12.1.0",