github-issue-tower-defence-management 1.146.7 → 1.146.9

package/src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts

@@ -2,18 +2,47 @@ import { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionReposit
 import {
   OauthTokenCandidate,
   OauthTokenSelectUseCase,
-  SelectionRandom,
-  selectWeightedCandidate,
   selectionWeightOf,
-  sevenDayUrgencyFactor,
 } from './OauthTokenSelectUseCase';
 
+export type LiveSessionOauthTokenSelectionSettings = {
+  maxConcurrentSessionCount: number;
+  fullSpeedFiveHourFreeRatio: number;
+};
+
+export const DEFAULT_LIVE_SESSION_OAUTH_TOKEN_SELECTION_SETTINGS: LiveSessionOauthTokenSelectionSettings =
+  {
+    maxConcurrentSessionCount: 10,
+    fullSpeedFiveHourFreeRatio: 0.5,
+  };
+
+export const liveSessionConcurrentLimitOf = (
+  fiveHourFreeRatio: number,
+  selectionWeight: number,
+  settings: LiveSessionOauthTokenSelectionSettings,
+): number => {
+  const fiveHourThrottleFactor = Math.min(
+    fiveHourFreeRatio / settings.fullSpeedFiveHourFreeRatio,
+    1,
+  );
+  return Math.max(
+    Math.floor(
+      settings.maxConcurrentSessionCount *
+        selectionWeight *
+        fiveHourThrottleFactor,
+    ),
+    1,
+  );
+};
+
 export type LiveSessionOauthTokenCandidateMetrics = {
   name: string;
   fiveHourFreeRatio: number;
   sevenDayFreeRatio: number;
   sevenDayEndEpoch: number;
   liveSessionCount: number;
+  concurrentSessionLimit: number;
+  hasConcurrencyHeadroom: boolean;
   eligible: boolean;
   exclusionReason: string | null;
 };
@@ -32,7 +61,7 @@ export class LiveSessionOauthTokenSelectUseCase {
     candidates: OauthTokenCandidate[],
     liveSessions: ClaudeLiveSession[],
     nowEpochSeconds: number,
-    random: SelectionRandom = Math.random,
+    settings: LiveSessionOauthTokenSelectionSettings,
   ): LiveSessionOauthTokenSelectResult => {
     const rateLimitResult = this.rateLimitSelectUseCase.run(
       candidates,
@@ -45,6 +74,11 @@ export class LiveSessionOauthTokenSelectUseCase {
       const rateLimitMetric = rateLimitResult.metrics[index];
       const liveSessionCount =
         liveSessionCountByToken.get(candidate.token) ?? 0;
+      const concurrentSessionLimit = liveSessionConcurrentLimitOf(
+        rateLimitMetric.fiveHourFreeRatio,
+        selectionWeightOf(candidate),
+        settings,
+      );
       return {
         candidate,
         metric: {
@@ -53,6 +87,8 @@ export class LiveSessionOauthTokenSelectUseCase {
           sevenDayFreeRatio: rateLimitMetric.sevenDayFreeRatio,
           sevenDayEndEpoch: rateLimitMetric.sevenDayEndEpoch,
           liveSessionCount,
+          concurrentSessionLimit,
+          hasConcurrencyHeadroom: liveSessionCount < concurrentSessionLimit,
           eligible: rateLimitMetric.eligible,
           exclusionReason: rateLimitMetric.exclusionReason,
         },
@@ -66,26 +102,12 @@ export class LiveSessionOauthTokenSelectUseCase {
       return { selected: null, metrics };
     }
 
-    const deterministicBest = eligible.reduce((bestEntry, currentEntry) =>
+    const selected = eligible.reduce((bestEntry, currentEntry) =>
       this.preferred(currentEntry.metric, bestEntry.metric)
         ? currentEntry
         : bestEntry,
     );
 
-    const selected = selectWeightedCandidate(
-      eligible,
-      (entry) =>
-        (selectionWeightOf(entry.candidate) *
-          sevenDayUrgencyFactor(
-            entry.metric.sevenDayFreeRatio,
-            entry.metric.sevenDayEndEpoch,
-            nowEpochSeconds,
-          )) /
-        (1 + entry.metric.liveSessionCount),
-      deterministicBest,
-      random,
-    );
-
     return { selected: selected.candidate, metrics };
   };
 
@@ -93,12 +115,18 @@ export class LiveSessionOauthTokenSelectUseCase {
     candidateMetric: LiveSessionOauthTokenCandidateMetrics,
     incumbentMetric: LiveSessionOauthTokenCandidateMetrics,
   ): boolean => {
-    if (candidateMetric.liveSessionCount !== incumbentMetric.liveSessionCount) {
+    if (
+      candidateMetric.hasConcurrencyHeadroom !==
+      incumbentMetric.hasConcurrencyHeadroom
+    ) {
+      return candidateMetric.hasConcurrencyHeadroom;
+    }
+    if (candidateMetric.sevenDayEndEpoch !== incumbentMetric.sevenDayEndEpoch) {
       return (
-        candidateMetric.liveSessionCount < incumbentMetric.liveSessionCount
+        candidateMetric.sevenDayEndEpoch < incumbentMetric.sevenDayEndEpoch
       );
     }
-    return candidateMetric.sevenDayEndEpoch < incumbentMetric.sevenDayEndEpoch;
+    return candidateMetric.liveSessionCount < incumbentMetric.liveSessionCount;
   };
 
   private liveSessionCountByToken = (

package/types/adapter/entry-points/cli/fleetConfig.d.ts

@@ -0,0 +1,6 @@
+import { LiveSessionOauthTokenSelectionSettings } from '../../../domain/usecases/LiveSessionOauthTokenSelectUseCase';
+export declare const FLEET_CONFIG_FILE_PATH_ENVIRONMENT_VARIABLE = "TDPM_FLEET_CONFIG";
+export declare const LIVE_SESSION_OAUTH_TOKEN_SELECTION_SECTION_KEY = "liveSessionOauthTokenSelection";
+export declare const resolveFleetConfigFilePath: (cliValue: string | null) => string | null;
+export declare const loadLiveSessionOauthTokenSelectionSettings: (fleetConfigFilePath: string | null) => LiveSessionOauthTokenSelectionSettings;
+//# sourceMappingURL=fleetConfig.d.ts.map

package/types/adapter/entry-points/cli/fleetConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fleetConfig.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/cli/fleetConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,sCAAsC,EACvC,MAAM,6DAA6D,CAAC;AAErE,eAAO,MAAM,2CAA2C,sBAAsB,CAAC;AAE/E,eAAO,MAAM,8CAA8C,mCACzB,CAAC;AAEnC,eAAO,MAAM,0BAA0B,GACrC,UAAU,MAAM,GAAG,IAAI,KACtB,MAAM,GAAG,IAUX,CAAC;AAwDF,eAAO,MAAM,0CAA0C,GACrD,qBAAqB,MAAM,GAAG,IAAI,KACjC,sCA0BF,CAAC"}

package/types/adapter/entry-points/cli/index.d.ts

@@ -2,4 +2,6 @@
 import { Command } from 'commander';
 export { ConfigFile, loadConfigFile, parseProjectReadmeConfig, mergeConfigs, fetchProjectReadme, } from './projectConfig';
 export declare const program: Command;
+export declare const reportFatalErrorAndExit: (error: unknown) => void;
+export declare const runCliProgram: (argv: string[], handleFatalError: (error: unknown) => void) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/types/adapter/entry-points/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/cli/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EACL,UAAU,EACV,cAAc,EACd,wBAAwB,EACxB,YAAY,EACZ,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AA+JzB,eAAO,MAAM,OAAO,SAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/cli/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EACL,UAAU,EACV,cAAc,EACd,wBAAwB,EACxB,YAAY,EACZ,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AAoKzB,eAAO,MAAM,OAAO,SAAgB,CAAC;AAq8BrC,eAAO,MAAM,uBAAuB,GAAI,OAAO,OAAO,KAAG,IAGxD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EAAE,EACd,kBAAkB,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,KACzC,OAAO,CAAC,IAAI,CAMd,CAAC"}

package/types/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.d.ts

@@ -1,10 +1,10 @@
 import { ClaudeLiveSessionRepository } from '../../../domain/usecases/adapter-interfaces/ClaudeLiveSessionRepository';
-import { LiveSessionOauthTokenSelectUseCase } from '../../../domain/usecases/LiveSessionOauthTokenSelectUseCase';
-import { SelectionRandom } from '../../../domain/usecases/OauthTokenSelectUseCase';
+import { LiveSessionOauthTokenSelectUseCase, LiveSessionOauthTokenSelectionSettings } from '../../../domain/usecases/LiveSessionOauthTokenSelectUseCase';
 export type LiveSessionOauthTokenSelectHandlerInput = {
     tokenListJsonPath: string | null;
     cacheDirectory: string | null;
     nowEpochSeconds: number;
+    selectionSettings: LiveSessionOauthTokenSelectionSettings;
 };
 export type LiveSessionOauthTokenSelectHandlerOutput = {
     selectedToken: string | null;
@@ -14,8 +14,7 @@ export type LiveSessionOauthTokenSelectHandlerOutput = {
 export declare class LiveSessionOauthTokenSelectHandler {
     private readonly useCase;
     private readonly liveSessionRepository;
-    private readonly random;
-    constructor(useCase?: LiveSessionOauthTokenSelectUseCase, liveSessionRepository?: ClaudeLiveSessionRepository, random?: SelectionRandom);
+    constructor(useCase?: LiveSessionOauthTokenSelectUseCase, liveSessionRepository?: ClaudeLiveSessionRepository);
     handle: (input: LiveSessionOauthTokenSelectHandlerInput) => LiveSessionOauthTokenSelectHandlerOutput;
     private formatDiagnostics;
 }

package/types/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiveSessionOauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;AACtH,OAAO,EAEL,kCAAkC,EACnC,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAKL,eAAe,EAChB,MAAM,kDAAkD,CAAC;AAS1D,MAAM,MAAM,uCAAuC,GAAG;IACpD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,wCAAwC,GAAG;IACrD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,OAAO,GAAE,kCAA6E,EACtF,qBAAqB,GAAE,2BAAmE,EAC1F,MAAM,GAAE,eAA6B;IAGxD,MAAM,GACJ,OAAO,uCAAuC,KAC7C,wCAAwC,CAmEzC;IAEF,OAAO,CAAC,iBAAiB,CAyBvB;CACH"}
+{"version":3,"file":"LiveSessionOauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;AACtH,OAAO,EAEL,kCAAkC,EAClC,sCAAsC,EACvC,MAAM,6DAA6D,CAAC;AAerE,MAAM,MAAM,uCAAuC,GAAG;IACpD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,sCAAsC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,wCAAwC,GAAG;IACrD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBADrB,OAAO,GAAE,kCAA6E,EACtF,qBAAqB,GAAE,2BAAmE;IAG7G,MAAM,GACJ,OAAO,uCAAuC,KAC7C,wCAAwC,CAmEzC;IAEF,OAAO,CAAC,iBAAiB,CAyBvB;CACH"}

package/types/domain/usecases/LiveSessionOauthTokenSelectUseCase.d.ts

@@ -1,11 +1,19 @@
 import { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionRepository';
-import { OauthTokenCandidate, OauthTokenSelectUseCase, SelectionRandom } from './OauthTokenSelectUseCase';
+import { OauthTokenCandidate, OauthTokenSelectUseCase } from './OauthTokenSelectUseCase';
+export type LiveSessionOauthTokenSelectionSettings = {
+    maxConcurrentSessionCount: number;
+    fullSpeedFiveHourFreeRatio: number;
+};
+export declare const DEFAULT_LIVE_SESSION_OAUTH_TOKEN_SELECTION_SETTINGS: LiveSessionOauthTokenSelectionSettings;
+export declare const liveSessionConcurrentLimitOf: (fiveHourFreeRatio: number, selectionWeight: number, settings: LiveSessionOauthTokenSelectionSettings) => number;
 export type LiveSessionOauthTokenCandidateMetrics = {
     name: string;
     fiveHourFreeRatio: number;
     sevenDayFreeRatio: number;
     sevenDayEndEpoch: number;
     liveSessionCount: number;
+    concurrentSessionLimit: number;
+    hasConcurrencyHeadroom: boolean;
     eligible: boolean;
     exclusionReason: string | null;
 };
@@ -16,7 +24,7 @@ export type LiveSessionOauthTokenSelectResult = {
 export declare class LiveSessionOauthTokenSelectUseCase {
     private readonly rateLimitSelectUseCase;
     constructor(rateLimitSelectUseCase?: OauthTokenSelectUseCase);
-    run: (candidates: OauthTokenCandidate[], liveSessions: ClaudeLiveSession[], nowEpochSeconds: number, random?: SelectionRandom) => LiveSessionOauthTokenSelectResult;
+    run: (candidates: OauthTokenCandidate[], liveSessions: ClaudeLiveSession[], nowEpochSeconds: number, settings: LiveSessionOauthTokenSelectionSettings) => LiveSessionOauthTokenSelectResult;
     private preferred;
     private liveSessionCountByToken;
 }

package/types/domain/usecases/LiveSessionOauthTokenSelectUseCase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AACrF,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,EAIhB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,qCAAqC,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,qCAAqC,EAAE,CAAC;CAClD,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAAtB,sBAAsB,GAAE,uBAAuD;IAGlG,GAAG,GACD,YAAY,mBAAmB,EAAE,EACjC,cAAc,iBAAiB,EAAE,EACjC,iBAAiB,MAAM,EACvB,SAAQ,eAA6B,KACpC,iCAAiC,CAsDlC;IAEF,OAAO,CAAC,SAAS,CAUf;IAEF,OAAO,CAAC,uBAAuB,CAe7B;CACH"}
+{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AACrF,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,sCAAsC,GAAG;IACnD,yBAAyB,EAAE,MAAM,CAAC;IAClC,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,mDAAmD,EAAE,sCAI/D,CAAC;AAEJ,eAAO,MAAM,4BAA4B,GACvC,mBAAmB,MAAM,EACzB,iBAAiB,MAAM,EACvB,UAAU,sCAAsC,KAC/C,MAaF,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,qCAAqC,EAAE,CAAC;CAClD,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAAtB,sBAAsB,GAAE,uBAAuD;IAGlG,GAAG,GACD,YAAY,mBAAmB,EAAE,EACjC,cAAc,iBAAiB,EAAE,EACjC,iBAAiB,MAAM,EACvB,UAAU,sCAAsC,KAC/C,iCAAiC,CA+ClC;IAEF,OAAO,CAAC,SAAS,CAgBf;IAEF,OAAO,CAAC,uBAAuB,CAe7B;CACH"}