Commit fails as hunks can't be applied: "hunks must be in order from top to bottom of the file"

[Byron]

Previously reported in https://discord.com/channels/1060193121130000425/1204524097241878629/1388609794771783871.

command: create_commit_from_worktree_changes
params: {"projectId":"242d50f5-4fad-4a55-8ca9-ed5d19a854a8","stackId":"52d0ea17-8f06-4054-9c3a-85809915b4f1","message":"feat(ui): update trigger button and section header","stackBranchName":"ui-burler-actions","worktreeChanges":[{"pathBytes":[97,112,112,115,47,100,101,115,107,116,111,112,47,115,114,99,47,99,111,109,112,111,110,101,110,116,115,47,67,104,114,111,109,101,72,101,97,100,101,114,46,115,118,101,108,116,101],"previousPathBytes":null,"hunkHeaders":[{"newLines":10,"newStart":64,"oldLines":8,"oldStart":64},{"newLines":56,"newStart":167,"oldLines":12,"oldStart":165},{"newLines":44,"newStart":230,"oldLines":6,"oldStart":184}]},{"pathBytes":[97,112,112,115,47,100,101,115,107,116,111,112,47,115,114,99,47,99,111,109,112,111,110,101,110,116,115,47,118,51,47,70,101,101,100,46,115,118,101,108,116,101],"previousPathBytes":null,"hunkHeaders":[{"oldStart":0,"oldLines":0,"newStart":105,"newLines":1},{"oldStart":0,"oldLines":0,"newStart":107,"newLines":1},{"newLines":16,"newStart":1,"oldLines":14,"oldStart":1},{"newLines":8,"newStart":70,"oldLines":7,"oldStart":68},{"oldStart":88,"oldLines":2,"newStart":0,"newLines":0},{"oldStart":92,"oldLines":1,"newStart":0,"newLines":0},{"oldStart":101,"oldLines":1,"newStart":0,"newLines":0},{"oldStart":107,"oldLines":1,"newStart":0,"newLines":0},{"oldStart":109,"oldLines":1,"newStart":0,"newLines":0}]},{"pathBytes":[97,112,112,115,47,100,101,115,107,116,111,112,47,115,114,99,47,99,111,109,112,111,110,101,110,116,115,47,118,51,47,87,111,114,107,115,112,97,99,101,86,105,101,119,46,115,118,101,108,116,101],"previousPathBytes":null,"hunkHeaders":[{"newLines":7,"newStart":80,"oldLines":7,"oldStart":80}]}]})

hunks must be in order from top to bottom of the file

Screen_Recording_2025-06-28_at_21.56.19.mov

[Byron]

It's not yet reproduced actually, so it seems to need a certain constellation of patches to kick in.

[anvilpete]

I'm also seeing this fairly often when selecting hunks for commit. @Byron let me know if you need anything to help reproduce or debug this.

[Byron]

Thanks for the offer! It can probably be reproduced by exploring/messing with hunk selections to reach a selection that fails like this. From there it should be possible to figure out if the frontend sends unreasonable hunks, or if the backend can't handle legitimate hunks for some reason.

At least in the video this happens when committing where hunk don't see much processing.

With that said, if you happen to stumble over it in a small repository that can be zipped up and attached to the issue along with a video or screenshot on which hunks to select, I think this issue could be resolved fairly soon.

Thanks again.

[anvilpete]

Sure, here's a minimal repro:

1. Commit and push a file containing:

line 1

line 2

line 3

2. Edit the file to:

line 11

line 22

line 33

3. Attempt to commit just the first and last line

[anvilpete]

(also fails if you attempt to commit just the first+second or second+third changes)

[Byron]

Thanks a million! I could easily reproduce the issue and took a look at the hunks sent to the backend, and it appears they are out of order.

For instance, this selection…

…results in…

{
  "projectId": "f0211ce8-e680-456b-be2c-165a464f0f44",
  "stackId": "d834c970-bf87-40e7-8661-c8a60c68b03a",
  "message": "change",
  "stackBranchName": "st-branch-14",
  "worktreeChanges": [
    {
      "pathBytes": [
        104,
        117,
        110,
        107,
        115
      ],
      "previousPathBytes": null,
      "hunkHeaders": [
        {
          "oldStart": 0,
          "oldLines": 0,
          "newStart": 3,
          "newLines": 1
        },
        {
          "oldStart": 0,
          "oldLines": 0,
          "newStart": 5,
          "newLines": 1
        },
        {
          "oldStart": 3,
          "oldLines": 1,
          "newStart": 0,
          "newLines": 0
        },
        {
          "oldStart": 5,
          "oldLines": 1,
          "newStart": 0,
          "newLines": 0
        }
      ]
    }
  ]
}

…but I think it should be…

{
  "projectId": "f0211ce8-e680-456b-be2c-165a464f0f44",
  "stackId": "d834c970-bf87-40e7-8661-c8a60c68b03a",
  "message": "change",
  "stackBranchName": "st-branch-14",
  "worktreeChanges": [
    {
      "pathBytes": [
        104,
        117,
        110,
        107,
        115
      ],
      "previousPathBytes": null,
      "hunkHeaders": [
        {
          "oldStart": 0,
          "oldLines": 0,
          "newStart": 3,
          "newLines": 1
        },
        {
          "oldStart": 3,
          "oldLines": 1,
          "newStart": 0,
          "newLines": 0
        },
        {
          "oldStart": 0,
          "oldLines": 0,
          "newStart": 5,
          "newLines": 1
        },
        {
          "oldStart": 5,
          "oldLines": 1,
          "newStart": 0,
          "newLines": 0
        }
      ]
    }
  ]
}

@estib-vega may still have context for this, and if the order is changed to basically top-to-bottom in order of the checkboxes, then it should work.

[estib-vega]

Sorry for the inconvenience!
The sorting function seems to have had an issue. I've now take care of that. Fix should be available in the next release

[anvilpete]

Many thanks, appreciate this feature! Perhaps we can close #5929?