opencode-copilot-account-switcher 0.10.8 → 0.10.10

package/dist/plugin-hooks.js

@@ -238,12 +238,20 @@ function buildConsumptionToast(input) {
             variant: "warning",
         };
     }
+    if (input.reason === "unbound-fallback") {
+        return {
+            message: `已使用 ${input.accountName}（异常无绑定 agent 入口，已按用户回合处理）`,
+            variant: "warning",
+        };
+    }
     return {
         message: `已使用 ${input.accountName}（${toConsumptionReasonText(input.reason)}）`,
         variant: "info",
     };
 }
 function shouldShowConsumptionToast(input) {
+    if (input.reason === "regular")
+        return false;
     if (input.reason === "subagent")
         return input.isFirstUse;
     if (input.reason === "compaction")
@@ -418,11 +426,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 +448,7 @@ export function buildPluginHooks(input) {
                 };
             }
         }
-        const session = await sessionLookup?.({
+        const session = await sessionLookup?.call(sessionClient, {
             path: {
                 id: requestInput.sessionID,
             },
@@ -448,7 +457,13 @@ export function buildPluginHooks(input) {
             },
             throwOnError: true,
         }).catch(() => undefined);
+        const canDetermineSessionAncestry = session !== undefined;
         const isTrueChildSession = typeof session?.data?.parentID === "string" && session.data.parentID.length > 0;
+        if (canDetermineSessionAncestry && !isTrueChildSession && requestInput.hasExistingBinding === false) {
+            return {
+                reason: "unbound-fallback",
+            };
+        }
         return {
             reason: isTrueChildSession ? "subagent" : "regular",
         };
@@ -539,8 +554,24 @@ export function buildPluginHooks(input) {
             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) : [];
+            if (candidates.length === 0) {
+                const outbound = stripInternalSessionHeader(request, init);
+                return config.fetch(outbound.request, outbound.init);
+            }
+            const hasExistingBinding = sessionID.length > 0 && sessionAccountBindings.has(sessionID);
+            const classification = sessionID.length > 0
+                ? await classifyRequestReason({
+                    sessionID,
+                    hasExistingBinding,
+                    request: selectionRequest,
+                    init: selectionInit,
+                })
+                : {
+                    reason: toReasonByInitiator(initiator),
+                };
+            const selectionAllowReselect = classification.reason === "user-reselect"
+                || classification.reason === "unbound-fallback";
             const hasExplicitModelGroup = Boolean(latestStore
                 && typeof modelID === "string"
                 && modelID.length > 0
@@ -562,7 +593,7 @@ export function buildPluginHooks(input) {
                 ? chooseCandidateAccount({
                     candidates,
                     sessionID,
-                    allowReselect,
+                    allowReselect: selectionAllowReselect,
                     sessionBindings: sessionAccountBindings,
                     loads,
                     random,
@@ -573,11 +604,6 @@ export function buildPluginHooks(input) {
                 return config.fetch(outbound.request, outbound.init);
             }
             const candidateNames = candidates.map((item) => item.name);
-            const classification = sessionID.length > 0
-                ? await classifyRequestReason({ sessionID, request: selectionRequest, init: selectionInit })
-                : {
-                    reason: toReasonByInitiator(initiator),
-                };
             let decisionLoads = loadMapToRecord(loads, candidateNames);
             let decisionReason = classification.reason;
             let decisionSwitched = false;
@@ -615,15 +641,15 @@ export function buildPluginHooks(input) {
             }
             let nextRequest = request;
             let nextInit = init;
-            if (isFirstUse) {
-                const currentInitiator = getMergedRequestHeader(request, init, "x-initiator");
-                if (currentInitiator === "agent") {
-                    const rewritten = mergeAndRewriteRequestHeaders(request, init, (headers) => {
-                        headers.delete("x-initiator");
-                    });
-                    nextRequest = rewritten.request;
-                    nextInit = rewritten.init;
-                }
+            const currentInitiator = getMergedRequestHeader(request, init, "x-initiator");
+            const shouldStripAgentInitiator = classification.reason === "unbound-fallback"
+                || (isFirstUse && currentInitiator === "agent");
+            if (shouldStripAgentInitiator && currentInitiator === "agent") {
+                const rewritten = mergeAndRewriteRequestHeaders(request, init, (headers) => {
+                    headers.delete("x-initiator");
+                });
+                nextRequest = rewritten.request;
+                nextInit = rewritten.init;
             }
             const auth = {
                 type: "oauth",

package/dist/routing-state.d.ts

@@ -69,7 +69,7 @@ export type RouteDecisionEvent = {
     groupSource: "model" | "active";
     candidateNames: string[];
     loads: Record<string, number>;
-    reason: "regular" | "subagent" | "compaction" | "user-reselect" | "rate-limit-switch";
+    reason: "regular" | "subagent" | "compaction" | "user-reselect" | "unbound-fallback" | "rate-limit-switch";
     switched: boolean;
     switchFrom?: string;
     switchBlockedBy?: "no-cooled-down-candidate" | "replacement-load-higher" | "routing-state-read-failed" | "no-replacement-candidate";

package/package.json

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