github-issue-tower-defence-management 2.6.1 → 2.7.0

package/src/adapter/entry-points/cli/index.ts

@@ -122,7 +122,6 @@ type NotifyFinishedOptions = {
   missingAgentName?: string;
   sessionErrorLine?: string;
   deferPreparation?: boolean;
-  ownerApprovalTimeoutCycles?: string;
 };
 
 type CheckIssueReviewReadinessOptions = {
@@ -484,7 +483,6 @@ program
         labelsAsLlmAgentName: config.labelsAsLlmAgentName ?? null,
         labelsNotRequiringPullRequest:
           config.labelsNotRequiringPullRequest ?? null,
-        ownerApprovalTimeoutCycles: config.ownerApprovalTimeoutCycles ?? 12,
       });
     }
 
@@ -585,10 +583,6 @@ program
     '--deferPreparation',
     'Defer the item via the Reactivation Trigger fields (sets nextActionDate to tomorrow) without creating any issue; use for transient upstream failures',
   )
-  .option(
-    '--ownerApprovalTimeoutCycles <count>',
-    'Number of owner-approval wait cycles before escalating to Failed Preparation (default: 12)',
-  )
   .action(async (options: NotifyFinishedOptions) => {
     const token = process.env.GH_TOKEN;
     if (!token) {
@@ -730,9 +724,6 @@ program
       manager: config.manager ?? null,
       developerAgentName: config.developerAgentName ?? null,
       deferPreparation: options.deferPreparation ?? null,
-      ownerApprovalTimeoutCycles: options.ownerApprovalTimeoutCycles
-        ? Number(options.ownerApprovalTimeoutCycles)
-        : (config.ownerApprovalTimeoutCycles ?? 12),
     });
   });
 

package/src/adapter/entry-points/cli/projectConfig.ts

@@ -32,7 +32,6 @@ export type ConfigFile = {
   consoleProjects?: Record<string, string>;
   consoleGithubTokenFileDir?: string;
   disks?: DiskConfig[];
-  ownerApprovalTimeoutCycles?: number;
   errorReportingRepository?: string;
 };
 
@@ -209,10 +208,6 @@ export const loadConfigFile = (configFilePath: string): ConfigFile => {
         'consoleGithubTokenFileDir',
       ),
       disks: getDisksValue(parsed, 'disks'),
-      ownerApprovalTimeoutCycles: getNumberValue(
-        parsed,
-        'ownerApprovalTimeoutCycles',
-      ),
       errorReportingRepository: getStringValue(
         parsed,
         'errorReportingRepository',
@@ -410,9 +405,6 @@ export const mergeConfigs = (
     cliOverrides.consoleGithubTokenFileDir ??
     configFile.consoleGithubTokenFileDir,
   disks: cliOverrides.disks ?? configFile.disks,
-  ownerApprovalTimeoutCycles:
-    cliOverrides.ownerApprovalTimeoutCycles ??
-    configFile.ownerApprovalTimeoutCycles,
   errorReportingRepository:
     readmeOverrides.errorReportingRepository ??
     cliOverrides.errorReportingRepository ??

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

@@ -74,7 +74,6 @@ import { ProxyRateLimitCacheRepository } from '../../repositories/ProxyRateLimit
 import { UpdateRateLimitCacheUseCase } from '../../../domain/usecases/UpdateRateLimitCacheUseCase';
 import { RevertOrphanedPreparationUseCase } from '../../../domain/usecases/RevertOrphanedPreparationUseCase';
 import { RevertNotReadyReviewQueueIssueUseCase } from '../../../domain/usecases/RevertNotReadyReviewQueueIssueUseCase';
-import { TriagerApprovalDispatchUseCase } from '../../../domain/usecases/TriagerApprovalDispatchUseCase';
 import { AgentDesignationLabelAdoptUseCase } from '../../../domain/usecases/AgentDesignationLabelAdoptUseCase';
 import { GitHubIssueCommentRepository } from '../../repositories/GitHubIssueCommentRepository';
 import { ProjectRequiredFieldCreateUseCase } from '../../../domain/usecases/ProjectRequiredFieldCreateUseCase';
@@ -528,11 +527,6 @@ export class HandleScheduledEventUseCaseHandler {
         issueRepository,
         issueCommentRepository,
       );
-    const triagerApprovalDispatchUseCase = new TriagerApprovalDispatchUseCase(
-      projectRepository,
-      issueRepository,
-      issueCommentRepository,
-    );
     const agentDesignationLabelAdoptUseCase =
       new AgentDesignationLabelAdoptUseCase(projectRepository, issueRepository);
 
@@ -575,7 +569,6 @@ export class HandleScheduledEventUseCaseHandler {
       revertOrphanedPreparationUseCase,
       conflictedIssueRevertUseCase,
       revertNotReadyReviewQueueIssueUseCase,
-      triagerApprovalDispatchUseCase,
       agentDesignationLabelAdoptUseCase,
       updateRateLimitCacheUseCase,
       dailySecurityScanUseCase,

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

@@ -212,13 +212,13 @@ describe('CheckIssueReviewReadinessUseCase', () => {
       });
     });
 
-    it('should return reviewReady=true when the last report declares pullRequestRequired as false and no related PR exists', async () => {
+    it('should return reviewReady=true when the last report designates the triager and no related PR exists', async () => {
       const issue = createMockIssue();
       mockIssueRepository.getIssueByUrl.mockResolvedValue(issue);
       mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
         createMockComment({
           content:
-            'From: :robot: Agent report\n```json\n{"pullRequestRequired": false}\n```',
+            'From: :robot: Agent report\n```json\n{"nextStepAgent": "triager"}\n```',
         }),
       ]);
       mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
@@ -232,13 +232,35 @@ describe('CheckIssueReviewReadinessUseCase', () => {
       expect(result.reviewReady).toBe(true);
     });
 
-    it('should keep every rejection other than PULL_REQUEST_NOT_FOUND when the last report declares pullRequestRequired as false', async () => {
+    it('should keep rejecting a missing PR when the last report designates an agent other than the triager', async () => {
       const issue = createMockIssue();
       mockIssueRepository.getIssueByUrl.mockResolvedValue(issue);
       mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
         createMockComment({
           content:
-            'From: :robot: Agent report\n```json\n{"pullRequestRequired": false}\n```',
+            'From: :robot: Agent report\n```json\n{"nextStepAgent": "developer"}\n```',
+        }),
+      ]);
+      mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
+
+      const result = await useCase.run({
+        issueUrl: 'https://github.com/user/repo/issues/1',
+      });
+
+      expect(result.reviewReady).toBe(false);
+      expect(result.rejections).toContainEqual({
+        type: 'PULL_REQUEST_NOT_FOUND',
+        detail: 'PULL_REQUEST_NOT_FOUND',
+      });
+    });
+
+    it('should keep every rejection other than PULL_REQUEST_NOT_FOUND when the last report designates the triager', async () => {
+      const issue = createMockIssue();
+      mockIssueRepository.getIssueByUrl.mockResolvedValue(issue);
+      mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
+        createMockComment({
+          content:
+            'From: :robot: Agent report\n```json\n{"nextStepAgent": "triager"}\n```',
         }),
       ]);
       mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([

package/src/domain/usecases/CheckIssueReviewReadinessUseCase.ts

@@ -5,10 +5,11 @@ import {
   PrRejectedReasonType,
 } from './IssueRejectionEvaluator';
 import { resolveLabelsNotRequiringPullRequest } from './resolveLabelsNotRequiringPullRequest';
-import { isPullRequestDeclaredUnnecessary } from './isPullRequestDeclaredUnnecessary';
 import { normalizeReportBody } from './normalizeReportBody';
 import { isAgentReportBody } from './isAgentReportBody';
 import { isAuthorAuthorizedForAutoStatusCheck } from './isAuthorAuthorizedForAutoStatusCheck';
+import { extractNextStepAgentFromComments } from './extractNextStepAgentFromComments';
+import { isTriagerAgentName } from './triagerAgentName';
 
 type RejectedReasonType =
   | 'ISSUE_NOT_FOUND'
@@ -94,10 +95,11 @@ export class CheckIssueReviewReadinessUseCase {
         { developerAgentName: params.developerAgentName },
       );
 
-    const requiredPrRejections = isPullRequestDeclaredUnnecessary(
+    const nextStepAgent = extractNextStepAgentFromComments(
       comments,
       isTrustedAuthor,
-    )
+    );
+    const requiredPrRejections = isTriagerAgentName(nextStepAgent)
       ? prRejections.filter(
           (rejection) => rejection.type !== 'PULL_REQUEST_NOT_FOUND',
         )

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

@@ -25,7 +25,6 @@ import { StartPreparationUseCase } from './StartPreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
 import { ConflictedIssueRevertUseCase } from './ConflictedIssueRevertUseCase';
 import { RevertNotReadyReviewQueueIssueUseCase } from './RevertNotReadyReviewQueueIssueUseCase';
-import { TriagerApprovalDispatchUseCase } from './TriagerApprovalDispatchUseCase';
 import { AgentDesignationLabelAdoptUseCase } from './AgentDesignationLabelAdoptUseCase';
 import { ProjectRequiredFieldCreateUseCase } from './ProjectRequiredFieldCreateUseCase';
 import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
@@ -129,8 +128,6 @@ describe('HandleScheduledEventUseCase', () => {
       mock<ConflictedIssueRevertUseCase>();
     const mockRevertNotReadyReviewQueueIssueUseCase =
       mock<RevertNotReadyReviewQueueIssueUseCase>();
-    const mockTriagerApprovalDispatchUseCase =
-      mock<TriagerApprovalDispatchUseCase>();
     const mockAgentDesignationLabelAdoptUseCase =
       mock<AgentDesignationLabelAdoptUseCase>();
     const mockUpdateRateLimitCacheUseCase = mock<UpdateRateLimitCacheUseCase>();
@@ -165,7 +162,6 @@ describe('HandleScheduledEventUseCase', () => {
       mockRevertOrphanedPreparationUseCase,
       mockConflictedIssueRevertUseCase,
       mockRevertNotReadyReviewQueueIssueUseCase,
-      mockTriagerApprovalDispatchUseCase,
       mockAgentDesignationLabelAdoptUseCase,
       mockUpdateRateLimitCacheUseCase,
       mockDailySecurityScanUseCase,
@@ -282,29 +278,6 @@ describe('HandleScheduledEventUseCase', () => {
       });
     });
 
-    it('should call TriagerApprovalDispatchUseCase with project URL', async () => {
-      const input = {
-        projectName: 'test-project',
-        org: 'test-org',
-        projectUrl: 'https://github.com/test-org/test-project',
-        manager: 'test-manager',
-        workingReport: {
-          repo: 'test-repo',
-          members: ['member1'],
-          spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
-        },
-        urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabled: false,
-      };
-
-      await useCase.run(input);
-      expect(mockTriagerApprovalDispatchUseCase.run).toHaveBeenCalledWith(
-        expect.objectContaining({
-          projectUrl: 'https://github.com/test-org/test-project',
-        }),
-      );
-    });
-
     it('should return null and skip all processing when disabled is true', async () => {
       const input = {
         projectName: 'test-project',
@@ -1827,7 +1800,6 @@ describe('HandleScheduledEventUseCase', () => {
       mock<RevertOrphanedPreparationUseCase>(),
       mock<ConflictedIssueRevertUseCase>(),
       mock<RevertNotReadyReviewQueueIssueUseCase>(),
-      mock<TriagerApprovalDispatchUseCase>(),
       mock<AgentDesignationLabelAdoptUseCase>(),
       null,
       null,

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -28,7 +28,6 @@ import {
 import { AgentDesignationLabelAdoptUseCase } from './AgentDesignationLabelAdoptUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
 import { RevertNotReadyReviewQueueIssueUseCase } from './RevertNotReadyReviewQueueIssueUseCase';
-import { TriagerApprovalDispatchUseCase } from './TriagerApprovalDispatchUseCase';
 import { isRecord } from './isRecord';
 import { resolveLabelsAsLlmAgentName } from './resolveLabelsAsLlmAgentName';
 import { resolveAllowedIssueAuthors } from './resolveAllowedIssueAuthors';
@@ -139,7 +138,6 @@ export class HandleScheduledEventUseCase {
     readonly revertOrphanedPreparationUseCase: RevertOrphanedPreparationUseCase,
     readonly conflictedIssueRevertUseCase: ConflictedIssueRevertUseCase,
     readonly revertNotReadyReviewQueueIssueUseCase: RevertNotReadyReviewQueueIssueUseCase,
-    readonly triagerApprovalDispatchUseCase: TriagerApprovalDispatchUseCase,
     readonly agentDesignationLabelAdoptUseCase: AgentDesignationLabelAdoptUseCase,
     readonly updateRateLimitCacheUseCase: UpdateRateLimitCacheUseCase | null,
     readonly dailySecurityScanUseCase: DailySecurityScanUseCase | null,
@@ -452,10 +450,6 @@ ${JSON.stringify(e)}
       allowedIssueAuthors,
       developerAgentName: input.developerAgentName,
     });
-    await this.triagerApprovalDispatchUseCase.run({
-      projectUrl: input.projectUrl,
-      allowedIssueAuthors,
-    });
     if (this.dailySecurityScanUseCase !== null && input.dailySecurityScan) {
       await this.dailySecurityScanUseCase.run({
         targetDates: targetDateTimes,

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

@@ -739,125 +739,6 @@ describe('IssueRejectionEvaluator', () => {
       });
     });
 
-    describe('pullRequestRequired: false in issue body', () => {
-      it('should not reject and not call findRelatedOpenPRs when body ends with JSON block containing pullRequestRequired: false', async () => {
-        const body = '```json\n{"pullRequestRequired": false}\n```';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(mockIssueRepository.findRelatedOpenPRs).not.toHaveBeenCalled();
-        expect(result.rejections).toHaveLength(0);
-        expect(result.approvedPrUrl).toBeNull();
-      });
-
-      it('should not reject even with trailing whitespace after the closing JSON block', async () => {
-        const body = '```json\n{"pullRequestRequired": false}\n```\n  ';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(mockIssueRepository.findRelatedOpenPRs).not.toHaveBeenCalled();
-        expect(result.rejections).toHaveLength(0);
-      });
-
-      it('should still require PR when body has pullRequestRequired: true', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-        const body = '```json\n{"pullRequestRequired": true}\n```';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-
-      it('should still require PR when body is null', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body: null,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-
-      it('should still require PR when body is undefined', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-
-      it('should still require PR when JSON block with pullRequestRequired: false is not at end of body', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-        const body =
-          '```json\n{"pullRequestRequired": false}\n```\n\nsome text after';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-
-      it('should still require PR when body has invalid JSON in code block', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-        const body = '```json\n{invalid json}\n```';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-
-      it('should still require PR when body has pullRequestRequired not set to false', async () => {
-        mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
-        const body = '```json\n{"someOtherField": true}\n```';
-
-        const result = await evaluator.evaluate({
-          url: 'https://github.com/user/repo/issues/1',
-          labels: [],
-          isPr: false,
-          body,
-        });
-
-        expect(result.rejections).toHaveLength(1);
-        expect(result.rejections[0].type).toBe('PULL_REQUEST_NOT_FOUND');
-      });
-    });
-
     describe('detectConflictEvenIfEvaluationSkipped option', () => {
       it('should call findRelatedOpenPRs and return PULL_REQUEST_CONFLICTED when relatedOpenPrUrls is null and PR is conflicted', async () => {
         mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([

package/src/domain/usecases/IssueRejectionEvaluator.ts

@@ -2,7 +2,6 @@ import {
   IssueRepository,
   RelatedPullRequest,
 } from './adapter-interfaces/IssueRepository';
-import { normalizeReportBody } from './normalizeReportBody';
 
 export type PrRejectedReasonType =
   | 'PULL_REQUEST_NOT_FOUND'
@@ -243,7 +242,6 @@ export class IssueRejectionEvaluator {
     return (
       !isNonDeveloperAgent &&
       !hasLabelNotRequiringPullRequest &&
-      this.isPullRequestRequiredByBody(issue.body) &&
       (categoryLabels.length <= 0 || categoryLabels.includes('category:e2e'))
     );
   };
@@ -337,23 +335,4 @@ export class IssueRejectionEvaluator {
     targetPath: string,
   ): boolean =>
     filePath === targetPath || filePath.startsWith(`${targetPath}/`);
-
-  private isPullRequestRequiredByBody = (
-    body: string | null | undefined,
-  ): boolean => {
-    if (!body) return true;
-    const match = normalizeReportBody(body)
-      .trimEnd()
-      .match(/```json\n([\s\S]*?)\n```\s*$/);
-    if (!match || !match[1]) return true;
-    let config: unknown;
-    try {
-      config = JSON.parse(match[1]);
-    } catch {
-      return true;
-    }
-    if (typeof config !== 'object' || config === null) return true;
-    if (!('pullRequestRequired' in config)) return true;
-    return Reflect.get(config, 'pullRequestRequired') !== false;
-  };
 }