github-issue-tower-defence-management 1.60.2 → 1.63.1

package/src/adapter/repositories/ProxyClaudeTokenUsageRepository.test.ts

@@ -1,6 +1,6 @@
 const mockEnsureProxyRunning = jest.fn();
 const mockReadRateLimit = jest.fn();
-const mockLoadTokens = jest.fn();
+const mockLoadTokenEntries = jest.fn();
 
 jest.mock('../proxy/ensureProxyRunning', () => ({
   ensureProxyRunning: mockEnsureProxyRunning,
@@ -12,7 +12,7 @@ jest.mock('../proxy/RateLimitCache', () => ({
 }));
 
 jest.mock('../proxy/TokenListLoader', () => ({
-  loadTokens: mockLoadTokens,
+  loadTokenEntries: mockLoadTokenEntries,
 }));
 
 import { ProxyClaudeTokenUsageRepository } from './ProxyClaudeTokenUsageRepository';
@@ -52,24 +52,27 @@ describe('ProxyClaudeTokenUsageRepository', () => {
       const result = await repository.getAvailableTokenUsages();
 
       expect(result).toEqual([]);
-      expect(mockLoadTokens.mock.calls).toHaveLength(0);
+      expect(mockLoadTokenEntries.mock.calls).toHaveLength(0);
     });
 
     it('should return an empty list when the token list cannot be loaded', async () => {
-      mockLoadTokens.mockReturnValue(null);
+      mockLoadTokenEntries.mockReturnValue(null);
       const repository = new ProxyClaudeTokenUsageRepository('/tokens.json');
 
       const result = await repository.getAvailableTokenUsages();
 
       expect(result).toEqual([]);
-      expect(mockLoadTokens.mock.calls).toEqual([['/tokens.json']]);
+      expect(mockLoadTokenEntries.mock.calls).toEqual([['/tokens.json']]);
     });
 
     const futureReset = Math.floor(Date.now() / 1000) + 3600;
     const pastReset = Math.floor(Date.now() / 1000) - 3600;
 
-    it('should map each token to its cached utilization', async () => {
-      mockLoadTokens.mockReturnValue(['token-a', 'token-b']);
+    it('should map each token to its cached utilization and include name', async () => {
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+        { name: 'bob', token: 'token-b' },
+      ]);
       mockReadRateLimit.mockImplementation((token: string) => {
         if (token === 'token-a') {
           return {
@@ -93,6 +96,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 42,
           blocked: false,
@@ -100,6 +104,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           modelWeeklyLimits: {},
         },
         {
+          name: 'bob',
           token: 'token-b',
           fiveHourUtilization: 0,
           blocked: false,
@@ -110,7 +115,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should propagate the blocked status from the cache', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 5,
         fiveHourReset: futureReset,
@@ -129,6 +136,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 5,
           blocked: true,
@@ -139,7 +147,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should propagate the rejected status from the cache', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: futureReset,
@@ -158,6 +168,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 100,
           blocked: false,
@@ -168,7 +179,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should normalize fiveHourUtilization to 0 when the 5h reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: pastReset,
@@ -187,6 +200,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 0,
           blocked: false,
@@ -197,7 +211,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should keep fiveHourUtilization when the 5h reset is in the future', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 95,
         fiveHourReset: futureReset,
@@ -216,6 +232,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 95,
           blocked: false,
@@ -226,7 +243,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should clear a 5h-origin rejection once the 5h reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: pastReset,
@@ -245,6 +264,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 0,
           blocked: false,
@@ -255,7 +275,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should clear a 7d-origin rejection once the 7d reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 10,
         fiveHourReset: futureReset,
@@ -274,6 +296,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 10,
           blocked: false,
@@ -284,7 +307,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should keep a 5h-origin rejection while the 5h reset is in the future', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: futureReset,
@@ -303,6 +328,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 100,
           blocked: false,
@@ -313,7 +339,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should keep a still-active 7d rejection after the 5h reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: pastReset,
@@ -332,6 +360,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 0,
           blocked: false,
@@ -342,7 +371,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should clear a unified rejection once the 5h reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 100,
         fiveHourReset: pastReset,
@@ -361,6 +392,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 0,
           blocked: false,
@@ -371,7 +403,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should default rejected to false when no snapshot exists', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue(null);
       const repository = new ProxyClaudeTokenUsageRepository('/tokens.json');
 
@@ -379,6 +413,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 0,
           blocked: false,
@@ -389,7 +424,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should keep a model weekly rejection while its reset is in the future', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 5,
         fiveHourReset: futureReset,
@@ -410,6 +447,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 5,
           blocked: false,
@@ -422,7 +460,9 @@ describe('ProxyClaudeTokenUsageRepository', () => {
     });
 
     it('should clear a model weekly rejection once its reset has passed', async () => {
-      mockLoadTokens.mockReturnValue(['token-a']);
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
       mockReadRateLimit.mockReturnValue({
         fiveHourUtilization: 5,
         fiveHourReset: futureReset,
@@ -443,6 +483,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
 
       expect(result).toEqual([
         {
+          name: 'alice',
           token: 'token-a',
           fiveHourUtilization: 5,
           blocked: false,

package/src/adapter/repositories/ProxyClaudeTokenUsageRepository.ts

@@ -2,7 +2,7 @@ import { ClaudeTokenUsage } from '../../domain/entities/ClaudeTokenUsage';
 import { ClaudeTokenUsageRepository } from '../../domain/usecases/adapter-interfaces/ClaudeTokenUsageRepository';
 import { ensureProxyRunning } from '../proxy/ensureProxyRunning';
 import { PROXY_PORT, readRateLimit } from '../proxy/RateLimitCache';
-import { loadTokens } from '../proxy/TokenListLoader';
+import { loadTokenEntries } from '../proxy/TokenListLoader';
 
 export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageRepository {
   constructor(
@@ -18,15 +18,16 @@ export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageReposito
     if (this.tokenListJsonPath === null) {
       return [];
     }
-    const tokens = loadTokens(this.tokenListJsonPath);
-    if (tokens === null) {
+    const entries = loadTokenEntries(this.tokenListJsonPath);
+    if (entries === null) {
       return [];
     }
     const nowEpochSeconds = Date.now() / 1000;
-    return tokens.map((token) => {
+    return entries.map(({ name, token }) => {
       const snapshot = readRateLimit(token);
       if (snapshot === null) {
         return {
+          name,
           token,
           fiveHourUtilization: 0,
           blocked: false,
@@ -63,6 +64,7 @@ export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageReposito
         };
       }
       return {
+        name,
         token,
         fiveHourUtilization,
         blocked: snapshot.blocked,

package/src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts

@@ -27,6 +27,7 @@ type TimelineItem = {
     number?: number;
     state?: string;
     createdAt?: string;
+    isDraft?: boolean;
     mergeable?: string;
     headRefName?: string;
     baseRefName?: string;
@@ -117,6 +118,7 @@ type IssueTimelineResponse = {
 };
 
 type PrStatusComputationData = {
+  isDraft?: boolean;
   mergeable?: string;
   baseRepository?: {
     branchProtectionRules?: {
@@ -293,21 +295,9 @@ export class ApiV3CheerioRestIssueRepository
       'getLatest' | 'set'
     >,
     readonly localStorageRepository: LocalStorageRepository,
-    readonly jsonFilePath: string = './tmp/github.com.cookies.json',
     readonly ghToken: string = process.env.GH_TOKEN || 'dummy',
-    readonly ghUserName: string | undefined = process.env.GH_USER_NAME,
-    readonly ghUserPassword: string | undefined = process.env.GH_USER_PASSWORD,
-    readonly ghAuthenticatorKey: string | undefined = process.env
-      .GH_AUTHENTICATOR_KEY,
   ) {
-    super(
-      localStorageRepository,
-      jsonFilePath,
-      ghToken,
-      ghUserName,
-      ghUserPassword,
-      ghAuthenticatorKey,
-    );
+    super(localStorageRepository, ghToken);
   }
 
   updateStatus: (
@@ -474,6 +464,23 @@ export class ApiV3CheerioRestIssueRepository
       labels,
     );
   };
+  searchIssue = async (query: {
+    owner: string;
+    repositoryName: string;
+    type?: 'issue' | 'pr';
+    state?: 'open' | 'closed' | 'all';
+    title?: string;
+    createdFrom?: string;
+    assignee?: string;
+  }): Promise<
+    {
+      url: string;
+      title: string;
+      number: string;
+    }[]
+  > => {
+    return await this.apiV3IssueRepository.searchIssue(query);
+  };
   updateIssue = async (issue: Issue): Promise<void> => {
     await this.restIssueRepository.updateIssue(issue);
   };
@@ -732,6 +739,7 @@ export class ApiV3CheerioRestIssueRepository
       url: prUrl,
       branchName: headRefName ?? null,
       createdAt: new Date(0),
+      isDraft: data.isDraft === true,
       isConflicted,
       isPassedAllCiJob,
       isCiStateSuccess,
@@ -771,6 +779,7 @@ export class ApiV3CheerioRestIssueRepository
                       number
                       state
                       createdAt
+                      isDraft
                       mergeable
                       headRefName
                       baseRefName
@@ -959,6 +968,7 @@ export class ApiV3CheerioRestIssueRepository
           pullRequest(number: $prNumber) {
             url
             state
+            isDraft
             headRefName
             baseRefName
             mergeable

package/src/adapter/repositories/issue/ApiV3IssueRepository.test.ts

@@ -7,7 +7,6 @@ describe('ApiV3IssueRepository', () => {
   const localStorageRepository = new LocalStorageRepository();
   const repository = new ApiV3IssueRepository(
     localStorageRepository,
-    '',
     process.env.GH_TOKEN || 'dummy',
   );
   test('searchIssue', async () => {

package/src/adapter/repositories/issue/GraphqlProjectItemRepository.test.ts

@@ -83,7 +83,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -109,7 +108,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -157,7 +155,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -176,7 +173,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -195,7 +191,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -244,7 +239,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -277,7 +271,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 
@@ -305,7 +298,6 @@ describe('GraphqlProjectItemRepository', () => {
       const localStorageRepository = new LocalStorageRepository();
       const repository = new GraphqlProjectItemRepository(
         localStorageRepository,
-        '',
         'dummy-token',
       );
 

package/src/adapter/repositories/issue/RestIssueRepository.test.ts

@@ -6,7 +6,6 @@ describe('RestIssueRepository', () => {
   const localStorageRepository = new LocalStorageRepository();
   const restIssueRepository: RestIssueRepository = new RestIssueRepository(
     localStorageRepository,
-    '',
     process.env.GH_TOKEN || 'dummy',
   );
 

package/src/domain/entities/ClaudeTokenUsage.ts

@@ -4,6 +4,7 @@ export type ClaudeModelWeeklyLimit = {
 };
 
 export type ClaudeTokenUsage = {
+  name?: string;
   token: string;
   fiveHourUtilization: number;
   blocked: boolean;

package/src/domain/usecases/HandleScheduledEventUseCase.test.ts

@@ -159,6 +159,9 @@ describe('HandleScheduledEventUseCase', () => {
         ['LastExecutionDateTime'],
         ['2024-01-01T00:00:00Z'],
       ]);
+      mockStartPreparationUseCase.run.mockResolvedValue({
+        rotationOrder: null,
+      });
     });
 
     it('should call AnalyzeProblemByIssueUseCase with correct parameters', async () => {
@@ -377,6 +380,7 @@ describe('HandleScheduledEventUseCase', () => {
       });
       mockStartPreparationUseCase.run.mockImplementation(async () => {
         callOrder.push('startPreparation');
+        return { rotationOrder: null };
       });
 
       const input = {

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -19,7 +19,10 @@ import { SetNoStoryIssueToStoryUseCase } from './SetNoStoryIssueToStoryUseCase';
 import { CreateNewStoryByLabelUseCase } from './CreateNewStoryByLabelUseCase';
 import { AssignNoAssigneeIssueToManagerUseCase } from './AssignNoAssigneeIssueToManagerUseCase';
 import { UpdateIssueStatusByLabelUseCase } from './UpdateIssueStatusByLabelUseCase';
-import { StartPreparationUseCase } from './StartPreparationUseCase';
+import {
+  RotationOrderEntry,
+  StartPreparationUseCase,
+} from './StartPreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
 import { RevertNotReadyAwaitingQualityCheckUseCase } from './RevertNotReadyAwaitingQualityCheckUseCase';
 import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
@@ -96,6 +99,7 @@ export class HandleScheduledEventUseCase {
     cacheUsed: boolean;
     targetDateTimes: Date[];
     storyIssues: StoryObjectMap;
+    rotationOrder: RotationOrderEntry[] | null;
   } | null> => {
     if (input.disabled) {
       return null;
@@ -205,8 +209,9 @@ export class HandleScheduledEventUseCase {
       now,
     );
 
+    let rotationOrder: RotationOrderEntry[] | null = null;
     try {
-      await this.runEachUseCases(
+      const useCaseResult = await this.runEachUseCases(
         input,
         project,
         issues,
@@ -215,6 +220,7 @@ export class HandleScheduledEventUseCase {
         storyIssues,
         runSlowSweep,
       );
+      rotationOrder = useCaseResult.rotationOrder;
     } catch (e) {
       if (!(e instanceof Error)) {
         throw e;
@@ -238,7 +244,14 @@ ${JSON.stringify(e)}
       throw e;
     }
 
-    return { project, issues, cacheUsed, targetDateTimes, storyIssues };
+    return {
+      project,
+      issues,
+      cacheUsed,
+      targetDateTimes,
+      storyIssues,
+      rotationOrder,
+    };
   };
   runEachUseCases = async (
     input: Parameters<HandleScheduledEventUseCase['run']>[0],
@@ -248,7 +261,7 @@ ${JSON.stringify(e)}
     targetDateTimes: Date[],
     storyObjectMap: StoryObjectMap,
     runSlowSweep: boolean,
-  ): Promise<void> => {
+  ): Promise<{ rotationOrder: RotationOrderEntry[] | null }> => {
     if (runSlowSweep) {
       await this.runSlowSweepUseCases(
         input,
@@ -284,7 +297,7 @@ ${JSON.stringify(e)}
             input.startPreparation.awaitingQualityCheckStatus ?? undefined,
         });
       }
-      await this.startPreparationUseCase.run({
+      const preparationResult = await this.startPreparationUseCase.run({
         projectUrl: input.projectUrl,
         defaultAgentName: input.startPreparation.defaultAgentName,
         defaultLlmModelName: input.startPreparation.defaultLlmModelName ?? null,
@@ -298,7 +311,9 @@ ${JSON.stringify(e)}
         codexHomeCandidates: input.startPreparation.codexHomeCandidates ?? null,
         allowIssueCacheMinutes: input.allowIssueCacheMinutes,
       });
+      return { rotationOrder: preparationResult.rotationOrder };
     }
+    return { rotationOrder: null };
   };
   runSlowSweepUseCases = async (
     input: Parameters<HandleScheduledEventUseCase['run']>[0],