@shepai/cli 1.129.2-pr414.a244c89 → 1.129.2-pr415.e8b42a3

package/dist/packages/core/src/application/ports/output/services/index.d.ts

@@ -10,7 +10,7 @@ export type { IVersionService } from './version-service.interface.js';
 export type { IWebServerService } from './web-server-service.interface.js';
 export type { IWorktreeService, WorktreeInfo } from './worktree-service.interface.js';
 export { WorktreeError, WorktreeErrorCode } from './worktree-service.interface.js';
-export type { IToolInstallerService } from './tool-installer.service.js';
+export type { IToolInstallerService, AvailableTerminalEntry } from './tool-installer.service.js';
 export type { INotificationService } from './notification-service.interface.js';
 export type { IGitPrService, CiStatus, CiStatusResult, DiffSummary, MergeStrategy, PrCreateResult, } from './git-pr-service.interface.js';
 export { GitPrError, GitPrErrorCode } from './git-pr-service.interface.js';

package/dist/packages/core/src/application/ports/output/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACnF,YAAY,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACzE,YAAY,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,GAChB,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,YAAY,EACV,wBAAwB,EACxB,UAAU,EACV,2BAA2B,EAC3B,YAAY,EACZ,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,0CAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACnF,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACjG,YAAY,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,GAChB,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,YAAY,EACV,wBAAwB,EACxB,UAAU,EACV,2BAA2B,EAC3B,YAAY,EACZ,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,0CAA0C,CAAC"}

package/dist/packages/core/src/application/ports/output/services/tool-installer.service.d.ts

@@ -5,6 +5,11 @@
  * Implementations check tool availability and execute installations.
  */
 import type { ToolInstallationStatus, ToolInstallCommand } from '../../../../domain/generated/output.js';
+export interface AvailableTerminalEntry {
+    id: string;
+    name: string;
+    available: boolean;
+}
 /**
  * Service interface for tool installation management.
  */
@@ -31,5 +36,13 @@ export interface IToolInstallerService {
      * @returns ToolInstallationStatus with result of installation
      */
     executeInstall(toolName: string, onOutput?: (data: string) => void): Promise<ToolInstallationStatus>;
+    /**
+     * List all terminal emulators supported on the current platform with availability status.
+     * Uses tool metadata loaded in the Node.js context (not bundled by Next.js),
+     * so this must be called via the DI container from server actions.
+     *
+     * @returns Array of terminal entries with id, name, and availability
+     */
+    listAvailableTerminals(): Promise<AvailableTerminalEntry[]>;
 }
 //# sourceMappingURL=tool-installer.service.d.ts.map

package/dist/packages/core/src/application/ports/output/services/tool-installer.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,wCAAwC,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAErE;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACpC"}
+{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,wCAAwC,CAAC;AAEhD,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAErE;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEnC;;;;;;OAMG;IACH,sBAAsB,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC;CAC7D"}

package/dist/packages/core/src/infrastructure/services/tool-installer/tool-installer.service.d.ts

@@ -11,7 +11,7 @@
  * - Automatic timeout handling with process termination
  * - Immutable status objects via value object factory functions
  */
-import type { IToolInstallerService } from '../../../application/ports/output/services/tool-installer.service.js';
+import type { IToolInstallerService, AvailableTerminalEntry } from '../../../application/ports/output/services/tool-installer.service.js';
 import type { ToolInstallationStatus, ToolInstallCommand } from '../../../domain/generated/output.js';
 export declare class ToolInstallerServiceImpl implements IToolInstallerService {
     /**
@@ -29,6 +29,12 @@ export declare class ToolInstallerServiceImpl implements IToolInstallerService {
      * Streams stdout/stderr to optional callback and handles timeout automatically.
      */
     executeInstall(toolName: string, onOutput?: (data: string) => void): Promise<ToolInstallationStatus>;
+    /**
+     * List all terminal emulators supported on the current platform with availability status.
+     * TOOL_METADATA is loaded in the Node.js CLI context, so this is safe to call from the
+     * DI container even when the Next.js standalone bundle cannot resolve tools/ via import.meta.url.
+     */
+    listAvailableTerminals(): Promise<AvailableTerminalEntry[]>;
     /**
      * Create installation suggestions for a tool based on its metadata
      */

package/dist/packages/core/src/infrastructure/services/tool-installer/tool-installer.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/tool-installer/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sEAAsE,CAAC;AAClH,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EAEnB,MAAM,qCAAqC,CAAC;AA2B7C,qBACa,wBAAyB,YAAW,qBAAqB;IACpE;;;OAGG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;;OAGG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAqB9D;;;OAGG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC;IAgFlC;;OAEG;IACH,OAAO,CAAC,6BAA6B;CA4BtC"}
+{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/tool-installer/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,sEAAsE,CAAC;AAC9E,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EAEnB,MAAM,qCAAqC,CAAC;AA2B7C,qBACa,wBAAyB,YAAW,qBAAqB;IACpE;;;OAGG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;;OAGG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAqB9D;;;OAGG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC;IAgFlC;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAuCjE;;OAEG;IACH,OAAO,CAAC,6BAA6B;CA4BtC"}

package/dist/packages/core/src/infrastructure/services/tool-installer/tool-installer.service.js

@@ -21,7 +21,7 @@ import { injectable } from 'tsyringe';
 import { exec, spawn } from 'node:child_process';
 import { platform } from 'node:os';
 import { createAvailableStatus, createMissingStatus, createErrorStatus, } from '../../../domain/value-objects/tool-installation-status.js';
-import { TOOL_METADATA } from './tool-metadata.js';
+import { TOOL_METADATA, getTerminalEntries } from './tool-metadata.js';
 import { checkBinaryExists } from './binary-exists.js';
 /**
  * Resolve binary name for the current platform.
@@ -172,6 +172,42 @@ let ToolInstallerServiceImpl = class ToolInstallerServiceImpl {
             });
         });
     }
+    /**
+     * List all terminal emulators supported on the current platform with availability status.
+     * TOOL_METADATA is loaded in the Node.js CLI context, so this is safe to call from the
+     * DI container even when the Next.js standalone bundle cannot resolve tools/ via import.meta.url.
+     */
+    async listAvailableTerminals() {
+        const currentPlatform = platform();
+        const entries = getTerminalEntries();
+        const results = [];
+        for (const [id, meta] of entries) {
+            if (meta.platforms &&
+                !meta.platforms.includes(currentPlatform)) {
+                continue;
+            }
+            if (id === 'system-terminal') {
+                results.unshift({ id: 'system', name: meta.name, available: true });
+                continue;
+            }
+            const binary = typeof meta.binary === 'string' ? meta.binary : meta.binary[currentPlatform];
+            if (!binary)
+                continue;
+            let available = false;
+            if (meta.verifyCommand.startsWith('test ')) {
+                available = await runVerifyCommand(meta.verifyCommand);
+            }
+            else {
+                const result = await checkBinaryExists(binary);
+                available = result.found;
+            }
+            results.push({ id, name: meta.name, available });
+        }
+        if (!results.some((r) => r.id === 'system')) {
+            results.unshift({ id: 'system', name: 'System Terminal', available: true });
+        }
+        return results;
+    }
     /**
      * Create installation suggestions for a tool based on its metadata
      */

package/dist/src/presentation/web/app/actions/get-available-terminals.d.ts

@@ -4,9 +4,14 @@ export interface AvailableTerminal {
     available: boolean;
 }
 /**
- * Returns the list of terminal entries from tool metadata, filtered to the
- * current platform, with availability checks. The "system-terminal" entry
- * is always marked available and listed first.
+ * Returns the list of terminal entries from the DI container's IToolInstallerService,
+ * filtered to the current platform with availability checks.
+ *
+ * Using the DI container (not a direct import from tool-metadata) ensures that
+ * TOOL_METADATA is read from the correct tools/ directory path — it is loaded once
+ * in the Node.js CLI bootstrap context where import.meta.url resolves correctly.
+ * Direct imports of tool-metadata from Next.js server action bundles break in
+ * standalone production mode because import.meta.url points to the chunk file.
  */
 export declare function getAvailableTerminals(): Promise<AvailableTerminal[]>;
 //# sourceMappingURL=get-available-terminals.d.ts.map

package/dist/src/presentation/web/app/actions/get-available-terminals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-available-terminals.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-available-terminals.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAkD1E"}
+{"version":3,"file":"get-available-terminals.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-available-terminals.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAO1E"}

package/dist/src/presentation/web/app/actions/get-available-terminals.js

@@ -1,53 +1,21 @@
 'use server';
-import { platform } from 'node:os';
-import { getTerminalEntries } from '../../../../../packages/core/src/infrastructure/services/tool-installer/tool-metadata.js';
-import { checkBinaryExists } from '../../../../../packages/core/src/infrastructure/services/tool-installer/binary-exists.js';
+import { resolve } from '../../lib/server-container.js';
 /**
- * Returns the list of terminal entries from tool metadata, filtered to the
- * current platform, with availability checks. The "system-terminal" entry
- * is always marked available and listed first.
+ * Returns the list of terminal entries from the DI container's IToolInstallerService,
+ * filtered to the current platform with availability checks.
+ *
+ * Using the DI container (not a direct import from tool-metadata) ensures that
+ * TOOL_METADATA is read from the correct tools/ directory path — it is loaded once
+ * in the Node.js CLI bootstrap context where import.meta.url resolves correctly.
+ * Direct imports of tool-metadata from Next.js server action bundles break in
+ * standalone production mode because import.meta.url points to the chunk file.
  */
 export async function getAvailableTerminals() {
-    const currentPlatform = platform();
-    const entries = getTerminalEntries();
-    const results = [];
-    for (const [id, meta] of entries) {
-        // Skip terminals not supported on this platform
-        if (meta.platforms &&
-            !meta.platforms.includes(currentPlatform)) {
-            continue;
-        }
-        // System terminal is always available
-        if (id === 'system-terminal') {
-            results.unshift({ id: 'system', name: meta.name, available: true });
-            continue;
-        }
-        // Check binary availability
-        const binary = typeof meta.binary === 'string' ? meta.binary : meta.binary[currentPlatform];
-        if (!binary)
-            continue;
-        // For app-bundle terminals (Warp, iTerm2) that use verifyCommand instead of binary check
-        let available = false;
-        if (meta.verifyCommand.startsWith('test ')) {
-            // Use verifyCommand for app-bundle checks (e.g., "test -d /Applications/Warp.app")
-            try {
-                const { execSync } = await import('node:child_process');
-                execSync(meta.verifyCommand, { stdio: 'ignore' });
-                available = true;
-            }
-            catch {
-                available = false;
-            }
-        }
-        else {
-            const result = await checkBinaryExists(binary);
-            available = result.found;
-        }
-        results.push({ id, name: meta.name, available });
+    try {
+        const service = resolve('IToolInstallerService');
+        return await service.listAvailableTerminals();
     }
-    // Ensure system terminal is always present even if not in tool metadata
-    if (!results.some((r) => r.id === 'system')) {
-        results.unshift({ id: 'system', name: 'System Terminal', available: true });
+    catch {
+        return [{ id: 'system', name: 'System Terminal', available: true }];
     }
-    return results;
 }

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activity-tab.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AA4EjD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iBAAiB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC7C;AAmED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,CAAC,EAAE,qBAAqB,EAAE,GACjC,iBAAiB,EAAE,CAgErB;AA6BD,wBAAgB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,gBAAgB,2CAqE3F"}
+{"version":3,"file":"activity-tab.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AAmEjD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iBAAiB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC7C;AAmED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,CAAC,EAAE,qBAAqB,EAAE,GACjC,iBAAiB,EAAE,CAgErB;AA6BD,wBAAgB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,gBAAgB,2CAqE3F"}

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.js

@@ -24,18 +24,12 @@ function getEffectiveDuration(timing, now) {
 function hasRunningPhase(timings) {
     return timings.some((t) => !t.phase.startsWith('run:') && !t.completedAt && t.startedAt);
 }
-/** Returns true if any non-lifecycle phase is currently waiting for approval. */
-function hasWaitingForApprovalPhase(timings) {
-    return timings.some((t) => !t.phase.startsWith('run:') && !!t.waitingApprovalAt && !t.approvalWaitMs);
-}
-/** Hook that ticks every second while there are running or approval-waiting phases. */
+/** Hook that ticks every second while there are running phases. */
 function useTickingNow(timings) {
     const [now, setNow] = useState(Date.now);
     const intervalRef = useRef(null);
     useEffect(() => {
-        const running = timings
-            ? hasRunningPhase(timings) || hasWaitingForApprovalPhase(timings)
-            : false;
+        const running = timings ? hasRunningPhase(timings) : false;
         if (running) {
             // Tick every second
             intervalRef.current = setInterval(() => setNow(Date.now()), 1000);
@@ -319,21 +313,12 @@ function NodeTimingRow({ timing, maxDurationMs, now, }) {
                                 backgroundImage: 'linear-gradient(90deg, transparent 0%, rgb(59 130 246) 50%, transparent 100%)',
                                 backgroundSize: '200% 100%',
                                 animation: 'shimmer 1.5s ease-in-out infinite',
-                            } })) : (_jsx("div", { className: `h-full rounded-full transition-all duration-300 ${barColorClass}`, style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-sm font-medium tabular-nums", children: formatDuration(durationMs) })] }), _jsxs("div", { className: "ml-[28px] flex items-center gap-3 text-xs", children: [timing.startedAt ? (_jsx("span", { className: "text-muted-foreground/60 tabular-nums", children: formatTimestamp(timing.startedAt) })) : null, totalTokens != null && totalTokens > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(Zap, { className: "h-3 w-3 opacity-50" }), formatTokens(totalTokens)] })) : null, timing.costUsd != null && timing.costUsd > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(DollarSign, { className: "h-3 w-3 opacity-50" }), formatCost(timing.costUsd)] })) : null] }), (timing.approvalWaitMs != null && timing.approvalWaitMs > 0) ||
-                (timing.waitingApprovalAt && !timing.approvalWaitMs) ? (_jsx(ApprovalWaitRow, { timing: timing, maxDurationMs: maxDurationMs, now: now })) : null] }));
+                            } })) : (_jsx("div", { className: `h-full rounded-full transition-all duration-300 ${barColorClass}`, style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-sm font-medium tabular-nums", children: formatDuration(durationMs) })] }), _jsxs("div", { className: "ml-[28px] flex items-center gap-3 text-xs", children: [timing.startedAt ? (_jsx("span", { className: "text-muted-foreground/60 tabular-nums", children: formatTimestamp(timing.startedAt) })) : null, totalTokens != null && totalTokens > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(Zap, { className: "h-3 w-3 opacity-50" }), formatTokens(totalTokens)] })) : null, timing.costUsd != null && timing.costUsd > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(DollarSign, { className: "h-3 w-3 opacity-50" }), formatCost(timing.costUsd)] })) : null] }), timing.approvalWaitMs != null && timing.approvalWaitMs > 0 ? (_jsx(ApprovalWaitRow, { timing: timing, maxDurationMs: maxDurationMs })) : null] }));
 }
-function ApprovalWaitRow({ timing, maxDurationMs, now, }) {
-    // isWaiting = approval requested but not yet resolved (live state)
-    const isWaiting = !!timing.waitingApprovalAt && !timing.approvalWaitMs;
-    const waitMs = isWaiting
-        ? Math.max(0, now - new Date(String(timing.waitingApprovalAt)).getTime())
-        : (timing.approvalWaitMs ?? 0);
+function ApprovalWaitRow({ timing, maxDurationMs, }) {
+    const waitMs = timing.approvalWaitMs ?? 0;
     const barPercent = maxDurationMs > 0 ? Math.max(2, (waitMs / maxDurationMs) * 100) : 2;
-    return (_jsxs("div", { "data-testid": `approval-wait-${timing.phase}`, className: "ml-[26px] flex items-center gap-2 rounded-md bg-amber-50/50 px-1.5 py-1 dark:bg-amber-950/20", children: [_jsx(Timer, { className: `h-3.5 w-3.5 shrink-0 text-amber-500 ${isWaiting ? 'animate-pulse' : ''}` }), _jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs", children: isWaiting ? 'awaiting' : 'approval' }), _jsx("div", { className: "bg-muted relative h-1.5 min-w-0 flex-1 overflow-hidden rounded-full", children: isWaiting ? (_jsx("div", { className: "absolute inset-0 rounded-full", style: {
-                        backgroundImage: 'linear-gradient(90deg, transparent 0%, rgb(245 158 11) 50%, transparent 100%)',
-                        backgroundSize: '200% 100%',
-                        animation: 'shimmer 1.5s ease-in-out infinite',
-                    } })) : (_jsx("div", { className: "h-full rounded-full bg-amber-500", style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-xs tabular-nums", children: formatDuration(waitMs) })] }));
+    return (_jsxs("div", { "data-testid": `approval-wait-${timing.phase}`, className: "ml-[26px] flex items-center gap-2 rounded-md bg-amber-50/50 px-1.5 py-1 dark:bg-amber-950/20", children: [_jsx(Timer, { className: "h-3.5 w-3.5 shrink-0 text-amber-500" }), _jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs", children: "approval" }), _jsx("div", { className: "bg-muted h-1.5 min-w-0 flex-1 overflow-hidden rounded-full", children: _jsx("div", { className: "h-full rounded-full bg-amber-500", style: { width: `${Math.min(barPercent, 100)}%` } }) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-xs tabular-nums", children: formatDuration(waitMs) })] }));
 }
 function SummaryTotals({ totalExecMs, totalWaitMs, totalInputTokens, totalOutputTokens, totalCostUsd, }) {
     const totalTokens = totalInputTokens + totalOutputTokens;

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.d.ts

@@ -32,20 +32,4 @@ export declare const WithApprovalWaits: Story;
  * Shows the full pattern: start → work → rejected → resumed → work → rejected → resumed → completed
  */
 export declare const FullLifecycle: Story;
-/**
- * Waiting for approval (live) — simulates the case where the agent has completed
- * a phase and is currently waiting for user approval. The "awaiting" sub-row shows
- * a pulsing amber indicator with a live-ticking timer.
- *
- * This covers the bug where the second merge iteration (after rejection + fixes)
- * did not show any approval wait indicator.
- */
-export declare const WaitingForApproval: Story;
-/**
- * Second iteration waiting for approval — simulates the exact reported bug:
- * after rejecting the merge step, the agent fixed things and is now waiting
- * for merge approval again in iteration 2. The activity tab must show the
- * "awaiting" indicator for merge:2.
- */
-export declare const SecondIterationWaitingForApproval: Story;
 //# sourceMappingURL=activity-tab.stories.d.ts.map

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activity-tab.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAclC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAC;AAsM1C,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,8CAA8C;AAC9C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,aAAa,EAAE,KAsE3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAwEhC,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,EAAE,KAgC/B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,KAiI3B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAoChC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,EAAE,KA0E/C,CAAC"}
+{"version":3,"file":"activity-tab.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAclC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAC;AAsM1C,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,8CAA8C;AAC9C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,aAAa,EAAE,KAsE3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAwEhC,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,EAAE,KAgC/B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,KAiI3B,CAAC"}

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.js

@@ -570,129 +570,3 @@ export const FullLifecycle = {
         error: null,
     },
 };
-/**
- * Waiting for approval (live) — simulates the case where the agent has completed
- * a phase and is currently waiting for user approval. The "awaiting" sub-row shows
- * a pulsing amber indicator with a live-ticking timer.
- *
- * This covers the bug where the second merge iteration (after rejection + fixes)
- * did not show any approval wait indicator.
- */
-export const WaitingForApproval = {
-    args: {
-        timings: [
-            {
-                agentRunId: 'run-1',
-                phase: 'run:started',
-                startedAt: new Date(Date.now() - 120000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'analyze',
-                startedAt: new Date(Date.now() - 119000).toISOString(),
-                completedAt: new Date(Date.now() - 105000).toISOString(),
-                durationMs: 14000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement',
-                startedAt: new Date(Date.now() - 105000).toISOString(),
-                completedAt: new Date(Date.now() - 60000).toISOString(),
-                durationMs: 45000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge',
-                startedAt: new Date(Date.now() - 60000).toISOString(),
-                completedAt: new Date(Date.now() - 30000).toISOString(),
-                durationMs: 30000,
-                // waitingApprovalAt set but approvalWaitMs absent = currently waiting
-                waitingApprovalAt: new Date(Date.now() - 30000).toISOString(),
-            },
-        ],
-        loading: false,
-        error: null,
-    },
-};
-/**
- * Second iteration waiting for approval — simulates the exact reported bug:
- * after rejecting the merge step, the agent fixed things and is now waiting
- * for merge approval again in iteration 2. The activity tab must show the
- * "awaiting" indicator for merge:2.
- */
-export const SecondIterationWaitingForApproval = {
-    args: {
-        timings: [
-            // Iteration 1
-            {
-                agentRunId: 'run-1',
-                phase: 'run:started',
-                startedAt: new Date(Date.now() - 300000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'analyze',
-                startedAt: new Date(Date.now() - 299000).toISOString(),
-                completedAt: new Date(Date.now() - 285000).toISOString(),
-                durationMs: 14000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement',
-                startedAt: new Date(Date.now() - 285000).toISOString(),
-                completedAt: new Date(Date.now() - 240000).toISOString(),
-                durationMs: 45000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge',
-                startedAt: new Date(Date.now() - 240000).toISOString(),
-                completedAt: new Date(Date.now() - 210000).toISOString(),
-                durationMs: 30000,
-                waitingApprovalAt: new Date(Date.now() - 210000).toISOString(),
-                approvalWaitMs: 15000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'run:rejected',
-                startedAt: new Date(Date.now() - 195000).toISOString(),
-                durationMs: 0,
-            },
-            // Iteration 2
-            {
-                agentRunId: 'run-1',
-                phase: 'run:resumed',
-                startedAt: new Date(Date.now() - 180000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement:2',
-                startedAt: new Date(Date.now() - 180000).toISOString(),
-                completedAt: new Date(Date.now() - 60000).toISOString(),
-                durationMs: 120000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge:2',
-                startedAt: new Date(Date.now() - 60000).toISOString(),
-                completedAt: new Date(Date.now() - 30000).toISOString(),
-                durationMs: 30000,
-                // Currently waiting — approvalWaitMs absent
-                waitingApprovalAt: new Date(Date.now() - 30000).toISOString(),
-            },
-        ],
-        rejectionFeedback: [
-            {
-                iteration: 1,
-                message: 'The PR has merge conflicts — rebase on main first',
-                phase: 'merge',
-                timestamp: new Date(Date.now() - 195000).toISOString(),
-            },
-        ],
-        loading: false,
-        error: null,
-    },
-};