oc-codex-multi-auth 6.22.0 → 6.24.0

package/dist/lib/opencode-v2-tui.js

@@ -0,0 +1,105 @@
+import { createElement, spread } from "@opentui/solid";
+import { createSignal, onCleanup } from "solid-js";
+import { CodexStatusRpc } from "./opencode-v2-rpc.js";
+/** Register quota and account views; return a disposer for the V2 TUI slots. */
+export function setupV2Tui(context) {
+    const [text, setText] = createSignal("");
+    const [accounts, setAccounts] = createSignal("Loading accounts…");
+    const [showFor, setShowFor] = createSignal("always");
+    const disposers = [context.ui.slot({
+            append: "app",
+            render: () => {
+                let details = "Quota is loading.";
+                let disposed = false;
+                let pending = false;
+                const controller = new AbortController();
+                const rpc = context.client.rpc(CodexStatusRpc);
+                const refresh = async () => {
+                    if (pending || disposed)
+                        return;
+                    pending = true;
+                    try {
+                        const result = await rpc.status({ width: Math.max(1, Math.min(1000, context.renderer.width - 40)) }, {
+                            location: context.location ?? context.data.location.default(), signal: controller.signal,
+                        });
+                        if (disposed)
+                            return;
+                        setText(result.text);
+                        setShowFor(result.showFor);
+                        setAccounts(result.accounts.length ? result.accounts.map((account) => `${account.active ? "●" : "○"} ${account.index}. ${account.label}${account.enabled ? "" : " (disabled)"}`).join("\n") : "No Codex accounts in this pool.");
+                        details = result.details;
+                    }
+                    catch {
+                        if (!disposed) {
+                            setText("limits ?");
+                            setAccounts("Accounts unavailable — retry shortly.");
+                            details = "Quota unavailable — retry shortly.";
+                        }
+                    }
+                    finally {
+                        pending = false;
+                    }
+                };
+                void refresh();
+                const timer = setInterval(() => { void refresh(); }, 2_000);
+                context.keymap.layer(() => ({
+                    mode: "global",
+                    commands: [{
+                            id: "codex.quota.details", title: "Codex quota details", group: "Codex", palette: true,
+                            async run() {
+                                await refresh();
+                                await context.ui.dialog.alert({ title: "Codex quota", message: details });
+                            },
+                        }, {
+                            id: "codex.accounts", title: "Codex accounts", group: "Codex", palette: true,
+                            slash: { name: "codex-accounts" },
+                            async run() {
+                                await refresh();
+                                await context.ui.dialog.alert({
+                                    title: "Codex accounts",
+                                    message: `${accounts()}\n\nAdd an account: run opencode auth login from this project directory, then select OpenAI → Codex OAuth (Add account — ChatGPT Plus/Pro). Repeat for each account, using a private browser window to choose a different login.`,
+                                });
+                            },
+                        }],
+                }));
+                onCleanup(() => { disposed = true; controller.abort(); clearInterval(timer); });
+                return null;
+            },
+        }), context.ui.slot({
+            append: "prompt.footer.status",
+            render: (props) => {
+                const element = createElement("text");
+                spread(element, {
+                    get children() {
+                        let providerID = props.sessionID ? context.data.session.get(props.sessionID)?.model?.providerID : undefined;
+                        if (props.sessionID) {
+                            const messages = context.data.session.message.list(props.sessionID) ?? [];
+                            for (let index = messages.length - 1; index >= 0; index -= 1) {
+                                const message = messages[index];
+                                if (message?.type !== "assistant")
+                                    continue;
+                                providerID = message.model.providerID;
+                                break;
+                            }
+                        }
+                        return showFor() === "codex-models" && providerID && providerID !== "openai" ? "" : text();
+                    },
+                    get fg() { return context.theme.text.base; },
+                });
+                return element;
+            },
+        }), context.ui.slot({
+            append: "sidebar.content",
+            render: () => {
+                const element = createElement("text");
+                spread(element, {
+                    get children() { return `\nCodex accounts\n${accounts()}\n/codex-accounts`; },
+                    get fg() { return context.theme.text.base; },
+                });
+                return element;
+            },
+        })];
+    return () => { for (const dispose of disposers)
+        dispose(); };
+}
+//# sourceMappingURL=opencode-v2-tui.js.map

package/dist/lib/opencode-v2-tui.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-v2-tui.js","sourceRoot":"","sources":["../../lib/opencode-v2-tui.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,gFAAgF;AAChF,MAAM,UAAU,UAAU,CAAC,OAAuB;IACjD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAClE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC;YAClC,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,GAAG,EAAE;gBACZ,IAAI,OAAO,GAAG,mBAAmB,CAAC;gBAClC,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;gBACzC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAC/C,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;oBAC1B,IAAI,OAAO,IAAI,QAAQ;wBAAE,OAAO;oBAChC,OAAO,GAAG,IAAI,CAAC;oBACf,IAAI,CAAC;wBACJ,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;4BACpG,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM;yBACxF,CAAC,CAAC;wBACH,IAAI,QAAQ;4BAAE,OAAO;wBACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACrB,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBAC3B,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACpE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CACzG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC;wBAClD,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;oBAC1B,CAAC;oBAAC,MAAM,CAAC;wBACR,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACf,OAAO,CAAC,UAAU,CAAC,CAAC;4BACpB,WAAW,CAAC,uCAAuC,CAAC,CAAC;4BACrD,OAAO,GAAG,oCAAoC,CAAC;wBAChD,CAAC;oBACF,CAAC;4BAAS,CAAC;wBACV,OAAO,GAAG,KAAK,CAAC;oBACjB,CAAC;gBACF,CAAC,CAAC;gBACF,KAAK,OAAO,EAAE,CAAC;gBACf,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBAC5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC3B,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,CAAC;4BACV,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI;4BACtF,KAAK,CAAC,GAAG;gCACR,MAAM,OAAO,EAAE,CAAC;gCAChB,MAAM,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;4BAC3E,CAAC;yBACD,EAAE;4BACF,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI;4BAC5E,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;4BACjC,KAAK,CAAC,GAAG;gCACR,MAAM,OAAO,EAAE,CAAC;gCAChB,MAAM,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;oCAC7B,KAAK,EAAE,gBAAgB;oCACvB,OAAO,EAAE,GAAG,QAAQ,EAAE,kOAAkO;iCACxP,CAAC,CAAC;4BACJ,CAAC;yBACD,CAAC;iBACF,CAAC,CAAC,CAAC;gBACJ,SAAS,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChF,OAAO,IAAI,CAAC;YACb,CAAC;SACD,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,sBAAsB;YAC9B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,CAAC,OAAO,EAAE;oBACf,IAAI,QAAQ;wBACX,IAAI,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC5G,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;4BACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;4BAC1E,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;gCAC9D,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;gCAChC,IAAI,OAAO,EAAE,IAAI,KAAK,WAAW;oCAAE,SAAS;gCAC5C,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;gCACtC,MAAM;4BACP,CAAC;wBACF,CAAC;wBACD,OAAO,OAAO,EAAE,KAAK,cAAc,IAAI,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC5F,CAAC;oBACD,IAAI,EAAE,KAAK,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC5C,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC;YAChB,CAAC;SACD,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE,GAAG,EAAE;gBACZ,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,CAAC,OAAO,EAAE;oBACf,IAAI,QAAQ,KAAK,OAAO,qBAAqB,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC;oBAC7E,IAAI,EAAE,KAAK,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC5C,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC;YAChB,CAAC;SACD,CAAC,CAAC,CAAC;IACJ,OAAO,GAAG,EAAE,GAAG,KAAK,MAAM,OAAO,IAAI,SAAS;QAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC"}

package/dist/lib/opencode-v2.d.ts

@@ -0,0 +1,11 @@
+import { type Plugin } from "@opencode/plugin";
+import type { Hooks } from "@opencode-ai/plugin";
+/** V1 supplied these defaults through provider options; V2's bridge needs them on the wire. */
+export declare function createV2Fetch(fetcher: (input: Request | string | URL, init?: RequestInit) => Promise<Response>, version: string): (input: Request | string | URL, init?: RequestInit) => Promise<Response>;
+/** The shared V1 runtime factory, passed in by the package entry. */
+export type CreateV2Runtime = (options: {
+    directory: string;
+}) => Promise<Hooks>;
+/** Keep account rotation and wire transforms in the shared runtime. */
+export declare function setupV2(context: Plugin.Context, createPluginRuntime: CreateV2Runtime): Promise<() => Promise<void>>;
+//# sourceMappingURL=opencode-v2.d.ts.map

package/dist/lib/opencode-v2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-v2.d.ts","sourceRoot":"","sources":["../../lib/opencode-v2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAmCjD,+FAA+F;AAC/F,wBAAgB,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,IACjH,OAAO,OAAO,GAAG,MAAM,GAAG,GAAG,EAAE,OAAO,WAAW,KAAG,OAAO,CAAC,QAAQ,CAAC,CAUnF;AAED,qEAAqE;AACrE,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;AAEjF,uEAAuE;AACvE,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,mBAAmB,EAAE,eAAe,gCAGpF"}

package/dist/lib/opencode-v2.js

@@ -0,0 +1,235 @@
+import { createOpenAI } from "@ai-sdk/openai";
+import { existsSync } from "node:fs";
+import { Integration } from "@opencode/plugin";
+import { z } from "zod";
+import { loadAccounts } from "./storage.js";
+import { coordinatePersistedRefresh } from "./storage/coordinated-refresh.js";
+import { logInfo, logWarn } from "./logger.js";
+import { readV2Status } from "./opencode-v2-status.js";
+import { CodexStatusRpc } from "./opencode-v2-rpc.js";
+import { createStorageScope } from "./storage/state.js";
+import { AUTH_LABELS } from "./constants.js";
+import { openBrowserUrl } from "./auth/browser.js";
+import { extractAccountId, extractAccountUserId } from "./auth/token-utils.js";
+const providerModule = new URL("./opencode-v2-provider.js", import.meta.url);
+// Local checkouts are loaded from TypeScript; published packages contain JS.
+if (!existsSync(providerModule))
+    providerModule.pathname = providerModule.pathname.replace(/\.js$/, ".ts");
+const providerPackage = `aisdk:${providerModule.href}`;
+/** Set stateless options before the SDK lowers history into server-side references. */
+function createV2Language(model) {
+    const stateless = (options) => {
+        const openai = { ...options.providerOptions?.openai, store: false };
+        delete openai.previousResponseId;
+        delete openai.conversation;
+        return { ...options, providerOptions: { ...options.providerOptions, openai } };
+    };
+    return new Proxy(model, {
+        get(target, property, receiver) {
+            if (property === "doGenerate")
+                return (options) => target.doGenerate(stateless(options));
+            if (property === "doStream")
+                return (options) => target.doStream(stateless(options));
+            return Reflect.get(target, property, receiver);
+        },
+    });
+}
+/** V1 supplied these defaults through provider options; V2's bridge needs them on the wire. */
+export function createV2Fetch(fetcher, version) {
+    return async (input, init) => {
+        const request = new Request(input, init);
+        const headers = new Headers(request.headers);
+        headers.set("user-agent", `opencode/${version}`);
+        if (request.method !== "POST" || !request.body)
+            return fetcher(request);
+        const body = await request.json();
+        body.store = false;
+        body.include = [...new Set([...(Array.isArray(body.include) ? body.include : []), "reasoning.encrypted_content"])];
+        return fetcher(request.url, { method: request.method, headers, body: JSON.stringify(body), signal: request.signal });
+    };
+}
+/** Keep account rotation and wire transforms in the shared runtime. */
+export function setupV2(context, createPluginRuntime) {
+    const run = createStorageScope();
+    return run(() => setupScopedV2(context, run, createPluginRuntime));
+}
+/** Register V2 hooks within the location's account-storage scope and release them on unload. */
+async function setupScopedV2(context, run, createPluginRuntime) {
+    const runtime = await createPluginRuntime({ directory: context.location.directory });
+    const auth = runtime.auth;
+    if (!auth?.loader)
+        throw new Error("Codex authentication runtime is unavailable");
+    const loader = auth.loader;
+    const hasOAuth = async () => {
+        if ((await loadAccounts())?.accounts.some((account) => account.enabled !== false && account.refreshToken))
+            return true;
+        const connection = await context.integration.connection.active("openai");
+        return connection ? (await context.integration.connection.resolve(connection))?.type === "oauth" : false;
+    };
+    let enabled = false;
+    const reload = async () => { enabled = await hasOAuth(); await context.provider.reload(); };
+    const controller = new AbortController();
+    const cleanup = () => run(async () => {
+        controller.abort();
+        await runtime.event?.({ event: { type: "server.instance.disposed", properties: { directory: context.location.directory } } });
+    });
+    try {
+        enabled = await hasOAuth();
+        logInfo("V2 Codex adapter initialized", { enabled, directory: context.location.directory });
+        await context.rpc.register(CodexStatusRpc, { status: (input) => run(() => readV2Status(input)) });
+        // V2 runs authorization in the service, where the V1 readline menu cannot run.
+        // Reuse the append-only loopback flow for the primary add-account method.
+        await context.integration.transform((editor) => {
+            for (const [index, method] of auth.methods.entries()) {
+                if (method.type !== "oauth")
+                    continue;
+                const primary = index === 0;
+                const flowMethod = primary
+                    ? auth.methods.find((candidate) => candidate.label === AUTH_LABELS.OAUTH_MANUAL_BROWSER)
+                    : method;
+                if (flowMethod?.type !== "oauth")
+                    continue;
+                const methodID = Integration.MethodID.make(`codex-multi-${index}`);
+                editor.method.update({
+                    integrationID: "openai",
+                    method: { id: methodID, type: "oauth", label: primary ? "Codex OAuth (Add account — ChatGPT Plus/Pro)" : method.label },
+                    authorize: () => run(async () => {
+                        const flow = await flowMethod.authorize();
+                        if (primary && flow.url)
+                            openBrowserUrl(flow.url);
+                        const instructions = flow.url
+                            ? `${flow.instructions}\nAdds to this project's Codex account pool. Use a private browser window or switch accounts to add a different login. Repeat opencode auth login for another account; view the pool with /codex-accounts.`
+                            : flow.instructions;
+                        const credential = (code) => run(async () => {
+                            const result = flow.method === "code" ? await flow.callback(code ?? "") : await flow.callback();
+                            if (result.type !== "success" || !("access" in result))
+                                throw new Error("Codex sign-in failed; retry authentication");
+                            await reload();
+                            return { type: "oauth", methodID, access: result.access, refresh: result.refresh, expires: result.expires };
+                        });
+                        return flow.method === "code"
+                            ? { url: flow.url, instructions, mode: "code", callback: credential }
+                            : { url: flow.url, instructions, mode: "auto", callback: credential() };
+                    }),
+                    refresh: (credential) => run(async () => {
+                        const pool = await loadAccounts();
+                        const exactMatches = pool?.accounts.filter((account) => account.refreshToken === credential.refresh) ?? [];
+                        const accountId = extractAccountId(credential.access);
+                        const accountUserId = extractAccountUserId(credential.access);
+                        const matches = pool?.accounts.filter((account) => (accountId || accountUserId) &&
+                            (!accountId || account.accountId === accountId) &&
+                            (!accountUserId || account.accountUserId === accountUserId)) ?? [];
+                        // One OAuth grant can back several seats. The access-token seat wins
+                        // over a shared refresh token; never guess if both are ambiguous.
+                        const account = matches.length === 1 ? matches[0] : exactMatches.length === 1 ? exactMatches[0] : undefined;
+                        if (!account && exactMatches.length > 1)
+                            throw new Error("Codex refresh account is ambiguous; reconnect the account");
+                        const result = await coordinatePersistedRefresh({
+                            refreshToken: credential.refresh,
+                            ...(account ? { organizationId: account.organizationId, accountId: account.accountId, accountUserId: account.accountUserId } : {}),
+                        });
+                        if (result.type !== "success")
+                            throw new Error("Codex token refresh failed");
+                        return { ...credential, access: result.access, refresh: result.refresh, expires: result.expires };
+                    }),
+                });
+            }
+        });
+        const resolveAuth = async () => {
+            const pool = await loadAccounts();
+            const account = pool?.accounts[pool.activeIndex] ?? pool?.accounts[0];
+            if (account?.refreshToken) {
+                return { type: "oauth", access: account.accessToken ?? "", refresh: account.refreshToken, expires: account.expiresAt ?? 0 };
+            }
+            const connection = await context.integration.connection.active("openai");
+            const credential = connection ? await context.integration.connection.resolve(connection) : undefined;
+            if (credential?.type === "oauth")
+                return credential;
+            throw new Error("Connect a Codex multi-account OAuth method with /connect first");
+        };
+        await context.provider.transform((editor) => {
+            if (!enabled)
+                return;
+            editor.update("openai", (provider) => {
+                provider.package = providerPackage;
+                provider.activation = "enabled";
+                provider.settings = { ...provider.settings, transport: "http" };
+            });
+            for (const model of editor.get("openai")?.models.values() ?? []) {
+                editor.models.update("openai", model.id, (draft) => { draft.package = providerPackage; });
+            }
+        });
+        await context.aisdk.hook("sdk", (event) => run(async () => {
+            if (!enabled)
+                return;
+            const options = await loader(resolveAuth, {
+                id: "openai", name: "OpenAI", source: "custom", env: [], models: {},
+                options: event.model.settings ?? {},
+            });
+            const fetcher = options.fetch;
+            if (typeof fetcher !== "function")
+                throw new Error("Codex request transport could not be initialized");
+            event.sdk = createOpenAI({
+                apiKey: typeof options.apiKey === "string" ? options.apiKey : "codex-oauth",
+                baseURL: typeof options.baseURL === "string" ? options.baseURL : undefined,
+                fetch: createV2Fetch((input, init) => run(() => fetcher(input, init)), context.app.version),
+            });
+        }), { providerID: "openai" });
+        await context.model.transform((editor) => {
+            if (!enabled)
+                return;
+            for (const model of editor.list("openai")) {
+                editor.update("openai", String(model.id), (draft) => {
+                    draft.package = providerPackage;
+                    draft.settings = { ...draft.settings, transport: "http" };
+                });
+            }
+        });
+        await context.aisdk.hook("language", (event) => {
+            if (!enabled)
+                return;
+            const sdk = event.sdk;
+            event.language = createV2Language(sdk.responses(event.model.modelID));
+        }, { providerID: "openai" });
+        await context.tool.transform((editor) => {
+            for (const [name, definition] of Object.entries(runtime.tool ?? {})) {
+                const schema = z.object(definition.args);
+                editor.add({
+                    name,
+                    description: definition.description,
+                    input: z.toJSONSchema(schema),
+                    execute: (input, call) => run(async () => {
+                        const result = await definition.execute(schema.parse(input), {
+                            sessionID: call.sessionID, messageID: call.messageID, agent: call.agent,
+                            directory: context.location.directory, worktree: context.location.project.directory,
+                            abort: call.signal,
+                            metadata: (update) => { void call.progress(update).catch(() => { }); },
+                            ask: () => { throw new Error("Legacy tool permission requests are not supported by the V2 adapter"); },
+                        });
+                        return { content: typeof result === "string" ? result : result.output };
+                    }),
+                });
+            }
+        });
+        void (async () => {
+            try {
+                for await (const event of context.event.subscribe({ signal: controller.signal })) {
+                    if (event.location && event.location.directory !== context.location.directory)
+                        continue;
+                    if (event.type === "credential.updated" || event.type === "credential.switched")
+                        await reload();
+                }
+            }
+            catch (error) {
+                if (!controller.signal.aborted)
+                    logWarn("V2 event subscription ended", { error: String(error) });
+            }
+        })();
+        return cleanup;
+    }
+    catch (error) {
+        await cleanup();
+        throw error;
+    }
+}
+//# sourceMappingURL=opencode-v2.js.map

package/dist/lib/opencode-v2.js.map

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

package/dist/lib/prompts/codex-opencode-bridge.js

@@ -7,73 +7,73 @@
  *
  * Token Count: ~450 tokens (~90% reduction vs full OpenCode prompt)
  */
-export const CODEX_OPENCODE_BRIDGE = `# Codex Running in OpenCode
-
-You are running Codex through OpenCode, an open-source terminal coding assistant.
-
-## Runtime Tooling Rule (Highest Priority)
-
-<critical_rule priority="0">
-Treat the runtime tool manifest as the only authoritative tool list.
-- Call ONLY tool names listed in that manifest.
-- Do NOT translate, alias, or rename tool names.
-- If a base instruction references a tool name that is not listed, ignore that alias and use the listed names only.
-</critical_rule>
-
-## Tool-Call Guardrails
-
-- Follow the current tool schema exactly for parameters.
-- Do not invent wrapper namespaces unless they are explicitly listed as tools.
-- If no explicit parallel helper tool is listed, run calls sequentially.
-- If a tool call fails validation, correct arguments to match schema and retry.
-
-## Planning & Modes
-
-- Never call \`update_plan\`, \`read_plan\`, or similarly named aliases.
-- Use planning tools only if they are explicitly listed in the runtime manifest.
-- \`request_user_input\` is Plan-mode only; never call it in Default mode.
-
-## Path & Execution Discipline
-
-- Follow per-tool path conventions from the active schema; do not assume absolute/relative behavior.
-- Prefer specialized tools over shell when an equivalent listed tool exists.
-- Use non-destructive checks before destructive commands.
-
-## Verification Checklist
-
-Before each tool call:
-1. Is the tool name exactly listed in the runtime manifest?
-2. Do arguments match the listed schema?
-3. Am I avoiding unlisted aliases and wrapper namespaces?
-4. Am I following mode/path constraints for this environment?
-
-If any answer is NO, correct it before proceeding.
-
-## OpenCode Working Style
-
-**Communication:**
-- Send brief preambles before tool calls.
-- Provide concise progress updates during longer tasks.
-
-**Execution:**
-- Continue working until the user request is fully resolved.
-- Do not return partial solutions unless blocked.
-
-**Code Approach:**
-- New projects: be creative and deliberate.
-- Existing codebases: make precise, minimal changes aligned to request.
-
-**Testing:**
-- If tests exist, run focused tests first, then broader validation.
-
-## What Remains from Codex
-
-Sandbox policies, approvals, final formatting, git protocols, and file reference formats still follow Codex instructions.
-
-## Approvals & Safety
-
-- Treat destructive commands (for example \`rm\`, \`git reset --hard\`) as requiring explicit user request or approval.
-- Never run \`git reset --hard\`, \`git checkout --\`, or force deletes unless explicitly requested.
+export const CODEX_OPENCODE_BRIDGE = `# Codex Running in OpenCode
+
+You are running Codex through OpenCode, an open-source terminal coding assistant.
+
+## Runtime Tooling Rule (Highest Priority)
+
+<critical_rule priority="0">
+Treat the runtime tool manifest as the only authoritative tool list.
+- Call ONLY tool names listed in that manifest.
+- Do NOT translate, alias, or rename tool names.
+- If a base instruction references a tool name that is not listed, ignore that alias and use the listed names only.
+</critical_rule>
+
+## Tool-Call Guardrails
+
+- Follow the current tool schema exactly for parameters.
+- Do not invent wrapper namespaces unless they are explicitly listed as tools.
+- If no explicit parallel helper tool is listed, run calls sequentially.
+- If a tool call fails validation, correct arguments to match schema and retry.
+
+## Planning & Modes
+
+- Never call \`update_plan\`, \`read_plan\`, or similarly named aliases.
+- Use planning tools only if they are explicitly listed in the runtime manifest.
+- \`request_user_input\` is Plan-mode only; never call it in Default mode.
+
+## Path & Execution Discipline
+
+- Follow per-tool path conventions from the active schema; do not assume absolute/relative behavior.
+- Prefer specialized tools over shell when an equivalent listed tool exists.
+- Use non-destructive checks before destructive commands.
+
+## Verification Checklist
+
+Before each tool call:
+1. Is the tool name exactly listed in the runtime manifest?
+2. Do arguments match the listed schema?
+3. Am I avoiding unlisted aliases and wrapper namespaces?
+4. Am I following mode/path constraints for this environment?
+
+If any answer is NO, correct it before proceeding.
+
+## OpenCode Working Style
+
+**Communication:**
+- Send brief preambles before tool calls.
+- Provide concise progress updates during longer tasks.
+
+**Execution:**
+- Continue working until the user request is fully resolved.
+- Do not return partial solutions unless blocked.
+
+**Code Approach:**
+- New projects: be creative and deliberate.
+- Existing codebases: make precise, minimal changes aligned to request.
+
+**Testing:**
+- If tests exist, run focused tests first, then broader validation.
+
+## What Remains from Codex
+
+Sandbox policies, approvals, final formatting, git protocols, and file reference formats still follow Codex instructions.
+
+## Approvals & Safety
+
+- Treat destructive commands (for example \`rm\`, \`git reset --hard\`) as requiring explicit user request or approval.
+- Never run \`git reset --hard\`, \`git checkout --\`, or force deletes unless explicitly requested.
 - When uncertain, prefer non-destructive verification first.`;
 const MAX_MANIFEST_TOOLS = 32;
 const normalizeRuntimeToolNames = (toolNames) => {

package/dist/lib/prompts/codex.d.ts

@@ -7,14 +7,24 @@ export declare function __clearCacheForTesting(): void;
  * Model family type for prompt selection
  * Maps to different system prompts in the Codex CLI
  */
-export type ModelFamily = "gpt-5-codex" | "codex-max" | "codex" | "gpt-6-astra" | "gpt-daybreak-blue" | "gpt-daybreak-red" | "gpt-5.6-cyber" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-5.6-luna" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.2" | "gpt-5.1";
+export type ModelFamily = "gpt-5-codex" | "codex-max" | "codex" | "gpt-6-astra" | "gpt-6-sol" | "gpt-6-luna" | "gpt-daybreak-blue" | "gpt-daybreak-red" | "gpt-5.6-cyber" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-5.6-luna" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.2" | "gpt-5.1";
 /**
  * All supported model families
  * Used for per-family account rotation and rate limit tracking
  */
 export declare const MODEL_FAMILIES: readonly ModelFamily[];
 /**
- * Pull one model's `base_instructions` out of a raw models.json payload.
+ * Pull one model's base instructions out of a raw models.json payload.
+ *
+ * openai/codex #43604 (2026-09-07) dropped `base_instructions` from every
+ * bundled catalog entry; the text now lives in
+ * `model_messages.instructions_template`. rust-v0.155.1 carries only the
+ * template for all nine of its models, so reading `base_instructions` alone
+ * served the legacy prompt file to every catalog model. The template is rendered the
+ * way Codex renders it with personality disabled
+ * (codex-rs/models-manager/src/model_info.rs): the placeholder takes
+ * `personality_default`, which is "" for every entry that carries one.
+ * `base_instructions` still wins when present, for tags that predate the move.
  *
  * @returns The instructions, or null when the tag predates the slug.
  */

package/dist/lib/prompts/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../lib/prompts/codex.ts"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAM7C;AAWD;;;GAGG;AACH,MAAM,MAAM,WAAW,GACpB,aAAa,GACb,WAAW,GACX,OAAO,GACP,aAAa,GACb,mBAAmB,GACnB,kBAAkB,GAClB,eAAe,GACf,aAAa,GACb,eAAe,GACf,cAAc,GACd,SAAS,GACT,cAAc,GACd,aAAa,GACb,SAAS,GACT,SAAS,CAAC;AAEb;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,WAAW,EAgBvC,CAAC;AA+LX;;;;GAIG;AACH,wBAAgB,0BAA0B,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAaf;AAOD,wBAAgB,iCAAiC,CAChD,eAAe,EAAE,MAAM,GACrB,MAAM,CAER;AAED,wBAAgB,yBAAyB,CACxC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,EAAE,MAAM,GACrB,MAAM,CAcR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAyEnE;AA2FD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACzC,eAAe,SAAgB,GAC7B,OAAO,CAAC,MAAM,CAAC,CA8DjB;AAmHD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,IAAI,CAapE;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,mkGA2EV,CAAC"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../lib/prompts/codex.ts"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAM7C;AAWD;;;GAGG;AACH,MAAM,MAAM,WAAW,GACpB,aAAa,GACb,WAAW,GACX,OAAO,GACP,aAAa,GACb,WAAW,GACX,YAAY,GACZ,mBAAmB,GACnB,kBAAkB,GAClB,eAAe,GACf,aAAa,GACb,eAAe,GACf,cAAc,GACd,SAAS,GACT,cAAc,GACd,aAAa,GACb,SAAS,GACT,SAAS,CAAC;AAEb;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,WAAW,EAkBvC,CAAC;AAwMX;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAwBf;AAOD,wBAAgB,iCAAiC,CAChD,eAAe,EAAE,MAAM,GACrB,MAAM,CAER;AAED,wBAAgB,yBAAyB,CACxC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,EAAE,MAAM,GACrB,MAAM,CAcR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAiFnE;AA2FD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACzC,eAAe,SAAgB,GAC7B,OAAO,CAAC,MAAM,CAAC,CA8DjB;AAmHD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,IAAI,CAapE;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,mkGA2EV,CAAC"}