Repository navigation
fix: report a PR closed during the auto-merge wait and fail the run #103
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.
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
Closed
vitali87
wants to merge
366
commits into
fix/merge-fetch-error-exit
from
fix/merge-closed-while-polling
Closed
Changes from all commits
Commits
Show all changes
366 commits
Select commit
Hold shift + click to select a range
e1accdc
fix: parse C-quoted paths that contain spaces without phantom files o…
vitali87 494f537
fix: round-trip non-UTF-8 text files instead of crashing with Unicode…
vitali87 fa37abf
fix: report an Anthropic token-count failure as an LLM error instead …
vitali87 7f438fa
Merge branch 'main' into fix/derived-min-loc-floor
vitali87 fc6ad35
Merge pull request #72 from vitali87/fix/derived-min-loc-floor
vitali87 4a5e22a
Merge branch 'main' into fix/reject-binary-files
vitali87 d14675a
Merge pull request #61 from vitali87/fix/reject-binary-files
vitali87 2ceadb8
Merge branch 'main' into fix/duplicate-file-assignments
vitali87 7878a8d
Merge pull request #68 from vitali87/fix/duplicate-file-assignments
vitali87 40367e4
Merge branch 'main' into fix/status-unverified-state
vitali87 ec2f754
Merge pull request #120 from vitali87/fix/status-unverified-state
vitali87 94613fd
Merge branch 'main' into fix/reject-remote-tracking-base
vitali87 3f9581d
Merge pull request #144 from vitali87/fix/reject-remote-tracking-base
vitali87 f4682b8
Merge branch 'main' into fix/stacked-grandchild-ancestor-hunks
vitali87 408cffb
Merge pull request #54 from vitali87/fix/stacked-grandchild-ancestor-…
vitali87 6d5a5f0
Merge branch 'main' into fix/reliable-branch-cleanup
vitali87 d6c8930
Merge pull request #55 from vitali87/fix/reliable-branch-cleanup
vitali87 19a65fe
Merge branch 'main' into fix/fork-ref-error-handling
vitali87 f8f48a0
Merge pull request #56 from vitali87/fix/fork-ref-error-handling
vitali87 ac60a99
Merge branch 'main' into chore/remove-dead-checkout-helpers
vitali87 2ddb9e2
Merge pull request #57 from vitali87/chore/remove-dead-checkout-helpers
vitali87 14831cf
Merge branch 'main' into fix/graph-partition-acyclic
vitali87 93cf0fb
Merge pull request #62 from vitali87/fix/graph-partition-acyclic
vitali87 5917543
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 3e11f48
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 71c3c01
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 db1ff47
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 bce2f38
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 96fe719
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 7572bf2
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 275b316
Merge pull request #67 from vitali87/fix/merge-blocked-dependencies
vitali87 ac4c1ec
Merge branch 'main' into fix/reject-truncated-llm-output
vitali87 c2ea13e
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 5ef9309
Merge branch 'main' into fix/branch-creation-errors-clean
vitali87 e59befd
Merge branch 'main' into fix/commit-without-hooks
vitali87 d1c220a
Merge pull request #86 from vitali87/fix/reject-truncated-llm-output
vitali87 3cd6d85
Merge branch 'main' into fix/branch-creation-errors-clean
vitali87 d3e6169
Merge pull request #125 from vitali87/fix/branch-creation-errors-clean
vitali87 91fb98a
Merge branch 'main' into fix/clean-skips-merged-prs
vitali87 83cc471
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 ad71c8f
Merge remote-tracking branch 'origin/fix/commit-without-hooks' into HEAD
vitali87 f094123
Merge remote-tracking branch 'origin/main' into HEAD
vitali87 cae09bc
Merge branch 'main' into fix/cp-sat-feasible-warning
vitali87 42c1181
Merge pull request #161 from vitali87/fix/commit-without-hooks
vitali87 dd753f7
Merge branch 'main' into fix/clean-skips-merged-prs
vitali87 ebf9639
Merge branch 'main' into fix/cp-sat-feasible-warning
vitali87 c94c731
Merge branch 'main' into fix/plan-store-corrupt-file
vitali87 b0de942
Merge pull request #151 from vitali87/fix/clean-skips-merged-prs
vitali87 d374799
Merge branch 'main' into fix/cp-sat-feasible-warning
vitali87 94b2e88
Merge origin/main into fix/plan-store-corrupt-file
vitali87 d7edd1e
Merge pull request #64 from vitali87/fix/plan-store-corrupt-file
vitali87 271f9b6
fix: report the configured CP-SAT timeout exactly in the not-optimal …
vitali87 a771a5c
Merge branch 'main' into fix/cp-sat-feasible-warning
vitali87 95cdcd9
Merge pull request #130 from vitali87/fix/cp-sat-feasible-warning
vitali87 f2af1e8
build(deps): bump the uv group across 1 directory with 2 updates
dependabot[bot] 31ddac8
ci: pin pr-split action to the fixed main SHA so the split comment po…
vitali87 939fdb1
ci: re-pin pr-split to the v1.0.1 release (same SHA)
vitali87 ee1b7b2
docs: point the action example at v1.0.1
vitali87 461b37c
Merge pull request #184 from vitali87/dependabot/uv/uv-eb80c93eb9
vitali87 8656509
fix: surface malformed LLM plan output as LLMError
vitali87 17c8d65
fix: preserve CRLF line endings in reconstructed files
vitali87 a1386dd
test: assert newline='' on worktree writes and cover a bare CR base file
vitali87 2b16708
fix: keep non-ASCII paths unescaped in the extracted diff
vitali87 6d38652
Merge branch 'main' into ci/pin-fixed-score
vitali87 9d70f29
Merge pull request #188 from vitali87/ci/pin-fixed-score
vitali87 a27d625
Merge branch 'main' into fix/whole-file-loc-accounting
vitali87 9cb1b61
test: exercise the stale WHOLE_FILE index case on the conflict check
vitali87 790761c
Merge branch 'main' into fix/llm-parse-errors
vitali87 af81a6b
Merge branch 'fix/whole-file-loc-accounting' into fix/interactive-mov…
vitali87 1ec20bf
Merge branch 'fix/llm-parse-errors' into fix/score-plan-cycle
vitali87 2746783
Merge branch 'main' into fix/skip-refinement-after-chunking
vitali87 d8e8d1d
fix: require hunk counts in validate_no_conflicts
vitali87 6f7c693
Merge branch 'main' into fix/preserve-crlf
vitali87 8f23570
Merge pull request #58 from vitali87/fix/whole-file-loc-accounting
vitali87 03fbb36
Merge branch 'main' into fix/interactive-move-recompute-loc
vitali87 41ee517
Merge branch 'fix/interactive-move-recompute-loc' into fix/editor-dro…
vitali87 6911607
Merge branch 'main' into fix/llm-parse-errors
vitali87 b2bad6f
Merge branch 'fix/llm-parse-errors' into fix/score-plan-cycle
vitali87 a170f6c
Merge pull request #60 from vitali87/fix/interactive-move-recompute-loc
vitali87 d33f952
Merge branch 'main' into fix/editor-drops-empty-groups
vitali87 0db9f05
Merge branch 'main' into fix/llm-parse-errors
vitali87 71ae420
fix: make dependants of a dropped group depend on its hunks' new owners
vitali87 1f6e915
fix: skip recipient dependencies that would create a cycle
vitali87 67795cf
fix: refuse dropping a group whose hunks moved downstream of its depe…
vitali87 3616470
fix: skip recipient edges the dependant already reaches through an an…
vitali87 6db4cd8
Merge pull request #129 from vitali87/fix/editor-drops-empty-groups
vitali87 dd1d076
Merge branch 'main' into fix/llm-parse-errors
vitali87 effce8a
Merge branch 'fix/llm-parse-errors' into fix/score-plan-cycle
vitali87 ed1a000
Merge pull request #59 from vitali87/fix/llm-parse-errors
vitali87 3441dfa
Merge branch 'main' into fix/score-plan-cycle
vitali87 ff17dea
Merge pull request #63 from vitali87/fix/score-plan-cycle
vitali87 cdb92a1
fix: keep the current plan when LLM refinement drops hunks or does no…
vitali87 6b141a0
Merge branch 'main' into fix/preserve-crlf
vitali87 0a204bd
fix: reject a refined plan whose dependency graph is invalid
vitali87 5cb4939
Merge pull request #121 from vitali87/fix/refinement-keeps-valid-plan
vitali87 4882a4b
Merge branch 'main' into fix/preserve-crlf
vitali87 5a4ebd1
Merge branch 'main' into fix/skip-refinement-after-chunking
vitali87 f671817
Merge pull request #77 from vitali87/fix/skip-refinement-after-chunking
vitali87 45a016f
docs: install pr-split from the git repository, not PyPI
vitali87 8d34687
fix: round-trip non-UTF-8 text files instead of crashing with Unicode…
vitali87 19ded1b
fix: lay out dependent groups along the plan DAG without --stack
vitali87 b2b002c
Merge branch 'main' into fix/preserve-crlf
vitali87 0e058d5
fix: root each native stack on its bottom PR's base, not the default …
vitali87 4f454b2
fix: flag an oversized PR in the score action even without a usable plan
vitali87 c8e6ded
Merge pull request #70 from vitali87/fix/preserve-crlf
vitali87 442bf07
Merge branch 'main' into fix/unicode-paths-in-diff
vitali87 a29e48f
Merge pull request #93 from vitali87/fix/unicode-paths-in-diff
vitali87 d6d6bb3
fix: decode C-quoted paths from git diff so files are not written und…
vitali87 b2d907b
fix: keep non-UTF-8 filename bytes when unquoting a C-quoted path
vitali87 0c62046
fix: accept a same-repo PR number in split
vitali87 5951671
fix: keep a diff within --max-loc as one group without running a backend
vitali87 61afcf8
fix: adopt a branch that exists only as a remote-tracking ref in split
vitali87 ecdab96
feat: edit dependencies, titles and descriptions in the plan editor
vitali87 3f78107
fix: resume execute past groups whose PRs already exist, and retry tr…
vitali87 2bbd1cc
Merge pull request #105 from vitali87/fix/unquote-c-quoted-paths
vitali87 e89daab
fix: parse C-quoted paths that contain spaces without phantom files o…
vitali87 b11aefb
feat: adopt already-built branches as a native stack
vitali87 5743cc0
feat: add a claude-cli provider that plans through the local Claude C…
vitali87 8688aa0
fix: say when groups exceed --max-loc and record them in the plan
vitali87 c2ea617
feat: record how a plan was made and say when re-running may change it
vitali87 cc72ae2
fix: name oversized groups that hold a single hunk as unsplittable
vitali87 7a41072
feat: retarget a split whose base branch has merged
vitali87 d2cbc21
feat: order groups by the names they define and use
vitali87 dec4a73
feat: group units that share names in the graph backend and name ever…
vitali87 c3a6541
feat: keep one plan per dev branch and keep the plan dir out of git
vitali87 82c3b6c
feat: plan with a local LLM through any OpenAI-compatible server
claude d47d7ab
feat: split an oversized new file across a stack at top-level boundaries
claude 75e56b6
refactor: place the new-file piece check where it cannot collide with…
claude 49a664a
fix: re-list a generated group description after an editor move
claude 7e99e6e
fix: diff against the base branch's upstream so a stale local base is…
claude bb3c150
feat: add `restack` to carry a lower layer's fix up a stack
claude 9caf815
feat: run a repository-defined step on every sub-PR branch before pus…
claude 40c284d
fix: repair a skipped, duplicated or invented hunk in an LLM plan ins…
claude b5b596b
feat: fall back to the graph backend when no LLM provider is configured
claude 2d15c83
feat: add `move` to shift a hunk up an executed stack without closing…
claude 9786ff5
fix: warn when the local provider's server is not on this machine
claude 1c73687
Merge branch 'feat/local-llm-provider' into feat/split-oversized-new-…
claude b0f100d
Merge branch 'feat/split-oversized-new-files' into fix/editor-move-re…
claude 32343db
Merge branch 'fix/editor-move-refreshes-description' into fix/diff-ag…
claude d10d3d8
Merge branch 'fix/diff-against-upstream-base' into feat/restack
claude f01757b
Merge branch 'feat/restack' into feat/per-group-step
claude a60a20a
Merge branch 'feat/per-group-step' into fix/repair-llm-plan
claude 679b936
Merge branch 'fix/repair-llm-plan' into feat/graph-fallback-without-key
claude b8e5085
Merge branch 'feat/graph-fallback-without-key' into feat/move-hunk-ac…
claude aa279c7
fix: say when the context window leaves no room for a diff chunk
claude c6c346f
Merge branch 'feat/local-llm-provider' into feat/split-oversized-new-…
claude ad53a38
Merge branch 'feat/split-oversized-new-files' into fix/editor-move-re…
claude 415f0d6
Merge branch 'fix/editor-move-refreshes-description' into fix/diff-ag…
claude fdb58cb
Merge branch 'fix/diff-against-upstream-base' into feat/restack
claude 3e2d14e
Merge branch 'feat/restack' into feat/per-group-step
claude e63140d
Merge branch 'feat/per-group-step' into fix/repair-llm-plan
claude ba0ce5e
Merge branch 'fix/repair-llm-plan' into feat/graph-fallback-without-key
claude a182893
Merge branch 'feat/graph-fallback-without-key' into feat/move-hunk-ac…
claude bd144c1
Merge pull request #226 from vitali87/feat/local-llm-provider
vitali87 640f746
Merge pull request #227 from vitali87/feat/split-oversized-new-files
vitali87 2496fbb
Merge pull request #228 from vitali87/fix/editor-move-refreshes-descr…
vitali87 76b0251
Merge pull request #229 from vitali87/fix/diff-against-upstream-base
vitali87 234d7d5
Merge pull request #230 from vitali87/feat/restack
vitali87 480f555
Merge pull request #231 from vitali87/feat/per-group-step
vitali87 16cde3d
Merge pull request #232 from vitali87/fix/repair-llm-plan
vitali87 381c37d
Merge pull request #233 from vitali87/feat/graph-fallback-without-key
vitali87 6a86b6b
Merge pull request #234 from vitali87/feat/move-hunk-across-stack
vitali87 d226eb6
feat: restack --onto-base brings a stack up to date when its base moves
claude 2f7d5db
fix: leave every local branch as found when restack stops, and follow…
claude 1e18759
fix: annotate restack's base_remote as the (remote, branch) pair it is
claude 545ae9c
Merge pull request #235 from vitali87/claude/nice-gauss-whhkxl
vitali87 941bf3b
feat: recover a lost plan from the stack's branches and PRs
claude 4198a49
fix: narrow recover's PR listing on the server and skip fork PRs
claude 12c9e32
Merge pull request #236 from vitali87/claude/nice-gauss-whhkxl
vitali87 9d95502
Merge origin/main into fix/execute-resume-partial-prs
claude 6c92598
Merge origin/main into feat/claude-cli-provider
claude a75c33b
Merge origin/main into feat/per-branch-plans
claude 744bcdb
fix: log execute's completion once; the main merge doubled the line
claude 7071359
Merge origin/main into fix/pr-creation-error-message
claude 6dbfad9
Merge branch 'fix/pr-creation-error-message' into fix/execute-retry
claude 467d897
test: patch plan validation in execute-retry tests that feed a mocked…
claude 328c839
Merge branch 'fix/execute-retry' into fix/execute-resume-partial-prs
claude f5fbf01
Merge origin/main into fix/plan-paths-at-repo-root
claude da75e67
Merge fix/plan-paths-at-repo-root (with main) into fix/ignore-plan-di…
claude 257a66f
Merge fix/ignore-plan-dir-in-clean-check (with main) into fix/atomic-…
claude 4777ad1
Merge fix/atomic-plan-save (with main) into feat/per-branch-plans
claude 2d23ac0
fix: keep a kept layer's parents on a stacked resume, and accept a pu…
claude b4b787e
fix: per-branch plan storage — unique names, legacy handling, exclude…
claude a18a825
Merge pull request #174 from vitali87/fix/pr-creation-error-message
vitali87 fe622af
fix: retry execute after a failed push instead of forcing a full re-plan
vitali87 1e0ef94
test: patch plan validation in execute-retry tests that feed a mocked…
claude a39bfa3
Merge fix/execute-retry (rebased onto main after #174 merged) into fi…
claude d556b0e
Merge pull request #176 from vitali87/fix/execute-retry
claude ed0e4fe
Merge remote-tracking branch 'origin/main' into feat/claude-cli-provider
claude e73fe84
Merge remote-tracking branch 'origin/main' into fix/execute-honours-d…
claude 862c2aa
Merge pull request #211 from vitali87/feat/claude-cli-provider
vitali87 9e4bc2d
Merge remote-tracking branch 'origin/main' into docs/install-from-git
claude d88f23e
Give the pip install command in the cp-sat hint too
claude 3c74e5b
Merge remote-tracking branch 'origin/main' into fix/execute-honours-d…
claude cb8aad6
Name a merge node's carried ancestors in its PR body; test unstacked …
claude 5b5de02
Merge remote-tracking branch 'origin/main' into fix/score-oversized-w…
claude dd43f8e
Keep a below-threshold plan's group count in the score output
claude 734e746
Merge remote-tracking branch 'origin/main' into fix/same-repo-pr-number
claude b55c445
Fetch a PR's head as refs/pull/N/head from the repository gh resolved
claude 4c389ac
Merge remote-tracking branch 'origin/main' into fix/plan-paths-at-rep…
claude 27554db
Qualify the README's parent-targeting claims for multi-parent groups
claude cb4cb42
Merge pull request #203 from vitali87/fix/score-oversized-without-plan
vitali87 55d1dc3
Merge remote-tracking branch 'origin/main' into fix/same-repo-pr-number
claude cd80d60
Merge pull request #204 from vitali87/fix/same-repo-pr-number
vitali87 260475e
Merge remote-tracking branch 'origin/main' into docs/install-from-git
claude 80401f9
Merge pull request #200 from vitali87/docs/install-from-git
vitali87 c0fa64f
Merge remote-tracking branch 'origin/main' into fix/execute-honours-d…
claude 0a94cd1
Merge pull request #201 from vitali87/fix/execute-honours-dag-unstacked
vitali87 1d6bd3e
Merge remote-tracking branch 'origin/main' into fix/small-diff-single…
claude d7bec79
Merge pull request #205 from vitali87/fix/small-diff-single-group
vitali87 e7a66bd
Merge remote-tracking branch 'origin/main' into fix/adopt-remote-only…
claude 4cc8976
Track the remote when adopting a remote-only branch
claude 733ffdb
Merge pull request #206 from vitali87/fix/adopt-remote-only-branch
vitali87 f033374
Merge remote-tracking branch 'origin/main' into feat/editor-plan-comm…
claude 68031af
Merge pull request #207 from vitali87/feat/editor-plan-commands
vitali87 e0d2ca6
Merge origin/main into fix/report-groups-over-max-loc
claude 4fa89d8
Count the hunks a WHOLE_FILE assignment covers in the oversized report
claude 88b8126
Merge pull request #212 from vitali87/fix/report-groups-over-max-loc
vitali87 a7db240
Merge origin/main into feat/plan-provenance
claude 2d9415e
Merge remote-tracking branch 'origin/main' into fix/stack-link-plan-base
claude 10fe757
Merge pull request #213 from vitali87/feat/plan-provenance
vitali87 514a0da
Merge remote-tracking branch 'origin/main' into fix/stack-link-plan-base
claude 7b53936
Merge origin/main into feat/adopt-existing-branches
claude d291262
Match an adopted branch's PR exactly and say how to finish a failed a…
claude 6c9640b
Merge origin/main into feat/symbol-dependencies
claude cde9228
Merge origin/main into fix/plan-paths-at-repo-root
claude 701d55e
Merge origin/main into fix/quoted-paths-with-spaces
claude a696612
Merge remote-tracking branch 'origin/main' into feat/adopt-existing-b…
claude 4992c9a
Never close or delete an adopted stack's PRs and branches in clean
claude abc5c78
Merge pull request #237 from vitali87/claude/nice-gauss-whhkxl
vitali87 c740b86
Merge origin/main into feat/retarget-merged-base
claude a8815c6
Merge remote-tracking branch 'origin/main' into feat/semantic-graph-g…
claude c781542
Merge remote-tracking branch 'origin/main' into feat/per-branch-plans
claude 083fc61
Merge origin/main into feat/per-branch-plans; file an adopted stack u…
claude 72db7e7
Merge origin/main into fix/execute-resume-partial-prs
claude 4c72122
Merge origin/main into fix/clean-tolerates-deleted-branches
claude cbc144c
Merge origin/main into fix/count-tokens-errors
claude 20b846f
Merge pull request #238 from vitali87/claude/nice-gauss-whhkxl
vitali87 a077b94
Merge remote-tracking branch 'origin/main' into feat/semantic-graph-g…
claude 8e41252
Merge pull request #239 from vitali87/feat/semantic-graph-groups
vitali87 fdfee88
Merge remote-tracking branch 'origin/main' into feat/per-branch-plans
claude 1bee2e9
Merge pull request #240 from vitali87/feat/per-branch-plans
vitali87 769ba85
Merge origin/main into fix/clean-tolerates-deleted-branches
claude c4a5477
Merge origin/main into fix/execute-resume-partial-prs
claude e8d00e1
Keep a resumed layer's ancestors whenever the plan has dependencies
claude 6d3ed4b
Merge pull request #241 from vitali87/fix/execute-resume-partial-prs
vitali87 6256a77
Merge remote-tracking branch 'origin/main' into fix/count-tokens-errors
claude 671a081
Merge pull request #242 from vitali87/fix/count-tokens-errors
vitali87 5e19445
Merge origin/main into fix/merge-closed-while-polling
claude 9437e7b
docs: describe the pr_closed exit for a PR closed during the auto-mer…
claude File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Run an action commit that contains the new scorer.
If planning fails for an oversized PR, the pinned action still sets
should_split=false. Its comment step then does not run. The action executes its bundledscripts/score_pr.py, not the changed script in this checkout. Pin a commit that contains the new scorer, or run the checked-out script explicitly. (raw.githubusercontent.com)🤖 Prompt for AI Agents