github-issue-tower-defence-management 1.84.0 → 1.85.0

package/src/adapter/proxy/RateLimitCache.ts

@@ -194,6 +194,34 @@ export const parseModelRateLimitsFromBody = (
   return result;
 };
 
+const HEADER_CLAIM_TO_LIMIT_TYPE: Record<string, string> = {
+  '7d_sonnet': 'seven_day_sonnet',
+  '7d_opus': 'seven_day_opus',
+};
+
+export const parseModelRateLimitsFromHeaders = (
+  headers: Record<string, string>,
+): Record<string, ModelWeeklyLimit> => {
+  const result: Record<string, ModelWeeklyLimit> = {};
+  for (const [headerClaim, limitType] of Object.entries(
+    HEADER_CLAIM_TO_LIMIT_TYPE,
+  )) {
+    const status = headers[`anthropic-ratelimit-unified-${headerClaim}-status`];
+    const resetRaw =
+      headers[`anthropic-ratelimit-unified-${headerClaim}-reset`];
+    if (status === undefined) continue;
+    const resetsAt =
+      resetRaw !== undefined && Number.isFinite(Number(resetRaw))
+        ? Number(resetRaw)
+        : 0;
+    result[limitType] = {
+      rejected: status === 'rejected',
+      resetsAt,
+    };
+  }
+  return result;
+};
+
 export const readRateLimit = (token: string): RateLimitSnapshot | null => {
   const filePath = cachePathForToken(token);
   if (!fs.existsSync(filePath)) return null;
@@ -240,7 +268,10 @@ export const readRateLimit = (token: string): RateLimitSnapshot | null => {
       unifiedRejected,
       fiveHourRejected,
       sevenDayRejected,
-      modelWeeklyLimits: readModelWeeklyLimits(parsed),
+      modelWeeklyLimits: {
+        ...parseModelRateLimitsFromHeaders(headers),
+        ...readModelWeeklyLimits(parsed),
+      },
       lastUpdatedEpoch,
       blockedUntilEpoch,
     };

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

@@ -109,6 +109,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -121,6 +122,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {},
         },
@@ -155,6 +157,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: true,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -191,6 +194,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: true,
+          fiveHourRejected: true,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -227,6 +231,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 30,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -263,6 +268,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -299,6 +305,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -335,6 +342,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {},
         },
@@ -369,6 +377,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: true,
+          fiveHourRejected: true,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -405,6 +414,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 100,
           blocked: false,
           rejected: true,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: true, resetsAt: futureReset },
@@ -441,6 +451,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day: { rejected: false, resetsAt: futureReset },
@@ -466,6 +477,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {},
         },
@@ -502,6 +514,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 10,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day_sonnet: { rejected: true, resetsAt: futureReset },
@@ -540,6 +553,7 @@ describe('ProxyClaudeTokenUsageRepository', () => {
           sevenDayUtilization: 10,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           blockedUntilEpoch: 0,
           modelWeeklyLimits: {
             seven_day_sonnet: { rejected: false, resetsAt: pastReset },
@@ -682,6 +696,35 @@ describe('ProxyClaudeTokenUsageRepository', () => {
       });
     });
 
+    it('should bridge a rejected generic seven_day window even when a per-model weekly limit is already present', async () => {
+      const opusResetsAt = futureReset + 2000;
+      mockLoadTokenEntries.mockReturnValue([
+        { name: 'alice', token: 'token-a' },
+      ]);
+      mockReadRateLimit.mockReturnValue({
+        fiveHourUtilization: 10,
+        fiveHourReset: futureReset,
+        sevenDayUtilization: 100,
+        sevenDayReset: futureReset,
+        blocked: false,
+        rejected: true,
+        unifiedRejected: false,
+        fiveHourRejected: false,
+        sevenDayRejected: true,
+        modelWeeklyLimits: {
+          seven_day_opus: { rejected: false, resetsAt: opusResetsAt },
+        },
+      });
+      const repository = new ProxyClaudeTokenUsageRepository('/tokens.json');
+
+      const result = await repository.getAvailableTokenUsages();
+
+      expect(result[0].modelWeeklyLimits).toEqual({
+        seven_day_opus: { rejected: false, resetsAt: opusResetsAt },
+        seven_day: { rejected: true, resetsAt: futureReset },
+      });
+    });
+
     it('should not bridge sevenDayReset when the 7d reset has already passed', async () => {
       mockLoadTokenEntries.mockReturnValue([
         { name: 'alice', token: 'token-a' },

package/src/adapter/repositories/ProxyClaudeTokenUsageRepository.ts

@@ -35,6 +35,7 @@ export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageReposito
           sevenDayUtilization: 0,
           blocked: false,
           rejected: false,
+          fiveHourRejected: false,
           modelWeeklyLimits: {},
           blockedUntilEpoch: 0,
         };
@@ -74,10 +75,13 @@ export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageReposito
         modelWeeklyLimits['seven_day'] !== undefined ||
         modelWeeklyLimits['seven_day_opus'] !== undefined ||
         modelWeeklyLimits['seven_day_sonnet'] !== undefined;
+      const needsGenericSevenDayBridge =
+        modelWeeklyLimits['seven_day'] === undefined &&
+        (!hasAnySevenDayWeeklyLimit || sevenDayRejectionActive);
       if (
         snapshot.sevenDayReset > 0 &&
         !sevenDayExpired &&
-        !hasAnySevenDayWeeklyLimit
+        needsGenericSevenDayBridge
       ) {
         modelWeeklyLimits['seven_day'] = {
           rejected: sevenDayRejectionActive,
@@ -92,6 +96,7 @@ export class ProxyClaudeTokenUsageRepository implements ClaudeTokenUsageReposito
         sevenDayUtilization,
         blocked: snapshot.blocked,
         rejected,
+        fiveHourRejected: fiveHourRejectionActive,
         modelWeeklyLimits,
         blockedUntilEpoch: cooldownActive ? snapshot.blockedUntilEpoch : 0,
       };

package/src/domain/entities/ClaudeTokenUsage.ts

@@ -10,6 +10,7 @@ export type ClaudeTokenUsage = {
   sevenDayUtilization: number;
   blocked: boolean;
   rejected: boolean;
+  fiveHourRejected: boolean;
   modelWeeklyLimits: Record<string, ClaudeModelWeeklyLimit>;
   blockedUntilEpoch: number;
 };

package/src/domain/entities/WorkflowStatus.ts

@@ -8,6 +8,7 @@ export const AWAITING_QUALITY_CHECK_STATUS_NAME = 'Awaiting Quality Check';
 export const TODO_STATUS_NAME = 'Todo by human';
 export const PC_TODO_STATUS_NAME = 'PC Todo';
 export const IN_TMUX_STATUS_NAME = 'In Tmux by human';
+export const IN_TMUX_BY_AGENT_STATUS_NAME = 'In Tmux by agent';
 export const DONE_STATUS_NAME = 'Done';
 export const ICEBOX_STATUS_NAME = 'Icebox';
 
@@ -50,6 +51,10 @@ export const REQUIRED_WORKFLOW_STATUSES: WorkflowStatusDefinition[] = [
     name: IN_TMUX_STATUS_NAME,
     color: 'RED',
   },
+  {
+    name: IN_TMUX_BY_AGENT_STATUS_NAME,
+    color: 'YELLOW',
+  },
   {
     name: DONE_STATUS_NAME,
     color: 'PURPLE',

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

@@ -11,6 +11,7 @@ import {
   DONE_STATUS_NAME,
   FAILED_PREPARATION_STATUS_NAME,
   ICEBOX_STATUS_NAME,
+  IN_TMUX_BY_AGENT_STATUS_NAME,
   IN_TMUX_STATUS_NAME,
   LEGACY_AWAITING_TASK_BREAKDOWN_STATUS_NAME,
   LEGACY_IN_TMUX_STATUS_NAME,
@@ -75,7 +76,7 @@ const buildIssue = (overrides: Partial<Issue>): Issue => ({
 });
 
 describe('SetupTowerDefenceProjectUseCase', () => {
-  it('should define exactly the 9 required statuses in the documented order with the documented colors and no descriptions', () => {
+  it('should define exactly the 10 required statuses in the documented order with the documented colors and no descriptions', () => {
     expect(REQUIRED_WORKFLOW_STATUSES).toEqual([
       { name: DEFAULT_STATUS_NAME, color: 'ORANGE' },
       { name: AWAITING_WORKSPACE_STATUS_NAME, color: 'BLUE' },
@@ -84,6 +85,7 @@ describe('SetupTowerDefenceProjectUseCase', () => {
       { name: AWAITING_QUALITY_CHECK_STATUS_NAME, color: 'GREEN' },
       { name: TODO_STATUS_NAME, color: 'PINK' },
       { name: IN_TMUX_STATUS_NAME, color: 'RED' },
+      { name: IN_TMUX_BY_AGENT_STATUS_NAME, color: 'YELLOW' },
       { name: DONE_STATUS_NAME, color: 'PURPLE' },
       { name: ICEBOX_STATUS_NAME, color: 'GRAY' },
     ]);
@@ -252,6 +254,12 @@ describe('SetupTowerDefenceProjectUseCase', () => {
           color: 'RED',
           description: '',
         },
+        {
+          id: null,
+          name: IN_TMUX_BY_AGENT_STATUS_NAME,
+          color: 'YELLOW',
+          description: '',
+        },
         {
           id: null,
           name: DONE_STATUS_NAME,
@@ -311,6 +319,7 @@ describe('SetupTowerDefenceProjectUseCase', () => {
       AWAITING_QUALITY_CHECK_STATUS_NAME,
       TODO_STATUS_NAME,
       IN_TMUX_STATUS_NAME,
+      IN_TMUX_BY_AGENT_STATUS_NAME,
       DONE_STATUS_NAME,
       ICEBOX_STATUS_NAME,
     ]);
@@ -420,6 +429,82 @@ describe('SetupTowerDefenceProjectUseCase', () => {
     );
   });
 
+  it('should create the "In Tmux by agent" status with yellow color when it is missing', async () => {
+    const mockProjectRepository =
+      mock<Pick<ProjectRepository, 'getByUrl' | 'updateStatusList'>>();
+    const mockIssueRepository =
+      mock<Pick<IssueRepository, 'getAllIssues' | 'updateStatus'>>();
+    const statuses = buildCanonicalStatuses().filter(
+      (s) => s.name !== IN_TMUX_BY_AGENT_STATUS_NAME,
+    );
+    const project = buildProject(statuses);
+    mockProjectRepository.getByUrl.mockResolvedValue(project);
+    mockProjectRepository.updateStatusList.mockResolvedValue([]);
+    mockIssueRepository.getAllIssues.mockResolvedValue({
+      issues: [],
+      cacheUsed: false,
+    });
+
+    const useCase = new SetupTowerDefenceProjectUseCase(
+      mockProjectRepository,
+      mockIssueRepository,
+    );
+    await useCase.run({ projectUrl: project.url });
+
+    expect(mockProjectRepository.updateStatusList).toHaveBeenCalledTimes(1);
+    const [, payload] = mockProjectRepository.updateStatusList.mock.calls[0];
+    const inTmuxByAgentEntry = payload.find(
+      (s) => s.name === IN_TMUX_BY_AGENT_STATUS_NAME,
+    );
+    expect(inTmuxByAgentEntry).toBeDefined();
+    expect(inTmuxByAgentEntry?.id).toBeNull();
+    expect(inTmuxByAgentEntry?.color).toBe('YELLOW');
+    const names = payload.map((s) => s.name);
+    expect(names.indexOf(IN_TMUX_BY_AGENT_STATUS_NAME)).toBe(
+      names.indexOf(IN_TMUX_STATUS_NAME) + 1,
+    );
+  });
+
+  it('should leave an already-present "In Tmux by agent" option unchanged by reusing its existing option ID', async () => {
+    const mockProjectRepository =
+      mock<Pick<ProjectRepository, 'getByUrl' | 'updateStatusList'>>();
+    const mockIssueRepository =
+      mock<Pick<IssueRepository, 'getAllIssues' | 'updateStatus'>>();
+    const statuses = buildCanonicalStatuses().map((s) => {
+      if (s.name === IN_TMUX_BY_AGENT_STATUS_NAME) {
+        return { ...s, id: 'preexisting-agent-id' };
+      }
+      if (s.name === DEFAULT_STATUS_NAME) {
+        return { ...s, description: 'stale description' };
+      }
+      return s;
+    });
+    const project = buildProject(statuses);
+    mockProjectRepository.getByUrl.mockResolvedValue(project);
+    mockProjectRepository.updateStatusList.mockResolvedValue([]);
+    mockIssueRepository.getAllIssues.mockResolvedValue({
+      issues: [],
+      cacheUsed: false,
+    });
+
+    const useCase = new SetupTowerDefenceProjectUseCase(
+      mockProjectRepository,
+      mockIssueRepository,
+    );
+    await useCase.run({ projectUrl: project.url });
+
+    expect(mockProjectRepository.updateStatusList).toHaveBeenCalledTimes(1);
+    const [, payload] = mockProjectRepository.updateStatusList.mock.calls[0];
+    const inTmuxByAgentEntry = payload.find(
+      (s) => s.name === IN_TMUX_BY_AGENT_STATUS_NAME,
+    );
+    expect(inTmuxByAgentEntry?.id).toBe('preexisting-agent-id');
+    expect(inTmuxByAgentEntry?.color).toBe('YELLOW');
+    expect(
+      payload.filter((s) => s.name === IN_TMUX_BY_AGENT_STATUS_NAME),
+    ).toHaveLength(1);
+  });
+
   it('should remove "PC Todo" from the status list and not include it in others', async () => {
     const mockProjectRepository =
       mock<Pick<ProjectRepository, 'getByUrl' | 'updateStatusList'>>();
@@ -530,6 +615,7 @@ describe('SetupTowerDefenceProjectUseCase', () => {
       AWAITING_QUALITY_CHECK_STATUS_NAME,
       TODO_STATUS_NAME,
       IN_TMUX_STATUS_NAME,
+      IN_TMUX_BY_AGENT_STATUS_NAME,
       DONE_STATUS_NAME,
       ICEBOX_STATUS_NAME,
     ]);
@@ -668,6 +754,7 @@ describe('SetupTowerDefenceProjectUseCase', () => {
       AWAITING_QUALITY_CHECK_STATUS_NAME,
       TODO_STATUS_NAME,
       IN_TMUX_STATUS_NAME,
+      IN_TMUX_BY_AGENT_STATUS_NAME,
       DONE_STATUS_NAME,
       ICEBOX_STATUS_NAME,
     ]);
@@ -817,6 +904,7 @@ describe('SetupTowerDefenceProjectUseCase', () => {
       AWAITING_QUALITY_CHECK_STATUS_NAME,
       TODO_STATUS_NAME,
       IN_TMUX_STATUS_NAME,
+      IN_TMUX_BY_AGENT_STATUS_NAME,
       DONE_STATUS_NAME,
       ICEBOX_STATUS_NAME,
     ]);