opencode-copilot-account-switcher 0.10.7 → 0.10.9

package/dist/copilot-network-retry.js

@@ -3,7 +3,6 @@ const RETRYABLE_MESSAGES = [
     "load failed",
     "failed to fetch",
     "network request failed",
-    "sse read timed out",
     "unable to connect",
     "econnreset",
     "etimedout",
@@ -490,8 +489,9 @@ function stripOpenAIItemId(part) {
     };
 }
 function getInternalPatchClient(client) {
-    const patch = client?._client?.patch;
-    return typeof patch === "function" ? patch : undefined;
+    const internalClient = client?._client;
+    const patch = internalClient?.patch;
+    return typeof patch === "function" ? patch.bind(internalClient) : undefined;
 }
 function collectSessionRepairMatches(messages, predicate) {
     return (messages?.data ?? []).flatMap((message) => {
@@ -1077,21 +1077,25 @@ function withStreamDebugLogs(response, request) {
                 }
                 catch (error) {
                     const message = getErrorMessage(error);
+                    const isSseReadTimeout = message.includes("sse read timed out");
                     const retryable = RETRYABLE_MESSAGES.some((part) => message.includes(part));
                     if (isDebugEnabled()) {
                         debugLog("sse stream read error", {
                             url: rawUrl,
                             message,
                             retryableByMessage: retryable,
+                            bypassedTimeoutWrap: isSseReadTimeout,
                         });
                     }
-                    controller.error(retryable
-                        ? toRetryableApiCallError(error, request, {
-                            group: "stream",
-                            statusCode: response.status,
-                            responseHeaders: response.headers,
-                        })
-                        : error);
+                    controller.error(isSseReadTimeout
+                        ? error
+                        : retryable
+                            ? toRetryableApiCallError(error, request, {
+                                group: "stream",
+                                statusCode: response.status,
+                                responseHeaders: response.headers,
+                            })
+                            : error);
                 }
             };
             void pump();

package/dist/plugin-hooks.d.ts

@@ -55,7 +55,18 @@ export declare function buildPluginHooks(input: {
     loadOfficialConfig?: (input: {
         getAuth: () => Promise<CopilotAuthState | undefined>;
         provider?: CopilotProviderConfig;
+        baseFetch?: typeof fetch;
+        version?: string;
     }) => Promise<OfficialCopilotConfig | undefined>;
+    finalizeRequestForSelection?: (input: {
+        request: Request | URL | string;
+        init?: RequestInit;
+        getAuth: () => Promise<CopilotAuthState | undefined>;
+        provider?: CopilotProviderConfig;
+    }) => Promise<{
+        request: Request | URL | string;
+        init?: RequestInit;
+    } | undefined>;
     loadOfficialChatHeaders?: (input: {
         client?: object;
         directory?: string;

package/dist/plugin-hooks.js

@@ -418,11 +418,12 @@ export function buildPluginHooks(input) {
                 reason: toReasonByInitiator(initiator),
             };
         }
-        const sessionLookup = input.client?.session?.get;
-        const messageLookup = input.client?.session?.message;
+        const sessionClient = input.client?.session;
+        const sessionLookup = sessionClient?.get;
+        const messageLookup = sessionClient?.message;
         const messageIDHeader = getMergedRequestHeader(requestInput.request, requestInput.init, INTERNAL_DEBUG_LINK_HEADER);
         if (typeof messageIDHeader === "string" && messageIDHeader.length > 0) {
-            const currentMessage = await messageLookup?.({
+            const currentMessage = await messageLookup?.call(sessionClient, {
                 path: {
                     id: requestInput.sessionID,
                     messageID: messageIDHeader,
@@ -439,7 +440,7 @@ export function buildPluginHooks(input) {
                 };
             }
         }
-        const session = await sessionLookup?.({
+        const session = await sessionLookup?.call(sessionClient, {
             path: {
                 id: requestInput.sessionID,
             },
@@ -479,12 +480,42 @@ export function buildPluginHooks(input) {
     const loader = async (getAuth, provider) => {
         const authOverride = new AsyncLocalStorage();
         const getScopedAuth = async () => authOverride.getStore() ?? getAuth();
+        const providerConfig = provider;
         const config = await loadOfficialConfig({
             getAuth: getScopedAuth,
-            provider: provider,
+            provider: providerConfig,
         });
         if (!config)
             return {};
+        const finalizeRequestForSelection = input.finalizeRequestForSelection
+            ?? (input.loadOfficialConfig
+                ? undefined
+                : async (selectionInput) => {
+                    let captured;
+                    const captureConfig = await loadOfficialConfig({
+                        getAuth: getScopedAuth,
+                        provider: providerConfig,
+                        baseFetch: async (nextRequest, nextInit) => {
+                            captured = {
+                                request: nextRequest,
+                                init: nextInit,
+                            };
+                            return new Response("{}", {
+                                status: 200,
+                                headers: {
+                                    "content-type": "application/json",
+                                },
+                            });
+                        },
+                    });
+                    if (!captureConfig)
+                        return undefined;
+                    const inspectionRequest = selectionInput.request instanceof Request
+                        ? selectionInput.request.clone()
+                        : selectionInput.request;
+                    await captureConfig.fetch(inspectionRequest, selectionInput.init).catch(() => undefined);
+                    return captured;
+                });
         const store = await loadStore().catch(() => undefined);
         const retryStore = readRetryStoreContext(store);
         const fetchWithModelAccount = async (request, init) => {
@@ -500,7 +531,15 @@ export function buildPluginHooks(input) {
                 maxEntries: touchWriteCacheMaxEntries,
             });
             const sessionID = getInternalSessionID(request, init);
-            const initiator = getMergedRequestHeader(request, init, "x-initiator");
+            const finalized = await finalizeRequestForSelection?.({
+                request,
+                init,
+                getAuth: getScopedAuth,
+                provider: providerConfig,
+            }).catch(() => undefined);
+            const selectionRequest = finalized?.request ?? request;
+            const selectionInit = finalized?.init ?? init;
+            const initiator = getMergedRequestHeader(selectionRequest, selectionInit, "x-initiator");
             const allowReselect = initiator === "user";
             const candidates = latestStore ? resolveCopilotModelAccounts(latestStore, modelID) : [];
             const hasExplicitModelGroup = Boolean(latestStore
@@ -536,7 +575,7 @@ export function buildPluginHooks(input) {
             }
             const candidateNames = candidates.map((item) => item.name);
             const classification = sessionID.length > 0
-                ? await classifyRequestReason({ sessionID, request, init })
+                ? await classifyRequestReason({ sessionID, request: selectionRequest, init: selectionInit })
                 : {
                     reason: toReasonByInitiator(initiator),
                 };

package/package.json

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