diff --git a/.gitignore b/.gitignore
index 35bbb1d307..8d96c6aa7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ e2e-screenshots/
 .claude/archon/
 .claude/mockups/
 .claude/settings.local.json
+.claude/scheduled_tasks.lock
 e2e-testing-findings-session2.md
 
 # Local workspace
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35e809c98a..2187905fd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **Cherry-pick batch 8 from upstream — sweep-up of small remainders (2 commits).** Final small picks from a survey of ~16 candidates; the other 14 turned out to be already-absorbed by earlier batches (the fork is now essentially caught up on workflow polish, providers, web UI, db, and reliability — the remaining ~100 upstream commits are dominantly Pi, maintainer workflows, Docker, or release/homebrew machinery that the fork doesn't ship).
+  - `4fc7d333` (`52eebf99`) — `.gitignore` now ignores `.claude/scheduled_tasks.lock`, the lock file Claude Code's scheduled-task feature writes alongside the project. Prevents accidental commits of the lock during dev.
+  - `23c9e4e9` (`eb730c0b`) — `packages/docs-web/astro.config.mjs` Starlight theme now starts in `auto` mode (system default) instead of forcing dark; users who switch to auto/light no longer get bounced back to dark on next page load (closes upstream #1079).
+
 - **Cherry-pick batch 7 from upstream — Tier 6 workflow polish (7 commits).** Seven workflow-engine fixes picked from `coleam00/archon` upstream/dev. Three candidates were already absorbed in earlier batches (`4c6ddd99`, `7ea32141`, `bc25deef`); one docs file (`script-nodes.md`) was dropped because the fork hasn't absorbed the prerequisite `46874cab` that creates it. Two pre-existing unresolved conflict markers in `.archon/workflows/defaults/archon-piv-loop.yaml` (left over from an earlier `8295ece7` cherry-pick) were resolved in favor of the safer "explicit list" + "never stage" guidance during this batch — they should never have been committed unresolved in the first place.
   - `817186d4` — `archon-adversarial-dev` init-workspace no longer uses non-portable `sed -i`; replaced with a `tmp + mv` pattern that works on both macOS and Linux. Macos-relevant for the fork (#1155).
   - `46671c46` — Filters user-plugin MCP failure noise out of workflow warnings. New helpers `parseMcpFailureServerNames` + `loadConfiguredMcpServerNames` parse the SDK's MCP failure lines and only forward those that match the workflow's `mcp:` config — third-party Claude plugins (telegram, notion, etc.) no longer leak into the workflow's user-visible warnings. Provider `⚠️` warnings still pass through verbatim (#1327).
diff --git a/packages/docs-web/astro.config.mjs b/packages/docs-web/astro.config.mjs
index cabfa83fd9..d4d0301cfe 100644
--- a/packages/docs-web/astro.config.mjs
+++ b/packages/docs-web/astro.config.mjs
@@ -15,7 +15,7 @@ export default defineConfig({
       head: [
         {
           tag: 'script',
-          content: `if(!localStorage.getItem('starlight-theme')){localStorage.setItem('starlight-theme','dark');document.documentElement.dataset.theme='dark';}`,
+          content: `if(!localStorage.getItem('archon-theme-init')){localStorage.setItem('archon-theme-init','1');localStorage.setItem('starlight-theme','dark');document.documentElement.dataset.theme='dark';}`,
         },
       ],
       social: [{ icon: 'github', label: 'GitHub', href: 'https://github.com/coleam00/Archon' }],