Skip to content

🤖 refactor: split maybeStartQueuedTasksFromReservations, part 2: per-task gates and parent reads - #7746

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

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

Conversation

@ThomasK33

Copy link
Copy Markdown
Member

Summary

Part 2 of 3. It moves the per-task body into reserveQueuedTaskSlot, which returns reserved, skipped or shutdown, and its steps: the parent and trust refusals, the parent metadata read with its fallback, the skip_init_hook read and the launch request. The method's CC goes from 56 to 20. Changed lines: 470.

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

  • The owner check, the stop barrier and the streaming task stay at the start of reserveQueuedTaskSlot. A streaming queued task still takes a slot. 🤖 fix: a streaming queued task takes two parallel-task slots in one drain #7743 tracks that double count, and this stack does not change it.
  • The 4 parent refusals and the 2 trust refusals now share one markTaskLaunchFailed call site each. Every path still makes exactly one call, with the same message.
  • The steps form a chain: each one calls the next right after its own last await, so no extra tick runs before the lease hold or the CAS edit.
  • The loop adds the slot after the plan push instead of before it. Only the loop head reads the count.

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

…task gates and parent reads

Part 2 of 3. It moves the head of the per-task loop body into steps, so
the whole body is now one step, reserveQueuedTaskSlot, that returns
"reserved", "skipped" or "shutdown". The method's CC goes from 56 to 20.
Each new step has CC 8 or less.

- reserveQueuedTaskSlot keeps the workflow-owner check, the stop
  barrier and the streaming task (which still takes a slot, #7743).
  Then it runs the sync refusals and marks a refused task failed with
  the same message as before.
- Module-level, no `this`: queuedTaskLaunchStart (the brief send or the
  legacy resume), resolveQueuedTaskParent (the four parent and runtime
  refusals), queuedTaskTrustRefusal and findUntrustedSecondaryProject.
- The steps after the refusals form a chain. Each step calls the next
  one right after its own await: readQueuedTaskParentMeta (the metadata
  read and its fallback), resolveQueuedTaskSkipInitHook, then
  requestQueuedTaskLaunch (the name check, the model and createdAt),
  which hands the request to part 1's leaseQueuedTaskLaunch.
- The snapshots cross the steps in readonly records built by spread:
  QueuedDrainSnapshot (config and taskIndex after the prepass),
  QueuedTaskParent, QueuedTaskCandidate and QueuedTaskParentRead.

No behaviour change: same awaits on collaborators, same calls in the
same order (compared with a script), same markTaskLaunchFailed
messages, 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:19.878963Z 4b6d291 Manual request
🔒 Security Review ✅ Completed 2026-10-30T06:43:42.243040Z 4b6d291 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. Breezy!

Reviewed commit: 9a248ca1e9

ℹ️ 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: 9a248ca1e9

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.5k tokens (27% cached)
Spend: $0.09 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 6.4s
🟢 a chat survives a restart of the server 1 step · 1 call 6.4s
🟢 compaction.e2e.ts · 1 passed 1 step · 1 call 4.3s
🟢 /compact replaces the old chat with a summary 1 step · 1 call 4.3s
🟢 pluginTrustRestart.e2e.ts · 1 passed 4 steps · 2 calls 9.1s
🟢 a trusted plugin hook stays trusted after the server restarts 4 steps · 2 calls 9.1s
🟢 settingsRoundTrip.e2e.ts · 1 passed 2 steps · 1 call 9.0s
🟢 a chat survives trips through Settings 2 steps · 1 call 9.0s
🟢 sidebarPerWorkspace.e2e.ts · 1 passed 4 steps · 1 call 6.3s
🟢 a new workspace starts with its right sidebar collapsed while another keeps it open 4 steps · 1 call 6.3s
🟢 smoke.e2e.ts · 1 passed 2 steps · 1 call 2.6s
🟢 the agent opens the playground workspace 2 steps · 1 call 2.6s
🟢 streamErrors.e2e.ts · 1 passed 1 step · 1 call 6.8s
🟢 stream errors show in the chat, and the chat recovers 1 step · 1 call 6.8s
🟢 todoNudge.e2e.ts · 1 passed 1 step · 1 call 3.0s
🟢 the agent finishes open TODO items after the turn-end nudge 1 step · 1 call 3.0s
🟢 touchAlignment.e2e.ts · 6 passed 6 steps · 6 calls 26.9s
🟢 the Settings close button is level with the title on a touch screen 390px wide 1 step · 1 call 5.7s
🟢 the Settings close button is level with the title on a touch screen 768px wide 1 step · 1 call 3.9s
🟢 Backup settings checkboxes are small and level with their labels on a touch phone 1 step · 1 call 4.5s
🟢 the heartbeat checkbox is small and level with its label on a touch phone 1 step · 1 call 3.5s
🟢 a reply's model and time stay on one line on a touch phone 1 step · 1 call 6.7s
🟢 the workspace actions menu stays on the title row on a touch phone 1 step · 1 call 2.6s

e2e 0.20.0 · 1m 18s · 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.4s
🟢 a deep link of a second launch starts a chat in the running app 1 step · 1 call 5.4s
🟢 electron/menuBar.e2e.ts · 1 passed 1 step · 1 call 8.5s
🟢 the workspace menu bar is the desktop title bar 1 step · 1 call 8.5s
🟢 electron/smoke.e2e.ts · 1 passed 1 step · 1 call 4.7s
🟢 Xum Electron opens the playground workspace 1 step · 1 call 4.7s

e2e 0.20.0 · 20.6s · electron · run artifacts

🟢 e2e agent repros (Haiku): no tests selected

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

e2e 0.20.0 · 5.3s · 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 them coming!

Reviewed commit: 6b095cb2cb

ℹ️ 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: 6b095cb2cb

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. Already looking forward to the next diff.

Reviewed commit: 4b6d291498

ℹ️ 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: 4b6d291498

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 34f0c4c Oct 30, 2026
36 of 59 checks passed
@ThomasK33
ThomasK33 deleted the refactor/task-queue-start-split-2 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