codex-multi-auth 2.16.0 → 2.17.2

package/dist/lib/runtime/api-model-runtime.js

@@ -0,0 +1,358 @@
+import { ClientCancellationError } from "../request/client-cancellation.js";
+import { mapWithConcurrency } from "../concurrency.js";
+import { RuntimeCapabilityFailures, classifyCapabilityFailure, } from "./runtime-capability-failures.js";
+import { readErrorBody } from "../request/stream-failover-runtime.js";
+import { createHash } from "node:crypto";
+import { resolveModelRoute, parseModelRoute, modelEntitlements, } from "../model-route-policy.js";
+import { isRecord } from "../utils.js";
+/** Endpoint-family exclusions, not a fixed allowlist of text model releases.
+ * Model ID discovery alone does not prove Responses/tool compatibility. */
+export function isNonResponsesModel(id) {
+    return (/(?:^|[-_])(?:tts|whisper|embedding|moderation|transcribe|transcription|realtime|audio|image|sora)(?:[-_]|$)/i.test(id) ||
+        /^(?:dall-e|babbage|davinci)(?:-|$)/i.test(id) ||
+        /(?:^|-)live(?:-|$)/i.test(id));
+}
+/** Conservative native-picker metadata: discovery proves an ID, not optional tool capabilities. */
+export function apiPickerModel(id) {
+    return {
+        slug: id,
+        display_name: id,
+        description: "API model; optional capabilities are not advertised by model discovery.",
+        supported_reasoning_levels: [],
+        default_reasoning_level: null,
+        shell_type: "shell_command",
+        visibility: "list",
+        supported_in_api: true,
+        priority: 0,
+        availability_nux: null,
+        upgrade: null,
+        model_messages: {
+            instructions_template: "You are a coding assistant. Follow the user instructions and supplied tool definitions.",
+        },
+        support_verbosity: false,
+        default_verbosity: null,
+        apply_patch_tool_type: null,
+        truncation_policy: { mode: "bytes", limit: 10000 },
+        experimental_supported_tools: [],
+        input_modalities: ["text"],
+        supports_reasoning_summary_parameter: false,
+        use_responses_lite: false,
+    };
+}
+/** Apply current credential policy, never metadata inherited from another credential or old config. */
+function withAccessPrograms(model, route) {
+    const result = { ...model };
+    delete result.available_access_programs;
+    const override = route.modelAccessPrograms && Object.hasOwn(route.modelAccessPrograms, model.slug)
+        ? route.modelAccessPrograms[model.slug] : undefined;
+    const programs = override ?? route.accessPrograms;
+    if (programs)
+        result.available_access_programs = structuredClone(programs);
+    return result;
+}
+export async function boundedJson(response, max = 8 * 1024 * 1024) {
+    const reader = response.body?.getReader();
+    if (!reader)
+        throw Error("Empty model catalog");
+    const chunks = [];
+    let size = 0;
+    try {
+        for (;;) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            size += value.byteLength;
+            if (size > max)
+                throw Error("Model catalog too large");
+            chunks.push(value);
+        }
+    }
+    finally {
+        await reader.cancel();
+    }
+    return JSON.parse(Buffer.concat(chunks).toString("utf8"));
+}
+export class ApiModelRuntime {
+    fetchImpl;
+    now;
+    updateDiscovery;
+    enrichModels;
+    onCatalogUpdated;
+    discoveryUpdates = new Map();
+    lastPersistenceError = null;
+    failures = new RuntimeCapabilityFailures(() => this.now());
+    visibility = new Map();
+    snapshots = new Map();
+    activeKeys = new Set();
+    cachedCatalogs() {
+        return [...this.snapshots]
+            .filter(([key]) => this.activeKeys.has(key))
+            .map(([, catalog]) => catalog);
+    }
+    cache = new Map();
+    constructor(fetchImpl = fetch, now = Date.now, updateDiscovery, enrichModels, onCatalogUpdated) {
+        this.fetchImpl = fetchImpl;
+        this.now = now;
+        this.updateDiscovery = updateDiscovery;
+        this.enrichModels = enrichModels;
+        this.onCatalogUpdated = onCatalogUpdated;
+    }
+    key(route) {
+        return createHash("sha256")
+            .update(route.id)
+            .update("\0")
+            .update(route.apiKey)
+            .digest("hex");
+    }
+    async catalogs(routes, refresh = false, forceProbes = false, waitForCapabilities = true, waitForPersistence = true, requestKind) {
+        this.activeKeys = new Set(routes.map((route) => this.key(route)));
+        return mapWithConcurrency(requestKind ? routes.filter(route => route.kind === requestKind) : routes, 3, async (route) => {
+            const key = this.key(route), cached = this.cache.get(key);
+            if (route.enabled &&
+                (refresh ||
+                    !cached ||
+                    cached.at + (cached.error ? 5000 : 5 * 60_000) <= this.now())) {
+                let models = [];
+                let error = false;
+                try {
+                    const response = await this.fetchImpl("https://api.openai.com/v1/models", {
+                        method: "GET",
+                        headers: { authorization: `Bearer ${route.apiKey}` },
+                        redirect: "error",
+                        signal: AbortSignal.timeout(15000),
+                    });
+                    if (!response.ok) {
+                        await response.body?.cancel();
+                        throw Error("API catalog unavailable");
+                    }
+                    const value = await boundedJson(response);
+                    if (!isRecord(value) ||
+                        !Array.isArray(value.data) ||
+                        value.data.length > 10000)
+                        throw Error("Invalid API catalog");
+                    models = value.data.flatMap((m) => isRecord(m) &&
+                        typeof m.id === "string" &&
+                        /^[A-Za-z0-9][A-Za-z0-9._:-]{0,199}$/.test(m.id) &&
+                        !isNonResponsesModel(m.id)
+                        ? [
+                            {
+                                ...apiPickerModel(m.id),
+                                ...cached?.models.find((old) => old.slug === m.id),
+                            },
+                        ]
+                        : []);
+                }
+                catch {
+                    error = true;
+                }
+                if (this.cache.size >= 100)
+                    this.cache.delete(this.cache.keys().next().value ?? "");
+                this.cache.set(key, { at: this.now(), models, error });
+            }
+            const entry = this.cache.get(key);
+            if (route.enabled && entry && !entry.error && this.updateDiscovery) {
+                let pending = this.discoveryUpdates.get(key);
+                if (!pending) {
+                    pending = this.updateDiscovery(route, entry.models.map(m => m.slug));
+                    this.discoveryUpdates.set(key, pending);
+                    void pending.then(() => { this.lastPersistenceError = null; }, () => { this.lastPersistenceError = "api_catalog_persistence_failed"; }).finally(() => { this.discoveryUpdates.delete(key); });
+                }
+                if (waitForPersistence) {
+                    try {
+                        route = await pending;
+                    }
+                    catch { /* Keep the explicit policy read for this request; discovery cannot expand it. */ }
+                }
+            }
+            this.visibility.set(key, route.visibleModels);
+            const snapshot = {
+                id: route.id,
+                kind: route.kind,
+                enabled: route.enabled,
+                priority: route.priority,
+                models: (entry?.models ?? []).map(model => withAccessPrograms(model, route)),
+                visibleModels: route.visibleModels,
+            };
+            this.snapshots.set(key, snapshot);
+            if (route.enabled && entry && !entry.error && this.enrichModels && (!requestKind || !cached || cached.error)) {
+                const pending = this.enrichModels(entry.models.filter((m) => route.visibleModels.includes(m.slug)), refresh, requestKind ? { ...route, probeCapabilities: false } : route, forceProbes).then((enriched) => {
+                    const byId = new Map(enriched.map((m) => [m.slug, m]));
+                    snapshot.models = entry.models.map((m) => withAccessPrograms(byId.get(m.slug) ?? m, route));
+                    // The caller receives its own completed result; only the newest refresh may replace the shared cache.
+                    if (this.cache.get(key) !== entry ||
+                        this.snapshots.get(key) !== snapshot ||
+                        !this.activeKeys.has(key))
+                        return;
+                    entry.models = snapshot.models;
+                    this.onCatalogUpdated?.();
+                });
+                if (waitForCapabilities)
+                    await pending;
+                else
+                    void pending.catch(() => {
+                        entry.error = true;
+                    });
+            }
+            return snapshot;
+        });
+    }
+    statuses(routes) {
+        return routes.map((r) => {
+            const c = this.cache.get(this.key(r));
+            return {
+                id: r.id,
+                kind: r.kind,
+                label: r.label,
+                priority: r.priority,
+                checkedAt: c?.at ?? 0,
+                error: c?.error ?? true,
+                availableModels: c?.models.map((m) => m.slug) ?? [],
+                entitlements: (c?.models ?? [])
+                    .filter((m) => (this.visibility.get(this.key(r)) ?? r.visibleModels).includes(m.slug))
+                    .map(model => modelEntitlements(withAccessPrograms(model, r))),
+                visibleModels: (this.visibility.get(this.key(r)) ?? r.visibleModels).filter((id) => c?.models.some((m) => m.slug === id)),
+            };
+        });
+    }
+    async request(alias, body, routes, signal, onAttempt) {
+        let route;
+        try {
+            if (isNonResponsesModel(parseModelRoute(alias).upstreamModel))
+                return this.failure(400, "model_requires_other_endpoint", "This model uses a media, audio, embedding, or legacy endpoint and cannot serve a Codex Responses turn. Select a text/coding model.");
+            route = resolveModelRoute(alias, await this.catalogs(routes, false, false, true, false, parseModelRoute(alias).kind), {
+                serviceTier: typeof body.service_tier === "string" ? body.service_tier : undefined,
+                reasoningEffort: isRecord(body.reasoning) && typeof body.reasoning.effort === "string"
+                    ? body.reasoning.effort
+                    : undefined,
+            });
+        }
+        catch {
+            return this.failure(400, "invalid_model_route");
+        }
+        if (route.kind === "oauth")
+            return this.failure(400, "explicit_api_model_required");
+        // Until connection-affinity support exists, never guess the owner of server-side response state.
+        if (body.background === true || body.conversation)
+            return this.failure(400, "stateful_api_route_unsupported");
+        if (body.previous_response_id)
+            return this.failure(400, "previous_response_not_found");
+        const payload = {
+            ...body,
+            model: route.upstreamModel,
+            store: false,
+        };
+        if (route.serviceTier)
+            payload.service_tier = route.serviceTier;
+        delete payload.client_metadata;
+        let lastStatus = 503;
+        let lastRejection;
+        for (const candidate of route.candidates) {
+            const credential = routes.find((r) => r.id === candidate.id);
+            if (!credential)
+                continue;
+            const effort = isRecord(body.reasoning) && typeof body.reasoning.effort === "string"
+                ? body.reasoning.effort
+                : undefined;
+            if (!this.failures.supports(this.key(credential), route.upstreamModel, effort, route.serviceTier))
+                continue;
+            if (signal?.aborted)
+                throw new ClientCancellationError();
+            const controller = new AbortController();
+            const abort = () => controller.abort();
+            signal?.addEventListener("abort", abort, { once: true });
+            const timer = setTimeout(abort, 60000);
+            try {
+                onAttempt?.(routes.indexOf(credential));
+                const response = await this.fetchImpl("https://api.openai.com/v1/responses", {
+                    method: "POST",
+                    headers: {
+                        authorization: `Bearer ${credential.apiKey}`,
+                        "content-type": "application/json",
+                    },
+                    body: JSON.stringify(payload),
+                    redirect: "error",
+                    signal: controller.signal,
+                });
+                lastStatus = response.status;
+                lastRejection = undefined;
+                if (response.ok) {
+                    const headers = new Headers();
+                    for (const name of [
+                        "content-type",
+                        "cache-control",
+                        "x-request-id",
+                        "retry-after",
+                    ]) {
+                        const value = response.headers.get(name);
+                        if (value)
+                            headers.set(name, value);
+                    }
+                    return new Response(response.body, {
+                        status: response.status,
+                        headers,
+                    });
+                }
+                const errorBody = await readErrorBody(response, 5000, 65536);
+                let data;
+                try {
+                    data = JSON.parse(errorBody);
+                }
+                catch {
+                    data = null;
+                }
+                const rejection = classifyCapabilityFailure(response.status, data);
+                const source = isRecord(data) && isRecord(data.error) ? data.error : {};
+                const sanitized = { message: "Upstream rejected the API request.", code: "api_request_rejected" };
+                for (const field of ["code", "type", "param"]) {
+                    const value = source[field];
+                    if (typeof value === "string" && /^[A-Za-z0-9_.]{1,80}$/.test(value))
+                        sanitized[field] = value;
+                }
+                if (rejection) {
+                    lastRejection = Response.json({ error: sanitized }, { status: response.status });
+                    this.failures.record(this.key(credential), route.upstreamModel, rejection, effort, route.serviceTier);
+                    continue;
+                }
+                if (![401, 403, 429, 500, 502, 503, 504].includes(response.status)) {
+                    return Response.json({ error: sanitized }, { status: response.status });
+                }
+            }
+            catch (error) {
+                if (error instanceof ClientCancellationError)
+                    throw error;
+                if (signal?.aborted)
+                    throw new ClientCancellationError();
+                lastStatus = 502;
+                lastRejection = undefined;
+            }
+            finally {
+                clearTimeout(timer);
+                signal?.removeEventListener("abort", abort);
+            }
+        }
+        if (lastRejection)
+            return lastRejection;
+        // A 401/403 here belongs to the API key, not the desktop login; the native
+        // client must not read an exhausted credential pool as a bad login.
+        return this.failure(lastStatus === 401 || lastStatus === 403 ? 503 : lastStatus, "model_route_pool_unavailable");
+    }
+    recordStreamFailure(credential, alias, body, error) {
+        const route = parseModelRoute(alias);
+        if (route.kind !== credential.kind)
+            return;
+        const rejection = classifyCapabilityFailure(400, error);
+        if (!rejection)
+            return;
+        const effort = isRecord(body.reasoning) && typeof body.reasoning.effort === "string" ? body.reasoning.effort : undefined;
+        const tier = route.serviceTier ?? (typeof body.service_tier === "string" ? body.service_tier : undefined);
+        this.failures.record(this.key(credential), route.upstreamModel, rejection, effort, tier);
+    }
+    failure(status, code, message = "No eligible credential could serve the selected API model route. No other pool was used.") {
+        return Response.json({
+            error: {
+                code,
+                message,
+            },
+        }, { status });
+    }
+}

package/dist/lib/runtime/app-bind.d.ts

@@ -11,6 +11,11 @@ export interface AppBindPaths {
     launchAgentPath: string | null;
 }
 export interface AppBindState {
+    nativeOpenai?: boolean;
+    catalogAccount?: {
+        email: string;
+        accountId: string;
+    };
     version: 1;
     platform: NodeJS.Platform;
     host: string;
@@ -70,6 +75,11 @@ export interface AppBindResult {
 }
 export type ProcessIdentityVerifier = (pid: number, startedAt: number, platform: NodeJS.Platform, identityToken?: string) => boolean | Promise<boolean>;
 export interface AppBindOptions {
+    nativeOpenai?: boolean;
+    catalogAccount?: {
+        email: string;
+        accountId: string;
+    };
     env?: NodeJS.ProcessEnv;
     platform?: NodeJS.Platform;
     home?: string;
@@ -93,6 +103,8 @@ export interface DetachedProcessStopOptions {
     /** Expected per-process nonce when verifying a persisted PID. */
     identityToken?: string;
     verifyProcessIdentity?: ProcessIdentityVerifier;
+    /** Called once the recorded PID is verified as this router, before it is stopped. */
+    onOwnershipVerified?: () => void;
 }
 export interface RuntimeRotationAppHelperStatus {
     state: string | null;
@@ -104,9 +116,15 @@ export interface RuntimeRotationAppHelperStatus {
     /** Per-process nonce echoed by the helper command line. */
     identityToken?: string | null;
 }
-export declare function rewriteConfigTomlForAppBind(rawConfig: string, baseUrl: string, clientApiKey?: string): string;
+export declare function rewriteConfigTomlForAppBind(rawConfig: string, baseUrl: string, clientApiKey?: string, nativeOpenai?: boolean): string;
 export declare function restoreConfigTomlFromAppBind(currentConfig: string, originalConfig: string): string;
 export declare function resolveAppBindPaths(options?: AppBindOptions): AppBindPaths;
+/**
+ * Whether anything still accepts connections at a recorded router address.
+ * Only "refused" is proof that no router serves it; a timeout or an unusable
+ * address is "unknown".
+ */
+export declare function probeRouterAddress(baseUrl: string | null | undefined, platform?: NodeJS.Platform, timeoutMs?: number): Promise<"refused" | "listening" | "unknown">;
 export declare function stopRuntimeRotationRouterProcess(router: Pick<AppBindRouterStatus, "state" | "pid" | "startedAt" | "updatedAt" | "statusPath" | "routerScriptPath" | "identityToken"> | null, platform: NodeJS.Platform, routerScriptPath: string, options?: DetachedProcessStopOptions): Promise<boolean>;
 /** Parse the documented local-time format emitted by `ps -o lstart=`. */
 export declare function parsePosixProcessStartTime(value: string): number | null;

package/dist/lib/runtime/app-bind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-bind.d.ts","sourceRoot":"","sources":["../../../lib/runtime/app-bind.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-bind.d.ts","sourceRoot":"","sources":["../../../lib/runtime/app-bind.ts"],"names":[],"mappings":"AA2CA,MAAM,WAAW,YAAY;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAUD,MAAM,WAAW,YAAY;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;KAAE,CAAC;IACvD,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iFAAiF;IACjF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IACnC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,YAAY,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,uBAAuB,GAAG,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,aAAa,CAAC,EAAE,MAAM,KAClB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,MAAM,WAAW,cAAc;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;KAAE,CAAC;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,sEAAsE;IACtE,qBAAqB,CAAC,EAAE,uBAAuB,CAAC;CAChD;AAED,MAAM,WAAW,0BAA0B;IAC1C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACrD,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC9D,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,iEAAiE;IACjE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,uBAAuB,CAAC;IAChD,qFAAqF;IACrF,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,8BAA8B;IAC9C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAoCD,wBAAgB,2BAA2B,CAC1C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,YAAY,SAAK,EACjB,YAAY,UAAQ,GAClB,MAAM,CAOR;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAKlG;AAwPD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,cAAmB,GAAG,YAAY,CAwB9E;AAgJD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAAE,SAAS,SAA0E,GAAG,OAAO,CAAC,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC,CAY5P;AAqCD,wBAAsB,gCAAgC,CACrD,MAAM,EAAE,IAAI,CACX,mBAAmB,EACjB,OAAO,GACP,KAAK,GACL,WAAW,GACX,WAAW,GACX,YAAY,GACZ,kBAAkB,GAClB,eAAe,CACjB,GAAG,IAAI,EACR,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,GAAE,0BAA+B,GACtC,OAAO,CAAC,OAAO,CAAC,CAoElB;AAsMD,yEAAyE;AACzE,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwCvE;AAmKD,wBAAsB,mBAAmB,CACxC,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,OAAO,GAAE,0BAA+B,GACtC,OAAO,CAAC,OAAO,CAAC,CA6DlB;AAmED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,IAAI,CAAC;AA8C3C,wBAAsB,mCAAmC,CACxD,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,0BAA0B,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAA;CAAO,GACvE,OAAO,CAAC,OAAO,CAAC,CAwClB;AAUD,wBAAsB,gBAAgB,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAqB3F;AAED,wBAAsB,2BAA2B,CAChD,OAAO,GAAE,cAAmB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAKxB;AA2JD,wBAAsB,6BAA6B,CAClD,OAAO,GAAE,cAAmB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAKxB;AAsQD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAuCjE"}

package/dist/lib/runtime/app-bind.js

@@ -1,7 +1,11 @@
+import { withNativeBindingLock } from "./native-binding-lock.js";
+import { isRecord } from "../utils.js";
+import { hasNativeProviderConfig, rewriteNativeProviderConfig, restoreNativeProviderConfig } from "./native-provider-config.js";
 import { spawn } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
 import { closeSync, existsSync, mkdirSync, openSync } from "node:fs";
 import { mkdir, open, readFile, readdir, rename, rm, unlink } from "node:fs/promises";
+import { connect } from "node:net";
 import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
 import process from "node:process";
@@ -51,11 +55,13 @@ async function withAppBindLock(key, operation) {
         }
     }
 }
-export function rewriteConfigTomlForAppBind(rawConfig, baseUrl, clientApiKey = "") {
+export function rewriteConfigTomlForAppBind(rawConfig, baseUrl, clientApiKey = "", nativeOpenai = false) {
+    if (nativeOpenai)
+        return rewriteNativeProviderConfig(rawConfig, baseUrl);
     return rewriteConfigTomlForRuntimeRotationProvider(rawConfig, baseUrl, clientApiKey);
 }
 export function restoreConfigTomlFromAppBind(currentConfig, originalConfig) {
-    return restoreConfigTomlFromRuntimeRotationProvider(currentConfig, originalConfig);
+    return restoreConfigTomlFromRuntimeRotationProvider(restoreNativeProviderConfig(currentConfig, originalConfig), originalConfig);
 }
 function sha256(value) {
     return createHash("sha256").update(value).digest("hex");
@@ -183,6 +189,8 @@ function readAppBindStateRecord(record) {
         nodePath,
         routerScriptPath,
         clientApiKey,
+        nativeOpenai: record.nativeOpenai === true,
+        catalogAccount: isRecord(record.catalogAccount) && typeof record.catalogAccount.email === "string" && typeof record.catalogAccount.accountId === "string" ? { email: record.catalogAccount.email, accountId: record.catalogAccount.accountId } : undefined,
         identityToken: identityToken ?? undefined,
         startupPath: readString(record, "startupPath"),
         launchAgentPath: readString(record, "launchAgentPath"),
@@ -421,6 +429,30 @@ function spawnRouter(state) {
         closeSync(logFd);
     }
 }
+/**
+ * Whether anything still accepts connections at a recorded router address.
+ * Only "refused" is proof that no router serves it; a timeout or an unusable
+ * address is "unknown".
+ */
+export async function probeRouterAddress(baseUrl, platform = process.platform, timeoutMs = platform === "win32" ? WINDOWS_PROCESS_IDENTITY_PROBE_TIMEOUT_MS : 1000) {
+    let url;
+    try {
+        url = new URL(baseUrl ?? "");
+    }
+    catch {
+        return "unknown";
+    }
+    const port = Number(url.port);
+    if (!Number.isInteger(port) || port <= 0)
+        return "unknown";
+    return new Promise((resolve) => {
+        const socket = connect({ host: url.hostname.replace(/^\[|\]$/g, ""), port });
+        const done = (result) => { clearTimeout(timer); socket.destroy(); resolve(result); };
+        const timer = setTimeout(() => done("unknown"), timeoutMs);
+        socket.once("connect", () => done("listening"));
+        socket.once("error", (error) => done(error.code === "ECONNREFUSED" ? "refused" : "unknown"));
+    });
+}
 async function maybeStartRouter(state, options) {
     if (options.spawnDetached === false)
         return false;
@@ -497,6 +529,7 @@ export async function stopRuntimeRotationRouterProcess(router, platform, routerS
     if (!verified) {
         return false;
     }
+    options.onOwnershipVerified?.();
     return stopDetachedProcess(router.pid, platform, options);
 }
 async function stopRouter(router, platform, routerScriptPath, options = {}) {
@@ -537,6 +570,13 @@ async function runWindowsTaskkill(pid) {
         }
     });
 }
+// `ps -o lstart=` is locale-sensitive: under a non-English LC_TIME it prints
+// localized day/month names that parsePosixProcessStartTime cannot read, so
+// every POSIX identity probe would fail and unbind would leak live routers.
+const POSIX_IDENTITY_PROBE_ENV = {
+    ...process.env,
+    LC_ALL: "C",
+};
 async function runProcessIdentityProbe(command, args, options = {}) {
     return new Promise((resolve) => {
         let output = "";
@@ -568,6 +608,7 @@ async function runProcessIdentityProbe(command, args, options = {}) {
             child = spawn(command, args, {
                 stdio: ["ignore", "pipe", "ignore"],
                 windowsHide: true,
+                ...(options.env ? { env: options.env } : {}),
             });
             child.stdout?.setEncoding("utf8");
             child.stdout?.on("data", (chunk) => {
@@ -616,8 +657,8 @@ async function readProcessIdentity(pid, platform, log) {
         };
     }
     const [startedAtRaw, commandLineRaw] = await Promise.all([
-        runProcessIdentityProbe("ps", ["-p", String(pid), "-o", "lstart="], { log }),
-        runProcessIdentityProbe("ps", ["-p", String(pid), "-o", "command="], { log }),
+        runProcessIdentityProbe("ps", ["-p", String(pid), "-o", "lstart="], { env: POSIX_IDENTITY_PROBE_ENV, log }),
+        runProcessIdentityProbe("ps", ["-p", String(pid), "-o", "command="], { env: POSIX_IDENTITY_PROBE_ENV, log }),
     ]);
     if (!startedAtRaw || !commandLineRaw) {
         log?.(`Process identity probe returned no POSIX record for PID ${pid}`);
@@ -960,7 +1001,7 @@ export async function getAppBindStatus(options = {}) {
     if (state === null) {
         const current = await readConfigIfExists(paths.configPath);
         unmanagedBind =
-            current.existed && configHasRuntimeRotationProvider(current.content);
+            current.existed && (configHasRuntimeRotationProvider(current.content) || hasNativeProviderConfig(current.content));
     }
     return {
         bound: state !== null || unmanagedBind,
@@ -973,12 +1014,42 @@ export async function getAppBindStatus(options = {}) {
 }
 export async function bindCodexAppRuntimeRotation(options = {}) {
     const paths = resolveAppBindPaths(options);
-    return withAppBindLock(paths.bindDir, () => bindCodexAppRuntimeRotationLocked(options, paths));
+    return withAppBindLock(paths.bindDir, () => withNativeBindingLock(paths.configPath, () => bindCodexAppRuntimeRotationLocked(options, paths)));
 }
 async function bindCodexAppRuntimeRotationLocked(options, paths) {
     const platform = options.platform ?? process.platform;
     const now = options.now?.() ?? Date.now();
     const existingState = await readAppBindState(paths.statePath);
+    const nativeOpenai = options.nativeOpenai ?? existingState?.nativeOpenai ??
+        ((options.env ?? process.env).CODEX_MULTI_AUTH_NATIVE_OPENAI === "1");
+    const catalogAccount = options.nativeOpenai === false ? undefined : options.catalogAccount ?? existingState?.catalogAccount;
+    if (existingState && (!!existingState.nativeOpenai !== nativeOpenai || JSON.stringify(catalogAccount) !== JSON.stringify(existingState.catalogAccount))) {
+        const router = await readRouterStatus(paths.statusPath);
+        let ownRouter = false;
+        await stopRouter(router, platform, existingState.routerScriptPath, {
+            log: options.log, identityToken: existingState.identityToken, verifyProcessIdentity: options.verifyProcessIdentity,
+            onOwnershipVerified: () => { ownRouter = true; },
+        });
+        // Refuse only when the recorded PID is verifiably our router and it survived
+        // the stop. A recycled PID now owned by another process must not block
+        // mode changes forever (unbind treats the same case as a warning).
+        if (router?.pid && isProcessAlive(router.pid)) {
+            if (ownRouter)
+                throw new Error("Stop the existing app router before changing provider mode");
+            // A failed identity check is not proof: a slow or failing process probe
+            // (common on Windows) also returns false for a live router. Treat the pid
+            // as recycled only when nothing answers at the recorded router address.
+            const address = await probeRouterAddress(router.baseUrl ?? existingState.baseUrl, options.platform ?? process.platform);
+            if (address !== "refused") {
+                throw new Error(`Could not confirm that the app router recorded as pid ${router.pid} has stopped (its address ${address === "listening" ? "still accepts connections" : "could not be checked"}). Stop it before changing provider mode.`);
+            }
+            options.log?.(`Warning: recorded router pid ${router.pid} is not the app router; continuing`);
+            // The record describes a router that no longer exists. Drop it so
+            // maybeStartRouter starts a replacement instead of trusting the live
+            // (recycled) pid and leaving the new mode pointed at a dead address.
+            await unlinkIfExists(paths.statusPath);
+        }
+    }
     const host = existingState?.host ?? "127.0.0.1";
     let port = existingState && existingState.port > 0 ? existingState.port : 0;
     let baseUrl = existingState?.baseUrl ?? formatBaseUrl(host, port);
@@ -993,8 +1064,13 @@ async function bindCodexAppRuntimeRotationLocked(options, paths) {
         content,
         createdAt: now,
     };
-    let boundConfig = rewriteConfigTomlForAppBind(content, baseUrl, clientApiKey);
+    const bindingContent = nativeOpenai
+        ? restoreConfigTomlFromAppBind(content, backup.content)
+        : restoreNativeProviderConfig(content, backup.content);
+    let boundConfig = rewriteConfigTomlForAppBind(bindingContent, baseUrl, clientApiKey, nativeOpenai);
     let state = {
+        nativeOpenai,
+        catalogAccount,
         version: 1,
         platform,
         host,
@@ -1056,7 +1132,7 @@ async function bindCodexAppRuntimeRotationLocked(options, paths) {
         }
         throw new Error("Codex app bind could not resolve a runtime router port; refusing to write config.toml with port=0.");
     }
-    boundConfig = rewriteConfigTomlForAppBind(content, baseUrl, clientApiKey);
+    boundConfig = rewriteConfigTomlForAppBind(bindingContent, baseUrl, clientApiKey, nativeOpenai);
     state = {
         ...state,
         port,
@@ -1078,7 +1154,7 @@ async function bindCodexAppRuntimeRotationLocked(options, paths) {
 }
 export async function unbindCodexAppRuntimeRotation(options = {}) {
     const paths = resolveAppBindPaths(options);
-    return withAppBindLock(paths.bindDir, () => unbindCodexAppRuntimeRotationLocked(options, paths));
+    return withAppBindLock(paths.bindDir, () => withNativeBindingLock(paths.configPath, () => unbindCodexAppRuntimeRotationLocked(options, paths)));
 }
 async function unbindCodexAppRuntimeRotationLocked(options, paths) {
     const state = await readAppBindState(paths.statePath);
@@ -1262,8 +1338,8 @@ async function unbindCodexAppRuntimeRotationLocked(options, paths) {
         // above can't see this, so consult the config directly and self-heal it
         // back to a working provider when it is bound.
         const current = await readConfigIfExists(paths.configPath);
-        if (current.existed && configHasRuntimeRotationProvider(current.content)) {
-            await atomicWriteFile(paths.configPath, restoreConfigTomlFromRuntimeRotationProviderWithoutBackup(current.content));
+        if (current.existed && (configHasRuntimeRotationProvider(current.content) || hasNativeProviderConfig(current.content))) {
+            await atomicWriteFile(paths.configPath, restoreConfigTomlFromRuntimeRotationProviderWithoutBackup(restoreNativeProviderConfig(current.content, "")));
             selfHealed = true;
         }
     }
@@ -1328,6 +1404,8 @@ export function formatAppBindStatus(status) {
     else if (status.router?.lastAccountIndex !== null && status.router?.lastAccountIndex !== undefined) {
         parts.push(`lastAccount=Account ${status.router.lastAccountIndex + 1}`);
     }
+    if (status.state.nativeOpenai)
+        return `Codex app bind: ${parts.join(", ")}, native OpenAI, live account catalogs`;
     return [
         `Codex app bind: ${parts.join(", ")}`,
         [