Skip to content

refactor: remove unnecessary Arc<Mutex> from tool execution pipeline#7979

Merged
jh-block merged 2 commits intoblock:mainfrom
rabi:arc_mutex
Mar 18, 2026
Merged

refactor: remove unnecessary Arc<Mutex> from tool execution pipeline#7979
jh-block merged 2 commits intoblock:mainfrom
rabi:arc_mutex

Conversation

@rabi
Copy link
Contributor

@rabi rabi commented Mar 18, 2026

Summary

All writes to tool response messages and tool futures are sequential (never concurrent), so the per-request Arc<Mutex> and the Arc<Mutex<Vec>> were unnecessary.

  • Replace per-message Arc<Mutex> with a plain HashMap<String, Message> using direct &mut access and a new add_tool_response_with_metadata(&mut self) method for in-place mutation.
  • Replace Arc<Mutex<Vec>> for tool_futures with &mut Vec, eliminating the lock/drain round-trip in the approval stream.

This removes Arc allocations, Mutex lock cycles, and Message clones on consumption (.remove() takes ownership instead).

Testing

Tested locally and there seems no regression.

All writes to tool response messages and tool futures are sequential
(never concurrent), so the per-request Arc<Mutex<Message>> and the
Arc<Mutex<Vec<ToolStream>>> were unnecessary.

- Replace per-message Arc<Mutex<Message>> with a plain
  HashMap<String, Message> using direct &mut access and a new
  add_tool_response_with_metadata(&mut self) method for in-place mutation.
- Replace Arc<Mutex<Vec<ToolStream>>> for tool_futures with &mut Vec,
  eliminating the lock/drain round-trip in the approval stream.

This removes Arc allocations, Mutex lock cycles, and Message clones
on consumption (.remove() takes ownership instead).

Change-Id: If6b009f2cdfa872b41e71851ef24ee7fe19c97c1
Signed-off-by: rabi <ramishra@redhat.com>
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 60a6b96ce9

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

* main: (32 commits)
  Revert message flush & test (block#7966)
  docs: add Remote Access section with Telegram Gateway documentation (block#7955)
  fix: update webmcp blog post metadata image URL (block#7967)
  fix: clean up OAuth token cache on provider deletion (block#7908)
  fix: hard-coded tool call id in code mode callback (block#7939)
  Fix SSE parsers to accept optional space after data: prefix (block#7929)
  docs: add GOOSE_INPUT_LIMIT to config-files.md (block#7961)
  Add WebMCP for Beginners blog post (block#7957)
  Fix download manager (block#7933)
  Improve the formatting of tool calls, show thinking, treat Reasoning and Thinking as the same thing (sorry Kant) (block#7626)
  don't imply running builds all the time in AGENTS.md (block#7865)
  fix: unregister goosed child process's  listener (block#7956)
  feat: adversarial agent for preventing leaking of info and more  (block#7948)
  Update contributing.md (block#7927)
  docs: add credit balance monitoring section (block#7952)
  docs: add Cerebras provider to supported providers list (block#7953)
  docs: add TUI client documentation to ACP clients guide (block#7950)
  fix: removed double dash in pnpm command (block#7951)
  docs: polish ACP docs (block#7946)
  claude adaptive thinking (block#7944)
  ...
@jh-block jh-block added this pull request to the merge queue Mar 18, 2026
Merged via the queue into block:main with commit 8d714a0 Mar 18, 2026
21 checks passed
lifeizhou-ap added a commit that referenced this pull request Mar 20, 2026
* main: (22 commits)
  feat: add gemini-acp provider, update docs on subscription models + improvements to codex (#8000)
  fix(openai): use Responses API for gpt-5.4 (#7982)
  Remove lead/worker provider (#7989)
  chore(release): release version 1.28.0 (#7991)
  Fix empty tool results from resource content (e.g. auto visualiser) (#7866)
  Separate SSE streaming from POST work submission (#7834)
  fix: include token usage in Databricks streaming responses (#7959)
  Optimize tool summarization (#7938)
  fix: overwrite the deprecated googledrive extension config (#7974)
  refactor: remove unnecessary Arc<Mutex> from tool execution pipeline (#7979)
  Revert message flush & test (#7966)
  docs: add Remote Access section with Telegram Gateway documentation (#7955)
  fix: update webmcp blog post metadata image URL (#7967)
  fix: clean up OAuth token cache on provider deletion (#7908)
  fix: hard-coded tool call id in code mode callback (#7939)
  Fix SSE parsers to accept optional space after data: prefix (#7929)
  docs: add GOOSE_INPUT_LIMIT to config-files.md (#7961)
  Add WebMCP for Beginners blog post (#7957)
  Fix download manager (#7933)
  Improve the formatting of tool calls, show thinking, treat Reasoning and Thinking as the same thing (sorry Kant) (#7626)
  ...
elijahsgh pushed a commit to elijahsgh/goose that referenced this pull request Mar 21, 2026
…lock#7979)

Signed-off-by: rabi <ramishra@redhat.com>
Co-authored-by: jh-block <jhugo@block.xyz>
Signed-off-by: esnyder <elijah.snyder1@gmail.com>
elijahsgh pushed a commit to elijahsgh/goose that referenced this pull request Mar 21, 2026
…lock#7979)

Signed-off-by: rabi <ramishra@redhat.com>
Co-authored-by: jh-block <jhugo@block.xyz>
Signed-off-by: esnyder <elijah.snyder1@gmail.com>
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.

2 participants