github-issue-tower-defence-management 1.190.0 → 1.192.0

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

@@ -329,6 +329,88 @@ describe('ConsoleCommentComposer', () => {
     });
   });
 
+  it('renders only the Comment button when onSubmitAndMoveToAwaitingWorkspace is not provided', () => {
+    const { queryByText, getByText } = render(
+      <ConsoleCommentComposer initiallyOpen onSubmit={stubSubmit} />,
+    );
+    expect(getByText('Comment')).toBeInTheDocument();
+    expect(queryByText('Comment & Awaiting Workspace')).toBeNull();
+  });
+
+  it('renders both Comment and Comment & Awaiting Workspace buttons when onSubmitAndMoveToAwaitingWorkspace is provided', () => {
+    const { getByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={stubSubmit}
+        onSubmitAndMoveToAwaitingWorkspace={stubSubmit}
+      />,
+    );
+    expect(getByText('Comment')).toBeInTheDocument();
+    expect(getByText('Comment & Awaiting Workspace')).toBeInTheDocument();
+  });
+
+  it('calls onSubmit and clears draft when the left Comment button is clicked', async () => {
+    const onSubmit = jest.fn(stubSubmit);
+    const onSubmitAndMoveToAwaitingWorkspace = jest.fn(stubSubmit);
+    const { getByPlaceholderText, getByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={onSubmit}
+        onSubmitAndMoveToAwaitingWorkspace={onSubmitAndMoveToAwaitingWorkspace}
+      />,
+    );
+    fireEvent.change(getByPlaceholderText('Leave a comment…'), {
+      target: { value: 'Left button comment.' },
+    });
+    fireEvent.click(getByText('Comment'));
+    await waitFor(() => {
+      expect(getByPlaceholderText('Leave a comment…')).toHaveValue('');
+    });
+    expect(onSubmit).toHaveBeenCalledWith('Left button comment.');
+    expect(onSubmitAndMoveToAwaitingWorkspace).not.toHaveBeenCalled();
+  });
+
+  it('calls onSubmitAndMoveToAwaitingWorkspace and clears draft when the right button is clicked', async () => {
+    const onSubmit = jest.fn(stubSubmit);
+    const onSubmitAndMoveToAwaitingWorkspace = jest.fn(stubSubmit);
+    const { getByPlaceholderText, getByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={onSubmit}
+        onSubmitAndMoveToAwaitingWorkspace={onSubmitAndMoveToAwaitingWorkspace}
+      />,
+    );
+    fireEvent.change(getByPlaceholderText('Leave a comment…'), {
+      target: { value: 'Right button comment.' },
+    });
+    fireEvent.click(getByText('Comment & Awaiting Workspace'));
+    await waitFor(() => {
+      expect(getByPlaceholderText('Leave a comment…')).toHaveValue('');
+    });
+    expect(onSubmitAndMoveToAwaitingWorkspace).toHaveBeenCalledWith(
+      'Right button comment.',
+    );
+    expect(onSubmit).not.toHaveBeenCalled();
+  });
+
+  it('shows an error message when the right button click results in an error', async () => {
+    const { getByPlaceholderText, getByText, findByRole } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={stubSubmit}
+        onSubmitAndMoveToAwaitingWorkspace={async () => {
+          throw new Error('move failed');
+        }}
+      />,
+    );
+    fireEvent.change(getByPlaceholderText('Leave a comment…'), {
+      target: { value: 'Will fail to move.' },
+    });
+    fireEvent.click(getByText('Comment & Awaiting Workspace'));
+    const alert = await findByRole('alert');
+    expect(alert.textContent).toContain('move failed');
+  });
+
   it('shows the upload failure reason when the upload rejects', async () => {
     const { getByLabelText, findByRole } = render(
       <ConsoleCommentComposer

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

@@ -6,6 +6,9 @@ export type ConsoleCommentComposerProps = {
   initialDraft?: string;
   onSubmit: (body: string) => Promise<ConsoleComment>;
   onDraftChange?: (draft: string) => void;
+  onSubmitAndMoveToAwaitingWorkspace?: (
+    body: string,
+  ) => Promise<ConsoleComment>;
   onUploadFile?: (file: File) => Promise<string>;
 };
 
@@ -78,6 +81,7 @@ export const ConsoleCommentComposer = ({
   initialDraft,
   onSubmit,
   onDraftChange,
+  onSubmitAndMoveToAwaitingWorkspace,
   onUploadFile,
 }: ConsoleCommentComposerProps) => {
   const [open, setOpen] = useState<boolean>(initiallyOpen);
@@ -91,14 +95,18 @@ export const ConsoleCommentComposer = ({
   });
   const fileInputRef = useRef<HTMLInputElement | null>(null);
 
-  const submit = async (): Promise<void> => {
+  const submit = async (withMove: boolean): Promise<void> => {
     const body = draft.trim();
     if (body.length === 0 || status.kind === 'posting') {
       return;
     }
     setStatus({ kind: 'posting' });
     try {
-      await onSubmit(body);
+      if (withMove && onSubmitAndMoveToAwaitingWorkspace !== undefined) {
+        await onSubmitAndMoveToAwaitingWorkspace(body);
+      } else {
+        await onSubmit(body);
+      }
       setDraft('');
       setStatus({ kind: 'idle' });
     } catch (error) {
@@ -231,11 +239,23 @@ export const ConsoleCommentComposer = ({
               className="console-composer-submit"
               disabled={status.kind === 'posting'}
               onClick={() => {
-                void submit();
+                void submit(false);
               }}
             >
               Comment
             </button>
+            {onSubmitAndMoveToAwaitingWorkspace !== undefined && (
+              <button
+                type="button"
+                className="console-composer-submit"
+                disabled={status.kind === 'posting'}
+                onClick={() => {
+                  void submit(true);
+                }}
+              >
+                Comment & Awaiting Workspace
+              </button>
+            )}
           </div>
         </div>
       )}

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

@@ -41,15 +41,16 @@ export type ConsoleOperationHandlers = {
   onOkAndAwaitingWorkspace: (option: ConsoleFieldOption) => void;
 };
 
+export const IN_TMUX_BY_HUMAN_NAME = 'In Tmux by human';
+export const AWAITING_WORKSPACE_NAME = 'Awaiting Workspace';
+
 export const STATUS_BUTTON_NAMES: string[] = [
   'In Tmux by agent',
   'In Tmux by human',
   'Todo by human',
   'Todo by agent',
-  'Awaiting Workspace',
+  AWAITING_WORKSPACE_NAME,
 ];
 
-export const IN_TMUX_BY_HUMAN_NAME = 'In Tmux by human';
-
 export const isManualTriageTab = (tab: ConsoleTabName): boolean =>
   tab === 'todo-by-human' || tab === 'todo-by-agent';

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

@@ -2,6 +2,7 @@ import { fireEvent, render, waitFor } from '@testing-library/react';
 import type { ConsoleCaches } from '../hooks/useConsoleCaches';
 import type { ConsoleOperationsApi } from '../hooks/useConsoleOperations';
 import { ResourceCache } from '../lib/resourceCache';
+import { AWAITING_WORKSPACE_NAME } from '../logic/operations';
 import type {
   ConsoleChangedFile,
   ConsoleRelatedPullRequest,
@@ -405,6 +406,84 @@ describe('ConsoleItemDetailContainer', () => {
     ]);
   });
 
+  it('passes onSubmitAndMoveToAwaitingWorkspace to the composer when statusOptions includes Awaiting Workspace', () => {
+    const { getByText } = render(
+      <ConsoleItemDetailContainer
+        tab="todo-by-human"
+        item={issueItem}
+        caches={buildCaches()}
+        operations={buildOperations()}
+        statusOptions={consoleStatusOptionsFixture}
+        storyOptions={consoleStoryOptionsFixture}
+        storyColors={consoleStoryColorsFixture}
+        storyName="TDPM Console port"
+        overlayStatus={null}
+        now={Date.parse('2026-06-19T12:00:00.000Z')}
+        onQueueAction={jest.fn()}
+      />,
+    );
+    expect(getByText('Comment & Awaiting Workspace')).toBeInTheDocument();
+  });
+
+  it('does not pass onSubmitAndMoveToAwaitingWorkspace to the composer when statusOptions does not include Awaiting Workspace', () => {
+    const statusOptionsWithoutAwaitingWorkspace =
+      consoleStatusOptionsFixture.filter(
+        (o) => o.name !== AWAITING_WORKSPACE_NAME,
+      );
+    const { queryByText } = render(
+      <ConsoleItemDetailContainer
+        tab="todo-by-human"
+        item={issueItem}
+        caches={buildCaches()}
+        operations={buildOperations()}
+        statusOptions={statusOptionsWithoutAwaitingWorkspace}
+        storyOptions={consoleStoryOptionsFixture}
+        storyColors={consoleStoryColorsFixture}
+        storyName="TDPM Console port"
+        overlayStatus={null}
+        now={Date.parse('2026-06-19T12:00:00.000Z')}
+        onQueueAction={jest.fn()}
+      />,
+    );
+    expect(queryByText('Comment & Awaiting Workspace')).toBeNull();
+  });
+
+  it('clicking Comment & Awaiting Workspace calls addComment and queues a set_status action for the Awaiting Workspace option', async () => {
+    const operations = buildOperations();
+    const onQueueAction = jest.fn();
+    const { getByPlaceholderText, getByText } = render(
+      <ConsoleItemDetailContainer
+        tab="todo-by-human"
+        item={issueItem}
+        caches={buildCaches()}
+        operations={operations}
+        statusOptions={consoleStatusOptionsFixture}
+        storyOptions={consoleStoryOptionsFixture}
+        storyColors={consoleStoryColorsFixture}
+        storyName="TDPM Console port"
+        overlayStatus={null}
+        now={Date.parse('2026-06-19T12:00:00.000Z')}
+        onQueueAction={onQueueAction}
+      />,
+    );
+    fireEvent.change(getByPlaceholderText('Leave a comment…'), {
+      target: { value: 'test comment body' },
+    });
+    fireEvent.click(getByText('Comment & Awaiting Workspace'));
+    await waitFor(() => {
+      expect(operations.addComment).toHaveBeenCalledWith(
+        issueItem,
+        'test comment body',
+      );
+    });
+    expect(onQueueAction).toHaveBeenCalledWith(
+      expect.objectContaining({
+        kind: { type: 'set_status', optionName: AWAITING_WORKSPACE_NAME },
+        item: issueItem,
+      }),
+    );
+  });
+
   it('collects an inline comment on an issue related pull request diff, enables Reject, and submits it as the request-changes review for that pull request url', async () => {
     const operations = buildOperations();
     const onQueueAction = jest.fn();

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

@@ -9,9 +9,10 @@ import type { ConsoleOperationsApi } from '../hooks/useConsoleOperations';
 import { buildImageProxyUrl } from '../lib/imageProxy';
 import type { ConsoleActionKind } from '../logic/actionToast';
 import { resolveStoryColorEnum } from '../logic/grouping';
-import type {
-  ConsoleOperationHandlers,
-  ConsolePendingReviewComment,
+import {
+  AWAITING_WORKSPACE_NAME,
+  type ConsoleOperationHandlers,
+  type ConsolePendingReviewComment,
 } from '../logic/operations';
 import { mergePostedComments } from '../logic/postedComments';
 import type {
@@ -163,6 +164,18 @@ export const ConsoleItemDetailContainer = ({
     },
   };
 
+  const awaitingWorkspaceOption =
+    statusOptions.find((o) => o.name === AWAITING_WORKSPACE_NAME) ?? null;
+
+  const addCommentAndMoveToAwaitingWorkspace =
+    awaitingWorkspaceOption !== null
+      ? async (body: string): Promise<ConsoleComment> => {
+          const comment = await addComment(body);
+          handlers.onSetStatus(awaitingWorkspaceOption);
+          return comment;
+        }
+      : undefined;
+
   const resolvedStoryName =
     storyName ?? (item.story.trim() !== '' ? item.story : null);
   const storyColorEnum: ConsoleColor | null =
@@ -205,6 +218,9 @@ export const ConsoleItemDetailContainer = ({
           initialDraft={initialCommentDraft}
           onSubmit={addComment}
           onDraftChange={onCommentDraftChange}
+          onSubmitAndMoveToAwaitingWorkspace={
+            addCommentAndMoveToAwaitingWorkspace
+          }
           onUploadFile={(file) => operations.uploadAttachment(item, file)}
         />
       }