@aragon-agent/cli 0.6.12 → 0.6.14

package/dist/config/schema.d.ts

@@ -671,6 +671,7 @@ export declare function clampBashConfig(raw: unknown): BashConfig;
  */
 export declare function parseThresholdInput(raw: string): number | null;
 export interface PersistedConfig {
+    modelProfiles?: import('./model-profiles.js').ModelProfilesConfig;
     version: number;
     provider: string;
     model: string;
@@ -838,6 +839,14 @@ export declare const LEGACY_STATE_KEYS: readonly ["promptHistory", "submitCount"
  */
 export declare function stripLegacyStateKeys<T extends object>(raw: T): T;
 export interface CliConfig {
+    /** A committed model snapshot failed to apply; no further requests may start. */
+    modelSettingsRestartRequired?: boolean;
+    modelProfiles?: import('./model-profiles.js').ModelProfilesConfig;
+    modelProfileState?: import('./model-profiles.js').ModelProfilesRuntime;
+    apiKeyOverrideTarget?: {
+        provider: string;
+        baseUrl: string | null;
+    };
     provider: string;
     model: string;
     baseUrl?: string;
@@ -1088,9 +1097,9 @@ export interface CliConfig {
     cwd: string;
     /** Whether ANSI color is enabled. */
     color: boolean;
-    /** Detected terminal color depth (0 none · 1 16 · 2 256 · 3 truecolor). */
+    /** Resolved color depth: TUI policy or non-interactive terminal detection. */
     colorLevel?: 0 | 1 | 2 | 3;
-    /** Detected Unicode support (box/round glyphs & spinners). */
+    /** TUI always enables Unicode; non-interactive output uses detection. */
     unicode?: boolean;
     /** One-shot `--api-key` override; applies to the active provider only. */
     apiKeyOverride?: string;

package/dist/config/store.d.ts

@@ -10,6 +10,8 @@
  * the drift the header of that module warns about.
  */
 import { getConfigPath, getSessionsDir } from './app-paths.js';
+import { type ModelSettingsPatch } from './model-profile-store.js';
+import { type ModelProfilesConfig } from './model-profiles.js';
 import { type PersistedConfig } from './schema.js';
 export { getConfigPath, getSessionsDir };
 export interface ConfigFileRead {
@@ -40,6 +42,8 @@ export declare function writeConfigFile(config: PersistedConfig): void;
  * Unlike `readConfigFile`, this always returns a complete `PersistedConfig`.
  */
 export declare function loadPersistedConfig(): PersistedConfig;
+/** Fill legacy defaults without projecting bindings or discarding unknown profile data. */
+export declare function normalizePersistedConfig(input: Partial<PersistedConfig>): PersistedConfig;
 /**
  * Read the persisted config, apply a patch, write it back atomically, and
  * return the merged result. This is the single write path used by the settings
@@ -59,4 +63,10 @@ export declare function loadPersistedConfig(): PersistedConfig;
  * a third SECTION, but it is still one level deep (scalars only), so the same
  * hand-written merge covers it — and it must stay that way for that reason.
  */
-export declare function updatePersistedConfig(patch: Partial<PersistedConfig>): PersistedConfig;
+export declare function updatePersistedConfig(patch: ModelSettingsPatch & {
+    modelProfiles?: ModelProfilesConfig;
+}): PersistedConfig;
+/** Merge an already adapted patch, replacing profile arrays as one complete section. */
+export declare function mergePersistedConfig(current: PersistedConfig, patch: ModelSettingsPatch & {
+    modelProfiles?: ModelProfilesConfig;
+}): PersistedConfig;

package/dist/config/store.js

@@ -9,11 +9,14 @@
  * a second name for `skills/paths.ts::getUserSkillsDir()`, which is precisely
  * the drift the header of that module warns about.
  */
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync, chmodSync } from 'node:fs';
+import { existsSync, mkdirSync, renameSync, writeFileSync, chmodSync, rmSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 import { dirname } from 'node:path';
 import process from 'node:process';
 import { getConfigPath, getSessionsDir } from './app-paths.js';
-import { registerSecretsFrom } from '../logging/secret-registry.js';
+import { registerProfileSecrets, registerSecretsFrom } from '../logging/secret-registry.js';
+import { adaptLegacyConnectionPatch, ModelProfileConfigError, readModelSettingsDisk } from './model-profile-store.js';
+import { normalizeModelProfiles } from './model-profiles.js';
 import { clampBashConfig, CONFIG_VERSION, DEFAULT_CONFIG, clampCompactionConfig, clampFastConfig, clampLogConfig, clampMaxTokens, clampRetryConfig, clampSkillsConfig, clampTeamConfig, clampTodoConfig, clampContextWindow, clampUpdateConfig, isAutoToken, stripLegacyStateKeys, } from './schema.js';
 /**
  * Normalize `maxTokens` for both directions of the config file.
@@ -62,25 +65,12 @@ export { getConfigPath, getSessionsDir };
  * workflow, so the failure mode had to become visible.
  */
 export function readConfigFile() {
-    const file = getConfigPath();
-    if (!existsSync(file))
-        return { config: null };
-    try {
-        const raw = readFileSync(file, 'utf-8');
-        const parsed = JSON.parse(raw);
-        if (parsed && typeof parsed === 'object') {
-            // Retired layout preference: tolerate old files without restoring a UI mode.
-            delete parsed.fullscreen;
-            return { config: parsed };
-        }
-        return { config: null, parseError: `${file} does not contain a JSON object` };
-    }
-    catch (err) {
-        return {
-            config: null,
-            parseError: `${file}: ${err instanceof Error ? err.message : String(err)}`,
-        };
-    }
+    const read = readModelSettingsDisk();
+    if (!read.ok)
+        return { config: null, parseError: `${getConfigPath()}: ${read.error}` };
+    if (read.parsed)
+        delete read.parsed.fullscreen;
+    return { config: read.parsed };
 }
 // ---------------------------------------------------------------------------
 // Write (atomic + 0600)
@@ -97,10 +87,19 @@ function ensureDir(dir) {
 export function writeConfigFile(config) {
     const file = getConfigPath();
     ensureDir(dirname(file));
-    const tmp = `${file}.${process.pid}.tmp`;
+    const tmp = `${file}.${process.pid}.${randomUUID()}.tmp`;
     const json = `${JSON.stringify(config, null, 2)}\n`;
-    writeFileSync(tmp, json, { encoding: 'utf-8', mode: 0o600 });
-    renameSync(tmp, file);
+    try {
+        writeFileSync(tmp, json, { encoding: 'utf-8', mode: 0o600, flag: 'wx' });
+        renameSync(tmp, file);
+    }
+    catch {
+        try {
+            rmSync(tmp, { force: true });
+        }
+        catch { /* Only our temporary path is eligible. */ }
+        throw new ModelProfileConfigError('write_failed');
+    }
     // rename may not preserve mode on every platform; re-chmod on POSIX.
     if (process.platform !== 'win32') {
         try {
@@ -116,12 +115,17 @@ export function writeConfigFile(config) {
  * Unlike `readConfigFile`, this always returns a complete `PersistedConfig`.
  */
 export function loadPersistedConfig() {
+    return normalizePersistedConfig(readConfigFile().config ?? {});
+}
+/** Fill legacy defaults without projecting bindings or discarding unknown profile data. */
+export function normalizePersistedConfig(input) {
     // STRIP BEFORE THE SPREAD, not after. `partial` is the raw file, so any
     // `promptHistory` / `submitCount` / `mouseNoticeSeen` / `recentModels` left
     // on disk would otherwise ride the spread into `merged` and be written back
     // out by `updatePersistedConfig` — the "I deleted it and it grew back" bug
     // that `stripLegacyStateKeys` exists to make impossible (§4.5).
-    const partial = stripLegacyStateKeys(readConfigFile().config ?? {});
+    const partial = stripLegacyStateKeys(input);
+    delete partial.fullscreen;
     return {
         ...DEFAULT_CONFIG,
         ...partial,
@@ -207,14 +211,27 @@ export function loadPersistedConfig() {
  * hand-written merge covers it — and it must stay that way for that reason.
  */
 export function updatePersistedConfig(patch) {
+    const read = readModelSettingsDisk();
+    if (!read.ok)
+        throw new ModelProfileConfigError('read_failed');
+    const adapted = adaptLegacyConnectionPatch({ current: read.config, patch });
+    const merged = mergePersistedConfig(read.config, adapted);
+    writeConfigFile(merged);
+    return merged;
+}
+/** Merge an already adapted patch, replacing profile arrays as one complete section. */
+export function mergePersistedConfig(current, patch) {
     // Registration site 5. Whatever route a key took to get here, this is the one
     // function that writes it to disk, so this is the last place it can be added
     // to the redactor's backstop before it also starts appearing in log records.
     registerSecretsFrom(patch.apiKeys);
-    const current = loadPersistedConfig();
+    registerProfileSecrets(patch);
+    const submittedProfiles = patch.modelProfiles === undefined
+        ? {} : { modelProfiles: normalizeModelProfiles(patch.modelProfiles) };
     const merged = {
         ...current,
         ...patch,
+        ...submittedProfiles,
         version: CONFIG_VERSION,
         // The write half of the gate: without it `config set maxTokens 900000` puts
         // a number on disk that the read path silently rewrites on every launch.
@@ -273,6 +290,5 @@ export function updatePersistedConfig(patch) {
         // `bash_output` / `bash_kill` from the next launch onward.
         bash: clampBashConfig({ ...current.bash, ...(patch.bash ?? {}) }),
     };
-    writeConfigFile(merged);
     return merged;
 }

package/dist/fast/resolve.d.ts

@@ -18,6 +18,7 @@
  * at construction is a tier that can be describing a provider the session no
  * longer uses.
  */
+import type { ModelRole } from '../config/model-profiles.js';
 import { type CliConfig } from '../config/schema.js';
 import type { FastTier } from './types.js';
 /**
@@ -29,7 +30,7 @@ import type { FastTier } from './types.js';
  *   `--api-key` override. Injected rather than reimplemented, because a second
  *   key resolver is a second answer to "why does it say no key?".
  */
-export declare function resolveFastTier(config: CliConfig, hasKey: (providerId: string) => boolean): FastTier;
+export declare function resolveFastTier(config: CliConfig, hasKey: (providerId: string, role?: ModelRole) => boolean): FastTier;
 /**
  * The one-line notice for a tier the user switched on that cannot resolve, or
  * `null` when there is nothing worth saying.

package/dist/fast/resolve.js

@@ -47,7 +47,7 @@ export function resolveFastTier(config, hasKey) {
     //        different settings.
     if (!isAdapterProvider(provider))
         return { ok: false, reason: 'no_adapter' };
-    if (!hasKey(provider))
+    if (!hasKey(provider, 'fast'))
         return { ok: false, reason: 'no_key' };
     // 6. A fast tier on the SAME provider inherits the session's base URL: a user
     //    pointing the CLI at a gateway means both models, not one. A fast tier on
@@ -56,9 +56,11 @@ export function resolveFastTier(config, hasKey) {
     const explicitBaseUrl = fast.baseUrl.trim();
     const baseUrl = explicitBaseUrl.length > 0
         ? explicitBaseUrl
-        : provider === config.provider
-            ? config.baseUrl
-            : undefined;
+        : config.modelProfiles?.fastId && !config.modelProfileState?.fast.invalid
+            ? undefined
+            : provider === config.provider
+                ? config.baseUrl
+                : undefined;
     const ref = {
         providerId: provider,
         modelId,

package/dist/fast/wiring.d.ts

@@ -30,6 +30,7 @@
  * inside its own loop with an error naming neither the tier nor the setting that
  * caused it (`agent-loop.ts:140-145`).
  */
+import type { ModelRole } from '../config/model-profiles.js';
 import { type AgentEvent, type AssistantMessage, type LLMRequest, type ModelRef, type ThinkingLevel } from '@aragon-agent/core';
 import type { CliConfig } from '../config/schema.js';
 import type { NoticeLevel } from '../agent/reducer.js';
@@ -38,8 +39,8 @@ export interface FastWiringDeps {
     /** Read LIVE on every call - the controller replaces the object on mutation. */
     getConfig: () => CliConfig;
     /** `AgentController.hasApiKey`, so there is exactly one key resolver. */
-    hasKey: (providerId: string) => boolean;
-    getApiKey: (providerId: string) => string | undefined;
+    hasKey: (providerId: string, role?: ModelRole) => boolean;
+    getApiKey: (providerId: string, role?: ModelRole) => string | undefined;
     /** Whether the static price table knows this model (C-11 / RV-4). */
     isPricedModel: (ref: Pick<ModelRef, 'providerId' | 'modelId'>) => boolean;
     /** The lead agent's event stream and steering surface. */
@@ -145,7 +146,7 @@ export declare class FastWiring {
      * resolved model id and a prompt naming a model the tier will not use is worse
      * than no prompt at all.
      */
-    onConfigChanged(): void;
+    onConfigChanged(refreshPrompt?: boolean, enabled?: boolean): void;
     /**
      * The startup notice for a configuration mistake that is otherwise invisible
      * (§3.3). Raised once, at construction, through the controller's `notify`.
@@ -162,6 +163,7 @@ export declare class FastWiring {
     resolveTier(tier: FastTierName): {
         ref: ModelRef;
         thinkingLevel: ThinkingLevel;
+        role?: ModelRole;
     };
     /** The resolved fast `ModelRef`, or `null` - for per-tier cost lookup (§3.6). */
     fastRef(): ModelRef | null;

package/dist/fast/wiring.js

@@ -114,7 +114,7 @@ export class FastWiring {
             getTier: () => this.tier,
             getConfig: () => this.deps.getConfig().fast,
             available: () => this.available(),
-            getApiKey: deps.getApiKey,
+            getApiKey: (id) => deps.getApiKey(id, 'fast'),
             emit: (event) => this.emit(event),
             // The reviewer announces its own self-disable with a `tier_changed`, and
             // only the wiring can build the snapshot that carries it.
@@ -202,7 +202,9 @@ export class FastWiring {
      * resolved model id and a prompt naming a model the tier will not use is worse
      * than no prompt at all.
      */
-    onConfigChanged() {
+    onConfigChanged(refreshPrompt = true, enabled) {
+        if (enabled !== undefined)
+            this.enabled = enabled;
         const next = resolveFastTier(this.deps.getConfig(), this.deps.hasKey);
         const before = this.tier;
         this.tier = next;
@@ -219,7 +221,8 @@ export class FastWiring {
                     this.deps.notify('warn', text);
             }
         }
-        this.deps.onPromptChanged();
+        if (refreshPrompt)
+            this.deps.onPromptChanged();
         this.emit({ type: 'tier_changed', snapshot: this.snapshot() });
     }
     /**
@@ -243,7 +246,7 @@ export class FastWiring {
     resolveTier(tier) {
         const config = this.deps.getConfig();
         if (tier === 'fast' && this.delegationAvailable() && this.tier.ok) {
-            return { ref: this.tier.ref, thinkingLevel: this.tier.thinkingLevel };
+            return { ref: this.tier.ref, thinkingLevel: this.tier.thinkingLevel, role: 'fast' };
         }
         return {
             ref: {
@@ -252,6 +255,7 @@ export class FastWiring {
                 ...(config.baseUrl ? { baseUrl: config.baseUrl } : {}),
             },
             thinkingLevel: config.thinkingLevel,
+            role: 'main',
         };
     }
     /** The resolved fast `ModelRef`, or `null` - for per-tier cost lookup (§3.6). */

package/dist/input/stdin-filter.js

@@ -228,8 +228,9 @@ export function createStdinFilter(real, features, bridge, onWarn) {
             burstTimer = arm(flushBurst, PASTE_BURST_MS);
             return;
         }
-        // Step 0: with `mouse` false this degenerates to "pass the text on", which
-        // is byte-identical to the unwrapped stream.
+        // Ink conflates DEL Backspace with CSI Delete. Normalize only keyboard
+        // text, after burst classification, preserving ESC for Alt+Backspace.
+        text = text.replace(/\x7f/g, '\x08');
         if (!features.mouse) {
             writeInput(text);
             return;

package/dist/logging/install.js

@@ -42,7 +42,7 @@ import { readConfigFile } from '../config/store.js';
 import { clampLogConfig } from '../config/schema.js';
 import { clampLogLevel } from './levels.js';
 import { Logger, setActiveLogger } from './logger.js';
-import { registerSecretsFrom } from './secret-registry.js';
+import { registerProfileSecrets, registerSecretsFrom } from './secret-registry.js';
 /** POSIX signal numbers for the `128 + signo` exit-code convention. */
 const SIGNAL_NUMBERS = { SIGINT: 2, SIGTERM: 15, SIGHUP: 1 };
 let screenRestore = () => { };
@@ -213,7 +213,9 @@ export function installLogging(opts = {}) {
     // Registration site 1 (§4.4.3): whatever the config file already holds. Sites
     // 2, 3, 4 and 5 add the env, the merged view plus `--api-key`, the settings
     // screen, and every persisted write respectively.
-    registerSecretsFrom(readConfigFile().config?.apiKeys ?? undefined);
+    const persisted = readConfigFile().config;
+    registerSecretsFrom(persisted?.apiKeys ?? undefined);
+    registerProfileSecrets(persisted);
     const warning = getHomeResolutionWarning();
     if (warning)
         logger.warn('cli', 'home_resolution_fallback', { reason: warning });

package/dist/logging/secret-registry.d.ts

@@ -18,6 +18,8 @@
 export declare function registerSecret(value: string | undefined | null): void;
 /** Convenience for the `apiKeys` maps every registration site happens to hold. */
 export declare function registerSecretsFrom(keys: Record<string, string | null | undefined> | undefined): void;
+/** Register dedicated credentials in untrusted parsed config before schema validation. */
+export declare function registerProfileSecrets(value: unknown): void;
 /**
  * Every known secret, LONGEST FIRST.
  *

package/dist/logging/secret-registry.js

@@ -39,6 +39,24 @@ export function registerSecretsFrom(keys) {
     for (const value of Object.values(keys))
         registerSecret(value);
 }
+/** Register dedicated credentials in untrusted parsed config before schema validation. */
+export function registerProfileSecrets(value) {
+    if (!value || typeof value !== 'object')
+        return;
+    const profiles = value.modelProfiles;
+    if (!profiles || typeof profiles !== 'object')
+        return;
+    const entries = profiles.entries;
+    if (!Array.isArray(entries))
+        return;
+    for (const entry of entries) {
+        if (!entry || typeof entry !== 'object')
+            continue;
+        const key = entry.apiKey;
+        if (typeof key === 'string')
+            registerSecret(key);
+    }
+}
 /**
  * Every known secret, LONGEST FIRST.
  *

package/dist/team/runtime.d.ts

@@ -17,6 +17,7 @@
  * queue class, no event-loop trickery — every path is observable from the event
  * stream.
  */
+import type { ModelRole } from '../config/model-profiles.js';
 import type { ProviderRegistry, SkillRegistry, ToolPolicyDecision, ToolPolicyVerdict } from '@aragon-agent/core';
 import type { AgentMode } from '../agent/agent-mode.js';
 import type { CliConfig } from '../config/schema.js';
@@ -30,7 +31,7 @@ export interface TeamRuntimeDeps {
     providerRegistry: ProviderRegistry;
     getCwd: () => string;
     getMode: () => AgentMode;
-    getApiKey: (providerId: string) => string | undefined;
+    getApiKey: (providerId: string, role?: ModelRole) => string | undefined;
     skillRegistry?: SkillRegistry;
     alwaysBlock?: () => string;
     toolPolicy?: () => ToolPolicyDecision;

package/dist/team/subagent.d.ts

@@ -10,6 +10,7 @@
  * them (§3.11 / R-6). What a child does NOT get is spelled out below, and each
  * omission has a reason that is a correctness boundary rather than caution.
  */
+import type { ModelRole } from '../config/model-profiles.js';
 import { type AgentConfig, type AgentEvent, type AgentTool, type Message, type ModelRef, type ProviderRegistry, type SkillRegistry, type ThinkingLevel, type TokenUsage, type ToolPolicyDecision, type ToolPolicyVerdict } from '@aragon-agent/core';
 import type { AgentMode } from '../agent/agent-mode.js';
 import type { ChildContextManagerProvider } from '../compaction/child.js';
@@ -60,7 +61,7 @@ export interface SubagentDeps {
     getCwd: () => string;
     /** The lead's live session mode. Read at CALL time, never cached. */
     getMode: () => AgentMode;
-    getApiKey: (providerId: string) => string | undefined;
+    getApiKey: (providerId: string, role?: ModelRole) => string | undefined;
     /**
      * The lead's `SkillRegistry`, used for `skill_find` ONLY.
      *
@@ -109,6 +110,7 @@ export interface SubagentDeps {
     resolveTier?: (tier: FastTierName) => {
         ref: ModelRef;
         thinkingLevel: ThinkingLevel;
+        role?: ModelRole;
     };
     /**
      * Build this child its own context manager

package/dist/team/subagent.js

@@ -181,6 +181,7 @@ export function createSubagent(spec, deps, hooks) {
                 ...(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
@@ -209,6 +210,7 @@ export function createSubagent(spec, deps, hooks) {
     const contextManager = deps.contextManagerFor?.({
         label: spec.label,
         model,
+        role: resolved.role ?? 'main',
         getMessages: () => agentRef?.state.messages ?? [],
         getSystemPrompt: () => systemPrompt,
         onCompacted: () => {
@@ -224,7 +226,7 @@ export function createSubagent(spec, deps, hooks) {
         // constructing five of them per dispatch is pure waste.
         providerRegistry: deps.providerRegistry,
         // The lead's closure, so a settings-screen key edit reaches children too.
-        getApiKey: deps.getApiKey,
+        getApiKey: (id) => deps.getApiKey(id, resolved.role ?? 'main'),
         ...(deps.config.maxTokens !== undefined ? { maxTokens: deps.config.maxTokens } : {}),
         timeouts: {
             toolTimeout: deps.config.toolTimeoutMs,

package/dist/ui/ActivityLine.d.ts

@@ -1,85 +1,21 @@
-/**
- * The live working line (agent-activity-presentation §3.2.2).
- *
- * Exactly one row, immediately above the composer, while a run is in flight:
- *
- *     * Percolating...
- *
- * THE ROW CARRIES THE PHRASE AND NOTHING ELSE, AND THAT IS THE WHOLE OF ITS
- * DESIGN (D-5 / P1-1). No elapsed clock, no token count, no `esc abort`, at any
- * width. Every one of those is already on screen while running: the status bar
- * renders `formatDuration(elapsedMs)` under exactly the `running` condition that
- * mounts this row and the token cluster at `cols >= 72`, and both composers carry
- * the abort hint. Duplicated rows are precisely what the v0.4.0 removal of the
- * status bar's hint cluster was for, and that rule does not distinguish between a
- * duplicated string and a duplicated number.
- *
- * Because there are no clusters there is NO WIDTH LADDER: one row, one
- * truncating `<Text>`, identical at 200 columns and at 40. `cols` is therefore
- * not a prop — nothing on the row depends on width, and a prop that changed on
- * every resize but was never read would be a false dependency on a memo boundary.
- *
- * What is left is the one thing the status bar cannot say: THAT THE SILENCE IS
- * WORK. The bar shows state; this row shows life.
- *
- * THIS ROW OWNS THE ONLY ANIMATED SPINNER WHILE IT IS MOUNTED
- * (single-spinner-while-running D-1). Seven other sites can animate — the
- * streaming assistant marker, the tool badge, the team/fast/retry cards, and the
- * two panels' rows — and each was independently right to. Emergently they put up
- * to five braille animations on adjacent rows, each on its own 80 ms timer: one
- * piece of information rendered five times and out of phase, which is the same
- * duplication the paragraph above legislates against for text. So `App` widens
- * the `reducedMotion` it hands those seven to `cfg.reducedMotion || (running &&
- * !overlay)`, and they all fall back to the static glyphs they already had.
- *
- * THIS COMPONENT KEEPS THE RAW CONFIG FLAG, and that asymmetry is deliberate
- * (D-5). It reads the flag TWICE: once for the spinner below, and once for
- * `pickActivityPhrase`'s rotation. Handing it the widened value would freeze the
- * phrase at the first word of every run — a second, unrelated regression, and
- * one nobody would connect to a change about icons.
+/** Legacy activity presentation. Explicit facts share the global status label mapping.
+ * StatusBar owns the application's sole live spinner via the factory below.
  */
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
 import { pickGlyphs } from './glyphs.js';
 import type { RunActivity } from './run-status-row.js';
-/**
- * The animated spinner this row draws while it is live, or `null` when it would
- * be STATIC — an ASCII terminal, or a user who asked for stillness.
- *
- * A FACTORY, NOT A COMPONENT, and the distinction is load-bearing. A
- * `<LiveSpinner/>` element whose own render returned `null` would still be
- * truthy at the call site — the exact trap `BottomStatusRow`'s `update` prop
- * documents at length. Callers test the RETURN VALUE and get a real answer.
- *
- * It is exported so `BottomStatusRow` can put the bare glyph beside a toast
- * without importing `ink-spinner` itself: `spinner-census.test.ts` enumerates
- * every file under `src/ui/**` that imports it, and that list is the checklist
- * for "who is allowed to animate". One more importer is one more site a future
- * reader has to reason about; one more caller of this function is not.
- */
+/** Shared animation factory; returns null for ASCII or reduced-motion terminals. */
 export declare function liveSpinner(reducedMotion: boolean, caps: TermCapabilities): React.ReactElement | null;
-/**
- * The label ladder, MOST SPECIFIC FIRST: `Compacting context` outranks a tool name
- * because compaction can be the only thing happening, and the tool name outranks
- * the rotating phrase for the reason `runningTool` exists at all. One
- * implementation, because the fixed bottom row and the run status row above the
- * input must never disagree about what the agent is doing.
- *
- * `Running ${name}` rather than a per-tool verb table: a table would be a SECOND
- * registry of tool names, and `toolGlyph` is already the one place that knows
- * them. ASCII only, and the ellipsis comes from `pickGlyphs` like every other one.
- */
+/** Explicit execution facts outrank compatibility tool names and rotating phrases. */
 export declare function resolveActivityLabel(activity: RunActivity, glyphs: ReturnType<typeof pickGlyphs>): string;
 export interface ActivityLabelProps extends RunActivity {
     /**
-     * False draws the STATIC glyph even when motion is allowed. The run status row
-     * uses it when it has scrolled out of the viewport (the fixed bottom row owns
-     * the animation then) or an overlay covers the chat. The phrase still rotates
-     * from the RAW `reducedMotion`, so a still icon never freezes the wording.
+     * False forces a static glyph. Compatibility phrases still follow reducedMotion.
      */
     spinnerLive?: boolean;
-    /** Prefix one space (the fixed bottom row's indent); the run row indents itself. */
+    /** Prefix one space for compatibility line consumers. */
     leadingSpace?: boolean;
     theme: Theme;
     caps: TermCapabilities;

package/dist/ui/ActivityLine.js

@@ -3,36 +3,19 @@ import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { pickGlyphs } from './glyphs.js';
 import { pickActivityPhrase } from './activity-phrases.js';
-/**
- * The animated spinner this row draws while it is live, or `null` when it would
- * be STATIC — an ASCII terminal, or a user who asked for stillness.
- *
- * A FACTORY, NOT A COMPONENT, and the distinction is load-bearing. A
- * `<LiveSpinner/>` element whose own render returned `null` would still be
- * truthy at the call site — the exact trap `BottomStatusRow`'s `update` prop
- * documents at length. Callers test the RETURN VALUE and get a real answer.
- *
- * It is exported so `BottomStatusRow` can put the bare glyph beside a toast
- * without importing `ink-spinner` itself: `spinner-census.test.ts` enumerates
- * every file under `src/ui/**` that imports it, and that list is the checklist
- * for "who is allowed to animate". One more importer is one more site a future
- * reader has to reason about; one more caller of this function is not.
- */
+import { phaseLabels } from './layout/status-layout.js';
+/** Shared animation factory; returns null for ASCII or reduced-motion terminals. */
 export function liveSpinner(reducedMotion, caps) {
     return caps.unicode && !reducedMotion ? _jsx(Spinner, { type: "dots" }) : null;
 }
-/**
- * The label ladder, MOST SPECIFIC FIRST: `Compacting context` outranks a tool name
- * because compaction can be the only thing happening, and the tool name outranks
- * the rotating phrase for the reason `runningTool` exists at all. One
- * implementation, because the fixed bottom row and the run status row above the
- * input must never disagree about what the agent is doing.
- *
- * `Running ${name}` rather than a per-tool verb table: a table would be a SECOND
- * registry of tool names, and `toolGlyph` is already the one place that knows
- * them. ASCII only, and the ellipsis comes from `pickGlyphs` like every other one.
- */
+/** Explicit execution facts outrank compatibility tool names and rotating phrases. */
 export function resolveActivityLabel(activity, glyphs) {
+    if (activity.phase !== undefined || activity.activeTool !== undefined || activity.outcome !== undefined) {
+        return phaseLabels({
+            phase: activity.phase ?? (activity.activeTool ? 'tool' : 'idle'),
+            activeTool: activity.activeTool, runOutcome: activity.outcome, compacting: activity.compacting,
+        })[1];
+    }
     if (activity.compacting)
         return `Compacting context${glyphs.ellipsis}`;
     if (activity.runningTool)
@@ -47,14 +30,9 @@ export function resolveActivityLabel(activity, glyphs) {
 export function ActivityLabel({ spinnerLive = true, leadingSpace = false, theme, caps, ...activity }) {
     const glyphs = pickGlyphs(caps);
     const label = resolveActivityLabel(activity, glyphs);
-    // The IDENTICAL branch `Transcript.tsx` uses for the assistant role marker, and
-    // it must stay identical: braille dots are both an animation AND a Unicode-only
-    // glyph, so reduced motion and an ASCII terminal fall back to the same marker.
-    //
-    // Through `liveSpinner` rather than inline, so this row and the glyph
-    // `BottomStatusRow` composes beside a toast can never disagree about WHEN the
-    // spinner is live - the same reason `App` names its mount condition once.
-    const spinner = (spinnerLive ? liveSpinner(activity.reducedMotion, caps) : null) ??
+    const settled = activity.phase === 'idle' || (activity.phase === undefined
+        && activity.outcome !== undefined && activity.outcome !== 'none' && !activity.activeTool);
+    const spinner = (spinnerLive && (!settled || activity.compacting) ? liveSpinner(activity.reducedMotion, caps) : null) ??
         glyphs.spinnerStill;
     return (_jsxs(Text, { wrap: "truncate", color: theme.thinking, children: [leadingSpace ? ' ' : '', spinner, " ", label] }));
 }

package/dist/ui/App.d.ts

@@ -88,6 +88,7 @@ export interface TerminalBridge {
     scrollbar?: ScrollbarBridge;
     /** Whether drag-select is on for this session (`mouseSelect` + a filter). */
     mouseSelect: boolean;
+    deleteDisambiguated?: boolean;
     /** Release the mouse to the terminal, or take it back (`/mouse`, G3). */
     setMouseCapture?: (on: boolean) => void;
     /** Whether the mouse is captured right now — read at command time. */