@aragon-agent/cli 0.6.22 → 0.6.24

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.22",
+  "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.34",
+    "@aragon-agent/core": "^0.2.36",
     "chalk": "^5.6.2",
     "cli-highlight": "^2.0.0",
     "commander": "^12.1.0",