opencode-copilot-account-switcher 0.12.0 → 0.12.2

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

@@ -1,6 +1,7 @@
 import { type OpenAIOAuthAuth } from "./codex-auth-source.js";
 import { type CodexStatusFetcherResult } from "./codex-status-fetcher.js";
 import { type CodexStoreFile } from "./codex-store.js";
+import { type AccountEntry } from "./store.js";
 type ToastVariant = "info" | "success" | "warning" | "error";
 type ToastClient = {
     tui?: {
@@ -36,12 +37,14 @@ type ToastClient = {
 type AuthPayload = {
     openai?: OpenAIOAuthAuth;
 } & Record<string, unknown>;
+type AuthEntries = Record<string, AccountEntry>;
 export declare class CodexStatusCommandHandledError extends Error {
     constructor();
 }
 export declare function handleCodexStatusCommand(input: {
     client?: ToastClient;
     loadAuth?: () => Promise<AuthPayload | undefined>;
+    readAuthEntries?: () => Promise<AuthEntries>;
     persistAuth?: (auth: AuthPayload) => Promise<void>;
     fetchStatus?: (input: {
         oauth: OpenAIOAuthAuth;

package/dist/codex-status-command.js

@@ -1,6 +1,7 @@
 import { resolveCodexAuthSource } from "./codex-auth-source.js";
 import { fetchCodexStatus } from "./codex-status-fetcher.js";
 import { readCodexStore, writeCodexStore } from "./codex-store.js";
+import { readAuth } from "./store.js";
 export class CodexStatusCommandHandledError extends Error {
     constructor() {
         super("codex-status-command-handled");
@@ -19,11 +20,12 @@ function pickNumber(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
 async function showToast(input) {
+    const tui = input.client?.tui;
     const show = input.client?.tui?.showToast;
     if (!show)
         return;
     try {
-        await show({
+        await show.call(tui, {
             body: {
                 message: input.message,
                 variant: input.variant,
@@ -77,31 +79,57 @@ function hasCachedStore(store) {
         || store.status?.premium?.remaining !== undefined);
 }
 async function defaultLoadAuth(client) {
-    const getAuth = client?.auth?.get;
-    if (!getAuth)
+    return defaultLoadAuthWithFallback({
+        client,
+        readAuthEntries: readAuth,
+    });
+}
+function mapAuthEntryToOpenAI(entry) {
+    if (!entry)
         return undefined;
-    try {
-        const result = await getAuth({ path: { id: "openai" }, throwOnError: true });
-        const withData = asRecord(result)?.data;
-        const payload = asRecord(withData) ?? asRecord(result);
-        if (!payload)
-            return undefined;
-        return {
-            openai: payload,
-        };
+    return {
+        type: "oauth",
+        refresh: entry.refresh,
+        access: entry.access,
+        expires: entry.expires,
+    };
+}
+async function defaultLoadAuthWithFallback(input) {
+    const client = input.client;
+    const authClient = client?.auth;
+    const getAuth = client?.auth?.get;
+    if (getAuth) {
+        try {
+            const result = await getAuth.call(authClient, { path: { id: "openai" }, throwOnError: true });
+            const withData = asRecord(result)?.data;
+            const payload = asRecord(withData) ?? asRecord(result);
+            if (payload) {
+                return {
+                    openai: payload,
+                };
+            }
+        }
+        catch {
+            // fall through to auth.json fallback
+        }
     }
-    catch {
+    const authEntries = await input.readAuthEntries().catch(() => ({}));
+    const openai = mapAuthEntryToOpenAI(authEntries.openai);
+    if (!openai)
         return undefined;
-    }
+    return {
+        openai,
+    };
 }
 async function defaultPersistAuth(client, auth) {
+    const authClient = client?.auth;
     const setAuth = client?.auth?.set;
     if (!setAuth)
         return;
     const openai = asRecord(auth.openai);
     if (!openai)
         return;
-    await setAuth({
+    await setAuth.call(authClient, {
         path: { id: "openai" },
         body: {
             type: "oauth",
@@ -128,7 +156,10 @@ function patchAuth(auth, patch) {
     };
 }
 export async function handleCodexStatusCommand(input) {
-    const loadAuth = input.loadAuth ?? (() => defaultLoadAuth(input.client));
+    const loadAuth = input.loadAuth ?? (() => defaultLoadAuthWithFallback({
+        client: input.client,
+        readAuthEntries: input.readAuthEntries ?? readAuth,
+    }));
     const persistAuth = input.persistAuth ?? ((nextAuth) => defaultPersistAuth(input.client, nextAuth));
     const fetchStatus = input.fetchStatus ?? ((next) => fetchCodexStatus(next));
     const readStore = input.readStore ?? (() => readCodexStore());

package/dist/plugin-hooks.js

@@ -1,5 +1,6 @@
 import { appendFileSync } from "node:fs";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { createHash } from "node:crypto";
 import { createCompactionLoopSafetyBypass, createLoopSafetySystemTransform, getLoopSafetyProviderScope, } from "./loop-safety-plugin.js";
 import { COPILOT_PROVIDER_DESCRIPTOR } from "./providers/descriptor.js";
 import { createCopilotRetryingFetch, cleanupLongIdsForAccountSwitch, detectRateLimitEvidence, INTERNAL_SESSION_CONTEXT_KEY, } from "./copilot-network-retry.js";
@@ -164,9 +165,11 @@ function mergeAndRewriteRequestHeaders(request, init, rewriteHeaders) {
         headers: normalizedHeaders,
     };
     if (request instanceof Request) {
+        const requestInit = { ...(init ?? {}) };
+        delete requestInit.headers;
         return {
             request: rewriteRequestHeaders(request),
-            init: normalizedInit,
+            init: Object.keys(requestInit).length > 0 ? requestInit : undefined,
         };
     }
     return {
@@ -174,6 +177,30 @@ function mergeAndRewriteRequestHeaders(request, init, rewriteHeaders) {
         init: normalizedInit,
     };
 }
+function stripDuplicateHeadersFromRequestWhenInitOverrides(request, init) {
+    if (!(request instanceof Request) || init?.headers == null) {
+        return { request, init };
+    }
+    const initHeaders = new Headers(init.headers);
+    if ([...initHeaders.keys()].length === 0) {
+        return { request, init };
+    }
+    const requestHeaders = new Headers(request.headers);
+    let changed = false;
+    for (const name of initHeaders.keys()) {
+        if (requestHeaders.has(name)) {
+            requestHeaders.delete(name);
+            changed = true;
+        }
+    }
+    if (!changed) {
+        return { request, init };
+    }
+    return {
+        request: new Request(request, { headers: requestHeaders }),
+        init,
+    };
+}
 function getMergedRequestHeader(request, init, name) {
     const headers = new Headers(request instanceof Request ? request.headers : undefined);
     for (const [headerName, value] of new Headers(init?.headers).entries()) {
@@ -210,6 +237,11 @@ function sanitizeLoggedRequestHeadersRecord(headers) {
     }
     return sanitized;
 }
+function toAuthFingerprint(value) {
+    if (typeof value !== "string" || value.length === 0)
+        return undefined;
+    return createHash("sha256").update(value).digest("hex").slice(0, 12);
+}
 function getInternalSessionID(request, init) {
     const headerValue = getMergedRequestHeader(request, init, "x-opencode-session-id");
     if (typeof headerValue === "string" && headerValue.length > 0)
@@ -661,8 +693,12 @@ export function buildPluginHooks(input) {
             let decisionTouchWriteOutcome = "skipped-missing-session";
             let decisionTouchWriteError;
             let finalChosenAccount = resolved.name;
+            let chosenAccountAuthFingerprint = toAuthFingerprint(resolved.entry.refresh);
             let finalRequestHeaders = getFinalSentRequestHeadersRecord(selectionRequest, selectionInit);
+            let networkRequestHeaders;
+            let networkRequestUsedInitHeaders = selectionInit?.headers != null;
             const previousBindingAccount = sessionID.length > 0 ? sessionAccountBindings.get(sessionID)?.accountName : undefined;
+            const debugLinkId = getMergedRequestHeader(selectionRequest, selectionInit, INTERNAL_DEBUG_LINK_HEADER) ?? undefined;
             if (sessionID.length > 0) {
                 sessionAccountBindings.set(sessionID, {
                     accountName: resolved.name,
@@ -730,9 +766,12 @@ export function buildPluginHooks(input) {
                     expires: candidate.entry.expires,
                     enterpriseUrl: candidate.entry.enterpriseUrl,
                 };
-                const outbound = stripInternalSessionHeader(requestValue, initValue);
+                const deduplicated = stripDuplicateHeadersFromRequestWhenInitOverrides(requestValue, initValue);
+                const outbound = stripInternalSessionHeader(deduplicated.request, deduplicated.init);
                 return finalHeaderCapture.run((headers) => {
                     finalRequestHeaders = headers;
+                    networkRequestHeaders = headers;
+                    networkRequestUsedInitHeaders = outbound.init?.headers != null;
                 }, () => authOverride.run(candidateAuth, () => config.fetch(rewriteRequestForAccount(outbound.request, candidate.entry.enterpriseUrl), outbound.init)));
             };
             const response = await sendWithAccount(resolved, nextRequest, nextInit);
@@ -856,6 +895,7 @@ export function buildPluginHooks(input) {
                             decisionSwitchFrom = resolved.name;
                             decisionSwitchBlockedBy = undefined;
                             finalChosenAccount = replacement.name;
+                            chosenAccountAuthFingerprint = toAuthFingerprint(replacement.entry.refresh);
                             modelAccountFirstUse.add(replacement.name);
                             const switchToast = buildConsumptionToast({
                                 accountName: replacement.name,
@@ -887,6 +927,9 @@ export function buildPluginHooks(input) {
                                     candidateNames,
                                     loads: decisionLoads,
                                     chosenAccount: finalChosenAccount,
+                                    chosenAccountAuthFingerprint,
+                                    debugLinkId,
+                                    networkRequestUsedInitHeaders,
                                     reason: decisionReason,
                                     switched: decisionSwitched,
                                     switchFrom: decisionSwitchFrom,
@@ -896,6 +939,7 @@ export function buildPluginHooks(input) {
                                     rateLimitMatched: decisionRateLimitMatched,
                                     retryAfterMs: decisionRetryAfterMs,
                                     finalRequestHeaders,
+                                    networkRequestHeaders,
                                 },
                             }).catch(() => undefined);
                             return sendWithAccount(replacement, retriedRequest, retriedInit);
@@ -919,6 +963,9 @@ export function buildPluginHooks(input) {
                     candidateNames,
                     loads: decisionLoads,
                     chosenAccount: finalChosenAccount,
+                    chosenAccountAuthFingerprint,
+                    debugLinkId,
+                    networkRequestUsedInitHeaders,
                     reason: decisionReason,
                     switched: decisionSwitched,
                     switchFrom: decisionSwitchFrom,
@@ -928,6 +975,7 @@ export function buildPluginHooks(input) {
                     rateLimitMatched: decisionRateLimitMatched,
                     retryAfterMs: decisionRetryAfterMs,
                     finalRequestHeaders,
+                    networkRequestHeaders,
                 },
             }).catch(() => undefined);
             if (shouldShowConsumptionToast({ reason: decisionReason, isFirstUse })) {
@@ -1177,6 +1225,8 @@ export function buildPluginHooks(input) {
                 injectArmed = false;
                 return;
             }
+            if (hookInput.tool === "task")
+                return;
             if (!injectArmed)
                 return;
             const begin = "[COPILOT_INJECT_V1_BEGIN]";

package/dist/routing-state.d.ts

@@ -64,6 +64,9 @@ export type RouteDecisionEvent = {
     at: number;
     modelID?: string;
     chosenAccount: string;
+    chosenAccountAuthFingerprint?: string;
+    debugLinkId?: string;
+    networkRequestUsedInitHeaders?: boolean;
     sessionID?: string;
     sessionIDPresent: boolean;
     groupSource: "model" | "active";
@@ -78,6 +81,7 @@ export type RouteDecisionEvent = {
     rateLimitMatched: boolean;
     retryAfterMs?: number;
     finalRequestHeaders?: Record<string, string>;
+    networkRequestHeaders?: Record<string, string>;
 };
 export type RoutingEvent = SessionTouchEvent | RateLimitFlaggedEvent;
 export declare function appendRouteDecisionEvent(input: {

package/dist/session-control-command.js

@@ -246,26 +246,20 @@ async function patchStoppedToolTranscript(input) {
 export async function handleCompactCommand(input) {
     const session = input.client?.session;
     const summarize = session?.summarize;
-    const model = input.model ?? getLatestAssistantModel(await getSessionMessages(session, input.sessionID));
-    if (!model) {
+    if (!summarize) {
         await showToast({
             client: input.client,
-            message: "No assistant model context available for compact.",
+            message: "Session summarize is unavailable for compact.",
             variant: "warning",
         });
         throw new SessionControlCommandHandledError();
     }
-    if (summarize) {
-        await summarize({
-            auto: true,
-            model,
-        });
-        throw new SessionControlCommandHandledError();
-    }
-    await showToast({
-        client: input.client,
-        message: "Session summarize is unavailable for compact.",
-        variant: "warning",
+    const model = input.model ?? getLatestAssistantModel(await getSessionMessages(session, input.sessionID));
+    await summarize(model ? {
+        auto: true,
+        model,
+    } : {
+        auto: true,
     });
     throw new SessionControlCommandHandledError();
 }

package/package.json

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