be932c846f
When canonical main is not an ancestor of the item HEAD, the gate now merges main into the item workspace under the delivery lock, re-runs the declared checks on the merged commit, and fast-forwards main to it. A conflicting merge is aborted with the workspace verified unchanged and a diagnostic naming the files. Successful catch-ups are logged.
64 lines
3.8 KiB
Markdown
64 lines
3.8 KiB
Markdown
# Delivery stabilization
|
|
|
|
Date: 2026-10-18.
|
|
|
|
The server now has draft-only `delivery=true` support for OpenCode model stages.
|
|
At run time it derives the canonical `main` worktree and linked-worktree Git
|
|
metadata from Git rather than accepting paths from a stage prompt. It verifies
|
|
the committed item tree in a disposable candidate worktree before fast-forwarding
|
|
canonical `main`; declared checks are bounded configuration, not proof that any
|
|
deployed definition has used them. It is denied for Pi (until equivalent
|
|
capability enforcement exists), foreign repositories, missing main worktrees,
|
|
and malformed capabilities. This item does not publish or deploy a definition.
|
|
|
|
The source also supports an optional controlled-fixture verification declaration
|
|
(`backend`, `revision`, `capability`, and `fixture`). Ordinary server setup wires
|
|
an explicit, bounded `reconnect-foreground` HTTP fixture registry when
|
|
`PIPELINES_VERIFICATION_RECONNECT_FOREGROUND_URL` and its expected `BACKEND`,
|
|
`REVISION`, `CAPABILITY`, and `STATE` values are configured. There is no default
|
|
remote URL. The server, not the model, probes that registered endpoint and
|
|
collects its returned backend identity, build revision, capability, fixture ID,
|
|
and state before comparing provenance. Unknown fixtures, incomplete setup,
|
|
wrong backend/revision/capability/state, non-200 responses, cancellation, and
|
|
oversized or malformed responses fail closed. A model result's labels are not
|
|
evidence. This is controlled local/backend fixture infrastructure, not evidence
|
|
of a rendered layout or a live Android device.
|
|
Definitions must be scratch-validated against the deployed server only after
|
|
the server support is deployed; no future delivery or verification definition
|
|
is activated by this source change.
|
|
|
|
`internal/author/skill/references/format.md` and
|
|
`internal/author/skill/references/queue.md` are stale: a later docs fold should
|
|
describe `delivery=true`, OpenCode-only availability, candidate verification,
|
|
and the required activation order (deploy server support before scratch-validating
|
|
and then publishing a definition).
|
|
OpenCode V2 resolves external resources at a containing directory, so delivery
|
|
uses the verified repository metadata directory rather than an impossible
|
|
single-lock-file scope. It does not grant a parent, home, foreign repository,
|
|
or global policy. Unrestricted shell permissions are not an OS sandbox.
|
|
|
|
Activation remains draft-only: deploy compatible server support, configure the
|
|
controlled fixture endpoint and matching provenance, scratch-validate the
|
|
fixture, then publish a definition. No definition is activated by this source
|
|
change.
|
|
|
|
Recovery checklist: retain `connection-reconnect` and unfinished feature
|
|
branches; merge only complete committed trees that pass mapped checks; do not
|
|
infer delivery from a dirty worktree or an old deployed-backend capture.
|
|
|
|
## Catch-up merge when main moved (2026-10-31)
|
|
|
|
Two delivery runs finishing close together used to fail the second with
|
|
"delivery item commit cannot fast-forward canonical main" (run #211), although a
|
|
retry of its Land stage succeeded. Now, while holding the delivery lock, the gate
|
|
merges canonical main's HEAD into the item workspace (`git merge --no-edit`, an
|
|
ordinary merge commit), runs the declared checks on the merged commit in the
|
|
disposable candidate worktree, and only then fast-forwards main. A conflicting
|
|
merge is aborted, the workspace is verified back at its prior commit and clean,
|
|
and the step fails with "main moved and the item no longer merges cleanly:
|
|
<files>". If checks fail on the merged tree, main is untouched; the merge commit
|
|
stays on the item branch and the diagnostic names the catch-up. A successful
|
|
catch-up is written to the server log (a success-step diagnostic renders as a
|
|
stop in the TUI). Nothing is forced onto main and history is never rewritten;
|
|
the clean-checkout, access and ancestry checks are unchanged.
|