@shepai/cli 1.144.0 → 1.145.0-pr452.8b628a7

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.js

@@ -54,6 +54,11 @@ export function parseWorkerArgs(args) {
     const resumeFromInterrupt = args.includes('--resume-from-interrupt');
     const push = args.includes('--push');
     const openPr = args.includes('--open-pr');
+    const forkAndPr = args.includes('--fork-and-pr');
+    const commitSpecs = !args.includes('--no-commit-specs');
+    const ciWatchEnabled = !args.includes('--no-ci-watch');
+    const enableEvidence = args.includes('--enable-evidence');
+    const commitEvidence = args.includes('--commit-evidence');
     const fast = args.includes('--fast');
     const threadIdx = args.indexOf('--thread-id');
     const threadId = threadIdx !== -1 && threadIdx + 1 < args.length ? args[threadIdx + 1] : undefined;
@@ -83,6 +88,11 @@ export function parseWorkerArgs(args) {
         resumeFromInterrupt,
         push,
         openPr,
+        forkAndPr,
+        commitSpecs,
+        ciWatchEnabled,
+        enableEvidence,
+        commitEvidence,
         resumePayload,
         agentType,
         fast,
@@ -143,6 +153,8 @@ export async function runWorker(args) {
         ...(args.resumeFromInterrupt ? ['--resume-from-interrupt'] : []),
         ...(args.push ? ['--push'] : []),
         ...(args.openPr ? ['--open-pr'] : []),
+        ...(args.forkAndPr ? ['--fork-and-pr'] : []),
+        ...(args.commitSpecs === false ? ['--no-commit-specs'] : []),
         ...(args.resumePayload ? ['--resume-payload', args.resumePayload] : []),
         ...(args.agentType ? ['--agent-type', args.agentType] : []),
         ...(args.fast ? ['--fast'] : []),
@@ -185,6 +197,7 @@ export async function runWorker(args) {
             localMergeSquash: (cwd, featureBranch, baseBranch, commitMessage, hasRemote) => gitPrService.localMergeSquash(cwd, featureBranch, baseBranch, commitMessage, hasRemote),
             featureRepository,
             gitPrService,
+            gitForkService: container.resolve('IGitForkService'),
             cleanupFeatureWorktreeUseCase,
         },
     };
@@ -274,6 +287,11 @@ export async function runWorker(args) {
                 ...(args.resumeReason ? { resumeReason: args.resumeReason } : {}),
                 push: args.push ?? false,
                 openPr: args.openPr ?? false,
+                forkAndPr: args.forkAndPr ?? false,
+                commitSpecs: args.commitSpecs ?? true,
+                ciWatchEnabled: args.ciWatchEnabled ?? true,
+                enableEvidence: args.enableEvidence ?? false,
+                commitEvidence: args.commitEvidence ?? false,
             }, graphConfig);
         }
         else {
@@ -287,6 +305,11 @@ export async function runWorker(args) {
                 ...(args.model ? { model: args.model } : {}),
                 push: args.push ?? false,
                 openPr: args.openPr ?? false,
+                forkAndPr: args.forkAndPr ?? false,
+                commitSpecs: args.commitSpecs ?? true,
+                ciWatchEnabled: args.ciWatchEnabled ?? true,
+                enableEvidence: args.enableEvidence ?? false,
+                commitEvidence: args.commitEvidence ?? false,
             }, graphConfig);
         }
         log(`Graph invocation completed. Error: ${result.error ?? 'none'}`);

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/merge/merge.node.d.ts

@@ -17,6 +17,7 @@ import type { FeatureAgentState } from '../../state.js';
 import type { IFeatureRepository } from '../../../../../../application/ports/output/repositories/feature-repository.interface.js';
 import type { DiffSummary, IGitPrService } from '../../../../../../application/ports/output/services/git-pr-service.interface.js';
 import type { CleanupFeatureWorktreeUseCase } from '../../../../../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
+import type { IGitForkService } from '../../../../../../application/ports/output/services/git-fork-service.interface.js';
 export interface MergeNodeDeps {
     executor: IAgentExecutor;
     getDiffSummary: (cwd: string, baseBranch: string) => Promise<DiffSummary>;
@@ -37,6 +38,7 @@ export interface MergeNodeDeps {
      */
     revParse: (cwd: string, ref: string) => Promise<string>;
     gitPrService: IGitPrService;
+    gitForkService?: IGitForkService;
     cleanupFeatureWorktreeUseCase: Pick<CleanupFeatureWorktreeUseCase, 'execute'>;
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAoBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;OAEG;IACH,gBAAgB,EAAE,CAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAiU7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAoBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAC3H,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mEAAmE,CAAC;AAEzG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;OAEG;IACH,gBAAgB,EAAE,CAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAgY7E"}

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

@@ -220,6 +220,56 @@ export function createMergeNode(deps) {
                     ciStatus = feature.pr.ciStatus ?? ciStatus;
                 }
             }
+            // --- Fork-and-PR flow ---
+            // When forkAndPr=true, fork the repo, push to the fork, create upstream PR,
+            // then transition to AwaitingUpstream instead of merging.
+            if (state.forkAndPr && deps.gitForkService) {
+                log.info('Fork-and-PR flow: forking repo and creating upstream PR');
+                await deps.gitForkService.forkRepository(cwd);
+                log.info('Repository forked, remotes remapped');
+                await deps.gitForkService.pushToFork(cwd, branch);
+                log.info(`Branch ${branch} pushed to fork`);
+                const upstreamPr = await deps.gitForkService.createUpstreamPr(cwd, feature?.name ?? branch, feature?.description ?? '', branch, baseBranch);
+                log.info(`Upstream PR created: ${upstreamPr.url}`);
+                messages.push(`[merge] Upstream PR created: ${upstreamPr.url}`);
+                if (feature) {
+                    await deps.featureRepository.update({
+                        ...feature,
+                        lifecycle: SdlcLifecycle.AwaitingUpstream,
+                        pr: {
+                            ...(feature.pr ?? { url: '', number: 0, status: PrStatus.Open }),
+                            ...(commitHash ? { commitHash } : {}),
+                            upstreamPrUrl: upstreamPr.url,
+                            upstreamPrNumber: upstreamPr.number,
+                            upstreamPrStatus: PrStatus.Open,
+                        },
+                        updatedAt: new Date(),
+                    });
+                    messages.push(`[merge] Feature lifecycle → AwaitingUpstream`);
+                }
+                const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+                await recordPhaseEnd(mergeTimingId, Date.now() - startTime, {
+                    inputTokens: totalInputTokens || undefined,
+                    outputTokens: totalOutputTokens || undefined,
+                    exitCode: 'success',
+                });
+                messages.push(`[merge] Complete (${elapsed}s)`);
+                log.info(`Fork-and-PR merge flow complete (${elapsed}s)`);
+                return {
+                    currentNode: 'merge',
+                    messages,
+                    commitHash,
+                    prUrl,
+                    prNumber,
+                    ciStatus,
+                    ciFixAttempts,
+                    ciFixHistory,
+                    ciFixStatus,
+                    _approvalAction: null,
+                    _rejectionFeedback: null,
+                    _needsReexecution: false,
+                };
+            }
             // --- Merge ---
             // Merge when: allowMerge is true (auto-merge), OR user explicitly
             // approved at the merge gate (isResumeAfterInterrupt means they

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

@@ -159,6 +159,14 @@ export declare function buildCommitPushBlock(opts: {
  * context so the agent knows to check existing work before proceeding.
  */
 export declare function buildResumeContext(resumeReason: string | undefined): string;
+/**
+ * Safety net: remove spec-file commits the agent made despite being told not to.
+ *
+ * When commitSpecs=false and the agent ignored the "do NOT commit" instruction,
+ * this function finds the most recent commit that touches the spec directory and
+ * soft-resets it so the files remain on disk (for local use) but are not committed.
+ */
+export declare function removeSpecCommitsIfNeeded(state: FeatureAgentState, nodeName: string, log: NodeLogger): void;
 /**
  * Execute a node with consistent logging and error handling.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.js

@@ -6,7 +6,8 @@
  */
 import yaml from 'js-yaml';
 import { mkdirSync, readFileSync, writeFileSync, renameSync, unlinkSync } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { execSync } from 'node:child_process';
+import { join, dirname, relative } from 'node:path';
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { hasSettings, getSettings } from '../../../../services/settings.service.js';
 import { reportNodeStart } from '../heartbeat.js';
@@ -394,6 +395,42 @@ Before proceeding with this phase:
 
 `;
 }
+/** Spec-only phases whose commits should be removed when commitSpecs=false. */
+const SPEC_PHASE_NODES = new Set(['analyze', 'requirements', 'research', 'plan']);
+/**
+ * Safety net: remove spec-file commits the agent made despite being told not to.
+ *
+ * When commitSpecs=false and the agent ignored the "do NOT commit" instruction,
+ * this function finds the most recent commit that touches the spec directory and
+ * soft-resets it so the files remain on disk (for local use) but are not committed.
+ */
+export function removeSpecCommitsIfNeeded(state, nodeName, log) {
+    if (state.commitSpecs)
+        return;
+    if (!SPEC_PHASE_NODES.has(nodeName))
+        return;
+    const cwd = state.worktreePath || state.repositoryPath;
+    const specRelDir = relative(cwd, state.specDir).replaceAll('\\', '/');
+    try {
+        // Check if HEAD commit touches spec files
+        const filesInHead = execSync(`git diff --name-only HEAD~1 HEAD -- "${specRelDir}"`, {
+            cwd,
+            encoding: 'utf-8',
+            windowsHide: true,
+        }).trim();
+        if (!filesInHead)
+            return;
+        log.info(`commitSpecs=false but agent committed spec files: ${filesInHead.split('\n').join(', ')}. Soft-resetting to undo.`);
+        // Soft-reset the last commit so spec files are unstaged but kept on disk
+        execSync('git reset --soft HEAD~1', { cwd, windowsHide: true });
+        // Unstage the spec files (keep them as untracked/modified on disk)
+        execSync(`git reset HEAD -- "${specRelDir}"`, { cwd, windowsHide: true });
+    }
+    catch {
+        // If git commands fail (e.g., no prior commit, detached HEAD), log and continue
+        log.info('Failed to check/remove spec commits — continuing');
+    }
+}
 /**
  * Execute a node with consistent logging and error handling.
  *
@@ -480,6 +517,8 @@ export function executeNode(nodeName, executor, buildPrompt) {
                 durationApiMs: result.usage?.durationApiMs,
                 exitCode: 'success',
             });
+            // Safety net: undo spec commits if commitSpecs=false
+            removeSpecCommitsIfNeeded(state, nodeName, log);
             // Mark phase complete BEFORE interrupting so that on resume the
             // node detects the work is already done and returns early.
             markPhaseComplete(state.specDir, nodeName, log);

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

@@ -1 +1 @@
-{"version":3,"file":"analyze.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/analyze.prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CA6GnE"}
+{"version":3,"file":"analyze.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/analyze.prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAiHnE"}

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

@@ -36,9 +36,9 @@ Write your analysis to: ${state.specDir}/spec.yaml
 
 You MUST write the COMPLETE file (not a partial update). Preserve the existing name/number/branch fields and update everything else. Use this YAML structure:
 
-  name: (keep existing)
-  number: (keep existing)
-  branch: (keep existing)
+  name: (keep existing — string)
+  number: (keep existing — MUST be a bare integer, e.g. 2, NOT "002" or "2")
+  branch: (keep existing — string)
   oneLiner: (concise one-line description of the feature)
   summary: >
     (2-3 sentence summary of what this feature involves based on your analysis)
@@ -107,10 +107,12 @@ You MUST write the COMPLETE file (not a partial update). Preserve the existing n
 - Do NOT start implementing the feature
 - Keep your analysis thorough but concise
 
-${buildCommitPushBlock({
-        push: state.push,
-        files: [`${state.specDir}/spec.yaml`],
-        commitHint: 'docs(specs): analyze repository and define spec',
-        skipVerification: true,
-    })}`;
+${state.commitSpecs
+        ? buildCommitPushBlock({
+            push: state.push,
+            files: [`${state.specDir}/spec.yaml`],
+            commitHint: 'docs(specs): analyze repository and define spec',
+            skipVerification: true,
+        })
+        : `## Git Operations\n\nDo NOT commit or push any spec files. Spec files are managed locally only.`}`;
 }

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