Skip to content

Improve fallback issue instructions when PR creation fails #18536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsyme merged 4 commits into from
Feb 26, 2026
Merged

Improve fallback issue instructions when PR creation fails #18536

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
deea1e7
Initial plan
Copilot Feb 26, 2026
9dc8954
Improve fallback issue instructions for pull request creation failures
Copilot Feb 26, 2026
e482236
Merge branch 'main' into copilot/improve-pull-request-error-instructions
dsyme Feb 26, 2026
4b196d5
Update actions/setup/js/create_pull_request.cjs
dsyme Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions actions/setup/js/create_pull_request.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,16 +673,23 @@ async function main(config = {}) {
>
> The patch file is available in the \`agent-artifacts\` artifact in the workflow run linked above.

To apply the patch locally:
To create a pull request with the changes:

\`\`\`sh
# Download the artifact from the workflow run ${runUrl}
# (Use GitHub MCP tools if gh CLI is not available)
# Download the artifact from the workflow run
gh run download ${runId} -n agent-artifacts -D /tmp/agent-artifacts-${runId}

# The patch file will be at agent-artifacts/tmp/gh-aw/${patchFileName} after download
# Create a new branch
git checkout -b ${branchName}

# Apply the patch (--3way handles cross-repo patches where files may already exist)
git am --3way /tmp/agent-artifacts-${runId}/${patchFileName}

# Push the branch to origin
git push origin ${branchName}

# Create the pull request
gh pr create --title '${title}' --base ${baseBranch} --head ${branchName} --repo ${repoParts.owner}/${repoParts.repo}
\`\`\`
${patchPreview}`;

Expand Down Expand Up @@ -936,11 +943,17 @@ ${patchPreview}`;

---

**Note:** This was originally intended as a pull request, but PR creation failed. The changes have been pushed to the branch [\`${branchName}\`](${branchUrl}).
> [!NOTE]
> This was originally intended as a pull request, but PR creation failed. The changes have been pushed to the branch [\`${branchName}\`](${branchUrl}).
>
> **Original error:** ${errorMessage}

**Original error:** ${errorMessage}
To create the pull request manually:

You can manually create a pull request from the branch if needed.${patchPreview}`;
\`\`\`sh
gh pr create --title "${title}" --base ${baseBranch} --head ${branchName} --repo ${repoParts.owner}/${repoParts.repo}
\`\`\`
${patchPreview}`;

try {
const { data: issue } = await github.rest.issues.create({
Expand Down
Loading