David MannandClaude Opus 5.5 72c2585177 Merge origin/main (287352bf92) into integration-batch-13 ...

Conflict in crates/engine/src/jobs.rs: main's save commit point (#5333,
OPEN/COMMITTED/CANCELLED phase) met the batch's cancel state
(CANCEL_REQUESTED/WORK_FINISHED). Both now share one atomic with a
COMMITTED bit; commit vs cancel and the batch's late-cancel guard each
stay one compare-and-swap. A Batch that refuses a repeated or late cancel
reports CancelRefused::Finishing ("finishing") in jobs.cancel's
notCancelled list, still {"cancelled": 0}. control-protocol.md documents both.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

2026-11-03 19:35:44 +01:00

..

photocraft

Merge pull request #5333 from vistaero/codex/streamed-psb-save

2026-11-03 18:41:16 +01:00

photocraft-cli

Merge remote-tracking branch 'origin/main' into HEAD

2026-11-03 17:11:53 +01:00

photocraft-web

Remove 21 requested PR contributions from the 108-PR integration

2026-10-29 18:49:17 +01:00

photocraft-web-boot

test(web): the boot module tells gzip from wasm the browser already inflated (#7639)

2026-10-19 12:37:55 +03:00