chore: cherry-pick upstream sweep-up (2 tiny commits) — batch 8#13
Merged
prospapledge88 merged 3 commits intodevfrom May 5, 2026
Merged
Conversation
Machine-local runtime state from the Claude Code scheduler (pid + sessionId + acquisition timestamp). Should not be shared across machines.
…ght (coleam00#1079) Starlight removes the `starlight-theme` localStorage key when the user selects "auto" mode. The old init script checked that key, so every navigation or refresh re-forced dark theme. Use a separate `archon-theme-init` sentinel that persists across theme changes. Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Sweep-up batch — 2 tiny picks from
coleam00/archonupstream/dev. Built from a survey of ~16 candidates across what was originally pitched as "Tier 7-9" (provider hardening + web UI + reliability fixes). All 14 of the other candidates turned out to be already-absorbed in fork via earlier batches.Picks
52eebf99.gitignoreignores.claude/scheduled_tasks.lockeb730c0bauto(was forceddark); fixes user theme preference reset (coleam00#1079)Already-absorbed (skipped after detection)
The fork is essentially caught up on the high-value upstream surface:
b99cee4c,f9f8775a,45682bd2,ff901115— all emptyd5c1cd96,d7f36b22,08de8ee5— all empty5957c6e2,39a05b76,301a139e,d89bc767— all empty41c0f179— fork doesn't shipmaintainer-standupWhat's left in upstream/dev (~100 commits)
The remaining gap from upstream/dev is dominantly:
Cumulative absorption: 59 / 110 upstream commits across PRs #6/#7/#8/#9/#10/#11/#12/#13.
Validation
bun run validatepasses (with the same baseline-equivalent test failures asdev):check:bundled✅check:bundled-skill✅type-check✅ (all 10 packages)lint✅ (zero warnings)format:check✅testbaseline-equivalent (no new tests in this batch — the 2 picks don't touch test code)Side note: orphan conflict marker discovered & cleaned during d5c1cd9 detection
Attempting
d5c1cd96produced an empty diff with 1 line of orphan<<<<<<< HEADaccidentally added topackages/workflows/src/dag-executor.test.ts. The orphan was caught and the empty commit dropped viagit reset HEAD^. No conflict markers ship in this PR — verified bygrep '<<<<<<<\|>>>>>>>' --include='*.ts' -rn packages/.Test plan
bun run validateclean (baseline-equivalent failures, same asdev)🤖 Generated with Claude Code