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

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-I_2Yu8fM.js"></script>
+    <script type="module" crossorigin src="/assets/index-BUFcVUVD.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DeZcPNCr.css">
   </head>
   <body>

package/bin/adapter/repositories/GoogleSpreadsheetRepository.js

@@ -9,9 +9,37 @@ const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
 class GoogleSpreadsheetRepository {
     constructor(localStorageRepository, serviceAccountKey = process.env.GOOGLE_SERVICE_ACCOUNT_KEY ||
-        'dummy', sheetsClientFactory) {
+        'dummy', sheetsClientFactory, sleepFn = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
         this.localStorageRepository = localStorageRepository;
         this.keyFile = './tmp/service-account-key.json';
+        this.callWithRetry = async (fn) => {
+            const backoffMs = [1000, 2000, 4000];
+            let lastError;
+            for (let attempt = 0; attempt <= backoffMs.length; attempt++) {
+                try {
+                    return await fn();
+                }
+                catch (error) {
+                    lastError = error;
+                    const isQuotaError = (() => {
+                        if (!(error instanceof Error))
+                            return false;
+                        if (error.message.includes('Quota exceeded'))
+                            return true;
+                        if ('status' in error && error.status === 429)
+                            return true;
+                        if ('code' in error && error.code === 429)
+                            return true;
+                        return false;
+                    })();
+                    if (!isQuotaError || attempt === backoffMs.length) {
+                        throw error;
+                    }
+                    await this.sleepFn(backoffMs[attempt]);
+                }
+            }
+            throw lastError;
+        };
         this.getSpreadsheetId = (spreadsheetUrl) => {
             const url = new URL(spreadsheetUrl);
             return url.pathname.split('/')[3];
@@ -19,9 +47,9 @@ class GoogleSpreadsheetRepository {
         this.getSheet = async (spreadsheetUrl, sheetName) => {
             const sheets = this.sheetsClient;
             const spreadsheetId = this.getSpreadsheetId(spreadsheetUrl);
-            const responseSheet = await sheets.spreadsheets.get({
+            const responseSheet = await this.callWithRetry(() => sheets.spreadsheets.get({
                 spreadsheetId,
-            });
+            }));
             if (responseSheet.status !== 200) {
                 throw new Error(`Failed to get sheet: ${responseSheet.status}. ${JSON.stringify(responseSheet.data)}`);
             }
@@ -29,10 +57,10 @@ class GoogleSpreadsheetRepository {
             if (!sheet) {
                 return null;
             }
-            const response = await sheets.spreadsheets.values.get({
+            const response = await this.callWithRetry(() => sheets.spreadsheets.values.get({
                 spreadsheetId,
                 range: sheetName,
-            });
+            }));
             if (response.status !== 200) {
                 throw new Error(`Failed to get sheet: ${response.status}. ${JSON.stringify(response.data)}`);
             }
@@ -45,14 +73,14 @@ class GoogleSpreadsheetRepository {
             const sheets = this.sheetsClient;
             const spreadsheetId = this.getSpreadsheetId(spreadsheetUrl);
             await this.createNewSheetIfNotExists(spreadsheetUrl, sheetName);
-            const response = await sheets.spreadsheets.values.update({
+            const response = await this.callWithRetry(() => sheets.spreadsheets.values.update({
                 spreadsheetId,
                 range: `${sheetName}!${String.fromCharCode(65 + column)}${row + 1}`,
                 valueInputOption: 'RAW',
                 requestBody: {
                     values: [[value]],
                 },
-            });
+            }));
             if (response.status !== 200) {
                 throw new Error(`Failed to update cell: ${response.status}. ${JSON.stringify(response.data)}`);
             }
@@ -60,7 +88,7 @@ class GoogleSpreadsheetRepository {
         this.sheetExists = async (spreadsheetUrl, sheetName) => {
             const sheets = this.sheetsClient;
             const spreadsheetId = this.getSpreadsheetId(spreadsheetUrl);
-            const response = await sheets.spreadsheets.get({ spreadsheetId });
+            const response = await this.callWithRetry(() => sheets.spreadsheets.get({ spreadsheetId }));
             if (response.status !== 200) {
                 throw new Error(`Failed to get sheet: ${response.status}. ${JSON.stringify(response.data)}`);
             }
@@ -72,7 +100,7 @@ class GoogleSpreadsheetRepository {
             if (await this.sheetExists(spreadsheetUrl, sheetName)) {
                 return;
             }
-            const response = await sheets.spreadsheets.batchUpdate({
+            const response = await this.callWithRetry(() => sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
                 requestBody: {
                     requests: [
@@ -85,7 +113,7 @@ class GoogleSpreadsheetRepository {
                         },
                     ],
                 },
-            });
+            }));
             if (response.status !== 200) {
                 throw new Error(`Failed to create sheet: ${response.status}. ${JSON.stringify(response.data)}`);
             }
@@ -96,18 +124,19 @@ class GoogleSpreadsheetRepository {
             await this.createNewSheetIfNotExists(spreadsheetUrl, sheetName);
             const sheet = await this.getSheet(spreadsheetUrl, sheetName);
             const range = `${sheetName}!A${sheet ? sheet.length + 1 : 1}:A`;
-            const response = await sheets.spreadsheets.values.append({
+            const response = await this.callWithRetry(() => sheets.spreadsheets.values.append({
                 spreadsheetId,
                 range: range,
                 valueInputOption: 'RAW',
                 requestBody: {
                     values,
                 },
-            });
+            }));
             if (response.status !== 200) {
                 throw new Error(`Failed to append values: ${response.status}. ${JSON.stringify(response.data)}`);
             }
         };
+        this.sleepFn = sleepFn;
         this.localStorageRepository.write(this.keyFile, serviceAccountKey);
         this.sheetsClient = sheetsClientFactory
             ? sheetsClientFactory()

package/bin/adapter/repositories/GoogleSpreadsheetRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleSpreadsheetRepository.js","sourceRoot":"","sources":["../../../src/adapter/repositories/GoogleSpreadsheetRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GoogleSpreadsheetRepository.js","sourceRoot":"","sources":["../../../src/adapter/repositories/GoogleSpreadsheetRepository.ts"],"names":[],"mappings":"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"}

package/bin/domain/usecases/extractFencedJsonBlocks.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractFencedJsonBlocks = void 0;
+const normalizeReportBody_1 = require("./normalizeReportBody");
+const extractFencedJsonBlocks = (body, context) => {
+    const blocks = [];
+    for (const match of (0, normalizeReportBody_1.normalizeReportBody)(body).matchAll(/```json\n([\s\S]*?)\n```/g)) {
+        try {
+            blocks.push(JSON.parse(match[1]));
+        }
+        catch (error) {
+            console.warn(`Invalid JSON in report body while checking ${context}:`, error);
+        }
+    }
+    return blocks;
+};
+exports.extractFencedJsonBlocks = extractFencedJsonBlocks;
+//# sourceMappingURL=extractFencedJsonBlocks.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extractFencedJsonBlocks.js","sourceRoot":"","sources":["../../../src/domain/usecases/extractFencedJsonBlocks.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAErD,MAAM,uBAAuB,GAAG,CACrC,IAAY,EACZ,OAAe,EACJ,EAAE;IACb,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,IAAA,yCAAmB,EAAC,IAAI,CAAC,CAAC,QAAQ,CACpD,2BAA2B,CAC5B,EAAE,CAAC;QACF,IAAI,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CACV,8CAA8C,OAAO,GAAG,EACxD,KAAK,CACN,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}

package/bin/domain/usecases/extractNextStepAgent.js

@@ -1,31 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractNextStepAgent = void 0;
-const normalizeReportBody_1 = require("./normalizeReportBody");
+const extractFencedJsonBlocks_1 = require("./extractFencedJsonBlocks");
 const extractNextStepAgent = (body) => {
-    const reportMatch = (0, normalizeReportBody_1.normalizeReportBody)(body).match(/```json\n([\s\S]*?)\n```/);
-    if (!reportMatch || reportMatch.length < 2) {
-        return null;
+    for (const block of (0, extractFencedJsonBlocks_1.extractFencedJsonBlocks)(body, 'nextStepAgent')) {
+        if (typeof block !== 'object' || block === null) {
+            continue;
+        }
+        if (!('nextStepAgent' in block)) {
+            continue;
+        }
+        const value = Reflect.get(block, 'nextStepAgent');
+        if (typeof value !== 'string' || value.trim() === '') {
+            continue;
+        }
+        return value.trim();
     }
-    let reportJson;
-    try {
-        reportJson = JSON.parse(reportMatch[1]);
-    }
-    catch (error) {
-        console.warn('Invalid JSON in report body while checking nextStepAgent:', error);
-        return null;
-    }
-    if (typeof reportJson !== 'object' || reportJson === null) {
-        return null;
-    }
-    if (!('nextStepAgent' in reportJson)) {
-        return null;
-    }
-    const value = Reflect.get(reportJson, 'nextStepAgent');
-    if (typeof value !== 'string' || value.trim() === '') {
-        return null;
-    }
-    return value.trim();
+    return null;
 };
 exports.extractNextStepAgent = extractNextStepAgent;
 //# sourceMappingURL=extractNextStepAgent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"extractNextStepAgent.js","sourceRoot":"","sources":["../../../src/domain/usecases/extractNextStepAgent.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAiB,EAAE;IAClE,MAAM,WAAW,GAAG,IAAA,yCAAmB,EAAC,IAAI,CAAC,CAAC,KAAK,CACjD,0BAA0B,CAC3B,CAAC;IACF,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,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,2DAA2D,EAC3D,KAAK,CACN,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,CAAC,eAAe,IAAI,UAAU,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IACvD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AA5BW,QAAA,oBAAoB,wBA4B/B"}
+{"version":3,"file":"extractNextStepAgent.js","sourceRoot":"","sources":["../../../src/domain/usecases/extractNextStepAgent.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AAE7D,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAiB,EAAE;IAClE,KAAK,MAAM,KAAK,IAAI,IAAA,iDAAuB,EAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;QACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAChD,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,eAAe,IAAI,KAAK,CAAC,EAAE,CAAC;YAChC,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAClD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B"}

package/bin/domain/usecases/isPullRequestDeclaredUnnecessary.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPullRequestDeclaredUnnecessary = void 0;
+const extractFencedJsonBlocks_1 = require("./extractFencedJsonBlocks");
 const isAgentReportBody_1 = require("./isAgentReportBody");
-const normalizeReportBody_1 = require("./normalizeReportBody");
 const isPullRequestDeclaredUnnecessary = (comments, isTrustedAuthor) => {
     const lastComment = comments[comments.length - 1];
     if (!lastComment ||
@@ -10,23 +10,16 @@ const isPullRequestDeclaredUnnecessary = (comments, isTrustedAuthor) => {
         !(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,2DAAwD;AACxD,+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,IAAA,qCAAiB,EAAC,WAAW,CAAC,OAAO,CAAC,EACvC,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.1",
+  "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', () => {