@shepai/cli 1.169.1-pr525.b4d0ff7 → 1.169.1

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;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,CAmZ7E"}
+{"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

@@ -221,50 +221,31 @@ export function createMergeNode(deps) {
                 }
             }
             // --- Fork-and-PR flow ---
-            // When forkAndPr=true, fork the repo (or create a new repo as fallback),
-            // push to the fork, create upstream PR, then transition to AwaitingUpstream.
-            // If no upstream exists (created via fallback), skip PR and transition to Completed.
+            // 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/created, remotes configured');
+                log.info('Repository forked, remotes remapped');
                 await deps.gitForkService.pushToFork(cwd, branch);
                 log.info(`Branch ${branch} pushed to fork`);
-                // Try to create upstream PR. This will fail gracefully if forkRepository
-                // fell back to creating a new repo (no upstream remote to target).
-                try {
-                    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`);
-                    }
-                }
-                catch {
-                    // No upstream remote — repo was created fresh, not forked.
-                    // Code is pushed to origin; transition to Maintain.
-                    log.info('No upstream remote — skipping upstream PR (repo created, not forked)');
-                    messages.push(`[merge] Code pushed to origin (no upstream to PR against)`);
-                    if (feature) {
-                        await deps.featureRepository.update({
-                            ...feature,
-                            lifecycle: SdlcLifecycle.Maintain,
-                            updatedAt: new Date(),
-                        });
-                        messages.push(`[merge] Feature lifecycle → Maintain`);
-                    }
+                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, {

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

@@ -13,11 +13,6 @@ export declare class GitForkService implements IGitForkService {
     private readonly execFile;
     constructor(execFile: ExecFunction);
     forkRepository(cwd: string): Promise<void>;
-    /**
-     * Fallback when gh repo fork fails due to missing remotes.
-     * Creates a new private GitHub repository and sets it as origin.
-     */
-    private createRepositoryFallback;
     pushToFork(cwd: string, branch: string): Promise<void>;
     createUpstreamPr(cwd: string, title: string, body: string, head: string, base: string): Promise<UpstreamPrResult>;
     getUpstreamPrStatus(upstreamRepo: string, prNumber: number): Promise<PrStatus>;

package/dist/packages/core/src/infrastructure/services/git/git-fork.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-fork.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-fork.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0EAA0E,CAAC;AAKjH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,cAAe,YAAW,eAAe;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDhD;;;OAGG;YACW,wBAAwB;IAgChC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC;IAkDtB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsBpF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;CAU3B"}
+{"version":3,"file":"git-fork.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-fork.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0EAA0E,CAAC;AAKjH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,cAAe,YAAW,eAAe;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C1C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC;IAkDtB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsBpF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;CAU3B"}

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

@@ -17,7 +17,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { basename } from 'node:path';
 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';
@@ -59,42 +58,9 @@ let GitForkService = class GitForkService {
             if (message.includes('auth') || message.includes('login')) {
                 throw new GitForkError('GitHub authentication required to fork', GitForkErrorCode.AUTH_FAILURE, err instanceof Error ? err : undefined);
             }
-            // Fallback: when fork fails because there are no remotes (e.g. freshly-init'd repo),
-            // create a new GitHub repository instead.
-            if (message.includes('unable to determine base repository')) {
-                await this.createRepositoryFallback(cwd);
-                return;
-            }
             throw new GitForkError(`Failed to fork repository: ${message}`, GitForkErrorCode.FORK_FAILED, err instanceof Error ? err : undefined);
         }
     }
-    /**
-     * Fallback when gh repo fork fails due to missing remotes.
-     * Creates a new private GitHub repository and sets it as origin.
-     */
-    async createRepositoryFallback(cwd) {
-        const { stdout: ghUser } = await this.execFile('gh', ['api', 'user', '--jq', '.login'], {
-            cwd,
-        });
-        const username = ghUser.trim();
-        const repoName = basename(cwd);
-        try {
-            await this.execFile('gh', [
-                'repo',
-                'create',
-                `${username}/${repoName}`,
-                '--source',
-                '.',
-                '--remote',
-                'origin',
-                '--private',
-            ], { cwd });
-        }
-        catch (createErr) {
-            const createMessage = createErr instanceof Error ? createErr.message : String(createErr);
-            throw new GitForkError(`Failed to create repository: ${createMessage}`, GitForkErrorCode.FORK_FAILED, createErr instanceof Error ? createErr : undefined);
-        }
-    }
     async pushToFork(cwd, branch) {
         try {
             await this.execFile('git', ['push', '-u', 'origin', branch], { cwd });