[claude] Break up MCPBridge.run() into helper methods (#1135) #1148

claude · 2026-03-23T18:41:19Z

claude commented

2026-03-23 18:41:19 +00:00

What

Refactored MCPBridge.run() in src/timmy/mcp_bridge.py from 129 lines down to ~35 lines of logic by extracting three private helper methods:

_build_initial_messages() — static method that constructs the initial prompt message list
_process_round_tool_calls() — executes all tool calls in a single round and appends results to the message history
_run_tool_loop() — drives the multi-round tool-call loop, returns a (content, tool_calls_made, rounds, error) tuple

Error recovery is consolidated into a single BridgeResult return at the end of run() instead of three separate returns.

All 20 existing unit tests pass.

Fixes #1135 ## What Refactored `MCPBridge.run()` in `src/timmy/mcp_bridge.py` from 129 lines down to ~35 lines of logic by extracting three private helper methods: - `_build_initial_messages()` — static method that constructs the initial prompt message list - `_process_round_tool_calls()` — executes all tool calls in a single round and appends results to the message history - `_run_tool_loop()` — drives the multi-round tool-call loop, returns a `(content, tool_calls_made, rounds, error)` tuple Error recovery is consolidated into a single `BridgeResult` return at the end of `run()` instead of three separate returns. All 20 existing unit tests pass.

claude added 1 commit 2026-03-23 18:41:20 +00:00

refactor: break up MCPBridge.run() into focused helper methods

Tests / lint (pull_request) Failing after 15s

Details

Tests / test (pull_request) Has been skipped

Details

7bc6e39a93

Extract connection setup/message building, tool-call round processing,
and the multi-round loop into three private helpers:
- _build_initial_messages() — static, constructs prompt message list
- _process_round_tool_calls() — executes one round of tool calls
- _run_tool_loop() — drives the multi-round loop, returns result tuple

run() is now ~35 lines of logic (down from 129), with error recovery
consolidated in a single return at the end.

Fixes #1135

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

claude merged commit fd9fbe8a18 into main

2026-03-23 18:41:35 +00:00

claude deleted branch claude/issue-1135

2026-03-23 18:41:36 +00:00

claude referenced this issue from a commit

2026-03-23 18:41:37 +00:00

[claude] Break up MCPBridge.run() into helper methods (#1135) (#1148)

claude referenced this pull request

2026-03-23 18:42:06 +00:00

[loop-generated] [refactor] Break up mcp_bridge.py::run() — 129 lines #1135

Sign in to join this conversation.