diff --git a/backlog/tasks/task-238.1 - Extract-main-window-and-overlay-window-composition-from-src-main.ts.md b/backlog/tasks/task-238.1 - Extract-main-window-and-overlay-window-composition-from-src-main.ts.md
index 8686953c..72aed153 100644
--- a/backlog/tasks/task-238.1 - Extract-main-window-and-overlay-window-composition-from-src-main.ts.md	
+++ b/backlog/tasks/task-238.1 - Extract-main-window-and-overlay-window-composition-from-src-main.ts.md	
@@ -29,10 +29,10 @@ priority: high
 ## Acceptance Criteria
 
 <!-- AC:BEGIN -->
-- [ ] #1 At least the main overlay window path plus two other window/setup flows are extracted from direct `BrowserWindow` construction inside `src/main.ts`.
-- [ ] #2 The extracted modules expose narrow factory/handler APIs that can be tested without booting the whole app.
-- [ ] #3 `src/main.ts` becomes materially smaller and easier to scan, with window creation concentrated behind well-named runtime surfaces.
-- [ ] #4 Relevant runtime/window tests pass, and new tests are added for any newly isolated window composition helpers.
+- [x] #1 At least the main overlay window path plus two other window/setup flows are extracted from direct `BrowserWindow` construction inside `src/main.ts`.
+- [x] #2 The extracted modules expose narrow factory/handler APIs that can be tested without booting the whole app.
+- [x] #3 `src/main.ts` becomes materially smaller and easier to scan, with window creation concentrated behind well-named runtime surfaces.
+- [x] #4 Relevant runtime/window tests pass, and new tests are added for any newly isolated window composition helpers.
 <!-- AC:END -->
 
 ## Implementation Plan
diff --git a/backlog/tasks/task-238.2 - Extract-CLI-and-headless-command-wiring-from-src-main.ts.md b/backlog/tasks/task-238.2 - Extract-CLI-and-headless-command-wiring-from-src-main.ts.md
index 84e39f68..e5375c67 100644
--- a/backlog/tasks/task-238.2 - Extract-CLI-and-headless-command-wiring-from-src-main.ts.md	
+++ b/backlog/tasks/task-238.2 - Extract-CLI-and-headless-command-wiring-from-src-main.ts.md	
@@ -30,10 +30,10 @@ priority: high
 ## Acceptance Criteria
 
 <!-- AC:BEGIN -->
-- [ ] #1 CLI parsing, initial-command dispatch, and headless command execution no longer live as large inline flows in `src/main.ts`.
-- [ ] #2 The new modules make the desktop startup path and headless startup path visibly separate and easier to test.
-- [ ] #3 Existing CLI behaviors remain unchanged, including help output and startup gating behavior.
-- [ ] #4 Targeted CLI/runtime tests cover the extracted path, and `bun run typecheck` passes.
+- [x] #1 CLI parsing, initial-command dispatch, and headless command execution no longer live as large inline flows in `src/main.ts`.
+- [x] #2 The new modules make the desktop startup path and headless startup path visibly separate and easier to test.
+- [x] #3 Existing CLI behaviors remain unchanged, including help output and startup gating behavior.
+- [x] #4 Targeted CLI/runtime tests cover the extracted path, and `bun run typecheck` passes.
 <!-- AC:END -->
 
 ## Implementation Plan