@aragon-agent/cli 0.6.23 → 0.6.24

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. */

package/dist/ui/overlays/model-profile-state.js

@@ -1,17 +1,29 @@
 import { randomUUID } from 'node:crypto';
 import { emptyModelProfiles, duplicateModelProfile, normalizeModelProfiles, validateModelProfiles } from '../../config/model-profiles.js';
+import { parseContextWindowInput } from '../../config/schema.js';
+/** The picker's built-in `Fast tier model` row; never a profile id on disk. */
+export const SUBAGENT_FAST_ROW_ID = '__fast__';
 /** Keep the original secret separate from the empty replacement field. */
 export function createProfileEditor(profile) {
     return { original: { ...profile }, name: profile.name, provider: profile.provider,
         model: profile.model, baseUrl: profile.baseUrl ?? '', apiKey: '',
+        contextWindow: profile.contextWindow === null ? '' : String(profile.contextWindow),
         credentialMode: profile.apiKey ? 'keep' : 'shared', endpointChanged: false };
 }
 /** Validate locally before merging the child form into the root transaction. */
 export function finishProfileEditor(editor) {
+    // STRICT IN THE UI, TOLERANT ON DISK (§6.5 / invariant 4): a typo is refused
+    // here with an inline error and the focus jump its `field` enables; it never
+    // reaches the draft. The message prefix matches the editor's LABELS row.
+    const window = parseContextWindowInput(editor.contextWindow);
+    if (window.kind === 'invalid') {
+        return { error: 'Context window: use a number or auto.', field: 'contextWindow' };
+    }
     const profile = { id: editor.original.id, name: editor.name.trim(),
         provider: editor.provider, model: editor.model.trim(), baseUrl: editor.baseUrl.trim() || null,
         apiKey: editor.credentialMode === 'keep' ? editor.original.apiKey
-            : editor.credentialMode === 'replace' ? editor.apiKey.trim() : null };
+            : editor.credentialMode === 'replace' ? editor.apiKey.trim() : null,
+        contextWindow: window.kind === 'auto' ? null : window.value };
     const library = { ...emptyModelProfiles(), entries: [profile] };
     const issue = validateModelProfiles(library)[0];
     if (issue)
@@ -30,10 +42,52 @@ export function createModelProfileState(draft) {
         bindNew: false, dirty: false };
 }
 /** Describe references using text so ASCII and no-color modes remain usable. */
-export function profileUsers(profiles, id) {
-    return [profiles?.mainId === id ? 'Main' : '', profiles?.fastId === id ? 'Fast' : '']
+export function profileUsers(profiles, id, subagentProfileId) {
+    return [profiles?.mainId === id ? 'Main' : '', profiles?.fastId === id ? 'Fast' : '',
+        subagentProfileId === id ? 'Subagent' : '']
         .filter(Boolean).join(' + ');
 }
+/**
+ * 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 function draftTeam(draft) {
+    const patch = draft.patch.team;
+    const baseline = draft.baseline.team;
+    return {
+        model: patch?.model !== undefined ? patch.model : baseline?.model ?? 'main',
+        modelProfileId: patch?.modelProfileId !== undefined ? patch.modelProfileId
+            : baseline?.modelProfileId ?? null,
+    };
+}
+/** The profile id the draft's team section binds, for reference checks (3.7). */
+export function draftSubagentProfileId(draft) {
+    return draftTeam(draft).model === 'profile' ? draftTeam(draft).modelProfileId : null;
+}
+/** The projected picker selection for the subagent role (6.2). */
+export function subagentSelectedId(draft) {
+    const team = draftTeam(draft);
+    if (team.model === 'profile')
+        return team.modelProfileId;
+    return team.model === 'fast' ? SUBAGENT_FAST_ROW_ID : null;
+}
+export function subagentModelSummary(input) {
+    if (input.mode === 'main')
+        return `Same as main (${input.mainConnection})`;
+    if (input.mode === 'fast') {
+        return input.fastConnection
+            ? `Fast tier (${input.fastConnection})`
+            : 'Fast tier (off - falls back to main)';
+    }
+    const entry = input.modelProfileId
+        ? input.profiles?.entries.find((candidate) => candidate.id === input.modelProfileId)
+        : undefined;
+    if (!entry)
+        return 'Profile missing - falls back to main';
+    const missing = !entry.apiKey && !input.hasKey(entry.provider);
+    return `${entry.name}  ${entry.provider}:${entry.model}${missing ? ' [Missing API key]' : ''}`;
+}
 /** Adopt persisted fields only, resolving the old fast inheritance once. */
 export function createCustomProfile(draft, role) {
     const file = draft.baseline;
@@ -45,7 +99,11 @@ export function createCustomProfile(draft, role) {
             || (provider === (file.provider || 'anthropic') ? file.baseUrl : null)
             : file.baseUrl) || null;
     return { id: randomUUID(), name: '', provider, model, baseUrl,
-        apiKey: role === 'fast' && !model ? null : file.apiKeys?.[provider] || null };
+        apiKey: role === 'fast' && !model ? null : file.apiKeys?.[provider] || null,
+        // Carry the user's existing top-level correction into the first profile
+        // (§6.5): binding an AUTO profile would otherwise silently retire it
+        // (tradeoff B's migration risk, mitigated exactly here).
+        contextWindow: file.contextWindow ?? null };
 }
 function editField(state, action) {
     if (!state.editor)
@@ -85,9 +143,24 @@ export function modelProfileReducer(state, action) {
         case 'reload': return createModelProfileState(action.draft);
         case 'page': return { ...state, page: action.page, role: action.role ?? state.role,
             error: undefined };
-        case 'select': return { ...state, page: 'root', dirty: true, error: undefined,
-            draft: { ...state.draft, profiles: { ...library, [`${action.role}Id`]: action.id },
-                activateRoles: [...new Set([...state.draft.activateRoles, action.role])] } };
+        case 'select': {
+            // THE SUBAGENT BRANCH (D-5): selection writes the DRAFT's team patch -
+            // `profiles` and `activateRoles` are untouched, because 'subagent' is a
+            // picker-only role with no `${role}Id` library key (6.2). Save is the
+            // one place the patch ever reaches disk (I-5).
+            if (action.role === 'subagent') {
+                const team = action.id === null
+                    ? { model: 'main', modelProfileId: null }
+                    : action.id === SUBAGENT_FAST_ROW_ID
+                        ? { model: 'fast', modelProfileId: null }
+                        : { model: 'profile', modelProfileId: action.id };
+                return { ...state, page: 'root', dirty: true, error: undefined,
+                    draft: { ...state.draft, patch: { ...state.draft.patch, team } } };
+            }
+            return { ...state, page: 'root', dirty: true, error: undefined,
+                draft: { ...state.draft, profiles: { ...library, [`${action.role}Id`]: action.id },
+                    activateRoles: [...new Set([...state.draft.activateRoles, action.role])] } };
+        }
         case 'edit': return { ...state, editor: createProfileEditor(action.profile), page: 'editor',
             returnPage: state.page === 'picker' ? 'picker' : 'manager',
             bindNew: action.bindNew ?? false, error: undefined };
@@ -107,13 +180,37 @@ export function modelProfileReducer(state, action) {
                 : state;
         }
         case 'delete': {
-            const users = profileUsers(library, action.id);
-            return users ? { ...state, error: `Used by ${users}. Select another profile first.` }
-                : { ...state, page: 'delete-confirm', deleteId: action.id, error: undefined };
+            // UNBIND-AND-DELETE (D-6): being referenced no longer refuses the flow.
+            // The references - subagent included - are computed here, shown on the
+            // confirm page, and cleared by `confirm-delete` inside the draft.
+            const users = profileUsers(library, action.id, draftSubagentProfileId(state.draft));
+            return { ...state, page: 'delete-confirm', deleteId: action.id,
+                deleteUsers: users, error: undefined };
+        }
+        case 'confirm-delete': {
+            const id = state.deleteId;
+            if (!id)
+                return state;
+            // THE DRAFT-SIDE UNBIND: Main/Fast bindings pointing at the entry are
+            // nulled here (not refused) and the subagent binding resets to main
+            // when it named THIS entry. `removeModelProfile`'s throw stays as the
+            // bottom-line defense - the UI has already unbound, so it cannot fire
+            // on this path.
+            const profiles = {
+                ...library,
+                mainId: library.mainId === id ? null : library.mainId,
+                fastId: library.fastId === id ? null : library.fastId,
+                entries: library.entries.filter((entry) => entry.id !== id),
+            };
+            const teamReset = draftSubagentProfileId(state.draft) === id
+                ? { team: { model: 'main', modelProfileId: null } }
+                : {};
+            return { ...state, page: 'manager', dirty: true,
+                draft: { ...state.draft, profiles,
+                    patch: { ...state.draft.patch, ...teamReset } },
+                deleteId: undefined, deleteUsers: undefined,
+                // No orphan editor for a deleted entry (3.7).
+                editor: state.editor?.original.id === id ? undefined : state.editor };
         }
-        case 'confirm-delete': return { ...state, page: 'manager', dirty: true,
-            draft: { ...state.draft, profiles: { ...library,
-                    entries: library.entries.filter((entry) => entry.id !== state.deleteId) } },
-            deleteId: undefined };
     }
 }

package/package.json

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