github-issue-tower-defence-management 1.187.0 → 1.187.2

package/src/adapter/entry-points/console/ui-dist/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TDPM Console</title>
-    <script type="module" crossorigin src="/assets/index-wj6o8qvo.js"></script>
+    <script type="module" crossorigin src="/assets/index-DfKDTGzS.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-yZy1TUOo.css">
   </head>
   <body>

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

@@ -976,6 +976,90 @@ describe('IssueRejectionEvaluator', () => {
           'ANY_CI_JOB_FAILED_OR_IN_PROGRESS',
         );
       });
+
+      it('should resolve the pull request item itself and not call findRelatedOpenPRs when the item is a pull request', async () => {
+        mockIssueRepository.findRelatedOpenPRs.mockRejectedValue(
+          new Error(
+            'findRelatedOpenPRs only supports issue URLs, not pull request URLs',
+          ),
+        );
+        mockIssueRepository.getOpenPullRequest.mockResolvedValue(
+          createReadyPr('https://github.com/user/repo/pull/7', {
+            isConflicted: true,
+          }),
+        );
+
+        const result = await evaluator.evaluate(
+          {
+            url: 'https://github.com/user/repo/pull/7',
+            labels: [],
+            isPr: true,
+            agent: 'chore',
+          },
+          [],
+          {
+            detectConflictEvenIfEvaluationSkipped: true,
+            relatedOpenPrUrls: null,
+          },
+        );
+
+        expect(mockIssueRepository.findRelatedOpenPRs).not.toHaveBeenCalled();
+        expect(mockIssueRepository.getOpenPullRequest).toHaveBeenCalledWith(
+          'https://github.com/user/repo/pull/7',
+        );
+        expect(result.rejections).toHaveLength(1);
+        expect(result.rejections[0].type).toBe('PULL_REQUEST_CONFLICTED');
+      });
+
+      it('should return no rejections when the pull request item itself is not conflicted', async () => {
+        mockIssueRepository.findRelatedOpenPRs.mockRejectedValue(
+          new Error(
+            'findRelatedOpenPRs only supports issue URLs, not pull request URLs',
+          ),
+        );
+        mockIssueRepository.getOpenPullRequest.mockResolvedValue(
+          createReadyPr('https://github.com/user/repo/pull/7'),
+        );
+
+        const result = await evaluator.evaluate(
+          {
+            url: 'https://github.com/user/repo/pull/7',
+            labels: [],
+            isPr: true,
+            agent: 'chore',
+          },
+          [],
+          {
+            detectConflictEvenIfEvaluationSkipped: true,
+            relatedOpenPrUrls: null,
+          },
+        );
+
+        expect(mockIssueRepository.findRelatedOpenPRs).not.toHaveBeenCalled();
+        expect(result.rejections).toHaveLength(0);
+      });
+
+      it('should return no rejections when resolving the pull request item fails transiently', async () => {
+        mockIssueRepository.getOpenPullRequest.mockRejectedValue(
+          new Error('Something went wrong while executing your query.'),
+        );
+
+        const result = await evaluator.evaluate(
+          {
+            url: 'https://github.com/user/repo/pull/7',
+            labels: [],
+            isPr: true,
+            agent: 'chore',
+          },
+          [],
+          {
+            detectConflictEvenIfEvaluationSkipped: true,
+            relatedOpenPrUrls: null,
+          },
+        );
+
+        expect(result.rejections).toHaveLength(0);
+      });
     });
 
     describe('change-target-must: label behavior', () => {

package/src/domain/usecases/IssueRejectionEvaluator.ts

@@ -189,7 +189,16 @@ export class IssueRejectionEvaluator {
       }
     } else if (options.detectConflictEvenIfEvaluationSkipped) {
       let prsToCheck: RelatedPullRequest[];
-      if (options.relatedOpenPrUrls != null) {
+      if (issue.isPr) {
+        const resolved = await this.resolveOpenPrsForPrItem(
+          issue.url,
+          options.resolvedOpenPrByUrl ?? null,
+        );
+        if (resolved === null) {
+          return { rejections, approvedPrUrl };
+        }
+        prsToCheck = resolved;
+      } else if (options.relatedOpenPrUrls != null) {
         const resolved = await this.resolveOpenPrsFromUrls(
           options.relatedOpenPrUrls,
           options.resolvedOpenPrByUrl ?? null,

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

@@ -293,6 +293,41 @@ describe('RevertNotReadyReviewQueueIssueUseCase', () => {
       expect(mockIssueCommentRepository.createComment).not.toHaveBeenCalled();
     });
 
+    it('should keep sweeping without calling findRelatedOpenPRs when an Awaiting Quality Check item is itself a pull request', async () => {
+      const pullRequestItem = createMockPullRequest({
+        status: 'Awaiting Quality Check',
+        url: 'https://github.com/user/repo/pull/9',
+        agent: 'chore',
+      });
+      mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mockProject,
+        issues: [pullRequestItem],
+        cacheUsed: false,
+      });
+      mockIssueRepository.findRelatedOpenPRs.mockRejectedValue(
+        new Error(
+          'findRelatedOpenPRs only supports issue URLs, not pull request URLs',
+        ),
+      );
+      mockIssueRepository.getOpenPullRequest.mockResolvedValue({
+        ...createReadyPr('https://github.com/user/repo/pull/9'),
+        isConflicted: true,
+      });
+
+      await useCase.run({
+        manager: 'manager-user',
+        projectUrl: 'https://github.com/users/user/projects/1',
+        allowedIssueAuthors: ['owner'],
+      });
+
+      expect(mockIssueRepository.findRelatedOpenPRs).not.toHaveBeenCalled();
+      expect(mockIssueRepository.updateStatus).toHaveBeenCalledWith(
+        mockProject,
+        pullRequestItem,
+        'awaiting-workspace-id',
+      );
+    });
+
     it('should revert Awaiting Quality Check issue with developer agent field and no linked PR', async () => {
       const issue = createMockIssue({
         status: 'Awaiting Quality Check',

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

@@ -1 +1 @@
-{"version":3,"file":"IssueRejectionEvaluator.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/IssueRejectionEvaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EACnB,MAAM,sCAAsC,CAAC;AAG9C,MAAM,MAAM,oBAAoB,GAC5B,wBAAwB,GACxB,8BAA8B,GAC9B,uBAAuB,GACvB,yBAAyB,GACzB,kCAAkC,GAClC,+BAA+B,GAC/B,iCAAiC,GACjC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE;QAAE,IAAI,EAAE,oBAAoB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC7D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAQ5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAMpC,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAG5E,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qCAAqC,CAAC,EAAE,OAAO,CAAC;CACjD,CAAC;AAEF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,IAAI,CACpC,eAAe,EACb,oBAAoB,GACpB,oBAAoB,GACpB,gCAAgC,GAChC,iCAAiC,CACpC;IAGH,QAAQ,GACN,OAAO;QACL,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,IAAI,EAAE,OAAO,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,EACD,gCAA+B,MAAM,EAAO,EAC5C,UAAS,eAAoB,KAC5B,OAAO,CAAC,iBAAiB,CAAC,CAqJ3B;IAKF,6BAA6B,GAC3B,OAAO;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EACxE,gCAA+B,MAAM,EAAO,EAC5C,qBAAqB,MAAM,GAAG,IAAI,KACjC,OAAO,CAkBR;IAKF,OAAO,CAAC,uBAAuB,CAqB7B;IAcF,OAAO,CAAC,sBAAsB,CA8B5B;IAEF,OAAO,CAAC,4BAA4B,CAYlC;IAEF,OAAO,CAAC,mBAAmB,CAIwC;IAEnE,OAAO,CAAC,2BAA2B,CAiBjC;CACH"}
+{"version":3,"file":"IssueRejectionEvaluator.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/IssueRejectionEvaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EACnB,MAAM,sCAAsC,CAAC;AAG9C,MAAM,MAAM,oBAAoB,GAC5B,wBAAwB,GACxB,8BAA8B,GAC9B,uBAAuB,GACvB,yBAAyB,GACzB,kCAAkC,GAClC,+BAA+B,GAC/B,iCAAiC,GACjC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE;QAAE,IAAI,EAAE,oBAAoB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC7D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAQ5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAMpC,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAG5E,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qCAAqC,CAAC,EAAE,OAAO,CAAC;CACjD,CAAC;AAEF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,IAAI,CACpC,eAAe,EACb,oBAAoB,GACpB,oBAAoB,GACpB,gCAAgC,GAChC,iCAAiC,CACpC;IAGH,QAAQ,GACN,OAAO;QACL,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,IAAI,EAAE,OAAO,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,EACD,gCAA+B,MAAM,EAAO,EAC5C,UAAS,eAAoB,KAC5B,OAAO,CAAC,iBAAiB,CAAC,CA8J3B;IAKF,6BAA6B,GAC3B,OAAO;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EACxE,gCAA+B,MAAM,EAAO,EAC5C,qBAAqB,MAAM,GAAG,IAAI,KACjC,OAAO,CAkBR;IAKF,OAAO,CAAC,uBAAuB,CAqB7B;IAcF,OAAO,CAAC,sBAAsB,CA8B5B;IAEF,OAAO,CAAC,4BAA4B,CAYlC;IAEF,OAAO,CAAC,mBAAmB,CAIwC;IAEnE,OAAO,CAAC,2BAA2B,CAiBjC;CACH"}