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

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

@@ -83,6 +83,7 @@ const createPassingPr = () => ({
   url: 'https://github.com/user/repo/pull/5',
   branchName: 'i1',
   createdAt: new Date('2024-01-01T00:00:00Z'),
+  isDraft: false,
   isConflicted: false,
   isPassedAllCiJob: true,
   isCiStateSuccess: true,
@@ -193,7 +194,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
     mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
       {
         author: 'bot',
-        content: 'From: agent report',
+        content: 'From: :robot: agent report',
         createdAt: new Date(),
       },
     ]);
@@ -228,7 +229,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
     mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
       {
         author: 'bot',
-        content: 'From: agent report',
+        content: 'From: :robot: agent report',
         createdAt: new Date(),
       },
     ]);
@@ -266,7 +267,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
     mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
       {
         author: 'bot',
-        content: 'From: agent report',
+        content: 'From: :robot: agent report',
         createdAt: new Date(),
       },
     ]);
@@ -300,7 +301,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
     mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
       {
         author: 'bot',
-        content: 'From: agent report',
+        content: 'From: :robot: agent report',
         createdAt: new Date(),
       },
     ]);
@@ -334,7 +335,40 @@ describe('RevertOrphanedPreparationUseCase', () => {
       {
         author: 'bot',
         content:
-          'From: agent report\n```json\n{"nextStep": "do something"}\n```',
+          'From: :robot: agent report\n```json\n{"nextStep": "do something"}\n```',
+        createdAt: new Date(),
+      },
+    ]);
+
+    await useCase.run({
+      projectUrl: 'https://github.com/user/repo',
+      allowIssueCacheMinutes: 60,
+      preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
+    });
+
+    expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
+    expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
+  });
+
+  it('should revert orphaned issue to Awaiting Workspace when last comment is a cross-issue notification starting with From: :warning:', async () => {
+    const stuckIssue = createMockIssue({
+      url: 'https://github.com/user/repo/issues/10',
+      status: 'Preparation',
+    });
+    mockIssueRepository.getAllIssues.mockResolvedValue({
+      issues: [stuckIssue],
+      cacheUsed: false,
+    });
+    mockLocalCommandRunner.runCommand.mockResolvedValue({
+      stdout: '',
+      stderr: '',
+      exitCode: 1,
+    });
+    mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
+      {
+        author: 'bot',
+        content:
+          'From: :warning: This message is from https://github.com/user/repo/tree/i999 AI HS Implement AI Agent (claude-sonnet-4-6)',
         createdAt: new Date(),
       },
     ]);

package/src/domain/usecases/RevertOrphanedPreparationUseCase.ts

@@ -102,7 +102,7 @@ export class RevertOrphanedPreparationUseCase {
     const comments =
       await this.issueCommentRepository.getCommentsFromIssue(issue);
     const lastComment = comments[comments.length - 1];
-    if (!lastComment || !lastComment.content.startsWith('From:')) {
+    if (!lastComment || !lastComment.content.startsWith('From: :robot:')) {
       return true;
     }
     if (this.reportBodyHasNextStep(lastComment.content)) {

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

@@ -353,7 +353,7 @@ describe('SetWorkflowManagementIssueToStoryUseCase', () => {
       ]);
     });
 
-    it('should throw error when story:* label has no matching regular / ... option', async () => {
+    it('should skip issue and create one notification issue when story:* label has no matching regular / ... option', async () => {
       const issue: Issue = {
         ...mock<Issue>(),
         labels: ['story:routine-management'],
@@ -362,24 +362,88 @@ describe('SetWorkflowManagementIssueToStoryUseCase', () => {
         nextActionDate: null,
         nextActionHour: null,
         isPr: false,
+        org: 'xcare-medical',
+        repo: 'xcare-platform',
+        url: 'https://github.com/xcare-medical/xcare-platform/issues/1445',
       };
+      mockIssueRepository.searchIssue.mockResolvedValue([]);
 
-      await expect(
-        useCase.run({
-          targetDates: [targetDate],
-          project: basicProject,
-          issues: [issue],
-          cacheUsed: false,
-        }),
-      ).rejects.toThrow(
-        'No matching story found for label: story:routine-management',
+      const promise = useCase.run({
+        targetDates: [targetDate],
+        project: basicProject,
+        issues: [issue],
+        cacheUsed: false,
+      });
+      await jest.runAllTimersAsync();
+      await promise;
+
+      expect(mockIssueRepository.updateStory).not.toHaveBeenCalled();
+      expect(mockIssueRepository.removeLabel).not.toHaveBeenCalled();
+      expect(mockIssueRepository.searchIssue.mock.calls).toEqual([
+        [
+          {
+            owner: 'xcare-medical',
+            repositoryName: 'xcare-platform',
+            type: 'issue',
+            state: 'open',
+            title:
+              'TDPM: story label "story:routine-management" has no matching "regular / routine-management" Story option',
+          },
+        ],
+      ]);
+      expect(mockIssueRepository.createNewIssue).toHaveBeenCalledTimes(1);
+      const createCall = mockIssueRepository.createNewIssue.mock.calls[0];
+      expect(createCall[0]).toEqual('xcare-medical');
+      expect(createCall[1]).toEqual('xcare-platform');
+      expect(createCall[2]).toEqual(
+        'TDPM: story label "story:routine-management" has no matching "regular / routine-management" Story option',
+      );
+      expect(createCall[3]).toContain(
+        'https://github.com/xcare-medical/xcare-platform/issues/1445',
       );
+      expect(createCall[3]).toContain('story:routine-management');
+      expect(createCall[4]).toEqual(['xcare-medical']);
+      expect(createCall[5]).toEqual([]);
+    });
+
+    it('should not create a duplicate notification issue when an open one already exists', async () => {
+      const issue: Issue = {
+        ...mock<Issue>(),
+        labels: ['story:routine-management'],
+        story: null,
+        state: 'OPEN',
+        nextActionDate: null,
+        nextActionHour: null,
+        isPr: false,
+        org: 'xcare-medical',
+        repo: 'xcare-platform',
+        url: 'https://github.com/xcare-medical/xcare-platform/issues/1445',
+      };
+      mockIssueRepository.searchIssue.mockResolvedValue([
+        {
+          url: 'https://github.com/xcare-medical/xcare-platform/issues/9999',
+          title:
+            'TDPM: story label "story:routine-management" has no matching "regular / routine-management" Story option',
+          number: '9999',
+        },
+      ]);
+
+      const promise = useCase.run({
+        targetDates: [targetDate],
+        project: basicProject,
+        issues: [issue],
+        cacheUsed: false,
+      });
+      await jest.runAllTimersAsync();
+      await promise;
 
       expect(mockIssueRepository.updateStory).not.toHaveBeenCalled();
       expect(mockIssueRepository.removeLabel).not.toHaveBeenCalled();
+      expect(mockIssueRepository.searchIssue).toHaveBeenCalledTimes(1);
+      expect(mockIssueRepository.createNewIssue).not.toHaveBeenCalled();
     });
 
-    it('should not match story option that does not start with regular / ', async () => {
+    it('should skip issue and notify when story option does not start with regular / ', async () => {
       const issue: Issue = {
         ...mock<Issue>(),
         labels: ['story:workflow-board'],
@@ -388,20 +452,75 @@ describe('SetWorkflowManagementIssueToStoryUseCase', () => {
         nextActionDate: null,
         nextActionHour: null,
         isPr: false,
+        org: 'xcare-medical',
+        repo: 'xcare-platform',
+        url: 'https://github.com/xcare-medical/xcare-platform/issues/1500',
       };
+      mockIssueRepository.searchIssue.mockResolvedValue([]);
+
+      const promise = useCase.run({
+        targetDates: [targetDate],
+        project: basicProject,
+        issues: [issue],
+        cacheUsed: false,
+      });
+      await jest.runAllTimersAsync();
+      await promise;
 
-      await expect(
-        useCase.run({
-          targetDates: [targetDate],
-          project: basicProject,
-          issues: [issue],
-          cacheUsed: false,
-        }),
-      ).rejects.toThrow(
-        'No matching story found for label: story:workflow-board',
+      expect(mockIssueRepository.updateStory).not.toHaveBeenCalled();
+      expect(mockIssueRepository.removeLabel).not.toHaveBeenCalled();
+      expect(mockIssueRepository.createNewIssue).toHaveBeenCalledTimes(1);
+      expect(mockIssueRepository.createNewIssue.mock.calls[0][2]).toEqual(
+        'TDPM: story label "story:workflow-board" has no matching "regular / workflow-board" Story option',
       );
     });
 
+    it('should continue processing remaining issues after an unmatched label', async () => {
+      const unmatchedIssue: Issue = {
+        ...mock<Issue>(),
+        labels: ['story:routine-management'],
+        story: null,
+        state: 'OPEN',
+        nextActionDate: null,
+        nextActionHour: null,
+        isPr: false,
+        org: 'xcare-medical',
+        repo: 'xcare-platform',
+        url: 'https://github.com/xcare-medical/xcare-platform/issues/1445',
+      };
+      const matchedIssue: Issue = {
+        ...mock<Issue>(),
+        labels: ['story:high-priority'],
+        story: null,
+        state: 'OPEN',
+        nextActionDate: null,
+        nextActionHour: null,
+        isPr: false,
+      };
+      mockIssueRepository.searchIssue.mockResolvedValue([]);
+
+      const promise = useCase.run({
+        targetDates: [targetDate],
+        project: basicProject,
+        issues: [unmatchedIssue, matchedIssue],
+        cacheUsed: false,
+      });
+      await jest.runAllTimersAsync();
+      await promise;
+
+      expect(mockIssueRepository.createNewIssue).toHaveBeenCalledTimes(1);
+      expect(mockIssueRepository.updateStory.mock.calls).toEqual([
+        [
+          { ...basicProject, story: basicProject.story },
+          matchedIssue,
+          'highPriorityId',
+        ],
+      ]);
+      expect(mockIssueRepository.removeLabel.mock.calls).toEqual([
+        [matchedIssue, 'story:high-priority'],
+      ]);
+    });
+
     it('should skip issue that already has a story assigned', async () => {
       const issue: Issue = {
         ...mock<Issue>(),

package/src/domain/usecases/SetWorkflowManagementIssueToStoryUseCase.ts

@@ -6,7 +6,7 @@ export class SetWorkflowManagementIssueToStoryUseCase {
   constructor(
     readonly issueRepository: Pick<
       IssueRepository,
-      'updateStory' | 'removeLabel'
+      'updateStory' | 'removeLabel' | 'searchIssue' | 'createNewIssue'
     >,
   ) {}
 
@@ -103,7 +103,8 @@ export class SetWorkflowManagementIssueToStoryUseCase {
       });
 
       if (!matchingStory) {
-        throw new Error(`No matching story found for label: ${storyLabel}`);
+        await this.notifyUnmatchedStoryLabel(issue, storyLabel, labelSuffix);
+        continue;
       }
 
       await this.issueRepository.updateStory(
@@ -116,6 +117,65 @@ export class SetWorkflowManagementIssueToStoryUseCase {
     }
   };
 
+  static buildUnmatchedStoryLabelTitle = (
+    storyLabel: string,
+    labelSuffix: string,
+  ): string =>
+    `TDPM: story label "${storyLabel}" has no matching "${SetWorkflowManagementIssueToStoryUseCase.REGULAR_STORY_PREFIX}${labelSuffix}" Story option`;
+
+  private notifyUnmatchedStoryLabel = async (
+    issue: Issue,
+    storyLabel: string,
+    labelSuffix: string,
+  ): Promise<void> => {
+    const title =
+      SetWorkflowManagementIssueToStoryUseCase.buildUnmatchedStoryLabelTitle(
+        storyLabel,
+        labelSuffix,
+      );
+    const existingOpenIssues = await this.issueRepository.searchIssue({
+      owner: issue.org,
+      repositoryName: issue.repo,
+      type: 'issue',
+      state: 'open',
+      title,
+    });
+    const alreadyNotified = existingOpenIssues.some(
+      (existing) => existing.title === title,
+    );
+    if (alreadyNotified) {
+      return;
+    }
+    const body = this.buildUnmatchedStoryLabelBody(issue, storyLabel);
+    await this.issueRepository.createNewIssue(
+      issue.org,
+      issue.repo,
+      title,
+      body,
+      [issue.org],
+      [],
+    );
+  };
+
+  private buildUnmatchedStoryLabelBody = (
+    issue: Issue,
+    storyLabel: string,
+  ): string => {
+    const labelSuffix = storyLabel.slice(
+      SetWorkflowManagementIssueToStoryUseCase.STORY_LABEL_PREFIX.length,
+    );
+    return [
+      'From: :robot: SetWorkflowManagementIssueToStoryUseCase',
+      '',
+      `The issue below carries the label \`${storyLabel}\`, but the project has no matching \`${SetWorkflowManagementIssueToStoryUseCase.REGULAR_STORY_PREFIX}${labelSuffix}\` Story option.`,
+      '',
+      issue.url,
+      '',
+      `Because no matching \`${SetWorkflowManagementIssueToStoryUseCase.REGULAR_STORY_PREFIX}${labelSuffix}\` Story option exists, the label cannot be auto-converted to a Story.`,
+      'Add the missing Story option to the project, or correct the label on the issue above, to resolve this.',
+    ].join('\n');
+  };
+
   private isEligibleIssue = (issue: Issue, targetDates: Date[]): boolean => {
     const hasStoryOrWorkflowTrigger =
       issue.labels.some((label) =>