opencode-copilot-account-switcher 0.13.3 → 0.13.5

package/dist/ui/menu.js

@@ -10,10 +10,10 @@ function defaultMenuCapabilities(provider) {
             checkModels: false,
             defaultAccountGroup: false,
             assignModels: false,
-            loopSafety: false,
-            policyScope: false,
-            experimentalSlashCommands: false,
-            networkRetry: false,
+            loopSafety: true,
+            policyScope: true,
+            experimentalSlashCommands: true,
+            networkRetry: true,
             syntheticAgentInitiator: false,
         };
     }
@@ -39,6 +39,8 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
                 menuSubtitle: "Select an action or account",
                 switchLanguageLabel: "切换到中文",
                 actionsHeading: "Actions",
+                commonSettingsHeading: "Common settings",
+                providerSettingsHeading: "Provider settings",
                 addAccount: "Add account",
                 addAccountHint: "OpenAI OAuth login",
                 importAuth: "Import from auth.json",
@@ -75,6 +77,8 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
             menuSubtitle: "请选择操作或账号",
             switchLanguageLabel: "Switch to English",
             actionsHeading: "操作",
+            commonSettingsHeading: "通用设置",
+            providerSettingsHeading: "Provider 专属设置",
             addAccount: "添加账号",
             addAccountHint: "OpenAI OAuth 登录",
             importAuth: "从 auth.json 导入",
@@ -112,6 +116,8 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
             menuSubtitle: "Select an action or account",
             switchLanguageLabel: "切换到中文",
             actionsHeading: "Actions",
+            commonSettingsHeading: "Common settings",
+            providerSettingsHeading: "Provider settings",
             addAccount: "Add account",
             addAccountHint: "device login or manual",
             importAuth: "Import from auth.json",
@@ -132,9 +138,9 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
             experimentalSlashCommandsOn: "Experimental slash commands: On",
             experimentalSlashCommandsOff: "Experimental slash commands: Off",
             experimentalSlashCommandsHint: "Controls whether /copilot-status, /copilot-compact, /copilot-stop-tool, /copilot-inject, and /copilot-policy-all-models are registered",
-            retryOn: "Copilot Network Retry: On",
-            retryOff: "Copilot Network Retry: Off",
-            retryHint: "Helps recover some requests after account switches or malformed retries",
+            retryOn: "Network Retry: On",
+            retryOff: "Network Retry: Off",
+            retryHint: "Helps recover some requests after retries or malformed responses",
             syntheticInitiatorOn: "Send synthetic messages as agent: On",
             syntheticInitiatorOff: "Send synthetic messages as agent: Off",
             syntheticInitiatorHint: "Changes upstream behavior; misuse may increase billing risk or trigger abuse signals",
@@ -148,6 +154,8 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
         menuSubtitle: "请选择操作或账号",
         switchLanguageLabel: "Switch to English",
         actionsHeading: "操作",
+        commonSettingsHeading: "通用设置",
+        providerSettingsHeading: "Provider 专属设置",
         addAccount: "添加账号",
         addAccountHint: "设备登录或手动录入",
         importAuth: "从 auth.json 导入",
@@ -168,9 +176,9 @@ export function getMenuCopy(language = "zh", provider = "copilot") {
         experimentalSlashCommandsOn: "实验性 Slash Commands：已开启",
         experimentalSlashCommandsOff: "实验性 Slash Commands：已关闭",
         experimentalSlashCommandsHint: "控制 /copilot-status、/copilot-compact、/copilot-stop-tool、/copilot-inject、/copilot-policy-all-models 是否注册",
-        retryOn: "Copilot Network Retry：已开启",
-        retryOff: "Copilot Network Retry：已关闭",
-        retryHint: "账号切换后若出现请求异常，可自动重试并修复部分请求",
+        retryOn: "Network Retry：已开启",
+        retryOff: "Network Retry：已关闭",
+        retryHint: "请求异常时可自动重试并修复部分请求",
         syntheticInitiatorOn: "synthetic 消息按 agent 身份发送：已开启",
         syntheticInitiatorOff: "synthetic 消息按 agent 身份发送：已关闭",
         syntheticInitiatorHint: "会改变与 upstream 的默认行为；误用可能带来异常计费或 abuse 风险",
@@ -215,34 +223,30 @@ export function buildMenuItems(input) {
         capabilities.checkModels = false;
         capabilities.defaultAccountGroup = false;
         capabilities.assignModels = false;
-        capabilities.loopSafety = false;
-        capabilities.policyScope = false;
-        capabilities.experimentalSlashCommands = false;
-        capabilities.networkRetry = false;
         capabilities.syntheticAgentInitiator = false;
     }
     const quotaHint = input.lastQuotaRefresh ? `last ${formatRelativeTime(input.lastQuotaRefresh)}` : undefined;
     const loopSafetyProviderScope = input.loopSafetyProviderScope ?? "copilot-only";
     const experimentalSlashCommandsEnabled = input.experimentalSlashCommandsEnabled !== false;
-    const actions = [
+    const providerActions = [
         { label: copy.actionsHeading, value: { type: "cancel" }, kind: "heading" },
         { label: copy.switchLanguageLabel, value: { type: "toggle-language" }, color: "cyan" },
         { label: copy.addAccount, value: { type: "add" }, color: "cyan", hint: copy.addAccountHint },
     ];
     if (capabilities.importAuth) {
-        actions.push({ label: copy.importAuth, value: { type: "import" }, color: "cyan" });
+        providerActions.push({ label: copy.importAuth, value: { type: "import" }, color: "cyan" });
     }
     if (capabilities.quota) {
-        actions.push({ label: copy.checkQuotas, value: { type: "quota" }, color: "cyan", hint: quotaHint });
+        providerActions.push({ label: copy.checkQuotas, value: { type: "quota" }, color: "cyan", hint: quotaHint });
     }
     if (capabilities.refreshIdentity) {
-        actions.push({ label: copy.refreshIdentity, value: { type: "refresh-identity" }, color: "cyan" });
+        providerActions.push({ label: copy.refreshIdentity, value: { type: "refresh-identity" }, color: "cyan" });
     }
     if (capabilities.checkModels) {
-        actions.push({ label: copy.checkModels, value: { type: "check-models" }, color: "cyan" });
+        providerActions.push({ label: copy.checkModels, value: { type: "check-models" }, color: "cyan" });
     }
     if (capabilities.defaultAccountGroup) {
-        actions.push({
+        providerActions.push({
             label: copy.defaultAccountGroup,
             value: { type: "configure-default-group" },
             color: "cyan",
@@ -250,54 +254,56 @@ export function buildMenuItems(input) {
         });
     }
     if (capabilities.assignModels) {
-        actions.push({
+        providerActions.push({
             label: copy.assignModels,
             value: { type: "assign-models" },
             color: "cyan",
             hint: input.modelAccountAssignmentCount ? `${input.modelAccountAssignmentCount} groups` : undefined,
         });
     }
-    actions.push({
-        label: input.refresh?.enabled ? copy.autoRefreshOn : copy.autoRefreshOff,
-        value: { type: "toggle-refresh" },
-        color: "cyan",
-        hint: input.refresh ? `${input.refresh.minutes}m` : undefined,
-    });
-    actions.push({ label: copy.setRefresh, value: { type: "set-interval" }, color: "cyan" });
-    if (capabilities.loopSafety) {
-        actions.push({
+    const commonSettings = [
+        { label: copy.commonSettingsHeading, value: { type: "cancel" }, kind: "heading" },
+        {
             label: input.loopSafetyEnabled ? copy.loopSafetyOn : copy.loopSafetyOff,
             value: { type: "toggle-loop-safety" },
             color: "cyan",
             hint: copy.loopSafetyHint,
-        });
-    }
-    if (capabilities.policyScope) {
-        actions.push({
+            disabled: !capabilities.loopSafety,
+        },
+        {
             label: loopSafetyProviderScope === "all-models" ? copy.policyScopeAllModels : copy.policyScopeCopilotOnly,
             value: { type: "toggle-loop-safety-provider-scope" },
             color: "cyan",
             hint: copy.policyScopeHint,
-        });
-    }
-    if (capabilities.experimentalSlashCommands) {
-        actions.push({
+            disabled: !capabilities.policyScope,
+        },
+        {
             label: experimentalSlashCommandsEnabled ? copy.experimentalSlashCommandsOn : copy.experimentalSlashCommandsOff,
             value: { type: "toggle-experimental-slash-commands" },
             color: "cyan",
             hint: copy.experimentalSlashCommandsHint,
-        });
-    }
-    if (capabilities.networkRetry) {
-        actions.push({
+            disabled: !capabilities.experimentalSlashCommands,
+        },
+        {
             label: input.networkRetryEnabled ? copy.retryOn : copy.retryOff,
             value: { type: "toggle-network-retry" },
             color: "cyan",
             hint: copy.retryHint,
-        });
-    }
+            disabled: !capabilities.networkRetry,
+        },
+    ];
+    const providerSettings = [
+        { label: copy.providerSettingsHeading, value: { type: "cancel" }, kind: "heading" },
+    ];
+    providerSettings.push({
+        label: input.refresh?.enabled ? copy.autoRefreshOn : copy.autoRefreshOff,
+        value: { type: "toggle-refresh" },
+        color: "cyan",
+        hint: input.refresh ? `${input.refresh.minutes}m` : undefined,
+    });
+    providerSettings.push({ label: copy.setRefresh, value: { type: "set-interval" }, color: "cyan" });
     if (capabilities.syntheticAgentInitiator) {
-        actions.push({
+        providerSettings.push({
             label: input.syntheticAgentInitiatorEnabled ? copy.syntheticInitiatorOn : copy.syntheticInitiatorOff,
             value: { type: "toggle-synthetic-agent-initiator" },
             color: "cyan",
@@ -305,7 +311,11 @@ export function buildMenuItems(input) {
         });
     }
     return [
-        ...actions,
+        ...providerActions,
+        { label: "", value: { type: "cancel" }, separator: true },
+        ...commonSettings,
+        { label: "", value: { type: "cancel" }, separator: true },
+        ...providerSettings,
         { label: "", value: { type: "cancel" }, separator: true },
         { label: copy.accountsHeading, value: { type: "cancel" }, kind: "heading" },
         ...input.accounts.map((account) => {
@@ -318,6 +328,7 @@ export function buildMenuItems(input) {
             const numbered = `${account.index + 1}. ${account.name}`;
             const label = `${numbered}${currentBadge}${statusBadge ? " " + statusBadge : ""}${quotaBadge}`;
             const detail = [
+                account.workspaceName,
                 account.lastUsed ? formatRelativeTime(account.lastUsed) : undefined,
                 account.plan,
                 account.models ? `${account.models.enabled}/${account.models.enabled + account.models.disabled} mods` : undefined,

package/dist/upstream/codex-loader-adapter.d.ts

@@ -0,0 +1,69 @@
+export type CodexAuthState = {
+    type: string;
+    refresh?: string;
+    access?: string;
+    expires?: number;
+    accountId?: string;
+};
+export type CodexProviderModel = {
+    id?: string;
+    api?: {
+        id?: string;
+        url?: string;
+        npm?: string;
+    };
+    cost?: {
+        input: number;
+        output: number;
+        cache: {
+            read: number;
+            write: number;
+        };
+    };
+};
+export type CodexProviderConfig = {
+    models: Record<string, CodexProviderModel>;
+};
+export type OfficialCodexConfig = {
+    apiKey: string;
+    fetch: (request: Request | URL | string, init?: RequestInit) => Promise<Response>;
+};
+export type OfficialCodexChatHeadersHook = (input: {
+    sessionID: string;
+    model: {
+        providerID: string;
+    };
+}, output: {
+    headers: Record<string, string>;
+}) => Promise<void>;
+export declare function loadOfficialCodexConfig(input: {
+    getAuth: () => Promise<CodexAuthState | undefined>;
+    provider?: CodexProviderConfig;
+    baseFetch?: typeof fetch;
+    version?: string;
+    client?: {
+        auth?: {
+            set?: (value: unknown) => Promise<unknown>;
+        };
+    };
+}): Promise<OfficialCodexConfig | undefined>;
+export declare function createOfficialCodexFetchAdapter(input: {
+    getAuth: () => Promise<CodexAuthState | undefined>;
+    provider?: CodexProviderConfig;
+    baseFetch?: typeof fetch;
+    version?: string;
+    client?: {
+        auth?: {
+            set?: (value: unknown) => Promise<unknown>;
+        };
+    };
+}): (request: Request | URL | string, init?: RequestInit) => Promise<Response>;
+export declare function loadOfficialCodexChatHeaders(input?: {
+    client?: {
+        auth?: {
+            set?: (value: unknown) => Promise<unknown>;
+        };
+    };
+    baseFetch?: typeof fetch;
+    version?: string;
+}): Promise<OfficialCodexChatHeadersHook>;

package/dist/upstream/codex-loader-adapter.js

@@ -0,0 +1,55 @@
+import { CodexAuthPlugin, officialCodexExportBridge } from "./codex-plugin.snapshot.js";
+function runWithOfficialBridge(input, fn) {
+    return officialCodexExportBridge.run({
+        fetchImpl: input.baseFetch ?? globalThis.fetch,
+        version: input.version,
+    }, fn);
+}
+async function loadOfficialHooks(input) {
+    return runWithOfficialBridge(input, async () => {
+        const hooks = await CodexAuthPlugin({
+            client: input.client,
+        });
+        return hooks;
+    });
+}
+export async function loadOfficialCodexConfig(input) {
+    const hooks = await loadOfficialHooks({
+        client: input.client,
+        baseFetch: input.baseFetch,
+        version: input.version,
+    });
+    const loader = hooks.auth?.loader;
+    if (typeof loader !== "function") {
+        return undefined;
+    }
+    const provider = input.provider ?? { models: {} };
+    const result = await runWithOfficialBridge(input, async () => loader(input.getAuth, provider));
+    if (!("fetch" in result) || typeof result.fetch !== "function") {
+        return undefined;
+    }
+    return {
+        apiKey: result.apiKey,
+        fetch(request, init) {
+            return runWithOfficialBridge(input, async () => result.fetch(request, init));
+        },
+    };
+}
+export function createOfficialCodexFetchAdapter(input) {
+    return async function fetchWithOfficialHeaders(request, init) {
+        const config = await loadOfficialCodexConfig(input);
+        const fallback = input.baseFetch ?? fetch;
+        if (!config) {
+            return fallback(request, init);
+        }
+        return config.fetch(request, init);
+    };
+}
+export async function loadOfficialCodexChatHeaders(input = {}) {
+    const hooks = await loadOfficialHooks(input);
+    const chatHeaders = hooks["chat.headers"];
+    if (typeof chatHeaders !== "function") {
+        throw new Error("Official Codex plugin is missing chat.headers hook");
+    }
+    return async (hookInput, output) => runWithOfficialBridge(input, async () => chatHeaders(hookInput, output));
+}

package/dist/upstream/codex-plugin.snapshot.d.ts

@@ -0,0 +1,13 @@
+type RequestInfo = Request | URL | string;
+type Hooks = any;
+type PluginInput = any;
+declare const officialCodexExportBridge: {
+    version: string;
+    fetchImpl(request: RequestInfo | URL, init?: RequestInit): Promise<Response>;
+    run(options: {
+        fetchImpl?: typeof globalThis.fetch;
+        version?: string;
+    } | undefined, fn: () => Promise<any>): Promise<any>;
+};
+export declare function CodexAuthPlugin(input: PluginInput): Promise<Hooks>;
+export { officialCodexExportBridge };

package/dist/upstream/codex-plugin.snapshot.js

@@ -0,0 +1,98 @@
+// @ts-nocheck
+import { AsyncLocalStorage } from "node:async_hooks";
+import os from "node:os";
+const officialCodexExportBridgeStorage = new AsyncLocalStorage();
+const officialCodexExportBridge = {
+    version: "snapshot",
+    fetchImpl(request, init) {
+        return globalThis.fetch(request, init);
+    },
+    async run(options = {}, fn) {
+        return officialCodexExportBridgeStorage.run({
+            fetchImpl: options.fetchImpl ?? this.fetchImpl,
+            version: options.version ?? this.version,
+        }, fn);
+    },
+};
+const Installation = {
+    get VERSION() {
+        return officialCodexExportBridgeStorage.getStore()?.version ?? officialCodexExportBridge.version;
+    },
+    set VERSION(value) {
+        officialCodexExportBridge.version = value;
+    },
+};
+const OAUTH_DUMMY_KEY = "official-codex-oauth";
+function fetch(request, init) {
+    return (officialCodexExportBridgeStorage.getStore()?.fetchImpl ?? officialCodexExportBridge.fetchImpl)(request, init);
+}
+/* LOCAL_SHIMS_END */
+const CODEX_API_ENDPOINT = "https://chatgpt.com/backend-api/codex/responses";
+export async function CodexAuthPlugin(input) {
+    return {
+        auth: {
+            provider: "openai",
+            async loader(getAuth, provider) {
+                const auth = await getAuth();
+                if (auth.type !== "oauth")
+                    return {};
+                if (provider?.models) {
+                    for (const model of Object.values(provider.models)) {
+                        model.cost = {
+                            input: 0,
+                            output: 0,
+                            cache: { read: 0, write: 0 },
+                        };
+                    }
+                }
+                return {
+                    apiKey: OAUTH_DUMMY_KEY,
+                    async fetch(requestInput, init) {
+                        const currentAuth = await getAuth();
+                        if (currentAuth.type !== "oauth")
+                            return fetch(requestInput, init);
+                        const headers = new Headers(init?.headers);
+                        headers.delete("authorization");
+                        headers.delete("Authorization");
+                        headers.set("authorization", `Bearer ${currentAuth.access}`);
+                        if (currentAuth.accountId) {
+                            headers.set("ChatGPT-Account-Id", currentAuth.accountId);
+                        }
+                        const parsed = requestInput instanceof URL
+                            ? requestInput
+                            : new URL(typeof requestInput === "string" ? requestInput : requestInput.url);
+                        const url = parsed.pathname.includes("/v1/responses") || parsed.pathname.includes("/chat/completions")
+                            ? new URL(CODEX_API_ENDPOINT)
+                            : parsed;
+                        return fetch(url, {
+                            ...init,
+                            headers,
+                        });
+                    },
+                };
+            },
+            methods: [
+                {
+                    label: "ChatGPT Pro/Plus (browser)",
+                    type: "oauth",
+                    authorize: async () => ({
+                        url: "",
+                        instructions: "",
+                        method: "auto",
+                        callback: async () => ({ type: "failed" }),
+                    }),
+                },
+            ],
+        },
+        "chat.headers": async (input, output) => {
+            if (input.model.providerID !== "openai")
+                return;
+            output.headers.originator = "opencode";
+            output.headers["User-Agent"] = `opencode/${Installation.VERSION} (${os.platform()} ${os.release()}; ${os.arch()})`;
+            output.headers.session_id = input.sessionID;
+        },
+    };
+}
+/* GENERATED_EXPORT_BRIDGE_START */
+export { officialCodexExportBridge };
+/* GENERATED_EXPORT_BRIDGE_END */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-copilot-account-switcher",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -44,6 +44,8 @@
     "build": "tsc -p tsconfig.build.json",
     "sync:copilot-snapshot": "node scripts/sync-copilot-upstream.mjs --output src/upstream/copilot-plugin.snapshot.ts",
     "check:copilot-sync": "node scripts/sync-copilot-upstream.mjs --output src/upstream/copilot-plugin.snapshot.ts --check",
+    "sync:codex-snapshot": "node scripts/sync-codex-upstream.mjs --output src/upstream/codex-plugin.snapshot.ts",
+    "check:codex-sync": "node scripts/sync-codex-upstream.mjs --output src/upstream/codex-plugin.snapshot.ts --check",
     "test": "npm run build && node --test",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "npm run build"