From ddc8a939c5a39a4fb124dbc7eee05e66e8895bdf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 26 Oct 2025 12:47:22 +0000 Subject: [PATCH 1/2] Initial plan From c471523587a2eca111d66334fc2338a458388b5e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 26 Oct 2025 12:52:03 +0000 Subject: [PATCH 2/2] Initial plan: Recompile workflow files Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com> --- .../changeset-generator.firewall.lock.yml | 19 ++++++++++++++----- .github/workflows/mergefest.lock.yml | 19 ++++++++++++++----- .github/workflows/poem-bot.lock.yml | 19 ++++++++++++++----- .github/workflows/tidy.lock.yml | 19 ++++++++++++++----- 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/.github/workflows/changeset-generator.firewall.lock.yml b/.github/workflows/changeset-generator.firewall.lock.yml index 619acb11e1b..db903ab4bdc 100644 --- a/.github/workflows/changeset-generator.firewall.lock.yml +++ b/.github/workflows/changeset-generator.firewall.lock.yml @@ -5137,8 +5137,8 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLines = patchLines.slice(0, 100).join("\n"); + core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); @@ -5150,9 +5150,18 @@ jobs: const statusResult = await exec.getExecOutput("git", ["status"]); core.info("Git status output:"); core.info(statusResult.stdout); - const patchResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); - core.info("Failed patch content:"); - core.info(patchResult.stdout); + const logResult = await exec.getExecOutput("git", ["log", "--oneline", "-5"]); + core.info("Recent commits (last 5):"); + core.info(logResult.stdout); + const diffResult = await exec.getExecOutput("git", ["diff", "HEAD"]); + core.info("Uncommitted changes:"); + core.info(diffResult.stdout && diffResult.stdout.trim() ? diffResult.stdout : "(no uncommitted changes)"); + const patchDiffResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); + core.info("Failed patch diff:"); + core.info(patchDiffResult.stdout); + const patchFullResult = await exec.getExecOutput("git", ["am", "--show-current-patch"]); + core.info("Failed patch (full):"); + core.info(patchFullResult.stdout); } catch (investigateError) { core.warning( `Failed to investigate patch failure: ${investigateError instanceof Error ? investigateError.message : String(investigateError)}` diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml index 777b28c2bc5..86e1a3a277c 100644 --- a/.github/workflows/mergefest.lock.yml +++ b/.github/workflows/mergefest.lock.yml @@ -4824,8 +4824,8 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLines = patchLines.slice(0, 100).join("\n"); + core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); @@ -4837,9 +4837,18 @@ jobs: const statusResult = await exec.getExecOutput("git", ["status"]); core.info("Git status output:"); core.info(statusResult.stdout); - const patchResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); - core.info("Failed patch content:"); - core.info(patchResult.stdout); + const logResult = await exec.getExecOutput("git", ["log", "--oneline", "-5"]); + core.info("Recent commits (last 5):"); + core.info(logResult.stdout); + const diffResult = await exec.getExecOutput("git", ["diff", "HEAD"]); + core.info("Uncommitted changes:"); + core.info(diffResult.stdout && diffResult.stdout.trim() ? diffResult.stdout : "(no uncommitted changes)"); + const patchDiffResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); + core.info("Failed patch diff:"); + core.info(patchDiffResult.stdout); + const patchFullResult = await exec.getExecOutput("git", ["am", "--show-current-patch"]); + core.info("Failed patch (full):"); + core.info(patchFullResult.stdout); } catch (investigateError) { core.warning( `Failed to investigate patch failure: ${investigateError instanceof Error ? investigateError.message : String(investigateError)}` diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml index afe2d83720d..f068917f751 100644 --- a/.github/workflows/poem-bot.lock.yml +++ b/.github/workflows/poem-bot.lock.yml @@ -6627,8 +6627,8 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLines = patchLines.slice(0, 100).join("\n"); + core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); @@ -6640,9 +6640,18 @@ jobs: const statusResult = await exec.getExecOutput("git", ["status"]); core.info("Git status output:"); core.info(statusResult.stdout); - const patchResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); - core.info("Failed patch content:"); - core.info(patchResult.stdout); + const logResult = await exec.getExecOutput("git", ["log", "--oneline", "-5"]); + core.info("Recent commits (last 5):"); + core.info(logResult.stdout); + const diffResult = await exec.getExecOutput("git", ["diff", "HEAD"]); + core.info("Uncommitted changes:"); + core.info(diffResult.stdout && diffResult.stdout.trim() ? diffResult.stdout : "(no uncommitted changes)"); + const patchDiffResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); + core.info("Failed patch diff:"); + core.info(patchDiffResult.stdout); + const patchFullResult = await exec.getExecOutput("git", ["am", "--show-current-patch"]); + core.info("Failed patch (full):"); + core.info(patchFullResult.stdout); } catch (investigateError) { core.warning( `Failed to investigate patch failure: ${investigateError instanceof Error ? investigateError.message : String(investigateError)}` diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml index db11190bf65..b297f56ad39 100644 --- a/.github/workflows/tidy.lock.yml +++ b/.github/workflows/tidy.lock.yml @@ -5131,8 +5131,8 @@ jobs: } const finalPatchContent = fs.readFileSync("/tmp/gh-aw/aw.patch", "utf8"); const patchLines = finalPatchContent.split("\n"); - const previewLines = patchLines.slice(0, 500).join("\n"); - core.info(`Patch preview (first ${Math.min(500, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); + const previewLines = patchLines.slice(0, 100).join("\n"); + core.info(`Patch preview (first ${Math.min(100, patchLines.length)} of ${patchLines.length} lines):\n${previewLines}`); await exec.exec("git am /tmp/gh-aw/aw.patch"); core.info("Patch applied successfully"); await exec.exec(`git push origin ${branchName}`); @@ -5144,9 +5144,18 @@ jobs: const statusResult = await exec.getExecOutput("git", ["status"]); core.info("Git status output:"); core.info(statusResult.stdout); - const patchResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); - core.info("Failed patch content:"); - core.info(patchResult.stdout); + const logResult = await exec.getExecOutput("git", ["log", "--oneline", "-5"]); + core.info("Recent commits (last 5):"); + core.info(logResult.stdout); + const diffResult = await exec.getExecOutput("git", ["diff", "HEAD"]); + core.info("Uncommitted changes:"); + core.info(diffResult.stdout && diffResult.stdout.trim() ? diffResult.stdout : "(no uncommitted changes)"); + const patchDiffResult = await exec.getExecOutput("git", ["am", "--show-current-patch=diff"]); + core.info("Failed patch diff:"); + core.info(patchDiffResult.stdout); + const patchFullResult = await exec.getExecOutput("git", ["am", "--show-current-patch"]); + core.info("Failed patch (full):"); + core.info(patchFullResult.stdout); } catch (investigateError) { core.warning( `Failed to investigate patch failure: ${investigateError instanceof Error ? investigateError.message : String(investigateError)}`