Skip to content

Give the Windows supervisor job room to finish - #325

Merged
BunsDev merged 2 commits into
mainfrom
fix/windows-supervisor-timeout
Sep 18, 2026
Merged

BunsDev merged 2 commits into
mainfrom
fix/windows-supervisor-timeout

Conversation

@BunsDev

@BunsDev BunsDev commented Sep 18, 2026

Copy link
Copy Markdown
Member

Closes #324.

Windows supervisor behavior is capped at timeout-minutes: 20 and needs 18 to 20, so it dies on the cap. GitHub reports the overrun as cancelled, which reads as a flake. It has taken out #313 three times and main twice, always after every assertion passed, in the final cargo check step.

Raises the cap to 30 on that job only.

Two commits, as the protocol requires

.github/workflows/ci.yml is one of the 25 files under harnessAuthority, so this follows the two-step in docs/phase1-conformance.md:

  • 74689b1 — the edit, plus ci.yml's new blob and SHA-256 in the lock and in the test's literal copy. Every digest rides with the change itself.
  • ef7bd74 — repin only: harness.revision, harnessAuthority.revision/.tree, and the prose and test copies of them. No digests, no behaviour.

Verification

Check Result
All 25 governed digests vs authority commit 74689b1 all match
Recorded tree vs 74689b1^{tree} identical
vitest --config vitest.heavy.config.ts src/phase1-conformance-lock.test.ts 95 passed, 1 skipped
pnpm exec vitest run 1321 passed, 63 skipped
pnpm typecheck, pnpm lint clean

There is a second timeout-minutes: 20 at line 129 of the same file, so the edit was made by line number rather than string match; the diff touches one line. No test pinned this job's timeout.

Merge requirement

The repin points harnessAuthority.revision at 74689b1, a commit on this branch. Per docs/phase1-conformance.md it must land as a real merge commit, never a squash or rebase, or the pinned revision stops being an ancestor of main and the authority checkout only resolves while this branch survives. An SDK rebind follows, as it does for any authority move.

🤖 Generated with Claude Code

Copilot AI lite review requested due to automatic review settings September 18, 2026 19:38
@BunsDev BunsDev added the ci:full Run the macOS and Windows CI jobs on this pull request label Sep 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The workflow timeout adjustment is narrowly scoped and the governed conformance lock/test/docs repins are updated consistently with the change.

Pull request overview

This PR increases the job-level timeout for the “Windows supervisor behavior” GitHub Actions job to prevent it from being cancelled at the 20-minute cap, and then updates the Phase 1 conformance authority pinning artifacts to keep governed workflow digests and documented bindings consistent.

Changes:

  • Raise .github/workflows/ci.yml job windows-supervisor-behavior timeout-minutes from 20 → 30.
  • Repin Phase 1 conformance harness authority (revision/tree) and update the governed blob/SHA-256 entry for the changed workflow in phase1-conformance.lock.json and its test mirror.
  • Refresh the documented “reviewed source” binding in docs/phase1-conformance.md to match the new authority revision/tree.
File summaries
File Description
src/phase1-conformance-lock.test.ts Updates the expected harness authority revision/tree and the pinned blob/SHA-256 for .github/workflows/ci.yml used by the lock tests.
phase1-conformance.lock.json Repins harness.revision and harnessAuthority (revision/tree), plus the .github/workflows/ci.yml blob/SHA-256 entry to reflect the workflow change.
docs/phase1-conformance.md Updates the prose binding to the new reviewed source revision/tree.
.github/workflows/ci.yml Increases windows-supervisor-behavior job timeout to 30 minutes to avoid end-of-job cancellation.
Review details
  • Files reviewed: 4/4 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

The job is capped at 20 minutes and needs 18 to 20, so it dies on the cap
and GitHub reports the overrun as a cancellation, which reads as a flake.
It has taken out PR #313 three times and main twice, always after every
assertion passed, in the final cargo check step. Raise the cap to 30.

Carries every governed digest that moves with this commit. ci.yml is
tracked in harnessAuthority.files, so its blob and SHA-256 advance in the
lock and in the test's literal copy.

Also refreshes three production deltas. Cargo.toml, Cargo.lock and
keyring.rs changed in #322 without a repin, which stayed invisible while
the authority still pointed at an older commit and the deltas were
verified against that older tree. Advancing the authority surfaces the
drift, so their digests move here rather than in the repin.

Refs #324
Repin only: harness revision, harness authority revision and tree, and
the prose and test copies of them. No digests and no behaviour move here;
they landed with the edit itself.

Refs #324
@BunsDev
BunsDev force-pushed the fix/windows-supervisor-timeout branch from ef7bd74 to 285ced0 Compare September 18, 2026 20:07
@BunsDev

BunsDev commented Sep 18, 2026

Copy link
Copy Markdown
Member Author

Force-pushed a correction. The first attempt failed Web checks in the heavy suite with Chat conformance native delta does not match its immutable allowlist, and the cause is worth recording.

harnessAuthority.productionDeltas carries ten digests alongside the 25 governed files. Three of them were stale: src-tauri/Cargo.toml and Cargo.lock from 07ffd59, and src-tauri/src/keyring.rs from 9761e87, all landed in #322 without a repin. That stayed invisible because the authority still pointed at b5e0fac, so the deltas were verified against that older tree and matched it correctly. Advancing the authority to a commit on current main is what surfaced the drift.

Their digests now move in the code commit, where digests belong, rather than in the repin. The repin still touches only the revision, the tree, and their prose and test copies.

Rebuilt rather than patched on top, so the two-step shape is preserved:

  • a3dc4d9 — the edit, ci.yml's digests, and the three refreshed deltas
  • 285ced0 — repin only

Re-verified against the new authority: tree matches a3dc4d9^{tree}, and all 25 governed files plus all 10 production deltas match. Heavy suite 909 passed, typecheck and lint clean.

Two tests, windows-shared-quota and windows-process-termination-race, fail only when the normal and heavy suites run back to back locally and pass individually. They are untouched by this branch.

@BunsDev
BunsDev merged commit 0a8e330 into main Sep 18, 2026
11 checks passed
BunsDev added a commit that referenced this pull request Sep 18, 2026
Brings in the raised Windows supervisor timeout from #325 so this
branch's own supervisor job has room to finish, and refreshes every
governed digest against the merged tree: ci.yml from main, and the
Cargo.toml, Cargo.lock and keyring.rs production deltas.

Digests land here, with the merge that changes the files. The authority
revision and tree advance in the repin that follows.
@BunsDev
BunsDev deleted the fix/windows-supervisor-timeout branch September 21, 2026 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:full Run the macOS and Windows CI jobs on this pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Windows supervisor behavior job has ~1 minute of headroom and now fails main

2 participants