@shepai/cli 1.142.1 → 1.144.0-pr458.cd35c8d

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.d.ts

@@ -1,7 +1,10 @@
 /**
  * CI Watch/Fix Loop
  *
- * After a push, watches CI status and attempts automatic fixes when CI fails.
+ * After a push, watches CI status using an agent-based approach and attempts
+ * automatic fixes when CI fails. The agent follows CI/CD best practices:
+ * checks ALL runs, waits for ALL to complete, and reports accurate status.
+ *
  * Respects configurable max attempts, timeout, and log size from settings.
  */
 import type { IAgentExecutor } from '../../../../../../application/ports/output/agents/agent-executor.interface.js';
@@ -34,8 +37,8 @@ export interface CiWatchFixResult {
     ciFixStatus: CiFixStatusValue;
 }
 /**
- * Run the CI watch/fix loop. Watches for the initial CI result, then
- * iteratively attempts fixes up to the configured maximum.
+ * Run the CI watch/fix loop. Watches for the initial CI result using an
+ * agent-based approach, then iteratively attempts fixes up to the configured maximum.
  *
  * Throws on timeout or exhausted attempts (after updating feature state).
  */

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ci-watch-fix-loop.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAKrG,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAK3G,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,YAAY,EAAE,aAAa,CAAC;IAC5B,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAqL3B"}
+{"version":3,"file":"ci-watch-fix-loop.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAO3G,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,YAAY,EAAE,aAAa,CAAC;IAC5B,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B;AAyED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CA4K3B"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.js

@@ -1,18 +1,70 @@
 /**
  * CI Watch/Fix Loop
  *
- * After a push, watches CI status and attempts automatic fixes when CI fails.
+ * After a push, watches CI status using an agent-based approach and attempts
+ * automatic fixes when CI fails. The agent follows CI/CD best practices:
+ * checks ALL runs, waits for ALL to complete, and reports accurate status.
+ *
  * Respects configurable max attempts, timeout, and log size from settings.
  */
-import { GitPrError, GitPrErrorCode, } from '../../../../../../application/ports/output/services/git-pr-service.interface.js';
 import { CiStatus } from '../../../../../../domain/generated/output.js';
 import { retryExecute } from '../node-helpers.js';
-import { buildCiWatchFixPrompt } from '../prompts/merge-prompts.js';
+import { buildCiWatchFixPrompt, buildCiWatchPrompt } from '../prompts/merge-prompts.js';
+import { parseCiWatchResult } from './merge-output-parser.js';
 import { extractRunId, handleCiTerminalFailure, buildCiExhaustedError } from './ci-helpers.js';
 import { getSettings } from '../../../../../services/settings.service.js';
+import { recordPhaseStart, recordPhaseEnd } from '../../phase-timing-context.js';
 /**
- * Run the CI watch/fix loop. Watches for the initial CI result, then
- * iteratively attempts fixes up to the configured maximum.
+ * Watch CI using an agent call. The agent checks ALL runs for the branch,
+ * waits for ALL to complete, and reports structured CI_STATUS.
+ *
+ * Records a phase timing entry for the activity timeline.
+ *
+ * @returns Parsed CI status result with usage metrics
+ */
+async function watchCiViaAgent(executor, branch, options, timeoutMs, log) {
+    const watchOptions = { ...options, timeout: timeoutMs };
+    const watchPrompt = buildCiWatchPrompt(branch);
+    const watchStart = Date.now();
+    const timingId = await recordPhaseStart('merge:ci-watch', {
+        agentType: executor.agentType,
+        prompt: watchPrompt,
+    });
+    try {
+        const result = await retryExecute(executor, watchPrompt, watchOptions, {
+            maxAttempts: 1,
+            logger: log,
+        });
+        const elapsed = Date.now() - watchStart;
+        await recordPhaseEnd(timingId, elapsed, {
+            inputTokens: result.usage?.inputTokens,
+            outputTokens: result.usage?.outputTokens,
+            costUsd: result.usage?.costUsd,
+            numTurns: result.usage?.numTurns,
+            durationApiMs: result.usage?.durationApiMs,
+            exitCode: 'success',
+        });
+        const parsed = parseCiWatchResult(result.result);
+        return { ...parsed, usage: result.usage };
+    }
+    catch (err) {
+        const elapsed = Date.now() - watchStart;
+        const errMsg = err instanceof Error ? err.message : String(err);
+        await recordPhaseEnd(timingId, elapsed, {
+            exitCode: 'error',
+            errorMessage: errMsg.slice(0, 500),
+        });
+        // Check if this is a timeout
+        if (errMsg.includes('timed out') || errMsg.includes('timeout')) {
+            return { status: 'failure', summary: 'CI watch timed out', timedOut: true };
+        }
+        // For other errors, treat as indeterminate (failure)
+        return { status: 'failure', summary: `CI watch agent error: ${errMsg.slice(0, 200)}` };
+    }
+}
+/**
+ * Run the CI watch/fix loop. Watches for the initial CI result using an
+ * agent-based approach, then iteratively attempts fixes up to the configured maximum.
  *
  * Throws on timeout or exhausted attempts (after updating feature state).
  */
@@ -23,12 +75,11 @@ export async function runCiWatchFixLoop(deps, params) {
     const maxAttempts = settings.workflow?.ciMaxFixAttempts ?? 3;
     const timeoutMs = settings.workflow?.ciWatchTimeoutMs ?? 600_000;
     const logMaxChars = settings.workflow?.ciLogMaxChars ?? 50_000;
-    const pollInterval = settings.workflow?.ciWatchPollIntervalSeconds ?? 30;
     let ciFixAttempts = params.existingAttempts;
     const ciFixHistory = [];
     let ciFixStatus;
     log.info(`Starting CI watch (maxAttempts=${maxAttempts}, timeout=${timeoutMs}ms)`);
-    // Check if any CI run exists for this branch
+    // Check if any CI run exists for this branch (lightweight check before spawning agent)
     let initialCiStatus;
     try {
         initialCiStatus = await gitPrService.getCiStatus(cwd, branch);
@@ -65,30 +116,22 @@ export async function runCiWatchFixLoop(deps, params) {
         return { ciStatus: CiStatus.Success, ciFixAttempts, ciFixHistory, ciFixStatus: 'idle' };
     }
     let runUrl = initialCiStatus.runUrl;
-    // Initial CI watch
-    let watchResult;
-    try {
-        watchResult = await gitPrService.watchCi(cwd, branch, timeoutMs, pollInterval);
-    }
-    catch (err) {
-        if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {
-            log.info('Initial CI watch timed out');
-            ciFixHistory.push({
-                attempt: ciFixAttempts + 1,
-                startedAt: new Date().toISOString(),
-                failureSummary: 'CI watch timed out',
-                outcome: 'timeout',
-            });
-            await handleCiTerminalFailure(feature, prUrl, prNumber, deps.featureRepository, messages);
-            throw buildCiExhaustedError(ciFixAttempts + 1, ciFixHistory, 'timeout');
-        }
-        throw err;
-    }
-    // Use the run URL from watchCi — it reflects the actual run watched,
-    // which may differ from the initial getCiStatus() result when multiple
-    // workflow runs exist for the same branch.
+    // Initial CI watch via agent
+    log.info('Watching CI via agent (checks ALL runs)');
+    const watchResult = await watchCiViaAgent(executor, branch, options, timeoutMs, log);
     if (watchResult.runUrl)
         runUrl = watchResult.runUrl;
+    if (watchResult.timedOut) {
+        log.info('Initial CI watch timed out');
+        ciFixHistory.push({
+            attempt: ciFixAttempts + 1,
+            startedAt: new Date().toISOString(),
+            failureSummary: 'CI watch timed out',
+            outcome: 'timeout',
+        });
+        await handleCiTerminalFailure(feature, prUrl, prNumber, deps.featureRepository, messages);
+        throw buildCiExhaustedError(ciFixAttempts + 1, ciFixHistory, 'timeout');
+    }
     if (watchResult.status === 'success') {
         log.info('CI passed on first watch');
         return { ciStatus: CiStatus.Success, ciFixAttempts, ciFixHistory, ciFixStatus: 'success' };
@@ -101,23 +144,40 @@ export async function runCiWatchFixLoop(deps, params) {
             ciFixStatus = 'exhausted';
             break;
         }
-        // Fetch failure logs
+        // Fetch failure logs for context
         const runId = extractRunId(runUrl) ?? '';
         const failureLogs = await gitPrService.getFailureLogs(cwd, runId, branch, logMaxChars);
         const startedAt = new Date().toISOString();
         log.info(`CI fix attempt ${ciFixAttempts + 1}/${maxAttempts} for run ${runId}`);
+        // Record fix phase timing
+        const fixStart = Date.now();
+        const fixTimingId = await recordPhaseStart('merge:ci-fix', {
+            agentType: executor.agentType,
+        });
         // Invoke fix executor — maxAttempts:1 prevents retryExecute's internal
         // retry logic from consuming CI fix attempts behind the outer loop's back.
-        // Each CI fix is a unique attempt with distinct failure logs and prompt;
-        // the outer loop already handles iteration.
         const fixPrompt = buildCiWatchFixPrompt(failureLogs, ciFixAttempts + 1, maxAttempts, branch);
         try {
-            await retryExecute(executor, fixPrompt, options, { maxAttempts: 1, logger: log });
+            const fixResult = await retryExecute(executor, fixPrompt, options, {
+                maxAttempts: 1,
+                logger: log,
+            });
+            await recordPhaseEnd(fixTimingId, Date.now() - fixStart, {
+                inputTokens: fixResult.usage?.inputTokens,
+                outputTokens: fixResult.usage?.outputTokens,
+                costUsd: fixResult.usage?.costUsd,
+                numTurns: fixResult.usage?.numTurns,
+                durationApiMs: fixResult.usage?.durationApiMs,
+                exitCode: 'success',
+            });
         }
         catch (execErr) {
             // If the fix executor fails, count it as a failed attempt and continue
-            // the loop rather than killing the entire CI fix process.
             const execMsg = execErr instanceof Error ? execErr.message : String(execErr);
+            await recordPhaseEnd(fixTimingId, Date.now() - fixStart, {
+                exitCode: 'error',
+                errorMessage: execMsg.slice(0, 500),
+            });
             log.info(`CI fix executor failed on attempt ${ciFixAttempts + 1}: ${execMsg}`);
             ciFixAttempts++;
             ciFixHistory.push({
@@ -130,44 +190,22 @@ export async function runCiWatchFixLoop(deps, params) {
             continue;
         }
         ciFixAttempts++;
-        // Get updated run URL (new run triggered by push in fix)
-        const updatedCiStatus = await gitPrService.getCiStatus(cwd, branch);
-        if (updatedCiStatus.runUrl)
-            runUrl = updatedCiStatus.runUrl;
-        // Watch CI after fix
-        let fixWatchResult;
-        try {
-            fixWatchResult = await gitPrService.watchCi(cwd, branch, timeoutMs, pollInterval);
-        }
-        catch (err) {
-            if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {
-                log.info(`CI watch timed out during fix attempt ${ciFixAttempts}`);
-                ciFixHistory.push({
-                    attempt: ciFixAttempts,
-                    startedAt,
-                    failureSummary: failureLogs.slice(0, 500),
-                    outcome: 'timeout',
-                });
-                ciFixStatus = 'timeout';
-                break;
-            }
-            // For non-timeout watchCi errors (e.g. GIT_ERROR), treat as a failed
-            // attempt and continue the loop instead of killing it.
-            const watchMsg = err instanceof Error ? err.message : String(err);
-            log.info(`CI watch failed during fix attempt ${ciFixAttempts}: ${watchMsg}`);
+        // Watch CI after fix via agent (agent checks ALL runs for updated branch)
+        log.info('Watching CI after fix via agent');
+        const fixWatchResult = await watchCiViaAgent(executor, branch, options, timeoutMs, log);
+        if (fixWatchResult.runUrl)
+            runUrl = fixWatchResult.runUrl;
+        if (fixWatchResult.timedOut) {
+            log.info(`CI watch timed out during fix attempt ${ciFixAttempts}`);
             ciFixHistory.push({
                 attempt: ciFixAttempts,
                 startedAt,
                 failureSummary: failureLogs.slice(0, 500),
-                outcome: 'failed',
+                outcome: 'timeout',
             });
-            messages.push(`[merge] CI fix attempt ${ciFixAttempts}/${maxAttempts} — watch failed`);
-            continue;
+            ciFixStatus = 'timeout';
+            break;
         }
-        // Update runUrl to the run that was actually watched (avoids mismatch
-        // when multiple workflow runs exist for the same branch).
-        if (fixWatchResult.runUrl)
-            runUrl = fixWatchResult.runUrl;
         const outcome = fixWatchResult.status === 'success' ? 'fixed' : 'failed';
         ciFixHistory.push({
             attempt: ciFixAttempts,

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.d.ts

@@ -8,6 +8,11 @@ export interface PrParseResult {
     url: string;
     number: number;
 }
+export interface CiWatchParseResult {
+    status: 'success' | 'failure';
+    summary?: string;
+    runUrl?: string;
+}
 /**
  * Extract the first commit SHA from agent output text.
  * Looks for git commit output format `[branch SHA]` or `commit SHA`.
@@ -19,4 +24,11 @@ export declare function parseCommitHash(output: string): string | null;
  * Returns null if no PR URL found.
  */
 export declare function parsePrUrl(output: string): PrParseResult | null;
+/**
+ * Extract CI watch result from agent output text.
+ * Looks for CI_STATUS: PASSED or CI_STATUS: FAILED markers.
+ * When multiple CI_STATUS markers appear, uses the last one.
+ * Returns failure with diagnostic summary if no marker found.
+ */
+export declare function parseCiWatchResult(output: string): CiWatchParseResult;
 //# sourceMappingURL=merge-output-parser.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-output-parser.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI7D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAI/D"}
+{"version":3,"file":"merge-output-parser.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AASD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI7D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAI/D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CAuBrE"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge-output-parser.js

@@ -9,6 +9,11 @@
 const COMMIT_SHA_RE = /\[[\w/.-]+\s+([0-9a-f]{7,40})\]|(?:commit\s+)([0-9a-f]{7,40})/i;
 // Matches GitHub PR URL: https://github.com/owner/repo/pull/123
 const PR_URL_RE = /(https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/pull\/(\d+))/;
+// Matches CI_STATUS: PASSED or CI_STATUS: FAILED — <summary>
+const CI_STATUS_PASSED_RE = /CI_STATUS:\s*PASSED/;
+const CI_STATUS_FAILED_RE = /CI_STATUS:\s*FAILED(?:\s*—\s*(.+))?/;
+// Matches GitHub Actions run URL
+const RUN_URL_RE = /(https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/actions\/runs\/\d+)/;
 /**
  * Extract the first commit SHA from agent output text.
  * Looks for git commit output format `[branch SHA]` or `commit SHA`.
@@ -30,3 +35,31 @@ export function parsePrUrl(output) {
         return null;
     return { url: match[1], number: parseInt(match[2], 10) };
 }
+/**
+ * Extract CI watch result from agent output text.
+ * Looks for CI_STATUS: PASSED or CI_STATUS: FAILED markers.
+ * When multiple CI_STATUS markers appear, uses the last one.
+ * Returns failure with diagnostic summary if no marker found.
+ */
+export function parseCiWatchResult(output) {
+    const runUrlMatch = output.match(RUN_URL_RE);
+    const runUrl = runUrlMatch ? runUrlMatch[1] : undefined;
+    // Split into lines and check from bottom up (last status wins)
+    const lines = output.split('\n');
+    for (let i = lines.length - 1; i >= 0; i--) {
+        const line = lines[i];
+        if (CI_STATUS_PASSED_RE.test(line)) {
+            return { status: 'success', runUrl };
+        }
+        const failedMatch = line.match(CI_STATUS_FAILED_RE);
+        if (failedMatch) {
+            const summary = failedMatch[1]?.trim() || 'CI failed (no details provided)';
+            return { status: 'failure', summary, runUrl };
+        }
+    }
+    return {
+        status: 'failure',
+        summary: 'CI status could not be determined from agent output',
+        runUrl,
+    };
+}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.d.ts

@@ -44,4 +44,14 @@ export declare function buildCommitPushPrPrompt(state: FeatureAgentState, branch
  * @param branch - Feature branch name to push to after fixing
  */
 export declare function buildCiWatchFixPrompt(failureLogs: string, attemptNumber: number, maxAttempts: number, branch: string): string;
+/**
+ * Build a prompt for the CI watch agent call.
+ *
+ * Instructs the agent to check ALL CI runs for a branch, wait for all
+ * to complete, verify every run passed, and report structured status.
+ * Generic — works with any git/gh repo, not tied to specific workflows.
+ *
+ * @param branch - Feature branch name to watch CI for
+ */
+export declare function buildCiWatchPrompt(branch: string): string;
 //# sourceMappingURL=merge-prompts.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwCxD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU9F;AAuCD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAAE,EACpB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAUR;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAqER;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CA0BR"}
+{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwCxD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU9F;AAuCD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAAE,EACpB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAUR;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAqER;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CA0BR;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAqDzD"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.js

@@ -219,3 +219,66 @@ ${failureLogs}
 - Do NOT create a new branch — push directly to \`${branch}\`
 - If the failure is unclear, make your best diagnosis and explain your reasoning in the commit message`;
 }
+/**
+ * Build a prompt for the CI watch agent call.
+ *
+ * Instructs the agent to check ALL CI runs for a branch, wait for all
+ * to complete, verify every run passed, and report structured status.
+ * Generic — works with any git/gh repo, not tied to specific workflows.
+ *
+ * @param branch - Feature branch name to watch CI for
+ */
+export function buildCiWatchPrompt(branch) {
+    return `You are checking CI status for branch \`${branch}\`.
+
+## Instructions
+
+Follow these steps EXACTLY:
+
+### Step 1: List all CI runs for the branch
+
+\`\`\`
+gh run list --branch ${branch} --json databaseId,status,conclusion,name
+\`\`\`
+
+This shows ALL workflow runs. A single push can trigger MULTIPLE runs (e.g., CI/CD + PR validation).
+You MUST check every run, not just one.
+
+### Step 2: Watch all in-progress runs
+
+For EACH run with \`status\` that is NOT \`completed\`, watch it:
+
+\`\`\`
+gh run watch <databaseId> --interval 20
+\`\`\`
+
+Wait for each in-progress run to finish before proceeding.
+
+### Step 3: Verify all runs after watching
+
+After all runs complete, run the list command again to confirm:
+
+\`\`\`
+gh run list --branch ${branch} --json databaseId,status,conclusion,name
+\`\`\`
+
+Check that EVERY run shows \`status: completed\`. Do NOT trust \`gh run watch\` exit status alone.
+
+### Step 4: Report status
+
+After verifying all runs are complete, report EXACTLY ONE of these lines:
+
+- If every run has \`conclusion: success\`:
+  \`CI_STATUS: PASSED\`
+
+- If any run has a non-success conclusion:
+  \`CI_STATUS: FAILED — <brief summary of which runs failed and why>\`
+
+## Constraints
+
+- NEVER claim CI passed until EVERY run shows \`completed\` + \`success\`
+- NEVER watch a single run and assume it is the only one
+- If \`gh run list\` returns no runs, wait 10 seconds and retry up to 3 times
+- If rate-limited (403 error), report: \`CI_STATUS: PASSED\` (skip check gracefully)
+- Print the URL of the failing run if CI fails`;
+}

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts

@@ -1,8 +1,8 @@
 /**
  * Feature List Command
  *
- * Lists features in a formatted list with optional filtering.
- * Derives real-time status from the agent run (not stale Feature.lifecycle).
+ * Lists features in a hierarchical tree view: repo → feature → child → child…
+ * Repos and features are ordered by creation date descending.
  *
  * Usage: shep feat ls [options]
  *
@@ -11,5 +11,47 @@
  * $ shep feat ls --repo /path/to/project
  */
 import { Command } from 'commander';
+import type { Feature, AgentRun, PhaseTiming, Repository } from '../../../../../packages/core/src/domain/generated/output.js';
+/** Convert a date value (any type from domain) to a timestamp for sorting. */
+export declare function toTimestamp(val: unknown): number;
+interface Entry {
+    feature: Feature;
+    run: AgentRun | null;
+    phases: PhaseTiming[];
+}
+interface TreeNode {
+    entry: Entry;
+    children: TreeNode[];
+}
+interface RepoGroup {
+    repoPath: string;
+    repoName: string;
+    repoCreatedAt: number;
+    roots: TreeNode[];
+}
+interface FlatRow {
+    entry: Entry;
+    parentIsLast: boolean[];
+    isLast: boolean;
+}
+/**
+ * Build a recursive feature tree within a single repo group.
+ * Features with a parentId that matches another feature in the group become children.
+ * All levels are sorted by createdAt descending.
+ */
+export declare function buildTree(entries: Entry[]): TreeNode[];
+/**
+ * Group entries by repositoryPath and sort repos by createdAt desc.
+ * Uses the Repository entity's createdAt if available; falls back to the
+ * newest feature's createdAt in that repo group.
+ */
+export declare function groupByRepo(entries: Entry[], repos: Repository[]): RepoGroup[];
+/** Flatten a tree into rows with prefix context for rendering. */
+export declare function flattenTree(nodes: TreeNode[], parentIsLast: boolean[]): FlatRow[];
+/** Build the tree-drawing prefix string for a given depth context. */
+export declare function buildTreePrefix(parentIsLast: boolean[], isLast: boolean): string;
+/** Render a single feature row as a formatted string. */
+export declare function renderFeatureRow(entry: Entry, treePrefix: string): string;
 export declare function createLsCommand(): Command;
+export {};
 //# sourceMappingURL=ls.command.d.ts.map

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkLpC,wBAAgB,eAAe,IAAI,OAAO,CAwGzC"}
+{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAyJ/F,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAOhD;AAiBD,UAAU,KAAK;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,EAAE,CAAC;CACtB;AAED,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,EAAE,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAgCtD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CA8B9E;AAED,kEAAkE;AAClE,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAWjF;AAED,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAOhF;AAQD,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAazE;AAeD,wBAAgB,eAAe,IAAI,OAAO,CAiFzC"}