github-issue-tower-defence-management 1.148.20 → 1.148.22

package/src/domain/usecases/DailySecurityScanUseCase.ts

@@ -197,7 +197,7 @@ export class DailySecurityScanUseCase {
       return [];
     }
 
-    const scannedVulnerablePackages: ScannedVulnerablePackage[] = [];
+    const remoteUrlByRepositoryName = new Map<string, string>();
     for (const repositoryDirectory of repositoryDirectories) {
       const { stdout: remoteUrl, exitCode: remoteExitCode } =
         await this.localCommandRunner.runCommand('git', [
@@ -217,8 +217,21 @@ export class DailySecurityScanUseCase {
       if (!remoteMatch || remoteMatch[1] !== org) {
         continue;
       }
-      const repositoryOrg = remoteMatch[1];
-      const repositoryName = remoteMatch[2];
+      if (!remoteUrlByRepositoryName.has(remoteMatch[2])) {
+        remoteUrlByRepositoryName.set(remoteMatch[2], remoteUrl.trim());
+      }
+    }
+
+    const scannedVulnerablePackages: ScannedVulnerablePackage[] = [];
+    for (const [repositoryName, remoteUrl] of remoteUrlByRepositoryName) {
+      const repositoryOrg = org;
+      const checkoutDirectory = await this.checkoutDefaultBranch(
+        repositoryName,
+        remoteUrl,
+      );
+      if (checkoutDirectory === null) {
+        continue;
+      }
 
       const {
         stdout: scanOutput,
@@ -228,16 +241,20 @@ export class DailySecurityScanUseCase {
         'scan',
         'source',
         '-r',
-        repositoryDirectory,
+        checkoutDirectory,
         '--format',
         'json',
       ]);
+      await this.localCommandRunner.runCommand('rm', [
+        '-rf',
+        checkoutDirectory,
+      ]);
       if (scanExitCode === 0) {
         continue;
       }
       if (scanExitCode !== 1) {
         console.error(
-          `osv-scanner failed with exit code ${scanExitCode} for ${repositoryDirectory}: ${scanStderr}`,
+          `osv-scanner failed with exit code ${scanExitCode} for ${repositoryName}: ${scanStderr}`,
         );
         continue;
       }
@@ -278,6 +295,44 @@ export class DailySecurityScanUseCase {
     return scannedVulnerablePackages;
   };
 
+  private checkoutDefaultBranch = async (
+    repositoryName: string,
+    remoteUrl: string,
+  ): Promise<string | null> => {
+    const { stdout: checkoutDirectoryOutput, exitCode: checkoutDirectoryExit } =
+      await this.localCommandRunner.runCommand('mktemp', [
+        '-d',
+        '-t',
+        `tdpm-daily-security-scan-${repositoryName}-XXXXXX`,
+      ]);
+    const checkoutDirectory = checkoutDirectoryOutput.trim();
+    if (checkoutDirectoryExit !== 0 || checkoutDirectory.length === 0) {
+      console.error(
+        `Failed to create a checkout directory for ${repositoryName}`,
+      );
+      return null;
+    }
+    const { stderr: cloneStderr, exitCode: cloneExitCode } =
+      await this.localCommandRunner.runCommand('git', [
+        'clone',
+        '--depth',
+        '1',
+        remoteUrl,
+        checkoutDirectory,
+      ]);
+    if (cloneExitCode !== 0) {
+      console.error(
+        `Failed to clone the default branch of ${repositoryName}: ${cloneStderr}`,
+      );
+      await this.localCommandRunner.runCommand('rm', [
+        '-rf',
+        checkoutDirectory,
+      ]);
+      return null;
+    }
+    return checkoutDirectory;
+  };
+
   private reportKevAdditions = async (
     org: string,
     manager: Member['name'],

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

@@ -420,6 +420,99 @@ describe('RevertOrphanedPreparationUseCase', () => {
     expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(1);
   });
 
+  it('should advance an orphaned issue to Awaiting Quality Check when its own status comments were written after the report declaring no pull request is required', async () => {
+    const stuckIssue = createMockIssue({
+      url: 'https://github.com/user/repo/issues/10',
+      status: 'Preparation',
+    });
+    mockIssueRepository.getAllIssues.mockResolvedValue({
+      project: mockProject,
+      issues: [stuckIssue],
+      cacheUsed: false,
+    });
+    mockLocalCommandRunner.runCommand.mockResolvedValue({
+      stdout: '',
+      stderr: '',
+      exitCode: 1,
+    });
+    mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
+      {
+        author: 'agent-bot',
+        content:
+          'From: :robot: agent report\n\n```json\n{ "pullRequestRequired": false, "nextStep": null }\n```\n',
+        createdAt: new Date(),
+      },
+      {
+        author: 'agent-bot',
+        content:
+          'Auto Status Check: RETURNED_TO_AWAITING_WORKSPACE\nThe last report declared that this task needs no pull request.',
+        createdAt: new Date(),
+      },
+      {
+        author: 'agent-bot',
+        content: 'Auto Status Check: REJECTED\n- ORPHANED_PREPARATION',
+        createdAt: new Date(),
+      },
+    ]);
+    mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
+
+    await useCase.run({
+      projectUrl: 'https://github.com/user/repo',
+      preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
+      thresholdForAutoReject: 3,
+      allowedIssueAuthors: ['agent-bot'],
+    });
+
+    expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(0);
+    expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
+    expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('4');
+    expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(0);
+  });
+
+  it('should keep rejecting an orphaned issue whose own status comments follow a report that declares nothing', async () => {
+    const stuckIssue = createMockIssue({
+      url: 'https://github.com/user/repo/issues/10',
+      status: 'Preparation',
+    });
+    mockIssueRepository.getAllIssues.mockResolvedValue({
+      project: mockProject,
+      issues: [stuckIssue],
+      cacheUsed: false,
+    });
+    mockLocalCommandRunner.runCommand.mockResolvedValue({
+      stdout: '',
+      stderr: '',
+      exitCode: 1,
+    });
+    mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
+      {
+        author: 'agent-bot',
+        content: 'From: :robot: agent report of an earlier session',
+        createdAt: new Date(),
+      },
+      {
+        author: 'agent-bot',
+        content: 'Auto Status Check: REJECTED\n- ORPHANED_PREPARATION',
+        createdAt: new Date(),
+      },
+    ]);
+    mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([]);
+
+    await useCase.run({
+      projectUrl: 'https://github.com/user/repo',
+      preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
+      thresholdForAutoReject: 3,
+      allowedIssueAuthors: ['agent-bot'],
+    });
+
+    expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
+    expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
+    expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(1);
+    expect(mockIssueCommentRepository.createComment.mock.calls[0][1]).toContain(
+      'Auto Status Check: REJECTED',
+    );
+  });
+
   it('should advance orphaned issue with llm-agent label to Awaiting Quality Check without PR check', async () => {
     const stuckIssue = createMockIssue({
       url: 'https://github.com/user/repo/issues/10',

package/src/domain/usecases/RevertOrphanedPreparationUseCase.ts

@@ -15,6 +15,7 @@ import {
 } from '../entities/WorkflowStatus';
 import { resolveLabelsNotRequiringPullRequest } from './resolveLabelsNotRequiringPullRequest';
 import { isPullRequestDeclaredUnnecessary } from './isPullRequestDeclaredUnnecessary';
+import { dropTrailingAutoStatusCheckComments } from './autoStatusCheckComments';
 import { isAuthorAuthorizedForAutoStatusCheck } from './isAuthorAuthorizedForAutoStatusCheck';
 import {
   RETURNED_TO_AWAITING_WORKSPACE_MESSAGE,
@@ -186,16 +187,24 @@ export class RevertOrphanedPreparationUseCase {
     }
     const comments =
       await this.issueCommentRepository.getCommentsFromIssue(issue);
-    const lastComment = comments[comments.length - 1];
-    if (!lastComment || !lastComment.content.startsWith('From: :robot:')) {
-      return { outcome: 'reject', comments };
-    }
-    if (this.reportBodyHasNextStep(lastComment.content)) {
-      return { outcome: 'reject', comments };
-    }
     const isTrustedAuthor = (author: string): boolean =>
       isAuthorAuthorizedForAutoStatusCheck(author, allowedIssueAuthors);
-    if (isPullRequestDeclaredUnnecessary(comments, isTrustedAuthor)) {
+    const commentsBeforeOwnStatusComments = dropTrailingAutoStatusCheckComments(
+      comments,
+      isTrustedAuthor,
+    );
+    const lastReport =
+      commentsBeforeOwnStatusComments[
+        commentsBeforeOwnStatusComments.length - 1
+      ] ?? null;
+    if (
+      lastReport !== null &&
+      isPullRequestDeclaredUnnecessary(
+        commentsBeforeOwnStatusComments,
+        isTrustedAuthor,
+      ) &&
+      !this.reportBodyHasNextStep(lastReport.content)
+    ) {
       const alreadyReturnedToWorkspace = comments.some(
         (comment) =>
           isTrustedAuthor(comment.author) &&
@@ -211,6 +220,14 @@ export class RevertOrphanedPreparationUseCase {
       };
     }
 
+    const lastComment = comments[comments.length - 1];
+    if (!lastComment || !lastComment.content.startsWith('From: :robot:')) {
+      return { outcome: 'reject', comments };
+    }
+    if (this.reportBodyHasNextStep(lastComment.content)) {
+      return { outcome: 'reject', comments };
+    }
+
     const categoryLabels = issue.labels.filter((label) =>
       label.startsWith('category:'),
     );

package/src/domain/usecases/autoStatusCheckComments.ts

@@ -0,0 +1,18 @@
+export const AUTO_STATUS_CHECK_MESSAGE_HEAD = 'Auto Status Check:';
+
+export const dropTrailingAutoStatusCheckComments = <
+  T extends { author: string; content: string },
+>(
+  comments: T[],
+  isTrustedAuthor: (author: string) => boolean,
+): T[] => {
+  let endIndex = comments.length;
+  while (
+    endIndex > 0 &&
+    isTrustedAuthor(comments[endIndex - 1].author) &&
+    comments[endIndex - 1].content.startsWith(AUTO_STATUS_CHECK_MESSAGE_HEAD)
+  ) {
+    endIndex -= 1;
+  }
+  return comments.slice(0, endIndex);
+};

package/types/domain/usecases/DailySecurityScanUseCase.d.ts

@@ -20,6 +20,7 @@ export declare class DailySecurityScanUseCase {
         dailySecurityScan: DailySecurityScanConfig;
     }) => Promise<void>;
     private scanRepositories;
+    private checkoutDefaultBranch;
     private reportKevAdditions;
 }
 //# sourceMappingURL=DailySecurityScanUseCase.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DailySecurityScanUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkHF,qBAAa,wBAAwB;IAEjC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IAC/C,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD;IACD,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAL9B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD,EACQ,cAAc,EAAE,cAAc;IAGzC,GAAG,GAAU,OAAO;QAClB,WAAW,EAAE,IAAI,EAAE,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,iBAAiB,EAAE,uBAAuB,CAAC;KAC5C,KAAG,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAEF,OAAO,CAAC,gBAAgB,CA8GtB;IAEF,OAAO,CAAC,kBAAkB,CAwDxB;CACH"}
+{"version":3,"file":"DailySecurityScanUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkHF,qBAAa,wBAAwB;IAEjC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IAC/C,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD;IACD,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAL9B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD,EACQ,cAAc,EAAE,cAAc;IAGzC,GAAG,GAAU,OAAO;QAClB,WAAW,EAAE,IAAI,EAAE,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,iBAAiB,EAAE,uBAAuB,CAAC;KAC5C,KAAG,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAEF,OAAO,CAAC,gBAAgB,CA+HtB;IAEF,OAAO,CAAC,qBAAqB,CAoC3B;IAEF,OAAO,CAAC,kBAAkB,CAwDxB;CACH"}

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

@@ -1 +1 @@
-{"version":3,"file":"RevertOrphanedPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAsB7E,qBAAa,gCAAgC;IAEzC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACjB,oBAAoB,GAAG,YAAY,CACpC;IACD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CACvB;IACD,QAAQ,CAAC,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC;IACD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;gBAftC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACjB,oBAAoB,GAAG,YAAY,CACpC,EACQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CACvB,EACQ,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC,EACQ,kBAAkB,EAAE,kBAAkB;IAGjD,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B,EAAE,MAAM,CAAC;QACvC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,oBAAoB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACvC,6BAA6B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC,IAAI,CAAC,CAmHf;IAEF,OAAO,CAAC,eAAe,CAwErB;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,eAAe,CA6BrB;IAEF,OAAO,CAAC,YAAY,CA+BlB;CACH"}
+{"version":3,"file":"RevertOrphanedPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAuB7E,qBAAa,gCAAgC;IAEzC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACjB,oBAAoB,GAAG,YAAY,CACpC;IACD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CACvB;IACD,QAAQ,CAAC,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC;IACD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;gBAftC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACjB,oBAAoB,GAAG,YAAY,CACpC,EACQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CACvB,EACQ,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC,EACQ,kBAAkB,EAAE,kBAAkB;IAGjD,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B,EAAE,MAAM,CAAC;QACvC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,oBAAoB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACvC,6BAA6B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC,IAAI,CAAC,CAmHf;IAEF,OAAO,CAAC,eAAe,CAwFrB;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,eAAe,CA6BrB;IAEF,OAAO,CAAC,YAAY,CA+BlB;CACH"}

package/types/domain/usecases/autoStatusCheckComments.d.ts

@@ -0,0 +1,6 @@
+export declare const AUTO_STATUS_CHECK_MESSAGE_HEAD = "Auto Status Check:";
+export declare const dropTrailingAutoStatusCheckComments: <T extends {
+    author: string;
+    content: string;
+}>(comments: T[], isTrustedAuthor: (author: string) => boolean) => T[];
+//# sourceMappingURL=autoStatusCheckComments.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"autoStatusCheckComments.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/autoStatusCheckComments.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AAEnE,eAAO,MAAM,mCAAmC,GAC9C,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAE7C,UAAU,CAAC,EAAE,EACb,iBAAiB,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,KAC3C,CAAC,EAUH,CAAC"}