@omnicross/subscriptions 0.1.3 → 0.1.4

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 Sayo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 Sayo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/NOTICE

@@ -1,45 +1,45 @@
-@omnicross/subscriptions — THIRD-PARTY NOTICES
-==============================================
-
-This package contains the subscription-as-provider block (auth strategies,
-account service, provider registry, dispatcher, OpenCodeGo routing). Some routing
-shapes and configuration-data values were adapted,
-clean-room, from the following third-party works. Those repositories are NOT
-vendored into this tree; only original TypeScript that mirrors their routing
-shape / config-data values lives here (see the in-code provenance comments).
-
---------------------------------------------------------------------------------
-1. claude-relay-service  (MIT License) — routing shape only
---------------------------------------------------------------------------------
-
-The Codex (ChatGPT OAuth) upstream routing shape — the
-`https://chatgpt.com/backend-api/codex/responses` endpoint dispatch in
-`src/SubscriptionProviderRegistry.ts` — mirrors the route shape of
-`claude-relay-service` (`src/routes/openaiRoutes.js`). Routing shape only; the
-TypeScript is original, and the upstream repository is not vendored.
-
-    https://github.com/Wei-Shaw/claude-relay-service
-    Licensed under the MIT License.
-
---------------------------------------------------------------------------------
-2. oc-go-cc  (OpenCodeGo CC) — model-map + routing-shape / config-data
---------------------------------------------------------------------------------
-
-The OpenCodeGo routing-shape, scenario router, model-map defaults, endpoint
-shapes, and Anthropic-shape `x-api-key` fallback in
-`src/opencodego/{defaults,endpoints,model-shape,ScenarioRouter}.ts` and
-`src/auth/StaticBearerAuthStrategy.ts` are clean-room ports of the model-map and
-routing shape from `oc-go-cc` (`internal/router/model_router.go`,
-`internal/client/opencode.go`, `configs/config.example.json`). Configuration
-data + routing shape only; the TypeScript is original, and the upstream
-repository is not vendored.
-
---------------------------------------------------------------------------------
-3. js-tiktoken  (MIT License)
---------------------------------------------------------------------------------
-
-`src/opencodego/token-count.ts` lazily imports `js-tiktoken` (cl100k_base
-encoding) to estimate input-token counts for OpenCodeGo scenario routing.
-
-    https://github.com/dqbd/tiktoken
-    Licensed under the MIT License.
+@omnicross/subscriptions — THIRD-PARTY NOTICES
+==============================================
+
+This package contains the subscription-as-provider block (auth strategies,
+account service, provider registry, dispatcher, OpenCodeGo routing). Some routing
+shapes and configuration-data values were adapted,
+clean-room, from the following third-party works. Those repositories are NOT
+vendored into this tree; only original TypeScript that mirrors their routing
+shape / config-data values lives here (see the in-code provenance comments).
+
+--------------------------------------------------------------------------------
+1. claude-relay-service  (MIT License) — routing shape only
+--------------------------------------------------------------------------------
+
+The Codex (ChatGPT OAuth) upstream routing shape — the
+`https://chatgpt.com/backend-api/codex/responses` endpoint dispatch in
+`src/SubscriptionProviderRegistry.ts` — mirrors the route shape of
+`claude-relay-service` (`src/routes/openaiRoutes.js`). Routing shape only; the
+TypeScript is original, and the upstream repository is not vendored.
+
+    https://github.com/Wei-Shaw/claude-relay-service
+    Licensed under the MIT License.
+
+--------------------------------------------------------------------------------
+2. oc-go-cc  (OpenCodeGo CC) — model-map + routing-shape / config-data
+--------------------------------------------------------------------------------
+
+The OpenCodeGo routing-shape, scenario router, model-map defaults, endpoint
+shapes, and Anthropic-shape `x-api-key` fallback in
+`src/opencodego/{defaults,endpoints,model-shape,ScenarioRouter}.ts` and
+`src/auth/StaticBearerAuthStrategy.ts` are clean-room ports of the model-map and
+routing shape from `oc-go-cc` (`internal/router/model_router.go`,
+`internal/client/opencode.go`, `configs/config.example.json`). Configuration
+data + routing shape only; the TypeScript is original, and the upstream
+repository is not vendored.
+
+--------------------------------------------------------------------------------
+3. js-tiktoken  (MIT License)
+--------------------------------------------------------------------------------
+
+`src/opencodego/token-count.ts` lazily imports `js-tiktoken` (cl100k_base
+encoding) to estimate input-token counts for OpenCodeGo scenario routing.
+
+    https://github.com/dqbd/tiktoken
+    Licensed under the MIT License.

package/README.md

@@ -1,15 +1,15 @@
-# @omnicross/subscriptions
-
-omnicross subscription-as-provider support — pass-through / OAuth-bearer / static-bearer auth strategies, the Claude / Codex / Gemini OAuth flows, and the OpenCodeGo scenario dispatcher + fallback chain.
-
-Part of the [omnicross](https://github.com/Dumoedss/omnicross) monorepo — see the root README for the full overview.
-
-```bash
-npm install @omnicross/subscriptions
-```
-
-## License
-
-[MIT](LICENSE) 
-
-This package adapts third-party work under its own license — see the `NOTICE` file.
+# @omnicross/subscriptions
+
+omnicross subscription-as-provider support — pass-through / OAuth-bearer / static-bearer auth strategies, the Claude / Codex / Gemini OAuth flows, and the OpenCodeGo scenario dispatcher + fallback chain.
+
+Part of the [omnicross](https://github.com/Dumoedss/omnicross) monorepo — see the root README for the full overview.
+
+```bash
+npm install @omnicross/subscriptions
+```
+
+## License
+
+[MIT](LICENSE) 
+
+This package adapts third-party work under its own license — see the `NOTICE` file.

package/dist/index.cjs

@@ -194,28 +194,40 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
     const gated = gateSchedulable(accounts, providerId, health, now, resolvedModel, supportedModelsById);
     const poolGated = isPoolGated(accounts, health, resolvedModel);
     const remapFor = (id) => remapReportForAccount(supportedModelsById.get(id), resolvedModel);
+    const preferredId = _optionalChain([ctx, 'optionalAccess', _5 => _5.preferredAccountId]);
+    if (preferredId) {
+      const preferred = gated.find((a) => a.id === preferredId);
+      if (preferred && preferred.schedulable !== false) {
+        const preferredToken = await tokens.getAccessTokenForAccount(providerId, preferredId);
+        if (preferredToken) {
+          maybeTouchLastUsed(selector, tokens, providerId, preferredId);
+          _optionalChain([report, 'optionalCall', _6 => _6(preferredId, preferredId === activeAccountId, remapFor(preferredId))]);
+          return preferredToken;
+        }
+      }
+    }
     const targetId = pickByIdTarget(selector, gated, providerId, activeAccountId, sessionKey, now, poolGated);
     if (targetId !== void 0) {
       const byId = await tokens.getAccessTokenForAccount(providerId, targetId);
       if (byId) {
         maybeTouchLastUsed(selector, tokens, providerId, targetId);
-        _optionalChain([report, 'optionalCall', _5 => _5(targetId, false, remapFor(targetId))]);
+        _optionalChain([report, 'optionalCall', _7 => _7(targetId, false, remapFor(targetId))]);
         return byId;
       }
       selector.evictAffinity(providerId, targetId);
-      _optionalChain([health, 'optionalAccess', _6 => _6.recordUpstreamOutcome, 'call', _7 => _7(providerId, targetId, { status: 401, now })]);
+      _optionalChain([health, 'optionalAccess', _8 => _8.recordUpstreamOutcome, 'call', _9 => _9(providerId, targetId, { status: 401, now })]);
       const remaining = gated.filter((a) => a.id !== targetId);
       const retryId = pickByIdTarget(selector, remaining, providerId, activeAccountId, sessionKey, now, poolGated);
       if (retryId !== void 0) {
         const retryToken = await tokens.getAccessTokenForAccount(providerId, retryId);
         if (retryToken) {
           maybeTouchLastUsed(selector, tokens, providerId, retryId);
-          _optionalChain([report, 'optionalCall', _8 => _8(retryId, false, remapFor(retryId))]);
+          _optionalChain([report, 'optionalCall', _10 => _10(retryId, false, remapFor(retryId))]);
           return retryToken;
         }
       }
     }
-    if (activeAccountId) _optionalChain([report, 'optionalCall', _9 => _9(activeAccountId, true, remapFor(activeAccountId))]);
+    if (activeAccountId) _optionalChain([report, 'optionalCall', _11 => _11(activeAccountId, true, remapFor(activeAccountId))]);
     return activeGetter();
   }
   return activeGetter();
@@ -264,9 +276,9 @@ var OAuthBearerAuthStrategy = (_class2 = class {
       this.selector,
       this.tokens,
       this.providerId,
-      _optionalChain([hints, 'optionalAccess', _10 => _10.sessionKey]),
+      _optionalChain([hints, 'optionalAccess', _12 => _12.sessionKey]),
       () => this.resolveAccessToken(),
-      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _11 => _11.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _12 => _12.resolvedModel]) }
+      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _13 => _13.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _14 => _14.resolvedModel]), preferredAccountId: _optionalChain([hints, 'optionalAccess', _15 => _15.preferredAccountId]) }
     );
     if (!token) {
       return;
@@ -288,7 +300,7 @@ var OAuthBearerAuthStrategy = (_class2 = class {
   async describeStatus() {
     const config = await this.tokens.getFullConfig();
     const entry = this.providerId === "codex" ? config.codex : config.gemini;
-    if (!_optionalChain([entry, 'optionalAccess', _13 => _13.accessToken])) {
+    if (!_optionalChain([entry, 'optionalAccess', _16 => _16.accessToken])) {
       return { providerId: this.providerId, ok: false, reason: "missing-credential" };
     }
     if (entry.status === "expired") {
@@ -305,7 +317,7 @@ var OAuthBearerAuthStrategy = (_class2 = class {
   async resolveAccessToken() {
     const config = await this.tokens.getFullConfig();
     const entry = this.providerId === "codex" ? config.codex : config.gemini;
-    if (!_optionalChain([entry, 'optionalAccess', _14 => _14.accessToken])) return null;
+    if (!_optionalChain([entry, 'optionalAccess', _17 => _17.accessToken])) return null;
     const expiresAtMs = entry.expiresAt ? new Date(entry.expiresAt).getTime() : 0;
     const expiringSoon = expiresAtMs > 0 && Date.now() >= expiresAtMs - REFRESH_LEAD_MS;
     if (expiringSoon && entry.refreshToken) {
@@ -315,7 +327,7 @@ var OAuthBearerAuthStrategy = (_class2 = class {
       if (!refreshed) return null;
       const fresh = await this.tokens.getFullConfig();
       const freshEntry = this.providerId === "codex" ? fresh.codex : fresh.gemini;
-      return _nullishCoalesce(_optionalChain([freshEntry, 'optionalAccess', _15 => _15.accessToken]), () => ( null));
+      return _nullishCoalesce(_optionalChain([freshEntry, 'optionalAccess', _18 => _18.accessToken]), () => ( null));
     }
     if (entry.status === "expired") return null;
     return entry.accessToken;
@@ -341,9 +353,9 @@ var PassThroughAuthStrategy = (_class3 = class {
       this.selector,
       this.tokens,
       "claude",
-      _optionalChain([hints, 'optionalAccess', _16 => _16.sessionKey]),
+      _optionalChain([hints, 'optionalAccess', _19 => _19.sessionKey]),
       () => this.tokens.getValidClaudeAccessToken(),
-      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _17 => _17.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _18 => _18.resolvedModel]) }
+      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _20 => _20.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _21 => _21.resolvedModel]), preferredAccountId: _optionalChain([hints, 'optionalAccess', _22 => _22.preferredAccountId]) }
     );
     if (!token) return;
     headers["Authorization"] = `Bearer ${token}`;
@@ -363,7 +375,7 @@ var PassThroughAuthStrategy = (_class3 = class {
   async describeStatus() {
     const config = await this.tokens.getFullConfig();
     const claude = config.claude;
-    if (!_optionalChain([claude, 'optionalAccess', _19 => _19.accessToken])) {
+    if (!_optionalChain([claude, 'optionalAccess', _23 => _23.accessToken])) {
       return { providerId: "claude", ok: false, reason: "missing-credential" };
     }
     if (claude.status === "expired") {
@@ -419,15 +431,15 @@ var StaticBearerAuthStrategy = (_class5 = class {
       this.selector,
       this.tokens,
       "opencodego",
-      _optionalChain([hints, 'optionalAccess', _20 => _20.sessionKey]),
+      _optionalChain([hints, 'optionalAccess', _24 => _24.sessionKey]),
       () => this.tokens.getValidOpenCodeGoApiKey(),
-      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _21 => _21.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _22 => _22.resolvedModel]) }
+      { health: this.health, reportSelection: _optionalChain([hints, 'optionalAccess', _25 => _25.reportSelection]), resolvedModel: _optionalChain([hints, 'optionalAccess', _26 => _26.resolvedModel]), preferredAccountId: _optionalChain([hints, 'optionalAccess', _27 => _27.preferredAccountId]) }
     );
     if (!key) {
       return;
     }
     headers["Authorization"] = `Bearer ${key}`;
-    if (_optionalChain([hints, 'optionalAccess', _23 => _23.upstreamUrl, 'optionalAccess', _24 => _24.includes, 'call', _25 => _25(ANTHROPIC_SHAPE_PATH)])) {
+    if (_optionalChain([hints, 'optionalAccess', _28 => _28.upstreamUrl, 'optionalAccess', _29 => _29.includes, 'call', _30 => _30(ANTHROPIC_SHAPE_PATH)])) {
       headers["x-api-key"] = key;
     }
   }
@@ -437,7 +449,7 @@ var StaticBearerAuthStrategy = (_class5 = class {
   async describeStatus() {
     const config = await this.tokens.getFullConfig();
     const oc = config.opencodego;
-    if (!_optionalChain([oc, 'optionalAccess', _26 => _26.apiKey])) {
+    if (!_optionalChain([oc, 'optionalAccess', _31 => _31.apiKey])) {
       return { providerId: "opencodego", ok: false, reason: "missing-credential" };
     }
     if (oc.status === "error") {
@@ -781,11 +793,11 @@ function resolveOpenCodeGoShape(entry) {
 function resolveOpenCodeGoHalf(modelId, config) {
   if (!config) return "go";
   for (const entry of Object.values(_nullishCoalesce(config.modelMap, () => ( {})))) {
-    if (_optionalChain([entry, 'optionalAccess', _27 => _27.modelId]) === modelId) return _nullishCoalesce(entry.provider, () => ( "go"));
+    if (_optionalChain([entry, 'optionalAccess', _32 => _32.modelId]) === modelId) return _nullishCoalesce(entry.provider, () => ( "go"));
   }
   for (const list of Object.values(_nullishCoalesce(config.fallbacks, () => ( {})))) {
     for (const entry of _nullishCoalesce(list, () => ( []))) {
-      if (_optionalChain([entry, 'optionalAccess', _28 => _28.modelId]) === modelId) return _nullishCoalesce(entry.provider, () => ( "go"));
+      if (_optionalChain([entry, 'optionalAccess', _33 => _33.modelId]) === modelId) return _nullishCoalesce(entry.provider, () => ( "go"));
     }
   }
   return "go";
@@ -885,7 +897,7 @@ function hasBackgroundPattern(loweredSlices) {
   return containsAny(loweredSlices, BACKGROUND_KEYWORDS);
 }
 function resolveOpenCodeGoScenario(summary, config) {
-  const longContextThreshold = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _29 => _29.modelMap, 'optionalAccess', _30 => _30.long_context, 'optionalAccess', _31 => _31.contextThreshold]), () => ( DEFAULT_OPENCODEGO_LONG_CONTEXT_THRESHOLD));
+  const longContextThreshold = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _34 => _34.modelMap, 'optionalAccess', _35 => _35.long_context, 'optionalAccess', _36 => _36.contextThreshold]), () => ( DEFAULT_OPENCODEGO_LONG_CONTEXT_THRESHOLD));
   if (summary.estimatedInputTokens >= longContextThreshold) {
     return "long_context";
   }
@@ -1015,7 +1027,7 @@ var SubscriptionProviderRegistry = (_class9 = class {
           resolveUpstreamUrl: (model, config) => {
             const oc = config;
             const { half, shape } = resolveOpenCodeGoTarget(model, oc);
-            const override = half === "zen" ? _optionalChain([oc, 'optionalAccess', _32 => _32.zenBaseUrl]) : _optionalChain([oc, 'optionalAccess', _33 => _33.baseUrl]);
+            const override = half === "zen" ? _optionalChain([oc, 'optionalAccess', _37 => _37.zenBaseUrl]) : _optionalChain([oc, 'optionalAccess', _38 => _38.baseUrl]);
             return buildOpenCodeGoUrl(half, shape, override);
           },
           // zen seam (Decision 3): vary the provider transformer chain by resolved
@@ -1033,7 +1045,7 @@ var SubscriptionProviderRegistry = (_class9 = class {
           modelTransformerNames: [],
           modelMapper: (sdkModel, summary, config) => {
             const scenario = resolveOpenCodeGoScenario(summary, config);
-            const entry = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([config, 'optionalAccess', _34 => _34.modelMap, 'optionalAccess', _35 => _35[scenario]]), () => ( _optionalChain([config, 'optionalAccess', _36 => _36.modelMap, 'optionalAccess', _37 => _37.default]))), () => ( DEFAULT_OPENCODEGO_MODEL_MAP[scenario])), () => ( DEFAULT_OPENCODEGO_MODEL_MAP.default));
+            const entry = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([config, 'optionalAccess', _39 => _39.modelMap, 'optionalAccess', _40 => _40[scenario]]), () => ( _optionalChain([config, 'optionalAccess', _41 => _41.modelMap, 'optionalAccess', _42 => _42.default]))), () => ( DEFAULT_OPENCODEGO_MODEL_MAP[scenario])), () => ( DEFAULT_OPENCODEGO_MODEL_MAP.default));
             if (!entry) {
               return { resolvedModel: sdkModel, scenario };
             }
@@ -1052,7 +1064,7 @@ var SubscriptionProviderRegistry = (_class9 = class {
           // wedge permanently in half-open). When NO circuit is open this returns
           // the same first non-attempted entry as the prior `!attempted` filter.
           nextFallback: (scenario, attempted, config) => {
-            const list = _nullishCoalesce(_nullishCoalesce(_optionalChain([config, 'optionalAccess', _38 => _38.fallbacks, 'optionalAccess', _39 => _39[scenario]]), () => ( DEFAULT_OPENCODEGO_FALLBACKS[scenario])), () => ( []));
+            const list = _nullishCoalesce(_nullishCoalesce(_optionalChain([config, 'optionalAccess', _43 => _43.fallbacks, 'optionalAccess', _44 => _44[scenario]]), () => ( DEFAULT_OPENCODEGO_FALLBACKS[scenario])), () => ( []));
             for (const entry of list) {
               if (attempted.includes(entry.modelId)) continue;
               if (this.breaker.allowRequest(entry.modelId)) return entry;
@@ -1153,7 +1165,7 @@ var SubscriptionDispatcher = class {
       scenario = mapped.scenario;
       req.anthropicBody.model = resolvedModel;
     }
-    const upstreamUrl = _optionalChain([this, 'access', _40 => _40.profile, 'access', _41 => _41.resolveUpstreamUrl, 'optionalCall', _42 => _42(resolvedModel, ocConfig)]);
+    const upstreamUrl = _optionalChain([this, 'access', _45 => _45.profile, 'access', _46 => _46.resolveUpstreamUrl, 'optionalCall', _47 => _47(resolvedModel, ocConfig)]);
     if (!upstreamUrl) {
       throw new Error(`[SubscriptionDispatcher] profile=${this.profile.providerId} missing resolveUpstreamUrl`);
     }
@@ -1185,7 +1197,7 @@ var SubscriptionDispatcher = class {
       );
       try {
         const upstream = await this.hooks.fetchWithRetry(upstreamUrl, headers, req.anthropicBody, currentModel);
-        _optionalChain([this, 'access', _43 => _43.profile, 'access', _44 => _44.recordModelOutcome, 'optionalCall', _45 => _45(currentModel, true)]);
+        _optionalChain([this, 'access', _48 => _48.profile, 'access', _49 => _49.recordModelOutcome, 'optionalCall', _50 => _50(currentModel, true)]);
         this.markHealth(usedAccountId, 200);
         await this.hooks.writeProxyResponse(req.res, upstream, req.isStream, req.reqId);
         return;
@@ -1194,7 +1206,7 @@ var SubscriptionDispatcher = class {
         if (handled.retryOnce) {
           try {
             const upstream = await this.hooks.fetchWithRetry(upstreamUrl, handled.headers, req.anthropicBody, currentModel);
-            _optionalChain([this, 'access', _46 => _46.profile, 'access', _47 => _47.recordModelOutcome, 'optionalCall', _48 => _48(currentModel, true)]);
+            _optionalChain([this, 'access', _51 => _51.profile, 'access', _52 => _52.recordModelOutcome, 'optionalCall', _53 => _53(currentModel, true)]);
             this.markHealth(usedAccountId, 200);
             await this.hooks.writeProxyResponse(req.res, upstream, req.isStream, req.reqId);
             return;
@@ -1204,10 +1216,10 @@ var SubscriptionDispatcher = class {
           }
         }
         if (caughtErrorBreakerOutcome(err) === "failure") {
-          _optionalChain([this, 'access', _49 => _49.profile, 'access', _50 => _50.recordModelOutcome, 'optionalCall', _51 => _51(currentModel, false)]);
+          _optionalChain([this, 'access', _54 => _54.profile, 'access', _55 => _55.recordModelOutcome, 'optionalCall', _56 => _56(currentModel, false)]);
         }
         this.markHealth(usedAccountId, errStatus(err), err);
-        const next = _optionalChain([this, 'access', _52 => _52.profile, 'access', _53 => _53.nextFallback, 'optionalCall', _54 => _54(scenario, attempted, ocConfig)]);
+        const next = _optionalChain([this, 'access', _57 => _57.profile, 'access', _58 => _58.nextFallback, 'optionalCall', _59 => _59(scenario, attempted, ocConfig)]);
         if (!next || attempted.length >= MAX_FALLBACK_ATTEMPTS_LOCAL) {
           throw err;
         }
@@ -1221,7 +1233,7 @@ var SubscriptionDispatcher = class {
   }
   /** Standard subscription transformer chain — Codex/Gemini/OpenCodeGo OpenAI-shape. */
   async dispatchTransformerChain(req, upstreamUrl, resolvedModel, scenario, ocConfig, sessionKey) {
-    const providerNames = _nullishCoalesce(_optionalChain([this, 'access', _55 => _55.profile, 'access', _56 => _56.resolveProviderTransformerNames, 'optionalCall', _57 => _57(resolvedModel, ocConfig)]), () => ( this.profile.providerTransformerNames));
+    const providerNames = _nullishCoalesce(_optionalChain([this, 'access', _60 => _60.profile, 'access', _61 => _61.resolveProviderTransformerNames, 'optionalCall', _62 => _62(resolvedModel, ocConfig)]), () => ( this.profile.providerTransformerNames));
     const providerTransformers = this.resolveTransformers(providerNames);
     const modelTransformers = this.resolveTransformers(this.profile.modelTransformerNames);
     const transformerProvider = {
@@ -1262,7 +1274,7 @@ var SubscriptionDispatcher = class {
       );
       try {
         const upstream = await this.hooks.fetchWithRetry(fetchUrl, headers, requestBody, currentModel);
-        _optionalChain([this, 'access', _58 => _58.profile, 'access', _59 => _59.recordModelOutcome, 'optionalCall', _60 => _60(currentModel, true)]);
+        _optionalChain([this, 'access', _63 => _63.profile, 'access', _64 => _64.recordModelOutcome, 'optionalCall', _65 => _65(currentModel, true)]);
         this.markHealth(usedAccountId, 200);
         const finalResponse = await this.hooks.executor.executeResponseChain(
           requestBody,
@@ -1278,7 +1290,7 @@ var SubscriptionDispatcher = class {
         if (handled.retryOnce) {
           try {
             const upstream = await this.hooks.fetchWithRetry(fetchUrl, handled.headers, requestBody, currentModel);
-            _optionalChain([this, 'access', _61 => _61.profile, 'access', _62 => _62.recordModelOutcome, 'optionalCall', _63 => _63(currentModel, true)]);
+            _optionalChain([this, 'access', _66 => _66.profile, 'access', _67 => _67.recordModelOutcome, 'optionalCall', _68 => _68(currentModel, true)]);
             this.markHealth(usedAccountId, 200);
             const finalResponse = await this.hooks.executor.executeResponseChain(
               requestBody,
@@ -1295,10 +1307,10 @@ var SubscriptionDispatcher = class {
           }
         }
         if (caughtErrorBreakerOutcome(err) === "failure") {
-          _optionalChain([this, 'access', _64 => _64.profile, 'access', _65 => _65.recordModelOutcome, 'optionalCall', _66 => _66(currentModel, false)]);
+          _optionalChain([this, 'access', _69 => _69.profile, 'access', _70 => _70.recordModelOutcome, 'optionalCall', _71 => _71(currentModel, false)]);
         }
         this.markHealth(usedAccountId, errStatus(err), err);
-        const next = _optionalChain([this, 'access', _67 => _67.profile, 'access', _68 => _68.nextFallback, 'optionalCall', _69 => _69(scenario, attempted, ocConfig)]);
+        const next = _optionalChain([this, 'access', _72 => _72.profile, 'access', _73 => _73.nextFallback, 'optionalCall', _74 => _74(scenario, attempted, ocConfig)]);
         if (!next || attempted.length >= MAX_FALLBACK_ATTEMPTS_LOCAL) {
           throw err;
         }
@@ -1328,7 +1340,7 @@ var SubscriptionDispatcher = class {
       return { firstModel: primaryModel, attempted: [] };
     }
     const skipped = [primaryModel];
-    const firstAdmitting = _optionalChain([this, 'access', _70 => _70.profile, 'access', _71 => _71.nextFallback, 'optionalCall', _72 => _72(scenario, skipped, ocConfig)]);
+    const firstAdmitting = _optionalChain([this, 'access', _75 => _75.profile, 'access', _76 => _76.nextFallback, 'optionalCall', _77 => _77(scenario, skipped, ocConfig)]);
     if (firstAdmitting) {
       console.warn(
         `[AgentProxy:subscription] opencodego primary ${primaryModel} circuit open -> first admitting fallback ${firstAdmitting.modelId}`
@@ -1346,7 +1358,7 @@ var SubscriptionDispatcher = class {
    * successfully (caller should retry once); otherwise re-throws.
    */
   async maybeRetryAfterError(err, headers, req, resolvedModel, sessionKey) {
-    const status = _nullishCoalesce(_optionalChain([err, 'optionalAccess', _73 => _73.status]), () => ( 0));
+    const status = _nullishCoalesce(_optionalChain([err, 'optionalAccess', _78 => _78.status]), () => ( 0));
     if (status !== 401) {
       return { retryOnce: false, headers };
     }
@@ -1468,11 +1480,11 @@ var SubscriptionDispatcher = class {
 };
 var MAX_FALLBACK_ATTEMPTS_LOCAL = 3;
 function errStatus(err) {
-  const status = _optionalChain([err, 'optionalAccess', _74 => _74.status]);
+  const status = _optionalChain([err, 'optionalAccess', _79 => _79.status]);
   return typeof status === "number" ? status : null;
 }
 function errHeaders(err) {
-  const h = _optionalChain([err, 'optionalAccess', _75 => _75.headers]);
+  const h = _optionalChain([err, 'optionalAccess', _80 => _80.headers]);
   if (!h) return void 0;
   if (typeof h.get === "function") return h;
   if (typeof h === "object") return h;
@@ -1480,11 +1492,11 @@ function errHeaders(err) {
 }
 function errBodyText(err) {
   const e = err;
-  const raw = typeof _optionalChain([e, 'optionalAccess', _76 => _76.bodyText]) === "string" ? e.bodyText : typeof _optionalChain([e, 'optionalAccess', _77 => _77.body]) === "string" ? e.body : void 0;
-  return _optionalChain([raw, 'optionalAccess', _78 => _78.slice, 'call', _79 => _79(0, 2048)]);
+  const raw = typeof _optionalChain([e, 'optionalAccess', _81 => _81.bodyText]) === "string" ? e.bodyText : typeof _optionalChain([e, 'optionalAccess', _82 => _82.body]) === "string" ? e.body : void 0;
+  return _optionalChain([raw, 'optionalAccess', _83 => _83.slice, 'call', _84 => _84(0, 2048)]);
 }
 function caughtErrorBreakerOutcome(err) {
-  const status = _optionalChain([err, 'optionalAccess', _80 => _80.status]);
+  const status = _optionalChain([err, 'optionalAccess', _85 => _85.status]);
   if (typeof status !== "number") return "failure";
   if (status === 0) return "neutral";
   if (status >= 500 || status === 429) return "failure";

package/dist/index.js

@@ -194,6 +194,18 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
     const gated = gateSchedulable(accounts, providerId, health, now, resolvedModel, supportedModelsById);
     const poolGated = isPoolGated(accounts, health, resolvedModel);
     const remapFor = (id) => remapReportForAccount(supportedModelsById.get(id), resolvedModel);
+    const preferredId = ctx?.preferredAccountId;
+    if (preferredId) {
+      const preferred = gated.find((a) => a.id === preferredId);
+      if (preferred && preferred.schedulable !== false) {
+        const preferredToken = await tokens.getAccessTokenForAccount(providerId, preferredId);
+        if (preferredToken) {
+          maybeTouchLastUsed(selector, tokens, providerId, preferredId);
+          report?.(preferredId, preferredId === activeAccountId, remapFor(preferredId));
+          return preferredToken;
+        }
+      }
+    }
     const targetId = pickByIdTarget(selector, gated, providerId, activeAccountId, sessionKey, now, poolGated);
     if (targetId !== void 0) {
       const byId = await tokens.getAccessTokenForAccount(providerId, targetId);
@@ -266,7 +278,7 @@ var OAuthBearerAuthStrategy = class {
       this.providerId,
       hints?.sessionKey,
       () => this.resolveAccessToken(),
-      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel }
+      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel, preferredAccountId: hints?.preferredAccountId }
     );
     if (!token) {
       return;
@@ -343,7 +355,7 @@ var PassThroughAuthStrategy = class {
       "claude",
       hints?.sessionKey,
       () => this.tokens.getValidClaudeAccessToken(),
-      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel }
+      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel, preferredAccountId: hints?.preferredAccountId }
     );
     if (!token) return;
     headers["Authorization"] = `Bearer ${token}`;
@@ -421,7 +433,7 @@ var StaticBearerAuthStrategy = class {
       "opencodego",
       hints?.sessionKey,
       () => this.tokens.getValidOpenCodeGoApiKey(),
-      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel }
+      { health: this.health, reportSelection: hints?.reportSelection, resolvedModel: hints?.resolvedModel, preferredAccountId: hints?.preferredAccountId }
     );
     if (!key) {
       return;

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "@omnicross/subscriptions",
-  "version": "0.1.3",
-  "description": "Omnicross subscription-as-provider auth strategies, OAuth flows, and the OpenCodeGo scenario dispatcher.",
-  "license": "MIT",
-  "author": "Sayo (https://github.com/Dumoedss)",
-  "homepage": "https://github.com/Dumoedss/omnicross#readme",
-  "keywords": [
-    "omnicross",
-    "llm",
-    "oauth",
-    "subscription",
-    "claude",
-    "codex",
-    "gemini"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Dumoedss/omnicross.git",
-    "directory": "packages/subscriptions"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "type": "module",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./*": {
-      "types": "./dist/*.d.ts",
-      "import": "./dist/*.js",
-      "require": "./dist/*.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "LICENSE",
-    "NOTICE",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
-  },
-  "dependencies": {
-    "@omnicross/contracts": "^0.1.0",
-    "@omnicross/core": "^0.1.0",
-    "js-tiktoken": "^1.0.21"
-  }
-}
+{
+  "name": "@omnicross/subscriptions",
+  "version": "0.1.4",
+  "description": "Omnicross subscription-as-provider auth strategies, OAuth flows, and the OpenCodeGo scenario dispatcher.",
+  "license": "MIT",
+  "author": "Sayo (https://github.com/Dumoedss)",
+  "homepage": "https://github.com/Dumoedss/omnicross#readme",
+  "keywords": [
+    "omnicross",
+    "llm",
+    "oauth",
+    "subscription",
+    "claude",
+    "codex",
+    "gemini"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Dumoedss/omnicross.git",
+    "directory": "packages/subscriptions"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "LICENSE",
+    "NOTICE",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
+  },
+  "dependencies": {
+    "@omnicross/contracts": "^0.1.0",
+    "@omnicross/core": "^0.1.0",
+    "js-tiktoken": "^1.0.21"
+  }
+}