Skip to content

🤖 refactor: split sendTreeMessage, part 1: park, dispatch and settle - #7709

Merged
ThomasK33 merged 1 commit into
refactor/task-send-testsfrom
refactor/task-send-split-1
Oct 29, 2026
Merged

ThomasK33 merged 1 commit into
refactor/task-send-testsfrom
refactor/task-send-split-1

Conversation

@ThomasK33

Copy link
Copy Markdown
Member

Summary

Part 1 of 5: splits the tail of TaskService.sendTreeMessage (park, dispatch and settle) in place into named steps, with no behaviour change. The method drops from CC 133 to CC 109. On top of the test PR #7708. 460 changed lines.

The parts go from the end of the method to its start, as in the two earlier stacks (#7697 to #7699, #7702 to #7706). The code that stays inline must be the start of the method, so it can call the extracted tail with one call.

Steps in this part

  • dispatchPeerSend makes the dispatch.
  • refuseStalePeerSendBeforeDispatch runs the recheck before dispatch.
  • queuePeerSendBehindParked queues the send behind a parked one.
  • parkPeerSendForDelegatedTurn is the former park closure, and waitForDelegatedTurn waits for the delegated turn.
  • settlePeerSendResult keeps the refusal order: the delegated-turn refusal, then the admission refusal, then send_failed.
  • This part adds the readonly records PeerSendRequest, PeerSendRoute and PeerSendAdmission, and the mutable PeerSendAttempt. In this part the admission check is still a closure, and dispatchPeerSend gets it as a parameter.

Rules every part keeps

  • The four overloads and the implementation signature of sendTreeMessage do not change. No step calls this.sendTreeMessage again, so the spy in taskService.delegatedTurnPeerDelivery.test.ts still sees every call.
  • Every step runs inside withPeerAdmissionLock(targetId, ...), which is the peer delivery lock plus the target's event lock. No step takes either lock, and the callback returns the chain, so both locks release when the chain settles.
  • The callbacks that sendMessage and the workspace service run later (admissionStale, park, onCanceled, onAccepted) read and write one mutable PeerSendAttempt record when they run: delegatedTurnCorrelation, admissionRefusal, refusedAtRegistrationEpoch, parkedThisAttempt and accepted. admissionStale stays a plain synchronous function.
  • The steps form a chain: each step calls the next one directly after its own last await, so no collaborator call runs a microtask later. Only the result of the send settles later, at approximately 2 to 3 microtasks per chain level. So the two locks also release that much later. A refusal before the checkout await settles at the same time as before.
  • make crap-check against the parent commit reports 0 violations, with and without coverage. Every new function scores CC 8 or less.
  • A script compared the old and new code: both have 5 awaits and the same collaborator calls.

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

Moves the tail of sendTreeMessage, from the pre-dispatch recheck to the
result, into named private steps: dispatchPeerSend,
refuseStalePeerSendBeforeDispatch, queuePeerSendBehindParked,
parkPeerSendForDelegatedTurn (was the park closure), waitForDelegatedTurn
and settlePeerSendResult. No behaviour change.

Adds the records the later parts use: PeerSendRoute and PeerSendAdmission
(read-only facts) and PeerSendAttempt, the one mutable record that the
admission probe and the sendMessage callbacks read when they run. The
admission probe is still a closure in sendTreeMessage in this part and is
passed to dispatchPeerSend.

sendTreeMessage drops from CC 133 to CC 109. Every new step is CC 8 or less.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 28, 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-28T23:26:50.176985Z 8c20553 Manual request
🔒 Security Review ✅ Completed 2026-10-28T23:28:21.205684Z 8c20553 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 #7714 October 28, 2026 22:58
@ThomasK33

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

Reviewed commit: 8c2055361f

ℹ️ 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: 8c2055361f

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

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.3s
🟢 a chat survives a restart of the server 1 step · 1 call 6.3s
🟢 compaction.e2e.ts · 1 passed 1 step · 1 call 4.5s
🟢 /compact replaces the old chat with a summary 1 step · 1 call 4.5s
🟢 pluginTrustRestart.e2e.ts · 1 passed 4 steps · 2 calls 17.5s
🟢 a trusted plugin hook stays trusted after the server restarts 4 steps · 2 calls 17.5s
🟢 settingsRoundTrip.e2e.ts · 1 passed 2 steps · 1 call 9.8s
🟢 a chat survives trips through Settings 2 steps · 1 call 9.8s
🟢 sidebarPerWorkspace.e2e.ts · 1 passed 4 steps · 1 call 5.6s
🟢 a new workspace starts with its right sidebar collapsed while another keeps it open 4 steps · 1 call 5.6s
🟢 smoke.e2e.ts · 1 passed 2 steps · 1 call 3.1s
🟢 the agent opens the playground workspace 2 steps · 1 call 3.1s
🟢 streamErrors.e2e.ts · 1 passed 1 step · 1 call 7.1s
🟢 stream errors show in the chat, and the chat recovers 1 step · 1 call 7.1s
🟢 todoNudge.e2e.ts · 1 passed 1 step · 1 call 10.1s
🟢 the agent finishes open TODO items after the turn-end nudge 1 step · 1 call 10.1s
🟢 touchAlignment.e2e.ts · 6 passed 6 steps · 6 calls 25.2s
🟢 the Settings close button is level with the title on a touch screen 390px wide 1 step · 1 call 5.1s
🟢 the Settings close button is level with the title on a touch screen 768px wide 1 step · 1 call 5.4s
🟢 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 3.4s
🟢 the workspace actions menu stays on the title row on a touch phone 1 step · 1 call 3.2s

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

🟢 e2e Electron stories (Haiku): 3 passed

3 agent steps · 3 model calls · 7.9k tokens (33% 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 7.1s
🟢 a deep link of a second launch starts a chat in the running app 1 step · 1 call 7.1s
🟢 electron/menuBar.e2e.ts · 1 passed 1 step · 1 call 6.9s
🟢 the workspace menu bar is the desktop title bar 1 step · 1 call 6.9s
🟢 electron/smoke.e2e.ts · 1 passed 1 step · 1 call 6.5s
🟢 Xum Electron opens the playground workspace 1 step · 1 call 6.5s

e2e 0.20.0 · 23.4s · 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.9s · 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. Swish!

Reviewed commit: 8c2055361f

ℹ️ 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: 8c2055361f

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 29, 2026
Merged via the queue into main with commit 5825e3c Oct 29, 2026
93 of 98 checks passed
@ThomasK33
ThomasK33 deleted the refactor/task-send-split-1 branch October 29, 2026 08:10
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