opencode-copilot-account-switcher 0.13.3 → 0.13.4

package/dist/codex-status-fetcher.d.ts

@@ -66,5 +66,6 @@ export declare function fetchCodexStatus(input: {
     accountId?: string;
     fetchImpl?: typeof globalThis.fetch;
     now?: () => number;
+    timeoutMs?: number;
     refreshTokens?: (oauth: OpenAIOAuthAuth) => Promise<OpenAIOAuthAuth | undefined>;
 }): Promise<CodexStatusFetcherResult>;

package/dist/codex-status-fetcher.js

@@ -1,4 +1,5 @@
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/codex/usage";
+const CODEX_USAGE_TIMEOUT_MS = 15_000;
 function isInvalidAccountRefreshError(error) {
     if (!error || typeof error !== "object")
         return false;
@@ -158,24 +159,30 @@ async function requestUsage(input) {
             access: input.oauth.access,
             accountId: input.accountId,
         }),
+        signal: input.signal,
     });
 }
 export async function fetchCodexStatus(input) {
     const fetchImpl = input.fetchImpl ?? globalThis.fetch;
     const now = input.now ?? Date.now;
     const explicitAccountId = input.accountId;
+    const timeoutMs = input.timeoutMs ?? CODEX_USAGE_TIMEOUT_MS;
     let oauth = input.oauth;
     let authPatch;
     for (let attempt = 0; attempt < 2; attempt += 1) {
         let response;
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), timeoutMs);
         try {
             response = await requestUsage({
                 oauth,
                 accountId: explicitAccountId ?? oauth.accountId,
                 fetchImpl,
+                signal: controller.signal,
             });
         }
         catch (error) {
+            clearTimeout(timeout);
             if (isTimeoutError(error)) {
                 return {
                     ok: false,
@@ -193,6 +200,9 @@ export async function fetchCodexStatus(input) {
                 },
             };
         }
+        finally {
+            clearTimeout(timeout);
+        }
         if (response.status === 401 && attempt === 0 && input.refreshTokens) {
             let refreshed;
             try {

package/dist/menu-runtime.d.ts

@@ -6,6 +6,7 @@ type WriteMeta = {
 export type MenuAccountInfo = {
     id?: string;
     name: string;
+    workspaceName?: string;
     index: number;
     isCurrent?: boolean;
 };

package/dist/plugin-hooks.js

@@ -421,6 +421,8 @@ function pruneTouchWriteCache(input) {
     }
 }
 export function buildPluginHooks(input) {
+    const authProvider = input.auth.provider ?? COPILOT_PROVIDER_DESCRIPTOR.providerIDs[0] ?? "github-copilot";
+    const enableCopilotAuthLoader = isCopilotProviderID(authProvider);
     const compactionLoopSafetyBypass = createCompactionLoopSafetyBypass();
     const loadStore = input.loadStore ?? readStoreSafe;
     const loadStoreSync = input.loadStoreSync ?? readStoreSafeSync;
@@ -1121,9 +1123,9 @@ export function buildPluginHooks(input) {
     return {
         auth: {
             ...input.auth,
-            provider: input.auth.provider ?? COPILOT_PROVIDER_DESCRIPTOR.providerIDs[0] ?? "github-copilot",
+            provider: authProvider,
             methods: input.auth.methods,
-            loader,
+            loader: enableCopilotAuthLoader ? loader : undefined,
         },
         config: async (config) => {
             if (!config.command)

package/dist/providers/codex-menu-adapter.js

@@ -255,6 +255,7 @@ export function createCodexMenuAdapter(inputDeps) {
                     fallback: `openai-${now()}`,
                 }),
                 providerId: "openai",
+                workspaceName: oauth.workspaceName,
                 refresh,
                 access,
                 expires: oauth.expires,
@@ -269,6 +270,7 @@ export function createCodexMenuAdapter(inputDeps) {
             return Object.entries(store.accounts).map(([name, entry], index) => ({
                 id: entry.accountId ?? name,
                 name: entry.email ?? entry.accountId ?? name,
+                workspaceName: entry.workspaceName,
                 index,
                 isCurrent: store.active === name,
                 source: entry.source,

package/dist/ui/menu.d.ts

@@ -3,6 +3,7 @@ import { confirm } from "./confirm.js";
 export type AccountStatus = "active" | "expired" | "unknown";
 export interface AccountInfo {
     name: string;
+    workspaceName?: string;
     index: number;
     addedAt?: number;
     lastUsed?: number;

package/dist/ui/menu.js

@@ -318,6 +318,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-copilot-account-switcher",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",