@aragon-agent/cli 0.6.22 → 0.6.24

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' });
 }

package/dist/ui/overlays/QuestionOverlay.js

@@ -38,6 +38,21 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
     const [phase, setPhase] = useState('choosing');
     const [cursors, setCursors] = useState(() => initialCursors(questions));
     const [selections, setSelections] = useState(() => initialSelections(questions));
+    /**
+     * THE PER-QUESTION EXPLICIT-MARK BIT (V-1 / D-8).
+     *
+     * `initialSelections` PRE-SELECTS the recommended option on EVERY question
+     * (or the first option when there is none), so "the selection set is empty"
+     * is unreachable and can never be the test for "did the user choose?". The
+     * only reliable discriminator is the fact itself: the user pressed SPACE on
+     * this question. Without it, a user who only MOVES the cursor and presses
+     * Enter would submit the RECOMMENDED option instead of the highlighted one -
+     * a silent regression of the wizard's most common path. The bit survives
+     * Left/Right navigation exactly like `selections` and `cursors` do, and a
+     * single-choice mark is idempotent (no un-mark; Enter always has at least
+     * the marked item to submit).
+     */
+    const [markedSteps, setMarkedSteps] = useState(() => questions.map(() => false));
     const [customs, setCustoms] = useState(() => questions.map(() => ''));
     const [draft, setDraft] = useState('');
     const [offset, setOffset] = useState(0);
@@ -56,6 +71,7 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
         return next;
     }));
     const chooseAt = (index, option) => setSelections((prev) => prev.map((set, i) => (i === index ? new Set([option]) : set)));
+    const markAt = (index) => setMarkedSteps((prev) => prev.map((marked, i) => (i === index ? true : marked)));
     const buildAnswers = () => questions.map((q, i) => {
         const chosen = [...(selections[i] ?? new Set())].sort((a, b) => a - b);
         const labels = chosen.map((index) => q.options[index]?.label ?? '').filter((l) => l.length > 0);
@@ -159,8 +175,21 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
             goBack();
             return;
         }
-        if (input === ' ' && question.allowMultiple) {
-            toggleAt(step, cursor);
+        // SPACE, BY QUESTION SHAPE (D-8). The strict `input === ' '` keeps a
+        // multi-character paste frame from ever matching (R-8); the Other row is
+        // a no-op in both shapes because it needs TEXT, and Enter is its key.
+        if (input === ' ' && !question.options[cursor]?.isOther) {
+            if (question.allowMultiple) {
+                toggleAt(step, cursor);
+                return;
+            }
+            // SINGLE CHOICE: mark the highlighted item and STAY - the terminal
+            // convention of "space selects, enter confirms". The mark is recorded
+            // both in the selection set (so `[x]` renders) and in the explicit
+            // mark bit (so a later Enter submits THIS item even after the cursor
+            // has moved on).
+            chooseAt(step, cursor);
+            markAt(step);
             return;
         }
         if (key.return) {
@@ -170,8 +199,15 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
                 setPhase('typingOther');
                 return;
             }
-            if (!question.allowMultiple)
-                chooseAt(step, cursor);
+            // A single-choice Enter submits the CURSOR item unless the user has
+            // explicitly space-marked this question, in which case the marked item
+            // wins even if the cursor has since moved (V-1's regression guard:
+            // cursor + Enter alone keeps today's behavior, recommended preselect
+            // and all).
+            if (!question.allowMultiple) {
+                if (!markedSteps[step])
+                    chooseAt(step, cursor);
+            }
             else if (!(selections[step] ?? new Set()).has(cursor))
                 toggleAt(step, cursor);
             advance();
@@ -183,7 +219,9 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
         ? `type your answer ${glyphs.midDot} ${glyphs.enterKey} commit ${glyphs.midDot} ${glyphs.arrowLeft} back ${glyphs.midDot} esc cancel`
         : phase === 'review'
             ? `${glyphs.enterKey} submit ${glyphs.midDot} ${glyphs.arrowLeft} back ${glyphs.midDot} esc cancel`
-            : `${glyphs.arrowUp}${glyphs.arrowDown} choose ${glyphs.midDot} ${glyphs.enterKey} next${question.allowMultiple ? ` ${glyphs.midDot} space toggle` : ''} ${glyphs.midDot} ${glyphs.arrowLeft} back ${glyphs.midDot} esc cancel`;
+            : question.options[cursor]?.isOther
+                ? `${glyphs.arrowUp}${glyphs.arrowDown} choose ${glyphs.midDot} ${glyphs.enterKey} to type ${glyphs.midDot} ${glyphs.arrowLeft} back ${glyphs.midDot} esc cancel`
+                : `${glyphs.arrowUp}${glyphs.arrowDown} choose ${glyphs.midDot} space select ${glyphs.midDot} ${glyphs.enterKey} next ${glyphs.midDot} ${glyphs.arrowLeft} back ${glyphs.midDot} esc cancel`;
     const rowTexts = [];
     const optionStarts = [];
     const push = (text) => { rowTexts.push(...wrapToRows(text, Math.max(1, cols - 4))); };
@@ -208,8 +246,11 @@ export function QuestionOverlay({ isActive = true, questions, maxRows, cols, the
         setOffset(previous => focus < previous ? focus : focus >= previous + height
             ? focus - height + 1 : previous);
     }, [focus, maxRows, cols, step, phase]);
+    // `space select` shows for BOTH shapes (AC-10) - 42 characters on the
+    // single-choice shape without `cancel`, a deliberate 5-column growth inside
+    // the `cols <= 48` budget this hint exists for (V-12).
     const shortHint = phase === 'typingOther' ? 'Enter commit | Left back | Esc cancel'
         : phase === 'review' ? 'Enter submit | Left back | Esc cancel'
-            : question.allowMultiple ? '^v choose Space toggle Enter next Esc' : 'Up/Down choose Enter next Esc cancel';
+            : '^v choose Space select Enter next Esc';
     return _jsx(OverlayFrame, { title: `${title}${position}`, hint: cols <= 48 ? shortHint : hint, maxRows: maxRows, cols: cols, theme: theme, caps: caps, rows: rowTexts.map((line, index) => _jsx(Text, { wrap: "truncate", children: line || ' ' }, index)), scrollOffset: offset, onScrollClamp: setOffset });
 }

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

@@ -36,6 +36,15 @@ export interface SettingsValues {
      */
     liveToolOutput: 'on' | 'off';
     maxTokens: string;
+    /**
+     * The top-level context-window override, as text (profile-context-window
+     * §6.3). EDITED ONLY WHILE MAIN IS UNBOUND: once a profile is bound as Main
+     * the profile owns the denominator, this row hides, and the editor becomes
+     * the only surface that writes the key - two entries on one key can only
+     * drift. Empty renders as `auto` because an empty field IS AUTO here, the
+     * reading `maxTokens` established.
+     */
+    contextWindow: string;
     apiKey: string;
     /**
      * Only the LEVEL is editable here. The rest of `LogConfig` — and above all

package/dist/ui/overlays/SettingsScreen.js

@@ -11,7 +11,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useReducer, useRef, useState } from 'react';
 import { Text, useInput } from 'ink';
 import { DEFAULT_MAX_OUTPUT_TOKENS, resolveOutputTokens, } from '@aragon-agent/core';
-import { ADAPTER_PROVIDERS, THINKING_LEVELS, maskSecret, parseMaxTokensInput, parseThresholdInput, } from '../../config/schema.js';
+import { ADAPTER_PROVIDERS, THINKING_LEVELS, maskSecret, parseContextWindowInput, parseMaxTokensInput, parseThresholdInput, } from '../../config/schema.js';
 import { LOG_LEVEL_NAMES } from '../../logging/levels.js';
 import { pickGlyphs } from '../glyphs.js';
 import { OverlayFrame } from '../layout/OverlayFrame.js';
@@ -21,7 +21,20 @@ import { emptyModelProfiles } from '../../config/model-profiles.js';
 import { registerSecret } from '../../logging/secret-registry.js';
 import { ModelProfilePicker, useProfileScroll } from './ModelProfilePicker.js';
 import { ModelProfileEditor } from './ModelProfileEditor.js';
-import { createModelProfileState, createCustomProfile, modelProfileReducer, profileUsers } from './model-profile-state.js';
+import { createModelProfileState, createCustomProfile, modelProfileReducer, profileUsers, draftTeam, draftSubagentProfileId, subagentModelSummary, subagentSelectedId } from './model-profile-state.js';
+/**
+ * THE ROOT PAGE'S ROW INDEXES, AS NAMES (subagent-model V-5).
+ *
+ * Five offset sites used to agree by accident on the number 3; the Subagent
+ * model row moves every one of them. Each site below now cites its constant,
+ * so adding a row later is a one-line change instead of a silent regression
+ * that focuses an error message on the wrong field.
+ */
+const ROOT_MAIN = 0;
+const ROOT_FAST = 1;
+const ROOT_SUBAGENT = 2;
+const ROOT_MANAGE = 3;
+const ROOT_FIRST_FIELD = 4;
 const SHOW_THINKING_OPTIONS = ['off', 'on'];
 const LIVE_OUTPUT_OPTIONS = ['off', 'on'];
 const FAST_ENABLED_OPTIONS = ['off', 'on'];
@@ -172,6 +185,11 @@ const FIELDS = [
     // `.padEnd(18)` enforces below and that IF-H7 records as silently overflowing.
     { key: 'liveToolOutput', label: 'Live output', kind: 'enum', options: LIVE_OUTPUT_OPTIONS },
     { key: 'maxTokens', label: 'Max tokens', kind: 'text' },
+    // DIRECTLY UNDER `Max tokens`: the two token rows read together. `Context
+    // window` is 14 characters, inside the 18-column label budget `.padEnd(18)`
+    // enforces below (IF-H7). Only ever RENDERED while Main is unbound - see
+    // `SettingsValues.contextWindow` and the unbound-group filter below.
+    { key: 'contextWindow', label: 'Context window', kind: 'text' },
     // The fast tier sits AFTER `Max tokens` and BEFORE `API key`, because the key
     // row is the one a user scrolls to deliberately and putting five rows past it
     // would bury it (fast-model-tier §4.5). The rationale survives a fifth row;
@@ -348,6 +366,11 @@ function LegacySettingsScreen({ isActive = true, initial, apiKeys, maxRows, cols
         // setting, which is the one thing this field can never be.
         if (f.key === 'maxTokens' && raw.length === 0)
             return 'auto';
+        // An empty window field is AUTO, not "unset" - the same reading, and the
+        // second of the TWO render points that must agree (P2-1: the profile
+        // screen's row fallback below is the other).
+        if (f.key === 'contextWindow' && raw.length === 0)
+            return 'auto';
         // `(not set)` and NOT `(same as main)`, which is the honest reading of §3.2
         // rule 3: an empty `fast.model` does not inherit, it means the tier is
         // unconfigured. `(same as main)` is a fact the derived line below states
@@ -385,15 +408,23 @@ function LegacySettingsScreen({ isActive = true, initial, apiKeys, maxRows, cols
     rows.push(_jsx(Text, { wrap: "truncate", color: theme.muted, children: "Enter saves. Keys persist to the config file (0600)." }, "__save"));
     return (_jsx(OverlayFrame, { title: "Settings", hint: `${glyphs.arrowUp}${glyphs.arrowDown} field ${glyphs.midDot} ${glyphs.arrowLeft}${glyphs.arrowRight} change ${glyphs.midDot} Enter save ${glyphs.midDot} Esc close`, maxRows: maxRows, cols: cols, rows: rows, scrollOffset: focusedOffset, onScrollClamp: onScrollClamp, theme: theme, caps: caps }));
 }
+// `contextWindow` joins the exclusion list so a bound Main can never leak a
+// SECOND copy of the row through PROFILE_FIELDS - the root row belongs to the
+// unbound group below, exclusively (AC-11).
 const PROFILE_FIELDS = FIELDS.filter((field) => ![
     'provider', 'model', 'baseUrl', 'apiKey', 'fastProvider', 'fastModel', 'fastEnabled',
+    'contextWindow',
 ].includes(field.key));
 function profileSettingsValues(initial, draft) {
     const file = draft.baseline;
     return { ...initial, provider: file.provider ?? initial.provider,
         model: file.model ?? initial.model,
         baseUrl: file.baseUrl ?? '', apiKey: '', fastModel: file.fast?.model ?? '',
-        fastProvider: file.fast?.provider || FAST_INHERIT_PROVIDER };
+        fastProvider: file.fast?.provider || FAST_INHERIT_PROVIDER,
+        // SEEDED FROM THE FILE VALUE, like its provider/model/baseUrl siblings
+        // (AC-11 / P2-3): when env holds an override the file value is not the
+        // effective one, and this screen edits the FILE.
+        contextWindow: file.contextWindow == null ? 'auto' : String(file.contextWindow) };
 }
 /** Only fields changed by the user belong in a settings transaction. */
 export function readDirtySettings(initial, values) {
@@ -422,6 +453,15 @@ export function readDirtySettings(initial, values) {
             throw new Error('Max tokens: use a number or auto.');
         patch.maxTokens = parsed.kind === 'auto' ? null : parsed.value;
     }
+    if (dirty('contextWindow')) {
+        // TYPO CHANGES NOTHING: the message's `Context window:` prefix is what
+        // `saveProfileSettings`'s focus logic matches to jump to this row. The
+        // silent clamp on a value mirrors `config set contextWindow`.
+        const parsed = parseContextWindowInput(values.contextWindow);
+        if (parsed.kind === 'invalid')
+            throw new Error('Context window: use a number or auto.');
+        patch.contextWindow = parsed.kind === 'auto' ? null : parsed.value;
+    }
     const fast = {};
     const parsedFast = readFastSettings(values);
     if (dirty('fastModel'))
@@ -501,11 +541,13 @@ function useProfileSettingsState(props) {
     const dirty = state.dirty || Object.keys(values).some((key) => values[key] !== initial[key]);
     const fields = [FIELDS.find((item) => item.key === 'fastEnabled'),
         ...FIELDS.filter((item) => library.mainId === null
-            && ['provider', 'model', 'baseUrl', 'apiKey'].includes(item.key)),
+            && ['provider', 'model', 'baseUrl', 'contextWindow', 'apiKey'].includes(item.key)),
         ...FIELDS.filter((item) => library.fastId === null
             && ['fastModel', 'fastProvider'].includes(item.key)), ...PROFILE_FIELDS];
-    const count = fields.length + 5;
-    const field = fields[index - 3];
+    // SIX FIXED ROWS now (Main, Fast, SUBAGENT, Manage, Save, Reload) around
+    // the `fields` block - see the ROOT_* constants for the five offset sites.
+    const count = fields.length + 6;
+    const field = fields[index - ROOT_FIRST_FIELD];
     const readError = state.draft.readError;
     const confirming = state.page === 'delete-confirm' || state.page === 'discard-confirm';
     return { state, dispatch, initial, setInitial, values, setValues, index, setIndex,
@@ -526,7 +568,7 @@ function saveProfileSettings(props, view) {
         setError(message);
         const at = fields.findIndex((item) => message.startsWith(`${item.label}:`));
         if (at >= 0)
-            setIndex(at + 3);
+            setIndex(at + ROOT_FIRST_FIELD);
         return;
     }
     const result = props.onProfileSave({
@@ -549,6 +591,7 @@ function reloadProfileSettings(props, view) {
         showThinking: live.showThinking ? 'on' : 'off',
         liveToolOutput: live.liveToolOutput ? 'on' : 'off',
         maxTokens: live.maxTokens === undefined ? '' : String(live.maxTokens),
+        contextWindow: live.contextWindow == null ? 'auto' : String(live.contextWindow),
         logLevel: live.log?.level ?? props.initial.logLevel,
         ...(live.fast ? fastSettingsFrom(live.fast) : {}),
         ...(live.compaction ? compactionSettingsFrom(live.compaction) : {}),
@@ -585,9 +628,15 @@ function activateRootSetting(props, view) {
     }
     if (readError || persisted)
         return;
-    if (index < 2)
-        dispatch({ type: 'page', page: 'picker', role: index === 0 ? 'main' : 'fast' });
-    else if (index === 2)
+    if (index === ROOT_MAIN || index === ROOT_FAST) {
+        dispatch({ type: 'page', page: 'picker', role: index === ROOT_MAIN ? 'main' : 'fast' });
+    }
+    else if (index === ROOT_SUBAGENT) {
+        // The user-owned cost switch (D-5): its own picker mode, writing
+        // `draft.patch.team` rather than a `${role}Id` library key.
+        dispatch({ type: 'page', page: 'picker', role: 'subagent' });
+    }
+    else if (index === ROOT_MANAGE)
         dispatch({ type: 'page', page: 'manager' });
     else
         saveProfileSettings(props, view);
@@ -669,16 +718,48 @@ function renderSettingsConfirmation(props, view) {
     const { state, library, confirmIndex, glyphs } = view;
     const deleting = state.page === 'delete-confirm';
     const name = library.entries.find((entry) => entry.id === state.deleteId)?.name ?? '';
-    const labels = deleting ? ['Cancel', 'Delete'] : ['Continue', 'Discard'];
-    return _jsx(OverlayFrame, { ...props, title: deleting ? `Delete ${name}?` : 'Discard unsaved changes?', hint: "Enter choose | Esc continue", rows: labels
-            .map((label, at) => _jsxs(Text, { wrap: "truncate", color: props.theme.primary, children: [confirmIndex === at ? `${glyphs.caret} ` : '  ', label] }, label)), scrollOffset: confirmIndex });
+    // UNBIND-AND-DELETE (D-6): a referenced entry stays deletable in ONE flow,
+    // and the button names what will happen.
+    const labels = deleting
+        ? ['Cancel', state.deleteUsers ? 'Unbind and delete' : 'Delete']
+        : ['Continue', 'Discard'];
+    const rows = labels
+        .map((label, at) => _jsxs(Text, { wrap: "truncate", color: props.theme.primary, children: [confirmIndex === at ? `${glyphs.caret} ` : '  ', label] }, label));
+    // V-8: A RENDER-ONLY ROW, pushed AFTER the buttons. `confirmIndex` stays a
+    // 0..1 index over the two buttons and `scrollOffset` follows it, so this
+    // line must never sit between them or take an array slot of its own.
+    if (deleting && state.deleteUsers) {
+        rows.push(_jsxs(Text, { wrap: "truncate", color: props.theme.muted, children: ["Used by ", state.deleteUsers, ". The binding(s) will be cleared."] }, "users"));
+    }
+    return _jsx(OverlayFrame, { ...props, title: deleting ? `Delete ${name}?` : 'Discard unsaved changes?', hint: "Enter choose | Esc continue", rows: rows, scrollOffset: confirmIndex });
+}
+/**
+ * Whether the fast tier resolves FOR DISPLAY while the subagent picker is
+ * open (D-5): the built-in `Fast tier model` row then annotates itself with
+ * `(fast tier off)`, so choosing it is never a surprise fallback. The same
+ * enabled + model + config-file-key approximation `fastTierLine` uses - and
+ * the same env-key blindness (V-10), accepted for consistency with it.
+ */
+function fastTierUnavailable(props, view) {
+    const { values } = view;
+    if (values.fastEnabled !== 'on')
+        return true;
+    if (values.fastModel.trim().length === 0)
+        return true;
+    const provider = values.fastProvider === FAST_INHERIT_PROVIDER
+        || values.fastProvider.trim().length === 0 ? values.provider : values.fastProvider;
+    return (props.apiKeys[provider] ?? '').length === 0;
 }
 function renderProfileSubpage(props, view) {
     const { state, library, dispatch, setConfirmIndex } = view;
     if (state.page === 'editor' && state.editor)
-        return _jsx(ModelProfileEditor, { ...props, editor: state.editor, users: profileUsers(library, state.editor.original.id), error: state.error, dispatch: dispatch });
+        return _jsx(ModelProfileEditor, { ...props, editor: state.editor, users: profileUsers(library, state.editor.original.id, draftSubagentProfileId(state.draft)), error: state.error, dispatch: dispatch });
+    // A NEW PROFILE SEEDED FROM THE MAIN CONNECTION while the subagent picker is
+    // open: 'subagent' is picker-only (6.2), so the seed role falls back to
+    // 'main' while `state.role` keeps driving the select that binds it.
+    const createRole = state.role === 'subagent' ? 'main' : state.role;
     if (state.page === 'picker' || state.page === 'manager')
-        return _jsx(ModelProfilePicker, { ...props, profiles: library, savedProfiles: state.draft.baseline.modelProfiles, role: state.role, customProfile: createCustomProfile(state.draft, state.role), manager: state.page === 'manager', error: state.error, onSelect: (id) => dispatch({ type: 'select', role: state.role, id }), onCreate: () => dispatch({ type: 'edit', profile: createCustomProfile(state.draft, state.role),
+        return _jsx(ModelProfilePicker, { ...props, profiles: library, savedProfiles: state.draft.baseline.modelProfiles, role: state.role, customProfile: createCustomProfile(state.draft, createRole), manager: state.page === 'manager', error: state.error, selectedIdOverride: state.role === 'subagent' ? subagentSelectedId(state.draft) : undefined, subagentProfileId: draftSubagentProfileId(state.draft), fastTierOff: state.role === 'subagent' && fastTierUnavailable(props, view), onSelect: (id) => dispatch({ type: 'select', role: state.role, id }), onCreate: () => dispatch({ type: 'edit', profile: createCustomProfile(state.draft, createRole),
                 bindNew: state.page === 'picker' }), onEdit: (profile) => dispatch({ type: 'edit', profile }), onDuplicate: (id) => dispatch({ type: 'duplicate', id }), onDelete: (id) => { setConfirmIndex(0); dispatch({ type: 'delete', id }); }, onCancel: () => dispatch({ type: 'page', page: 'root' }) });
     return null;
 }
@@ -691,13 +772,34 @@ function buildRootSettingsRows(props, view) {
         const missing = !entry.apiKey && !props.apiKeys[entry.provider];
         return `${entry.name}  ${entry.provider}:${entry.model}${missing ? ' [Missing API key]' : ''}`;
     };
+    // THE SUBAGENT MODEL ROW (D-5), third on the page, summarized from the
+    // same draft/baseline sources every other derived row here reads. The fast
+    // tier check mirrors `fastTierLine`'s approximation (enabled + model + a
+    // config-file key) so the two derived lines can never disagree.
+    const team = draftTeam(state.draft);
+    const mainBound = library.entries.find((entry) => entry.id === library.mainId);
+    const mainConnection = mainBound
+        ? `${mainBound.provider}:${mainBound.model}`
+        : `${values.provider}:${values.model}`;
+    const fastModel = values.fastModel.trim();
+    const fastProvider = values.fastProvider === FAST_INHERIT_PROVIDER
+        || values.fastProvider.trim().length === 0 ? values.provider : values.fastProvider;
+    const fastConnection = values.fastEnabled === 'on' && fastModel.length > 0
+        && (props.apiKeys[fastProvider] ?? '').length > 0
+        ? `${fastProvider}:${fastModel}` : null;
+    const subagentLine = subagentModelSummary({ mode: team.model,
+        modelProfileId: team.modelProfileId, mainConnection, fastConnection,
+        profiles: state.draft.profiles,
+        hasKey: (id) => (props.apiKeys[id] ?? '').length > 0 });
     const lines = [`Main profile      ${name(library.mainId)}`,
         `Fast profile      ${name(library.fastId)}`,
+        `Subagent model    ${subagentLine}`,
         `Manage profiles   ${library.entries.length} saved`,
         ...fields.map((item) => `${item.label.padEnd(18)}${item.key === 'apiKey'
             ? values.apiKey ? 'Configured (replacement)' : props.apiKeys[values.provider]
                 ? 'Configured (type to replace)' : '(type to set)'
-            : values[item.key] || (item.key === 'maxTokens' ? 'auto' : '(not set)')}`),
+            : values[item.key] || (item.key === 'maxTokens' || item.key === 'contextWindow'
+                ? 'auto' : '(not set)')}`),
         persisted || readError ? 'Save (disabled)' : 'Save settings', 'Reload settings'];
     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(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: effectiveCapLine(values) }, "effective"));
@@ -720,7 +822,7 @@ function ProfileSettingsScreen(props) {
         return subpage;
     const { error, readError, dirty, persisted, index, offset } = view;
     return _jsx(OverlayFrame, { ...props, rows: buildRootSettingsRows(props, view), scrollOffset: offset, title: error ?? (readError ? 'Cannot read config. Repair with aragon config edit; Reload.'
-            : dirty ? 'Settings | Unsaved changes' : 'Settings'), hint: persisted ? 'Esc close; restart to apply' : index < 3
+            : dirty ? 'Settings | Unsaved changes' : 'Settings'), hint: persisted ? 'Esc close; restart to apply' : index < ROOT_FIRST_FIELD
             ? 'Enter select/edit | Ctrl+S save | Esc cancel'
             : 'Enter save/action | Ctrl+S save | Esc cancel' });
 }

package/dist/ui/overlays/model-profile-state.d.ts

@@ -1,11 +1,25 @@
 import { type ModelProfile, type ModelProfilesConfig, type ModelRole } from '../../config/model-profiles.js';
 import type { ModelSettingsDraft } from '../../config/model-profile-store.js';
+import type { SubagentModelMode } from '../../team/model.js';
 export type ProfilePage = 'root' | 'picker' | 'manager' | 'editor' | 'delete-confirm' | 'discard-confirm';
+/**
+ * Which role a PROFILE PICKER page is choosing for.
+ *
+ * `'subagent'` is a PICKER-ONLY role (subagent-model 6.2): `ModelRole` stays
+ * `'main' | 'fast'` because it is the type basis of the config layer's
+ * `${role}Id` template keys - widening it would invent a `subagentId` library
+ * key nothing reads. The subagent picker writes `draft.patch.team` instead.
+ */
+export type ProfilePickerRole = ModelRole | 'subagent';
+/** The picker's built-in `Fast tier model` row; never a profile id on disk. */
+export declare const SUBAGENT_FAST_ROW_ID = "__fast__";
 export interface ProfileEditorDraft {
     original: ModelProfile;
     name: string;
     provider: string;
     model: string;
+    /** Text exactly as typed; `''` renders `(auto)` and parses to AUTO (§6.5). */
+    contextWindow: string;
     baseUrl: string;
     credentialMode: 'keep' | 'replace' | 'shared';
     apiKey: string;
@@ -14,21 +28,23 @@ export interface ProfileEditorDraft {
 export interface ModelProfileState {
     draft: ModelSettingsDraft;
     page: ProfilePage;
-    role: ModelRole;
+    role: ProfilePickerRole;
     editor?: ProfileEditorDraft;
     returnPage: 'picker' | 'manager';
     bindNew: boolean;
     dirty: boolean;
     error?: string;
     deleteId?: string;
+    /** Who referenced the entry being deleted ('Main + Subagent', or ''). */
+    deleteUsers?: string;
 }
 export type ModelProfileAction = {
     type: 'page';
     page: ProfilePage;
-    role?: ModelRole;
+    role?: ProfilePickerRole;
 } | {
     type: 'select';
-    role: ModelRole;
+    role: ProfilePickerRole;
     id: string | null;
 } | {
     type: 'edit';
@@ -67,7 +83,40 @@ export declare function finishProfileEditor(editor: ProfileEditorDraft): {
 /** Make an isolated root draft; opening the screen never mutates live config. */
 export declare function createModelProfileState(draft: ModelSettingsDraft): ModelProfileState;
 /** Describe references using text so ASCII and no-color modes remain usable. */
-export declare function profileUsers(profiles: ModelProfilesConfig | undefined, id: string): string;
+export declare function profileUsers(profiles: ModelProfilesConfig | undefined, id: string, subagentProfileId?: string | null): string;
+/**
+ * The team section a draft would save: the patch first, then the disk baseline
+ * (subagent-model §3.6). The explicit-`undefined` test is what makes an
+ * explicit `null` in the patch win over the baseline - `??` would fold it away.
+ */
+export declare function draftTeam(draft: ModelSettingsDraft): {
+    model: SubagentModelMode;
+    modelProfileId: string | null;
+};
+/** The profile id the draft's team section binds, for reference checks (3.7). */
+export declare function draftSubagentProfileId(draft: ModelSettingsDraft): string | null;
+/** The projected picker selection for the subagent role (6.2). */
+export declare function subagentSelectedId(draft: ModelSettingsDraft): string | null;
+/** What the settings root row and `/team model` show for the current mode. */
+export interface SubagentModelSummaryInput {
+    mode: SubagentModelMode;
+    modelProfileId: string | null;
+    /** `<provider>:<model>` of the connection the main role runs on. */
+    mainConnection: string;
+    /** The fast tier's `<provider>:<model>`, or null when it does not resolve. */
+    fastConnection: string | null;
+    profiles: ModelProfilesConfig | undefined;
+    /**
+     * KEY EXISTENCE AS THE SETTINGS SCREEN SEES IT (V-10): derived from the
+     * config-file keys, exactly like the `name()` row and `fastTierLine` beside
+     * it. A key that exists ONLY as an environment variable is invisible here,
+     * so an env-key user may see `(off ...)` / `[Missing API key]` where the
+     * runtime would succeed - the accepted approximation both sibling lines
+     * already ship.
+     */
+    hasKey: (providerId: string) => boolean;
+}
+export declare function subagentModelSummary(input: SubagentModelSummaryInput): string;
 /** Adopt persisted fields only, resolving the old fast inheritance once. */
 export declare function createCustomProfile(draft: ModelSettingsDraft, role: ModelRole): ModelProfile;
 /** All child actions modify only the root draft; persistence belongs to Save. */