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

package/bin/domain/usecases/console/GenerateConsoleListsUseCase.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GenerateConsoleListsUseCase = void 0;
+const UNKNOWN_STORY_SORT_INDEX = 999999;
+class GenerateConsoleListsUseCase {
+    constructor() {
+        this.run = (input) => {
+            const { project, issues, pjcode, assigneeLogin, generatedAt } = input;
+            const storyOptions = project.story ? project.story.stories : [];
+            const storyOrder = storyOptions.map((option) => option.name);
+            const statusOptions = project.status.statuses;
+            const actionableIssues = issues.filter((issue) => this.isActionable(issue, assigneeLogin));
+            const buildStatusTab = (selector, excludedStatusNames) => ({
+                pjcode,
+                generatedAt,
+                statusOptions: this.buildFieldOptions(statusOptions, excludedStatusNames),
+                storyOrder,
+                storyColors: this.buildStoryColorsObject(storyOptions),
+                items: this.sortByStoryOrder(actionableIssues
+                    .filter(selector)
+                    .map((issue) => this.projectItem(issue)), storyOrder),
+            });
+            return {
+                prs: buildStatusTab((issue) => issue.status !== null &&
+                    issue.status.toLowerCase() === 'awaiting quality check', ['awaiting quality check', 'done']),
+                unread: buildStatusTab((issue) => issue.status !== null && issue.status.toLowerCase() === 'unread', ['unread', 'done']),
+                'failed-preparation': buildStatusTab((issue) => issue.status === 'Failed Preparation', [
+                    'failed preparation',
+                    'done',
+                    'preparation',
+                    'icebox',
+                    'unread',
+                    'in tmux by human',
+                ]),
+                triage: {
+                    pjcode,
+                    generatedAt,
+                    storyOptions: this.buildFieldOptions(storyOptions, []),
+                    storyOrder,
+                    storyColors: this.buildStoryColorsString(storyOptions),
+                    items: this.sortByStoryOrder(actionableIssues
+                        .filter((issue) => issue.story !== null &&
+                        issue.story.toLowerCase().includes('no story'))
+                        .map((issue) => this.projectItem(issue)), storyOrder),
+                },
+            };
+        };
+        this.isActionable = (issue, assigneeLogin) => issue.isClosed === false &&
+            issue.assignees.includes(assigneeLogin) &&
+            issue.dependedIssueUrls.length === 0 &&
+            issue.nextActionDate === null &&
+            issue.nextActionHour === null;
+        this.projectItem = (issue) => ({
+            number: issue.number,
+            title: issue.title,
+            url: issue.url,
+            repo: issue.nameWithOwner,
+            nameWithOwner: issue.nameWithOwner,
+            projectItemId: issue.itemId,
+            itemId: issue.itemId,
+            isPr: issue.isPr,
+            story: issue.story ?? '',
+            labels: issue.labels,
+            createdAt: issue.createdAt.toISOString(),
+        });
+        this.buildFieldOptions = (options, excludedLowerCaseNames) => options
+            .filter((option) => !excludedLowerCaseNames.includes(option.name.toLowerCase()))
+            .map((option) => ({
+            id: option.id,
+            name: option.name,
+            color: option.color,
+        }));
+        this.buildStoryColorsObject = (options) => {
+            const result = {};
+            for (const option of options) {
+                result[option.name] = { color: option.color };
+            }
+            return result;
+        };
+        this.buildStoryColorsString = (options) => {
+            const result = {};
+            for (const option of options) {
+                result[option.name] = option.color;
+            }
+            return result;
+        };
+        this.sortByStoryOrder = (items, storyOrder) => {
+            const indexByStory = new Map(storyOrder.map((name, index) => [name, index]));
+            return items
+                .map((item, position) => ({
+                item,
+                position,
+                sortKey: indexByStory.get(item.story) ?? UNKNOWN_STORY_SORT_INDEX,
+            }))
+                .sort((a, b) => a.sortKey - b.sortKey || a.position - b.position)
+                .map((entry) => entry.item);
+        };
+    }
+}
+exports.GenerateConsoleListsUseCase = GenerateConsoleListsUseCase;
+//# sourceMappingURL=GenerateConsoleListsUseCase.js.map

package/bin/domain/usecases/console/GenerateConsoleListsUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GenerateConsoleListsUseCase.js","sourceRoot":"","sources":["../../../../src/domain/usecases/console/GenerateConsoleListsUseCase.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-issue-tower-defence-management",
-  "version": "1.83.0",
+  "version": "1.84.1",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

package/src/adapter/entry-points/handlers/HandleScheduledEventUseCaseHandler.ts

@@ -2,6 +2,7 @@ import YAML from 'yaml';
 import TYPIA from 'typia';
 import fs from 'fs';
 import { writeSituationFile } from './situationFileWriter';
+import { writeConsoleLists } from './consoleListsWriter';
 import { writeRotationOrderFile } from './rotationOrderFileWriter';
 import {
   fetchProjectReadme,
@@ -66,6 +67,7 @@ export class HandleScheduledEventUseCaseHandler {
     const input: unknown = YAML.parse(configFileContent);
     type inputType = Parameters<HandleScheduledEventUseCase['run']>[0] & {
       claudeCodeOauthTokenListJsonPath?: string;
+      consoleDataOutputDir?: string;
       credentials: {
         manager: {
           github: {
@@ -365,6 +367,22 @@ export class HandleScheduledEventUseCaseHandler {
           mergedInput.startPreparation?.preparationProcessCheckCommand ?? null,
         localCommandRunner: nodeLocalCommandRunner,
       });
+
+      try {
+        writeConsoleLists({
+          consoleDataOutputDir: mergedInput.consoleDataOutputDir ?? null,
+          pjcode: input.projectName,
+          assigneeLogin: input.manager,
+          project: result.project,
+          issues: result.issues,
+        });
+      } catch (error) {
+        console.error(
+          `Failed to write console lists: ${
+            error instanceof Error ? error.message : String(error)
+          }`,
+        );
+      }
     }
     return result;
   };

package/src/adapter/entry-points/handlers/consoleListsWriter.test.ts

@@ -0,0 +1,167 @@
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { mock } from 'jest-mock-extended';
+import { Issue } from '../../../domain/entities/Issue';
+import { FieldOption, Project } from '../../../domain/entities/Project';
+import {
+  formatConsoleGeneratedAt,
+  writeConsoleLists,
+} from './consoleListsWriter';
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  value !== null && typeof value === 'object' && !Array.isArray(value);
+
+const isUnknownArray = (value: unknown): value is unknown[] =>
+  Array.isArray(value);
+
+const ASSIGNEE = 'owner-login';
+
+const option = (
+  id: string,
+  name: string,
+  color: FieldOption['color'],
+): FieldOption => ({ id, name, color, description: '' });
+
+const project: Project = {
+  ...mock<Project>(),
+  status: {
+    name: 'Status',
+    fieldId: 'status-field',
+    statuses: [
+      option('st-unread', 'Unread', 'ORANGE'),
+      option('st-aw', 'Awaiting Workspace', 'BLUE'),
+      option('st-aqc', 'Awaiting Quality Check', 'GREEN'),
+    ],
+  },
+  story: {
+    name: 'story',
+    fieldId: 'story-field',
+    databaseId: 2,
+    stories: [option('s1', 'Story Alpha', 'BLUE')],
+    workflowManagementStory: { id: 'wm', name: 'workflow management' },
+  },
+};
+
+const makeIssue = (overrides: Partial<Issue>): Issue => ({
+  ...mock<Issue>(),
+  number: 1,
+  title: 'Issue 1',
+  nameWithOwner: 'demo/repo',
+  url: 'https://github.com/demo/repo/issues/1',
+  status: null,
+  story: null,
+  nextActionDate: null,
+  nextActionHour: null,
+  dependedIssueUrls: [],
+  assignees: [ASSIGNEE],
+  labels: [],
+  body: 'should never be written',
+  itemId: 'item-1',
+  isPr: false,
+  isClosed: false,
+  createdAt: new Date('2026-06-13T08:18:45.000Z'),
+  ...overrides,
+});
+
+describe('writeConsoleLists', () => {
+  let outDir: string;
+
+  beforeEach(() => {
+    outDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-out-'));
+  });
+
+  afterEach(() => {
+    fs.rmSync(outDir, { recursive: true, force: true });
+  });
+
+  const tabFile = (tab: string): string =>
+    path.join(outDir, 'demo', tab, 'list.json');
+
+  it('writes all four tab list.json files', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: outDir,
+      pjcode: 'demo',
+      assigneeLogin: ASSIGNEE,
+      project,
+      issues: [makeIssue({ status: 'Unread' })],
+      generatedAt: '2026-06-14T07:22:33Z',
+    });
+
+    for (const tab of ['prs', 'triage', 'unread', 'failed-preparation']) {
+      expect(fs.existsSync(tabFile(tab))).toBe(true);
+    }
+  });
+
+  it('writes items with no body field', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: outDir,
+      pjcode: 'demo',
+      assigneeLogin: ASSIGNEE,
+      project,
+      issues: [makeIssue({ status: 'Unread' })],
+      generatedAt: '2026-06-14T07:22:33Z',
+    });
+
+    const raw: unknown = JSON.parse(fs.readFileSync(tabFile('unread'), 'utf8'));
+    expect(isRecord(raw)).toBe(true);
+    const items: unknown = isRecord(raw) ? raw.items : undefined;
+    expect(isUnknownArray(items)).toBe(true);
+    const firstItem: unknown = isUnknownArray(items) ? items[0] : undefined;
+    expect(isRecord(firstItem)).toBe(true);
+    expect(firstItem).not.toHaveProperty('body');
+  });
+
+  it('does not leave a temp file behind after writing', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: outDir,
+      pjcode: 'demo',
+      assigneeLogin: ASSIGNEE,
+      project,
+      issues: [],
+      generatedAt: '2026-06-14T07:22:33Z',
+    });
+    expect(fs.existsSync(`${tabFile('prs')}.tmp`)).toBe(false);
+  });
+
+  it('is a no-op when consoleDataOutputDir is unset', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: undefined,
+      pjcode: 'demo',
+      assigneeLogin: ASSIGNEE,
+      project,
+      issues: [makeIssue({ status: 'Unread' })],
+    });
+    expect(fs.readdirSync(outDir)).toHaveLength(0);
+  });
+
+  it('is a no-op when pjcode is unset', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: outDir,
+      pjcode: '',
+      assigneeLogin: ASSIGNEE,
+      project,
+      issues: [makeIssue({ status: 'Unread' })],
+    });
+    expect(fs.readdirSync(outDir)).toHaveLength(0);
+  });
+
+  it('is a no-op when assigneeLogin is unset', () => {
+    writeConsoleLists({
+      consoleDataOutputDir: outDir,
+      pjcode: 'demo',
+      assigneeLogin: null,
+      project,
+      issues: [makeIssue({ status: 'Unread' })],
+    });
+    expect(fs.readdirSync(outDir)).toHaveLength(0);
+  });
+});
+
+describe('formatConsoleGeneratedAt', () => {
+  it('strips milliseconds and keeps the trailing Z', () => {
+    expect(formatConsoleGeneratedAt(new Date('2026-06-14T07:22:33.456Z'))).toBe(
+      '2026-06-14T07:22:33Z',
+    );
+  });
+});

package/src/adapter/entry-points/handlers/consoleListsWriter.ts

@@ -0,0 +1,60 @@
+import fs from 'fs';
+import path from 'path';
+import type { Issue } from '../../../domain/entities/Issue';
+import type { Project } from '../../../domain/entities/Project';
+import {
+  ConsoleLists,
+  ConsoleTabName,
+  GenerateConsoleListsUseCase,
+} from '../../../domain/usecases/console/GenerateConsoleListsUseCase';
+
+export type ConsoleListsWriterParams = {
+  consoleDataOutputDir: string | null | undefined;
+  pjcode: string | null | undefined;
+  assigneeLogin: string | null | undefined;
+  project: Project;
+  issues: Issue[];
+  generatedAt?: string;
+};
+
+const CONSOLE_TAB_NAMES: ConsoleTabName[] = [
+  'prs',
+  'triage',
+  'unread',
+  'failed-preparation',
+];
+
+export const formatConsoleGeneratedAt = (date: Date): string =>
+  date.toISOString().replace(/\.\d{3}Z$/, 'Z');
+
+const writeJsonAtomic = (filePath: string, data: unknown): void => {
+  const dir = path.dirname(filePath);
+  fs.mkdirSync(dir, { recursive: true });
+  const tmpPath = `${filePath}.tmp`;
+  fs.writeFileSync(tmpPath, JSON.stringify(data));
+  fs.renameSync(tmpPath, filePath);
+};
+
+export const writeConsoleLists = (params: ConsoleListsWriterParams): void => {
+  const { consoleDataOutputDir, pjcode, assigneeLogin } = params;
+  if (!consoleDataOutputDir || !pjcode || !assigneeLogin) {
+    return;
+  }
+
+  const generatedAt =
+    params.generatedAt ?? formatConsoleGeneratedAt(new Date());
+  const lists: ConsoleLists = new GenerateConsoleListsUseCase().run({
+    project: params.project,
+    issues: params.issues,
+    pjcode,
+    assigneeLogin,
+    generatedAt,
+  });
+
+  for (const tab of CONSOLE_TAB_NAMES) {
+    writeJsonAtomic(
+      path.join(consoleDataOutputDir, pjcode, tab, 'list.json'),
+      lists[tab],
+    );
+  }
+};

package/src/adapter/proxy/RateLimitCache.test.ts

@@ -8,6 +8,7 @@ import {
   HEADERLESS_429_DEFAULT_COOLDOWN_SECONDS,
   HEADERLESS_429_MAX_COOLDOWN_SECONDS,
   parseModelRateLimitsFromBody,
+  parseModelRateLimitsFromHeaders,
   readRateLimit,
   writeModelRateLimit,
   writeRateLimit,
@@ -647,4 +648,98 @@ describe('RateLimitCache', () => {
       expect(readRateLimit(token)).toBeNull();
     });
   });
+
+  describe('parseModelRateLimitsFromHeaders', () => {
+    it('should extract a rejected seven_day_sonnet limit from the per-model unified headers', () => {
+      expect(
+        parseModelRateLimitsFromHeaders({
+          'anthropic-ratelimit-unified-7d_sonnet-status': 'rejected',
+          'anthropic-ratelimit-unified-7d_sonnet-reset': '1779642000',
+        }),
+      ).toEqual({
+        seven_day_sonnet: { rejected: true, resetsAt: 1779642000 },
+      });
+    });
+
+    it('should extract both seven_day_sonnet and seven_day_opus limits with their statuses', () => {
+      expect(
+        parseModelRateLimitsFromHeaders({
+          'anthropic-ratelimit-unified-7d_sonnet-status': 'rejected',
+          'anthropic-ratelimit-unified-7d_sonnet-reset': '1779642000',
+          'anthropic-ratelimit-unified-7d_opus-status': 'allowed',
+          'anthropic-ratelimit-unified-7d_opus-reset': '1779700000',
+        }),
+      ).toEqual({
+        seven_day_sonnet: { rejected: true, resetsAt: 1779642000 },
+        seven_day_opus: { rejected: false, resetsAt: 1779700000 },
+      });
+    });
+
+    it('should return an empty map when no per-model headers are present', () => {
+      expect(
+        parseModelRateLimitsFromHeaders({
+          'anthropic-ratelimit-unified-status': 'allowed',
+          'anthropic-ratelimit-unified-7d-status': 'allowed',
+        }),
+      ).toEqual({});
+    });
+
+    it('should default resetsAt to 0 when the per-model reset header is missing', () => {
+      expect(
+        parseModelRateLimitsFromHeaders({
+          'anthropic-ratelimit-unified-7d_opus-status': 'rejected',
+        }),
+      ).toEqual({
+        seven_day_opus: { rejected: true, resetsAt: 0 },
+      });
+    });
+  });
+
+  describe('readRateLimit per-model header population', () => {
+    it('should populate seven_day_sonnet from the per-model headers when the body carried no rate_limit event', () => {
+      const token = 'header-only-sonnet-token';
+      writeRateLimit(token, {
+        'anthropic-ratelimit-unified-status': 'rejected',
+        'anthropic-ratelimit-unified-5h-status': 'allowed',
+        'anthropic-ratelimit-unified-5h-reset': '1700000000',
+        'anthropic-ratelimit-unified-5h-utilization': '53',
+        'anthropic-ratelimit-unified-7d-status': 'allowed_warning',
+        'anthropic-ratelimit-unified-7d-reset': '1700100000',
+        'anthropic-ratelimit-unified-7d-utilization': '88',
+        'anthropic-ratelimit-unified-7d_sonnet-status': 'rejected',
+        'anthropic-ratelimit-unified-7d_sonnet-reset': '1779642000',
+        'anthropic-ratelimit-unified-7d_opus-status': 'allowed',
+        'anthropic-ratelimit-unified-7d_opus-reset': '1779700000',
+      });
+      const snapshot = readRateLimit(token);
+      expect(snapshot?.modelWeeklyLimits).toEqual({
+        seven_day_sonnet: { rejected: true, resetsAt: 1779642000 },
+        seven_day_opus: { rejected: false, resetsAt: 1779700000 },
+      });
+      expect(snapshot?.unifiedRejected).toBe(true);
+      expect(snapshot?.fiveHourRejected).toBe(false);
+    });
+
+    it('should let a body-derived model limit override the per-model header value for the same claim', () => {
+      const token = 'body-overrides-header-token';
+      writeRateLimit(token, {
+        'anthropic-ratelimit-unified-status': 'allowed',
+        'anthropic-ratelimit-unified-5h-status': 'allowed',
+        'anthropic-ratelimit-unified-5h-reset': '1700000000',
+        'anthropic-ratelimit-unified-5h-utilization': '10',
+        'anthropic-ratelimit-unified-7d-status': 'allowed',
+        'anthropic-ratelimit-unified-7d-reset': '1700100000',
+        'anthropic-ratelimit-unified-7d-utilization': '5',
+        'anthropic-ratelimit-unified-7d_sonnet-status': 'allowed',
+        'anthropic-ratelimit-unified-7d_sonnet-reset': '1700200000',
+      });
+      writeModelRateLimit(token, {
+        seven_day_sonnet: { rejected: true, resetsAt: 1779642000 },
+      });
+      const snapshot = readRateLimit(token);
+      expect(snapshot?.modelWeeklyLimits).toEqual({
+        seven_day_sonnet: { rejected: true, resetsAt: 1779642000 },
+      });
+    });
+  });
 });

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' },