@shepai/cli 1.140.0 → 1.141.0-pr452.1d8e904

package/dist/packages/core/src/infrastructure/services/git/git-fork.service.js

@@ -0,0 +1,145 @@
+/**
+ * Git Fork Service Implementation
+ *
+ * Manages GitHub fork operations: forking repos, pushing to forks,
+ * creating upstream PRs, and polling upstream PR status.
+ * Uses `gh` CLI for all GitHub API interactions.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { injectable, inject } from 'tsyringe';
+import { GitForkError, GitForkErrorCode, } from '../../../application/ports/output/services/git-fork-service.interface.js';
+import { PrStatus } from '../../../domain/generated/output.js';
+let GitForkService = class GitForkService {
+    execFile;
+    constructor(execFile) {
+        this.execFile = execFile;
+    }
+    async forkRepository(cwd) {
+        // Check if origin is already a fork — if so, just ensure upstream remote exists
+        try {
+            const { stdout } = await this.execFile('gh', ['repo', 'view', '--json', 'isFork,parent'], {
+                cwd,
+            });
+            const repoInfo = JSON.parse(stdout);
+            if (repoInfo.isFork && repoInfo.parent) {
+                // Origin is already a fork — ensure upstream remote points to parent
+                const parentUrl = `https://github.com/${repoInfo.parent.owner.login}/${repoInfo.parent.name}.git`;
+                try {
+                    await this.execFile('git', ['remote', 'add', 'upstream', parentUrl], { cwd });
+                }
+                catch {
+                    // Remote may already exist — update it
+                    await this.execFile('git', ['remote', 'set-url', 'upstream', parentUrl], { cwd });
+                }
+                return;
+            }
+        }
+        catch {
+            // gh repo view failed — could be auth issue or not a GitHub repo
+        }
+        // Fork the repository: gh repo fork --remote remaps origin to fork, adds upstream
+        try {
+            await this.execFile('gh', ['repo', 'fork', '--remote', '--remote-name', 'origin'], { cwd });
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            if (message.includes('auth') || message.includes('login')) {
+                throw new GitForkError('GitHub authentication required to fork', GitForkErrorCode.AUTH_FAILURE, err instanceof Error ? err : undefined);
+            }
+            throw new GitForkError(`Failed to fork repository: ${message}`, GitForkErrorCode.FORK_FAILED, err instanceof Error ? err : undefined);
+        }
+    }
+    async pushToFork(cwd, branch) {
+        try {
+            await this.execFile('git', ['push', '-u', 'origin', branch], { cwd });
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            throw new GitForkError(`Failed to push to fork: ${message}`, GitForkErrorCode.PUSH_FAILED, err instanceof Error ? err : undefined);
+        }
+    }
+    async createUpstreamPr(cwd, title, body, head, base) {
+        try {
+            // Get the upstream repo identifier
+            const { stdout: upstreamUrl } = await this.execFile('git', ['remote', 'get-url', 'upstream'], { cwd });
+            const upstreamRepo = this.extractRepoFromUrl(upstreamUrl.trim());
+            // Get the fork owner for the head ref (owner:branch format)
+            const { stdout: forkUrl } = await this.execFile('git', ['remote', 'get-url', 'origin'], {
+                cwd,
+            });
+            const forkRepo = this.extractRepoFromUrl(forkUrl.trim());
+            const forkOwner = forkRepo.split('/')[0];
+            const { stdout } = await this.execFile('gh', [
+                'pr',
+                'create',
+                '--repo',
+                upstreamRepo,
+                '--title',
+                title,
+                '--body',
+                body,
+                '--head',
+                `${forkOwner}:${head}`,
+                '--base',
+                base,
+                '--json',
+                'url,number',
+            ], { cwd });
+            const result = JSON.parse(stdout);
+            return { url: result.url, number: result.number };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            throw new GitForkError(`Failed to create upstream PR: ${message}`, GitForkErrorCode.PR_CREATE_FAILED, err instanceof Error ? err : undefined);
+        }
+    }
+    async getUpstreamPrStatus(upstreamRepo, prNumber) {
+        try {
+            const { stdout } = await this.execFile('gh', ['pr', 'view', String(prNumber), '--repo', upstreamRepo, '--json', 'state'], {});
+            const result = JSON.parse(stdout);
+            const state = (result.state ?? '').toUpperCase();
+            if (state === 'MERGED')
+                return PrStatus.Merged;
+            if (state === 'CLOSED')
+                return PrStatus.Closed;
+            return PrStatus.Open;
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            throw new GitForkError(`Failed to get upstream PR status: ${message}`, GitForkErrorCode.PR_STATUS_FAILED, err instanceof Error ? err : undefined);
+        }
+    }
+    /**
+     * Extract owner/repo from a git remote URL.
+     * Handles both HTTPS and SSH formats.
+     */
+    extractRepoFromUrl(url) {
+        // SSH: git@github.com:owner/repo.git
+        const sshMatch = url.match(/git@[^:]+:([^/]+\/[^/.]+)/);
+        if (sshMatch)
+            return sshMatch[1];
+        // HTTPS: https://github.com/owner/repo.git
+        const httpsMatch = url.match(/github\.com\/([^/]+\/[^/.]+)/);
+        if (httpsMatch)
+            return httpsMatch[1];
+        // Strip .git suffix and return as-is
+        return url.replace(/\.git$/, '');
+    }
+};
+GitForkService = __decorate([
+    injectable(),
+    __param(0, inject('ExecFunction')),
+    __metadata("design:paramtypes", [Function])
+], GitForkService);
+export { GitForkService };

package/dist/packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.d.ts

@@ -2,7 +2,8 @@
  * PR Sync Watcher Service
  *
  * Polls GitHub PR status and CI status for features in the Review lifecycle
- * stage, updating feature records and emitting notifications when transitions
+ * stage, and upstream PR status for features in the AwaitingUpstream stage,
+ * updating feature records and emitting notifications when transitions
  * are detected. Follows the NotificationWatcherService polling pattern.
  *
  * Maintains in-memory tracking of last-known PR and CI status per feature
@@ -13,12 +14,14 @@ import type { IFeatureRepository } from '../../../application/ports/output/repos
 import type { IAgentRunRepository } from '../../../application/ports/output/agents/agent-run-repository.interface.js';
 import type { IGitPrService } from '../../../application/ports/output/services/git-pr-service.interface.js';
 import type { INotificationService } from '../../../application/ports/output/services/notification-service.interface.js';
+import type { IGitForkService } from '../../../application/ports/output/services/git-fork-service.interface.js';
 import type Database from 'better-sqlite3';
 export declare class PrSyncWatcherService {
     private readonly featureRepo;
     private readonly agentRunRepo;
     private readonly gitPrService;
     private readonly notificationService;
+    private readonly gitForkService;
     private readonly pollIntervalMs;
     private readonly trackedFeatures;
     private readonly skippedRepos;
@@ -27,7 +30,7 @@ export declare class PrSyncWatcherService {
     private readonly processId;
     private intervalId;
     private pollCycle;
-    constructor(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null);
+    constructor(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null, gitForkService?: IGitForkService | null);
     isRunning(): boolean;
     start(): void;
     stop(): void;
@@ -40,6 +43,17 @@ export declare class PrSyncWatcherService {
     private handleRateLimitError;
     private processRepository;
     private processFeature;
+    /**
+     * Extract upstream repo (owner/name) from an upstream PR URL.
+     * Expected format: https://github.com/owner/repo/pull/123
+     */
+    private extractUpstreamRepo;
+    /**
+     * Poll upstream PR status for a feature in AwaitingUpstream lifecycle.
+     * If the upstream PR is merged, transition to Maintain.
+     * If the upstream PR is closed, update upstreamPrStatus to Closed.
+     */
+    private processAwaitingUpstreamFeature;
     /** Mark associated agent run as completed so the UI reflects "done" state. */
     private completeAgentRun;
     private emitNotification;
@@ -50,7 +64,7 @@ export declare class PrSyncWatcherService {
  *
  * @throws Error if the watcher is already initialized
  */
-export declare function initializePrSyncWatcher(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null): void;
+export declare function initializePrSyncWatcher(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null, gitForkService?: IGitForkService | null): void;
 /**
  * Get the PR sync watcher singleton.
  *

package/dist/packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pr-sync-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gFAAgF,CAAC;AACzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAK5G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AACzH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAqB3C,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,SAAS,CAAK;gBAGpB,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC,EACjD,EAAE,GAAE,QAAQ,CAAC,QAAQ,GAAG,IAAW;IAWrC,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;IASZ,gFAAgF;IAChF,OAAO,CAAC,cAAc;IAiBtB,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB;YAUX,IAAI;IA6ClB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,oBAAoB;YAYd,iBAAiB;YA+CjB,cAAc;IAkM5B,8EAA8E;YAChE,gBAAgB;IAW9B,OAAO,CAAC,gBAAgB;CAoBzB;AAMD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,EACvB,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,GAC5B,IAAI,CAaN;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,oBAAoB,CAQvD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC"}
+{"version":3,"file":"pr-sync-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAWH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gFAAgF,CAAC;AACzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAK5G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AACzH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAChH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAqB3C,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,SAAS,CAAK;gBAGpB,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC,EACjD,EAAE,GAAE,QAAQ,CAAC,QAAQ,GAAG,IAAW,EACnC,cAAc,GAAE,eAAe,GAAG,IAAW;IAY/C,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;IASZ,gFAAgF;IAChF,OAAO,CAAC,cAAc;IAiBtB,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB;YAUX,IAAI;IAmDlB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,oBAAoB;YAYd,iBAAiB;YA+CjB,cAAc;IAkM5B;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAK3B;;;;OAIG;YACW,8BAA8B;IA0F5C,8EAA8E;YAChE,gBAAgB;IAW9B,OAAO,CAAC,gBAAgB;CAoBzB;AAMD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,EACvB,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,EAC7B,cAAc,CAAC,EAAE,eAAe,GAAG,IAAI,GACtC,IAAI,CAcN;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,oBAAoB,CAQvD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC"}

package/dist/packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.js

@@ -2,7 +2,8 @@
  * PR Sync Watcher Service
  *
  * Polls GitHub PR status and CI status for features in the Review lifecycle
- * stage, updating feature records and emitting notifications when transitions
+ * stage, and upstream PR status for features in the AwaitingUpstream stage,
+ * updating feature records and emitting notifications when transitions
  * are detected. Follows the NotificationWatcherService polling pattern.
  *
  * Maintains in-memory tracking of last-known PR and CI status per feature
@@ -24,6 +25,7 @@ export class PrSyncWatcherService {
     agentRunRepo;
     gitPrService;
     notificationService;
+    gitForkService;
     pollIntervalMs;
     trackedFeatures = new Map();
     skippedRepos = new Set();
@@ -32,11 +34,12 @@ export class PrSyncWatcherService {
     processId;
     intervalId = null;
     pollCycle = 0;
-    constructor(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS, db = null) {
+    constructor(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS, db = null, gitForkService = null) {
         this.featureRepo = featureRepo;
         this.agentRunRepo = agentRunRepo;
         this.gitPrService = gitPrService;
         this.notificationService = notificationService;
+        this.gitForkService = gitForkService;
         this.pollIntervalMs = pollIntervalMs;
         this.db = db;
         this.processId = `${process.pid}-${Date.now()}`;
@@ -97,26 +100,32 @@ export class PrSyncWatcherService {
                 return; // another process holds the lock — skip this cycle
             }
             this.pollCycle++;
-            const allFeatures = await this.featureRepo.list({ lifecycle: SdlcLifecycle.Review });
+            const allReviewFeatures = await this.featureRepo.list({ lifecycle: SdlcLifecycle.Review });
             // Include features with a valid repositoryPath (with or without PR data)
-            const features = allFeatures.filter((f) => f.repositoryPath);
-            if (features.length === 0) {
-                this.trackedFeatures.clear();
-                return;
-            }
-            // Group features by repositoryPath for batch queries
+            const reviewFeatures = allReviewFeatures.filter((f) => f.repositoryPath);
+            // Group Review features by repositoryPath for batch queries
             const byRepo = new Map();
-            for (const feature of features) {
+            for (const feature of reviewFeatures) {
                 const group = byRepo.get(feature.repositoryPath) ?? [];
                 group.push(feature);
                 byRepo.set(feature.repositoryPath, group);
             }
-            // Process each repository
+            // Process each repository (Review features)
             for (const [repoPath, repoFeatures] of byRepo) {
                 await this.processRepository(repoPath, repoFeatures);
             }
-            // Prune features no longer in Review
-            const currentFeatureIds = new Set(features.map((f) => f.id));
+            // Process AwaitingUpstream features (poll upstream PR status individually)
+            const awaitingFeatures = await this.featureRepo.list({
+                lifecycle: SdlcLifecycle.AwaitingUpstream,
+            });
+            for (const feature of awaitingFeatures) {
+                await this.processAwaitingUpstreamFeature(feature);
+            }
+            // Prune features no longer in Review or AwaitingUpstream
+            const currentFeatureIds = new Set([
+                ...reviewFeatures.map((f) => f.id),
+                ...awaitingFeatures.map((f) => f.id),
+            ]);
             for (const trackedId of this.trackedFeatures.keys()) {
                 if (!currentFeatureIds.has(trackedId)) {
                     this.trackedFeatures.delete(trackedId);
@@ -319,6 +328,80 @@ export class PrSyncWatcherService {
             tracked.unchangedCycles++;
         }
     }
+    /**
+     * Extract upstream repo (owner/name) from an upstream PR URL.
+     * Expected format: https://github.com/owner/repo/pull/123
+     */
+    extractUpstreamRepo(upstreamPrUrl) {
+        const match = upstreamPrUrl.match(/github\.com\/([^/]+\/[^/]+)\/pull\//);
+        return match?.[1] ?? null;
+    }
+    /**
+     * Poll upstream PR status for a feature in AwaitingUpstream lifecycle.
+     * If the upstream PR is merged, transition to Maintain.
+     * If the upstream PR is closed, update upstreamPrStatus to Closed.
+     */
+    async processAwaitingUpstreamFeature(feature) {
+        if (!this.gitForkService)
+            return;
+        if (!feature.pr?.upstreamPrUrl || !feature.pr?.upstreamPrNumber)
+            return;
+        // Check exponential backoff — skip features that haven't changed recently
+        if (!this.shouldPollFeature(feature.id)) {
+            return;
+        }
+        const upstreamRepo = this.extractUpstreamRepo(feature.pr.upstreamPrUrl);
+        if (!upstreamRepo) {
+            // eslint-disable-next-line no-console
+            console.warn(`${TAG} Could not extract upstream repo from URL: ${feature.pr.upstreamPrUrl}`);
+            return;
+        }
+        let upstreamStatus;
+        try {
+            upstreamStatus = await this.gitForkService.getUpstreamPrStatus(upstreamRepo, feature.pr.upstreamPrNumber);
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            // eslint-disable-next-line no-console
+            console.warn(`${TAG} getUpstreamPrStatus failed for "${feature.name}" (${upstreamRepo}#${feature.pr.upstreamPrNumber}): ${msg}`);
+            return;
+        }
+        // Initialize tracking if needed
+        const prevState = this.trackedFeatures.get(feature.id);
+        if (!prevState) {
+            this.trackedFeatures.set(feature.id, {
+                prStatus: feature.pr.upstreamPrStatus ?? PrStatus.Open,
+                ciStatus: undefined,
+                mergeable: undefined,
+                featureName: feature.name,
+                unchangedCycles: 0,
+            });
+        }
+        const tracked = this.trackedFeatures.get(feature.id);
+        const previousStatus = tracked.prStatus;
+        if (upstreamStatus === previousStatus) {
+            tracked.unchangedCycles++;
+            return;
+        }
+        // eslint-disable-next-line no-console
+        console.log(`${TAG} Upstream PR #${feature.pr.upstreamPrNumber} status changed: ${previousStatus} -> ${upstreamStatus} for "${feature.name}"`);
+        tracked.prStatus = upstreamStatus;
+        tracked.unchangedCycles = 0;
+        if (upstreamStatus === PrStatus.Merged) {
+            feature.lifecycle = SdlcLifecycle.Maintain;
+            feature.pr = { ...feature.pr, upstreamPrStatus: PrStatus.Merged };
+            feature.updatedAt = new Date();
+            await this.featureRepo.update(feature);
+            await this.completeAgentRun(feature);
+            this.emitNotification(NotificationEventType.PrMerged, feature.id, feature.agentRunId ?? '', feature.name, `Upstream PR #${feature.pr.upstreamPrNumber} merged for ${feature.name}`, NotificationSeverity.Success);
+        }
+        else if (upstreamStatus === PrStatus.Closed) {
+            feature.pr = { ...feature.pr, upstreamPrStatus: PrStatus.Closed };
+            feature.updatedAt = new Date();
+            await this.featureRepo.update(feature);
+            this.emitNotification(NotificationEventType.PrClosed, feature.id, feature.agentRunId ?? '', feature.name, `Upstream PR #${feature.pr.upstreamPrNumber} closed for ${feature.name}`, NotificationSeverity.Warning);
+        }
+    }
     /** Mark associated agent run as completed so the UI reflects "done" state. */
     async completeAgentRun(feature) {
         if (!feature.agentRunId)
@@ -353,11 +436,11 @@ let watcherInstance = null;
  *
  * @throws Error if the watcher is already initialized
  */
-export function initializePrSyncWatcher(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db) {
+export function initializePrSyncWatcher(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db, gitForkService) {
     if (watcherInstance !== null) {
         throw new Error('PR sync watcher already initialized. Cannot re-initialize.');
     }
-    watcherInstance = new PrSyncWatcherService(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db ?? null);
+    watcherInstance = new PrSyncWatcherService(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db ?? null, gitForkService ?? null);
 }
 /**
  * Get the PR sync watcher singleton.

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

@@ -1 +1 @@
-{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAgC1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA0FzC"}
+{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAiC1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA4FzC"}

package/dist/src/presentation/cli/commands/ui.command.js

@@ -67,8 +67,9 @@ Examples:
             getNotificationWatcher().start();
             // Start PR sync watcher to detect PR/CI status transitions on GitHub
             const gitPrService = container.resolve('IGitPrService');
+            const gitForkService = container.resolve('IGitForkService');
             const db = getExistingConnection();
-            initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db);
+            initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db, gitForkService);
             getPrSyncWatcher().start();
             const url = `http://localhost:${port}`;
             messages.success(`Server ready at ${fmt.code(url)}`);

package/dist/src/presentation/web/app/api/agent-events/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/agent-events/route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiBH,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAuEvC,wBAAgB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CA4R9C"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/agent-events/route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiBH,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAwEvC,wBAAgB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CA4R9C"}

package/dist/src/presentation/web/app/api/agent-events/route.js

@@ -36,6 +36,7 @@ const LIFECYCLE_TO_NODE = {
     [SdlcLifecycle.Blocked]: 'blocked',
     [SdlcLifecycle.Pending]: 'pending',
     [SdlcLifecycle.Deleting]: 'blocked',
+    [SdlcLifecycle.AwaitingUpstream]: 'merge',
     [SdlcLifecycle.Archived]: 'archived',
 };
 const STATUS_TO_EVENT = {

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.d.ts

@@ -39,6 +39,10 @@ export interface FeatureCreatePayload {
     fast: boolean;
     /** When true, create the feature in pending state (no agent spawned). */
     pending?: boolean;
+    /** Fork repo and create PR to upstream at merge time. */
+    forkAndPr: boolean;
+    /** Commit specs/evidences into the repo (defaults false when forkAndPr is enabled). */
+    commitSpecs: boolean;
     /** Optional agent type override for this feature run */
     agentType?: string;
     /** Optional model override for this feature run */

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-create-drawer.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"feature-create-drawer.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.tsx"],"names":[],"mappings":"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"}

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useCallback, useEffect, useRef } from 'react';
-import { PaperclipIcon, ChevronsUpDown, CheckIcon, Zap, Clock, FolderPlus, Loader2, } from 'lucide-react';
+import { PaperclipIcon, ChevronsUpDown, CheckIcon, Zap, Clock, FolderPlus, Loader2, GitFork, FileText, } from 'lucide-react';
 import { cn } from '../../../lib/utils.js';
 import { useSoundAction } from '../../../hooks/use-sound-action.js';
 import { BaseDrawer } from '../../common/base-drawer/index.js';
@@ -131,6 +131,8 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
     const [parentId, setParentId] = useState(undefined);
     const [fast, setFast] = useState(false);
     const [pending, setPending] = useState(false);
+    const [forkAndPr, setForkAndPr] = useState(false);
+    const [commitSpecs, setCommitSpecs] = useState(true);
     const [overrideAgent, setOverrideAgent] = useState(undefined);
     const [overrideModel, setOverrideModel] = useState(undefined);
     const [selectedRepoPath, setSelectedRepoPath] = useState(validRepoPath || undefined);
@@ -177,6 +179,8 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
         setLocalRepos(repositories ?? []);
         setFast(false);
         setPending(false);
+        setForkAndPr(false);
+        setCommitSpecs(true);
         setOverrideAgent(undefined);
         setOverrideModel(undefined);
         setUploadError(null);
@@ -320,12 +324,14 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
                 allowPlan: approvalGates.allowPlan ?? false,
                 allowMerge: approvalGates.allowMerge ?? false,
             },
-            push: push || openPr,
-            openPr,
+            push: forkAndPr ? true : push || openPr,
+            openPr: forkAndPr ? true : openPr,
             ciWatchEnabled,
             enableEvidence,
             commitEvidence,
             fast,
+            forkAndPr,
+            commitSpecs,
             ...(pending ? { pending } : {}),
             ...(overrideAgent ? { agentType: overrideAgent } : {}),
             ...(overrideModel ? { model: overrideModel } : {}),
@@ -346,6 +352,8 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
         ciWatchEnabled,
         commitEvidence,
         fast,
+        forkAndPr,
+        commitSpecs,
         pending,
         overrideAgent,
         overrideModel,
@@ -453,15 +461,24 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
                                                                 ? 'Requires PR to be enabled'
                                                                 : !enableEvidence
                                                                     ? 'Requires evidence collection to be enabled'
-                                                                    : 'Include evidence in the pull request body.' })] })] })] }), _jsxs("div", { className: "border-input flex items-center gap-4 rounded-md border px-3 py-2.5", children: [_jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs font-semibold tracking-wider", children: "GIT" }), _jsxs("div", { className: "flex flex-1 items-center gap-4", children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "push", size: "sm", checked: push || openPr, onCheckedChange: (v) => {
+                                                                    : 'Include evidence in the pull request body.' })] })] })] }), _jsxs("div", { className: "border-input flex items-center gap-4 rounded-md border px-3 py-2.5", children: [_jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs font-semibold tracking-wider", children: "GIT" }), _jsxs("div", { className: "flex flex-1 items-center gap-4", children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "push", size: "sm", checked: forkAndPr ? true : push || openPr, onCheckedChange: (v) => {
                                                                             setPush(v);
                                                                             if (!v && openPr)
                                                                                 setOpenPr(false);
-                                                                        }, disabled: isSubmitting }), _jsx(Label, { htmlFor: "push", className: "cursor-pointer text-xs font-medium", children: "Push" })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Push branch to remote after implementation." })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "open-pr", size: "sm", checked: openPr, onCheckedChange: (v) => {
+                                                                        }, disabled: isSubmitting || forkAndPr }), _jsx(Label, { htmlFor: "push", className: cn('cursor-pointer text-xs font-medium', forkAndPr && 'opacity-50'), children: "Push" })] }) }), _jsx(TooltipContent, { side: "bottom", children: forkAndPr
+                                                                ? 'Implicitly enabled by fork-and-PR mode'
+                                                                : 'Push branch to remote after implementation.' })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "open-pr", size: "sm", checked: forkAndPr ? true : openPr, onCheckedChange: (v) => {
                                                                             setOpenPr(v);
                                                                             if (!v)
                                                                                 setCommitEvidence(false);
-                                                                        }, disabled: isSubmitting }), _jsx(Label, { htmlFor: "open-pr", className: "cursor-pointer text-xs font-medium", children: "PR" })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Open a pull request after pushing." })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "ci-watch", size: "sm", checked: ciWatchEnabled, onCheckedChange: setCiWatchEnabled, disabled: isSubmitting }), _jsx(Label, { htmlFor: "ci-watch", className: "cursor-pointer text-xs font-medium", children: "Watch" })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Watch CI and auto-fix after push." })] })] })] })] })] }) }) }) }));
+                                                                        }, disabled: isSubmitting || forkAndPr }), _jsx(Label, { htmlFor: "open-pr", className: cn('cursor-pointer text-xs font-medium', forkAndPr && 'opacity-50'), children: "PR" })] }) }), _jsx(TooltipContent, { side: "bottom", children: forkAndPr
+                                                                ? 'Implicitly enabled by fork-and-PR mode'
+                                                                : 'Open a pull request after pushing.' })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "ci-watch", size: "sm", checked: ciWatchEnabled, onCheckedChange: setCiWatchEnabled, disabled: isSubmitting }), _jsx(Label, { htmlFor: "ci-watch", className: "cursor-pointer text-xs font-medium", children: "Watch" })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Watch CI and auto-fix after push." })] })] })] }), _jsxs("div", { className: "border-input flex items-center gap-4 rounded-md border px-3 py-2.5", children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "text-muted-foreground w-16 shrink-0 cursor-default text-xs font-semibold tracking-wider", children: "FORK" }) }), _jsx(TooltipContent, { side: "bottom", children: "Fork the repository and create a PR to the upstream repo." })] }), _jsxs("div", { className: "flex flex-1 items-center gap-4", children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "fork-and-pr", size: "sm", checked: forkAndPr, onCheckedChange: (v) => {
+                                                                            setForkAndPr(v);
+                                                                            // Auto-flip commitSpecs to false when enabling fork mode
+                                                                            if (v)
+                                                                                setCommitSpecs(false);
+                                                                        }, disabled: isSubmitting }), _jsxs(Label, { htmlFor: "fork-and-pr", className: "flex cursor-pointer items-center gap-1 text-xs font-medium", children: [_jsx(GitFork, { className: "h-3 w-3" }), "Fork & PR"] })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Contribute via fork (PR to upstream)." })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("div", { className: "flex cursor-pointer items-center gap-1.5", children: [_jsx(Switch, { id: "commit-specs", size: "sm", checked: commitSpecs, onCheckedChange: setCommitSpecs, disabled: isSubmitting }), _jsxs(Label, { htmlFor: "commit-specs", className: "flex cursor-pointer items-center gap-1 text-xs font-medium", children: [_jsx(FileText, { className: "h-3 w-3" }), "Commit Specs"] })] }) }), _jsx(TooltipContent, { side: "bottom", children: "Commit specs to repository." })] })] })] })] })] }) }) }) }));
 }
 function ParentFeatureCombobox({ features, value, onChange, disabled, }) {
     const [open, setOpen] = useState(false);

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.stories.d.ts

@@ -120,6 +120,17 @@ export declare const DiscardConfirmation: Story;
  */
 export declare const DragDropReady: Story;
 export declare const Interactive: Story;
+/**
+ * Fork & PR enabled — the "Fork & PR" toggle is checked. When enabled,
+ * Push and PR toggles are implicitly locked to `true` (disabled), and
+ * `commitSpecs` auto-flips to `false`.
+ */
+export declare const ForkAndPrEnabled: Story;
+/**
+ * Fork & PR with Commit Specs re-enabled — after enabling fork mode
+ * (which auto-disables commitSpecs), the user overrides commitSpecs back to `true`.
+ */
+export declare const ForkAndPrWithCommitSpecs: Story;
 /**
  * With repository selector — opened from sidebar without repo context.
  * Shows the searchable repository combobox at the top of the form.

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

@@ -1 +1 @@
-{"version":3,"file":"feature-create-drawer.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAU9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,mBAAmB,CAgC1C,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAmDlD,uFAAuF;AACvF,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,KAiBvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAMhC,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,SAAS,EAAE,KAMvB,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAUxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,KAUrB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,KAUvB,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,KAUtB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,KAUvB,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,WAAW,EAAE,KAMzB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,EAAE,KAUxB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAgBjC,CAAC;AAeF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,KAWlC,CAAC;AAkDF,+EAA+E;AAC/E,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC;AAwCF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,KAM/B,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAgBjC,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,KAY3B,CAAC;AAMF,eAAO,MAAM,WAAW,EAAE,KAwCzB,CAAC;AAuCF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,KAM9B,CAAC;AA6BF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,KAMnC,CAAC"}
+{"version":3,"file":"feature-create-drawer.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAU9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,mBAAmB,CAgC1C,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAmDlD,uFAAuF;AACvF,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,KAiBvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAMhC,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,SAAS,EAAE,KAMvB,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAUxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,KAUrB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,KAUvB,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,KAUtB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,KAUvB,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,WAAW,EAAE,KAMzB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,EAAE,KAUxB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAgBjC,CAAC;AAeF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,KAWlC,CAAC;AAkDF,+EAA+E;AAC/E,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC;AAwCF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,KAM/B,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAgBjC,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,KAY3B,CAAC;AAMF,eAAO,MAAM,WAAW,EAAE,KAwCzB,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,KAU9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,KAatC,CAAC;AAuCF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,KAM9B,CAAC;AA6BF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,KAMnC,CAAC"}

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.stories.js

@@ -398,6 +398,40 @@ export const Interactive = {
                     }, repositoryPath: "/Users/dev/my-repo", currentAgentType: "claude-code", currentModel: "claude-sonnet-4-6" })] }));
     },
 };
+/* ---------------------------------------------------------------------------
+ * Fork & PR stories
+ * ------------------------------------------------------------------------- */
+/**
+ * Fork & PR enabled — the "Fork & PR" toggle is checked. When enabled,
+ * Push and PR toggles are implicitly locked to `true` (disabled), and
+ * `commitSpecs` auto-flips to `false`.
+ */
+export const ForkAndPrEnabled = {
+    render: () => _jsx(CreateDrawerTrigger, { label: "Open (Fork & PR)" }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (Fork & PR)' }));
+        const body = within(canvasElement.ownerDocument.body);
+        const forkToggle = await body.findByLabelText('Fork & PR');
+        await userEvent.click(forkToggle);
+    },
+};
+/**
+ * Fork & PR with Commit Specs re-enabled — after enabling fork mode
+ * (which auto-disables commitSpecs), the user overrides commitSpecs back to `true`.
+ */
+export const ForkAndPrWithCommitSpecs = {
+    render: () => _jsx(CreateDrawerTrigger, { label: "Open (Fork + Specs)" }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (Fork + Specs)' }));
+        const body = within(canvasElement.ownerDocument.body);
+        const forkToggle = await body.findByLabelText('Fork & PR');
+        await userEvent.click(forkToggle);
+        const specsToggle = body.getByLabelText('Commit Specs');
+        await userEvent.click(specsToggle);
+    },
+};
 /* ---------------------------------------------------------------------------
  * Repository selector stories
  * ------------------------------------------------------------------------- */

package/dist/src/presentation/web/components/common/feature-node/feature-node-state-config.d.ts

@@ -3,7 +3,7 @@ import type { Node } from '@xyflow/react';
 import type { PrStatus, CiStatus, DeploymentState } from '../../../../../../packages/core/src/domain/generated/output.js';
 import type { AgentTypeValue } from './agent-type-icons.js';
 export type FeatureNodeState = 'creating' | 'running' | 'action-required' | 'done' | 'blocked' | 'pending' | 'error' | 'deleting' | 'archived';
-export type FeatureLifecyclePhase = 'pending' | 'requirements' | 'research' | 'implementation' | 'review' | 'deploy' | 'maintain';
+export type FeatureLifecyclePhase = 'pending' | 'requirements' | 'research' | 'implementation' | 'review' | 'awaitingUpstream' | 'deploy' | 'maintain';
 /** Human-readable display labels for lifecycle phases. */
 export declare const lifecycleDisplayLabels: Record<FeatureLifecyclePhase, string>;
 /** Left border color for each lifecycle phase. */