github-issue-tower-defence-management 1.82.0 → 1.83.0

package/src/domain/usecases/StartPreparationUseCase.ts

@@ -61,6 +61,29 @@ export class StartPreparationUseCase {
     return general !== undefined && general.rejected;
   };
 
+  private selectModelForToken = (
+    usage: ClaudeTokenUsage,
+    defaultModelName: string | null,
+    fallbackModelName: string | null,
+  ): string | null => {
+    const generalWeeklyLimit = usage.modelWeeklyLimits['seven_day'];
+    if (generalWeeklyLimit !== undefined && generalWeeklyLimit.rejected) {
+      return null;
+    }
+    const candidateModelNames = [defaultModelName, fallbackModelName].filter(
+      (modelName): modelName is string =>
+        modelName !== null && modelName !== '',
+    );
+    for (const candidateModelName of candidateModelNames) {
+      const weeklyLimitType = this.weeklyLimitTypeForModel(candidateModelName);
+      const specificWeeklyLimit = usage.modelWeeklyLimits[weeklyLimitType];
+      if (specificWeeklyLimit === undefined || !specificWeeklyLimit.rejected) {
+        return candidateModelName;
+      }
+    }
+    return null;
+  };
+
   private secondsUntilSevenDayReset = (
     usage: ClaudeTokenUsage,
     weeklyLimitType: string,
@@ -79,18 +102,19 @@ export class StartPreparationUseCase {
 
   private compareBySevenDayDeadlineThenUtilization = (
     a: ClaudeTokenUsage,
+    aWeeklyLimitType: string,
     b: ClaudeTokenUsage,
-    weeklyLimitType: string,
+    bWeeklyLimitType: string,
     nowEpochSeconds: number,
   ): number => {
     const aSecondsUntilReset = this.secondsUntilSevenDayReset(
       a,
-      weeklyLimitType,
+      aWeeklyLimitType,
       nowEpochSeconds,
     );
     const bSecondsUntilReset = this.secondsUntilSevenDayReset(
       b,
-      weeklyLimitType,
+      bWeeklyLimitType,
       nowEpochSeconds,
     );
     if (aSecondsUntilReset !== bSecondsUntilReset) {
@@ -128,31 +152,43 @@ export class StartPreparationUseCase {
   private selectRotationTokens = (
     tokenUsages: ClaudeTokenUsage[],
     utilizationPercentageThreshold: number,
-    modelName: string | null,
+    defaultModelName: string | null,
+    fallbackModelName: string | null,
     maxConcurrent: number,
   ): {
     tokens: string[];
     effectiveCap: number;
-    tokensWithLimits: Array<{ token: string; limit: number }>;
+    tokensWithLimits: Array<{
+      token: string;
+      model: string;
+      limit: number;
+      secondsUntilSevenDayReset: number;
+    }>;
   } => {
-    const weeklyLimitType = this.weeklyLimitTypeForModel(modelName);
     const nowEpochSeconds = Date.now() / 1000;
     const eligibleTokens = tokenUsages
       .filter((usage) => !usage.blocked)
       .filter((usage) => !usage.rejected)
       .filter((usage) => !this.isWithinCooldown(usage, nowEpochSeconds))
-      .filter(
-        (usage) => !this.isModelWeeklyLimitRejected(usage, weeklyLimitType),
-      )
       .filter(
         (usage) =>
           usage.fiveHourUtilization * 100 < utilizationPercentageThreshold,
       )
+      .flatMap((usage) => {
+        const model = this.selectModelForToken(
+          usage,
+          defaultModelName,
+          fallbackModelName,
+        );
+        if (model === null) return [];
+        return [{ usage, model }];
+      })
       .sort((a, b) =>
         this.compareBySevenDayDeadlineThenUtilization(
-          a,
-          b,
-          weeklyLimitType,
+          a.usage,
+          this.weeklyLimitTypeForModel(a.model),
+          b.usage,
+          this.weeklyLimitTypeForModel(b.model),
           nowEpochSeconds,
         ),
       );
@@ -161,12 +197,18 @@ export class StartPreparationUseCase {
       return { tokens: [], effectiveCap: 0, tokensWithLimits: [] };
     }
 
-    const tokensWithLimits = eligibleTokens.map((usage) => ({
+    const tokensWithLimits = eligibleTokens.map(({ usage, model }) => ({
       token: usage.token,
+      model,
       limit: this.getTokenConcurrentLimit(
         usage.fiveHourUtilization,
         usage.sevenDayUtilization,
       ),
+      secondsUntilSevenDayReset: this.secondsUntilSevenDayReset(
+        usage,
+        this.weeklyLimitTypeForModel(model),
+        nowEpochSeconds,
+      ),
     }));
 
     const totalCapacity = tokensWithLimits.reduce((sum, t) => sum + t.limit, 0);
@@ -206,6 +248,7 @@ export class StartPreparationUseCase {
       .sort((a, b) =>
         this.compareBySevenDayDeadlineThenUtilization(
           a,
+          weeklyLimitType,
           b,
           weeklyLimitType,
           nowEpochSeconds,
@@ -261,7 +304,12 @@ export class StartPreparationUseCase {
       await this.claudeTokenUsageRepository.getAvailableTokenUsages();
     let rotationTokens: string[] | null = null;
     let proxyBaseUrl: string | null = null;
-    let selectedTokensWithLimits: Array<{ token: string; limit: number }> = [];
+    let selectedTokensWithLimits: Array<{
+      token: string;
+      model: string;
+      limit: number;
+      secondsUntilSevenDayReset: number;
+    }> = [];
     let tokenInFlightCounts: Record<string, number> = {};
     const rotationOrder: RotationOrderEntry[] | null =
       tokenUsages.length > 0
@@ -274,51 +322,23 @@ export class StartPreparationUseCase {
     const maximumPreparingIssuesCount =
       params.maximumPreparingIssuesCount ?? NORMAL_CONCURRENT_LIMIT;
     let effectiveMaxPreparingIssuesCount = maximumPreparingIssuesCount;
-    let effectiveDefaultLlmModelName = params.defaultLlmModelName;
+    const fallbackLlmModelName =
+      params.fallbackLlmModelName ?? DEFAULT_FALLBACK_LLM_MODEL_NAME;
     if (tokenUsages.length > 0) {
       const {
-        tokens: ranked,
-        effectiveCap,
-        tokensWithLimits: rankedTokensWithLimits,
+        tokens: selectedTokens,
+        effectiveCap: selectedCap,
+        tokensWithLimits: selectedTokensWithLimitsLocal,
       } = this.selectRotationTokens(
         tokenUsages,
         params.utilizationPercentageThreshold,
         params.defaultLlmModelName,
+        fallbackLlmModelName,
         maximumPreparingIssuesCount,
       );
-      let selectedTokens = ranked;
-      let selectedCap = effectiveCap;
-      let selectedTokensWithLimitsLocal = rankedTokensWithLimits;
-      if (
-        selectedTokens.length === 0 &&
-        this.weeklyLimitTypeForModel(params.defaultLlmModelName) ===
-          'seven_day_sonnet'
-      ) {
-        const fallbackModelName =
-          params.fallbackLlmModelName ?? DEFAULT_FALLBACK_LLM_MODEL_NAME;
-        const {
-          tokens: fallbackRanked,
-          effectiveCap: fallbackCap,
-          tokensWithLimits: fallbackTokensWithLimits,
-        } = this.selectRotationTokens(
-          tokenUsages,
-          params.utilizationPercentageThreshold,
-          fallbackModelName,
-          maximumPreparingIssuesCount,
-        );
-        if (fallbackRanked.length > 0) {
-          console.warn(
-            `Sonnet 7-day weekly limit (${this.weeklyLimitTypeForModel(params.defaultLlmModelName)}) is exhausted across all configured Claude OAuth token(s). Falling back to ${fallbackModelName}.`,
-          );
-          selectedTokens = fallbackRanked;
-          selectedCap = fallbackCap;
-          selectedTokensWithLimitsLocal = fallbackTokensWithLimits;
-          effectiveDefaultLlmModelName = fallbackModelName;
-        }
-      }
       if (selectedTokens.length === 0) {
         console.warn(
-          `All ${tokenUsages.length} configured Claude OAuth token(s) are unavailable (blocked, rejected, weekly limit for ${this.weeklyLimitTypeForModel(params.defaultLlmModelName)} exhausted, or 5h utilization >= ${params.utilizationPercentageThreshold}%). Skipping starting preparation.`,
+          `All ${tokenUsages.length} configured Claude OAuth token(s) are unavailable (blocked, rejected, weekly limits for the configured model(s) exhausted, or 5h utilization >= ${params.utilizationPercentageThreshold}%). Skipping starting preparation.`,
         );
         return { rotationOrder };
       }
@@ -421,12 +441,15 @@ export class StartPreparationUseCase {
           .trim() ||
         params.defaultLlmAgentName ||
         params.defaultAgentName;
-      const model =
-        issue.labels
-          .find((label: string) => label.startsWith('llm-model:'))
-          ?.replace('llm-model:', '')
-          .trim() || effectiveDefaultLlmModelName;
-      if (!model) {
+      const labelModelName = issue.labels
+        .find((label: string) => label.startsWith('llm-model:'))
+        ?.replace('llm-model:', '')
+        .trim();
+      if (
+        !labelModelName &&
+        !params.defaultLlmModelName &&
+        rotationTokens === null
+      ) {
         console.error(
           `No LLM model configured for issue ${issue.url}. Provide --defaultLlmModelName or add an llm-model: label.`,
         );
@@ -509,41 +532,31 @@ export class StartPreparationUseCase {
       );
       issue.status = PREPARATION_STATUS_NAME;
 
-      const awArgs: string[] = [
-        issue.url,
-        agent,
-        model,
-        '--configFilePath',
-        params.configFilePath,
-        '--branch',
-        branchName,
-      ];
-      if (
-        params.codexHomeCandidates !== null &&
-        params.codexHomeCandidates.length > 0
-      ) {
-        const codexHome =
-          params.codexHomeCandidates[
-            startedInThisRunCount % params.codexHomeCandidates.length
-          ];
-        awArgs.push('--codexHome', codexHome);
-      }
       let spawnEnv: Record<string, string> | undefined;
+      let routedModelName: string | null = null;
       if (rotationTokens !== null && proxyBaseUrl !== null) {
-        const tokenWithMostRemainingCapacity = selectedTokensWithLimits
+        const tokenWithSoonestResetAmongAvailable = selectedTokensWithLimits
           .map((t) => ({
             token: t.token,
+            model: t.model,
             remaining:
               t.limit -
               (tokenInFlightCounts[t.token] ?? 0) -
               (spawnedInThisRunByToken[t.token] ?? 0),
+            secondsUntilSevenDayReset: t.secondsUntilSevenDayReset,
           }))
           .filter((t) => t.remaining > 0)
-          .sort((a, b) => b.remaining - a.remaining)[0];
-        if (tokenWithMostRemainingCapacity === undefined) {
+          .sort((a, b) => {
+            if (a.secondsUntilSevenDayReset !== b.secondsUntilSevenDayReset) {
+              return a.secondsUntilSevenDayReset - b.secondsUntilSevenDayReset;
+            }
+            return b.remaining - a.remaining;
+          })[0];
+        if (tokenWithSoonestResetAmongAvailable === undefined) {
           break;
         }
-        const selected = tokenWithMostRemainingCapacity.token;
+        const selected = tokenWithSoonestResetAmongAvailable.token;
+        routedModelName = tokenWithSoonestResetAmongAvailable.model;
         spawnedInThisRunByToken[selected] =
           (spawnedInThisRunByToken[selected] ?? 0) + 1;
         spawnEnv = {
@@ -551,6 +564,33 @@ export class StartPreparationUseCase {
           ANTHROPIC_BASE_URL: proxyBaseUrl,
         };
       }
+      const model =
+        labelModelName || routedModelName || params.defaultLlmModelName;
+      if (!model) {
+        console.error(
+          `No LLM model configured for issue ${issue.url}. Provide --defaultLlmModelName or add an llm-model: label.`,
+        );
+        continue;
+      }
+      const awArgs: string[] = [
+        issue.url,
+        agent,
+        model,
+        '--configFilePath',
+        params.configFilePath,
+        '--branch',
+        branchName,
+      ];
+      if (
+        params.codexHomeCandidates !== null &&
+        params.codexHomeCandidates.length > 0
+      ) {
+        const codexHome =
+          params.codexHomeCandidates[
+            startedInThisRunCount % params.codexHomeCandidates.length
+          ];
+        awArgs.push('--codexHome', codexHome);
+      }
       await this.localCommandRunner.runCommand(
         'aw',
         awArgs,

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

@@ -21,6 +21,7 @@ export declare class StartPreparationUseCase {
     private weeklyLimitTypeForModel;
     private isWithinCooldown;
     private isModelWeeklyLimitRejected;
+    private selectModelForToken;
     private secondsUntilSevenDayReset;
     private compareBySevenDayDeadlineThenUtilization;
     private taperedConcurrentLimit;

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

@@ -1 +1 @@
-{"version":3,"file":"StartPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAShE,eAAO,MAAM,+BAA+B,oBAAoB,CAAC;AAEjE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAUhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAZ1B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,EACtD,eAAe,EAAE,IAAI,CACpC,eAAe,EACb,mBAAmB,GACnB,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,kBAAkB,GAClB,yBAAyB,GACzB,oBAAoB,CACvB,EACgB,kBAAkB,EAAE,kBAAkB,EACtC,0BAA0B,EAAE,0BAA0B;IAGzE,OAAO,CAAC,uBAAuB,CAK7B;IAEF,OAAO,CAAC,gBAAgB,CAGgC;IAExD,OAAO,CAAC,0BAA0B,CAQhC;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,CAAC,wCAAwC,CAoB9C;IAEF,OAAO,CAAC,sBAAsB,CAS5B;IAEF,uBAAuB,GACrB,qBAAqB,MAAM,EAC3B,qBAAqB,MAAM,KAC1B,MAAM,CAUP;IAEF,OAAO,CAAC,oBAAoB,CA0D1B;IAEF,kBAAkB,GAChB,aAAa,gBAAgB,EAAE,EAC/B,gCAAgC,MAAM,EACtC,WAAW,MAAM,GAAG,IAAI,KACvB,kBAAkB,EAAE,CAoDrB;IAEF,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,cAAc,EAAE,MAAM,CAAC;QACvB,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,8BAA8B,EAAE,MAAM,CAAC;QACvC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC;QAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAA;KAAE,CAAC,CAgTzD;CACH"}
+{"version":3,"file":"StartPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAShE,eAAO,MAAM,+BAA+B,oBAAoB,CAAC;AAEjE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAUhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAZ1B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,EACtD,eAAe,EAAE,IAAI,CACpC,eAAe,EACb,mBAAmB,GACnB,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,kBAAkB,GAClB,yBAAyB,GACzB,oBAAoB,CACvB,EACgB,kBAAkB,EAAE,kBAAkB,EACtC,0BAA0B,EAAE,0BAA0B;IAGzE,OAAO,CAAC,uBAAuB,CAK7B;IAEF,OAAO,CAAC,gBAAgB,CAGgC;IAExD,OAAO,CAAC,0BAA0B,CAQhC;IAEF,OAAO,CAAC,mBAAmB,CAqBzB;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,CAAC,wCAAwC,CAqB9C;IAEF,OAAO,CAAC,sBAAsB,CAS5B;IAEF,uBAAuB,GACrB,qBAAqB,MAAM,EAC3B,qBAAqB,MAAM,KAC1B,MAAM,CAUP;IAEF,OAAO,CAAC,oBAAoB,CA4E1B;IAEF,kBAAkB,GAChB,aAAa,gBAAgB,EAAE,EAC/B,gCAAgC,MAAM,EACtC,WAAW,MAAM,GAAG,IAAI,KACvB,kBAAkB,EAAE,CAqDrB;IAEF,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,cAAc,EAAE,MAAM,CAAC;QACvB,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,8BAA8B,EAAE,MAAM,CAAC;QACvC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC;QAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAA;KAAE,CAAC,CA6SzD;CACH"}