github-issue-tower-defence-management 1.180.0 → 1.181.0

package/bin/domain/usecases/isPullRequestDeclaredUnnecessary.js

@@ -1,32 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPullRequestDeclaredUnnecessary = void 0;
-const agentReportPrefix_1 = require("./agentReportPrefix");
-const normalizeReportBody_1 = require("./normalizeReportBody");
+const extractFencedJsonBlocks_1 = require("./extractFencedJsonBlocks");
+const isAgentReportBody_1 = require("./isAgentReportBody");
 const isPullRequestDeclaredUnnecessary = (comments, isTrustedAuthor) => {
     const lastComment = comments[comments.length - 1];
     if (!lastComment ||
         !isTrustedAuthor(lastComment.author) ||
-        !lastComment.content.startsWith(agentReportPrefix_1.AGENT_REPORT_PREFIX)) {
+        !(0, isAgentReportBody_1.isAgentReportBody)(lastComment.content)) {
         return false;
     }
-    const reportMatch = (0, normalizeReportBody_1.normalizeReportBody)(lastComment.content).match(/```json\n([\s\S]*?)\n```/);
-    if (!reportMatch || reportMatch.length < 2) {
-        return false;
-    }
-    let reportJson;
-    try {
-        reportJson = JSON.parse(reportMatch[1]);
-    }
-    catch (error) {
-        console.warn('Invalid JSON in report body while checking pullRequestRequired:', error);
-        return false;
-    }
-    if (typeof reportJson !== 'object' || reportJson === null) {
-        return false;
+    for (const block of (0, extractFencedJsonBlocks_1.extractFencedJsonBlocks)(lastComment.content, 'pullRequestRequired')) {
+        if (typeof block !== 'object' || block === null) {
+            continue;
+        }
+        const report = { ...block };
+        if (report.pullRequestRequired === false) {
+            return true;
+        }
     }
-    const report = { ...reportJson };
-    return report.pullRequestRequired === false;
+    return false;
 };
 exports.isPullRequestDeclaredUnnecessary = isPullRequestDeclaredUnnecessary;
 //# sourceMappingURL=isPullRequestDeclaredUnnecessary.js.map

package/bin/domain/usecases/isPullRequestDeclaredUnnecessary.js.map

@@ -1 +1 @@
-{"version":3,"file":"isPullRequestDeclaredUnnecessary.js","sourceRoot":"","sources":["../../../src/domain/usecases/isPullRequestDeclaredUnnecessary.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAC1D,+DAA4D;AAErD,MAAM,gCAAgC,GAAG,CAC9C,QAA+C,EAC/C,eAA4C,EACnC,EAAE;IACX,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClD,IACE,CAAC,WAAW;QACZ,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC;QACpC,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,uCAAmB,CAAC,EACpD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,WAAW,GAAG,IAAA,yCAAmB,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,CAChE,0BAA0B,CAC3B,CAAC;IACF,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,UAAmB,CAAC;IACxB,IAAI,CAAC;QACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,iEAAiE,EACjE,KAAK,CACN,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAA4B,EAAE,GAAG,UAAU,EAAE,CAAC;IAC1D,OAAO,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC;AAC9C,CAAC,CAAC;AAjCW,QAAA,gCAAgC,oCAiC3C"}
+{"version":3,"file":"isPullRequestDeclaredUnnecessary.js","sourceRoot":"","sources":["../../../src/domain/usecases/isPullRequestDeclaredUnnecessary.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AACpE,2DAAwD;AAEjD,MAAM,gCAAgC,GAAG,CAC9C,QAA+C,EAC/C,eAA4C,EACnC,EAAE;IACX,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClD,IACE,CAAC,WAAW;QACZ,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC;QACpC,CAAC,IAAA,qCAAiB,EAAC,WAAW,CAAC,OAAO,CAAC,EACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAA,iDAAuB,EACzC,WAAW,CAAC,OAAO,EACnB,qBAAqB,CACtB,EAAE,CAAC;QACF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAChD,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAA4B,EAAE,GAAG,KAAK,EAAE,CAAC;QACrD,IAAI,MAAM,CAAC,mBAAmB,KAAK,KAAK,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAzBW,QAAA,gCAAgC,oCAyB3C"}

package/package.json

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

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

@@ -112,7 +112,7 @@ test('renders the Workflow Blocker tab leftmost and shows its detail operations'
   ).click();
 
   await expect(
-    page.locator('.console-op-button', { hasText: 'Awaiting Workspace' }),
+    page.locator('.console-op-button', { hasText: /^Awaiting Workspace$/ }),
   ).toBeVisible();
   await expect(
     page.locator('.console-op-button', { hasText: 'Close as not planned' }),

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

@@ -20,6 +20,7 @@ const noopOperationHandlers: ConsoleOperationHandlers = {
   onSetStatus: () => {},
   onSetInTmuxByHuman: () => {},
   onClose: () => {},
+  onOkAndAwaitingWorkspace: () => {},
 };
 
 const richMarkdownBody = [

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOkAndAwaitingWorkspaceActions.stories.tsx

@@ -0,0 +1,25 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { consoleStatusOptionsFixture } from '../../testing/fixtures';
+import { ConsoleOkAndAwaitingWorkspaceActions } from './ConsoleOkAndAwaitingWorkspaceActions';
+
+const meta: Meta<typeof ConsoleOkAndAwaitingWorkspaceActions> = {
+  title: 'Console/ConsoleOkAndAwaitingWorkspaceActions',
+  component: ConsoleOkAndAwaitingWorkspaceActions,
+  args: { onOkAndAwaitingWorkspace: () => {} },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ConsoleOkAndAwaitingWorkspaceActions>;
+
+export const WithAwaitingWorkspaceOption: Story = {
+  args: { statusOptions: consoleStatusOptionsFixture },
+};
+
+export const WithoutAwaitingWorkspaceOption: Story = {
+  args: {
+    statusOptions: consoleStatusOptionsFixture.filter(
+      (o) => o.name.toLowerCase() !== 'awaiting workspace',
+    ),
+  },
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOkAndAwaitingWorkspaceActions.test.tsx

@@ -0,0 +1,50 @@
+import { fireEvent, render } from '@testing-library/react';
+import { consoleStatusOptionsFixture } from '../../testing/fixtures';
+import { ConsoleOkAndAwaitingWorkspaceActions } from './ConsoleOkAndAwaitingWorkspaceActions';
+
+const [awaitingWorkspaceOption] = consoleStatusOptionsFixture.filter(
+  (o) => o.name.toLowerCase() === 'awaiting workspace',
+);
+
+const statusOptionsWithoutAwaitingWorkspace =
+  consoleStatusOptionsFixture.filter(
+    (o) => o.name.toLowerCase() !== 'awaiting workspace',
+  );
+
+describe('ConsoleOkAndAwaitingWorkspaceActions', () => {
+  it('renders the button when the awaiting workspace option is present', () => {
+    const { getByRole } = render(
+      <ConsoleOkAndAwaitingWorkspaceActions
+        statusOptions={consoleStatusOptionsFixture}
+        onOkAndAwaitingWorkspace={() => {}}
+      />,
+    );
+    expect(
+      getByRole('button', { name: 'ok & Awaiting Workspace' }),
+    ).toBeInTheDocument();
+  });
+
+  it('returns null when the awaiting workspace option is absent', () => {
+    const { container } = render(
+      <ConsoleOkAndAwaitingWorkspaceActions
+        statusOptions={statusOptionsWithoutAwaitingWorkspace}
+        onOkAndAwaitingWorkspace={() => {}}
+      />,
+    );
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('calls the callback with the awaiting workspace option on click', () => {
+    const onOkAndAwaitingWorkspace = jest.fn();
+    const { getByRole } = render(
+      <ConsoleOkAndAwaitingWorkspaceActions
+        statusOptions={consoleStatusOptionsFixture}
+        onOkAndAwaitingWorkspace={onOkAndAwaitingWorkspace}
+      />,
+    );
+    fireEvent.click(getByRole('button', { name: 'ok & Awaiting Workspace' }));
+    expect(onOkAndAwaitingWorkspace).toHaveBeenCalledWith(
+      awaitingWorkspaceOption,
+    );
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOkAndAwaitingWorkspaceActions.tsx

@@ -0,0 +1,41 @@
+import { colorFromEnum } from '../../logic/colors';
+import type { ConsoleFieldOption } from '../../logic/types';
+
+export type ConsoleOkAndAwaitingWorkspaceActionsProps = {
+  statusOptions: ConsoleFieldOption[];
+  onOkAndAwaitingWorkspace: (option: ConsoleFieldOption) => void;
+};
+
+const AWAITING_WORKSPACE_NAME = 'awaiting workspace';
+
+export const ConsoleOkAndAwaitingWorkspaceActions = ({
+  statusOptions,
+  onOkAndAwaitingWorkspace,
+}: ConsoleOkAndAwaitingWorkspaceActionsProps) => {
+  const option = statusOptions.find(
+    (o) => o.name.toLowerCase() === AWAITING_WORKSPACE_NAME,
+  );
+
+  if (option === undefined) {
+    return null;
+  }
+
+  const palette = colorFromEnum(option.color);
+
+  return (
+    <div className="console-op-group">
+      <button
+        type="button"
+        className="console-op-button"
+        style={{
+          color: palette.fg,
+          borderColor: palette.border,
+          backgroundColor: palette.bg,
+        }}
+        onClick={() => onOkAndAwaitingWorkspace(option)}
+      >
+        ok &amp; Awaiting Workspace
+      </button>
+    </div>
+  );
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOperationMenu.stories.tsx

@@ -14,6 +14,7 @@ const handlers: ConsoleOperationHandlers = {
   onSetStatus: () => {},
   onSetInTmuxByHuman: () => {},
   onClose: () => {},
+  onOkAndAwaitingWorkspace: () => {},
 };
 
 const meta: Meta<typeof ConsoleOperationMenu> = {

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOperationMenu.test.tsx

@@ -14,6 +14,7 @@ const handlers: ConsoleOperationHandlers = {
   onSetStatus: jest.fn(),
   onSetInTmuxByHuman: jest.fn(),
   onClose: jest.fn(),
+  onOkAndAwaitingWorkspace: jest.fn(),
 };
 
 const prItem = consoleListItemsFixture[0];

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOperationMenu.tsx

@@ -9,6 +9,7 @@ import type {
 } from '../../logic/types';
 import { ConsoleCloseActions } from './ConsoleCloseActions';
 import { ConsoleNextActionDateActions } from './ConsoleNextActionDateActions';
+import { ConsoleOkAndAwaitingWorkspaceActions } from './ConsoleOkAndAwaitingWorkspaceActions';
 import { ConsolePullRequestReviewActions } from './ConsolePullRequestReviewActions';
 import { ConsoleStatusActions } from './ConsoleStatusActions';
 import { ConsoleStoryActions } from './ConsoleStoryActions';
@@ -34,6 +35,10 @@ export const ConsoleOperationMenu = ({
   const showStory = tab === 'triage';
   return (
     <div className="console-operation-bar">
+      <ConsoleOkAndAwaitingWorkspaceActions
+        statusOptions={statusOptions}
+        onOkAndAwaitingWorkspace={handlers.onOkAndAwaitingWorkspace}
+      />
       {hasPullRequest && (
         <ConsolePullRequestReviewActions
           onReview={handlers.onReview}

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

@@ -415,4 +415,74 @@ describe('useConsoleOperations', () => {
     ).rejects.toThrow('No project specified in the URL path.');
     expect(fetchMock).not.toHaveBeenCalled();
   });
+
+  it('posts an ok comment then sets status to awaiting workspace in order', async () => {
+    let callCount = 0;
+    const calls: Array<[string, unknown]> = [];
+    global.fetch = jest.fn(async (url: unknown, opts: unknown) => {
+      calls.push([url as string, opts]);
+      callCount += 1;
+      if (callCount === 1) {
+        return {
+          ok: true,
+          status: 200,
+          json: async () => ({
+            comment: {
+              author: 'bot',
+              body: 'ok',
+              createdAt: '2026-01-01T00:00:00Z',
+            },
+          }),
+        };
+      }
+      return { ok: true, status: 200, json: async () => ({ ok: true }) };
+    }) as unknown as typeof fetch;
+    const { result } = setup();
+    const [option] = consoleStatusOptionsFixture.filter(
+      (o) => o.name.toLowerCase() === 'awaiting workspace',
+    );
+    await act(async () => {
+      await result.current.operations.okAndMoveToAwaitingWorkspace(
+        issueItem,
+        option,
+      );
+    });
+    expect(calls[0][0]).toBe('/api/comment');
+    expect(JSON.parse((calls[0][1] as { body: string }).body)).toMatchObject({
+      pjcode: 'acme',
+      url: issueItem.url,
+      body: 'ok',
+    });
+    expect(calls[1][0]).toBe('/api/triage');
+    expect(JSON.parse((calls[1][1] as { body: string }).body)).toMatchObject({
+      pjcode: 'acme',
+      action: 'set_status',
+      issueUrl: issueItem.url,
+      statusName: option.name,
+    });
+  });
+
+  it('does not call the status endpoint when the comment post fails', async () => {
+    let callCount = 0;
+    global.fetch = jest.fn(async () => {
+      callCount += 1;
+      if (callCount === 1) {
+        return { ok: false, status: 500, text: async () => 'error' };
+      }
+      return { ok: true, status: 200, json: async () => ({ ok: true }) };
+    }) as unknown as typeof fetch;
+    const { result } = setup();
+    const [option] = consoleStatusOptionsFixture.filter(
+      (o) => o.name.toLowerCase() === 'awaiting workspace',
+    );
+    await expect(
+      act(async () => {
+        await result.current.operations.okAndMoveToAwaitingWorkspace(
+          issueItem,
+          option,
+        );
+      }),
+    ).rejects.toThrow();
+    expect(callCount).toBe(1);
+  });
 });

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

@@ -61,6 +61,10 @@ export type ConsoleOperationsApi = {
     item: ConsoleListItem,
     action: ConsoleCloseAction,
   ) => Promise<void>;
+  okAndMoveToAwaitingWorkspace: (
+    item: ConsoleListItem,
+    option: ConsoleFieldOption,
+  ) => Promise<void>;
   addComment: (item: ConsoleListItem, body: string) => Promise<ConsoleComment>;
   uploadAttachment: (item: ConsoleListItem, file: File) => Promise<string>;
   addInlineReviewComment: (
@@ -276,6 +280,30 @@ export const useConsoleOperations = (
     [pjcode, markDone],
   );
 
+  const okAndMoveToAwaitingWorkspace = useCallback(
+    async (item: ConsoleListItem, option: ConsoleFieldOption) => {
+      if (pjcode === null) {
+        throw missingPjcodeError();
+      }
+      await postConsoleComment({ pjcode, url: item.url, body: 'ok' });
+      const request: ConsoleTriageRequest = {
+        pjcode,
+        action: 'set_status',
+        issueUrl: item.url,
+        projectItemId: item.projectItemId,
+        statusName: option.name,
+      };
+      await postConsoleOperation(TRIAGE_OPERATION_PATH, request);
+      invalidateItemContent(item);
+      patchOverlay(
+        overlayKeyForItem(item),
+        { done: true, status: { name: option.name, color: option.color } },
+        mode,
+      );
+    },
+    [pjcode, invalidateItemContent, patchOverlay, mode],
+  );
+
   const addComment = useCallback(
     async (item: ConsoleListItem, body: string) => {
       if (pjcode === null) {
@@ -340,6 +368,7 @@ export const useConsoleOperations = (
     setStatus,
     setInTmuxByHuman,
     closeIssue,
+    okAndMoveToAwaitingWorkspace,
     addComment,
     uploadAttachment,
     addInlineReviewComment,

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

@@ -127,6 +127,17 @@ describe('actionToastColor', () => {
       actionToastColor({ type: 'next_action_date', action: 'snooze_1day' }),
     ).toBe('amber');
     expect(actionToastColor({ type: 'close', action: 'close' })).toBe('red');
+    expect(actionToastColor({ type: 'ok_and_awaiting_workspace' })).toBe(
+      'blue',
+    );
+  });
+});
+
+describe('actionToastMessage for ok_and_awaiting_workspace', () => {
+  it('returns the composite label', () => {
+    expect(
+      actionToastMessage({ type: 'ok_and_awaiting_workspace' }, 'prs'),
+    ).toBe('ok → Awaiting Workspace');
   });
 });
 
@@ -138,6 +149,9 @@ describe('actionAdvances', () => {
     expect(actionAdvances({ type: 'set_status', optionName: 'x' }, 'prs')).toBe(
       true,
     );
+    expect(actionAdvances({ type: 'ok_and_awaiting_workspace' }, 'prs')).toBe(
+      true,
+    );
   });
 
   it('does not advance a snooze except on the manual triage tabs', () => {

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

@@ -20,7 +20,8 @@ export type ConsoleActionKind =
   | { type: 'set_story'; optionName: string }
   | { type: 'set_status'; optionName: string }
   | { type: 'set_in_tmux_by_human'; optionName: string }
-  | { type: 'close'; action: ConsoleCloseAction };
+  | { type: 'close'; action: ConsoleCloseAction }
+  | { type: 'ok_and_awaiting_workspace' };
 
 export const ACTION_TOAST_DELAY_MS = 5000;
 
@@ -56,6 +57,8 @@ export const actionToastMessage = (
       return `Status → ${kind.optionName}`;
     case 'set_in_tmux_by_human':
       return 'Added to In Tmux by human';
+    case 'ok_and_awaiting_workspace':
+      return 'ok → Awaiting Workspace';
     case 'close':
       return kind.action === 'close' ? 'Closed' : 'Closed as not planned';
   }
@@ -81,6 +84,7 @@ export const actionToastColor = (
     case 'set_story':
     case 'set_status':
     case 'set_in_tmux_by_human':
+    case 'ok_and_awaiting_workspace':
       return 'blue';
     case 'close':
       return 'red';

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

@@ -38,6 +38,7 @@ export type ConsoleOperationHandlers = {
   onSetStatus: (option: ConsoleFieldOption) => void;
   onSetInTmuxByHuman: (option: ConsoleFieldOption) => void;
   onClose: (action: ConsoleCloseAction) => void;
+  onOkAndAwaitingWorkspace: (option: ConsoleFieldOption) => void;
 };
 
 export const STATUS_BUTTON_NAMES: string[] = [

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.test.tsx

@@ -74,6 +74,7 @@ const buildOperations = (): ConsoleOperationsApi => ({
   setStatus: jest.fn(async () => {}),
   setInTmuxByHuman: jest.fn(async () => {}),
   closeIssue: jest.fn(async () => {}),
+  okAndMoveToAwaitingWorkspace: jest.fn(async () => {}),
   addComment: jest.fn(async () => ({
     author: 'HiromiShikata',
     body: 'comment body',

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.tsx

@@ -150,6 +150,13 @@ export const ConsoleItemDetailContainer = ({
         commit: () => operations.closeIssue(item, action),
       });
     },
+    onOkAndAwaitingWorkspace: (option: ConsoleFieldOption) => {
+      onQueueAction({
+        kind: { type: 'ok_and_awaiting_workspace' },
+        item,
+        commit: () => operations.okAndMoveToAwaitingWorkspace(item, option),
+      });
+    },
   };
 
   const resolvedStoryName =