Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)
Python
Close interrupted tool turns before new user input (#1271)
Ali Khokharcb5b4305c521
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.mdindex 236c4f1c..3de19947 100644--- a/ARCHITECTURE.md+++ b/ARCHITECTURE.md@@ -804,10 +804,12 @@ Top-level `system` content stays distinct from inline `system` messages.Target-protocol conversion owns their representation: neutral OpenAI Chatconversion emits top-level `system` content as the sole leading system messageand maps inline `system` content into ordered `user` turns. After tool-result-dependencies are ordered, adjacent user content is coalesced into one turn so-strict chat templates do not receive consecutive user roles. Conversion-preserves content order and rejects unrepresentable blocks instead of dropping-them. Provider policies do not reinterpret this role mapping.+dependencies are ordered, a neutral whitespace-only assistant boundary closes+any completed tool round before subsequent user input. Adjacent user content+is then coalesced into one turn so strict chat templates receive neither+`tool → user` nor consecutive user roles. Conversion preserves content order+and rejects unrepresentable blocks instead of dropping them. Provider policies+do not reinterpret this role mapping.User image conversion is a pure protocol operation. Core maps Anthropic base64and URL image sources to ordered OpenAI `image_url` content parts withoutdiff --git a/pyproject.toml b/pyproject.tomlindex e16033a3..7d05ed0f 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -4,7 +4,7 @@ build-backend = "hatchling.build"[project]name = "free-claude-code"-version = "4.12.10"+version = "4.12.11"description = "Local proxy connecting coding agents to OpenAI-compatible AI providers"readme = "README.md"requires-python = ">=3.14.0"diff --git a/smoke/features.py b/smoke/features.pyindex 0b45cbb0..b5bbdeaf 100644--- a/smoke/features.py+++ b/smoke/features.py@@ -172,6 +172,7 @@ FEATURE_INVENTORY: tuple[FeatureCoverage, ...] = (("test_provider_interleaved_thinking_tool_e2e","test_provider_tool_result_continuation_e2e",+ "test_provider_interrupted_tool_turn_resume_e2e","test_gemini_thought_signature_tool_continuation_e2e","test_provider_reasoning_tool_continuation_e2e",),diff --git a/smoke/product/test_provider_product_live.py b/smoke/product/test_provider_product_live.pyindex 0c0fda35..f394c268 100644--- a/smoke/product/test_provider_product_live.py+++ b/smoke/product/test_provider_product_live.py@@ -85,6 +85,15 @@ def test_provider_tool_result_continuation_e2e()[email protected]_target("tools")+def test_provider_interrupted_tool_turn_resume_e2e(+ smoke_config: SmokeConfig, provider_model: ProviderModel+) -> None:+ _run_provider_scenario(+ smoke_config, provider_model, _scenario_interrupted_tool_turn_resume+ )++@pytest.mark.smoke_target("tools")def test_gemini_thought_signature_tool_continuation_e2e(smoke_config: SmokeConfig, provider_model: ProviderModel@@ -443,6 +452,51 @@ def _scenario_tool_result_continuation(_assert_provider_product_stream(second.events)+def _scenario_interrupted_tool_turn_resume(+ smoke_config: SmokeConfig, provider_model: ProviderModel+) -> None:+ tool_id = "toolu_interrupted123456789"+ payload = {+ "model": "claude-sonnet-4-5-20250929",+ "max_tokens": 32,+ "stream": True,+ "messages": [+ {"role": "user", "content": "Use echo_smoke with value FCC_INTERRUPTED."},+ {+ "role": "assistant",+ "content": [+ {+ "type": "tool_use",+ "id": tool_id,+ "name": "echo_smoke",+ "input": {"value": "FCC_INTERRUPTED"},+ }+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": tool_id,+ "content": "FCC_INTERRUPTED",+ }+ ],+ },+ {+ "role": "user",+ "content": "Reply exactly OK without calling tools.",+ },+ ],+ "tools": [echo_tool_schema()],+ }+ with _server_for_provider(+ smoke_config, provider_model, "interrupted-tool-turn"+ ) as server:+ turn = ConversationDriver(server, smoke_config).stream(payload)+ _assert_provider_product_stream(turn.events)++def _scenario_gemini_thought_signature_tool_continuation(smoke_config: SmokeConfig, provider_model: ProviderModel) -> None:diff --git a/src/free_claude_code/core/anthropic/__init__.py b/src/free_claude_code/core/anthropic/__init__.pyindex cf7a2a09..03e22421 100644--- a/src/free_claude_code/core/anthropic/__init__.py+++ b/src/free_claude_code/core/anthropic/__init__.py@@ -6,6 +6,7 @@ from .conversion import (OpenAIConversionError,ReasoningReplayMode,build_base_request_body,+ is_synthetic_openai_tool_turn_boundary,)from .errors import (anthropic_error_payload,@@ -92,6 +93,7 @@ __all__ = ["get_block_attr","get_block_type","get_token_count",+ "is_synthetic_openai_tool_turn_boundary","map_stop_reason","serialize_tool_result_content","set_if_not_none",diff --git a/src/free_claude_code/core/anthropic/conversion.py b/src/free_claude_code/core/anthropic/conversion.pyindex e760353a..75a5adb1 100644--- a/src/free_claude_code/core/anthropic/conversion.py+++ b/src/free_claude_code/core/anthropic/conversion.py@@ -268,6 +268,38 @@ def _coalesce_openai_user_messages(return result+class _SyntheticOpenAIToolTurnBoundary(dict[str, Any]):+ """Identify an FCC-inserted assistant boundary until wire serialization."""++ __slots__ = ()+++def is_synthetic_openai_tool_turn_boundary(message: object) -> bool:+ """Return whether FCC inserted this message to close an OpenAI tool turn."""+ return isinstance(message, _SyntheticOpenAIToolTurnBoundary)+++def _close_openai_tool_result_turns(+ messages: list[dict[str, Any]],+) -> list[dict[str, Any]]:+ """Close completed tool rounds before subsequent user input."""+ result: list[dict[str, Any]] = []+ for message in messages:+ if (+ message.get("role") == "user"+ and result+ and result[-1].get("role") == "tool"+ ):+ # Some OpenAI-compatible chat templates reject a user role directly+ # after tool output. Non-empty whitespace closes the assistant turn+ # without inventing model content.+ result.append(+ _SyntheticOpenAIToolTurnBoundary(role="assistant", content=" ")+ )+ result.append(message)+ return result++class _OpenAIChatHistoryLedger:"""Assemble OpenAI chat history while respecting tool-result dependencies."""@@ -431,7 +463,9 @@ class AnthropicToOpenAIConverter:else:ledger.add_tool_turn(segment)- return _coalesce_openai_user_messages(ledger.finish())+ ordered_messages = ledger.finish()+ closed_messages = _close_openai_tool_result_turns(ordered_messages)+ return _coalesce_openai_user_messages(closed_messages)@staticmethoddef _convert_message_to_segments(diff --git a/src/free_claude_code/providers/open_router/client.py b/src/free_claude_code/providers/open_router/client.pyindex becfab9f..9f8c53bf 100644--- a/src/free_claude_code/providers/open_router/client.py+++ b/src/free_claude_code/providers/open_router/client.py@@ -6,7 +6,10 @@ from typing import Anyfrom free_claude_code.application.model_metadata import ProviderModelInfofrom free_claude_code.config.constants import ANTHROPIC_DEFAULT_MAX_OUTPUT_TOKENS-from free_claude_code.core.anthropic import ReasoningReplayMode+from free_claude_code.core.anthropic import (+ ReasoningReplayMode,+ is_synthetic_openai_tool_turn_boundary,+)from free_claude_code.core.anthropic.models import MessagesRequestfrom free_claude_code.core.anthropic.streaming import AnthropicStreamLedgerfrom free_claude_code.core.reasoning import ReasoningEffort, ReasoningPolicy@@ -78,7 +81,11 @@ def _apply_openrouter_reasoning_details_replay(for details in assistant_details:for index in range(cursor, len(messages)):message = messages[index]- if not isinstance(message, dict) or message.get("role") != "assistant":+ if (+ not isinstance(message, dict)+ or message.get("role") != "assistant"+ or is_synthetic_openai_tool_turn_boundary(message)+ ):continueexisting = message.get("reasoning_details")if isinstance(existing, list):diff --git a/tests/providers/test_converter.py b/tests/providers/test_converter.pyindex 52a663a8..61141515 100644--- a/tests/providers/test_converter.py+++ b/tests/providers/test_converter.py@@ -7,6 +7,7 @@ from free_claude_code.core.anthropic import (OpenAIConversionError,ReasoningReplayMode,build_base_request_body,+ is_synthetic_openai_tool_turn_boundary,)from free_claude_code.core.anthropic.models import MessagesRequest@@ -244,8 +245,10 @@ def test_inline_system_message_follows_completed_tool_result() -> None:"user","assistant","tool",+ "assistant","user",]+ assert body["messages"][3] == {"role": "assistant", "content": " "}assert body["messages"][-1]["content"] == "New instructions"@@ -1137,7 +1140,26 @@ def test_convert_assistant_text_after_tool_use_inserts_after_tool_results():assert result[2] == {"role": "assistant", "content": "Post-tool commentary"}-def test_unrelated_user_text_before_tool_result_is_buffered_until_after_tool_result():+def _completed_single_tool_turn(*, user_text=None):+ result_blocks = [+ MockBlock(+ type="tool_result",+ tool_use_id="call_z",+ content="file contents",+ )+ ]+ if user_text is not None:+ result_blocks.append(MockBlock(type="text", text=user_text))+ return [+ MockMessage(+ "assistant",+ [MockBlock(type="tool_use", id="call_z", name="Read", input={})],+ ),+ MockMessage("user", result_blocks),+ ]+++def test_unrelated_user_text_before_tool_result_is_buffered_after_closed_tool_turn():messages = [MockMessage("assistant",@@ -1158,10 +1180,126 @@ def test_unrelated_user_text_before_tool_result_is_buffered_until_after_tool_resresult = AnthropicToOpenAIConverter.convert_messages(messages)- assert [message["role"] for message in result] == ["assistant", "tool", "user"]+ assert [message["role"] for message in result] == [+ "assistant",+ "tool",+ "assistant",+ "user",+ ]assert result[0]["tool_calls"][0]["id"] == "call_z"assert result[1]["tool_call_id"] == "call_z"- assert result[2]["content"] == "Please also summarize it."+ assert result[2] == {"role": "assistant", "content": " "}+ assert result[3]["content"] == "Please also summarize it."+++def test_user_after_completed_tool_result_gets_neutral_assistant_boundary():+ messages = [+ MockMessage("user", "Read the file."),+ *_completed_single_tool_turn(),+ MockMessage("user", "Please summarize it."),+ ]++ result = AnthropicToOpenAIConverter.convert_messages(messages)++ assert [message["role"] for message in result] == [+ "user",+ "assistant",+ "tool",+ "assistant",+ "user",+ ]+ assert result[3] == {"role": "assistant", "content": " "}+ assert is_synthetic_openai_tool_turn_boundary(result[3])+ assert json.loads(json.dumps(result[3])) == {+ "role": "assistant",+ "content": " ",+ }+ assert result[4]["content"] == "Please summarize it."+++def test_user_text_beside_tool_result_follows_neutral_assistant_boundary():+ messages = _completed_single_tool_turn(user_text="Please summarize it.")++ result = AnthropicToOpenAIConverter.convert_messages(messages)++ assert [message["role"] for message in result] == [+ "assistant",+ "tool",+ "assistant",+ "user",+ ]+ assert result[2] == {"role": "assistant", "content": " "}+ assert result[3]["content"] == "Please summarize it."+++def test_multiple_tool_results_get_one_assistant_boundary_before_user():+ messages = [+ MockMessage(+ "assistant",+ [+ MockBlock(type="tool_use", id="call_a", name="ReadA", input={}),+ MockBlock(type="tool_use", id="call_b", name="ReadB", input={}),+ ],+ ),+ MockMessage(+ "user",+ [+ MockBlock(+ type="tool_result",+ tool_use_id="call_b",+ content="result b",+ ),+ MockBlock(+ type="tool_result",+ tool_use_id="call_a",+ content="result a",+ ),+ ],+ ),+ MockMessage("user", "Compare both results."),+ ]++ result = AnthropicToOpenAIConverter.convert_messages(messages)++ assert [message["role"] for message in result] == [+ "assistant",+ "tool",+ "tool",+ "assistant",+ "user",+ ]+ assert [message["tool_call_id"] for message in result[1:3]] == [+ "call_a",+ "call_b",+ ]+ assert result[3] == {"role": "assistant", "content": " "}+ assert result[4]["content"] == "Compare both results."+++def test_terminal_tool_result_does_not_get_assistant_boundary():+ messages = _completed_single_tool_turn()++ result = AnthropicToOpenAIConverter.convert_messages(messages)++ assert [message["role"] for message in result] == ["assistant", "tool"]+++def test_existing_assistant_completion_prevents_extra_tool_turn_boundary():+ messages = [+ *_completed_single_tool_turn(),+ MockMessage("assistant", "The file contains useful information."),+ MockMessage("user", "Please summarize it."),+ ]++ result = AnthropicToOpenAIConverter.convert_messages(messages)++ assert [message["role"] for message in result] == [+ "assistant",+ "tool",+ "assistant",+ "user",+ ]+ assert result[2]["content"] == "The file contains useful information."def test_unrelated_assistant_text_before_tool_result_is_buffered_until_after_tool_result():diff --git a/tests/providers/test_open_router.py b/tests/providers/test_open_router.pyindex b5b29535..88866652 100644--- a/tests/providers/test_open_router.py+++ b/tests/providers/test_open_router.py@@ -1,5 +1,6 @@"""Tests for the OpenRouter OpenAI-chat provider."""+import jsonfrom types import SimpleNamespacefrom unittest.mock import AsyncMock, MagicMock, patch@@ -174,6 +175,130 @@ def test_build_request_body_replays_openrouter_reasoning_details(assert assistant["reasoning_details"] == [detail]+def test_reasoning_details_skip_neutral_tool_turn_boundary(open_router_provider):+ first_detail = {"type": "reasoning.encrypted", "data": "first"}+ second_detail = {"type": "reasoning.encrypted", "data": "second"}+ request = MessagesRequest.model_validate(+ {+ "model": "m",+ "messages": [+ {+ "role": "assistant",+ "content": [+ {+ "type": "redacted_thinking",+ "data": json.dumps(first_detail),+ },+ {+ "type": "tool_use",+ "id": "call_read",+ "name": "Read",+ "input": {},+ },+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "call_read",+ "content": "contents",+ }+ ],+ },+ {"role": "user", "content": "continue"},+ {+ "role": "assistant",+ "content": [+ {+ "type": "redacted_thinking",+ "data": json.dumps(second_detail),+ },+ {"type": "text", "text": "done"},+ ],+ },+ ],+ }+ )++ body = open_router_provider._build_request_body(+ request, reasoning=reasoning_for(request)+ )++ assistants = [+ message for message in body["messages"] if message["role"] == "assistant"+ ]+ assert assistants[0]["reasoning_details"] == [first_detail]+ assert assistants[1] == {"role": "assistant", "content": " "}+ assert assistants[2]["reasoning_details"] == [second_detail]+++def test_reasoning_details_preserve_redacted_only_assistant_after_tool(+ open_router_provider,+):+ first_detail = {"type": "reasoning.encrypted", "data": "first"}+ second_detail = {"type": "reasoning.encrypted", "data": "second"}+ request = MessagesRequest.model_validate(+ {+ "model": "m",+ "messages": [+ {+ "role": "assistant",+ "content": [+ {+ "type": "redacted_thinking",+ "data": json.dumps(first_detail),+ },+ {+ "type": "tool_use",+ "id": "call_read",+ "name": "Read",+ "input": {},+ },+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "call_read",+ "content": "contents",+ }+ ],+ },+ {+ "role": "assistant",+ "content": [+ {+ "type": "redacted_thinking",+ "data": json.dumps(second_detail),+ }+ ],+ },+ {"role": "user", "content": "continue"},+ {"role": "assistant", "content": "done"},+ ],+ }+ )++ body = open_router_provider._build_request_body(+ request, reasoning=reasoning_for(request)+ )++ assistants = [+ message for message in body["messages"] if message["role"] == "assistant"+ ]+ assert assistants[0]["reasoning_details"] == [first_detail]+ assert assistants[1] == {+ "role": "assistant",+ "content": " ",+ "reasoning_details": [second_detail],+ }+ assert "reasoning_details" not in assistants[2]++@pytest.mark.asyncioasync def test_stream_maps_reasoning_content_and_details(open_router_provider):redacted = {"type": "reasoning.encrypted", "data": "opaque"}diff --git a/uv.lock b/uv.lockindex b9c3de71..0a4749f3 100644--- a/uv.lock+++ b/uv.lock@@ -620,7 +620,7 @@ wheels = [[[package]]name = "free-claude-code"-version = "4.12.10"+version = "4.12.11"source = { editable = "." }dependencies = [{ name = "aiohttp" },