@namzu/cli 2.6.1 → 4.0.0

package/dist/integrations/providers/preferences.js

@@ -1,33 +1,88 @@
 /**
- * `~/.namzu/preferences.json` — the user's primary-chat picker selection.
+ * `~/.namzu/preferences.json` — the operator's provider chain.
  *
- * Schema (current = v2):
+ * Schema (current = v3):
  *   {
- *     "version": 2,
- *     "provider": "anthropic",            // ProviderId
- *     "model": "claude-opus-4-7",         // optional model override
+ *     "version": 3,
+ *     "providers": [                      // ordered; index 0 is the primary
+ *       { "id": "anthropic", "model": "claude-opus-4-7" },
+ *       { "id": "openai" }                // model omitted → the registry default
+ *     ],
  *     "subagents": { "active": [...] }    // instances reserved for subagent dispatch
  *   }
  *
- * The previous schema (v1) stored a peer instance as the
- * default — a different primitive (subagent dispatch, not primary
- * chat). On-disk v1 files trigger a forced re-pick rather than an
- * auto-migration: mapping between the two semantics would surprise
- * more than help.
+ * The chain is an ORDER the operator declares, replacing the single provider v2
+ * held. It is deliberately a plain readable array in a file the operator owns:
+ * the order has to be legible and editable without launching the TUI, which a
+ * value only reachable through an interactive picker is not.
+ *
+ * **Only `providers[0]` runs today.** The rest are validated and reported (see
+ * `readPreferences` and the `providers.chain` doctor check) but nothing falls
+ * over to them yet. That is the point of shipping this first: a chain you can
+ * declare, read back, and have checked is useful before failover exists, and it
+ * is what failover will consume.
+ *
+ * ## Versions
+ *
+ * v1 stored a peer instance as the default — a different primitive (subagent
+ * dispatch, not primary chat). It is still REFUSED rather than migrated, because
+ * mapping between the two semantics would surprise more than help.
+ *
+ * v2 stored a single `provider` + optional `model`. It IS migrated, on read, in
+ * memory: one provider is a one-element chain, which is unambiguous, and the
+ * distinction from v1 is exactly that. Migration does not rewrite the file — a
+ * reader with a write side effect would rewrite `$HOME` on a `--help`. The next
+ * `writePreferences` lands v3.
+ *
+ * Note the consequence: a v3 file read by an older namzu reports `needs-repick`
+ * rather than silently losing the tail, which is the safe direction.
  */
 import { randomBytes } from 'node:crypto';
 import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
+import { PROVIDER_REGISTRY } from './registry.js';
 const FILE_MODE = 0o600;
 const DIR_MODE = 0o700;
-export const PREFERENCES_FILE_VERSION = 2;
+export const PREFERENCES_FILE_VERSION = 3;
+/**
+ * How a member is named to the operator, by position.
+ *
+ * One function because three surfaces say it — validation, the doctor listing
+ * and the capability refusal — and a chain member called `fallback #1` in one
+ * message and `fallback 1` in the next reads as two different things.
+ */
+export function chainPositionName(index) {
+    return index === 0 ? 'primary provider' : `fallback #${index}`;
+}
 export class PreferencesError extends Error {
     constructor(message) {
         super(message);
         this.name = 'PreferencesError';
     }
 }
+/**
+ * The member that actually runs.
+ *
+ * A helper rather than `prefs.providers[0]` at each call site: the chain is
+ * guaranteed non-empty by validation, and every reader repeating an index
+ * lookup plus a non-null assertion would be four places to get that wrong.
+ */
+export function primaryProvider(prefs) {
+    // Optional-chained rather than indexed: a caller handing over an object of
+    // the old shape is a real case (a stale test fixture did exactly that), and
+    // a `TypeError: cannot read '0' of undefined` names neither the field nor
+    // the fix, while the error below names both.
+    const first = prefs.providers?.[0];
+    if (!first) {
+        // Unreachable through readPreferences/writePreferences, both of which
+        // refuse an empty chain. Reachable only from a hand-built object, and
+        // silently returning a placeholder there would put the caller on a
+        // provider nobody chose.
+        throw new PreferencesError('preferences.providers is empty — no provider to run');
+    }
+    return first;
+}
 export function preferencesPath(home = homedir()) {
     return join(home, '.namzu', 'preferences.json');
 }
@@ -59,6 +114,16 @@ export function readPreferences(home = homedir()) {
             reason: 'preferences file uses an older schema (v1) — namzu now picks an LLM provider client directly. Please re-pick.',
         };
     }
+    if (v.version === 2) {
+        const migrated = migrateV2(parsed);
+        if (!migrated) {
+            throw new PreferencesError(`${path} has an unexpected shape for a v2 file`);
+        }
+        const invalid = describeInvalidChain(migrated.providers);
+        if (invalid)
+            return { status: 'needs-repick', reason: `${invalid} — please re-pick.` };
+        return { status: 'ok', prefs: migrated };
+    }
     if (v.version !== PREFERENCES_FILE_VERSION) {
         return {
             status: 'needs-repick',
@@ -68,15 +133,27 @@ export function readPreferences(home = homedir()) {
     if (!isPreferences(parsed)) {
         throw new PreferencesError(`${path} has an unexpected shape`);
     }
+    // Shape is right; the CONTENT may still name a provider that does not exist
+    // or repeat a member. Reported as `needs-repick` with the offending member
+    // named, not thrown: a bad chain is something the operator can fix by
+    // picking again, and it is the tail this is really for — an unusable
+    // fallback that only surfaces the day the primary goes down is the failure
+    // this check exists to prevent.
+    const invalid = describeInvalidChain(parsed.providers);
+    if (invalid)
+        return { status: 'needs-repick', reason: `${invalid} — please re-pick.` };
     return { status: 'ok', prefs: parsed };
 }
 export function writePreferences(prefs, home = homedir()) {
     if (prefs.version !== PREFERENCES_FILE_VERSION) {
         throw new PreferencesError(`unsupported preferences version: ${String(prefs.version)} (expected ${PREFERENCES_FILE_VERSION})`);
     }
-    if (typeof prefs.provider !== 'string' || prefs.provider.length === 0) {
-        throw new PreferencesError('preferences.provider is required');
+    if (!Array.isArray(prefs.providers) || prefs.providers.length === 0) {
+        throw new PreferencesError('preferences.providers must list at least one provider');
     }
+    const invalid = describeInvalidChain(prefs.providers);
+    if (invalid)
+        throw new PreferencesError(invalid);
     const path = preferencesPath(home);
     mkdirSync(dirname(path), { recursive: true, mode: DIR_MODE });
     const body = `${JSON.stringify(prefs, null, 2)}\n`;
@@ -85,27 +162,105 @@ export function writePreferences(prefs, home = homedir()) {
     chmodSync(tmp, FILE_MODE);
     renameSync(tmp, path);
 }
+/**
+ * A v2 file as a one-element chain, or null if it was not a well-formed v2.
+ *
+ * `model` is carried only when present, so a v2 file that never pinned a model
+ * does not gain one.
+ */
+function migrateV2(value) {
+    const v = value;
+    if (typeof v.provider !== 'string' || v.provider.length === 0)
+        return null;
+    if (v.model !== undefined && typeof v.model !== 'string')
+        return null;
+    if (!isSubagents(v.subagents))
+        return null;
+    const member = {
+        id: v.provider,
+        ...(typeof v.model === 'string' ? { model: v.model } : {}),
+    };
+    return {
+        version: PREFERENCES_FILE_VERSION,
+        providers: [member],
+        ...(v.subagents !== undefined
+            ? { subagents: v.subagents }
+            : {}),
+    };
+}
+/**
+ * Why this chain is unusable, or null if it is fine.
+ *
+ * Every member is checked, not only the head. A chain exists to be fallen back
+ * to, so a tail member naming a provider that does not exist is precisely as
+ * broken as a bad head — it is just broken later, on the worst day.
+ */
+function describeInvalidChain(members) {
+    if (members.length === 0) {
+        return 'preferences lists no providers';
+    }
+    const seen = new Set();
+    for (const [index, member] of members.entries()) {
+        const position = chainPositionName(index);
+        if (!(member.id in PROVIDER_REGISTRY)) {
+            return `${position} "${member.id}" is not a provider namzu knows (known: ${Object.keys(PROVIDER_REGISTRY).join(', ')})`;
+        }
+        // Compared as the pair the operator WROTE, not against the resolved
+        // default model. Resolving would make a file that was valid yesterday
+        // invalid the day a registry default changes, which is a config that
+        // breaks on upgrade. Two entries for one provider with different models
+        // stay legitimate: falling back from a large model to a small one on the
+        // same provider is a real chain.
+        const key = JSON.stringify([member.id, member.model ?? null]);
+        if (seen.has(key)) {
+            const shown = member.model ? `${member.id} (${member.model})` : member.id;
+            return `${position} repeats "${shown}", which is already earlier in the chain — a provider cannot be its own fallback`;
+        }
+        seen.add(key);
+    }
+    return null;
+}
+function isSubagents(value) {
+    if (value === undefined)
+        return true;
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const sa = value;
+    if (!Array.isArray(sa.active))
+        return false;
+    for (const item of sa.active) {
+        if (typeof item !== 'string')
+            return false;
+    }
+    return true;
+}
+function isProviderChoice(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const v = value;
+    if (typeof v.id !== 'string' || v.id.length === 0)
+        return false;
+    if (v.model !== undefined && typeof v.model !== 'string')
+        return false;
+    return true;
+}
 function isPreferences(value) {
     if (typeof value !== 'object' || value === null)
         return false;
     const v = value;
     if (v.version !== PREFERENCES_FILE_VERSION)
         return false;
-    if (typeof v.provider !== 'string' || v.provider.length === 0)
+    if (!Array.isArray(v.providers))
         return false;
-    if (v.model !== undefined && typeof v.model !== 'string')
-        return false;
-    if (v.subagents !== undefined) {
-        if (typeof v.subagents !== 'object' || v.subagents === null)
-            return false;
-        const sa = v.subagents;
-        if (!Array.isArray(sa.active))
+    for (const member of v.providers) {
+        if (!isProviderChoice(member))
             return false;
-        for (const item of sa.active) {
-            if (typeof item !== 'string')
-                return false;
-        }
     }
+    if (v.allowCapabilityMismatch !== undefined && typeof v.allowCapabilityMismatch !== 'boolean') {
+        return false;
+    }
+    if (!isSubagents(v.subagents))
+        return false;
     return true;
 }
 //# sourceMappingURL=preferences.js.map

package/dist/integrations/providers/preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../src/integrations/providers/preferences.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../src/integrations/providers/preferences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,iBAAiB,EAAmB,MAAM,eAAe,CAAA;AAElE,MAAM,SAAS,GAAG,KAAK,CAAA;AACvB,MAAM,QAAQ,GAAG,KAAK,CAAA;AACtB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAU,CAAA;AAyClD;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC9C,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,KAAK,EAAE,CAAA;AAC/D,CAAC;AAOD,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAC1C,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAA;IAC/B,CAAC;CACD;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,KAAkB;IACjD,2EAA2E;IAC3E,4EAA4E;IAC5E,0EAA0E;IAC1E,6CAA6C;IAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;IAClC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,sEAAsE;QACtE,sEAAsE;QACtE,mEAAmE;QACnE,yBAAyB;QACzB,MAAM,IAAI,gBAAgB,CAAC,qDAAqD,CAAC,CAAA;IAClF,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,OAAO,EAAE;IACvD,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,OAAO,EAAE;IACvD,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,IAAI,GAAW,CAAA;IACf,IAAI,CAAC;QACJ,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;QAClF,MAAM,IAAI,gBAAgB,CACzB,kBAAkB,IAAI,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC7E,CAAA;IACF,CAAC;IACD,IAAI,MAAe,CAAA;IACnB,IAAI,CAAC;QACJ,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,gBAAgB,CACzB,GAAG,IAAI,uBAAuB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAChF,CAAA;IACF,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACnD,MAAM,IAAI,gBAAgB,CAAC,GAAG,IAAI,8BAA8B,CAAC,CAAA;IAClE,CAAC;IACD,MAAM,CAAC,GAAG,MAA+B,CAAA;IACzC,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO;YACN,MAAM,EAAE,cAAc;YACtB,MAAM,EACL,+GAA+G;SAChH,CAAA;IACF,CAAC;IACD,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,GAAG,IAAI,wCAAwC,CAAC,CAAA;QAC5E,CAAC;QACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACxD,IAAI,OAAO;YAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,oBAAoB,EAAE,CAAA;QACtF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;IACzC,CAAC;IACD,IAAI,CAAC,CAAC,OAAO,KAAK,wBAAwB,EAAE,CAAC;QAC5C,OAAO;YACN,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,2CAA2C,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB;SACxF,CAAA;IACF,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,gBAAgB,CAAC,GAAG,IAAI,0BAA0B,CAAC,CAAA;IAC9D,CAAC;IACD,4EAA4E;IAC5E,2EAA2E;IAC3E,sEAAsE;IACtE,qEAAqE;IACrE,2EAA2E;IAC3E,gCAAgC;IAChC,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACtD,IAAI,OAAO;QAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,oBAAoB,EAAE,CAAA;IACtF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAkB,EAAE,OAAe,OAAO,EAAE;IAC5E,IAAI,KAAK,CAAC,OAAO,KAAK,wBAAwB,EAAE,CAAC;QAChD,MAAM,IAAI,gBAAgB,CACzB,oCAAoC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,wBAAwB,GAAG,CAClG,CAAA;IACF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,gBAAgB,CAAC,uDAAuD,CAAC,CAAA;IACpF,CAAC;IACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACrD,IAAI,OAAO;QAAE,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAEhD,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAA;IAClD,MAAM,GAAG,GAAG,GAAG,IAAI,QAAQ,OAAO,CAAC,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;IAC1E,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAC7C,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACzB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;AACtB,CAAC;AAED;;;;;GAKG;AACH,SAAS,SAAS,CAAC,KAAc;IAChC,MAAM,CAAC,GAAG,KAAgC,CAAA;IAC1C,IAAI,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAC1E,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IACrE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAA;IAC1C,MAAM,MAAM,GAAmB;QAC9B,EAAE,EAAE,CAAC,CAAC,QAAsB;QAC5B,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1D,CAAA;IACD,OAAO;QACN,OAAO,EAAE,wBAAwB;QACjC,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS;YAC5B,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAmD,EAAE;YACtE,CAAC,CAAC,EAAE,CAAC;KACN,CAAA;AACF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,OAAkC;IAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,gCAAgC,CAAA;IACxC,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,iBAAiB,CAAC,EAAE,CAAC;YACvC,OAAO,GAAG,QAAQ,KAAK,MAAM,CAAC,EAAE,2CAA2C,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACxH,CAAC;QACD,oEAAoE;QACpE,sEAAsE;QACtE,qEAAqE;QACrE,wEAAwE;QACxE,yEAAyE;QACzE,iCAAiC;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAA;QAC7D,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAA;YACzE,OAAO,GAAG,QAAQ,aAAa,KAAK,kFAAkF,CAAA;QACvH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IAClC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAA;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,EAAE,GAAG,KAAgC,CAAA;IAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAA;IAC3C,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAA;IAC3C,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,CAAC,GAAG,KAAgC,CAAA;IAC1C,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC/D,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IACtE,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,CAAC,GAAG,KAAgC,CAAA;IAC1C,IAAI,CAAC,CAAC,OAAO,KAAK,wBAAwB;QAAE,OAAO,KAAK,CAAA;IACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAA;IAC7C,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;IAC5C,CAAC;IACD,IAAI,CAAC,CAAC,uBAAuB,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,uBAAuB,KAAK,SAAS,EAAE,CAAC;QAC/F,OAAO,KAAK,CAAA;IACb,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAA;IAC3C,OAAO,IAAI,CAAA;AACZ,CAAC"}

package/dist/tui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/tui/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAwDH,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,YAAY,CAAA;AAE/D,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;CACxB;AAWD,wBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,2CAw2BpC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/tui/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA0DH,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,YAAY,CAAA;AAE/D,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;CACxB;AAWD,wBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,2CAg7BpC"}

package/dist/tui/App.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Box, Text, useApp, useInput } from 'ink';
 import { relative } from 'node:path';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { writePreferences, } from '../integrations/providers/index.js';
+import { primaryProvider, writePreferences, } from '../integrations/providers/index.js';
 import { isTrusted, trustDir } from '../integrations/trust/store.js';
 import { appendMemory, composeMemoryPrompt, readMemory } from '../memory/store.js';
 import { composeSkillsPrompt, discoverSkills, loadSkillBody } from '../skills/store.js';
@@ -14,6 +14,7 @@ import { Composer } from './Composer.js';
 import { TrustPrompt } from './TrustPrompt.js';
 import { NAMZU_MARK, NAMZU_MARK_COLOR, NAMZU_WORDMARK, NAMZU_WORDMARK_GRADIENT, NAMZU_WORDMARK_MIN_WIDTH, } from './logo.js';
 import { PermissionOverlay } from './PermissionOverlay.js';
+import { approvalIsDeliberate } from './consent-timing.js';
 import { Picker } from './Picker.js';
 import { StatusBar } from './StatusBar.js';
 import { Transcript } from './Transcript.js';
@@ -71,6 +72,23 @@ export function App({ ctx }) {
         setActiveTools([]);
     }, []);
     const permissionResolveRef = useRef(null);
+    /**
+     * When the pending prompt took the screen, or `null` with none open.
+     *
+     * A ref rather than state because the keypress handler reads it in the same
+     * tick the prompt opens, before any re-render could carry a new value — see
+     * `permission-timing.ts` for why an approving key has to wait on this.
+     */
+    const permissionOpenedAtRef = useRef(null);
+    /**
+     * When the trust gate was painted, or `null` while it is not up.
+     *
+     * The same quantity as `permissionOpenedAtRef`, for the other consent
+     * screen. Set from an effect rather than at the `setPhase('trust')` call
+     * because effects run after the commit, so the window starts when the gate
+     * could first have been SEEN rather than when it was decided upon.
+     */
+    const trustShownAtRef = useRef(null);
     // SDK-backed conversation persistence (DiskSessionStore). `scopeRef` carries
     // the active session id used by query() — mutated in place on /resume so new
     // turns attribute to the resumed conversation.
@@ -144,10 +162,16 @@ export function App({ ctx }) {
             // the file is shadowed instead of leaving it silently unused.
             reserved: SLASH_COMMANDS.map((c) => c.name),
         }));
-        setCurrentProvider(prefs.provider);
+        setCurrentProvider(primaryProvider(prefs).id);
         if (s.hasProvider) {
             setPhase('ready');
             pushMessage('system', `Connected to ${s.providerSummary}${s.modelSummary ? ` · ${s.modelSummary}` : ''} · ${s.toolNames.length} tools`);
+            // Before the rest: a limitation the operator accepted once and has
+            // been living with since is the thing they are least likely to
+            // remember and most likely to be surprised by.
+            for (const notice of s.configNotices) {
+                pushMessage('system', notice);
+            }
             // Named, not counted. "2 files" tells a user their conventions were
             // found but not WHICH ones, and the interesting case is the one
             // they did not expect — an instructions file in a parent directory
@@ -204,6 +228,11 @@ export function App({ ctx }) {
             setPhase('trust');
         }
     }, [ctx.cwd, runProbe]);
+    // Starts the settle window when the gate is on screen, and clears it when it
+    // leaves so a later stray key can never be measured against a stale one.
+    useEffect(() => {
+        trustShownAtRef.current = phase === 'trust' ? Date.now() : null;
+    }, [phase]);
     const acceptTrust = useCallback(() => {
         try {
             trustDir(ctx.cwd);
@@ -295,6 +324,7 @@ export function App({ ctx }) {
     const resolvePermission = useCallback((decision) => {
         const resolve = permissionResolveRef.current;
         permissionResolveRef.current = null;
+        permissionOpenedAtRef.current = null;
         setPermission(null);
         if (resolve)
             resolve(decision);
@@ -303,6 +333,7 @@ export function App({ ctx }) {
     // non-read-only tool batch; it parks until the user presses y/n/a.
     const onPermission = useCallback((req) => new Promise((resolve) => {
         permissionResolveRef.current = resolve;
+        permissionOpenedAtRef.current = Date.now();
         setPermission(req);
         setState('awaiting-permission');
     }), []);
@@ -451,6 +482,7 @@ export function App({ ctx }) {
         finally {
             abortRef.current = null;
             permissionResolveRef.current = null;
+            permissionOpenedAtRef.current = null;
             setPermission(null);
             clearActiveTools();
             setState('idle');
@@ -601,13 +633,23 @@ export function App({ ctx }) {
         setDetected(next);
         // The disposition, not the key. `credential` never reaches a message.
         pushMessage('system', disposition);
-        void hydrateSession({ version: 2, provider: credential.entry.id, subagents: { active: [] } }, next);
+        void hydrateSession({
+            version: 3,
+            providers: [{ id: credential.entry.id }],
+            subagents: { active: [] },
+        }, next);
     }, [detected, hydrateSession, pushMessage]);
     const handlePickerSubmit = useCallback((selection) => {
+        // One member for now. The picker builds a longer chain in a later
+        // change; the shape it writes into is already the chain.
         const prefs = {
-            version: 2,
-            provider: selection.provider,
-            model: selection.model,
+            version: 3,
+            providers: [
+                {
+                    id: selection.provider,
+                    ...(selection.model !== undefined ? { model: selection.model } : {}),
+                },
+            ],
             subagents: { active: [] },
         };
         try {
@@ -642,26 +684,56 @@ export function App({ ctx }) {
         // Trust gate owns the keyboard until the folder is trusted or we exit.
         if (phase === 'trust') {
             const ch = input.toLowerCase();
-            if (ch === 'y' || key.return)
-                acceptTrust();
-            else if (ch === 'n' || key.escape || (key.ctrl && input === 'c'))
+            // Refusal answers on the first press and is never deferred. It only
+            // exits: nothing is written, nothing has run, and a relaunch costs a
+            // second — so an accidental refusal is the recoverable direction,
+            // and making the escape hatch hesitate on the program's first screen
+            // would read as a hang.
+            if (ch === 'n' || key.escape || (key.ctrl && input === 'c')) {
                 exit();
+                return;
+            }
+            // Enter is deliberately NOT trust, for the reason it is not approval
+            // at the tool prompt — and more so here. The operator reached this
+            // screen by typing `namzu` and pressing Enter, so a key repeat or an
+            // impatient second press arrives while the gate is still painting;
+            // this is the one moment in the program where an in-flight Enter is
+            // close to expected. And the decision is durable: `acceptTrust`
+            // writes the folder into `~/.namzu/trust.json`, which covers every
+            // subfolder, so a stray keystroke grants standing permission to a
+            // whole tree rather than to one call.
+            if (!approvalIsDeliberate(trustShownAtRef.current, Date.now()))
+                return;
+            if (ch === 'y')
+                acceptTrust();
             return;
         }
         // A pending permission prompt owns the keyboard: y/n/a decide it.
         if (permissionResolveRef.current) {
             const ch = input.toLowerCase();
-            if (key.ctrl && (input === 'c' || input === '\x03')) {
+            // Refusing is never deferred or gated — it is the direction a
+            // mistake is recoverable in, so it answers on the first press.
+            if (key.ctrl && input === 'c') {
                 resolvePermission({ kind: 'reject', feedback: 'User interrupted.' });
                 abortRef.current?.abort();
                 return;
             }
-            if (ch === 'y' || key.return)
+            if (ch === 'n' || key.escape) {
+                resolvePermission({ kind: 'reject' });
+                return;
+            }
+            // Enter is deliberately NOT an approval. It is the key people press
+            // to dismiss a thing that appeared, it is the key already in flight
+            // when a turn's follow-up was being typed, and it is named nowhere
+            // on this prompt — so reading it as consent approves a tool call the
+            // operator never looked at. `y` and `a` are the only approvals, and
+            // they must arrive after the prompt has been up long enough to read.
+            if (!approvalIsDeliberate(permissionOpenedAtRef.current, Date.now()))
+                return;
+            if (ch === 'y')
                 resolvePermission({ kind: 'approve' });
             else if (ch === 'a')
                 resolvePermission({ kind: 'approve-all' });
-            else if (ch === 'n' || key.escape)
-                resolvePermission({ kind: 'reject' });
             return;
         }
         // Esc interrupts a running turn (Ctrl+C stays reserved for exit). Mirrors
@@ -678,7 +750,7 @@ export function App({ ctx }) {
             setExpanded((e) => !e);
             return;
         }
-        if (key.ctrl && (input === 'c' || input === '\x03')) {
+        if (key.ctrl && input === 'c') {
             // A turn is running → first Ctrl+C interrupts it, not exits.
             if (abortRef.current) {
                 abortRef.current.abort();
@@ -732,8 +804,10 @@ function formatToolCall(toolName, summary) {
     return summary.length > 0 ? `${display}(${summary})` : display;
 }
 function hintForPhase(phase, state) {
+    // Enter is absent because Enter grants nothing here, deliberately — see the
+    // trust branch in the key handler above.
     if (phase === 'trust')
-        return 'y trust this folder · n exit';
+        return 'y trust this folder · n / esc exit';
     if (phase === 'resume')
         return '↑↓ navigate · enter resume · esc cancel';
     if (phase === 'probing')
@@ -742,8 +816,10 @@ function hintForPhase(phase, state) {
         return '↑↓ navigate · enter accept · esc cancel';
     if (phase === 'unhealthy')
         return 'Ctrl+C ×2 to exit';
+    // Enter is absent because Enter decides nothing here, deliberately — see the
+    // permission gate in the key handler above.
     if (state === 'awaiting-permission')
-        return 'y approve · n reject · a approve all';
+        return 'y approve · n / esc reject · a approve all';
     if (state !== 'idle')
         return 'agent is working — esc to interrupt';
     return '/help · @file / Ctrl+V to attach · Ctrl+C ×2 to exit';