Skip to content

chore: back-merge main into develop - #10

Merged
lorem-dev merged 2 commits into
developfrom
main
Sep 8, 2026
Merged

chore: back-merge main into develop#10
lorem-dev merged 2 commits into
developfrom
main

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

Automated back-merge of main into develop. Auto-merge is on, so this merges itself once the required checks pass.

Latest commit on main: 5bd7eef - Merge pull request #9 from lorem-dev/develop

Triggered by push to main in workflow Back-merge main -> develop run 34272971888.

Merge this with a MERGE COMMIT, not a squash. A squash copies main's content without its history, so git stops knowing that develop already contains it and every later back-merge conflicts on files nobody touched. That is what happened once already; see the comment at the top of .github/workflows/backmerge.yml.

lorem-dev and others added 2 commits September 8, 2026 22:07
CI said what the old assertion could not: "a second job was accepted while
01M21AB... held the lock. That job is now running at 0%." The first job was
alive, so this was never the race it looked like -- the second launcher was
accepted because there was no lock to see yet.

`createJob` writes `state: 'running'` in the LAUNCHER, before the child
exists, and the child is what calls `withJobLock`. Between the launcher
exiting and the child taking the lock there is a window with no lock file,
which is exactly why `jobLockHolder` documents itself as advisory and why
`exclusiveLock.ts` says the parent gives a synchronous refusal while the
child takes the real lock. The test polled the state and then demanded a
refusal -- a guarantee the design never made.

It now waits for the lock file itself, which is the only state where an
up-front refusal is meant to hold. The product behaviour is unchanged and
still as documented: two `--detach` launches inside that window are both
accepted, and the second job then fails against the real lock.
@lorem-dev
lorem-dev merged commit 20422e1 into develop Sep 8, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant