Skip to content

ci: resolve an owned Mac's kept Swift packages offline - #14709

Merged
teamleaderleo merged 1 commit into
mainfrom
ci/owned-spm-resolve-warm
Sep 25, 2026
Merged

teamleaderleo merged 1 commit into
mainfrom
ci/owned-spm-resolve-warm

Conversation

@teamleaderleo

@teamleaderleo teamleaderleo commented Sep 25, 2026 •

Copy link
Copy Markdown
Collaborator

Why

hq#661 workstream 5: the "Resolve Swift packages" step in owned compile admission swings from 10 to 55 s.

Cause: on a warm owned Mac, owned_build_state.py check clones the kept source-packages into the workspace, and "Cache Swift packages" is skipped (steps.owned-state.outputs.packages != 'true'). CMUX_CI_SWIFTPM_CACHE_EXACT_HIT is therefore empty, so the resolve always ran the online path and updated all 11 package remotes. The spm- key and restore-keys are not involved on owned roots. Checked on owned jobs 108217222634, 108219220752 and 108224018952: CMUX_CI_SWIFTPM_CACHE_EXACT_HIT: was empty and the log shows 11 Updating from lines.

Change

  • compile-app-host-test-product.sh resolve stamps the package directory (.cmux-resolved-sha256) with the hash of Package.resolved plus swiftpm-cache-layout after every successful resolve. A failed resolve leaves no stamp.
  • When the stamp matches this checkout, the resolve takes the same -skipPackageUpdates path as an exact spm- hit, with the same fallback to a normal resolve.
  • The stamp moves with the packages into the canonical root and back into the owned package store, so the next job on that Mac resolves offline.
  • A changed Package.resolved, or a partial spm- restore that carries an older stamp, fetches as before.
  • Does not touch the workflow. The script is a product input, so the product key rotates once.

Tests

  • tests/test_ci_test_compilation_cache_seed.sh covers four cases: an unstamped directory resolves online and gets a stamp; a stamped one resolves offline once; a failed offline resolve falls back; a changed Package.resolved fetches.
  • It also checks that a failed resolve leaves no stamp.
  • tests/test_ci_owned_build_state.py still passes.

🤖 Generated with Claude Code


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.


Summary by cubic

Makes an owned Mac's kept Swift packages resolve offline, cutting the Resolve step from 10-55s down by avoiding fetches of all 11 package remotes.

  • A successful resolve now stamps the package directory with a hash of Package.resolved and the cache layout; a failed resolve leaves no stamp.
  • A matching stamp takes the same -skipPackageUpdates offline path as an exact spm- cache hit, with the same fallback to a normal resolve.
  • The stamp persists with the packages into the owned package store, so the next job on that Mac resolves offline; a changed Package.resolved or a partial cache restore fetches as before.
  • Tests cover an unstamped directory, a stamped one resolving offline, a failed offline fallback, and a changed Package.resolved with no residue after failure.

Written for commit 2b40891. Summary will update on new commits.

Review in cubic

An owned Mac hands the admission resolve the packages its last job
resolved (owned_build_state.py), which skips the `spm-` cache restore and
so never counts as an exact hit. Every owned admission fetched all 11
package remotes: 10 to 55 s of the Resolve step, depending on GitHub.

A successful resolve now stamps the packages with the Package.resolved
and cache layout it resolved. When the stamp matches the checkout, the
resolve takes the same -skipPackageUpdates path and fallback as an exact
`spm-` hit.

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

coderabbitai Bot commented Sep 25, 2026

Copy link
Copy Markdown

Warning

Review limit reached

Next included review available in 24 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used all 10 included reviews currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 51584b07-3aee-4b80-acab-8e3bee9d03bd

📥 Commits

Reviewing files that changed from the base of the PR and between 8538fa9 and 2b40891.

📒 Files selected for processing (3)
  • scripts/ci/compile-app-host-test-product.sh
  • scripts/ci/owned_build_state.py
  • tests/test_ci_test_compilation_cache_seed.sh

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@teamleaderleo
teamleaderleo merged commit 9b291c0 into main Sep 25, 2026
50 of 51 checks passed
@teamleaderleo
teamleaderleo deleted the ci/owned-spm-resolve-warm branch September 25, 2026 20:17
@github-actions

Copy link
Copy Markdown
Contributor

Merge receipt for 2b4089148c: every check was green at merge (13 verified; 14 skipped by policy). Full suite runs on main after merge.

rustybret pushed a commit to rustybret/bmux that referenced this pull request Sep 25, 2026
b63ab49 Fail remote-tmux review when a wait is a timer instead of an event (manaflow-ai#11264)
b436c92 Fail closed when CLI forwarding loops back to the GUI binary (manaflow-ai#8788)
136eb2a fix(ios): make the last intermittent CmuxMobileShell tests deterministic (manaflow-ai#14721)
dc7f5bd fix(ios): keep terminal composer dock at bottom (manaflow-ai#14702)
cb4429b ci: add owned_build_state.py warm-keys for warm admission routing (manaflow-ai#14717)
be1ab5e ci(ios): charge in-flight auto runs simulators only when they took the fleet (manaflow-ai#14716)
5110582 ci: clear fixed DerivedData by renaming it aside first (manaflow-ai#14710)
1b8a603 fix(ios): unregister terminal output streams by registration identity; fix stale render-grid tests (manaflow-ai#14711)
3cae7dd refactor: move the browser WebKit support layer into CmuxBrowser (manaflow-ai#14398)
6693884 Run the Codex monitor Stop replay outside the hook handler frame (manaflow-ai#14715)
133a083 ci(e2e): take the owned Mac's gui token just before testing in the build (manaflow-ai#14705)
4c36ace ci: re-run every job of an E2E run whose build did not succeed (manaflow-ai#14712)
ab5ac72 ci: start owned E2E builds from the Mac's kept state, upload after tests (manaflow-ai#14692)
6a3d2d0 test(ios): align Mac switch and pool tests with build-scoped identity (manaflow-ai#14708)
0b16a8b Keep closePanel's unmapped fallback from closing another panel's tab (manaflow-ai#14704)
69c9518 close-surface: reject a blank --workspace or --window (manaflow-ai#14706)
8476043 ci: route warm admission by static runner labels, never write labels (manaflow-ai#14696)
537d53f Guard direct GhosttyKit setup against incompatible Zig (manaflow-ai#4706)
4b200e1 Restore Pi wakeup alerts across reloads (manaflow-ai#12861)
9b291c0 ci: resolve an owned Mac's kept Swift packages offline (manaflow-ai#14709)
31c9105 Stop attaching the unverified per-resume relay MAC (manaflow-ai#14694)
5443f43 Merge pull request manaflow-ai#13565 from manaflow-ai/feat-recover-forgotten-computers
e817240 Add app.equalizeSplitsOnCreate to balance panes on new splits (manaflow-ai#14703)
a358095 fix: never use a shell bootstrap executable in a resume binding (manaflow-ai#5848)
3f177af Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
8b4c97b Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
dce9509 ci: update iOS checkout routing assertion
5dbf06c ci: update CLA workflow digest after main pin
44c00fb Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
d22189d Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
eeca51a fix: make event reconnect policy instance based
9e29c96 Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
d860564 Model first Cloud receipt before remote graph discovery
87f1305 Verify forgotten Mac recovery with the real paired store
2237f8c Merge main and retain upstream test repairs
9ccaa7a Avoid type-check timeout in process fixture
a848b5e Simplify AppKit accessibility test setup
82a9769 Isolate process generation fixture from runner TTY state
4c129bb Enable and restore AppKit assistive access in mounted tree test
9a9acca Enable accessibility output in the hosted SwiftUI test fixture
5ce39d0 Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
a29a7ec Read proxy accessibility children and text through one attribute bridge
12938b6 Test accessibility walkers against modern and legacy proxy nodes
04a30c5 Revoke the original pairing in the targeted dial authority regression
ff1888e Import the extracted Cloud module in the team picker
9c9f259 Merge main and adopt the verified focus recovery fixture
5d41fc8 Align hosted UI fixtures with runtime paths and presentation lifecycle
87dbbd9 Preserve unknown legacy restore liveness after main integration
41a8d4b Revert "Establish running agent state in auto-resume fixtures"
6c7d14b Revert "Use the running-agent fixture for second-restore cwd coverage"
9d276b5 Route Kiro permission-mode fixtures through the mock delivery target
cdb4eae Restore the host app delegate after registration tests
4bdc410 Use the running-agent fixture for second-restore cwd coverage
0b58cbc Establish running agent state in auto-resume fixtures
20c6415 Wait for mounted project content in accessibility test
3ba7b6a Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
2c3c680 Make reparent focus test geometry deterministic
d2f563b Stabilize canonical cache recipe guard
cc60792 Merge current main into forgotten Mac recovery
7dc515f Merge branch 'main' into feat-recover-forgotten-computers
cfd4773 Preserve per-instance forgotten Mac recovery
6a95584 Canonicalize recovered directory identities
f083246 Preserve queued forgotten Mac refreshes
e5202a6 test(ios): use canonical UUID duplicate fixture
ca7ee53 fix(ios): serialize forgotten Mac recovery retries
db851c2 Merge remote-tracking branch 'origin/main' into feat-recover-forgotten-computers
35269cb fix(ios): rehydrate Macs after forget recovery
d0266b7 Merge current CI workflow identity guard into device recovery
45b7c72 fix(i18n): distinguish signed-in Mac recovery from connectivity
730260c Merge remote-tracking branch 'origin/feat-recover-forgotten-computers' into feat-recover-forgotten-computers
a17f8dd fix: complete forgotten Mac recovery without replaying revocation
d64766a test: reproduce revocation during device recovery registration
faf5b55 test: keep recovery authority limited to enrollment
a9c437a test: cover duplicate forget and recovery lifecycle gaps
033e7a0 chore: normalize project ordering
28f63ec fix: recover forgotten Macs from revocation events
7b8e322 fix: recover forgotten Mac registrations
f1aca40 test: validate recovery enrollment proof
62b4e14 test: cover authenticated forgotten-device recovery
9cb2f97 test: cover recovery after device forget

# Conflicts:
#	.github/workflows/app-host-test-rerun.yml
#	.github/workflows/ci-guards.yml
#	.github/workflows/ci-macos.yml
#	.github/workflows/ci-queue-janitor.yml
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
#	.github/workflows/seed-derived-data.yml
#	.github/workflows/test-e2e.yml
#	.github/workflows/test-ios.yml
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