Fix push_to_pull_request_branch generating bad patch on follow-up issue_comment runs by Copilot · Pull Request #17206 · github/gh-aw

Copilot · 2026-02-20T15:34:54Z

Original prompt

Recreate this PR #16927 cleanly.

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Changeset

Type: patch
Description: Fetches the missing origin/(branch) ref before generating the push_to_pull_request_branch patch so only new commits land on follow-up issue_comment runs.

Generated by Changeset Generator

✨ PR Review Safe Output Test - Run 22230889913

💥 [THE END] — Illustrated by Smoke Claude

Changeset

Type: patch
Description: Fetches the missing origin/(branch) ref before generating the push_to_pull_request_branch patch so follow-up issue_comment runs only include new commits.

Generated by Changeset Generator

✨ PR Review Safe Output Test - Run 22232216256

💥 [THE END] — Illustrated by Smoke Claude

Changeset

Type: patch
Description: Fetches the missing origin/(branch) ref before generating the push_to_pull_request_branch patch so follow-up issue_comment runs only include new commits.

Generated by Changeset Generator

✨ PR Review Safe Output Test - Run 22233329042

💥 [THE END] — Illustrated by Smoke Claude

… follow-up runs Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

github-actions · 2026-02-20T15:53:06Z

🎬 THE END — Smoke ClaudeMISSION: ACCOMPLISHED! The hero saves the day! ✨

github-actions · 2026-02-20T15:53:08Z

🧪 Smoke Project is now testing project operations...

github-actions · 2026-02-20T15:53:11Z

🧪 Smoke Temporary ID is now testing temporary ID functionality...

github-actions · 2026-02-20T15:53:11Z

📰 BREAKING: Smoke Copilot is now investigating this pull request. Sources say the story is developing...

github-actions · 2026-02-20T15:53:11Z

✨ The prophecy is fulfilled... Smoke Codex has completed its mystical journey. The stars align. 🌟

github-actions · 2026-02-20T15:56:26Z

✅ Smoke Project completed successfully. All project operations validated.

github-actions · 2026-02-20T15:57:59Z

Smoke test (Codex) summary:
PRs: fix: supply chain and shell injection security findings | Delete shared/mood.md workflow and clean up all references
GitHub MCP: ✅
Serena MCP: ✅
Playwright: ✅
File write/read: ✅
Build: ✅
Overall: PASS

🔮 The oracle has spoken through Smoke Codex for issue #17206

github-actions · 2026-02-20T15:58:07Z

Smoke test results for PR #17206:

Test
GitHub MCP	✅
Safe Inputs GH CLI	✅
Serena MCP	❌
Playwright	✅
File Write/Read	✅
Discussion	✅
Build	✅
Discussion Create	✅
Haiku Dispatch	✅
PR Review	✅

Overall: PASS (10/11 - Serena MCP tools unavailable)

@pelikhan@Copilot

📰 BREAKING: Report filed by Smoke Copilot for issue #17206

github-actions

Smoke test review: PR looks good. README docs are kept in sync with file removals, and the generate_git_patch.cjs refactoring is well-structured with clear strategy separation.

📰 BREAKING: Report filed by Smoke Copilot for issue #17206

github-actions · 2026-02-20T15:58:36Z

📰 VERDICT: Smoke Copilot has concluded. All systems operational. This is a developing story. 🎤

github-actions · 2026-02-20T16:03:15Z

Smoke Test Run §22230889913 — Overall: PARTIAL

Core tests #1–10: ✅✅✅✅✅✅✅✅✅✅

PR review tests #11–17:

Fix orphan removal on "gh aw remove" #11 Update PR body: ✅
Weekly Research Report: AI Workflow Automation Landscape and Strategic Opportunities - August 2025 #12 Review comments (×2): ✅
Add codex test action #13 Submit review: ✅
codex naming #14 Resolve thread: ✅
Revise caution note in README (#674) #15 Add reviewer (copilot): ✅
Update default model in Codex engine to o4-mini and adjust test expectations #16 Push to PR branch: ❌ (core is not defined MCP error)
Enhance timestamp and token usage extraction for Codex format in logs #17 Close test PR: ⚠️ skipped

💥 [THE END] — Illustrated by Smoke Claude for issue #17206

github-actions

💥 Automated smoke test review - all systems nominal!

💥 [THE END] — Illustrated by Smoke Claude for issue #17206

pelikhan · 2026-02-20T16:03:41Z

@copilot add a shim.cjs for the core logging function and load this shim in the safe output server and safe input server.

update server.sh to copy shim.cjs in both folders

github-actions

Reviewed PR #17206 — the fix properly handles the missing origin/(branch) ref during push_to_pull_request_branch patch generation. The resolveBaseRef fallback chain is solid and the migration from shell to JS is clean.

📰 BREAKING: Report filed by Smoke Copilot for issue #17206

github-actions · 2026-02-20T17:10:01Z

 const { getErrorMessage } = require("./error_helpers.cjs");
 const { execGitSync } = require("./git_helpers.cjs");

+const PATCH_PATH = "/tmp/gh-aw/aw.patch";


Good to extract PATCH_PATH as a named constant — makes it easy to change the path in one place if needed.

github-actions · 2026-02-20T17:10:01Z

+ const baseRef = `origin/${branchName}`;
+ core.info(`[generate_git_patch] using remote tracking ref as baseRef="${baseRef}"`);
+ return baseRef;
+ } catch {


The three-level fallback strategy in resolveBaseRef (remote tracking ref → fresh fetch → merge-base) is well-structured and covers the gh pr checkout edge case nicely.

github-actions · 2026-02-20T17:10:19Z

📰 VERDICT: Smoke Copilot has concluded. All systems operational. This is a developing story. 🎤

Smoke test complete: 10/11 tests passed. Serena MCP unavailable. Labels not added (not all tests passed).

Copilot

Pull request overview

Fixes incorrect patch generation on follow-up issue_comment runs for push_to_pull_request_branch by ensuring the remote base ref is fetched (instead of immediately falling back to merge-base), and adds a Node shim so scripts relying on GitHub Actions’ core global can run in MCP server contexts.

Changes:

Refactors generate_git_patch.cjs into helpers and fetches origin/<branch> when the tracking ref is missing to avoid including already-applied commits.
Introduces shim.cjs and loads it early in MCP server entrypoints; updates tests to mock global.core.
Removes the legacy shell patch generator and a Go test that depended on it; updates setup docs and file-copy lists.

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
`actions/setup/js/generate_git_patch.cjs`	Fetches missing remote branch tracking ref before computing patch base; refactors patch generation into helpers with added logging.
`actions/setup/js/generate_git_patch.test.cjs`	Adds `global.core` mock and clears mocks between tests.
`actions/setup/js/shim.cjs`	Adds a minimal `global.core` shim for non-GitHub Actions Node execution.
`actions/setup/js/safe-outputs-mcp-server.cjs`	Requires the shim first so `global.core` exists before other imports.
`actions/setup/js/safe_inputs_mcp_server_http.cjs`	Requires the shim first so `global.core` exists before other imports.
`actions/setup/js/safe_outputs_handlers.test.cjs`	Adds `global.core` mock and clears mocks between tests.
`actions/setup/setup.sh`	Ensures `shim.cjs` is copied into both safe-inputs and safe-outputs deploy directories.
`actions/setup/README.md`	Updates shell script count/list after removing `generate_git_patch.sh`.
`actions/setup/sh/generate_git_patch.sh`	Deleted (superseded by JS implementation).
`pkg/workflow/git_patch_head_test.go`	Deleted (was testing the removed shell script path).
`.changeset/patch-fetch-push-patch-base.md`	Changeset entry for the patch-base fetch behavior change.
`.changeset/smoke-test-push-22232216256.md`	Adds a smoke-test artifact file (currently malformed content).

Comments suppressed due to low confidence (1)

actions/setup/js/generate_git_patch.cjs:40

The new “missing tracking ref → fetch origin/ → fallback” logic is the core fix for follow-up issue_comment runs, but there’s no test exercising this path (e.g., simulating a repo where refs/remotes/origin/<branch> is absent after gh pr checkout). Adding a focused integration-style unit test around resolveBaseRef/tryBranchStrategy would help prevent regressions.

function resolveBaseRef(branchName, defaultBranch, cwd) {
try {
execGitSync(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${branchName}`], { cwd });
const baseRef = `origin/${branchName}`;
core.info(`[generate_git_patch] using remote tracking ref as baseRef="${baseRef}"`);
return baseRef;
} catch {
// Remote tracking ref not found (e.g. after gh pr checkout which doesn't set tracking refs).
// Try fetching the branch from origin so we use only the NEW commits as the patch base.
core.info(`[generate_git_patch] refs/remotes/origin/${branchName} not found; fetching from origin`);
}
try {
execGitSync(["fetch", "origin", branchName], { cwd });
const baseRef = `origin/${branchName}`;
core.info(`[generate_git_patch] fetch succeeded, baseRef="${baseRef}"`);
return baseRef;

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Copilot · 2026-02-20T17:13:25Z

@copilot fix tests to use shims https://github.com/github/gh-aw/actions/runs/22233320203/job/64318520951?pr=17206

Fixed in 5ff8086. The TypeScript typecheck was failing because global.core is not declared on typeof globalThis. Added @ts-expect-error comments on both the check and the assignment in shim.cjs, matching the pattern used in setup_globals.cjs.

github-actions · 2026-02-20T17:14:30Z

Smoke Test Results — Run §22233329042

Overall: PARTIAL (17/17 run, 1 skipped)

Core: ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ (#1–10 all pass)
PR Review: ✅ ✅ ✅ ✅ ✅ ✅ ⚠️ (#11–16 pass, #17 skipped — no safe PR to close)

💥 [THE END] — Illustrated by Smoke Claude for issue #17206

github-actions

💥 Automated smoke test review - all systems nominal!

💥 [THE END] — Illustrated by Smoke Claude for issue #17206

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

github-actions · 2026-02-21T00:34:14Z

✨ The prophecy is fulfilled... Smoke Codex has completed its mystical journey. The stars align. 🌟

github-actions · 2026-02-21T00:34:21Z

📰 BREAKING: Smoke Copilot is now investigating this pull request. Sources say the story is developing...

github-actions · 2026-02-21T00:34:21Z

🎬 THE END — Smoke ClaudeMISSION: ACCOMPLISHED! The hero saves the day! ✨

github-actions · 2026-02-21T00:39:28Z

Smoke test §22246618529 results for @pelikhan:

Test
GitHub MCP	✅
Safe Inputs GH CLI	✅
Serena MCP	❌
Playwright	✅
File Writing + Bash	✅
Discussion Interaction	✅
Build gh-aw	✅
Discussion Creation	✅
Workflow Dispatch	✅
PR Review	✅

Overall: PASS (Serena MCP not available in this env)

📰 BREAKING: Report filed by Smoke Copilot

github-actions

Quick review of PR #17206. The core fix — fetching origin/(branch) before generating the patch — is solid and well-structured with a clear fallback chain. Two minor observations: (1) duplicate changeset files, and (2) hardcoded PATCH_PATH. Overall the logic is correct and well-commented.

📰 BREAKING: Report filed by Smoke Copilot

github-actions · 2026-02-21T00:39:43Z

📰 VERDICT: Smoke Copilot has concluded. All systems operational. This is a developing story. 🎤

github-actions · 2026-02-21T00:40:09Z

PR titles:

Copilot/update smoke labels
[docs] docs: remove bloat from network.md (21% line reduction)
GitHub MCP: ✅
Serena MCP: ✅
Playwright: ✅
File write+verify: ✅
Build (make build): ✅
Overall: PASS

🔮 The oracle has spoken through Smoke Codex

Initial plan
bd8a382

CopilotAI assigned Copilot and pelikhan Feb 20, 2026

Copilotstarted work on behalf of pelikhan February 20, 2026 15:36 View session

Fix push_to_pull_request_branch generating bad patch on issue_comment…
79e3b4b
… follow-up runs Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

CopilotAI changed the title ~~[WIP] Recreate pull request 16927 cleanly~~Fix push_to_pull_request_branch generating bad patch on follow-up issue_comment runsFeb 20, 2026

CopilotAI requested a review from pelikhan February 20, 2026 15:50

Copilotfinished work on behalf of pelikhan February 20, 2026 15:50

pelikhan added the smoke label Feb 20, 2026

This was referenced Feb 20, 2026
[smoke-temporary-id] Test Parent: Temporary ID Validation #17212
Closed
[smoke-temporary-id] Sub-Issue 1: Test Temporary ID References #17213
Closed
[smoke-temporary-id] Sub-Issue 2: Test Different ID Length #17214
Closed

github-actionsBot added smoke-codex and removed smoke labels Feb 20, 2026

github-actionsBot mentioned this pull request Feb 20, 2026
Smoke Test: Copilot - 22230889881 #17216
Closed

github-actionsBot added the smoke-copilot label Feb 20, 2026

github-actionsBot reviewed Feb 20, 2026
View reviewed changes

Comment threadactions/setup/README.md
Comment threadactions/setup/js/generate_git_patch.cjs

github-actionsBot mentioned this pull request Feb 20, 2026
Smoke Test: Claude - 22230889913 #17218
Closed

github-actionsBot reviewed Feb 20, 2026
View reviewed changes

Copilotstarted work on behalf of pelikhan February 20, 2026 17:10 View session

CopilotAI reviewed Feb 20, 2026
View reviewed changes

Comment thread.changeset/smoke-test-push-22232216256.md Outdated
Comment threadactions/setup/js/generate_git_patch.cjs Outdated
Comment threadactions/setup/js/shim.cjs
Comment threadactions/setup/js/safe_outputs_handlers.test.cjs

Fix TypeScript errors in shim.cjs by adding ts-expect-error comments
5ff8086
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Copilotfinished work on behalf of pelikhan February 20, 2026 17:14

test: Add smoke test file for run 22233329042
98a6d6a

github-actionsBot mentioned this pull request Feb 20, 2026
Smoke Test: Claude - 22233329042 #17240
Closed

github-actionsBot added the smoke-claude label Feb 20, 2026

github-actionsBot reviewed Feb 20, 2026
View reviewed changes

pelikhanand others added 5 commits February 20, 2026 11:49

Update actions/setup/js/shim.cjs
3bf047d
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update actions/setup/js/generate_git_patch.cjs
08de326
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update .changeset/smoke-test-push-22232216256.md
b546fad
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix linting
abf44f4

Merge branch 'main' into copilot/recreate-pr-16927-cleanly
9e83b36

pelikhan added the smoke label Feb 21, 2026

github-actionsBot mentioned this pull request Feb 21, 2026
Smoke Test: Copilot - 22246618529 #17345
Closed

github-actionsBot added smoke-copilot and removed smoke labels Feb 21, 2026

github-actionsBot reviewed Feb 21, 2026
View reviewed changes

Comment threadactions/setup/js/generate_git_patch.cjs
Comment thread.changeset/patch-fetch-origin-base-for-push-patch.md

pelikhan closed this Feb 21, 2026

github-actionsBot deleted the copilot/recreate-pr-16927-cleanly branch April 2, 2026 13:10

Uh oh!

Conversation

CopilotAI commented Feb 20, 2026• edited by github-actions BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changeset

Changeset

Changeset

Uh oh!

github-actionsBot commented Feb 20, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot left a comment

Choose a reason for hiding this comment

Uh oh!

pelikhan commented Feb 20, 2026

Uh oh!

github-actionsBot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actionsBotFeb 20, 2026

Choose a reason for hiding this comment

Uh oh!

github-actionsBotFeb 20, 2026

Choose a reason for hiding this comment

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CopilotAI commented Feb 20, 2026

Uh oh!

github-actionsBot commented Feb 20, 2026

Uh oh!

github-actionsBot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actionsBot commented Feb 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Feb 21, 2026

Uh oh!

github-actionsBot commented Feb 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actionsBot commented Feb 21, 2026

Uh oh!

github-actionsBot left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI commented Feb 20, 2026•
edited by github-actions Bot
Loading

github-actionsBot commented Feb 20, 2026•
edited
Loading

github-actionsBot commented Feb 20, 2026•
edited
Loading

github-actionsBot commented Feb 21, 2026•
edited
Loading

github-actionsBot commented Feb 21, 2026•
edited
Loading