Skip to content

🤖 refactor: split maybeStartQueuedTasksFromReservations, part 3: drain preamble - #7747

Merged
ThomasK33 merged 3 commits into
refactor/task-queue-start-split-2from
refactor/task-queue-start-split-3
Oct 30, 2026
Merged

ThomasK33 merged 3 commits into
refactor/task-queue-start-split-2from
refactor/task-queue-start-split-3

Conversation

@ThomasK33

Copy link
Copy Markdown
Member

Summary

Part 3 of 3. It moves the drain's preamble under the mutex into openQueuedDrain (config, settings, queued list and the inactive-workflow prepass) and countQueuedDrainSlots (the stale-turn sweep bookkeeping and the capacity gates). maybeStartQueuedTasksFromReservations ends at CC 8 (from 76 before the stack). Changed lines: 172.

No behaviour change: same awaits, same calls to other methods in the same order (checked with a script that inlines every step), same markTaskLaunchFailed messages. Each new step has CC 8 or less, with 100 % line coverage. The method keeps the _unlaunchedLeases disposer, the mutex block and the per-task loop. No step takes the mutex or starts a drain, and every step call inside the mutex block is awaited.

Implementation

Risks

Queue drains run after every task state change. The split adds microtasks between tasks inside the mutex block (up to 7 before the next task's first call), as the merged recoverInterruptedTasks split did. All 5019 targeted tests pass at every part. A mutation pass over the new code left 33 survivors: equivalent mutants, assertions for impossible conditions, empty-string edge cases, one debug log, and two test gaps (an extra coalesced drain, and a worktree parent's runtime project path).


Generated with xum • Model: anthropic:claude-opus-5-5 • Thinking: high • Cost: $313.07

…n preamble

Part 3 of 3. It moves the head under the mutex into steps: the reads,
the inactive-workflow prepass, the stale-turn sweep bookkeeping and the
capacity gates. maybeStartQueuedTasksFromReservations ends at CC 8 (from
76 before the stack). It keeps the lease disposer, the mutex block, the
per-task loop and the launch of the plans after the mutex.

- openQueuedDrain reads the config, the task settings, the task index
  and the queued tasks, runs the prepass, and re-reads all three when
  the prepass interrupted a task. Then it calls countQueuedDrainSlots
  right after the prepass's last await.
- countQueuedDrainSlots reads staleTurnSweepGeneration before the turn
  count, completes the sweep only when the scan saw every owner, and
  returns "idle" (nothing queued, or no free slot) or "open" with the
  drain record the loop reads. The turn count still runs after the
  prepass.
- listQueuedAgentTasks is the former listQueuedTasks closure, now a
  method because both reads in openQueuedDrain call it.

No behaviour change: same awaits on collaborators, same calls in the
same order (compared with a script), same log messages and fields.

---

_Generated with `xum` • Model: `anthropic:claude-opus-5-5` • Thinking: `xhigh`_

<!-- mux-attribution: model=anthropic:claude-opus-5-5 thinking=xhigh -->
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-30T06:42:34.357406Z b8608c8 Manual request
🔒 Security Review ✅ Completed 2026-10-30T06:43:14.966383Z b8608c8 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@ThomasK33
ThomasK33 added this pull request to stack #7748 October 30, 2026 03:42
@ThomasK33

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Swish!

Reviewed commit: 4053fc64e2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector

Copy link
Copy Markdown

🛡️ Codex Security Review · Automatically triggered

Security review completed. No security issues were found in this pull request.

Reviewed commit: 4053fc64e2

View security finding report

Only the user who started this review can view the report in Codex.

ℹ️ About Codex security reviews in GitHub

This is an experimental Codex feature. Security reviews are triggered when:

  • You comment "@codex security review"
  • A regular code review gets triggered (for example, "@codex review" or when a PR is opened), and you’re opted in so security review runs alongside code review

Once complete, Codex will leave suggestions, or a comment if no findings are found.

@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

🟢 e2e stories (Haiku): 14 passed

22 agent steps · 7 replayed from cache · 15 model calls · 46.3k tokens (28% cached)
Spend: $0.08 of the $1.00 cap (proxy ledger)

All 14 tests in 9 files
Test Agent Time
🟢 chatRestart.e2e.ts · 1 passed 1 step · 1 call 5.5s
🟢 a chat survives a restart of the server 1 step · 1 call 5.5s
🟢 compaction.e2e.ts · 1 passed 1 step · 1 call 4.4s
🟢 /compact replaces the old chat with a summary 1 step · 1 call 4.4s
🟢 pluginTrustRestart.e2e.ts · 1 passed 4 steps · 2 calls 10.0s
🟢 a trusted plugin hook stays trusted after the server restarts 4 steps · 2 calls 10.0s
🟢 settingsRoundTrip.e2e.ts · 1 passed 2 steps · 1 call 8.7s
🟢 a chat survives trips through Settings 2 steps · 1 call 8.7s
🟢 sidebarPerWorkspace.e2e.ts · 1 passed 4 steps · 1 call 4.2s
🟢 a new workspace starts with its right sidebar collapsed while another keeps it open 4 steps · 1 call 4.2s
🟢 smoke.e2e.ts · 1 passed 2 steps · 1 call 2.5s
🟢 the agent opens the playground workspace 2 steps · 1 call 2.5s
🟢 streamErrors.e2e.ts · 1 passed 1 step · 1 call 8.9s
🟢 stream errors show in the chat, and the chat recovers 1 step · 1 call 8.9s
🟢 todoNudge.e2e.ts · 1 passed 1 step · 1 call 6.8s
🟢 the agent finishes open TODO items after the turn-end nudge 1 step · 1 call 6.8s
🟢 touchAlignment.e2e.ts · 6 passed 6 steps · 6 calls 21.5s
🟢 the Settings close button is level with the title on a touch screen 390px wide 1 step · 1 call 4.0s
🟢 the Settings close button is level with the title on a touch screen 768px wide 1 step · 1 call 4.2s
🟢 Backup settings checkboxes are small and level with their labels on a touch phone 1 step · 1 call 4.3s
🟢 the heartbeat checkbox is small and level with its label on a touch phone 1 step · 1 call 3.1s
🟢 a reply's model and time stay on one line on a touch phone 1 step · 1 call 3.3s
🟢 the workspace actions menu stays on the title row on a touch phone 1 step · 1 call 2.6s

e2e 0.20.0 · 1m 16s · web · run artifacts

🟢 e2e Electron stories (Haiku): 3 passed

3 agent steps · 3 model calls · 8.0k tokens (32% cached)
Spend: $0.01 of the $1.00 cap (proxy ledger)

All 3 tests in 3 files
Test Agent Time
🟢 electron/deepLink.e2e.ts · 1 passed 1 step · 1 call 5.3s
🟢 a deep link of a second launch starts a chat in the running app 1 step · 1 call 5.3s
🟢 electron/menuBar.e2e.ts · 1 passed 1 step · 1 call 6.3s
🟢 the workspace menu bar is the desktop title bar 1 step · 1 call 6.3s
🟢 electron/smoke.e2e.ts · 1 passed 1 step · 1 call 5.0s
🟢 Xum Electron opens the playground workspace 1 step · 1 call 5.0s

e2e 0.20.0 · 18.9s · electron · run artifacts

🟢 e2e agent repros (Haiku): no tests selected

Spend: $0.00 of the $1.00 cap (proxy ledger)

e2e 0.20.0 · 6.4s · 2 targets (web, phone) · run artifacts

@ThomasK33

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: d74050c1b9

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector

Copy link
Copy Markdown

🛡️ Codex Security Review · Automatically triggered

Security review completed. No security issues were found in this pull request.

Reviewed commit: d74050c1b9

View security finding report

Only the user who started this review can view the report in Codex.

ℹ️ About Codex security reviews in GitHub

This is an experimental Codex feature. Security reviews are triggered when:

  • You comment "@codex security review"
  • A regular code review gets triggered (for example, "@codex review" or when a PR is opened), and you’re opted in so security review runs alongside code review

Once complete, Codex will leave suggestions, or a comment if no findings are found.

@ThomasK33

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: b8608c86fb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector

Copy link
Copy Markdown

🛡️ Codex Security Review · Automatically triggered

Security review completed. No security issues were found in this pull request.

Reviewed commit: b8608c86fb

View security finding report

Only the user who started this review can view the report in Codex.

ℹ️ About Codex security reviews in GitHub

This is an experimental Codex feature. Security reviews are triggered when:

  • You comment "@codex security review"
  • A regular code review gets triggered (for example, "@codex review" or when a PR is opened), and you’re opted in so security review runs alongside code review

Once complete, Codex will leave suggestions, or a comment if no findings are found.

@ThomasK33
ThomasK33 added this pull request to the merge queue Oct 30, 2026
Merged via the queue into main with commit 3d3a4cf Oct 30, 2026
36 of 59 checks passed
@ThomasK33
ThomasK33 deleted the refactor/task-queue-start-split-3 branch October 30, 2026 07:41
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