@aragon-agent/cli 0.6.33 → 0.6.35

package/dist/ui/overlays/KitManager.js

@@ -0,0 +1,104 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * Settings > Kit pack: the manager page (agent-model-kits §4.5 / D-9).
+ *
+ * ASCII ONLY - `src/ui/**` is inside `glyphs.test.ts::inScope`.
+ *
+ * CRUD LIVES HERE AND NOWHERE ELSE: `New kit` and `e` open the editor, `d` asks
+ * a confirmation that NAMES the consequences, `s` runs exit A (three slots plus
+ * the persisted pointer, because a default that only moved a pointer would not
+ * be in effect at the next launch - RV-P0-3), and `Enter` applies a kit to the
+ * transaction draft. Nothing on this page writes the config file.
+ */
+import { useState } from 'react';
+import { Text, useInput } from 'ink';
+import { pickGlyphs } from '../glyphs.js';
+import { OverlayFrame } from '../layout/OverlayFrame.js';
+import { clipProfileText, useProfileScroll } from './ModelProfilePicker.js';
+/** `New kit` first, then one row per kit, then the three actions. */
+const NEW_KIT = 'New kit';
+const ACTIONS = ['Duplicate', 'Delete', 'Set default'];
+export function KitManager(props) {
+    const glyphs = pickGlyphs(props.caps);
+    const [index, setIndex] = useState(0);
+    // NULL, NOT THE FIRST KIT: `selected` is "the last kit the cursor was on", and
+    // starting it at `rows[0]` would let `d` on the `New kit` row delete a kit the
+    // user never pointed at.
+    const [selected, setSelected] = useState(null);
+    const count = props.rows.length + 1 + ACTIONS.length;
+    const cursor = Math.min(index, count - 1);
+    const focused = props.rows[cursor - 1];
+    const offset = useProfileScroll(props, cursor);
+    const current = focused?.id ?? selected;
+    function action(name) {
+        if (!current)
+            return;
+        if (name === 'Duplicate')
+            props.dispatch({ type: 'kit-duplicate', id: current });
+        if (name === 'Delete')
+            props.dispatch({ type: 'kit-delete', id: current });
+        // EXIT A, NOT A POINTER WRITE (RV-P0-3): the three slots and the pointer move
+        // together, because "the default" IS the disk binding (D-13).
+        if (name === 'Set default')
+            props.dispatch({ type: 'kit-default', id: current });
+    }
+    useInput((input, key) => {
+        if (props.isActive === false)
+            return;
+        if (key.escape) {
+            props.onBack();
+            return;
+        }
+        if (key.upArrow || (key.tab && key.shift)) {
+            const next = (cursor - 1 + count) % count;
+            setIndex(next);
+            if (props.rows[next - 1])
+                setSelected(props.rows[next - 1].id);
+            return;
+        }
+        if (key.downArrow || key.tab) {
+            const next = (cursor + 1) % count;
+            setIndex(next);
+            if (props.rows[next - 1])
+                setSelected(props.rows[next - 1].id);
+            return;
+        }
+        if (key.return) {
+            if (cursor === 0) {
+                props.dispatch({ type: 'kit-open', id: null });
+                return;
+            }
+            if (focused) {
+                props.dispatch({ type: 'kit-apply', id: focused.id });
+                return;
+            }
+            action(ACTIONS[cursor - 1 - props.rows.length]);
+            return;
+        }
+        if (key.ctrl || key.meta)
+            return;
+        const letter = input.toLowerCase();
+        // `e` opens the focused kit; `d` and `s` are the two destructive/intent-bearing
+        // single keys. ALL THREE require a focused KIT ROW, so none of them can fire
+        // from `New kit` or from the action rows at the bottom.
+        if (!focused)
+            return;
+        if (letter === 'e') {
+            props.dispatch({ type: 'kit-open', id: focused.id });
+            return;
+        }
+        if (letter === 'd') {
+            props.dispatch({ type: 'kit-delete', id: focused.id });
+            return;
+        }
+        if (letter === 's')
+            action('Set default');
+    });
+    const lines = [NEW_KIT, ...props.rows.map((row) => `${row.label}  ${row.summary}`),
+        ...ACTIONS];
+    const rows = lines.map((line, at) => (_jsx(Text, { wrap: "truncate", color: at === cursor ? props.theme.accent : props.theme.muted, children: `${at === cursor ? glyphs.caret : ' '} ${clipProfileText(line, props.cols - 8)}` }, at)));
+    if (!props.rows.length) {
+        rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: clipProfileText('No kits yet. Press Enter on New kit to build one from this setup.', props.cols - 8) }, "empty"));
+    }
+    return _jsx(OverlayFrame, { ...props, title: props.error ?? 'Agent kits', hint: "Enter apply | e edit | d delete | s set default | Esc back", rows: rows, scrollOffset: offset });
+}

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

@@ -0,0 +1,49 @@
+/**
+ * The Agent-kit picker: `ctrl+K` (agent-model-kits §4.6 / D-10 / D-11).
+ *
+ * ASCII ONLY - `src/ui/**` is inside `glyphs.test.ts::inScope`.
+ *
+ * A LIST PLUS A DETAIL BLOCK, not one row per kit with three columns: three
+ * connections never fit on a 72-column terminal, and the `OverlayFrame` detail
+ * idiom is how this package already says everything that does not fit in a row
+ * (`ModelProfilePicker`, the compaction card). The list carries names and
+ * markers only, so the choice stays scannable at any width.
+ *
+ * THE OVERLAY IS READ-ONLY (R-11): Enter applies for this session, Esc leaves
+ * everything as it was. That is what makes moving `killToEnd` off `Ctrl+K`
+ * (D-15) a one-time surprise instead of a risk - a user who presses the old
+ * key gets a reversible screen, not a deleted line.
+ */
+import React from 'react';
+import type { ModelProfilesConfig } from '../../config/model-profiles.js';
+import type { CliConfig } from '../../config/schema.js';
+import type { ActiveKit } from '../../config/kit-resolution.js';
+import type { Theme } from '../theme.js';
+import type { TermCapabilities } from '../capabilities.js';
+import { type KitConnectionsSource } from './kit-picker-state.js';
+export interface KitPickerProps {
+    isActive?: boolean;
+    theme: Theme;
+    caps: TermCapabilities;
+    cols: number;
+    maxRows: number;
+    scrollOffset: number;
+    onScrollClamp?: (offset: number) => void;
+    library?: ModelProfilesConfig | undefined;
+    config: CliConfig;
+    /**
+     * The config file's bindings, for the `Current setup` detail block (§4.6).
+     *
+     * OMITTED BY EMBEDDED HOSTS AND TESTS, in which case the block falls back to
+     * `config` - which is exactly right when no kit is in effect, since the live
+     * config then IS the file.
+     */
+    diskConfig?: KitConnectionsSource | undefined;
+    active: ActiveKit;
+    /** Only the APPLY is refused while work is in flight; browsing still works. */
+    busy: boolean;
+    /** `null` = `Current setup`, i.e. release the session kit. */
+    onChoose: (kitId: string | null) => void;
+    onClose: () => void;
+}
+export declare function KitPicker(props: KitPickerProps): React.ReactElement;

package/dist/ui/overlays/KitPicker.js

@@ -0,0 +1,58 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * The Agent-kit picker: `ctrl+K` (agent-model-kits §4.6 / D-10 / D-11).
+ *
+ * ASCII ONLY - `src/ui/**` is inside `glyphs.test.ts::inScope`.
+ *
+ * A LIST PLUS A DETAIL BLOCK, not one row per kit with three columns: three
+ * connections never fit on a 72-column terminal, and the `OverlayFrame` detail
+ * idiom is how this package already says everything that does not fit in a row
+ * (`ModelProfilePicker`, the compaction card). The list carries names and
+ * markers only, so the choice stays scannable at any width.
+ *
+ * THE OVERLAY IS READ-ONLY (R-11): Enter applies for this session, Esc leaves
+ * everything as it was. That is what makes moving `killToEnd` off `Ctrl+K`
+ * (D-15) a one-time surprise instead of a risk - a user who presses the old
+ * key gets a reversible screen, not a deleted line.
+ */
+import { useState } from 'react';
+import { Text, useInput } from 'ink';
+import { pickGlyphs } from '../glyphs.js';
+import { OverlayFrame } from '../layout/OverlayFrame.js';
+import { clipProfileText, useProfileScroll } from './ModelProfilePicker.js';
+import { kitDetail, kitPickHint, kitRows, NO_KITS_HINT } from './kit-picker-state.js';
+export function KitPicker(props) {
+    const rows = kitRows({ library: props.library, active: props.active });
+    const glyphs = pickGlyphs(props.caps);
+    const [index, setIndex] = useState(0);
+    const count = rows.length;
+    const cursor = Math.min(index, count - 1);
+    const focused = rows[cursor];
+    const offset = useProfileScroll(props, cursor);
+    const hasKits = (props.library?.kits ?? []).length > 0;
+    const body = rows.map((row, at) => (_jsx(Text, { wrap: "truncate", color: at === cursor ? props.theme.accent : props.theme.muted, children: `${at === cursor ? glyphs.caret : ' '} ${clipProfileText(row.label, props.cols - 8)}` }, row.id ?? 'current')));
+    if (!hasKits) {
+        body.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: clipProfileText(NO_KITS_HINT, props.cols - 8) }, "empty"));
+    }
+    // THE DETAIL BLOCK DESCRIBES THE FOCUSED ROW ONLY. Shown last so a narrow
+    // terminal clips the detail, never the choice.
+    for (const [at, line] of kitDetail({ row: focused, library: props.library,
+        config: props.config, diskConfig: props.diskConfig }).entries()) {
+        body.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: clipProfileText(`  ${line}`, props.cols - 8) }, `detail-${at}`));
+    }
+    useInput((_input, key) => {
+        if (props.isActive === false)
+            return;
+        if (key.escape) {
+            props.onClose();
+            return;
+        }
+        if (key.upArrow || (key.tab && key.shift))
+            setIndex((cursor - 1 + count) % count);
+        else if (key.downArrow || key.tab)
+            setIndex((cursor + 1) % count);
+        else if (key.return)
+            props.onChoose(focused.id);
+    });
+    return _jsx(OverlayFrame, { title: props.busy ? 'Agent kits (running)' : 'Agent kits', hint: kitPickHint({ busy: props.busy, hasKits }), rows: body, scrollOffset: offset, onScrollClamp: props.onScrollClamp, maxRows: props.maxRows, cols: props.cols, theme: props.theme, caps: props.caps });
+}

package/dist/ui/overlays/ModelProfilePicker.js

@@ -64,7 +64,12 @@ function usePickerState(props) {
     const actions = props.manager ? ['New', 'Edit', 'Duplicate', 'Delete'] : ['Create profile'];
     // 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;
+    //
+    // THE BINDING PICKER HAS NEITHER (agent-model-kits §4.5): a kit slot can only
+    // name a profile, so `prefix` is 0 there even though it is a selection page -
+    // "no profile" is not a choice a kit may make.
+    const prefix = props.role === 'subagent' ? 2 : props.role === 'binding' ? 0
+        : props.manager ? 0 : 1;
     const count = entries.length + prefix + actions.length;
     const cursor = Math.min(index, count - 1);
     const focused = entries[cursor - prefix];
@@ -89,7 +94,7 @@ function usePickerInput(props, state) {
                 return;
             }
         }
-        else if (!props.manager && cursor === 0) {
+        else if (!props.manager && props.role !== 'binding' && cursor === 0) {
             props.onSelect(null);
             return;
         }
@@ -164,7 +169,10 @@ function usePickerInput(props, state) {
 function currentSelectionId(props) {
     if (props.selectedIdOverride !== undefined)
         return props.selectedIdOverride;
-    if (props.role === 'subagent')
+    // `subagent` and `binding` have no `${role}Id` key: their selection arrives
+    // through `selectedIdOverride`, so looking one up would read a key that does
+    // not exist on the library.
+    if (props.role === 'subagent' || props.role === 'binding')
         return undefined;
     return props.profiles[`${props.role}Id`];
 }
@@ -190,7 +198,7 @@ function buildPickerRows(props, state) {
         lines.push(`${current === SUBAGENT_FAST_ROW_ID ? '[Selected] ' : ''}Fast tier model`
             + `${props.fastTierOff === true ? '  (fast tier off)' : ''}`);
     }
-    else if (!props.manager)
+    else if (!props.manager && props.role !== 'binding')
         lines.push('Current custom');
     lines.push(...entries.map((entry) => profilePickerLabel(props, entry)));
     lines.push(...actions);
@@ -200,7 +208,8 @@ function buildPickerRows(props, state) {
     // 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;
+        : !props.manager && props.role !== 'binding' && 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'
@@ -215,7 +224,8 @@ export function ModelProfilePicker(props) {
     usePickerInput(props, state);
     return _jsx(OverlayFrame, { ...props, title: props.error ?? (props.manager ? 'Manage profiles'
             : 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.role === 'binding' ? 'Choose profile'
+                    : `${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/SettingsScreen.js

@@ -24,7 +24,10 @@ import { ModelProfileEditor } from './ModelProfileEditor.js';
 import { ModelDiscoveryList } from './ModelDiscoveryList.js';
 import { useModelProbe } from './use-model-probe.js';
 import { canProbe, editorProbeTarget, visibleProbeViews } from './model-probe-view.js';
-import { createModelProfileState, createCustomProfile, modelProfileReducer, profileUsers, draftTeam, draftSubagentProfileId, subagentModelSummary, subagentSelectedId } from './model-profile-state.js';
+import { createModelProfileState, createCustomProfile, modelProfileReducer, profileUsers, draftTeam, draftSubagentProfileId, subagentModelSummary, subagentSelectedId, SUBAGENT_FAST_ROW_ID } from './model-profile-state.js';
+import { KitEditor } from './KitEditor.js';
+import { KitManager } from './KitManager.js';
+import { heldSlots, kitManagerRows, kitPackRow, kitReducer } from './kit-settings-state.js';
 /**
  * THE ROOT PAGE'S ROW INDEXES, AS NAMES (subagent-model V-5).
  *
@@ -32,12 +35,18 @@ import { createModelProfileState, createCustomProfile, modelProfileReducer, prof
  * 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.
+ *
+ * DERIVED FROM ONE LIST (agent-model-kits §4.5), because the kit row is the
+ * fifth of these and the "five offsets agreed by accident" defect does not need
+ * a sequel. Order here IS the render order.
  */
-const ROOT_MAIN = 0;
-const ROOT_FAST = 1;
-const ROOT_SUBAGENT = 2;
-const ROOT_MANAGE = 3;
-const ROOT_FIRST_FIELD = 4;
+const ROOT_ROWS = ['main', 'fast', 'subagent', 'kit', 'manage'];
+const ROOT_MAIN = ROOT_ROWS.indexOf('main');
+const ROOT_FAST = ROOT_ROWS.indexOf('fast');
+const ROOT_SUBAGENT = ROOT_ROWS.indexOf('subagent');
+const ROOT_KIT = ROOT_ROWS.indexOf('kit');
+const ROOT_MANAGE = ROOT_ROWS.indexOf('manage');
+const ROOT_FIRST_FIELD = ROOT_ROWS.length;
 /** Stand-in target while no editor exists; no probe row is rendered then. */
 const NO_PROFILE_TARGET = { provider: '', model: '', baseUrl: null,
     apiKey: null };
@@ -523,8 +532,23 @@ function saveError(result) {
     };
     return errors[result.code ?? ''] ?? 'Could not save. Review settings and retry.';
 }
+function isKitAction(action) {
+    return action.type.startsWith('kit-');
+}
+/**
+ * ONE REDUCER FOR THE WHOLE SCREEN, TWO OWNERS INSIDE IT (agent-model-kits §4.5).
+ *
+ * The kit pages need their own data mutations (create, duplicate, delete, apply)
+ * but must not introduce a second state object: `Save`, `Esc` and the dirty
+ * badge are shared, and a second store is how a settings screen starts
+ * disagreeing with itself. `kitReducer` returns the SAME state shape, so the
+ * split is invisible from the outside.
+ */
+function settingsReducer(state, action) {
+    return isKitAction(action) ? kitReducer(state, action) : modelProfileReducer(state, action);
+}
 function useProfileSettingsState(props) {
-    const [state, dispatch] = useReducer(modelProfileReducer, props.draft, createModelProfileState);
+    const [state, dispatch] = useReducer(settingsReducer, props.draft, createModelProfileState);
     const [initial, setInitial] = useState(() => profileSettingsValues(props.initial, props.draft));
     const [values, setValues] = useState(initial);
     const [index, setIndex] = useState(0);
@@ -559,12 +583,16 @@ function useProfileSettingsState(props) {
             && ['provider', 'model', 'baseUrl', 'contextWindow', 'apiKey'].includes(item.key)),
         ...FIELDS.filter((item) => library.fastId === null
             && ['fastModel', 'fastProvider'].includes(item.key)), ...PROFILE_FIELDS];
-    // 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;
+    // SEVEN FIXED ROWS now (Main, Fast, SUBAGENT, Kit pack, Manage, Save, Reload)
+    // around the `fields` block - derived from ROOT_ROWS so the count and the
+    // offsets cannot drift apart (see those constants).
+    const count = fields.length + ROOT_ROWS.length + 2;
     const field = fields[index - ROOT_FIRST_FIELD];
     const readError = state.draft.readError;
-    const confirming = state.page === 'delete-confirm' || state.page === 'discard-confirm';
+    // THREE CONFIRMATIONS SHARE ONE PAGE, which is why the page name - not a
+    // boolean - is what the renderer and the input hook both branch on.
+    const confirming = state.page === 'delete-confirm' || state.page === 'discard-confirm'
+        || state.page === 'kit-delete';
     return { state, dispatch, initial, setInitial, values, setValues, index, setIndex,
         error, setError, persisted, setPersisted, confirmIndex, setConfirmIndex,
         reloadPending, setReloadPending, offset, library, glyphs, dirty, fields, count,
@@ -651,6 +679,11 @@ function activateRootSetting(props, view) {
         // `draft.patch.team` rather than a `${role}Id` library key.
         dispatch({ type: 'page', page: 'picker', role: 'subagent' });
     }
+    else if (index === ROOT_KIT) {
+        // The fourth root row opens the manager, not a picker: kits are data the user
+        // owns here, and `ctrl+K` is where they are CONSUMED (agent-model-kits §4.5).
+        dispatch({ type: 'page', page: 'kits' });
+    }
     else if (index === ROOT_MANAGE)
         dispatch({ type: 'page', page: 'manager' });
     else
@@ -717,6 +750,11 @@ function useSettingsConfirmationInput(props, view) {
         }
         if (!key.return)
             return;
+        if (state.page === 'kit-delete') {
+            dispatch(confirmIndex === 1 ? { type: 'kit-confirm-delete' }
+                : { type: 'page', page: 'kits' });
+            return;
+        }
         if (state.page === 'delete-confirm') {
             dispatch(confirmIndex === 1 ? { type: 'confirm-delete' }
                 : { type: 'page', page: 'manager' });
@@ -729,8 +767,26 @@ function useSettingsConfirmationInput(props, view) {
             props.onClose?.();
     }, { isActive: confirming });
 }
+/**
+ * The kit deletion confirmation (agent-model-kits D-9 / AC-30).
+ *
+ * `Cancel` IS THE DEFAULT FOCUS, like the profile confirmation next door: the
+ * `Enter` key that opened this page must not be the one that deletes. The second
+ * line names what the user loses - a kit, and with it the default pointer and any
+ * session binding that named it.
+ */
+function renderKitDeleteConfirmation(props, view) {
+    const { state, confirmIndex, glyphs } = view;
+    const kit = (state.draft.profiles?.kits ?? []).find((item) => item.id === state.kitDraft?.id);
+    const rows = ['Cancel', 'Delete'].map((label, at) => (_jsxs(Text, { wrap: "truncate", color: props.theme.primary, children: [confirmIndex === at ? `${glyphs.caret} ` : '  ', label] }, label)));
+    rows.push(_jsx(Text, { wrap: "truncate", color: props.theme.muted, children: `Deletes kit "${kit?.name ?? ''}". Its three slots stay as they are; only the preset goes.` }, "consequence"));
+    return _jsx(OverlayFrame, { ...props, title: `Delete kit ${kit?.name ?? ''}?`, hint: "Enter choose | Esc continue", rows: rows, scrollOffset: confirmIndex });
+}
 function renderSettingsConfirmation(props, view) {
     const { state, library, confirmIndex, glyphs } = view;
+    const deletingKit = state.page === 'kit-delete';
+    if (deletingKit)
+        return renderKitDeleteConfirmation(props, view);
     const deleting = state.page === 'delete-confirm';
     const name = library.entries.find((entry) => entry.id === state.deleteId)?.name ?? '';
     // UNBIND-AND-DELETE (D-6): a referenced entry stays deletable in ONE flow,
@@ -780,6 +836,16 @@ function fastTierUnavailable(props, view) {
 }
 function renderProfileSubpage(props, view) {
     const { state, library, dispatch, setConfirmIndex } = view;
+    // THE KIT PAGES (agent-model-kits §4.5). They are dispatched BEFORE the profile
+    // pages because `'kit-slot'` RENDERS a profile picker while belonging to the
+    // kit editor - the page name, not the component, decides where the user is.
+    if (state.page === 'kits')
+        return _jsx(KitManager, { ...props, rows: kitManagerRows(state), error: state.error, dispatch: dispatch, onBack: () => dispatch({ type: 'page', page: 'root' }) });
+    if (state.page === 'kit-edit' && state.kitDraft)
+        return _jsx(KitEditor, { ...props, draft: state.kitDraft, state: state, dispatch: dispatch });
+    if (state.page === 'kit-slot' && state.kitDraft) {
+        return renderKitSlotPicker(props, view, state.kitDraft);
+    }
     if (state.page === 'editor' && state.editor)
         return _jsx(ModelProfileEditor, { ...props, editor: state.editor, users: profileUsers(library, state.editor.original.id, draftSubagentProfileId(state.draft)), error: state.error, dispatch: dispatch, probeView: view.probeViews.test, probeBusy: view.probe.busy, probeTarget: view.probeTarget, onTest: () => startTest(view), onDiscover: () => startDiscovery(view, dispatch), onCancelProbe: view.probe.cancel });
     // A DISCOVERY IS A PAGE, NOT A POPUP: the list is where the answer belongs, and
@@ -788,13 +854,50 @@ function renderProfileSubpage(props, view) {
         return _jsx(ModelDiscoveryList, { ...props, provider: state.editor.provider, currentModel: state.editor.model, view: view.probeViews.discovery, busy: view.probe.discovery.phase === 'discovering', onChoose: (model) => dispatch({ type: 'choose-model', model }), onRetry: () => startDiscovery(view, dispatch), onBack: () => dispatch({ type: 'page', page: 'editor' }), onCancelProbe: view.probe.cancel });
     // 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;
+    // 'main' while `state.role` keeps driving the select that binds it. 'binding'
+    // is the kit slot's chooser and seeds the same way.
+    const createRole = state.role === 'subagent' || state.role === 'binding'
+        ? '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, 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;
 }
+/** Which slot value the kit picker should mark `[Selected]`. */
+function kitSlotSelection(kitDraft) {
+    if (kitDraft.slot === 'main')
+        return kitDraft.mainProfileId || null;
+    if (kitDraft.slot === 'fast')
+        return kitDraft.fastProfileId;
+    if (kitDraft.subagent.model === 'profile')
+        return kitDraft.subagent.modelProfileId;
+    return kitDraft.subagent.model === 'fast' ? SUBAGENT_FAST_ROW_ID : null;
+}
+/**
+ * The slot chooser: the SAME profile picker, in its `binding` role.
+ *
+ * A kit slot can only name a profile, so there is no `Current custom` row and no
+ * `Same as main` (those are the subagent slot's own three-state vocabulary). The
+ * subagent slot keeps the `subagent` role, which is why `Fast tier (off - falls
+ * back to main)` needs no new wording anywhere (RV-P2-6).
+ */
+function renderKitSlotPicker(props, view, kitDraft) {
+    const { state, library, dispatch } = view;
+    const role = kitDraft.slot === 'subagent' ? 'subagent' : 'binding';
+    return _jsx(ModelProfilePicker, { ...props, profiles: library, savedProfiles: state.draft.baseline.modelProfiles, role: role, customProfile: createCustomProfile(state.draft, 'main'), error: state.error, selectedIdOverride: kitSlotSelection(kitDraft), subagentProfileId: draftSubagentProfileId(state.draft), fastTierOff: kitDraft.slot === 'subagent' && fastTierUnavailable(props, view), onSelect: (id) => {
+            if (kitDraft.slot === 'main') {
+                dispatch({ type: 'kit-main', id });
+                return;
+            }
+            if (kitDraft.slot === 'fast') {
+                dispatch({ type: 'kit-fast', id });
+                return;
+            }
+            dispatch({ type: 'kit-subagent',
+                model: id === null ? 'main' : id === SUBAGENT_FAST_ROW_ID ? 'fast' : 'profile',
+                modelProfileId: id === null || id === SUBAGENT_FAST_ROW_ID ? null : id });
+        }, onCreate: () => dispatch({ type: 'edit', profile: createCustomProfile(state.draft, 'main') }), onEdit: (profile) => dispatch({ type: 'edit', profile }), onDuplicate: (id) => dispatch({ type: 'duplicate', id }), onDelete: (id) => dispatch({ type: 'delete', id }), onCancel: () => dispatch({ type: 'kit-cancel' }) });
+}
 function buildRootSettingsRows(props, view) {
     const { library, fields, values, persisted, readError, index, glyphs, state } = view;
     const name = (id) => {
@@ -823,9 +926,29 @@ function buildRootSettingsRows(props, view) {
         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}`,
+    // HELD SLOTS SHOW THE KIT'S EFFECTIVE VALUES (RV-P0-2 / AC-38). Three rows on
+    // this page read the FILE's bindings while the header reads the live ones, so
+    // without this the screen says `Main profile  Opus` over a header that says
+    // `haiku` - and the only available conclusion is that the app is broken.
+    // `Enter` on any of these rows writes an explicit choice, which releases that
+    // slot (§4.3), so what the user sees is what they are about to change.
+    const held = heldSlots(state);
+    const kitTag = held.kitName ? `  (kit ${held.kitName})` : '';
+    const mainValue = `${name(held.mainId ?? library.mainId)}${held.held.includes('main')
+        ? kitTag : ''}`;
+    const fastValue = held.held.includes('fast')
+        ? `${held.fastId ? name(held.fastId) : 'Off (this kit turns the tier off)'}${kitTag}`
+        : name(library.fastId);
+    const subagentValue = held.subagent
+        ? `${subagentModelSummary({ mode: held.subagent.model,
+            modelProfileId: held.subagent.modelProfileId, mainConnection, fastConnection,
+            profiles: state.draft.profiles,
+            hasKey: (id) => (props.apiKeys[id] ?? '').length > 0 })}${kitTag}`
+        : subagentLine;
+    const lines = [`Main profile      ${mainValue}`,
+        `Fast profile      ${fastValue}`,
+        `Subagent model    ${subagentValue}`,
+        `Kit pack          ${kitPackRow(state)}`,
         `Manage profiles   ${library.entries.length} saved`,
         ...fields.map((item) => `${item.label.padEnd(18)}${item.key === 'apiKey'
             ? values.apiKey ? 'Configured (replacement)' : props.apiKeys[values.provider]

package/dist/ui/overlays/kit-picker-state.d.ts

@@ -0,0 +1,87 @@
+/**
+ * The `ctrl+K` list, as a pure view model (agent-model-kits §4.6 / D-10).
+ *
+ * ASCII ONLY - `src/ui/**` is inside `glyphs.test.ts::inScope`.
+ *
+ * WHY THE ROWS ARE COMPUTED HERE AND NOT IN THE COMPONENT: three surfaces print
+ * the same three connections (this list, the settings manager, `/kit list`).
+ * One function produces them, so the wording of "the fast tier is off" cannot
+ * differ between the key the user pressed and the command they typed.
+ */
+import type { CliConfig, TeamConfig } from '../../config/schema.js';
+import type { ModelProfilesConfig } from '../../config/model-profiles.js';
+import { type KitConnection, type KitSlot } from '../../config/model-kits.js';
+import { type ActiveKit } from '../../config/kit-resolution.js';
+export interface KitPickerRow {
+    /** `null` = `Current setup` (the release action). */
+    id: string | null;
+    /** The one-line label, markers included. */
+    label: string;
+    /** Machine-checkable markers, so tests never grep a rendered string. */
+    markers: {
+        inUse: boolean;
+        isDefault: boolean;
+        modified: boolean;
+    };
+    /** Non-empty when a referenced profile is gone. */
+    missing: KitSlot[];
+}
+export interface KitPickerInput {
+    library?: ModelProfilesConfig | undefined;
+    active: ActiveKit;
+}
+/** `provider:model` plus the endpoint clause shared by every surface. */
+export declare function connectionText(connection: KitConnection): string;
+/**
+ * Rows in a FIXED order: `Current setup` first, then the library's own order.
+ *
+ * The first row never moves (AC-24) - it is the only row that can always be
+ * chosen, and a list whose "off" entry wanders with the data is a list a user
+ * has to read every single time.
+ */
+export declare function kitRows(input: KitPickerInput): KitPickerRow[];
+/**
+ * The three bindings `Current setup` describes.
+ *
+ * STRUCTURAL, NOT `CliConfig`: the caller hands in the PERSISTED config for this
+ * block (§4.6), because the live config no longer holds the file's bindings once
+ * a session kit is applied - it mirrors the kit (I-6). Both shapes satisfy this
+ * interface, so neither layer has to convert anything.
+ */
+export interface KitConnectionsSource {
+    provider: string;
+    model: string;
+    team?: {
+        model: TeamConfig['model'];
+        modelProfileId?: string | null;
+    } | undefined;
+    fast: {
+        enabled: boolean;
+        provider: string;
+        model: string;
+    };
+    modelProfiles?: ModelProfilesConfig | undefined;
+}
+/** The three lines under the focused row (§4.6). */
+export declare function kitDetail(input: {
+    row: KitPickerRow;
+    library?: ModelProfilesConfig | undefined;
+    config: CliConfig;
+    /** The config file's copy of the bindings; see the `Current setup` note below. */
+    diskConfig?: KitConnectionsSource | undefined;
+}): string[];
+/**
+ * The footer. `busy` is a warning, never a reason to hide the list (§4.7).
+ *
+ * THE LAST CLAUSE IS D-7, VERBATIM: this overlay is a session-only surface, so it
+ * says where the persistence actually lives. Without it the natural reading of
+ * `Enter` is "make this my default", and D-7 exists to keep that action one
+ * deliberate trip to `/settings` instead of one keystroke next to a browse key.
+ * It is LAST so that a 40-column terminal clips the pointer, never the action.
+ */
+export declare function kitPickHint(input: {
+    busy: boolean;
+    hasKits: boolean;
+}): string;
+/** The one guidance row an empty library renders (AC-26). */
+export declare const NO_KITS_HINT = "No kits yet. Create one in /settings (Settings > Kit pack).";