@omnicross/subscriptions 0.1.6 → 0.1.8

package/dist/{chunk-IXGHVMZB.js → chunk-4HYDPKHR.js}

@@ -1,8 +1,6 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+import {
+  __export
+} from "./chunk-MLKGABMK.js";
 
 // src/oauth/flows/claude.ts
 var claude_exports = {};
@@ -29,39 +27,70 @@ function errorMessage(error, errorDescription) {
   }
   return String(error);
 }
-async function postForm(fetchImpl, url, params, parseErrorMessage) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: params.toString()
-  });
+function withStatus(message, response) {
+  return response.ok ? message : `${message} (HTTP ${response.status})`;
+}
+var DEFAULT_TOKEN_TIMEOUT_MS = 3e4;
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetchImpl(url, { ...init, signal: controller.signal });
+  } catch (e) {
+    if (controller.signal.aborted) {
+      throw new Error(`token endpoint timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw e;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function postForm(fetchImpl, url, params, parseErrorMessage, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: params.toString()
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
   }
   return data;
 }
-async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...extraHeaders },
-    body: JSON.stringify(body)
-  });
+async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json", ...extraHeaders },
+      body: JSON.stringify(body)
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
+  }
+  if (!response.ok) {
+    throw new Error(withStatus("token endpoint rejected the request", response));
   }
   return data;
 }

package/dist/chunk-6TTHLCG6.cjs

@@ -0,0 +1,33 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/scheduler/accountModelMap.ts
+function canonicalModelId(value) {
+  const idx = value.indexOf(",");
+  const bare = idx >= 0 ? value.slice(idx + 1) : value;
+  return bare.trim().toLowerCase();
+}
+function accountSupportsModel(supportedModels, model) {
+  if (!supportedModels) return true;
+  const target = canonicalModelId(model);
+  if (Array.isArray(supportedModels)) {
+    return supportedModels.some((m) => canonicalModelId(m) === target);
+  }
+  return Object.keys(supportedModels).some((k) => canonicalModelId(k) === target);
+}
+function remapForAccount(supportedModels, model) {
+  if (!supportedModels || Array.isArray(supportedModels)) return model;
+  const target = canonicalModelId(model);
+  for (const [key, actual] of Object.entries(supportedModels)) {
+    if (canonicalModelId(key) === target) return actual;
+  }
+  return model;
+}
+function remapReportForAccount(supportedModels, model) {
+  if (!model) return void 0;
+  const remapped = remapForAccount(supportedModels, model);
+  return remapped === model ? void 0 : remapped;
+}
+
+
+
+
+
+exports.accountSupportsModel = accountSupportsModel; exports.remapForAccount = remapForAccount; exports.remapReportForAccount = remapReportForAccount;

package/dist/chunk-75ZPJI57.cjs

@@ -0,0 +1,9 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+
+
+exports.__export = __export;

package/dist/chunk-MLKGABMK.js

@@ -0,0 +1,9 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+export {
+  __export
+};

package/dist/chunk-TDDDW53K.js

@@ -0,0 +1,33 @@
+// src/scheduler/accountModelMap.ts
+function canonicalModelId(value) {
+  const idx = value.indexOf(",");
+  const bare = idx >= 0 ? value.slice(idx + 1) : value;
+  return bare.trim().toLowerCase();
+}
+function accountSupportsModel(supportedModels, model) {
+  if (!supportedModels) return true;
+  const target = canonicalModelId(model);
+  if (Array.isArray(supportedModels)) {
+    return supportedModels.some((m) => canonicalModelId(m) === target);
+  }
+  return Object.keys(supportedModels).some((k) => canonicalModelId(k) === target);
+}
+function remapForAccount(supportedModels, model) {
+  if (!supportedModels || Array.isArray(supportedModels)) return model;
+  const target = canonicalModelId(model);
+  for (const [key, actual] of Object.entries(supportedModels)) {
+    if (canonicalModelId(key) === target) return actual;
+  }
+  return model;
+}
+function remapReportForAccount(supportedModels, model) {
+  if (!model) return void 0;
+  const remapped = remapForAccount(supportedModels, model);
+  return remapped === model ? void 0 : remapped;
+}
+
+export {
+  accountSupportsModel,
+  remapForAccount,
+  remapReportForAccount
+};

package/dist/{chunk-TPW5Q25Y.cjs → chunk-UXUMAXZJ.cjs}

@@ -1,12 +1,10 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+var _chunk75ZPJI57cjs = require('./chunk-75ZPJI57.cjs');
 
 // src/oauth/flows/claude.ts
 var claude_exports = {};
-__export(claude_exports, {
+_chunk75ZPJI57cjs.__export.call(void 0, claude_exports, {
   exchangeCodeForTokens: () => exchangeCodeForTokens,
   exchangeSetupTokenCode: () => exchangeSetupTokenCode,
   generateAuthParams: () => generateAuthParams,
@@ -29,39 +27,70 @@ function errorMessage(error, errorDescription) {
   }
   return String(error);
 }
-async function postForm(fetchImpl, url, params, parseErrorMessage) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: params.toString()
-  });
+function withStatus(message, response) {
+  return response.ok ? message : `${message} (HTTP ${response.status})`;
+}
+var DEFAULT_TOKEN_TIMEOUT_MS = 3e4;
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetchImpl(url, { ...init, signal: controller.signal });
+  } catch (e) {
+    if (controller.signal.aborted) {
+      throw new Error(`token endpoint timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw e;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function postForm(fetchImpl, url, params, parseErrorMessage, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: params.toString()
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch (e2) {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
   }
   return data;
 }
-async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...extraHeaders },
-    body: JSON.stringify(body)
-  });
+async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json", ...extraHeaders },
+      body: JSON.stringify(body)
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch (e3) {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
+  }
+  if (!response.ok) {
+    throw new Error(withStatus("token endpoint rejected the request", response));
   }
   return data;
 }
@@ -204,7 +233,7 @@ async function refreshAccessToken(refreshToken, fetchImpl) {
 
 // src/oauth/flows/codex.ts
 var codex_exports = {};
-__export(codex_exports, {
+_chunk75ZPJI57cjs.__export.call(void 0, codex_exports, {
   exchangeCodeForTokens: () => exchangeCodeForTokens2,
   generateAuthParams: () => generateAuthParams2,
   refreshAccessToken: () => refreshAccessToken2
@@ -280,7 +309,7 @@ async function refreshAccessToken2(refreshToken, fetchImpl) {
 
 // src/oauth/flows/gemini.ts
 var gemini_exports = {};
-__export(gemini_exports, {
+_chunk75ZPJI57cjs.__export.call(void 0, gemini_exports, {
   exchangeCodeForTokens: () => exchangeCodeForTokens3,
   generateAuthParams: () => generateAuthParams3,
   refreshAccessToken: () => refreshAccessToken3

package/dist/index.cjs

@@ -2,7 +2,12 @@
 
 
 
-var _chunkTPW5Q25Ycjs = require('./chunk-TPW5Q25Y.cjs');
+var _chunkUXUMAXZJcjs = require('./chunk-UXUMAXZJ.cjs');
+
+
+
+var _chunk6TTHLCG6cjs = require('./chunk-6TTHLCG6.cjs');
+require('./chunk-75ZPJI57.cjs');
 
 // src/scheduler/SubscriptionAccountSelector.ts
 var SESSION_AFFINITY_TTL_MS = 36e5;
@@ -61,7 +66,7 @@ var SubscriptionAccountSelector = (_class = class {constructor() { _class.protot
    * conversation).
    */
   evictAffinity(providerId, accountId) {
-    const prefix = `${providerId} `;
+    const prefix = scopedKey(providerId, "");
     for (const [key, entry] of this.affinity) {
       if (entry.accountId === accountId && key.startsWith(prefix)) {
         this.affinity.delete(key);
@@ -116,36 +121,6 @@ var _AccountAllowanceScheduling = require('@omnicross/core/pipeline/AccountAllow
 
 
 var _BoundAccountSelectionError = require('@omnicross/core/pipeline/BoundAccountSelectionError');
-
-// src/scheduler/accountModelMap.ts
-function canonicalModelId(value) {
-  const idx = value.indexOf(",");
-  const bare = idx >= 0 ? value.slice(idx + 1) : value;
-  return bare.trim().toLowerCase();
-}
-function accountSupportsModel(supportedModels, model) {
-  if (!supportedModels) return true;
-  const target = canonicalModelId(model);
-  if (Array.isArray(supportedModels)) {
-    return supportedModels.some((m) => canonicalModelId(m) === target);
-  }
-  return Object.keys(supportedModels).some((k) => canonicalModelId(k) === target);
-}
-function remapForAccount(supportedModels, model) {
-  if (!supportedModels || Array.isArray(supportedModels)) return model;
-  const target = canonicalModelId(model);
-  for (const [key, actual] of Object.entries(supportedModels)) {
-    if (canonicalModelId(key) === target) return actual;
-  }
-  return model;
-}
-function remapReportForAccount(supportedModels, model) {
-  if (!model) return void 0;
-  const remapped = remapForAccount(supportedModels, model);
-  return remapped === model ? void 0 : remapped;
-}
-
-// src/scheduler/accountSelection.ts
 var ACCOUNTS_KEY = {
   claude: "claudeAccounts",
   codex: "codexAccounts",
@@ -162,7 +137,7 @@ function gateSchedulable(accounts, providerId, health, now, resolvedModel, suppo
   if (!health && !resolvedModel || accounts.length < 2) return accounts;
   return accounts.map((a) => {
     const healthOk = health ? health.isSchedulable(providerId, a.id, now) : true;
-    const modelOk = resolvedModel ? accountSupportsModel(supportedModelsById.get(a.id), resolvedModel) : true;
+    const modelOk = resolvedModel ? _chunk6TTHLCG6cjs.accountSupportsModel.call(void 0, supportedModelsById.get(a.id), resolvedModel) : true;
     return { ...a, schedulable: a.schedulable !== false && healthOk && modelOk };
   });
 }
@@ -172,7 +147,7 @@ function isPoolGated(accounts, health, resolvedModel) {
 function hasUsableToken(token) {
   return typeof token === "string" && token.trim() !== "";
 }
-async function resolveStrictPreferredToken(tokens, providerId, preferredId, activeGetter, ctx) {
+async function resolveStrictPreferredToken(selector, tokens, providerId, preferredId, activeGetter, ctx) {
   let config;
   try {
     config = await tokens.getFullConfig();
@@ -197,7 +172,7 @@ async function resolveStrictPreferredToken(tokens, providerId, preferredId, acti
   if (ctx.health && !ctx.health.isSchedulable(providerId, preferredId, ctx.now)) {
     throw new (0, _BoundAccountSelectionError.BoundAccountSelectionError)(providerId, "unhealthy");
   }
-  if (ctx.resolvedModel && !accountSupportsModel(supportedModelsById.get(preferredId), ctx.resolvedModel)) {
+  if (ctx.resolvedModel && !_chunk6TTHLCG6cjs.accountSupportsModel.call(void 0, supportedModelsById.get(preferredId), ctx.resolvedModel)) {
     throw new (0, _BoundAccountSelectionError.BoundAccountSelectionError)(providerId, "model-incompatible");
   }
   const allowance = _AccountAllowanceScheduling.getSharedAccountAllowanceScheduling.call(void 0, ).evaluate(
@@ -218,7 +193,8 @@ async function resolveStrictPreferredToken(tokens, providerId, preferredId, acti
   if (!hasUsableToken(token)) {
     throw new (0, _BoundAccountSelectionError.BoundAccountSelectionError)(providerId, "empty-token");
   }
-  const remapped = remapReportForAccount(supportedModelsById.get(preferredId), ctx.resolvedModel);
+  const remapped = _chunk6TTHLCG6cjs.remapReportForAccount.call(void 0, supportedModelsById.get(preferredId), ctx.resolvedModel);
+  if (selector) maybeTouchLastUsed(selector, tokens, providerId, preferredId);
   _optionalChain([ctx, 'access', _ => _.reportSelection, 'optionalCall', _2 => _2(preferredId, preferredId === activeAccountId, remapped)]);
   return token;
 }
@@ -284,7 +260,7 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
   const preferredId = typeof _optionalChain([ctx, 'optionalAccess', _9 => _9.preferredAccountId]) === "string" && ctx.preferredAccountId.trim() !== "" ? ctx.preferredAccountId.trim() : void 0;
   const preferredGroup = typeof _optionalChain([ctx, 'optionalAccess', _10 => _10.preferredAccountGroup]) === "string" && ctx.preferredAccountGroup.trim() !== "" ? ctx.preferredAccountGroup.trim() : void 0;
   if (preferredId && ctx && ctx.boundAccountFallbackPolicy !== "pool") {
-    return resolveStrictPreferredToken(tokens, providerId, preferredId, activeGetter, ctx);
+    return resolveStrictPreferredToken(selector, tokens, providerId, preferredId, activeGetter, ctx);
   }
   if (selector && tokens.getAccessTokenForAccount) {
     const config = await tokens.getFullConfig();
@@ -327,7 +303,7 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
       gated = gateByAllowance(healthAndModelGated, providerId, now);
     }
     const poolGated = isPoolGated(candidates, health, resolvedModel) || candidates.some((account) => account.schedulable === false) || preferredGroup !== void 0;
-    const remapFor = (id) => remapReportForAccount(supportedModelsById.get(id), resolvedModel);
+    const remapFor = (id) => _chunk6TTHLCG6cjs.remapReportForAccount.call(void 0, supportedModelsById.get(id), resolvedModel);
     if (preferredId) {
       const preferred = gated.find((a) => a.id === preferredId);
       if (preferred && preferred.schedulable !== false) {
@@ -375,7 +351,12 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
       if (activeAllowance.action === "pause") {
         throw new (0, _AccountAllowanceScheduling.AccountAllowanceExhaustedError)(providerId, activeAllowance.resumeAt);
       }
-      _optionalChain([report, 'optionalCall', _22 => _22(activeAccountId, true, remapFor(activeAccountId))]);
+      const token = await activeGetter();
+      if (hasUsableToken(token)) {
+        maybeTouchLastUsed(selector, tokens, providerId, activeAccountId);
+        _optionalChain([report, 'optionalCall', _22 => _22(activeAccountId, true, remapFor(activeAccountId))]);
+      }
+      return token;
     }
     return activeGetter();
   }
@@ -1697,4 +1678,4 @@ function stripAuthHeaders(headers) {
 
 
 
-exports.DEFAULT_ACCOUNT_PRIORITY = DEFAULT_ACCOUNT_PRIORITY; exports.LAST_USED_PERSIST_THROTTLE_MS = LAST_USED_PERSIST_THROTTLE_MS; exports.SESSION_AFFINITY_TTL_MS = SESSION_AFFINITY_TTL_MS; exports.SubscriptionAccountSelector = SubscriptionAccountSelector; exports.SubscriptionAccountService = SubscriptionAccountService; exports.SubscriptionDispatcher = SubscriptionDispatcher; exports.SubscriptionProviderRegistry = SubscriptionProviderRegistry; exports.claudeOAuth = _chunkTPW5Q25Ycjs.claude_exports; exports.codexOAuth = _chunkTPW5Q25Ycjs.codex_exports; exports.geminiOAuth = _chunkTPW5Q25Ycjs.gemini_exports; exports.getSubscriptionAccountService = getSubscriptionAccountService; exports.getSubscriptionProviderRegistry = getSubscriptionProviderRegistry; exports.setSubscriptionAccountService = setSubscriptionAccountService; exports.setSubscriptionProviderRegistry = setSubscriptionProviderRegistry;
+exports.DEFAULT_ACCOUNT_PRIORITY = DEFAULT_ACCOUNT_PRIORITY; exports.LAST_USED_PERSIST_THROTTLE_MS = LAST_USED_PERSIST_THROTTLE_MS; exports.SESSION_AFFINITY_TTL_MS = SESSION_AFFINITY_TTL_MS; exports.SubscriptionAccountSelector = SubscriptionAccountSelector; exports.SubscriptionAccountService = SubscriptionAccountService; exports.SubscriptionDispatcher = SubscriptionDispatcher; exports.SubscriptionProviderRegistry = SubscriptionProviderRegistry; exports.claudeOAuth = _chunkUXUMAXZJcjs.claude_exports; exports.codexOAuth = _chunkUXUMAXZJcjs.codex_exports; exports.geminiOAuth = _chunkUXUMAXZJcjs.gemini_exports; exports.getSubscriptionAccountService = getSubscriptionAccountService; exports.getSubscriptionProviderRegistry = getSubscriptionProviderRegistry; exports.setSubscriptionAccountService = setSubscriptionAccountService; exports.setSubscriptionProviderRegistry = setSubscriptionProviderRegistry;

package/dist/index.js

@@ -2,7 +2,12 @@ import {
   claude_exports,
   codex_exports,
   gemini_exports
-} from "./chunk-IXGHVMZB.js";
+} from "./chunk-4HYDPKHR.js";
+import {
+  accountSupportsModel,
+  remapReportForAccount
+} from "./chunk-TDDDW53K.js";
+import "./chunk-MLKGABMK.js";
 
 // src/scheduler/SubscriptionAccountSelector.ts
 var SESSION_AFFINITY_TTL_MS = 36e5;
@@ -61,7 +66,7 @@ var SubscriptionAccountSelector = class {
    * conversation).
    */
   evictAffinity(providerId, accountId) {
-    const prefix = `${providerId} `;
+    const prefix = scopedKey(providerId, "");
     for (const [key, entry] of this.affinity) {
       if (entry.accountId === accountId && key.startsWith(prefix)) {
         this.affinity.delete(key);
@@ -116,36 +121,6 @@ import {
 import {
   BoundAccountSelectionError
 } from "@omnicross/core/pipeline/BoundAccountSelectionError";
-
-// src/scheduler/accountModelMap.ts
-function canonicalModelId(value) {
-  const idx = value.indexOf(",");
-  const bare = idx >= 0 ? value.slice(idx + 1) : value;
-  return bare.trim().toLowerCase();
-}
-function accountSupportsModel(supportedModels, model) {
-  if (!supportedModels) return true;
-  const target = canonicalModelId(model);
-  if (Array.isArray(supportedModels)) {
-    return supportedModels.some((m) => canonicalModelId(m) === target);
-  }
-  return Object.keys(supportedModels).some((k) => canonicalModelId(k) === target);
-}
-function remapForAccount(supportedModels, model) {
-  if (!supportedModels || Array.isArray(supportedModels)) return model;
-  const target = canonicalModelId(model);
-  for (const [key, actual] of Object.entries(supportedModels)) {
-    if (canonicalModelId(key) === target) return actual;
-  }
-  return model;
-}
-function remapReportForAccount(supportedModels, model) {
-  if (!model) return void 0;
-  const remapped = remapForAccount(supportedModels, model);
-  return remapped === model ? void 0 : remapped;
-}
-
-// src/scheduler/accountSelection.ts
 var ACCOUNTS_KEY = {
   claude: "claudeAccounts",
   codex: "codexAccounts",
@@ -172,7 +147,7 @@ function isPoolGated(accounts, health, resolvedModel) {
 function hasUsableToken(token) {
   return typeof token === "string" && token.trim() !== "";
 }
-async function resolveStrictPreferredToken(tokens, providerId, preferredId, activeGetter, ctx) {
+async function resolveStrictPreferredToken(selector, tokens, providerId, preferredId, activeGetter, ctx) {
   let config;
   try {
     config = await tokens.getFullConfig();
@@ -219,6 +194,7 @@ async function resolveStrictPreferredToken(tokens, providerId, preferredId, acti
     throw new BoundAccountSelectionError(providerId, "empty-token");
   }
   const remapped = remapReportForAccount(supportedModelsById.get(preferredId), ctx.resolvedModel);
+  if (selector) maybeTouchLastUsed(selector, tokens, providerId, preferredId);
   ctx.reportSelection?.(preferredId, preferredId === activeAccountId, remapped);
   return token;
 }
@@ -284,7 +260,7 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
   const preferredId = typeof ctx?.preferredAccountId === "string" && ctx.preferredAccountId.trim() !== "" ? ctx.preferredAccountId.trim() : void 0;
   const preferredGroup = typeof ctx?.preferredAccountGroup === "string" && ctx.preferredAccountGroup.trim() !== "" ? ctx.preferredAccountGroup.trim() : void 0;
   if (preferredId && ctx && ctx.boundAccountFallbackPolicy !== "pool") {
-    return resolveStrictPreferredToken(tokens, providerId, preferredId, activeGetter, ctx);
+    return resolveStrictPreferredToken(selector, tokens, providerId, preferredId, activeGetter, ctx);
   }
   if (selector && tokens.getAccessTokenForAccount) {
     const config = await tokens.getFullConfig();
@@ -375,7 +351,12 @@ async function resolveSelectedToken(selector, tokens, providerId, sessionKey, ac
       if (activeAllowance.action === "pause") {
         throw new AccountAllowanceExhaustedError(providerId, activeAllowance.resumeAt);
       }
-      report?.(activeAccountId, true, remapFor(activeAccountId));
+      const token = await activeGetter();
+      if (hasUsableToken(token)) {
+        maybeTouchLastUsed(selector, tokens, providerId, activeAccountId);
+        report?.(activeAccountId, true, remapFor(activeAccountId));
+      }
+      return token;
     }
     return activeGetter();
   }

package/dist/oauth.cjs

@@ -2,9 +2,10 @@
 
 
 
-var _chunkTPW5Q25Ycjs = require('./chunk-TPW5Q25Y.cjs');
+var _chunkUXUMAXZJcjs = require('./chunk-UXUMAXZJ.cjs');
+require('./chunk-75ZPJI57.cjs');
 
 
 
 
-exports.claudeOAuth = _chunkTPW5Q25Ycjs.claude_exports; exports.codexOAuth = _chunkTPW5Q25Ycjs.codex_exports; exports.geminiOAuth = _chunkTPW5Q25Ycjs.gemini_exports;
+exports.claudeOAuth = _chunkUXUMAXZJcjs.claude_exports; exports.codexOAuth = _chunkUXUMAXZJcjs.codex_exports; exports.geminiOAuth = _chunkUXUMAXZJcjs.gemini_exports;

package/dist/oauth.js

@@ -2,7 +2,8 @@ import {
   claude_exports,
   codex_exports,
   gemini_exports
-} from "./chunk-IXGHVMZB.js";
+} from "./chunk-4HYDPKHR.js";
+import "./chunk-MLKGABMK.js";
 export {
   claude_exports as claudeOAuth,
   codex_exports as codexOAuth,

package/dist/scheduler/accountModelMap.cjs

@@ -0,0 +1,11 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+
+
+var _chunk6TTHLCG6cjs = require('../chunk-6TTHLCG6.cjs');
+require('../chunk-75ZPJI57.cjs');
+
+
+
+
+exports.accountSupportsModel = _chunk6TTHLCG6cjs.accountSupportsModel; exports.remapForAccount = _chunk6TTHLCG6cjs.remapForAccount; exports.remapReportForAccount = _chunk6TTHLCG6cjs.remapReportForAccount;

package/dist/scheduler/accountModelMap.d.cts

@@ -0,0 +1,46 @@
+/**
+ * accountModelMap — pure helpers for the per-account `supportedModels` field
+ * (subscription-account-model-map, design D1).
+ *
+ * Dual-format `SubscriptionAccountEntry.supportedModels`:
+ *  - **array** — an ALLOW-LIST of supported logical models; no remap.
+ *  - **object** — the KEYS are the same allow-list AND each VALUE is the
+ *    account's ACTUAL upstream model (a logical→actual remap).
+ *  - **absent** — supports every model, no remap (zero regression).
+ *
+ * Both helpers are pure. They fold into the EXISTING `accountSelection`
+ * eligibility path (`accountSupportsModel` → `gateSchedulable`) and the outbound
+ * body-model finalize point (`remapForAccount`); they add no new mechanism.
+ *
+ * Model ids are compared on ONE canonical form — the bare, trimmed, lower-cased
+ * id (a `"providerId,modelId"` ref reduces to its `modelId`) — identical to the
+ * key-model restriction's `canonicalModelId` (#6), so membership is case- and
+ * ref-shape-insensitive and an alias cannot slip past.
+ *
+ * @module scheduler/accountModelMap
+ */
+/** The `supportedModels` value shape (mirrors the contract field). */
+type SupportedModels = string[] | Record<string, string>;
+/**
+ * Whether an account with this `supportedModels` supports the resolved model.
+ *  - absent ⇒ `true` (supports everything — zero regression).
+ *  - array  ⇒ case-insensitive membership.
+ *  - object ⇒ the model is one of the KEYS (the keys are the allow-list).
+ */
+declare function accountSupportsModel(supportedModels: SupportedModels | undefined, model: string): boolean;
+/**
+ * The ACTUAL upstream model this account serves the logical model as. Only the
+ * OBJECT form remaps: when a key matches the resolved model its value is
+ * returned; an array form, an absent map, or a missing key ⇒ the model unchanged.
+ */
+declare function remapForAccount(supportedModels: SupportedModels | undefined, model: string): string;
+/**
+ * The remapped model to REPORT to the relay, or `undefined` when there is no
+ * actual change (array form / absent / no matching key / a remap equal to the
+ * resolved model). Returning `undefined` on a no-op keeps the outbound body
+ * byte-identical on the same-format path (the relay only rewrites `body.model`
+ * when a value is present).
+ */
+declare function remapReportForAccount(supportedModels: SupportedModels | undefined, model: string | undefined): string | undefined;
+
+export { type SupportedModels, accountSupportsModel, remapForAccount, remapReportForAccount };

package/dist/scheduler/accountModelMap.d.ts

@@ -0,0 +1,46 @@
+/**
+ * accountModelMap — pure helpers for the per-account `supportedModels` field
+ * (subscription-account-model-map, design D1).
+ *
+ * Dual-format `SubscriptionAccountEntry.supportedModels`:
+ *  - **array** — an ALLOW-LIST of supported logical models; no remap.
+ *  - **object** — the KEYS are the same allow-list AND each VALUE is the
+ *    account's ACTUAL upstream model (a logical→actual remap).
+ *  - **absent** — supports every model, no remap (zero regression).
+ *
+ * Both helpers are pure. They fold into the EXISTING `accountSelection`
+ * eligibility path (`accountSupportsModel` → `gateSchedulable`) and the outbound
+ * body-model finalize point (`remapForAccount`); they add no new mechanism.
+ *
+ * Model ids are compared on ONE canonical form — the bare, trimmed, lower-cased
+ * id (a `"providerId,modelId"` ref reduces to its `modelId`) — identical to the
+ * key-model restriction's `canonicalModelId` (#6), so membership is case- and
+ * ref-shape-insensitive and an alias cannot slip past.
+ *
+ * @module scheduler/accountModelMap
+ */
+/** The `supportedModels` value shape (mirrors the contract field). */
+type SupportedModels = string[] | Record<string, string>;
+/**
+ * Whether an account with this `supportedModels` supports the resolved model.
+ *  - absent ⇒ `true` (supports everything — zero regression).
+ *  - array  ⇒ case-insensitive membership.
+ *  - object ⇒ the model is one of the KEYS (the keys are the allow-list).
+ */
+declare function accountSupportsModel(supportedModels: SupportedModels | undefined, model: string): boolean;
+/**
+ * The ACTUAL upstream model this account serves the logical model as. Only the
+ * OBJECT form remaps: when a key matches the resolved model its value is
+ * returned; an array form, an absent map, or a missing key ⇒ the model unchanged.
+ */
+declare function remapForAccount(supportedModels: SupportedModels | undefined, model: string): string;
+/**
+ * The remapped model to REPORT to the relay, or `undefined` when there is no
+ * actual change (array form / absent / no matching key / a remap equal to the
+ * resolved model). Returning `undefined` on a no-op keeps the outbound body
+ * byte-identical on the same-format path (the relay only rewrites `body.model`
+ * when a value is present).
+ */
+declare function remapReportForAccount(supportedModels: SupportedModels | undefined, model: string | undefined): string | undefined;
+
+export { type SupportedModels, accountSupportsModel, remapForAccount, remapReportForAccount };

package/dist/scheduler/accountModelMap.js

@@ -0,0 +1,11 @@
+import {
+  accountSupportsModel,
+  remapForAccount,
+  remapReportForAccount
+} from "../chunk-TDDDW53K.js";
+import "../chunk-MLKGABMK.js";
+export {
+  accountSupportsModel,
+  remapForAccount,
+  remapReportForAccount
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnicross/subscriptions",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Omnicross subscription-as-provider auth strategies, OAuth flows, and the OpenCodeGo scenario dispatcher.",
   "license": "MIT",
   "author": "Sayo (https://github.com/Dumoedss)",