@open-mercato/cezar 0.9.2 → 0.10.0-pr892.1298

package/dist/core/model-identity.d.ts

@@ -40,12 +40,13 @@ export declare class ModelIdentityError extends Error {
     constructor(message: string);
 }
 /**
- * Providers cezar names today. Informational and extensible — an unknown
- * provider in an explicit `provider/model` string still passes through, so
- * future models and new backends are never silently rejected.
+ * No provider allowlist lives here on purpose (#548). `resolveModelIdentity`
+ * lets an unknown provider in an explicit `provider/model` string pass through,
+ * so future models and new backends are never silently rejected — an exported
+ * roster of "providers cezar names today" would gate nothing, and an unused
+ * public export reads as a contract someone must keep current. The per-backend
+ * knowledge that IS load-bearing lives in `BACKEND_MODEL_MAP` below.
  */
-export declare const KNOWN_PROVIDERS: readonly ['anthropic', 'openai', 'google', 'openrouter'];
-export type KnownProvider = (typeof KNOWN_PROVIDERS)[number];
 interface BackendModelMap {
     /**
      * The provider a bare (provider-less) model id belongs to for this backend.
@@ -54,6 +55,10 @@ interface BackendModelMap {
      * It also selects the wire form in {@link toBackendModel}.
      */
     readonly defaultProvider?: string;
+    /** Whether explicit foreign provider/model ids are valid backend-native ids. */
+    readonly allowExplicitProvider?: boolean;
+    /** Whether the backend wire model keeps the explicit provider prefix. */
+    readonly wireProviderQualified?: boolean;
     /**
      * Bare model id → provider override, for the rare backend whose bare ids
      * span providers. Checked before `defaultProvider`; empty for today's set.
@@ -63,7 +68,11 @@ interface BackendModelMap {
 /**
  * Per-backend mapping table — the one place #387 extends for the `pi` runner.
  * `claude-cli` is the legacy id kept so old run records normalise identically
- * to `claude`.
+ * to `claude`. That is now true end to end: `storedRunnerSchema`
+ * (`runs/store.ts`) parses the legacy spelling out of `runs.json` and folds it
+ * to `claude` (#547), so the entry below is what a record carrying it maps
+ * through on the way in — not, as the comment used to imply, a mapping for a
+ * value the store could never load.
  */
 export declare const BACKEND_MODEL_MAP: Readonly<Record<AgentBackend, BackendModelMap>>;
 /** Serialize a canonical identity to its `provider/model` string form. */
@@ -84,14 +93,15 @@ export declare function parseModelIdentity(raw: string | undefined | null): Mode
  *    explicit choice, not a silent fallback);
  *  - an explicit `provider/model` → that identity, for a multi-provider backend
  *    or when the provider is the single-provider backend's own;
- *  - an explicit `provider/model` naming a FOREIGN provider on a single-provider
- *    backend → throws {@link ModelIdentityError} (it would be dropped on the wire
- *    yet persisted, asserting a provider that never ran — #405 review M2);
+ *  - an explicit `provider/model` naming a FOREIGN provider is preserved when
+ *    the backend supports custom/gateway model ids;
  *  - a bare id → the backend's default provider;
  *  - a bare id on a backend with no default provider → throws
  *    {@link ModelIdentityError}.
  */
-export declare function resolveModelIdentity(backend: AgentBackend, raw: string | undefined): ModelIdentity | undefined;
+export declare function resolveModelIdentity(backend: AgentBackend, raw: string | undefined, options?: {
+    configuredProvider?: string;
+}): ModelIdentity | undefined;
 /**
  * The model string to hand `backend`'s CLI/API for a canonical identity — the
  * inverse of {@link resolveModelIdentity}. Single-provider backends
@@ -106,7 +116,9 @@ export declare function toBackendModel(backend: AgentBackend, id: ModelIdentity)
  * `undefined` for empty/auto. Throws {@link ModelIdentityError} on an
  * unresolvable model — the single fail-loud gate the run wiring calls.
  */
-export declare function normalizeModelForBackend(backend: AgentBackend, raw: string | undefined): {
+export declare function normalizeModelForBackend(backend: AgentBackend, raw: string | undefined, options?: {
+    configuredProvider?: string;
+}): {
     backendModel: string;
     identity: ModelIdentity;
 } | undefined;

package/dist/core/model-identity.js

@@ -10,24 +10,31 @@ export class ModelIdentityError extends Error {
         this.name = 'ModelIdentityError';
     }
 }
-/**
- * Providers cezar names today. Informational and extensible — an unknown
- * provider in an explicit `provider/model` string still passes through, so
- * future models and new backends are never silently rejected.
- */
-export const KNOWN_PROVIDERS = ['anthropic', 'openai', 'google', 'openrouter'];
 /**
  * Per-backend mapping table — the one place #387 extends for the `pi` runner.
  * `claude-cli` is the legacy id kept so old run records normalise identically
- * to `claude`.
+ * to `claude`. That is now true end to end: `storedRunnerSchema`
+ * (`runs/store.ts`) parses the legacy spelling out of `runs.json` and folds it
+ * to `claude` (#547), so the entry below is what a record carrying it maps
+ * through on the way in — not, as the comment used to imply, a mapping for a
+ * value the store could never load.
  */
 export const BACKEND_MODEL_MAP = {
-    claude: { defaultProvider: 'anthropic' },
-    'claude-cli': { defaultProvider: 'anthropic' },
+    // Claude Code supports custom/gateway model ids such as DeepSeek via an
+    // Anthropic-compatible endpoint, so preserve an explicit provider/model.
+    claude: { defaultProvider: 'anthropic', allowExplicitProvider: true, wireProviderQualified: true },
+    'claude-cli': { defaultProvider: 'anthropic', allowExplicitProvider: true, wireProviderQualified: true },
+    // Codex selects the provider from model_provider in config.toml. A foreign
+    // explicit prefix is accepted only when the caller proves it matches that
+    // effective setting; the provider is then stripped from the wire model id.
     codex: { defaultProvider: 'openai' },
     // opencode selects across providers, so a bare model is ambiguous: reject it
     // loudly rather than let the server pick a default the user never asked for.
     opencode: {},
+    // pi selects across providers with the same `provider/model` convention as
+    // opencode (#387) — no default provider, so a bare model is rejected loudly
+    // and `toBackendModel` hands pi the full `provider/model` on its `--model`.
+    pi: {},
 };
 const SLASH = '/';
 /** Serialize a canonical identity to its `provider/model` string form. */
@@ -59,31 +66,34 @@ export function parseModelIdentity(raw) {
  *    explicit choice, not a silent fallback);
  *  - an explicit `provider/model` → that identity, for a multi-provider backend
  *    or when the provider is the single-provider backend's own;
- *  - an explicit `provider/model` naming a FOREIGN provider on a single-provider
- *    backend → throws {@link ModelIdentityError} (it would be dropped on the wire
- *    yet persisted, asserting a provider that never ran — #405 review M2);
+ *  - an explicit `provider/model` naming a FOREIGN provider is preserved when
+ *    the backend supports custom/gateway model ids;
  *  - a bare id → the backend's default provider;
  *  - a bare id on a backend with no default provider → throws
  *    {@link ModelIdentityError}.
  */
-export function resolveModelIdentity(backend, raw) {
+export function resolveModelIdentity(backend, raw, options = {}) {
     if (!raw || !raw.trim())
         return undefined;
     const map = BACKEND_MODEL_MAP[backend] ?? {};
+    const configuredProvider = options.configuredProvider?.trim().toLowerCase() || undefined;
+    const effectiveProvider = configuredProvider ?? map.defaultProvider;
     const explicit = parseModelIdentity(raw);
     if (explicit) {
-        // A single-provider backend (claude/codex) can only serve its own provider. An explicit
-        // foreign provider would be silently dropped on the wire — `toBackendModel` hands the CLI
-        // the bare model id — while the record persists the foreign provider, asserting one that
-        // never served the run (#405 review M2). Reject it, the same fail-loud contract a bare id
-        // gets on a multi-provider backend.
-        if (map.defaultProvider !== undefined && explicit.provider !== map.defaultProvider) {
-            throw new ModelIdentityError(`provider "${explicit.provider}" can't be served by the ${backend} runner (serves ${map.defaultProvider}) — use "${map.defaultProvider}/${explicit.model}" or a bare model id`);
+        // Most single-provider backends need their bare wire form, but Claude Code
+        // also accepts explicit gateway/custom provider ids. Keep rejecting foreign
+        // providers for backends that do not advertise that capability.
+        if (map.defaultProvider !== undefined &&
+            explicit.provider !== effectiveProvider &&
+            !map.allowExplicitProvider) {
+            throw new ModelIdentityError(configuredProvider
+                ? `provider "${explicit.provider}" doesn't match the ${backend} runner's configured provider "${configuredProvider}" — use "${configuredProvider}/${explicit.model}" or a bare model id`
+                : `provider "${explicit.provider}" can't be verified for the ${backend} runner (serves ${map.defaultProvider}) — use "${map.defaultProvider}/${explicit.model}" or a bare model id`);
         }
         return explicit;
     }
     const model = raw.trim();
-    const provider = map.providerByModel?.[model] ?? map.defaultProvider;
+    const provider = map.providerByModel?.[model] ?? effectiveProvider;
     if (!provider) {
         throw new ModelIdentityError(`model "${model}" is ambiguous for the ${backend} runner — name the provider as "provider/model" (e.g. anthropic/${model})`);
     }
@@ -98,7 +108,14 @@ export function resolveModelIdentity(backend, raw) {
  */
 export function toBackendModel(backend, id) {
     const map = BACKEND_MODEL_MAP[backend] ?? {};
-    return map.defaultProvider === undefined ? formatModelIdentity(id) : id.model;
+    if (map.defaultProvider === undefined)
+        return formatModelIdentity(id);
+    if (map.allowExplicitProvider &&
+        map.wireProviderQualified &&
+        id.provider !== map.defaultProvider) {
+        return formatModelIdentity(id);
+    }
+    return id.model;
 }
 /**
  * Normalise a raw model string for `backend` in one step: the backend-native
@@ -106,8 +123,8 @@ export function toBackendModel(backend, id) {
  * `undefined` for empty/auto. Throws {@link ModelIdentityError} on an
  * unresolvable model — the single fail-loud gate the run wiring calls.
  */
-export function normalizeModelForBackend(backend, raw) {
-    const identity = resolveModelIdentity(backend, raw);
+export function normalizeModelForBackend(backend, raw, options = {}) {
+    const identity = resolveModelIdentity(backend, raw, options);
     if (!identity)
         return undefined;
     return { backendModel: toBackendModel(backend, identity), identity };

package/dist/core/model-identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-identity.js","sourceRoot":"","sources":["../../src/core/model-identity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-identity.js","sourceRoot":"","sources":["../../src/core/model-identity.ts"],"names":[],"mappings":"AAkCA;;;;;GAKG;AACH,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AA8BD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAoD;IAChF,wEAAwE;IACxE,yEAAyE;IACzE,MAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE;IAClG,YAAY,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE;IACxG,2EAA2E;IAC3E,0EAA0E;IAC1E,2EAA2E;IAC3E,KAAK,EAAE,EAAE,eAAe,EAAE,QAAQ,EAAE;IACpC,6EAA6E;IAC7E,6EAA6E;IAC7E,QAAQ,EAAE,EAAE;IACZ,2EAA2E;IAC3E,4EAA4E;IAC5E,4EAA4E;IAC5E,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,KAAK,GAAG,GAAG,CAAC;AAElB,0EAA0E;AAC1E,MAAM,UAAU,mBAAmB,CAAC,EAAiB;IACnD,OAAO,GAAG,EAAE,CAAC,QAAQ,GAAG,KAAK,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;AAC7C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAA8B;IAC/D,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,wEAAwE;IACxE,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;AACrF,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAqB,EACrB,GAAuB,EACvB,OAAO,GAAoC,EAAE;IAE7C,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC;IACzF,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,GAAG,CAAC,eAAe,CAAC;IACpE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,QAAQ,EAAE,CAAC;QACb,2EAA2E;QAC3E,4EAA4E;QAC5E,gEAAgE;QAChE,IACE,GAAG,CAAC,eAAe,KAAK,SAAS;YACjC,QAAQ,CAAC,QAAQ,KAAK,iBAAiB;YACvC,CAAC,GAAG,CAAC,qBAAqB,EAC1B,CAAC;YACD,MAAM,IAAI,kBAAkB,CAC1B,kBAAkB;gBAChB,CAAC,CAAC,aAAa,QAAQ,CAAC,QAAQ,uBAAuB,OAAO,kCAAkC,kBAAkB,YAAY,kBAAkB,IAAI,QAAQ,CAAC,KAAK,sBAAsB;gBACxL,CAAC,CAAC,aAAa,QAAQ,CAAC,QAAQ,+BAA+B,OAAO,mBAAmB,GAAG,CAAC,eAAe,YAAY,GAAG,CAAC,eAAe,IAAI,QAAQ,CAAC,KAAK,sBAAsB,CACtL,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC;IACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,kBAAkB,CAC1B,UAAU,KAAK,0BAA0B,OAAO,mEAAmE,KAAK,GAAG,CAC5H,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,OAAqB,EAAE,EAAiB;IACrE,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,GAAG,CAAC,eAAe,KAAK,SAAS;QAAE,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtE,IACE,GAAG,CAAC,qBAAqB;QACzB,GAAG,CAAC,qBAAqB;QACzB,EAAE,CAAC,QAAQ,KAAK,GAAG,CAAC,eAAe,EACnC,CAAC;QACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAqB,EACrB,GAAuB,EACvB,OAAO,GAAoC,EAAE;IAE7C,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;AACvE,CAAC"}

package/dist/core/model-presets.d.ts

@@ -8,8 +8,14 @@ import type { RunnerId } from './agent-runner.ts';
  * and config presets must keep working), so the only thing ever rejected is a model that is
  * recognizably ANOTHER runner's preset — the corruption a client/server resolution mismatch
  * can produce (#401 review). Unknown ids never conflict (fail-open).
+ *
+ * OpenCode lists nothing here on purpose (#794): its models are discovered from the host
+ * (`opencode-model-catalog.ts`), so any hard-coded list would be one release away from naming
+ * models the user's provider does not have. Its half of the guard is the structural check in
+ * {@link modelConflictsWithRunner} instead, which needs no vendor knowledge at all.
  */
 export declare const KNOWN_PRESETS_BY_RUNNER: Record<RunnerId, readonly string[]>;
-/** True when `model` is recognizably a preset of a runner OTHER than `runner` (and not also
- *  one of `runner`'s own presets). `''`/unknown/custom ids never conflict. */
+/** True when `model` is recognizably a preset of a runner OTHER than `runner` (and not also one
+ *  of `runner`'s own presets), or when its provider prefix is one this runner is known not to
+ *  serve. `''`/unknown/custom ids never conflict. */
 export declare function modelConflictsWithRunner(model: string, runner: RunnerId): boolean;

package/dist/core/model-presets.js

@@ -1,3 +1,12 @@
+import { BACKEND_MODEL_MAP, parseModelIdentity } from './model-identity.js';
+/**
+ * The vendor prefixes this module treats as evidence of a mis-paired model. Deliberately local
+ * rather than an export of `model-identity.ts` (#548/#831): nothing else may gate on it, because
+ * `resolveModelIdentity` lets an unknown provider through on purpose. It is a heuristic for
+ * {@link namesAnotherKnownProvider} alone, and being short is a feature — every entry costs a
+ * false refusal if cezar is ever wrong about who serves it.
+ */
+const KNOWN_PROVIDERS = ['anthropic', 'openai', 'google', 'openrouter'];
 /**
  * The model-preset ids each runner's picker offers — the ids of the web composer's
  * `MODELS_BY_RUNNER` (packages/web/src/routes/new-task-form.ts), hand-mirrored the same way the
@@ -7,6 +16,11 @@
  * and config presets must keep working), so the only thing ever rejected is a model that is
  * recognizably ANOTHER runner's preset — the corruption a client/server resolution mismatch
  * can produce (#401 review). Unknown ids never conflict (fail-open).
+ *
+ * OpenCode lists nothing here on purpose (#794): its models are discovered from the host
+ * (`opencode-model-catalog.ts`), so any hard-coded list would be one release away from naming
+ * models the user's provider does not have. Its half of the guard is the structural check in
+ * {@link modelConflictsWithRunner} instead, which needs no vendor knowledge at all.
  */
 export const KNOWN_PRESETS_BY_RUNNER = {
     claude: [
@@ -19,20 +33,49 @@ export const KNOWN_PRESETS_BY_RUNNER = {
         'claude-haiku-4-5',
     ],
     codex: ['gpt-5.1-codex', 'gpt-5.1-codex-mini', 'gpt-5-codex'],
-    opencode: [
-        'anthropic/claude-opus-4-8',
-        'anthropic/claude-sonnet-5',
-        'openai/gpt-5.1',
-        'openai/gpt-5.1-codex',
-    ],
+    opencode: [],
+    // pi lists nothing for the same reason OpenCode does (#794), plus one of its own: it picks a
+    // model with the canonical `provider/model` convention and has no default provider, so the
+    // structural check in {@link modelConflictsWithRunner} already guards it without vendor
+    // knowledge. Listing pi's composer presets here would actively break OpenCode — the ids
+    // overlap (`anthropic/claude-sonnet-5`), and a shared id present in pi's list but absent from
+    // OpenCode's empty one would read as "another runner's preset" and be refused.
+    pi: [],
 };
-/** True when `model` is recognizably a preset of a runner OTHER than `runner` (and not also
- *  one of `runner`'s own presets). `''`/unknown/custom ids never conflict. */
+/**
+ * True when the `provider/` prefix on `model` names a provider cezar knows that this
+ * single-provider runner does not serve — `anthropic/…` handed to codex.
+ *
+ * Deliberately narrower than the run-time gate in `model-identity.ts`: this check is
+ * synchronous and therefore cannot read the runner's `configuredProvider`, so an UNFAMILIAR
+ * prefix (`my-org/custom-tune`) is left alone — it may well be the user's own gateway, which
+ * the run-time gate accepts once it has read the config. Only a prefix naming another known
+ * vendor is evidence enough to refuse the pairing up front.
+ */
+function namesAnotherKnownProvider(model, runner) {
+    const map = BACKEND_MODEL_MAP[runner];
+    // Nothing to contradict: OpenCode spans providers (no default of its own), and Claude Code
+    // accepts explicit gateway/custom provider ids by design.
+    if (map?.defaultProvider === undefined || map.allowExplicitProvider)
+        return false;
+    const explicit = parseModelIdentity(model);
+    if (!explicit || explicit.provider === map.defaultProvider)
+        return false;
+    return KNOWN_PROVIDERS.includes(explicit.provider);
+}
+/** True when `model` is recognizably a preset of a runner OTHER than `runner` (and not also one
+ *  of `runner`'s own presets), or when its provider prefix is one this runner is known not to
+ *  serve. `''`/unknown/custom ids never conflict. */
 export function modelConflictsWithRunner(model, runner) {
     if (!model)
         return false;
     if (KNOWN_PRESETS_BY_RUNNER[runner]?.includes(model))
         return false;
+    // The provider half of the guard needs no vendor model knowledge, so — unlike the preset
+    // lists — it keeps holding for models that do not exist yet. That is what lets OpenCode's
+    // entry above be empty (#794) without losing the protection it used to provide.
+    if (namesAnotherKnownProvider(model, runner))
+        return true;
     return Object.entries(KNOWN_PRESETS_BY_RUNNER).some(([other, presets]) => other !== runner && presets.includes(model));
 }
 //# sourceMappingURL=model-presets.js.map

package/dist/core/model-presets.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-presets.js","sourceRoot":"","sources":["../../src/core/model-presets.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAwC;IAC1E,MAAM,EAAE;QACN,MAAM;QACN,QAAQ;QACR,OAAO;QACP,gBAAgB;QAChB,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;KACnB;IACD,KAAK,EAAE,CAAC,eAAe,EAAE,oBAAoB,EAAE,aAAa,CAAC;IAC7D,QAAQ,EAAE;QACR,2BAA2B;QAC3B,2BAA2B;QAC3B,gBAAgB;QAChB,sBAAsB;KACvB;CACF,CAAC;AAEF;8EAC8E;AAC9E,MAAM,UAAU,wBAAwB,CAAC,KAAa,EAAE,MAAgB;IACtE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnE,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,IAAI,CACjD,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAClE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"model-presets.js","sourceRoot":"","sources":["../../src/core/model-presets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE5E;;;;;;GAMG;AACH,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAU,CAAC;AAEjF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAwC;IAC1E,MAAM,EAAE;QACN,MAAM;QACN,QAAQ;QACR,OAAO;QACP,gBAAgB;QAChB,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;KACnB;IACD,KAAK,EAAE,CAAC,eAAe,EAAE,oBAAoB,EAAE,aAAa,CAAC;IAC7D,QAAQ,EAAE,EAAE;IACZ,6FAA6F;IAC7F,2FAA2F;IAC3F,wFAAwF;IACxF,wFAAwF;IACxF,8FAA8F;IAC9F,+EAA+E;IAC/E,EAAE,EAAE,EAAE;CACP,CAAC;AAEF;;;;;;;;;GASG;AACH,SAAS,yBAAyB,CAAC,KAAa,EAAE,MAAgB;IAChE,MAAM,GAAG,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACtC,2FAA2F;IAC3F,0DAA0D;IAC1D,IAAI,GAAG,EAAE,eAAe,KAAK,SAAS,IAAI,GAAG,CAAC,qBAAqB;QAAE,OAAO,KAAK,CAAC;IAClF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,KAAK,GAAG,CAAC,eAAe;QAAE,OAAO,KAAK,CAAC;IACzE,OAAQ,eAAqC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC5E,CAAC;AAED;;qDAEqD;AACrD,MAAM,UAAU,wBAAwB,CAAC,KAAa,EAAE,MAAgB;IACtE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnE,yFAAyF;IACzF,0FAA0F;IAC1F,gFAAgF;IAChF,IAAI,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1D,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,IAAI,CACjD,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAClE,CAAC;AACJ,CAAC"}

package/dist/core/opencode-model-catalog.d.ts

@@ -0,0 +1,32 @@
+import { type ChildProcessWithoutNullStreams } from 'node:child_process';
+import type { ModelOption } from './runner-model-catalog.ts';
+export interface OpencodeModelDiscoveryOptions {
+    cwd: string;
+    bin?: string;
+    timeoutMs?: number;
+    spawn?: (bin: string, args: readonly string[], cwd: string) => ChildProcessWithoutNullStreams;
+}
+/** Grace between the probe's SIGTERM and the SIGKILL that follows it. */
+export declare const KILL_GRACE_MS = 2000;
+/** The host binary, resolved exactly like `OpencodeServerRunner` and the backend probe. */
+export declare function resolveOpencodeExecutable(bin?: string): string;
+/**
+ * Discover the models the host's own OpenCode installation offers, by asking it: `opencode
+ * models` lists every `provider/model` id the configured providers expose, which is the same
+ * list OpenCode's own picker routes to.
+ *
+ * Best-effort by contract — `RunnerModelCatalog` turns any throw here into a cached or
+ * `unavailable` answer, and `auto` stays selectable either way. No config is read or written,
+ * no session is started; the child is short-lived and bounded by a deadline, a stdout cap and
+ * a model cap.
+ */
+export declare function discoverOpencodeModels(options: OpencodeModelDiscoveryOptions): Promise<ModelOption[]>;
+/**
+ * Turn `opencode models` output into picker options, preserving OpenCode's own order.
+ *
+ * Empty output is a legitimate answer (no provider configured yet) and yields no models, so the
+ * picker shows `auto` alone. Output that contains lines but NO recognizable id is treated as a
+ * failure instead: the CLI said something we cannot read, and reporting "unavailable" is more
+ * honest than an empty catalog that looks like "you have no models".
+ */
+export declare function parseOpencodeModels(stdout: string): ModelOption[];

package/dist/core/opencode-model-catalog.js

@@ -0,0 +1,153 @@
+import { spawn as nodeSpawn } from 'node:child_process';
+import { trackChildExit } from './agent-runner.js';
+import { buildChildEnv } from './agent-env.js';
+const DEFAULT_DISCOVERY_TIMEOUT_MS = 10_000;
+/** Grace between the probe's SIGTERM and the SIGKILL that follows it. */
+export const KILL_GRACE_MS = 2_000;
+const MAX_MODELS = 500;
+/** Defensive cap on what we buffer from a misbehaving child (characters of stdout). */
+const MAX_OUTPUT_CHARS = 512 * 1_024;
+/**
+ * One `provider/model` id per line — the shape `opencode models` prints (#794). Deliberately
+ * strict: anything else (a banner, a prompt, a stack trace, a bare model name that OpenCode
+ * could not route) is NOT a model id, and silently turning it into a picker entry would
+ * recreate the very defect this replaces.
+ */
+const MODEL_LINE_RE = /^[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._:/-]*$/i;
+/** SGR/CSI sequences, in case a future CLI colorizes even a piped stdout. */
+const ANSI_RE = /\u001B\[[0-9;]*[A-Za-z]/g;
+/** The host binary, resolved exactly like `OpencodeServerRunner` and the backend probe. */
+export function resolveOpencodeExecutable(bin) {
+    return bin ?? process.env.CEZ_OPENCODE_BIN ?? 'opencode';
+}
+/**
+ * Discover the models the host's own OpenCode installation offers, by asking it: `opencode
+ * models` lists every `provider/model` id the configured providers expose, which is the same
+ * list OpenCode's own picker routes to.
+ *
+ * Best-effort by contract — `RunnerModelCatalog` turns any throw here into a cached or
+ * `unavailable` answer, and `auto` stays selectable either way. No config is read or written,
+ * no session is started; the child is short-lived and bounded by a deadline, a stdout cap and
+ * a model cap.
+ */
+export async function discoverOpencodeModels(options) {
+    const bin = resolveOpencodeExecutable(options.bin);
+    const args = ['models'];
+    const child = (options.spawn ?? spawnOpencode)(bin, args, options.cwd);
+    const kill = teardown(child);
+    const timeoutMs = options.timeoutMs ?? DEFAULT_DISCOVERY_TIMEOUT_MS;
+    let timeout;
+    try {
+        return await new Promise((resolve, reject) => {
+            let stdout = '';
+            let overflowed = false;
+            const fail = (message) => {
+                reject(new Error(message));
+                kill();
+            };
+            timeout = setTimeout(() => fail('OpenCode model discovery timed out'), timeoutMs);
+            timeout.unref?.();
+            child.stdout.setEncoding('utf8');
+            child.stdout.on('data', (chunk) => {
+                if (overflowed)
+                    return;
+                stdout += chunk;
+                if (stdout.length > MAX_OUTPUT_CHARS) {
+                    overflowed = true;
+                    fail('OpenCode model discovery exceeded the output limit');
+                }
+            });
+            // Drained but ignored: OpenCode prints provider warnings here, and an unread pipe would
+            // eventually stall the child.
+            child.stderr.resume();
+            child.once('error', () => fail('OpenCode model discovery child failed'));
+            child.once('close', (code) => {
+                if (overflowed)
+                    return;
+                if (code !== 0) {
+                    fail(`OpenCode model discovery child exited (${code ?? 'unknown'})`);
+                    return;
+                }
+                try {
+                    resolve(parseOpencodeModels(stdout));
+                }
+                catch (error) {
+                    reject(error instanceof Error ? error : new Error(String(error)));
+                }
+            });
+        });
+    }
+    finally {
+        if (timeout)
+            clearTimeout(timeout);
+        kill();
+    }
+}
+/**
+ * Turn `opencode models` output into picker options, preserving OpenCode's own order.
+ *
+ * Empty output is a legitimate answer (no provider configured yet) and yields no models, so the
+ * picker shows `auto` alone. Output that contains lines but NO recognizable id is treated as a
+ * failure instead: the CLI said something we cannot read, and reporting "unavailable" is more
+ * honest than an empty catalog that looks like "you have no models".
+ */
+export function parseOpencodeModels(stdout) {
+    const lines = stdout
+        .replace(ANSI_RE, '')
+        .split('\n')
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+    const models = [];
+    const ids = new Set();
+    for (const line of lines) {
+        if (!MODEL_LINE_RE.test(line) || ids.has(line))
+            continue;
+        if (models.length >= MAX_MODELS)
+            throw new Error('OpenCode model discovery exceeded the size limit');
+        ids.add(line);
+        const provider = line.slice(0, line.indexOf('/'));
+        models.push({ id: line, label: line, description: `via ${provider}` });
+    }
+    if (models.length === 0 && lines.length > 0) {
+        throw new Error('OpenCode model discovery returned unrecognized output');
+    }
+    return models;
+}
+function spawnOpencode(bin, args, cwd) {
+    const child = nodeSpawn(bin, [...args], {
+        cwd,
+        env: buildChildEnv({ backend: 'opencode' }),
+    });
+    // Nothing is ever written to it, and an open stdin is what makes a CLI that expects a TTY
+    // sit and wait instead of printing its list.
+    child.stdin.end();
+    return child;
+}
+/**
+ * Returns the probe's teardown: SIGTERM now, SIGKILL once the grace window elapses.
+ *
+ * Both steps gate on the child's *real* termination, never on `child.killed` — Node flips that
+ * flag the moment a signal is delivered, so the old `exitCode === null && !child.killed` test
+ * went false the instant our own SIGTERM landed. A probe that installs a SIGTERM handler then
+ * survived every teardown, leaking one process per cache refresh (#858, the shape #841 fixed for
+ * the Claude probe in `a67b327d`).
+ *
+ * Called from both the failure path and the `finally`, so the escalation is armed at most once.
+ */
+function teardown(child) {
+    const hasExited = trackChildExit(child);
+    let signalled = false;
+    return () => {
+        if (signalled || hasExited())
+            return;
+        signalled = true;
+        child.kill('SIGTERM');
+        const escalation = setTimeout(() => {
+            if (hasExited())
+                return;
+            child.kill('SIGKILL');
+        }, KILL_GRACE_MS);
+        escalation.unref?.();
+    };
+}
+//# sourceMappingURL=opencode-model-catalog.js.map

package/dist/core/opencode-model-catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-model-catalog.js","sourceRoot":"","sources":["../../src/core/opencode-model-catalog.ts"],"names":[],"mappings":"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"}

package/dist/core/opencode-server-runner.d.ts

@@ -6,6 +6,8 @@ export interface OpencodeRunnerOptions {
     /** Wall-clock timeout for a run (ms); per-spec `timeoutMs` still wins. */
     timeoutMs?: number;
 }
+/** Grace between the teardown SIGTERM and the SIGKILL that follows it. */
+export declare const KILL_GRACE_MS = 4000;
 /**
  * `AgentRunner` over `opencode serve` — a headless HTTP server (the same one
  * the opencode TUI talks to) with an SSE event stream. One server per session,

package/dist/core/opencode-server-runner.js

@@ -1,11 +1,13 @@
 import { spawn as nodeSpawn } from 'node:child_process';
-import { prependSystemPrompt } from './agent-runner.js';
+import { prependSystemPrompt, trackChildExit } from './agent-runner.js';
 import { buildChildEnv } from './agent-env.js';
 import { AUTO_END_DELAY_MS, DEFAULT_RUN_TIMEOUT_MS } from './claude-cli-runner.js';
 import { parseModelIdentity } from './model-identity.js';
 import { V1TextCoalescer } from './v1-text-coalescer.js';
 import { createOpencodeUiState, mapOpencodeEvent, opencodeSessionStarted, opencodeTurnStarted, } from './opencode-ui-mapper.js';
 const SERVER_START_TIMEOUT_MS = 30_000;
+/** Grace between the teardown SIGTERM and the SIGKILL that follows it. */
+export const KILL_GRACE_MS = 4_000;
 /**
  * `AgentRunner` over `opencode serve` — a headless HTTP server (the same one
  * the opencode TUI talks to) with an SSE event stream. One server per session,
@@ -47,6 +49,9 @@ class OpencodeSession {
     opts;
     result;
     child;
+    /** "Has the server actually terminated?" — never `child.killed`, which only
+     *  reports delivery and would disarm the escalation (#844/#858). */
+    hasExited;
     serverOpen = true;
     baseUrl;
     sessionId;
@@ -81,6 +86,8 @@ class OpencodeSession {
     autoEndTimer;
     spawnFailed = null;
     timedOut = false;
+    /** One teardown per session — see `terminate()`. */
+    signalled = false;
     constructor(bin, timeoutMs, spec, onEvent, opts) {
         this.bin = bin;
         this.spec = spec;
@@ -97,6 +104,7 @@ class OpencodeSession {
         catch (err) {
             throw wrapSpawnError(err, bin);
         }
+        this.hasExited = trackChildExit(this.child);
         this.child.on('error', (err) => {
             this.spawnFailed = wrapSpawnError(err, bin);
         });
@@ -142,8 +150,7 @@ class OpencodeSession {
                     clearTimeout(this.autoEndTimer);
                 this.sse.abort();
                 this.serverOpen = false;
-                if (!this.child.killed)
-                    this.child.kill('SIGTERM');
+                this.terminate();
             }
             await this.exited;
             if (this.spawnFailed)
@@ -196,12 +203,7 @@ class OpencodeSession {
             return;
         this.serverOpen = false;
         this.sse.abort();
-        if (!this.child.killed)
-            this.child.kill('SIGTERM');
-        setTimeout(() => {
-            if (this.child.exitCode == null && !this.child.killed)
-                this.child.kill('SIGKILL');
-        }, 4_000).unref?.();
+        this.terminate();
     }
     interrupt() {
         this.serverOpen = false;
@@ -209,8 +211,37 @@ class OpencodeSession {
             void this.http('POST', `/session/${this.sessionId}/abort`, undefined).catch(() => undefined);
         }
         this.sse.abort();
-        if (!this.child.killed)
-            this.child.kill('SIGTERM');
+        this.terminate();
+    }
+    /**
+     * The one place either signal is sent: SIGTERM now, SIGKILL once the grace
+     * window elapses.
+     *
+     * Both steps gate on `hasExited()`, never on `child.killed` — the latter
+     * flips the moment SIGTERM is *delivered*, so the old nested
+     * `exitCode == null && !killed` guard disarmed the escalation for exactly the
+     * server it was written for: one that installs its own SIGTERM handler stayed
+     * alive with `killed = true` and `exitCode === null`, outliving the whole
+     * window (#858, the same defect #844 fixed for the other two backends). Every
+     * caller here is followed by `await this.exited`, so a server that survived
+     * SIGTERM did not just leak — it hung the session's result forever.
+     *
+     * One teardown per session: all three call sites can run for the same session
+     * (`interrupt()` on the deadline, then the result promise's `finally`), and
+     * once SIGTERM is out with SIGKILL armed there is nothing a second pass adds.
+     * The old `!child.killed` test deduplicated this as a side effect of being
+     * wrong; `signalled` keeps that property on purpose.
+     */
+    terminate() {
+        if (this.signalled || this.hasExited())
+            return;
+        this.signalled = true;
+        this.child.kill('SIGTERM');
+        setTimeout(() => {
+            if (this.hasExited())
+                return;
+            this.child.kill('SIGKILL');
+        }, KILL_GRACE_MS).unref?.();
     }
     // ---- server lifecycle ---------------------------------------------------
     waitForServerUrl(fallbackPort) {