@north-light/crouter 0.3.262 → 0.3.269

package/dist/core/config.js

@@ -114,10 +114,11 @@ export function ensureScopeInitialized(scope, root) {
         // a missing `modelLadders` from whatever build is CURRENTLY running, and an explicit
         // user override (`sys config set modelLadders...`) still persists and still wins.
         // Keybindings are sparse user overrides, so an untouched scope omits that member too.
-        const { modelLadders: _omittedModelLadders, keybindings: _omittedKeybindings, tmux_passthrough: _omittedTmuxPassthrough, brokerThresholds, ...rest } = defaultScopeConfig();
-        // Broker thresholds are host-wide daemon policy, so only user scope
-        // persists them. Project config must never acquire a machine setting.
-        atomicWriteJson(cfgPath, scope === 'user' ? { ...rest, brokerThresholds } : rest);
+        const { modelLadders: _omittedModelLadders, keybindings: _omittedKeybindings, tmux_passthrough: _omittedTmuxPassthrough, brokerThresholds, lifecycle, ...rest } = defaultScopeConfig();
+        // Broker thresholds and lifecycle timing are host-wide daemon policy, so
+        // only user scope persists them. Project config must never acquire a
+        // machine setting.
+        atomicWriteJson(cfgPath, scope === 'user' ? { ...rest, brokerThresholds, lifecycle } : rest);
     });
 }
 function normalizeKeybindings(raw) {
@@ -167,66 +168,140 @@ function mergeModelLadders(raw, base = defaultModelLaddersConfig()) {
 function validStrength(value) {
     return value === 'ultra' || value === 'strong' || value === 'medium' || value === 'light';
 }
-/** Validate and overlay route entries. Invalid declarations are loud but local:
- * a typo must not prevent unrelated launch configuration from resolving. */
-function mergeModelRoutes(raw, base = {}) {
-    const out = { ...base };
+const MODEL_STRENGTHS = ['ultra', 'strong', 'medium', 'light'];
+function routeRecord() {
+    return Object.create(null);
+}
+function setRouteRecord(record, routeId, value) {
+    Object.defineProperty(record, routeId, { value, writable: true, enumerable: true, configurable: true });
+}
+function copyRouteRecord(record) {
+    const copy = routeRecord();
+    for (const [routeId, value] of Object.entries(record ?? {}))
+        setRouteRecord(copy, routeId, value);
+    return copy;
+}
+function routeInvalid(routeId, rule) {
+    emitEvent({ level: 'warn', event: 'config.model_routes.invalid', fields: { route_id: routeId, rule } });
+}
+/** Overlay raw route patches first so a higher scope may replace one cell of a
+ * complete lower route. Completeness belongs to the resulting effective route,
+ * never an individual raw scope patch. */
+function mergeModelRoutePatches(raw, base = {}) {
+    const out = copyRouteRecord(base);
     if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
         return out;
     for (const [routeId, value] of Object.entries(raw)) {
-        const patch = value;
-        const invalid = (rule) => { emitEvent({ level: 'warn', event: 'config.model_routes.invalid', fields: { route_id: routeId, rule } }); };
-        if (!patch || typeof patch !== 'object' || Array.isArray(patch)) {
-            invalid('route must be an object');
-            continue;
-        }
-        const route = { ...out[routeId], ...patch, models: { ...out[routeId]?.models, ...patch.models } };
-        if (typeof route.family !== 'string' || route.family.trim() === '') {
-            invalid('family must be a non-empty string');
-            continue;
-        }
-        if (typeof route.credentialSource !== 'string' || route.credentialSource.trim() === '') {
-            invalid('credentialSource must be a non-empty string');
-            continue;
-        }
-        if (typeof route.providerId !== 'string' || route.providerId.trim() === '') {
-            invalid('providerId must be a non-empty string');
+        if (routeId.trim() === '') {
+            routeInvalid(routeId, 'route id must be a non-empty string');
             continue;
         }
-        if (!route.models || typeof route.models !== 'object' || Array.isArray(route.models)) {
-            invalid('models must be an object');
+        if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+            routeInvalid(routeId, 'route must be an object');
             continue;
         }
-        const models = {};
+        const patch = value;
+        const current = out[routeId];
+        const route = { ...current };
         let rule;
-        for (const [strength, spec] of Object.entries(route.models)) {
-            if (!validStrength(strength)) {
-                rule = `models.${strength} is not a model strength`;
-                break;
-            }
-            if (typeof spec !== 'string' || spec.trim() === '') {
-                rule = `models.${strength} must be a non-empty provider/id ref`;
+        for (const field of ['family', 'credentialSource', 'providerId']) {
+            const candidate = patch[field];
+            if (candidate === undefined)
+                continue;
+            if (typeof candidate !== 'string' || candidate.trim() === '') {
+                rule = `${field} must be a non-empty string`;
                 break;
             }
-            const slash = spec.indexOf('/');
-            if (slash <= 0 || slash === spec.length - 1) {
-                rule = `models.${strength} must be provider/id`;
-                break;
+            route[field] = candidate;
+        }
+        if (rule === undefined && patch.models !== undefined) {
+            if (patch.models === null || typeof patch.models !== 'object' || Array.isArray(patch.models))
+                rule = 'models must be an object';
+            else {
+                const models = { ...current?.models };
+                for (const [strength, spec] of Object.entries(patch.models)) {
+                    if (!validStrength(strength)) {
+                        rule = `models.${strength} is not a model strength`;
+                        break;
+                    }
+                    if (typeof spec !== 'string' || spec.trim() === '') {
+                        rule = `models.${strength} must be a non-empty provider/id ref`;
+                        break;
+                    }
+                    const slash = spec.indexOf('/');
+                    if (slash <= 0 || slash === spec.length - 1) {
+                        rule = `models.${strength} must be provider/id`;
+                        break;
+                    }
+                    models[strength] = spec;
+                }
+                route.models = models;
             }
-            if (spec.slice(0, slash) !== route.providerId) {
-                rule = `models.${strength} provider prefix must equal providerId`;
-                break;
+        }
+        if (rule === undefined && route.models !== undefined && route.providerId !== undefined) {
+            for (const [strength, spec] of Object.entries(route.models)) {
+                if (spec.slice(0, spec.indexOf('/')) !== route.providerId) {
+                    rule = `models.${strength} provider prefix must equal providerId`;
+                    break;
+                }
             }
-            models[strength] = spec;
         }
         if (rule !== undefined) {
-            invalid(rule);
+            routeInvalid(routeId, rule);
             continue;
         }
-        out[routeId] = { family: route.family, credentialSource: route.credentialSource, providerId: route.providerId, models };
+        setRouteRecord(out, routeId, route);
     }
     return out;
 }
+/** Resolve complete routes after every scope has overlaid its sparse raw patch.
+ * Sparse standalone routes are read for one compatibility release only: they
+ * retain their historical candidate behavior, emit a repair warning, and never
+ * gain invented cells. New writes cannot create them. */
+function resolveModelRoutes(routes) {
+    const complete = routeRecord();
+    const legacy = routeRecord();
+    for (const [routeId, route] of Object.entries(routes)) {
+        if (route.family === undefined || route.credentialSource === undefined || route.providerId === undefined || route.models === undefined) {
+            routeInvalid(routeId, 'route must include family, credentialSource, providerId, and models');
+            continue;
+        }
+        const missing = MODEL_STRENGTHS.filter((strength) => route.models[strength] === undefined);
+        if (missing.length > 0) {
+            routeInvalid(routeId, `incomplete route; missing strengths: ${missing.join(', ')}`);
+            setRouteRecord(legacy, routeId, { family: route.family, credentialSource: route.credentialSource, providerId: route.providerId, models: route.models });
+            continue;
+        }
+        setRouteRecord(complete, routeId, {
+            family: route.family,
+            credentialSource: route.credentialSource,
+            providerId: route.providerId,
+            models: route.models,
+        });
+    }
+    return { complete, legacy };
+}
+function assertCompleteModelRoute(routeId, route) {
+    if (routeId.trim() === '')
+        throw new Error('model route id must be a non-empty string');
+    for (const field of ['family', 'credentialSource', 'providerId']) {
+        if (typeof route[field] !== 'string' || route[field].trim() === '')
+            throw new Error(`model route "${routeId}" ${field} must be a non-empty string`);
+    }
+    const missing = MODEL_STRENGTHS.filter((strength) => route.models?.[strength] === undefined);
+    if (missing.length > 0)
+        throw new Error(`model route "${routeId}" is incomplete; missing strengths: ${missing.join(', ')}`);
+    for (const strength of MODEL_STRENGTHS) {
+        const spec = route.models[strength];
+        if (typeof spec !== 'string' || spec.trim() === '')
+            throw new Error(`model route "${routeId}" models.${strength} must be a non-empty provider/id ref`);
+        const slash = spec.indexOf('/');
+        if (slash <= 0 || slash === spec.length - 1)
+            throw new Error(`model route "${routeId}" models.${strength} must be provider/id`);
+        if (spec.slice(0, slash) !== route.providerId)
+            throw new Error(`model route "${routeId}" models.${strength} provider prefix must equal providerId`);
+    }
+}
 function mergeModelRouting(raw, base) {
     if (raw === undefined)
         return base;
@@ -627,6 +702,12 @@ function mergeBrokerThresholds(raw, defaults) {
         ? { warning, automaticReviveCap }
         : { ...defaults };
 }
+function mergeLifecycle(raw, defaults) {
+    const partial = raw !== null && typeof raw === 'object'
+        ? raw
+        : {};
+    return { unattendedParkMs: normalizePositiveInteger(partial.unattendedParkMs, defaults.unattendedParkMs) };
+}
 function normalizeWhipMessages(raw) {
     if (!Array.isArray(raw))
         return [...DEFAULT_WHIP_MESSAGES];
@@ -654,6 +735,7 @@ function mergeConfig(partial) {
         ? partial.auto_open_child_viewers
         : defaults.auto_open_child_viewers;
     const brokerThresholds = mergeBrokerThresholds(partial.brokerThresholds, defaults.brokerThresholds);
+    const lifecycle = mergeLifecycle(partial.lifecycle, defaults.lifecycle);
     const completion_bell = typeof partial.completion_bell === 'boolean' ? partial.completion_bell : defaults.completion_bell;
     const working_gerunds = partial.working_gerunds === undefined
         ? [...defaults.working_gerunds]
@@ -679,14 +761,15 @@ function mergeConfig(partial) {
     const keybindings = normalizeKeybindings(partial.keybindings);
     const tmux_passthrough = normalizeTmuxPassthrough(partial.tmux_passthrough);
     const modelLadders = mergeModelLadders(partial.modelLadders);
-    const modelRoutes = mergeModelRoutes(partial.modelRoutes);
+    const routes = resolveModelRoutes(mergeModelRoutePatches(partial.modelRoutes));
+    const modelRoutes = routes.complete;
     const modelRouting = mergeModelRouting(partial.modelRouting, undefined);
     const kinds = mergeKinds(partial.kinds);
     const remoteCanvas = mergeRemoteCanvas(partial.remoteCanvas);
     const spawnEnv = mergeSpawnEnv(partial.spawnEnv, defaults.spawnEnv?.allow);
     const bin = normalizeBin(partial.bin);
     const humanActions = normalizeHumanActions(partial.humanActions);
-    return { bin, humanActions, schema_version, marketplaces, plugins, auto_update, max_panes_per_window, auto_open_child_viewers, brokerThresholds, completion_bell, working_gerunds, whip_mode, page_components, page_surface, whip_messages, whip_message_mode, mouse_mode_default, live_cycles, condensed_history, bash_tool_purpose, fold_finished_tools, summarize_tool_calls, detailed_tool_recaps, keybindings, tmux_passthrough, modelLadders, ...(Object.keys(modelRoutes).length > 0 ? { modelRoutes } : {}), ...(modelRouting !== undefined ? { modelRouting } : {}), kinds, remoteCanvas, spawnEnv };
+    return { bin, humanActions, schema_version, marketplaces, plugins, auto_update, max_panes_per_window, auto_open_child_viewers, brokerThresholds, lifecycle, completion_bell, working_gerunds, whip_mode, page_components, page_surface, whip_messages, whip_message_mode, mouse_mode_default, live_cycles, condensed_history, bash_tool_purpose, fold_finished_tools, summarize_tool_calls, detailed_tool_recaps, keybindings, tmux_passthrough, modelLadders, ...(Object.keys(modelRoutes).length > 0 ? { modelRoutes } : {}), ...(Object.keys(routes.legacy).length > 0 ? { legacyModelRoutes: routes.legacy } : {}), ...(modelRouting !== undefined ? { modelRouting } : {}), kinds, remoteCanvas, spawnEnv };
 }
 /** Raw (un-defaulted) partial config for one scope, or null if the scope has
  *  no root or no config.json. Used by `readMergedLaunchConfig` to layer
@@ -775,13 +858,13 @@ export function readMergedLaunchConfig(targetCwd = process.cwd(), targetProfileI
     // (ladders/routes/spawnEnv) have no plugin channel.
     let kinds = mergeKinds(userRaw?.kinds, layerPluginKinds('user', scopeRoot('user'), defaults.kinds));
     let modelLadders = mergeModelLadders(userRaw?.modelLadders, defaults.modelLadders);
-    let modelRoutes = mergeModelRoutes(userRaw?.modelRoutes);
+    let modelRoutePatches = mergeModelRoutePatches(userRaw?.modelRoutes);
     let modelRouting = mergeModelRouting(userRaw?.modelRouting, undefined);
     let spawnEnv = mergeSpawnEnv(userRaw?.spawnEnv, defaults.spawnEnv?.allow);
     if (profileRaw !== null) {
         kinds = mergeKinds(profileRaw.kinds, kinds);
         modelLadders = mergeModelLadders(profileRaw.modelLadders, modelLadders);
-        modelRoutes = mergeModelRoutes(profileRaw.modelRoutes, modelRoutes);
+        modelRoutePatches = mergeModelRoutePatches(profileRaw.modelRoutes, modelRoutePatches);
         modelRouting = mergeModelRouting(profileRaw.modelRouting, modelRouting);
         spawnEnv = mergeSpawnEnv(profileRaw.spawnEnv, spawnEnv.allow);
     }
@@ -790,11 +873,19 @@ export function readMergedLaunchConfig(targetCwd = process.cwd(), targetProfileI
         if (raw === null)
             continue;
         modelLadders = mergeModelLadders(raw.modelLadders, modelLadders);
-        modelRoutes = mergeModelRoutes(raw.modelRoutes, modelRoutes);
+        modelRoutePatches = mergeModelRoutePatches(raw.modelRoutes, modelRoutePatches);
         modelRouting = mergeModelRouting(raw.modelRouting, modelRouting);
         spawnEnv = mergeSpawnEnv(raw.spawnEnv, spawnEnv.allow);
     }
-    return { kinds, modelLadders, ...(Object.keys(modelRoutes).length > 0 ? { modelRoutes } : {}), ...(modelRouting !== undefined ? { modelRouting } : {}), spawnEnv };
+    const routes = resolveModelRoutes(modelRoutePatches);
+    return {
+        kinds,
+        modelLadders,
+        ...(Object.keys(routes.complete).length > 0 ? { modelRoutes: routes.complete } : {}),
+        ...(Object.keys(routes.legacy).length > 0 ? { legacyModelRoutes: routes.legacy } : {}),
+        ...(modelRouting !== undefined ? { modelRouting } : {}),
+        spawnEnv,
+    };
 }
 /** The effective `KindConfig` for one full kind string (top-level, e.g.
  *  `developer`, or sub-kind, e.g. `audit/security`), across
@@ -930,6 +1021,38 @@ export function persistModelLadders(root, patch) {
         atomicWriteJson(lockedPath, { ...raw, modelLadders: next });
     });
 }
+/** Persist one complete route at one exact config root. The route is the only
+ * raw route entry touched; unrelated routes and local ladder defaults remain
+ * absent. Pass `undefined` to remove this scope's entry, which resumes lower
+ * scope inheritance rather than introducing a tombstone. */
+export function persistModelRoute(root, routeId, route) {
+    if (route !== undefined)
+        assertCompleteModelRoute(routeId, route);
+    else if (routeId.trim() === '')
+        throw new Error('model route id must be a non-empty string');
+    const path = configPathFor(root);
+    ensureDir(root);
+    withConfigPathLock(path, (lockedPath) => {
+        const raw = readJsonIfExists(lockedPath) ?? {};
+        const routes = copyRouteRecord((raw.modelRoutes ?? {}));
+        if (route === undefined)
+            delete routes[routeId];
+        else {
+            const current = routes[routeId];
+            setRouteRecord(routes, routeId, {
+                ...(current !== null && typeof current === 'object' && !Array.isArray(current) ? current : {}),
+                ...route,
+                models: { ...route.models },
+            });
+        }
+        const next = { ...raw };
+        if (Object.keys(routes).length === 0)
+            delete next.modelRoutes;
+        else
+            next.modelRoutes = routes;
+        atomicWriteJson(lockedPath, next);
+    });
+}
 /** Mutate one exact config root. Setup uses this for profile and explicit
  * project targets that cannot be represented by the user/project Scope enum. */
 export function updateConfigAtRoot(root, mutate) {

package/dist/core/keybindings/catalog.d.ts

@@ -3,13 +3,13 @@ import type { AttachBindingId, AttachMenuBindingId } from './attach-control.js';
 type TmuxMenuAction = 'open' | 'attach' | 'show' | 'view-settings' | 'fold-tools' | 'metadata' | 'promote' | 'demote-mode' | 'resume' | 'fork' | 'demote' | 'make-resident' | 'detach' | 'close-subtree' | 'background-bash' | 'file-review' | 'pin' | 'reload-viewer' | 'recap' | 'context' | 'context-admin' | 'providers' | 'plugins' | 'graph' | 'focus-manager' | 'copy-id' | 'issues';
 type TmuxMenuEntryAction = Exclude<TmuxMenuAction, 'open' | 'attach'> | `issue.${'idea' | 'bug'}`;
 type GraphAction = 'down' | 'up' | 'first' | 'last' | 'collapse-or-manager' | 'expand-or-child' | 'focus' | 'revive' | 'focus-manager' | 'close-subtree' | 'dismiss';
-type BrowseAction = 'quit' | 'down' | 'up' | 'first' | 'last' | 'expand-or-child' | 'collapse-or-parent' | 'toggle-fold' | 'tab-next' | 'tab-previous' | `tab.${1 | 2 | 3 | 4 | 5}` | 'close-subtree' | 'confirm-close' | 'sort' | 'scope' | 'profile' | 'residents' | 'preview' | 'search' | 'revive-now' | 'focus' | 'focus-background' | 'yank-id';
+type BrowseAction = 'quit' | 'down' | 'up' | 'first' | 'last' | 'expand-or-child' | 'collapse-or-parent' | 'toggle-fold' | 'tab-next' | 'tab-previous' | `tab.${1 | 2 | 3 | 4 | 5}` | 'close-subtree' | 'confirm-close' | 'sort' | 'scope' | 'profile' | 'residents' | 'preview' | 'pin' | 'search' | 'revive-now' | 'focus' | 'focus-background' | 'yank-id';
 type ProfileMenuAction = 'up' | 'down' | 'select' | 'accept-default' | 'abort' | `slot.${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}` | 'create' | 'search-existing' | 'use-root' | 'set-default' | 'add-directory' | 'unpin' | 'manage';
 type SetupAction = 'cancel' | 'tab-next' | 'tab-previous' | 'open' | 'list-down' | 'list-up' | 'toggle' | 'details' | 'advance' | 'cell-previous' | 'cell-next';
 type SetupKeybindingAction = 'edit' | 'commit-edit' | 'cancel-edit' | 'unbind' | 'reset-row' | 'reset-all' | 'save' | 'discard' | 'page-up' | 'page-down' | 'filter' | 'filter-delete' | 'filter-clear';
 type SetupModelsAction = 'open' | 'commit' | 'cancel' | 'scope-next';
 export type BindingId = `crtr.tmux.menu.${TmuxMenuAction}` | `crtr.tmux.menu.issue.${'idea' | 'bug'}` | AttachMenuBindingId | `crtr.tmux.menu-global.${TmuxMenuEntryAction}` | `crtr.tmux.node.${'next' | 'previous'}` | 'crtr.tmux.inbox.toggle' | `crtr.attach.scroll.${'up' | 'down' | 'page-up' | 'page-down' | 'live'}` | 'crtr.attach.mouse.toggle' | 'crtr.attach.copy.message' | 'crtr.attach.help.toggle' | `crtr.attach.search.${'next' | 'previous' | 'edit' | 'close'}` | AttachBindingId | `crtr.graph.${GraphAction}` | `crtr.graph.confirm.${'accept' | 'cancel'}` | `crtr.inspector.${'force-quit' | 'down' | 'up' | 'section-next' | 'section-prev' | 'page-down' | 'page-up' | 'toggle-detail' | 'cancel-item' | 'open-log' | 'confirm' | 'dismiss' | 'retarget' | 'refresh' | 'quit'}` | `crtr.browse.${BrowseAction}` | `crtr.browse.search.${'cancel' | 'commit' | 'delete' | 'quit'}` | `crtr.profile.menu.${ProfileMenuAction}` | `crtr.profile.search.${'up' | 'down' | 'pick' | 'back' | 'delete' | 'abort'}` | `crtr.setup.${SetupAction}` | `crtr.setup.confirm.${'accept' | 'back'}` | `crtr.setup.keybindings.${SetupKeybindingAction}` | `crtr.setup.models.${SetupModelsAction}`;
-export declare const BINDING_CATALOG: readonly [BindingDefinition<"crtr.tmux.menu.open">, BindingDefinition<"crtr.tmux.menu.attach">, ...(BindingDefinition<BindingId> | BindingDefinition<"crtr.tmux.node.next"> | BindingDefinition<"crtr.tmux.node.previous"> | BindingDefinition<"crtr.tmux.inbox.toggle"> | BindingDefinition<"crtr.attach.scroll.up"> | BindingDefinition<"crtr.attach.scroll.down"> | BindingDefinition<"crtr.attach.scroll.page-up"> | BindingDefinition<"crtr.attach.scroll.page-down"> | BindingDefinition<"crtr.attach.scroll.live"> | BindingDefinition<"crtr.attach.mouse.toggle"> | BindingDefinition<"crtr.attach.copy.message"> | BindingDefinition<"crtr.attach.search.next"> | BindingDefinition<"crtr.attach.search.previous"> | BindingDefinition<"crtr.attach.search.edit"> | BindingDefinition<"crtr.attach.search.close"> | BindingDefinition<"crtr.graph.down"> | BindingDefinition<"crtr.graph.up"> | BindingDefinition<"crtr.graph.first"> | BindingDefinition<"crtr.graph.last"> | BindingDefinition<"crtr.graph.collapse-or-manager"> | BindingDefinition<"crtr.graph.expand-or-child"> | BindingDefinition<"crtr.graph.focus"> | BindingDefinition<"crtr.graph.revive"> | BindingDefinition<"crtr.graph.focus-manager"> | BindingDefinition<"crtr.graph.close-subtree"> | BindingDefinition<"crtr.graph.dismiss"> | BindingDefinition<"crtr.graph.confirm.accept"> | BindingDefinition<"crtr.graph.confirm.cancel"> | BindingDefinition<"crtr.inspector.force-quit"> | BindingDefinition<"crtr.inspector.down"> | BindingDefinition<"crtr.inspector.up"> | BindingDefinition<"crtr.inspector.section-next"> | BindingDefinition<"crtr.inspector.section-prev"> | BindingDefinition<"crtr.inspector.page-down"> | BindingDefinition<"crtr.inspector.page-up"> | BindingDefinition<"crtr.inspector.toggle-detail"> | BindingDefinition<"crtr.inspector.cancel-item"> | BindingDefinition<"crtr.inspector.open-log"> | BindingDefinition<"crtr.inspector.confirm"> | BindingDefinition<"crtr.inspector.dismiss"> | BindingDefinition<"crtr.inspector.retarget"> | BindingDefinition<"crtr.inspector.refresh"> | BindingDefinition<"crtr.inspector.quit"> | BindingDefinition<"crtr.browse.quit"> | BindingDefinition<"crtr.browse.down"> | BindingDefinition<"crtr.browse.up"> | BindingDefinition<"crtr.browse.first"> | BindingDefinition<"crtr.browse.last"> | BindingDefinition<"crtr.browse.expand-or-child"> | BindingDefinition<"crtr.browse.collapse-or-parent"> | BindingDefinition<"crtr.browse.toggle-fold"> | BindingDefinition<"crtr.browse.tab-next"> | BindingDefinition<"crtr.browse.tab-previous"> | BindingDefinition<"crtr.browse.tab.2" | "crtr.browse.tab.1" | "crtr.browse.tab.3" | "crtr.browse.tab.4" | "crtr.browse.tab.5"> | BindingDefinition<"crtr.browse.close-subtree"> | BindingDefinition<"crtr.browse.confirm-close"> | BindingDefinition<"crtr.browse.sort"> | BindingDefinition<"crtr.browse.scope"> | BindingDefinition<"crtr.browse.profile"> | BindingDefinition<"crtr.browse.residents"> | BindingDefinition<"crtr.browse.preview"> | BindingDefinition<"crtr.browse.search"> | BindingDefinition<"crtr.browse.revive-now"> | BindingDefinition<"crtr.browse.focus"> | BindingDefinition<"crtr.browse.focus-background"> | BindingDefinition<"crtr.browse.yank-id"> | BindingDefinition<"crtr.browse.search.cancel"> | BindingDefinition<"crtr.browse.search.commit"> | BindingDefinition<"crtr.browse.search.delete"> | BindingDefinition<"crtr.browse.search.quit"> | BindingDefinition<"crtr.profile.menu.up"> | BindingDefinition<"crtr.profile.menu.down"> | BindingDefinition<"crtr.profile.menu.select"> | BindingDefinition<"crtr.profile.menu.accept-default"> | BindingDefinition<"crtr.profile.menu.abort"> | BindingDefinition<"crtr.profile.menu.slot.2" | "crtr.profile.menu.slot.1" | "crtr.profile.menu.slot.3" | "crtr.profile.menu.slot.4" | "crtr.profile.menu.slot.5" | "crtr.profile.menu.slot.6" | "crtr.profile.menu.slot.7" | "crtr.profile.menu.slot.8" | "crtr.profile.menu.slot.9">)[], BindingDefinition<"crtr.profile.menu.create">, BindingDefinition<"crtr.profile.menu.search-existing">, BindingDefinition<"crtr.profile.menu.use-root">, BindingDefinition<"crtr.profile.menu.set-default">, BindingDefinition<"crtr.profile.menu.add-directory">, BindingDefinition<"crtr.profile.menu.unpin">, BindingDefinition<"crtr.profile.menu.manage">, BindingDefinition<"crtr.profile.search.up">, BindingDefinition<"crtr.profile.search.down">, BindingDefinition<"crtr.profile.search.pick">, BindingDefinition<"crtr.profile.search.back">, BindingDefinition<"crtr.profile.search.delete">, BindingDefinition<"crtr.profile.search.abort">, BindingDefinition<"crtr.setup.cancel">, BindingDefinition<"crtr.setup.tab-next">, BindingDefinition<"crtr.setup.tab-previous">, BindingDefinition<"crtr.setup.open">, BindingDefinition<"crtr.setup.list-down">, BindingDefinition<"crtr.setup.list-up">, BindingDefinition<"crtr.setup.toggle">, BindingDefinition<"crtr.setup.details">, BindingDefinition<"crtr.setup.advance">, BindingDefinition<"crtr.setup.confirm.accept">, BindingDefinition<"crtr.setup.confirm.back">, BindingDefinition<"crtr.setup.keybindings.edit">, BindingDefinition<"crtr.setup.keybindings.commit-edit">, BindingDefinition<"crtr.setup.keybindings.cancel-edit">, BindingDefinition<"crtr.setup.keybindings.unbind">, BindingDefinition<"crtr.setup.keybindings.reset-row">, BindingDefinition<"crtr.setup.keybindings.reset-all">, BindingDefinition<"crtr.setup.keybindings.save">, BindingDefinition<"crtr.setup.keybindings.discard">, BindingDefinition<"crtr.setup.keybindings.page-up">, BindingDefinition<"crtr.setup.keybindings.page-down">, BindingDefinition<"crtr.setup.keybindings.filter">, BindingDefinition<"crtr.setup.keybindings.filter-delete">, BindingDefinition<"crtr.setup.keybindings.filter-clear">, BindingDefinition<"crtr.setup.cell-previous">, BindingDefinition<"crtr.setup.cell-next">, BindingDefinition<"crtr.setup.models.open">, BindingDefinition<"crtr.setup.models.scope-next">, BindingDefinition<"crtr.setup.models.commit">, BindingDefinition<"crtr.setup.models.cancel">];
+export declare const BINDING_CATALOG: readonly [BindingDefinition<"crtr.tmux.menu.open">, BindingDefinition<"crtr.tmux.menu.attach">, ...(BindingDefinition<BindingId> | BindingDefinition<"crtr.tmux.node.next"> | BindingDefinition<"crtr.tmux.node.previous"> | BindingDefinition<"crtr.tmux.inbox.toggle"> | BindingDefinition<"crtr.attach.scroll.up"> | BindingDefinition<"crtr.attach.scroll.down"> | BindingDefinition<"crtr.attach.scroll.page-up"> | BindingDefinition<"crtr.attach.scroll.page-down"> | BindingDefinition<"crtr.attach.scroll.live"> | BindingDefinition<"crtr.attach.mouse.toggle"> | BindingDefinition<"crtr.attach.copy.message"> | BindingDefinition<"crtr.attach.search.next"> | BindingDefinition<"crtr.attach.search.previous"> | BindingDefinition<"crtr.attach.search.edit"> | BindingDefinition<"crtr.attach.search.close"> | BindingDefinition<"crtr.graph.down"> | BindingDefinition<"crtr.graph.up"> | BindingDefinition<"crtr.graph.first"> | BindingDefinition<"crtr.graph.last"> | BindingDefinition<"crtr.graph.collapse-or-manager"> | BindingDefinition<"crtr.graph.expand-or-child"> | BindingDefinition<"crtr.graph.focus"> | BindingDefinition<"crtr.graph.revive"> | BindingDefinition<"crtr.graph.focus-manager"> | BindingDefinition<"crtr.graph.close-subtree"> | BindingDefinition<"crtr.graph.dismiss"> | BindingDefinition<"crtr.graph.confirm.accept"> | BindingDefinition<"crtr.graph.confirm.cancel"> | BindingDefinition<"crtr.inspector.force-quit"> | BindingDefinition<"crtr.inspector.down"> | BindingDefinition<"crtr.inspector.up"> | BindingDefinition<"crtr.inspector.section-next"> | BindingDefinition<"crtr.inspector.section-prev"> | BindingDefinition<"crtr.inspector.page-down"> | BindingDefinition<"crtr.inspector.page-up"> | BindingDefinition<"crtr.inspector.toggle-detail"> | BindingDefinition<"crtr.inspector.cancel-item"> | BindingDefinition<"crtr.inspector.open-log"> | BindingDefinition<"crtr.inspector.confirm"> | BindingDefinition<"crtr.inspector.dismiss"> | BindingDefinition<"crtr.inspector.retarget"> | BindingDefinition<"crtr.inspector.refresh"> | BindingDefinition<"crtr.inspector.quit"> | BindingDefinition<"crtr.browse.quit"> | BindingDefinition<"crtr.browse.down"> | BindingDefinition<"crtr.browse.up"> | BindingDefinition<"crtr.browse.first"> | BindingDefinition<"crtr.browse.last"> | BindingDefinition<"crtr.browse.expand-or-child"> | BindingDefinition<"crtr.browse.collapse-or-parent"> | BindingDefinition<"crtr.browse.toggle-fold"> | BindingDefinition<"crtr.browse.tab-next"> | BindingDefinition<"crtr.browse.tab-previous"> | BindingDefinition<"crtr.browse.tab.2" | "crtr.browse.tab.1" | "crtr.browse.tab.3" | "crtr.browse.tab.4" | "crtr.browse.tab.5"> | BindingDefinition<"crtr.browse.close-subtree"> | BindingDefinition<"crtr.browse.confirm-close"> | BindingDefinition<"crtr.browse.sort"> | BindingDefinition<"crtr.browse.scope"> | BindingDefinition<"crtr.browse.profile"> | BindingDefinition<"crtr.browse.residents"> | BindingDefinition<"crtr.browse.preview"> | BindingDefinition<"crtr.browse.pin"> | BindingDefinition<"crtr.browse.search"> | BindingDefinition<"crtr.browse.revive-now"> | BindingDefinition<"crtr.browse.focus"> | BindingDefinition<"crtr.browse.focus-background"> | BindingDefinition<"crtr.browse.yank-id"> | BindingDefinition<"crtr.browse.search.cancel"> | BindingDefinition<"crtr.browse.search.commit"> | BindingDefinition<"crtr.browse.search.delete"> | BindingDefinition<"crtr.browse.search.quit"> | BindingDefinition<"crtr.profile.menu.up"> | BindingDefinition<"crtr.profile.menu.down"> | BindingDefinition<"crtr.profile.menu.select"> | BindingDefinition<"crtr.profile.menu.accept-default"> | BindingDefinition<"crtr.profile.menu.abort"> | BindingDefinition<"crtr.profile.menu.slot.2" | "crtr.profile.menu.slot.1" | "crtr.profile.menu.slot.3" | "crtr.profile.menu.slot.4" | "crtr.profile.menu.slot.5" | "crtr.profile.menu.slot.6" | "crtr.profile.menu.slot.7" | "crtr.profile.menu.slot.8" | "crtr.profile.menu.slot.9">)[], BindingDefinition<"crtr.profile.menu.create">, BindingDefinition<"crtr.profile.menu.search-existing">, BindingDefinition<"crtr.profile.menu.use-root">, BindingDefinition<"crtr.profile.menu.set-default">, BindingDefinition<"crtr.profile.menu.add-directory">, BindingDefinition<"crtr.profile.menu.unpin">, BindingDefinition<"crtr.profile.menu.manage">, BindingDefinition<"crtr.profile.search.up">, BindingDefinition<"crtr.profile.search.down">, BindingDefinition<"crtr.profile.search.pick">, BindingDefinition<"crtr.profile.search.back">, BindingDefinition<"crtr.profile.search.delete">, BindingDefinition<"crtr.profile.search.abort">, BindingDefinition<"crtr.setup.cancel">, BindingDefinition<"crtr.setup.tab-next">, BindingDefinition<"crtr.setup.tab-previous">, BindingDefinition<"crtr.setup.open">, BindingDefinition<"crtr.setup.list-down">, BindingDefinition<"crtr.setup.list-up">, BindingDefinition<"crtr.setup.toggle">, BindingDefinition<"crtr.setup.details">, BindingDefinition<"crtr.setup.advance">, BindingDefinition<"crtr.setup.confirm.accept">, BindingDefinition<"crtr.setup.confirm.back">, BindingDefinition<"crtr.setup.keybindings.edit">, BindingDefinition<"crtr.setup.keybindings.commit-edit">, BindingDefinition<"crtr.setup.keybindings.cancel-edit">, BindingDefinition<"crtr.setup.keybindings.unbind">, BindingDefinition<"crtr.setup.keybindings.reset-row">, BindingDefinition<"crtr.setup.keybindings.reset-all">, BindingDefinition<"crtr.setup.keybindings.save">, BindingDefinition<"crtr.setup.keybindings.discard">, BindingDefinition<"crtr.setup.keybindings.page-up">, BindingDefinition<"crtr.setup.keybindings.page-down">, BindingDefinition<"crtr.setup.keybindings.filter">, BindingDefinition<"crtr.setup.keybindings.filter-delete">, BindingDefinition<"crtr.setup.keybindings.filter-clear">, BindingDefinition<"crtr.setup.cell-previous">, BindingDefinition<"crtr.setup.cell-next">, BindingDefinition<"crtr.setup.models.open">, BindingDefinition<"crtr.setup.models.scope-next">, BindingDefinition<"crtr.setup.models.commit">, BindingDefinition<"crtr.setup.models.cancel">];
 export declare const BINDING_IDS: ReadonlySet<string>;
 /** True for an action whose direct gesture is handled inside an attach viewer.
  *  Tmux menu selectors and root shortcuts are chrome, not pane input. */

package/dist/core/keybindings/catalog.js

@@ -72,7 +72,7 @@ export const BINDING_CATALOG = Object.freeze([
     b('crtr.tmux.node.previous', 'Global tmux', 'Previous node', 'Focus the previous canvas node.', ['alt+['], 'host-global', ['tmux.root']),
     b('crtr.tmux.inbox.toggle', 'Global tmux', 'Toggle inbox', 'Open or close the human inbox in the focused viewer.', ['alt+i'], 'host-global', ['tmux.root']),
     ...attachEntry('crtr.tmux.menu.attach.detach', 'crtr.attach.detach', 'Detach', 'Detach from the node.', ['d'], ['ctrl+d']),
-    ...attachEntry('crtr.tmux.menu.attach.clear-or-detach', 'crtr.attach.clear-or-detach', 'Clear input (detach if empty)', 'Clear input or detach when input is empty.', ['c'], ['ctrl+c']),
+    ...attachEntry('crtr.tmux.menu.attach.clear-or-detach', 'crtr.attach.clear-or-detach', 'Clear input (cancel agent on repeat)', 'Clear the input; press again within a second to cancel the running agent turn. Detach lives on its own binding.', ['c'], ['ctrl+c']),
     ...attachEntry('crtr.tmux.menu.attach.graph.toggle', 'crtr.attach.graph.toggle', 'Toggle graph', 'Open or close the graph overlay.', ['g'], ['alt+g']),
     ...attachEntry('crtr.tmux.menu.attach.help.toggle', 'crtr.attach.help.toggle', 'Help', 'Open the attach help overlay.', ['?'], ['alt+shift+k']),
     ...attachEntry('crtr.tmux.menu.attach.inbox.toggle', 'crtr.attach.inbox.toggle', 'Toggle inbox', 'Open or close the human inbox surface in this viewer.', ['i'], []),
@@ -147,7 +147,8 @@ function browseBindings() {
         b('crtr.browse.scope', 'Browse and pickers', 'Change scope', 'Toggle the browse cwd scope.', ['c'], 'terminal', [nav]),
         b('crtr.browse.profile', 'Browse and pickers', 'Toggle profile', 'Toggle the browse profile scope.', ['shift+p'], 'terminal', [nav]),
         b('crtr.browse.residents', 'Browse and pickers', 'Toggle residents', 'Toggle resident display.', ['r'], 'terminal', [nav]),
-        b('crtr.browse.preview', 'Browse and pickers', 'Toggle preview', 'Toggle the preview panel.', ['p'], 'terminal', [nav]),
+        b('crtr.browse.preview', 'Browse and pickers', 'Toggle preview', 'Toggle the preview panel.', ['v'], 'terminal', [nav]),
+        b('crtr.browse.pin', 'Browse and pickers', 'Pin node', 'Star or unstar the selected node.', ['p'], 'terminal', [nav]),
         b('crtr.browse.search', 'Browse and pickers', 'Search', 'Open browse search.', ['/'], 'terminal', [nav]),
         b('crtr.browse.revive-now', 'Browse and pickers', 'Revive now', 'Revive the selected node now.', ['shift+k'], 'terminal', [nav]),
         b('crtr.browse.focus', 'Browse and pickers', 'Focus node', 'Focus the selected node.', ['enter', 'o'], 'terminal', [nav]),
@@ -190,13 +191,13 @@ function setupBindings() {
         b('crtr.setup.tab-next', 'Setup', 'Next tab', 'Select the next setup tab.', ['tab', 'right'], 'terminal', SETUP_TAB_CONTEXTS),
         b('crtr.setup.tab-previous', 'Setup', 'Previous tab', 'Select the previous setup tab.', ['shift+tab', 'left'], 'terminal', SETUP_TAB_CONTEXTS),
         b('crtr.setup.open', 'Setup', 'Open', 'Open the selected setup item.', ['enter'], 'terminal', ['setup.login']),
-        b('crtr.setup.list-down', 'Setup', 'Move down', 'Move to the next setup item.', ['j', 'down'], 'terminal', ['setup.list', 'setup.models', 'setup.models.dimension-picker']),
-        b('crtr.setup.list-up', 'Setup', 'Move up', 'Move to the previous setup item.', ['k', 'up'], 'terminal', ['setup.list', 'setup.models', 'setup.models.dimension-picker']),
+        b('crtr.setup.list-down', 'Setup', 'Move down', 'Move to the next setup item.', ['j', 'down'], 'terminal', ['setup.list', 'setup.models', 'setup.models.dimension-picker', 'setup.models.route-form']),
+        b('crtr.setup.list-up', 'Setup', 'Move up', 'Move to the previous setup item.', ['k', 'up'], 'terminal', ['setup.list', 'setup.models', 'setup.models.dimension-picker', 'setup.models.route-form']),
         b('crtr.setup.toggle', 'Setup', 'Toggle', 'Toggle the selected setup item.', ['space'], 'terminal', ['setup.list', 'setup.keybindings']),
         b('crtr.setup.details', 'Setup', 'Show details', 'Show details for the selected item.', ['?'], 'terminal', ['setup.list']),
         b('crtr.setup.advance', 'Setup', 'Advance', 'Advance the setup flow.', ['enter'], 'terminal', ['setup.list']),
-        b('crtr.setup.confirm.accept', 'Setup', 'Confirm', 'Accept the setup confirmation.', ['y', 'enter'], 'terminal', ['setup.confirm']),
-        b('crtr.setup.confirm.back', 'Setup', 'Go back', 'Cancel the setup confirmation.', ['n', 'escape', 'q'], 'terminal', ['setup.confirm'], 'dismiss-modal'),
+        b('crtr.setup.confirm.accept', 'Setup', 'Confirm', 'Accept the setup confirmation.', ['y', 'enter'], 'terminal', ['setup.confirm', 'setup.models.confirm']),
+        b('crtr.setup.confirm.back', 'Setup', 'Go back', 'Cancel the setup confirmation.', ['n', 'escape', 'q'], 'terminal', ['setup.confirm', 'setup.models.confirm'], 'dismiss-modal'),
         b('crtr.setup.keybindings.edit', 'Setup', 'Edit binding', 'Edit the selected binding.', ['enter'], 'terminal', ['setup.keybindings']),
         b('crtr.setup.keybindings.commit-edit', 'Setup', 'Commit edit', 'Commit the active binding edit.', ['enter'], 'terminal', ['setup.keybindings.edit']),
         b('crtr.setup.keybindings.cancel-edit', 'Setup', 'Cancel edit', 'Cancel the active binding edit.', ['escape'], 'terminal', ['setup.keybindings.edit'], 'dismiss-modal'),
@@ -212,10 +213,10 @@ function setupBindings() {
         b('crtr.setup.keybindings.filter-clear', 'Setup', 'Clear filter', 'Clear the keybinding filter.', ['escape'], 'terminal', ['setup.keybindings.filter'], 'dismiss-modal'),
         b('crtr.setup.cell-previous', 'Setup', 'Previous field', 'Select the previous field or setup table cell.', ['h'], 'terminal', ['setup.models', 'setup.keybindings']),
         b('crtr.setup.cell-next', 'Setup', 'Next field', 'Select the next field or setup table cell.', ['l'], 'terminal', ['setup.models', 'setup.keybindings']),
-        b('crtr.setup.models.open', 'Setup', 'Edit model', 'Edit the selected model cell.', ['enter'], 'terminal', ['setup.models']),
+        b('crtr.setup.models.open', 'Setup', 'Edit model', 'Edit the selected model cell or route field.', ['enter'], 'terminal', ['setup.models', 'setup.models.route-form']),
         b('crtr.setup.models.scope-next', 'Setup', 'Next model config scope', 'Edit the next applicable user, profile, or project config.', ['s'], 'terminal', ['setup.models']),
         b('crtr.setup.models.commit', 'Setup', 'Commit pick', 'Commit the provider, strength, model, or thinking-level pick.', ['enter'], 'terminal', ['setup.models.picker', 'setup.models.dimension-picker']),
-        b('crtr.setup.models.cancel', 'Setup', 'Cancel pick', 'Cancel the provider, strength, model, or thinking-level picker.', ['escape'], 'terminal', ['setup.models.picker', 'setup.models.dimension-picker'], 'dismiss-modal'),
+        b('crtr.setup.models.cancel', 'Setup', 'Cancel pick', 'Cancel the model picker or route form.', ['escape'], 'terminal', ['setup.models.picker', 'setup.models.dimension-picker', 'setup.models.route-form'], 'dismiss-modal'),
     ];
 }
 export const BINDING_IDS = new Set(BINDING_CATALOG.map((definition) => definition.id));
@@ -246,4 +247,6 @@ export const SAFETY_REQUIREMENTS = Object.freeze([
     { context: 'setup.models', capability: 'leave-screen' },
     { context: 'setup.models.picker', capability: 'dismiss-modal' },
     { context: 'setup.models.dimension-picker', capability: 'dismiss-modal' },
+    { context: 'setup.models.route-form', capability: 'dismiss-modal' },
+    { context: 'setup.models.confirm', capability: 'dismiss-modal' },
 ]);

package/dist/core/model-routes.js

@@ -19,6 +19,8 @@ function parseSpec(spec) {
 function synthesizeRoutes(ladders) {
     const route = (family) => {
         const providerId = ladders[family].strong.slice(0, ladders[family].strong.indexOf('/'));
+        // `credentialSource` orders routes. Auth and subscription-pool lookup are
+        // provider-wide, keyed by providerId, so this does not select credentials.
         return { family, credentialSource: 'default', providerId, models: ladders[family] };
     };
     return { anthropic: route('anthropic'), openai: route('openai') };
@@ -32,7 +34,10 @@ function strengths(requested, configured) {
 /** Expand config-derived route order only. Availability never affects rank. */
 export function expandModelCandidates(request, cwd, profileId) {
     const cfg = readMergedLaunchConfig(cwd, profileId ?? null);
-    const routes = cfg.modelRoutes && Object.keys(cfg.modelRoutes).length > 0 ? cfg.modelRoutes : synthesizeRoutes(cfg.modelLadders);
+    // Complete routes are the effective contract. Sparse entries written by an
+    // older crouter release remain readable for one cutover release only.
+    const declaredRoutes = { ...(cfg.modelRoutes ?? {}), ...(cfg.legacyModelRoutes ?? {}) };
+    const routes = Object.keys(declaredRoutes).length > 0 ? declaredRoutes : synthesizeRoutes(cfg.modelLadders);
     const routeEntries = Object.entries(routes);
     const fallback = cfg.modelRouting?.strengthFallback ?? [readRotationConfig().defaultFallbackStrength ?? 'strong'];
     const declarationFamilies = routeEntries.map(([, route]) => route.family).filter((value, index, all) => all.indexOf(value) === index);
@@ -79,7 +84,9 @@ export function expandModelCandidates(request, cwd, profileId) {
             return;
         if (concrete && parsed.modelId !== concrete.modelId)
             return;
-        const key = `${parsed.providerId}/${parsed.modelId}:${parsed.thinkingLevel ?? ''}`;
+        // Route identity is meaningful: two panel-managed routes can intentionally
+        // share a provider/model while carrying distinct credential-source order.
+        const key = JSON.stringify([routeId, parsed.providerId, parsed.modelId, parsed.thinkingLevel]);
         if (seen.has(key))
             return;
         seen.add(key);
@@ -91,7 +98,7 @@ export function expandModelCandidates(request, cwd, profileId) {
     if (concrete) {
         const [routeId, route] = concreteRoute ?? [
             'concrete',
-            { family: requestedFamily, credentialSource: 'default', providerId: concrete.providerId, models: { [requestedStrength]: request.spec } },
+            { family: requestedFamily, credentialSource: 'default' },
         ];
         append(routeId, route, requestedStrength, request.spec);
     }
@@ -182,7 +189,7 @@ export function modelRequestFromConfig(model, modelIntent, exact) {
     if (exact)
         return { kind: 'exact', spec: model };
     if (modelIntent) {
-        const slash = modelIntent.indexOf('/');
+        const slash = modelIntent.lastIndexOf('/');
         const strength = slash > 0 ? modelIntent.slice(slash + 1) : '';
         if (STRENGTHS.includes(strength))
             return { kind: 'logical', family: modelIntent.slice(0, slash), strength: strength, spec: model };

package/dist/core/runtime/broker/auth-reload.js

@@ -3,6 +3,7 @@ import { envModelIntent } from '../../../shared/env.js';
 import { emitEvent } from '../../events/emit.js';
 import { clearFault, readFault } from '../fault.js';
 import { isUnknownModel } from '../model-selection.js';
+import { announceMessageOrigin } from '../stamp/channel.js';
 export function createAuthReloadGate(deps) {
     const { nodeId, cfg, replies, rebind, session, services, broadcastModelChanged, formatModelSpec, resolveLaunchModel, driveKickoff, turnAdmission, } = deps;
     let reloadInFlight = null;
@@ -118,7 +119,9 @@ export function createAuthReloadGate(deps) {
                         return Promise.resolve();
                     }
                     clearFault(nodeId, { link: 'pi→provider' });
-                    return faultSession.prompt(formatCard('recovery', {}, AUTH_FAULT_RECOVERY_BODY), { preflightResult: release });
+                    const card = formatCard('recovery', {}, AUTH_FAULT_RECOVERY_BODY);
+                    announceMessageOrigin(card, { type: 'runtime', kind: 'recovery' });
+                    return faultSession.prompt(card, { preflightResult: release });
                 });
             }
             catch (err) {

package/dist/core/runtime/broker/fault-retry.js

@@ -12,6 +12,7 @@ import { markFatalOnExhaust, nextFaultRetry, policyFor } from '../fault-recovery
 import { parseModelSpec } from '../model-selection.js';
 import { endedByAbort } from '../session-cycles.js';
 import { resolveProviderCandidates } from '../../subscription-state.js';
+import { announceMessageOrigin } from '../stamp/channel.js';
 const MAX_TIMEOUT_MS = 2_147_483_647;
 /** Owns provider fallback and daemon-driven fault retry state for one broker session. */
 export class FaultRetry {
@@ -266,7 +267,9 @@ export class FaultRetry {
                 return;
             if (unconfigured)
                 clearFault(this.deps.nodeId, { link: 'pi→provider' });
-            await this.deps.turnAdmission.admit((release) => operationIdContext.fresh(() => candidateSession.prompt(formatCard('recovery', {}, formatModelFallbackRecovery(currentSpec, resolved, unconfigured ? 'credential' : 'not-found')), { preflightResult: release })));
+            const fallbackCard = formatCard('recovery', {}, formatModelFallbackRecovery(currentSpec, resolved, unconfigured ? 'credential' : 'not-found'));
+            announceMessageOrigin(fallbackCard, { type: 'runtime', kind: 'recovery' });
+            await this.deps.turnAdmission.admit((release) => operationIdContext.fresh(() => candidateSession.prompt(fallbackCard, { preflightResult: release })));
         })().catch((err) => {
             emitEvent({ level: 'debug', event: 'broker.runtime.diagnostic', fields: { message: `${unconfigured ? 'unconfigured-provider' : 'not_found'} fallback failed: ${err instanceof Error ? err.message : String(err)}` } });
         }).finally(() => {
@@ -405,7 +408,9 @@ export class FaultRetry {
                 return Promise.resolve();
             }
             recordFault(this.deps.nodeId, plan.fault);
-            return operationIdContext.fresh(() => candidateSession.prompt(formatCard('recovery', {}, fault.kind === 'connection' ? CONNECTION_FAULT_RECOVERY_BODY : PROVIDER_FAULT_RECOVERY_BODY), { preflightResult: release }));
+            const retryCard = formatCard('recovery', {}, fault.kind === 'connection' ? CONNECTION_FAULT_RECOVERY_BODY : PROVIDER_FAULT_RECOVERY_BODY);
+            announceMessageOrigin(retryCard, { type: 'runtime', kind: 'recovery' });
+            return operationIdContext.fresh(() => candidateSession.prompt(retryCard, { preflightResult: release }));
         });
     }
 }

package/dist/core/runtime/broker/frame-client.js

@@ -1,6 +1,7 @@
 import { SITUATIONAL_CONTEXT_CUSTOM_TYPE } from '../../../shared/generated-context.js';
 import { emitEvent } from '../../events/emit.js';
 import { normalizeSnapshotTail } from '../broker-protocol.js';
+import { announceMessageOrigin } from '../stamp/channel.js';
 export function createClientHandlers(deps) {
     const { registry, replies, session, driveEngine, turnAcceptance, pendingDialogs, sendWelcome, replayExtraPendingDialogsTo, disposeAndExit, } = deps;
     const { notWritable, ackTo } = replies;
@@ -82,6 +83,9 @@ export function createClientHandlers(deps) {
             };
             if (via === 'prompt')
                 turnAcceptance.waitFor(ackAccepted);
+            // The daemon knows who authored this body; the stamp writer lives here.
+            if (frame.origin !== undefined)
+                announceMessageOrigin(frame.text, frame.origin);
             const outcome = driveEngine(client, {
                 type: 'prompt',
                 text: frame.text,

package/dist/core/runtime/broker/frame-dispatch.js

@@ -1,5 +1,6 @@
 import { createFrameReplies } from './frame-replies.js';
 import { createEngineDriver } from './engine-drive.js';
+import { announceMessageOrigin } from '../stamp/channel.js';
 import { createClientHandlers } from './frame-client.js';
 import { createMemoryRefGuidance } from './frame-memory-refs.js';
 import { createAuthReloadGate } from './auth-reload.js';
@@ -51,6 +52,12 @@ export function createFrameDispatchContext(deps) {
     const handleDriveFrame = (client, frame) => {
         if (notWritable(client, 'drive the engine'))
             return;
+        // These frames are the viewer's input vocabulary — a person typed them.
+        // (crtrd's `deliver` never lands here: frame-client synthesizes its own
+        // prompt frame and calls driveEngine directly, announcing its own origin.)
+        if (frame.type === 'prompt' || frame.type === 'steer' || frame.type === 'follow_up') {
+            announceMessageOrigin(frame.text, { type: 'human', channel: { type: 'viewer' } });
+        }
         driveEngine(client, frame);
     };
     const clientHandlers = createClientHandlers({

package/dist/core/runtime/broker/inbox.d.ts

@@ -27,7 +27,9 @@ export declare function readBrokerCanceledEntryIds(nodeId: string): Set<BrokerIn
 export declare function reportRefNodeId(ref: string | undefined): string | undefined;
 /** One-shot runtime cards an entry carries (rendered envelopes written by the
  *  message API). They ride the delivery their own entry belongs to, so a note
- *  can never land ahead of an unrelated person's message. */
+ *  can never land ahead of an unrelated person's message — except in the one
+ *  deliberate fold below, where deferred entries join a person's delivery as
+ *  the context their turn reads. */
 export declare function entryCards(entry: BrokerInboxEntry): readonly string[];
 /** One deliverable user message: either a person's verbatim words or the whole
  *  `<runtime kind="inbox">` envelope. Never both — a reader parses an envelope
@@ -40,5 +42,13 @@ export interface InboxDelivery {
     entries: readonly BrokerInboxEntry[];
 }
 /** Split unread entries into ordered deliveries: each human entry verbatim, and
- *  every node/system entry in one card landing where the first such sender fell. */
+ *  each CONTIGUOUS run of node/system entries as one card in the physical slot
+ *  that run occupies. A deferred-only card is folded into the person's delivery
+ *  waiting immediately behind it rather than being deliverable on its own.
+ *
+ *  The runs are what keep the cursor honest. Exactly one delivery goes out per
+ *  cycle and the rest requeue, while a sent delivery commits the cursor across
+ *  its own entries — so a delivery that spanned a person's message would commit
+ *  past words this cycle never sent. A run can never span one, and node mail
+ *  that arrived after a person's message now waits behind it. */
 export declare function coalesceBrokerInbox(entries: readonly BrokerInboxEntry[], reportNodes: ReadonlyMap<string, BrokerReportNodeDTO>): readonly InboxDelivery[];