edsger 0.30.2 → 0.30.3

package/dist/phases/pr-execution/context.js

@@ -1,5 +1,6 @@
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { logInfo, logError } from '../../utils/logger.js';
+import { buildCredentialArgs } from '../../utils/git-push.js';
 import { getFeature } from '../../api/features/index.js';
 import { getPullRequests, } from '../../services/pull-requests.js';
 import { getGitHubConfig } from '../../api/github.js';
@@ -76,26 +77,26 @@ export async function fetchPRExecutionContext(featureId, verbose) {
             throw new Error(`Development branch '${devBranchName}' does not exist. ` +
                 `The feature must have code on the dev branch before PR execution.`);
         }
-        // If branch only exists on remote, fetch it
+        // Fetch GitHub config and data in parallel
+        const [feature, pullRequests, githubConfig] = await Promise.all([
+            getFeature(featureId, verbose),
+            getPullRequests({ featureId, verbose }),
+            getGitHubConfig(featureId, verbose),
+        ]);
+        // If branch only exists on remote, fetch it (using credential helper)
         if (!localExists && remoteExists) {
             if (verbose) {
                 logInfo(`Fetching remote branch ${devBranchName}...`);
             }
-            execSync(`git fetch origin ${devBranchName}`, {
+            const credArgs = buildCredentialArgs(githubConfig.token);
+            execFileSync('git', [...credArgs, 'fetch', 'origin', devBranchName], {
                 encoding: 'utf-8',
                 stdio: 'pipe',
             });
         }
-        // Fetch data in parallel
-        const [feature, pullRequests] = await Promise.all([
-            getFeature(featureId, verbose),
-            getPullRequests({ featureId, verbose }),
-        ]);
         if (pullRequests.length === 0) {
             throw new Error('No PR plan found. Run the pr-splitting phase first to create a PR plan.');
         }
-        // Fetch GitHub config
-        const githubConfig = await getGitHubConfig(featureId, verbose);
         if (!githubConfig.configured) {
             throw new Error(`GitHub is not configured. ${githubConfig.message || 'Please configure GitHub integration.'}`);
         }

package/dist/phases/pr-splitting/context.js

@@ -1,5 +1,6 @@
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { logInfo, logError } from '../../utils/logger.js';
+import { buildCredentialArgs } from '../../utils/git-push.js';
 import { getFeature } from '../../api/features/index.js';
 import { getProduct } from '../../api/products.js';
 import { getBranches } from '../../services/branches.js';
@@ -82,25 +83,25 @@ export async function fetchPRSplittingContext(featureId, verbose, replaceExistin
             throw new Error(`Development branch '${devBranchName}' does not exist. ` +
                 `The feature must have code on the dev branch before PR splitting.`);
         }
-        // If branch only exists on remote, fetch it
+        // Fetch database data and GitHub config in parallel
+        const [feature, existing_branches, existing_pull_requests, githubConfig] = await Promise.all([
+            getFeature(featureId, verbose),
+            getBranches({ featureId, verbose }).catch(() => []),
+            getPullRequests({ featureId, verbose }).catch(() => []),
+            getGitHubConfig(featureId, verbose),
+        ]);
+        // If branch only exists on remote, fetch it (using credential helper)
         if (!localExists && remoteExists) {
             if (verbose) {
                 logInfo(`Fetching remote branch ${devBranchName}...`);
             }
-            execSync(`git fetch origin ${devBranchName}`, {
+            const credArgs = buildCredentialArgs(githubConfig.token);
+            execFileSync('git', [...credArgs, 'fetch', 'origin', devBranchName], {
                 encoding: 'utf-8',
                 stdio: 'pipe',
             });
         }
-        // Fetch database data in parallel
-        const [feature, existing_branches, existing_pull_requests] = await Promise.all([
-            getFeature(featureId, verbose),
-            getBranches({ featureId, verbose }).catch(() => []),
-            getPullRequests({ featureId, verbose }).catch(() => []),
-        ]);
         const product = await getProduct(feature.product_id, verbose);
-        // Fetch GitHub config
-        const githubConfig = await getGitHubConfig(featureId, verbose);
         // Detect fork status
         let forkInfo = { isFork: false };
         if (githubConfig.configured && githubConfig.token && githubConfig.owner && githubConfig.repo) {

package/dist/utils/git-branch-manager.d.ts

@@ -67,7 +67,7 @@ export declare function branchExists(branch: string): boolean;
 /**
  * Check if a remote branch exists
  */
-export declare function remoteBranchExists(branch: string): boolean;
+export declare function remoteBranchExists(branch: string, githubToken?: string): boolean;
 /**
  * Options for switchToBranch
  */
@@ -79,6 +79,8 @@ export interface SwitchToBranchOptions {
      * Set this to true to skip the remote check (useful for well-known local branches like 'main').
      */
     skipRemoteCheck?: boolean;
+    /** GitHub App installation token for authenticated remote operations */
+    githubToken?: string;
 }
 /**
  * Switch to a specific Git branch, creating it if it doesn't exist
@@ -99,7 +101,7 @@ export declare function switchToBranch(branch: string, verbose?: boolean, option
 /**
  * Pull latest changes from remote for a specific branch
  */
-export declare function pullLatestFromBranch(branch: string, verbose?: boolean): void;
+export declare function pullLatestFromBranch(branch: string, verbose?: boolean, githubToken?: string): void;
 /**
  * Switch to feature branch and rebase with main
  * This should be called at the START of each phase
@@ -109,7 +111,7 @@ export declare function pullLatestFromBranch(branch: string, verbose?: boolean):
  * @param verbose - Whether to log verbose output
  * @returns Object containing the previous branch name
  */
-export declare function switchToFeatureBranchAndRebase(featureBranch: string, baseBranch?: string, verbose?: boolean): {
+export declare function switchToFeatureBranchAndRebase(featureBranch: string, baseBranch?: string, verbose?: boolean, githubToken?: string): {
     previousBranch: string;
 };
 /**

package/dist/utils/git-branch-manager.js

@@ -2,12 +2,12 @@
  * Git Branch Manager
  * Shared utilities for consistent git branch management across all phases
  */
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Octokit } from '@octokit/rest';
 import { logInfo, logError } from './logger.js';
-import { gitForcePush } from './git-push.js';
+import { gitForcePush, buildCredentialArgs } from './git-push.js';
 /**
  * Get current Git branch name
  */
@@ -225,10 +225,11 @@ export function branchExists(branch) {
 /**
  * Check if a remote branch exists
  */
-export function remoteBranchExists(branch) {
+export function remoteBranchExists(branch, githubToken) {
     try {
         // Fetch remote refs first to ensure we have latest info
-        execSync('git fetch origin --prune', { encoding: 'utf-8', stdio: 'pipe' });
+        const credArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...credArgs, 'fetch', 'origin', '--prune'], { encoding: 'utf-8', stdio: 'pipe' });
         execSync(`git rev-parse --verify origin/${branch}`, {
             encoding: 'utf-8',
             stdio: 'pipe',
@@ -280,7 +281,8 @@ export function switchToBranch(branch, verbose, options) {
             // This handles multi-clone scenarios where branch was pushed from another clone
             try {
                 // Fetch to get latest remote refs
-                execSync('git fetch origin', { encoding: 'utf-8', stdio: 'pipe' });
+                const switchCredArgs = buildCredentialArgs(options?.githubToken);
+                execFileSync('git', [...switchCredArgs, 'fetch', 'origin'], { encoding: 'utf-8', stdio: 'pipe' });
                 // Check if remote branch exists
                 execSync(`git rev-parse --verify origin/${branch}`, {
                     encoding: 'utf-8',
@@ -317,7 +319,7 @@ export function switchToBranch(branch, verbose, options) {
 /**
  * Pull latest changes from remote for a specific branch
  */
-export function pullLatestFromBranch(branch, verbose) {
+export function pullLatestFromBranch(branch, verbose, githubToken) {
     try {
         // Check for uncommitted changes and reset if found
         if (hasUncommittedChanges()) {
@@ -329,7 +331,8 @@ export function pullLatestFromBranch(branch, verbose) {
         if (verbose) {
             logInfo(`📥 Pulling latest changes from origin/${branch}...`);
         }
-        execSync(`git pull origin ${branch} --rebase`, {
+        const credArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...credArgs, 'pull', 'origin', branch, '--rebase'], {
             encoding: 'utf-8',
             stdio: verbose ? 'inherit' : 'pipe',
         });
@@ -350,7 +353,7 @@ export function pullLatestFromBranch(branch, verbose) {
  * @param verbose - Whether to log verbose output
  * @returns Object containing the previous branch name
  */
-export function switchToFeatureBranchAndRebase(featureBranch, baseBranch = 'main', verbose) {
+export function switchToFeatureBranchAndRebase(featureBranch, baseBranch = 'main', verbose, githubToken) {
     const previousBranch = getCurrentBranch();
     if (verbose) {
         logInfo(`\n🔄 Preparing feature branch: ${featureBranch}`);
@@ -373,7 +376,7 @@ export function switchToFeatureBranchAndRebase(featureBranch, baseBranch = 'main
             if (verbose) {
                 logInfo(`   Pulling latest ${baseBranch}...`);
             }
-            pullLatestFromBranch(baseBranch, verbose);
+            pullLatestFromBranch(baseBranch, verbose, githubToken);
         }
         catch (error) {
             if (verbose) {
@@ -397,7 +400,8 @@ export function switchToFeatureBranchAndRebase(featureBranch, baseBranch = 'main
             resetUncommittedChanges(verbose);
         }
         // Fetch to get latest remote state (may have been fetched in switchToBranch, but ensures fresh data)
-        execSync('git fetch origin', { encoding: 'utf-8', stdio: 'pipe' });
+        const credArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...credArgs, 'fetch', 'origin'], { encoding: 'utf-8', stdio: 'pipe' });
         // Check if remote feature branch exists
         try {
             execSync(`git rev-parse --verify origin/${featureBranch}`, {
@@ -459,7 +463,8 @@ export function switchToFeatureBranchAndRebase(featureBranch, baseBranch = 'main
             }
             resetUncommittedChanges(verbose);
         }
-        execSync(`git pull origin ${baseBranch} --rebase`, {
+        const rebaseCredArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...rebaseCredArgs, 'pull', 'origin', baseBranch, '--rebase'], {
             encoding: 'utf-8',
             stdio: verbose ? 'inherit' : 'pipe',
         });
@@ -716,7 +721,7 @@ export async function switchToFeatureBranchAndRebaseAsync(options) {
             if (verbose) {
                 logInfo(`   Pulling latest ${baseBranch}...`);
             }
-            pullLatestFromBranch(baseBranch, verbose);
+            pullLatestFromBranch(baseBranch, verbose, githubToken);
         }
         catch (error) {
             if (verbose) {
@@ -739,7 +744,8 @@ export async function switchToFeatureBranchAndRebaseAsync(options) {
             resetUncommittedChanges(verbose);
         }
         // Fetch to get latest remote state (may have been fetched in switchToBranch, but ensures fresh data)
-        execSync('git fetch origin', { encoding: 'utf-8', stdio: 'pipe' });
+        const syncCredArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...syncCredArgs, 'fetch', 'origin'], { encoding: 'utf-8', stdio: 'pipe' });
         try {
             execSync(`git rev-parse --verify origin/${featureBranch}`, {
                 encoding: 'utf-8',
@@ -802,7 +808,8 @@ export async function switchToFeatureBranchAndRebaseAsync(options) {
             resetUncommittedChanges(verbose);
         }
         // Fetch the target branch first
-        execSync(`git fetch origin ${actualRebaseTarget}`, {
+        const fetchCredArgs = buildCredentialArgs(githubToken);
+        execFileSync('git', [...fetchCredArgs, 'fetch', 'origin', actualRebaseTarget], {
             encoding: 'utf-8',
             stdio: 'pipe',
         });
@@ -812,7 +819,7 @@ export async function switchToFeatureBranchAndRebaseAsync(options) {
             // Command: git rebase --onto <new-base> <old-base>
             // This rebases commits from <old-base>..HEAD onto <new-base>
             // Also fetch the originalBaseBranch for the --onto reference
-            execSync(`git fetch origin ${originalBaseBranch}`, {
+            execFileSync('git', [...fetchCredArgs, 'fetch', 'origin', originalBaseBranch], {
                 encoding: 'utf-8',
                 stdio: 'pipe',
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.30.2",
+  "version": "0.30.3",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"