github-issue-tower-defence-management 1.146.17 → 1.146.19

package/bin/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-Cuitqkoc.js"></script>
+    <script type="module" crossorigin src="/assets/index-wljqMpcX.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CDLgAfIB.css">
   </head>
   <body>

package/package.json

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

package/src/adapter/entry-points/console/consoleOperationApi.test.ts

@@ -266,6 +266,33 @@ describe('consoleOperationApi', () => {
       expectRecordedAcrossTabs('PVTI_unnecessary');
     });
 
+    it('tells the linked issue that the unnecessary pull request must not be created again', async () => {
+      issueRepository.getIssueByUrl.mockResolvedValue({
+        ...issue,
+        url: 'https://github.com/o/r/issues/9',
+        org: 'o',
+        repo: 'r',
+        number: 9,
+        labels: ['bug'],
+      });
+      const issueCommentBody =
+        'The pull request for this issue was unnecessary and has been closed: https://github.com/o/r/pull/3\n\nDo not create it again.';
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'unnecessary',
+        prUrl: 'https://github.com/o/r/pull/3',
+        issueUrl: 'https://github.com/o/r/issues/9',
+        projectItemId: 'PVTI_unnecessary_issue_comment',
+        commentBody: 'This pull request is unnecessary.',
+        issueCommentBody,
+      });
+      expect(response.statusCode).toBe(200);
+      expect(issueRepository.createCommentByUrl).toHaveBeenCalledWith(
+        'https://github.com/o/r/issues/9',
+        issueCommentBody,
+      );
+    });
+
     it('keeps the chore label once when the unnecessary item already carries it', async () => {
       issueRepository.getIssueByUrl.mockResolvedValue({
         ...issue,

package/src/adapter/entry-points/console/consoleOperationApi.ts

@@ -260,6 +260,11 @@ export const handleReview = async (
         .resolveIssueRepository(prUrl)
         .createCommentByUrl(prUrl, body.commentBody);
     }
+    if (isNonEmptyString(body.issueCommentBody)) {
+      await context
+        .resolveIssueRepository(issueUrl)
+        .createCommentByUrl(issueUrl, body.issueCommentBody);
+    }
     const labelFailure = await addChoreLabel(
       context.resolveIssueRepository(issueUrl),
       issueUrl,

package/src/adapter/entry-points/console/ui/e2e/consoleScenario.spec.ts

@@ -50,10 +50,12 @@ test('shows CI and conflict badges in the directly opened PR detail header', asy
   const title = page.locator('.console-detail-title');
   await expect(title.getByText('CI failing')).toHaveCount(0);
 
+  await expect(title.getByText('Conflict')).toBeVisible();
+
   const statusRow = page.locator('.console-detail-pr-status-row');
   await expect(statusRow.getByText('CI failing')).toBeVisible();
   await expect(statusRow.getByText(/missing: build, test/)).toBeVisible();
-  await expect(statusRow.getByText('Conflict')).toBeVisible();
+  await expect(statusRow.getByText('Conflict')).toHaveCount(0);
   await expect(statusRow.getByText('Out of date')).toBeVisible();
 
   await page.locator('.console-detail').screenshot({

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsoleItemDetail.test.tsx

@@ -164,6 +164,52 @@ describe('ConsoleItemDetail', () => {
     expect(title?.contains(getByText('Awaiting Workspace'))).toBe(true);
   });
 
+  it('renders the merge conflict state inside the top header', () => {
+    const { getByText, container } = render(
+      <ConsoleItemDetail
+        item={prItem}
+        {...baseProps}
+        pullRequestStatus={{
+          found: true,
+          isConflicted: true,
+          mergeableStatus: 'CONFLICTING',
+          isPassedAllCiJob: true,
+          isCiStateSuccess: true,
+          isBranchOutOfDate: false,
+          missingRequiredCheckNames: [],
+        }}
+      />,
+    );
+    const title = container.querySelector('.console-detail-title');
+    if (title === null) {
+      throw new Error('the top header must render');
+    }
+    expect(title.contains(getByText('Conflict'))).toBe(true);
+  });
+
+  it('renders the absence of a merge conflict inside the top header', () => {
+    const { getByText, container } = render(
+      <ConsoleItemDetail
+        item={prItem}
+        {...baseProps}
+        pullRequestStatus={{
+          found: true,
+          isConflicted: false,
+          mergeableStatus: 'MERGEABLE',
+          isPassedAllCiJob: true,
+          isCiStateSuccess: true,
+          isBranchOutOfDate: false,
+          missingRequiredCheckNames: [],
+        }}
+      />,
+    );
+    const title = container.querySelector('.console-detail-title');
+    if (title === null) {
+      throw new Error('the top header must render');
+    }
+    expect(title.contains(getByText('No conflict'))).toBe(true);
+  });
+
   it('renders failing CI, missing checks, and conflict badges on their own row below the title', () => {
     const { getByText, container } = render(
       <ConsoleItemDetail

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsoleItemDetail.tsx

@@ -27,6 +27,7 @@ import { ConsoleCopyUrlButton } from './ConsoleCopyUrlButton';
 import type { ConsoleAddInlineComment } from './ConsoleFileDiff';
 import { ConsoleItemIcon } from './ConsoleItemIcon';
 import { ConsolePullRequestDetail } from './ConsolePullRequestDetail';
+import { ConsolePullRequestMergeableChip } from './ConsolePullRequestMergeableChip';
 import { ConsolePullRequestStatusBadges } from './ConsolePullRequestStatusBadges';
 
 export type ConsoleRelatedPullRequestView = {
@@ -159,6 +160,11 @@ export const ConsoleItemDetail = ({
             {closedStateLabel}
           </span>
         )}
+        {item.isPr && pullRequestStatus?.found && (
+          <ConsolePullRequestMergeableChip
+            mergeableStatus={pullRequestStatus.mergeableStatus}
+          />
+        )}
       </h2>
 
       {stateError !== null && (
@@ -176,7 +182,6 @@ export const ConsoleItemDetail = ({
       {item.isPr && pullRequestStatus?.found && (
         <div className="console-detail-pr-status-row">
           <ConsolePullRequestStatusBadges
-            mergeableStatus={pullRequestStatus.mergeableStatus}
             isPassedAllCiJob={pullRequestStatus.isPassedAllCiJob}
             isCiStateSuccess={pullRequestStatus.isCiStateSuccess}
             isBranchOutOfDate={pullRequestStatus.isBranchOutOfDate}

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestDetail.tsx

@@ -11,6 +11,7 @@ import { ConsoleChangedFileList } from './ConsoleChangedFileList';
 import { ConsoleCommitList } from './ConsoleCommitList';
 import { ConsoleCopyUrlButton } from './ConsoleCopyUrlButton';
 import type { ConsoleAddInlineComment } from './ConsoleFileDiff';
+import { ConsolePullRequestMergeableChip } from './ConsolePullRequestMergeableChip';
 import { ConsolePullRequestStatusBadges } from './ConsolePullRequestStatusBadges';
 
 export type ConsolePullRequestSectionProps = {
@@ -63,8 +64,10 @@ export const ConsolePullRequestDetail = ({
         {pullRequest.isDraft && (
           <span className="console-pr-section-state">draft</span>
         )}
-        <ConsolePullRequestStatusBadges
+        <ConsolePullRequestMergeableChip
           mergeableStatus={pullRequest.mergeableStatus}
+        />
+        <ConsolePullRequestStatusBadges
           isPassedAllCiJob={pullRequest.isPassedAllCiJob}
           isCiStateSuccess={pullRequest.isCiStateSuccess}
           isBranchOutOfDate={pullRequest.isBranchOutOfDate}

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestMergeableChip.stories.tsx

@@ -0,0 +1,29 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { ConsolePullRequestMergeableChip } from './ConsolePullRequestMergeableChip';
+
+const meta: Meta<typeof ConsolePullRequestMergeableChip> = {
+  title: 'Console/ConsolePullRequestMergeableChip',
+  component: ConsolePullRequestMergeableChip,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ConsolePullRequestMergeableChip>;
+
+export const Mergeable: Story = {
+  args: {
+    mergeableStatus: 'MERGEABLE',
+  },
+};
+
+export const Conflicting: Story = {
+  args: {
+    mergeableStatus: 'CONFLICTING',
+  },
+};
+
+export const CheckingMergeStatus: Story = {
+  args: {
+    mergeableStatus: 'UNKNOWN',
+  },
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestMergeableChip.test.tsx

@@ -0,0 +1,30 @@
+import { render } from '@testing-library/react';
+import { ConsolePullRequestMergeableChip } from './ConsolePullRequestMergeableChip';
+
+describe('ConsolePullRequestMergeableChip', () => {
+  it('renders the green no-conflict chip when the pull request is mergeable', () => {
+    const { getByText, queryByText } = render(
+      <ConsolePullRequestMergeableChip mergeableStatus="MERGEABLE" />,
+    );
+    expect(getByText('No conflict')).toBeInTheDocument();
+    expect(queryByText('Conflict')).toBeNull();
+    expect(queryByText('Checking merge status')).toBeNull();
+  });
+
+  it('renders the red conflict chip when the pull request is conflicting', () => {
+    const { getByText, queryByText } = render(
+      <ConsolePullRequestMergeableChip mergeableStatus="CONFLICTING" />,
+    );
+    expect(getByText('Conflict')).toBeInTheDocument();
+    expect(queryByText('No conflict')).toBeNull();
+  });
+
+  it('renders the gray checking chip when the merge status is unknown', () => {
+    const { getByText, queryByText } = render(
+      <ConsolePullRequestMergeableChip mergeableStatus="UNKNOWN" />,
+    );
+    expect(getByText('Checking merge status')).toBeInTheDocument();
+    expect(queryByText('Conflict')).toBeNull();
+    expect(queryByText('No conflict')).toBeNull();
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestMergeableChip.tsx

@@ -0,0 +1,50 @@
+import { colorFromEnum } from '../../logic/colors';
+import type { ConsoleColor, ConsoleMergeableStatus } from '../../logic/types';
+
+export type ConsolePullRequestMergeableChipProps = {
+  mergeableStatus: ConsoleMergeableStatus;
+};
+
+const MERGEABLE_BADGE: Record<
+  ConsoleMergeableStatus,
+  { color: ConsoleColor; label: string; title: string; modifier: string }
+> = {
+  MERGEABLE: {
+    color: 'GREEN',
+    label: 'No conflict',
+    title: 'This pull request has no merge conflicts',
+    modifier: 'console-detail-mergeable-chip-ok',
+  },
+  CONFLICTING: {
+    color: 'RED',
+    label: 'Conflict',
+    title: 'This pull request has merge conflicts',
+    modifier: 'console-detail-mergeable-chip-conflict',
+  },
+  UNKNOWN: {
+    color: 'GRAY',
+    label: 'Checking merge status',
+    title: 'GitHub has not finished computing the merge status yet',
+    modifier: 'console-detail-mergeable-chip-unknown',
+  },
+};
+
+export const ConsolePullRequestMergeableChip = ({
+  mergeableStatus,
+}: ConsolePullRequestMergeableChipProps) => {
+  const badge = MERGEABLE_BADGE[mergeableStatus];
+  const palette = colorFromEnum(badge.color);
+  return (
+    <span
+      className={`console-detail-status-chip console-detail-mergeable-chip ${badge.modifier}`}
+      style={{
+        color: palette.fg,
+        borderColor: palette.border,
+        backgroundColor: palette.bg,
+      }}
+      title={badge.title}
+    >
+      {badge.label}
+    </span>
+  );
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.stories.tsx

@@ -10,9 +10,8 @@ export default meta;
 
 type Story = StoryObj<typeof ConsolePullRequestStatusBadges>;
 
-export const PassingAndMergeable: Story = {
+export const Passing: Story = {
   args: {
-    mergeableStatus: 'MERGEABLE',
     isPassedAllCiJob: true,
     isCiStateSuccess: true,
     isBranchOutOfDate: false,
@@ -22,7 +21,6 @@ export const PassingAndMergeable: Story = {
 
 export const FailingWithMissingChecks: Story = {
   args: {
-    mergeableStatus: 'MERGEABLE',
     isPassedAllCiJob: false,
     isCiStateSuccess: false,
     isBranchOutOfDate: false,
@@ -30,22 +28,11 @@ export const FailingWithMissingChecks: Story = {
   },
 };
 
-export const ConflictingAndOutOfDate: Story = {
+export const FailingAndOutOfDate: Story = {
   args: {
-    mergeableStatus: 'CONFLICTING',
     isPassedAllCiJob: false,
     isCiStateSuccess: false,
     isBranchOutOfDate: true,
     missingRequiredCheckNames: ['build', 'test'],
   },
 };
-
-export const CheckingMergeStatus: Story = {
-  args: {
-    mergeableStatus: 'UNKNOWN',
-    isPassedAllCiJob: true,
-    isCiStateSuccess: true,
-    isBranchOutOfDate: false,
-    missingRequiredCheckNames: [],
-  },
-};

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.test.tsx

@@ -5,7 +5,6 @@ describe('ConsolePullRequestStatusBadges', () => {
   it('renders a passing CI badge when all CI jobs passed and the CI state is success', () => {
     const { getByText, queryByText } = render(
       <ConsolePullRequestStatusBadges
-        mergeableStatus="MERGEABLE"
         isPassedAllCiJob={true}
         isCiStateSuccess={true}
         isBranchOutOfDate={false}
@@ -19,7 +18,6 @@ describe('ConsolePullRequestStatusBadges', () => {
   it('renders a failing CI badge with missing required checks', () => {
     const { getByText } = render(
       <ConsolePullRequestStatusBadges
-        mergeableStatus="MERGEABLE"
         isPassedAllCiJob={false}
         isCiStateSuccess={true}
         isBranchOutOfDate={false}
@@ -30,54 +28,9 @@ describe('ConsolePullRequestStatusBadges', () => {
     expect(getByText(/missing: build, test/)).toBeInTheDocument();
   });
 
-  it('renders the green no-conflict badge when the pull request is mergeable', () => {
-    const { getByText, queryByText } = render(
-      <ConsolePullRequestStatusBadges
-        mergeableStatus="MERGEABLE"
-        isPassedAllCiJob={true}
-        isCiStateSuccess={true}
-        isBranchOutOfDate={false}
-        missingRequiredCheckNames={[]}
-      />,
-    );
-    expect(getByText('No conflict')).toBeInTheDocument();
-    expect(queryByText('Conflict')).toBeNull();
-    expect(queryByText('Checking merge status')).toBeNull();
-  });
-
-  it('renders the red conflict badge when the pull request is conflicting', () => {
-    const { getByText, queryByText } = render(
-      <ConsolePullRequestStatusBadges
-        mergeableStatus="CONFLICTING"
-        isPassedAllCiJob={true}
-        isCiStateSuccess={true}
-        isBranchOutOfDate={false}
-        missingRequiredCheckNames={[]}
-      />,
-    );
-    expect(getByText('Conflict')).toBeInTheDocument();
-    expect(queryByText('No conflict')).toBeNull();
-  });
-
-  it('renders the gray checking badge when the merge status is unknown', () => {
-    const { getByText, queryByText } = render(
-      <ConsolePullRequestStatusBadges
-        mergeableStatus="UNKNOWN"
-        isPassedAllCiJob={true}
-        isCiStateSuccess={true}
-        isBranchOutOfDate={false}
-        missingRequiredCheckNames={[]}
-      />,
-    );
-    expect(getByText('Checking merge status')).toBeInTheDocument();
-    expect(queryByText('Conflict')).toBeNull();
-    expect(queryByText('No conflict')).toBeNull();
-  });
-
   it('renders the out-of-date badge when the branch is behind the base branch', () => {
     const { getByText } = render(
       <ConsolePullRequestStatusBadges
-        mergeableStatus="MERGEABLE"
         isPassedAllCiJob={true}
         isCiStateSuccess={true}
         isBranchOutOfDate={true}
@@ -90,7 +43,6 @@ describe('ConsolePullRequestStatusBadges', () => {
   it('treats a successful CI state but unfinished jobs as failing', () => {
     const { getByText } = render(
       <ConsolePullRequestStatusBadges
-        mergeableStatus="MERGEABLE"
         isPassedAllCiJob={false}
         isCiStateSuccess={true}
         isBranchOutOfDate={false}

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsolePullRequestStatusBadges.tsx

@@ -1,8 +1,7 @@
 import { colorFromEnum } from '../../logic/colors';
-import type { ConsoleColor, ConsoleMergeableStatus } from '../../logic/types';
+import type { ConsoleColor } from '../../logic/types';
 
 export type ConsolePullRequestStatusBadgesProps = {
-  mergeableStatus: ConsoleMergeableStatus;
   isPassedAllCiJob: boolean;
   isCiStateSuccess: boolean;
   isBranchOutOfDate: boolean;
@@ -18,32 +17,7 @@ const badgeStyle = (color: ConsoleColor) => {
   };
 };
 
-const MERGEABLE_BADGE: Record<
-  ConsoleMergeableStatus,
-  { color: ConsoleColor; label: string; title: string; modifier: string }
-> = {
-  MERGEABLE: {
-    color: 'GREEN',
-    label: 'No conflict',
-    title: 'This pull request has no merge conflicts',
-    modifier: 'console-detail-mergeable-chip-ok',
-  },
-  CONFLICTING: {
-    color: 'RED',
-    label: 'Conflict',
-    title: 'This pull request has merge conflicts',
-    modifier: 'console-detail-mergeable-chip-conflict',
-  },
-  UNKNOWN: {
-    color: 'GRAY',
-    label: 'Checking merge status',
-    title: 'GitHub has not finished computing the merge status yet',
-    modifier: 'console-detail-mergeable-chip-unknown',
-  },
-};
-
 export const ConsolePullRequestStatusBadges = ({
-  mergeableStatus,
   isPassedAllCiJob,
   isCiStateSuccess,
   isBranchOutOfDate,
@@ -56,7 +30,6 @@ export const ConsolePullRequestStatusBadges = ({
     !ciPassing && missingRequiredCheckNames.length > 0
       ? `missing: ${missingRequiredCheckNames.join(', ')}`
       : null;
-  const mergeableBadge = MERGEABLE_BADGE[mergeableStatus];
 
   return (
     <span className="console-detail-pr-status">
@@ -73,13 +46,6 @@ export const ConsolePullRequestStatusBadges = ({
           </span>
         )}
       </span>
-      <span
-        className={`console-detail-status-chip console-detail-mergeable-chip ${mergeableBadge.modifier}`}
-        style={badgeStyle(mergeableBadge.color)}
-        title={mergeableBadge.title}
-      >
-        {mergeableBadge.label}
-      </span>
       {isBranchOutOfDate && (
         <span
           className="console-detail-status-chip console-detail-outofdate-chip"

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.test.ts

@@ -89,6 +89,21 @@ describe('useConsoleOperations', () => {
     });
   });
 
+  it('posts an unnecessary review carrying the comment the linked issue receives', async () => {
+    const fetchMock = captureFetch();
+    const { result } = setup();
+    await act(async () => {
+      await result.current.operations.reviewPullRequest(
+        prItem,
+        prItem.url,
+        'unnecessary',
+      );
+    });
+    expect(lastBody(fetchMock)).toMatchObject({
+      issueCommentBody: `The pull request for this issue was unnecessary and has been closed: ${prItem.url}\n\nDo not create it again.`,
+    });
+  });
+
   it('posts an approve review and marks the item done in the overlay', async () => {
     captureFetch();
     const { result } = setup();

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.ts

@@ -12,6 +12,7 @@ import {
 } from '../lib/consoleApi';
 import {
   buildRequestChangesBody,
+  buildUnnecessaryIssueCommentBody,
   type ConsoleCloseAction,
   type ConsoleNextActionDateAction,
   type ConsolePendingReviewComment,
@@ -119,6 +120,7 @@ const reviewRequest = (
     projectItemId: item.projectItemId,
     issueUrl: item.url,
     commentBody: UNNECESSARY_COMMENT_BODY,
+    issueCommentBody: buildUnnecessaryIssueCommentBody(prUrl),
   };
 };
 

package/src/adapter/entry-points/console/ui/src/features/console/lib/consoleApi.ts

@@ -25,6 +25,7 @@ export type ConsoleReviewRequest = {
   projectItemId: string;
   issueUrl?: string;
   commentBody?: string;
+  issueCommentBody?: string;
   changedFilePath?: string;
   line?: number;
   side?: ConsoleReviewCommentSide;

package/src/adapter/entry-points/console/ui/src/features/console/logic/operations.test.ts

@@ -1,5 +1,6 @@
 import {
   buildRequestChangesBody,
+  buildUnnecessaryIssueCommentBody,
   IN_TMUX_BY_HUMAN_NAME,
   isManualTriageTab,
   STATUS_BUTTON_NAMES,
@@ -16,6 +17,14 @@ describe('operation constants', () => {
     expect(UNNECESSARY_COMMENT_BODY).toBe('This pull request is unnecessary.');
   });
 
+  it('builds an issue comment body that names the closed pull request and forbids creating it again', () => {
+    expect(
+      buildUnnecessaryIssueCommentBody('https://github.com/o/r/pull/1'),
+    ).toBe(
+      'The pull request for this issue was unnecessary and has been closed: https://github.com/o/r/pull/1\n\nDo not create it again.',
+    );
+  });
+
   it('lists the status buttons left to right', () => {
     expect(STATUS_BUTTON_NAMES).toEqual([
       'In Tmux by agent',

package/src/adapter/entry-points/console/ui/src/features/console/logic/operations.ts

@@ -4,6 +4,9 @@ import type { ConsoleFieldOption, ConsoleTabName } from './types';
 export const TOTALLY_WRONG_COMMENT_BODY = 'totally wrong';
 export const UNNECESSARY_COMMENT_BODY = 'This pull request is unnecessary.';
 
+export const buildUnnecessaryIssueCommentBody = (prUrl: string): string =>
+  `The pull request for this issue was unnecessary and has been closed: ${prUrl}\n\nDo not create it again.`;
+
 export type ConsolePendingReviewComment = {
   path: string;
   line: number;