Improve remote tracking

entry

@@ -83327,7 +83327,7 @@ function query({
 // package.json
 var package_default = {
   name: "@pullfrog/action",
-  version: "0.0.140",
+  version: "0.0.143",
   type: "module",
   files: [
     "index.js",
@@ -98180,8 +98180,9 @@ function buildPullfrogFooter(params) {
     parts.push(`Using [${params.agent.displayName}](${params.agent.url})`);
   }
   if (params.workflowRun) {
-    const { owner, repo, runId } = params.workflowRun;
-    parts.push(`[View workflow run](https://github.com/${owner}/${repo}/actions/runs/${runId})`);
+    parts.push(
+      `[View workflow run](https://github.com/${params.workflowRun.owner}/${params.workflowRun.repo}/actions/runs/${params.workflowRun.runId})`
+    );
   }
   if (params.customParts) {
     parts.push(...params.customParts);
@@ -123147,19 +123148,19 @@ function PushBranchTool(ctx) {
     parameters: PushBranch,
     execute: execute(ctx, async ({ branchName, force }) => {
       const branch = branchName || $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
-      log.info(`Pushing branch ${branch} to ${remote}`);
+      const isUrl = remote.startsWith("https://");
+      const args3 = force ? ["push", "--force", ...isUrl ? [] : ["-u"], remote, branch] : ["push", ...isUrl ? [] : ["-u"], remote, branch];
+      log.info(`Pushing branch ${branch} to ${isUrl ? "(fork URL)" : remote}`);
       if (force) {
         log.warning(`Force pushing - this will overwrite remote history`);
-        $("git", ["push", "--force", "-u", remote, branch]);
-      } else {
-        $("git", ["push", "-u", remote, branch]);
       }
+      $("git", args3);
       return {
         success: true,
         branch,
-        remote,
+        remote: isUrl ? "(fork URL)" : remote,
         force,
-        message: `Successfully pushed branch ${branch} to ${remote}`
+        message: `Successfully pushed branch ${branch}`
       };
     })
   });
@@ -123858,10 +123859,9 @@ function setupGitConfig() {
     );
   }
 }
-function setupGit(ctx) {
-  const { githubInstallationToken: githubInstallationToken2, payload } = ctx;
+async function setupGit(ctx) {
   const repoDir = process.cwd();
-  log.info("\u{1F527} Setting up git configuration...");
+  log.info("\u{1F527} Setting up git authentication...");
   try {
     execSync("git config --local --unset-all http.https://github.com/.extraheader", {
       cwd: repoDir,
@@ -123871,39 +123871,39 @@ function setupGit(ctx) {
   } catch {
     log.debug("No existing authentication headers to remove");
   }
-  $("git", ["config", "--local", "credential.helper", ""], { cwd: repoDir });
-  $("git", ["config", "--local", "--add", "credential.helper", "!gh auth git-credential"], {
-    cwd: repoDir,
-    env: { GH_TOKEN: githubInstallationToken2 }
-  });
-  log.info("\u2713 Configured gh as credential helper");
-  if (payload.event.is_pr !== true || !payload.event.issue_number) {
+  const originUrl = `https://x-access-token:${ctx.githubInstallationToken}@github.com/${ctx.owner}/${ctx.name}.git`;
+  $("git", ["remote", "set-url", "origin", originUrl], { cwd: repoDir });
+  log.info("\u2713 Updated origin URL with authentication token");
+  if (ctx.payload.event.is_pr !== true || !ctx.payload.event.issue_number) {
     log.debug("Not a PR event, staying on default branch");
     return { pushRemote: "origin" };
   }
-  const prNumber = payload.event.issue_number;
+  const prNumber = ctx.payload.event.issue_number;
   log.info(`\u{1F33F} Checking out PR #${prNumber}...`);
   $("gh", ["pr", "checkout", prNumber.toString()], {
     cwd: repoDir,
-    env: { GH_TOKEN: githubInstallationToken2 }
+    env: { GH_TOKEN: ctx.githubInstallationToken }
   });
   log.info(`\u2713 Successfully checked out PR #${prNumber}`);
-  const pushRemote = detectPushRemote();
-  if (pushRemote !== "origin") {
-    log.info(`\u{1F374} Fork PR detected, will push to remote: ${pushRemote}`);
+  const pr = await ctx.octokit.rest.pulls.get({
+    owner: ctx.owner,
+    repo: ctx.name,
+    pull_number: prNumber
+  });
+  const headRepo = pr.data.head.repo;
+  const baseRepo = pr.data.base.repo;
+  if (!headRepo || headRepo.full_name === baseRepo.full_name) {
+    return { pushRemote: "origin" };
   }
-  return { pushRemote };
-}
-function detectPushRemote() {
-  try {
-    const branch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
-    const upstream = $("git", ["rev-parse", "--abbrev-ref", `${branch}@{upstream}`], {
-      log: false
-    });
-    return upstream.split("/")[0];
-  } catch {
-    return "origin";
+  if (!pr.data.maintainer_can_modify) {
+    log.warning(
+      `\u26A0\uFE0F Fork PR from ${headRepo.owner.login} does not allow maintainer edits. Push may fail.`
+    );
   }
+  const token = process.env.GITHUB_TOKEN || ctx.githubInstallationToken;
+  const forkUrl = `https://x-access-token:${token}@github.com/${headRepo.full_name}.git`;
+  log.info(`\u{1F374} Fork PR detected, will push to: ${headRepo.full_name}`);
+  return { pushRemote: forkUrl };
 }
 
 // utils/timer.ts
@@ -123942,7 +123942,7 @@ async function main(inputs) {
     const partialCtx = await initializeContext(inputs, payload);
     const ctx = partialCtx;
     timer.checkpoint("initializeContext");
-    const { pushRemote } = setupGit(ctx);
+    const { pushRemote } = await setupGit(ctx);
     ctx.pushRemote = pushRemote;
     timer.checkpoint("setupGit");
     await setupTempDirectory(ctx);

main.ts

@@ -64,7 +64,7 @@ export async function main(inputs: Inputs): Promise<MainResult> {
     const ctx = partialCtx as Context;
     timer.checkpoint("initializeContext");
 
-    const { pushRemote } = setupGit(ctx);
+    const { pushRemote } = await setupGit(ctx);
     ctx.pushRemote = pushRemote;
     timer.checkpoint("setupGit");
 

mcp/git.ts

@@ -7,6 +7,7 @@ import { execute, tool } from "./shared.ts";
 
 export function CreateBranchTool(ctx: Context) {
   const defaultBranch = ctx.repo.default_branch || "main";
+
   const CreateBranch = type({
     branchName: type.string.describe(
       "The name of the branch to create (e.g., 'pullfrog/123-fix-bug')"
@@ -151,20 +152,24 @@ export function PushBranchTool(ctx: Context) {
     execute: execute(ctx, async ({ branchName, force }) => {
       const branch = branchName || $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
 
-      log.info(`Pushing branch ${branch} to ${remote}`);
+      // skip -u flag when pushing to URL (can't set upstream without a remote name)
+      const isUrl = remote.startsWith("https://");
+      const args = force
+        ? ["push", "--force", ...(isUrl ? [] : ["-u"]), remote, branch]
+        : ["push", ...(isUrl ? [] : ["-u"]), remote, branch];
+
+      log.info(`Pushing branch ${branch} to ${isUrl ? "(fork URL)" : remote}`);
       if (force) {
         log.warning(`Force pushing - this will overwrite remote history`);
-        $("git", ["push", "--force", "-u", remote, branch]);
-      } else {
-        $("git", ["push", "-u", remote, branch]);
       }
+      $("git", args);
 
       return {
         success: true,
         branch,
-        remote,
+        remote: isUrl ? "(fork URL)" : remote,
         force,
-        message: `Successfully pushed branch ${branch} to ${remote}`,
+        message: `Successfully pushed branch ${branch}`,
       };
     }),
   });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pullfrog/action",
-  "version": "0.0.140",
+  "version": "0.0.143",
   "type": "module",
   "files": [
     "index.js",

utils/buildPullfrogFooter.ts

@@ -40,8 +40,9 @@ export function buildPullfrogFooter(params: BuildPullfrogFooterParams): string {
   }
 
   if (params.workflowRun) {
-    const { owner, repo, runId } = params.workflowRun;
-    parts.push(`[View workflow run](https://github.com/${owner}/${repo}/actions/runs/${runId})`);
+    parts.push(
+      `[View workflow run](https://github.com/${params.workflowRun.owner}/${params.workflowRun.repo}/actions/runs/${params.workflowRun.runId})`
+    );
   }
 
   if (params.customParts) {

utils/setup.ts

@@ -68,15 +68,13 @@ export type SetupGitResult = {
 
 /**
  * Unified git setup: configures authentication and checks out PR branch if applicable.
- * Uses gh as credential helper so git push works with any remote (including forks).
- * For PR events, gh pr checkout sets up proper remote tracking.
- * Returns the remote to push to (detected from branch tracking after checkout).
+ * For fork PRs, returns a full URL to push to (since gh pr checkout doesn't set up remotes in Actions).
+ * For same-repo PRs, returns "origin".
  */
-export function setupGit(ctx: Context): SetupGitResult {
-  const { githubInstallationToken, payload } = ctx;
+export async function setupGit(ctx: Context): Promise<SetupGitResult> {
   const repoDir = process.cwd();
 
-  log.info("🔧 Setting up git configuration...");
+  log.info("🔧 Setting up git authentication...");
 
   // remove existing git auth headers that actions/checkout might have set
   try {
@@ -89,46 +87,52 @@ export function setupGit(ctx: Context): SetupGitResult {
     log.debug("No existing authentication headers to remove");
   }
 
-  // set up gh as credential helper - this makes git use GH_TOKEN for any remote
-  $("git", ["config", "--local", "credential.helper", ""], { cwd: repoDir });
-  $("git", ["config", "--local", "--add", "credential.helper", "!gh auth git-credential"], {
-    cwd: repoDir,
-    env: { GH_TOKEN: githubInstallationToken },
-  });
-  log.info("✓ Configured gh as credential helper");
+  // embed token directly in origin URL - simple and doesn't expose token in env
+  const originUrl = `https://x-access-token:${ctx.githubInstallationToken}@github.com/${ctx.owner}/${ctx.name}.git`;
+  $("git", ["remote", "set-url", "origin", originUrl], { cwd: repoDir });
+  log.info("✓ Updated origin URL with authentication token");
 
   // non-PR events: stay on default branch, push to origin
-  if (payload.event.is_pr !== true || !payload.event.issue_number) {
+  if (ctx.payload.event.is_pr !== true || !ctx.payload.event.issue_number) {
     log.debug("Not a PR event, staying on default branch");
     return { pushRemote: "origin" };
   }
 
-  // checkout PR branch - gh pr checkout handles fork remotes and tracking automatically
-  const prNumber = payload.event.issue_number;
+  // checkout PR branch
+  const prNumber = ctx.payload.event.issue_number;
   log.info(`🌿 Checking out PR #${prNumber}...`);
   $("gh", ["pr", "checkout", prNumber.toString()], {
     cwd: repoDir,
-    env: { GH_TOKEN: githubInstallationToken },
+    env: { GH_TOKEN: ctx.githubInstallationToken },
   });
   log.info(`✓ Successfully checked out PR #${prNumber}`);
 
-  // detect the push remote from branch tracking (set by gh pr checkout)
-  const pushRemote = detectPushRemote();
-  if (pushRemote !== "origin") {
-    log.info(`🍴 Fork PR detected, will push to remote: ${pushRemote}`);
-  }
-  return { pushRemote };
-}
+  // check if this is a fork PR - gh pr checkout in Actions doesn't set up remotes for forks
+  const pr = await ctx.octokit.rest.pulls.get({
+    owner: ctx.owner,
+    repo: ctx.name,
+    pull_number: prNumber,
+  });
 
-function detectPushRemote(): string {
-  try {
-    const branch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
-    const upstream = $("git", ["rev-parse", "--abbrev-ref", `${branch}@{upstream}`], {
-      log: false,
-    });
-    // upstream is like "remote/branch", extract remote name
-    return upstream.split("/")[0];
-  } catch {
-    return "origin";
+  const headRepo = pr.data.head.repo;
+  const baseRepo = pr.data.base.repo;
+
+  // not a fork - push to origin
+  if (!headRepo || headRepo.full_name === baseRepo.full_name) {
+    return { pushRemote: "origin" };
   }
+
+  // fork PR - return the full URL with auth token embedded
+  // git push accepts URLs directly, no remote needed
+  if (!pr.data.maintainer_can_modify) {
+    log.warning(
+      `⚠️ Fork PR from ${headRepo.owner.login} does not allow maintainer edits. Push may fail.`
+    );
+  }
+
+  // use GITHUB_TOKEN for fork push - it has the right permissions in Actions
+  const token = process.env.GITHUB_TOKEN || ctx.githubInstallationToken;
+  const forkUrl = `https://x-access-token:${token}@github.com/${headRepo.full_name}.git`;
+  log.info(`🍴 Fork PR detected, will push to: ${headRepo.full_name}`);
+  return { pushRemote: forkUrl };
 }