@aragon-agent/cli 0.6.23 → 0.6.25

package/dist/ui/overlays/HelpOverlay.js

@@ -68,8 +68,14 @@ const COMMANDS = [
         'Todo planning: status, switches, the rail, follow-through',
     ],
     ['/tools', 'List active tools'],
-    ['/clear', 'Clear the visible transcript and the todo panel'],
-    ['/reset', 'New conversation'],
+    // `/clear` IS NOT "CLEAR THE SCREEN" ANY MORE (clear-command-context-reset D-1).
+    // Two rows, not one, because the intentions differ: `/clear` starts a NEW
+    // CONVERSATION (interrupt the run, archive the old one, drop the history), while
+    // `/clear screen` only wipes what is on screen. A user who wants the second has
+    // to be able to see that it exists before reaching for the first.
+    ['/clear', 'Start a new conversation: archive, then clear context and transcript'],
+    ['/clear screen', 'Clear the visible transcript only; keeps the conversation'],
+    ['/reset', 'Alias of /clear'],
     ['/cwd [dir]', 'Show or change the tool working directory'],
     ['/save [file]', 'Save the session to JSON'],
     ['/resume [file]', 'Load a saved session'],

package/dist/ui/overlays/ModelDiscoveryList.d.ts

@@ -0,0 +1,23 @@
+import React from 'react';
+import { type ProfileFrameProps } from './ModelProfilePicker.js';
+import { type DiscoveryView } from './model-probe-view.js';
+interface ModelDiscoveryListProps extends ProfileFrameProps {
+    provider: string;
+    /** The draft's current model: the cursor starts on it when the list has it. */
+    currentModel: string;
+    view: DiscoveryView;
+    busy: boolean;
+    onChoose: (model: string) => void;
+    onRetry: () => void;
+    onBack: () => void;
+    onCancelProbe?: () => void;
+}
+/**
+ * The discovered-model page (model-profile-connection-test §3.5).
+ *
+ * Pure display plus input: it receives the discovery outcome and three intents and
+ * issues no request itself. No spinner - the census of animated sites is a closed
+ * list, and this overlay can be open while a run is in flight.
+ */
+export declare function ModelDiscoveryList(props: ModelDiscoveryListProps): React.ReactElement;
+export {};

package/dist/ui/overlays/ModelDiscoveryList.js

@@ -0,0 +1,161 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { Text, useInput } from 'ink';
+import { PROBE_LIMITS } from '../../agent/model-probe-limits.js';
+import { pickGlyphs } from '../glyphs.js';
+import { OverlayFrame } from '../layout/OverlayFrame.js';
+import { stripPasteFrames } from '../paste-frames.js';
+import { stripEnterFrames } from '../enter-frames.js';
+import { clipProfileText, useProfileScroll } from './ModelProfilePicker.js';
+import { rankCandidates, windowLabel, clipName, LIST_ID_CHARS } from './model-probe-view.js';
+function matches(candidate, query) {
+    const needle = query.toLocaleLowerCase();
+    return candidate.id.toLocaleLowerCase().includes(needle)
+        || candidate.name.toLocaleLowerCase().includes(needle);
+}
+/** One row: id column, name column, window right-aligned inside the frame budget. */
+function listRowText(candidate, cols) {
+    const width = Math.max(20, cols - 8);
+    const label = windowLabel(candidate.contextWindow);
+    const idWidth = Math.max(10, Math.min(LIST_ID_CHARS, width - label.length - 14));
+    const nameWidth = Math.max(4, width - idWidth - label.length - 2);
+    const id = [...candidate.id].slice(0, idWidth).join('').padEnd(idWidth);
+    // `clipName` caps the NAME COLUMN itself, so a vendor that ships a paragraph in
+    // `name` cannot push the window label out of a wide frame either.
+    const name = [...clipName(candidate.name)].slice(0, nameWidth).join('').padEnd(nameWidth);
+    return clipProfileText(`${id} ${name} ${label}`, width);
+}
+/** What the page says when there is no row to select. */
+function emptyLines(busy, provider, view) {
+    if (busy)
+        return [`Discovering ${provider} models...`];
+    if (view.kind === 'discovery' && !view.outcome.ok) {
+        return [view.outcome.detail ?? 'The model list could not be fetched.',
+            'Fix: check the base URL and key, then press r to retry.'];
+    }
+    if (view.kind === 'discovery') {
+        return ['No models returned. Press r to retry, Esc to go back.',
+            'Test the connection for a precise reason.'];
+    }
+    return ['No models discovered yet. Press r to retry, Esc to go back.'];
+}
+function buildRows(props, view, glyphs) {
+    const rows = [];
+    if (view.searchable) {
+        rows.push(_jsxs(Text, { wrap: "truncate", color: props.theme.primary, children: [view.searching ? `${glyphs.caret} ` : '  ', "Search: ", view.query || '(/ to search)'] }, "search"));
+    }
+    if (view.shown.length === 0) {
+        const lines = view.query.length > 0
+            ? [`No model matches "${view.query}". Esc clears the search.`]
+            : emptyLines(props.busy, props.provider, props.view);
+        for (const line of lines) {
+            rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: line }, `empty-${rows.length}`));
+        }
+    }
+    view.shown.forEach((candidate, at) => {
+        const focused = at === view.cursor && !view.searching;
+        rows.push(_jsxs(Text, { wrap: "truncate", color: at === view.cursor ? props.theme.accent : props.theme.muted, children: [focused ? `${glyphs.caret} ` : '  ', listRowText(candidate, props.cols)] }, candidate.id));
+    });
+    if (view.truncated) {
+        const total = props.view.kind === 'discovery'
+            ? props.view.outcome.total ?? view.shown.length : view.shown.length;
+        rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: `Showing first ${PROBE_LIMITS.maxListedModels} of ${total}. Narrow with search.` }, "truncated"));
+    }
+    return rows;
+}
+/**
+ * The discovered-model page (model-profile-connection-test §3.5).
+ *
+ * Pure display plus input: it receives the discovery outcome and three intents and
+ * issues no request itself. No spinner - the census of animated sites is a closed
+ * list, and this overlay can be open while a run is in flight.
+ */
+export function ModelDiscoveryList(props) {
+    const [index, setIndex] = useState(0);
+    const [query, setQuery] = useState('');
+    const [searching, setSearching] = useState(false);
+    const glyphs = pickGlyphs(props.caps);
+    const candidates = props.view.kind === 'discovery'
+        ? props.view.outcome.models : [];
+    const ranked = rankCandidates(candidates, props.currentModel);
+    const shown = query.length > 0 ? ranked.filter((item) => matches(item, query)) : ranked;
+    const searchable = ranked.length > PROBE_LIMITS.searchThreshold;
+    const cursor = shown.length > 0 ? Math.min(index, shown.length - 1) : 0;
+    // The truncation notice is one row BELOW the last candidate, and `useProfileScroll`
+    // only guarantees the FOCUSED row is visible - the same blind spot that hid the
+    // editor's result rows (RV-P1-3). Standing on the last row therefore widens the
+    // window by one, or `Showing first 400 of ...` could never be read at all.
+    const truncatedNotice = props.view.kind === 'discovery' && props.view.outcome.truncated
+        && shown.length > 0;
+    const revealNotice = truncatedNotice && cursor >= shown.length - 1;
+    const offset = useProfileScroll(props, cursor + (searchable ? 1 : 0) + (revealNotice ? 1 : 0));
+    // Arrival, not every render: when the outcome lands, put the cursor on the model the
+    // draft already names, so "which one am I on" is answerable without scrolling.
+    const arrival = props.view.kind === 'discovery'
+        ? `${props.view.outcome.connectionId}|${ranked.length}` : 'none';
+    useEffect(() => {
+        const at = ranked.findIndex((item) => item.id === props.currentModel.trim());
+        setIndex(at > 0 ? at : 0);
+    }, [arrival]);
+    const move = (delta) => {
+        if (shown.length > 0)
+            setIndex((cursor + delta + shown.length) % shown.length);
+    };
+    useInput((input, key) => {
+        if (props.isActive === false)
+            return;
+        if (key.escape) {
+            if (searching) {
+                setSearching(false);
+                setQuery('');
+                setIndex(0);
+                return;
+            }
+            if (props.busy) {
+                props.onCancelProbe?.();
+                return;
+            }
+            props.onBack();
+            return;
+        }
+        if (key.upArrow || (key.tab && key.shift)) {
+            move(-1);
+            return;
+        }
+        if (key.downArrow || key.tab) {
+            move(1);
+            return;
+        }
+        if (key.return) {
+            const picked = shown[cursor];
+            if (picked)
+                props.onChoose(picked.id);
+            return;
+        }
+        if (searching) {
+            if (key.backspace || key.delete) {
+                setQuery((value) => [...value].slice(0, -1).join(''));
+                setIndex(0);
+            }
+            else if (input && !key.ctrl && !key.meta) {
+                setQuery((value) => value + stripPasteFrames(stripEnterFrames(input)));
+                setIndex(0);
+            }
+            return;
+        }
+        if (input === '/' && searchable) {
+            setSearching(true);
+            setIndex(0);
+            return;
+        }
+        // `r` retries ONLY outside the search state: sharing the key with the query would
+        // turn one typo into a network request (§3.5 / D-16).
+        if (!key.ctrl && !key.meta && input === 'r')
+            props.onRetry();
+    });
+    const hint = props.busy ? 'Esc cancel'
+        : searching ? 'Type search | Enter choose | Esc back'
+            : `Enter choose${searchable ? ' | / search' : ''} | r retry | Esc back`;
+    return _jsx(OverlayFrame, { ...props, scrollOffset: offset, hint: hint, rows: buildRows(props, { query, shown, cursor, searchable, searching,
+            truncated: truncatedNotice }, glyphs), title: `Models | ${props.provider} (${shown.length})` });
+}

package/dist/ui/overlays/ModelProfileEditor.d.ts

@@ -1,12 +1,29 @@
 import React from 'react';
+import type { ProbeTarget } from '../../agent/model-probe.js';
 import { type ProfileFrameProps } from './ModelProfilePicker.js';
 import { type ProfileEditorDraft, type ModelProfileAction } from './model-profile-state.js';
+import { type ProbeView } from './model-probe-view.js';
 interface ModelProfileEditorProps extends ProfileFrameProps {
     editor: ProfileEditorDraft;
     users: string;
     error?: string;
     dispatch: React.Dispatch<ModelProfileAction>;
+    /**
+     * The rendered probe state and its three intents. ALL OPTIONAL: a standalone or
+     * embedded mount has no probe port, and the two action rows then read
+     * `(unavailable)` instead of pretending to work (§6.1 / AC-15).
+     */
+    probeView?: ProbeView;
+    probeBusy?: boolean;
+    probeTarget?: ProbeTarget;
+    onTest?: () => void;
+    onDiscover?: () => void;
+    onCancelProbe?: () => void;
 }
-/** Replacement key input starts empty; retention across targets is explicit. */
+/**
+ * The profile form. Row semantics come from `editorRows()` - never from index
+ * arithmetic - so `apiKey` stays at index 6 and the two probe actions sit at the end
+ * of the action block, after `retain` (P0-1 / I-4).
+ */
 export declare function ModelProfileEditor(props: ModelProfileEditorProps): React.ReactElement;
 export {};

package/dist/ui/overlays/ModelProfileEditor.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Text, useInput } from 'ink';
 import { ADAPTER_PROVIDERS } from '../../config/schema.js';
@@ -7,49 +7,47 @@ import { OverlayFrame } from '../layout/OverlayFrame.js';
 import { stripPasteFrames } from '../paste-frames.js';
 import { stripEnterFrames } from '../enter-frames.js';
 import { pickGlyphs } from '../glyphs.js';
-import { profileEndpointSummary, useProfileScroll } from './ModelProfilePicker.js';
+import { useProfileScroll } from './ModelProfilePicker.js';
 import { finishProfileEditor } from './model-profile-state.js';
-const FIELDS = ['name', 'provider', 'model', 'baseUrl', 'credentialMode', 'apiKey'];
-const LABELS = ['Name', 'Provider', 'Model', 'Base URL', 'Credential mode', 'API key'];
-function useEditorInput(props, navigation) {
+import { EDITOR_FIELDS, editorRows, editorProbeTarget, focusableRows, resultRowCount } from './model-probe-view.js';
+function useEditorInput(props, focus) {
     const { editor, dispatch } = props;
-    const { index, setIndex, retain, count } = navigation;
+    const { index, setIndex, count, focusable } = focus;
     function commit() {
         const result = finishProfileEditor(editor);
         if (result.field) {
-            const at = FIELDS.indexOf(result.field);
+            // Field rows are the first focusables, in `EDITOR_FIELDS` order, so the jump an
+            // invalid field asks for is a lookup rather than an offset guess.
+            const at = EDITOR_FIELDS.indexOf(result.field);
             if (at >= 0)
                 setIndex(at);
         }
         dispatch({ type: 'merge-editor' });
     }
-    useInput((input, key) => {
-        if (props.isActive === false)
-            return;
-        if (key.escape) {
-            dispatch({ type: 'cancel-editor' });
-            return;
-        }
-        if (key.upArrow || (key.tab && key.shift)) {
-            setIndex((index - 1 + count) % count);
+    function activate(row) {
+        if (!row)
             return;
-        }
-        if (key.downArrow || key.tab) {
-            setIndex((index + 1) % count);
+        if (row.kind === 'field') {
+            commit();
             return;
         }
-        if (key.return) {
-            if (retain && index === FIELDS.length)
-                dispatch({ type: 'retain-key' });
-            else if (index === count - 1)
-                dispatch({ type: 'cancel-editor' });
-            else
-                commit();
+        if (row.kind !== 'action')
             return;
-        }
-        const field = FIELDS[index];
-        if (!field || key.ctrl || key.meta)
+        if (row.action === 'retain')
+            dispatch({ type: 'retain-key' });
+        if (row.action === 'test')
+            props.onTest?.();
+        if (row.action === 'discover')
+            props.onDiscover?.();
+        if (row.action === 'apply')
+            commit();
+        if (row.action === 'cancel')
+            dispatch({ type: 'cancel-editor' });
+    }
+    function editField(row, input, key) {
+        if (row.kind !== 'field')
             return;
+        const field = row.field;
         if (field === 'provider' || field === 'credentialMode') {
             if (!key.leftArrow && !key.rightArrow)
                 return;
@@ -70,36 +68,101 @@ function useEditorInput(props, navigation) {
             registerSecret(value);
         if (key.backspace || key.delete || text)
             dispatch({ type: 'editor-field', field, value });
+    }
+    useInput((input, key) => {
+        if (props.isActive === false)
+            return;
+        // Accelerators work on EVERY row (§3.3): the action rows are the primary entry,
+        // these are only the shortcut. Both keys are unused by `App`'s global branch.
+        if (key.ctrl && input === 'r') {
+            props.onTest?.();
+            return;
+        }
+        if (key.ctrl && input === 'f') {
+            props.onDiscover?.();
+            return;
+        }
+        if (key.escape) {
+            // THREE-LEVEL Esc (§3.4): a probe in flight is cancelled first and the draft
+            // survives; only the second press discards the form.
+            if (props.probeBusy) {
+                props.onCancelProbe?.();
+                return;
+            }
+            dispatch({ type: 'cancel-editor' });
+            return;
+        }
+        if (key.upArrow || (key.tab && key.shift)) {
+            setIndex((index - 1 + count) % count);
+            return;
+        }
+        if (key.downArrow || key.tab) {
+            setIndex((index + 1) % count);
+            return;
+        }
+        if (key.return) {
+            activate(focusable[index]);
+            return;
+        }
+        if (key.ctrl || key.meta)
+            return;
+        const row = focusable[index];
+        if (row)
+            editField(row, input, key);
     });
 }
-function buildEditorRows(props, navigation) {
-    const { editor } = props;
-    const { index, retain } = navigation;
+function rowColor(props, row) {
+    if (row.kind === 'result') {
+        return row.tone === 'ok' ? props.theme.toolDone
+            : row.tone === 'fail' ? props.theme.noticeError : props.theme.muted;
+    }
+    return undefined;
+}
+function buildRows(props, focus) {
     const glyphs = pickGlyphs(props.caps);
-    const values = FIELDS.map((field) => {
-        if (field === 'apiKey')
-            return editor.credentialMode === 'replace'
-                ? editor.apiKey ? 'Configured (replacement)' : '(type replacement)'
-                : editor.credentialMode === 'keep' ? 'Configured (unchanged)' : 'Shared / environment';
-        if (field === 'credentialMode')
-            return editor.credentialMode;
-        return editor[field] || (field === 'name' ? '(defaults to model)' : field === 'baseUrl'
-            ? '(provider default)' : '(required)');
+    const focused = focus.focusable[focus.index];
+    return focus.rows.map((row, at) => {
+        if (row.kind === 'note') {
+            return _jsx(Text, { wrap: "truncate", color: props.theme.muted, children: row.label }, at);
+        }
+        if (row.kind === 'result') {
+            return _jsx(Text, { wrap: "truncate", color: rowColor(props, row), children: row.label }, at);
+        }
+        const line = row.value.length > 0 ? `${row.label.padEnd(18)}${row.value}` : row.label;
+        const isFocused = row === focused;
+        return _jsxs(Text, { wrap: "truncate", color: isFocused ? props.theme.accent : props.theme.muted, children: [isFocused ? `${glyphs.caret} ` : '  ', line] }, at);
     });
-    const lines = LABELS.map((label, at) => `${label.padEnd(18)}${values[at]}`);
-    if (retain)
-        lines.push('Retain key for new endpoint');
-    lines.push('Apply to settings draft', 'Cancel editing');
-    const rows = lines.map((line, at) => _jsxs(Text, { wrap: "truncate", color: at === index ? props.theme.accent : props.theme.muted, children: [at === index ? `${glyphs.caret} ` : '  ', line] }, at));
-    rows.push(_jsxs(Text, { wrap: "truncate", color: props.theme.muted, children: ["Target: ", editor.provider, " ", profileEndpointSummary(editor.baseUrl)] }, "target"));
-    return rows;
 }
-/** Replacement key input starts empty; retention across targets is explicit. */
+function editorHint(props) {
+    if (props.probeBusy)
+        return 'Esc cancel the probe | draft is kept';
+    return 'Enter apply to draft | Ctrl+R test | Ctrl+F discover | Esc cancel';
+}
+/**
+ * The profile form. Row semantics come from `editorRows()` - never from index
+ * arithmetic - so `apiKey` stays at index 6 and the two probe actions sit at the end
+ * of the action block, after `retain` (P0-1 / I-4).
+ */
 export function ModelProfileEditor(props) {
     const [index, setIndex] = useState(0);
-    const retain = props.editor.endpointChanged && Boolean(props.editor.original.apiKey);
-    const navigation = { index, setIndex, retain, count: FIELDS.length + (retain ? 1 : 0) + 2 };
-    const offset = useProfileScroll(props, index);
-    useEditorInput(props, navigation);
-    return _jsx(OverlayFrame, { ...props, rows: buildEditorRows(props, navigation), scrollOffset: offset, title: props.error ?? `Edit profile${props.users ? ` | Used by ${props.users}` : ''}`, hint: "Enter apply to draft | Esc cancel" });
+    const editor = props.editor;
+    const retain = editor.endpointChanged && Boolean(editor.original.apiKey);
+    const probe = props.probeView ?? { kind: 'idle', reason: 'unavailable' };
+    const target = props.probeTarget ?? editorProbeTarget(editor, {});
+    const rows = editorRows({ editor, retain, probe, target, fastOnly: props.users === 'Fast' });
+    const focusable = focusableRows(rows);
+    const count = Math.max(1, focusable.length);
+    const clamped = Math.min(index, count - 1);
+    // The result rows sit BELOW the action block, so following the focused row alone
+    // would leave the verdict off-screen right after the user asked for it (§4.9 / AC-21).
+    // How many action rows there are comes from the row model, never from a constant: a
+    // sixth action would otherwise move this window boundary onto a FIELD row.
+    const actionRows = focusable.filter((row) => row.kind === 'action').length;
+    const results = resultRowCount(rows);
+    const inActions = clamped >= count - actionRows;
+    const viewFocus = results > 0 && inActions ? Math.max(clamped, rows.length - 1) : clamped;
+    const offset = useProfileScroll(props, viewFocus);
+    useEditorInput(props, { index: clamped, setIndex, count, rows, focusable });
+    return _jsx(OverlayFrame, { ...props, rows: buildRows(props, { index: clamped, setIndex, count,
+            rows, focusable }), scrollOffset: offset, title: props.error ?? `Edit profile${props.users ? ` | Used by ${props.users}` : ''}`, hint: editorHint(props) });
 }

package/dist/ui/overlays/ModelProfilePicker.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-import type { ModelProfile, ModelProfilesConfig, ModelRole } from '../../config/model-profiles.js';
+import type { ModelProfile, ModelProfilesConfig } from '../../config/model-profiles.js';
 import type { Theme } from '../theme.js';
 import type { TermCapabilities } from '../capabilities.js';
+import { type ProfilePickerRole } from './model-profile-state.js';
 export interface ProfileFrameProps {
     isActive?: boolean;
     theme: Theme;
@@ -19,11 +20,22 @@ export declare function profileEndpointSummary(baseUrl: string | null): string;
 interface ModelProfilePickerProps extends ProfileFrameProps {
     profiles: ModelProfilesConfig;
     savedProfiles?: ModelProfilesConfig;
-    role: ModelRole;
+    /** Which role this page selects for; `'subagent'` swaps the built-in rows (D-5). */
+    role: ProfilePickerRole;
     manager?: boolean;
     error?: string;
     apiKeys: Record<string, string | undefined>;
     customProfile?: ModelProfile;
+    /**
+     * The selection id for a role the library has no `${role}Id` key for: the
+     * subagent projection (`Same as main` = null, fast = the sentinel, profile
+     * = its id). Takes precedence over the `${role}Id` lookup when present.
+     */
+    selectedIdOverride?: string | null;
+    /** The subagent binding, for the reference suffix on profile labels (3.7). */
+    subagentProfileId?: string | null;
+    /** Whether to annotate the built-in `Fast tier model` row with `(fast tier off)`. */
+    fastTierOff?: boolean;
     onSelect: (id: string | null) => void;
     onCreate: () => void;
     onEdit: (profile: ModelProfile) => void;

package/dist/ui/overlays/ModelProfilePicker.js

@@ -6,7 +6,7 @@ import { pickGlyphs } from '../glyphs.js';
 import { OverlayFrame, overlayBodyRows } from '../layout/OverlayFrame.js';
 import { stripPasteFrames } from '../paste-frames.js';
 import { stripEnterFrames } from '../enter-frames.js';
-import { profileUsers } from './model-profile-state.js';
+import { profileUsers, SUBAGENT_FAST_ROW_ID } from './model-profile-state.js';
 /** Move focus into view while accepting App's independent wheel/page scrolling. */
 export function useProfileScroll(props, focus) {
     const [offset, setOffset] = useState(0);
@@ -62,7 +62,9 @@ function usePickerState(props) {
     const entries = props.profiles.entries.filter((entry) => `${entry.name} ${entry.provider} ${entry.model}`.toLocaleLowerCase()
         .includes(query.toLocaleLowerCase()));
     const actions = props.manager ? ['New', 'Edit', 'Duplicate', 'Delete'] : ['Create profile'];
-    const prefix = props.manager ? 0 : 1;
+    // THE SUBAGENT PICKER swaps the `Current custom` row for TWO built-in rows:
+    // `Same as main` (selection id null) and `Fast tier model` (the sentinel).
+    const prefix = props.role === 'subagent' ? 2 : props.manager ? 0 : 1;
     const count = entries.length + prefix + actions.length;
     const cursor = Math.min(index, count - 1);
     const focused = entries[cursor - prefix];
@@ -76,7 +78,18 @@ function usePickerState(props) {
 function usePickerInput(props, state) {
     const { cursor, focused, selected, actions, prefix, entries, count, searching, searchable, setIndex, setQuery, setSearching } = state;
     function activate() {
-        if (!props.manager && cursor === 0) {
+        if (props.role === 'subagent') {
+            // Built-in rows first: `Same as main`, then `Fast tier model`.
+            if (cursor === 0) {
+                props.onSelect(null);
+                return;
+            }
+            if (cursor === 1) {
+                props.onSelect(SUBAGENT_FAST_ROW_ID);
+                return;
+            }
+        }
+        else if (!props.manager && cursor === 0) {
             props.onSelect(null);
             return;
         }
@@ -138,11 +151,26 @@ function usePickerInput(props, state) {
         else if (!key.ctrl && !key.meta && input.toLowerCase() === 'e' && focused) {
             props.onEdit(focused);
         }
+        // `d` deletes the focused entry (D-7), symmetric with `e`: same guards,
+        // same no-ops on the built-in and action rows (`focused` is undefined
+        // there), and the `searching` early-return above keeps `d` a query
+        // character while typing a search.
+        else if (!key.ctrl && !key.meta && input.toLowerCase() === 'd' && focused) {
+            props.onDelete(focused.id);
+        }
     });
 }
+/** The selection id this page marks with `[Selected]`, by role (6.2). */
+function currentSelectionId(props) {
+    if (props.selectedIdOverride !== undefined)
+        return props.selectedIdOverride;
+    if (props.role === 'subagent')
+        return undefined;
+    return props.profiles[`${props.role}Id`];
+}
 function profilePickerLabel(props, entry) {
-    const saved = profileUsers(props.savedProfiles, entry.id);
-    const checked = props.profiles[`${props.role}Id`] === entry.id ? '[Selected] ' : '';
+    const saved = profileUsers(props.savedProfiles, entry.id, props.subagentProfileId);
+    const checked = currentSelectionId(props) === entry.id ? '[Selected] ' : '';
     const duplicate = props.profiles.entries.some((other) => other.id !== entry.id
         && other.name === entry.name);
     const identity = duplicate ? `#${uniqueId(entry, props.profiles.entries)} ` : '';
@@ -154,18 +182,30 @@ function buildPickerRows(props, state) {
     const { entries, actions, cursor, searching, searchable, query, focused, selected } = state;
     const glyphs = pickGlyphs(props.caps);
     const lines = [];
-    if (!props.manager)
+    if (props.role === 'subagent') {
+        // TWO BUILT-IN ROWS (D-5), marked with the same `[Selected]` prefix the
+        // profile rows use; the fast row annotates an unusable tier honestly.
+        const current = props.selectedIdOverride ?? null;
+        lines.push(`${current === null ? '[Selected] ' : ''}Same as main`);
+        lines.push(`${current === SUBAGENT_FAST_ROW_ID ? '[Selected] ' : ''}Fast tier model`
+            + `${props.fastTierOff === true ? '  (fast tier off)' : ''}`);
+    }
+    else if (!props.manager)
         lines.push('Current custom');
     lines.push(...entries.map((entry) => profilePickerLabel(props, entry)));
     lines.push(...actions);
     const rows = lines.map((line, row) => _jsxs(Text, { wrap: "truncate", color: row === cursor ? props.theme.accent : props.theme.muted, children: [`${row === cursor && !searching ? glyphs.caret : ' '} `, clipProfileText(line, props.cols - 8)] }, row));
     if (searchable)
         rows.unshift(_jsxs(Text, { wrap: "truncate", color: props.theme.primary, children: [searching ? `${glyphs.caret} ` : '  ', "Search: ", query || '(/ to search)'] }, "search"));
-    const detail = !props.manager && cursor === 0 ? props.customProfile : focused ?? selected;
+    // The subagent picker has no `Current custom` row to describe; its
+    // built-in rows already say everything there is to say.
+    const detail = props.role === 'subagent' ? focused
+        : !props.manager && cursor === 0 ? props.customProfile : focused ?? selected;
     if (detail) {
         rows.push(_jsxs(Text, { wrap: "truncate", color: props.theme.muted, children: [detail.provider, ":", detail.model || '(not set)', " ", host(detail), detail === props.customProfile ? '' : ` #${detail.id}`] }, "detail"));
         rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: detail.apiKey ? 'Profile key: Configured'
                 : props.apiKeys[detail.provider] ? 'Shared / environment: Configured' : 'Missing API key' }, "key"));
+        rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: `Window: ${detail.contextWindow ?? 'auto'}` }, "window"));
     }
     return rows;
 }
@@ -174,7 +214,8 @@ export function ModelProfilePicker(props) {
     const state = usePickerState(props);
     usePickerInput(props, state);
     return _jsx(OverlayFrame, { ...props, title: props.error ?? (props.manager ? 'Manage profiles'
-            : `${props.role === 'main' ? 'Main' : 'Fast'} profile`), rows: buildPickerRows(props, state), scrollOffset: state.searching ? 0 : state.offset, hint: state.searching ? 'Type search | Enter done | Esc back'
-            : props.manager ? 'Enter action | e edit | Esc back'
-                : 'Enter select | e edit | Esc back' });
+            : props.role === 'subagent' ? 'Subagent model'
+                : `${props.role === 'main' ? 'Main' : 'Fast'} profile`), rows: buildPickerRows(props, state), scrollOffset: state.searching ? 0 : state.offset, hint: state.searching ? 'Type search | Enter done | Esc back'
+            : props.manager ? 'Enter action | e edit | d delete | Esc back'
+                : 'Enter select | e edit | d delete | Esc back' });
 }