Merge branch 'master' of https://github.com/alchemiststudiosDOTai/tunacode

Author: tunahorse

.claude/delta/2026-03-03-ruff-import-order-determinism.md

@@ -0,0 +1,45 @@
+---
+title: Make Ruff import sorting deterministic across local and CI
+type: delta
+link: ruff-import-order-determinism
+path: pyproject.toml
+depth: 1
+seams: [M]
+ontological_relations:
+  - affects: [[tooling]]
+  - affects: [[ci]]
+  - affects: [[imports]]
+tags:
+  - ruff
+  - pre-commit
+  - ci
+  - import-order
+created_at: 2026-03-03T04:30:00+00:00
+updated_at: 2026-03-03T04:30:00+00:00
+uuid: 1563860a-585a-49eb-a57a-52eb721c5912
+---
+
+# Make Ruff import sorting deterministic across local and CI
+
+## Summary
+
+Added `src = ["src"]` under `[tool.ruff]` so Ruff/isort classifies first-party modules from `src/` only.
+
+This prevents local environment differences (for example, an untracked `tinyAgent/` directory) from changing how `tinyagent` imports are grouped.
+
+Re-applied import sorting in files that were flipping between local and CI:
+
+- `src/tunacode/core/agents/agent_components/agent_config.py`
+- `src/tunacode/core/agents/main.py`
+- `src/tunacode/tools/decorators.py`
+- `tests/benchmarks/bench_discover.py`
+
+## Why
+
+PR #407 was failing the `pre-commit` GitHub check because Ruff auto-fixed imports in CI and exited with code 1.
+Local pre-commit passed after fixes, but CI still re-sorted imports due different module classification.
+
+## Validation
+
+- `uv run pre-commit run --all-files` ✅
+- `uv run pytest tests/integration/core/test_minimax_execution_path.py tests/integration/core/test_mtime_caches_end_to_end.py tests/system/cli/test_repl_support.py tests/unit/tools/test_tinyagent_tool_adapter.py -q` ✅

pyproject.toml

@@ -91,6 +91,7 @@ Documentation = "https://github.com/alchemiststudiosDOTai/tunacode#readme"
 
 [tool.ruff]
 line-length = 100
+src = ["src"]
 
 [tool.ruff.lint]
 select = [

src/tunacode/tools/decorators.py

@@ -191,10 +191,7 @@ async def execute(
             bound = sig.bind(**args)
             bound.apply_defaults()
         except TypeError as exc:
-            raise ToolRetryError(
-                f"Invalid arguments for tool '{tool_name}': {exc}. "
-                f"Expected schema: {parameters_schema}"
-            ) from exc
+            raise ToolRetryError(f"Invalid arguments for tool '{tool_name}': {exc}") from exc
 
         result = await func(**cast(dict[str, Any], bound.arguments))
 

src/tunacode/ui/repl_support.py

@@ -187,6 +187,13 @@ def _truncate_for_safety(content: str | None) -> str | None:
     return truncated_result
 
 
+def _is_validation_error(result: str | None) -> bool:
+    """Check if result is a validation error that should go to model, not user."""
+    if result is None:
+        return False
+    return "Invalid arguments for tool" in result and "missing a required argument" in result
+
+
 def build_tool_result_callback(app: AppForCallbacks) -> ToolResultCallback:
     def _callback(
         tool_name: ToolName,
@@ -204,6 +211,10 @@ def _callback(
         app.status_bar.complete_running_action(tool_name)
         app.status_bar.update_last_action(tool_name)
 
+        # Don't show validation errors to users - they go back to model for retry
+        if status == "failed" and _is_validation_error(result):
+            return
+
         safe_result = _truncate_for_safety(result)
 
         app.post_message(

tests/integration/core/test_minimax_execution_path.py

@@ -59,8 +59,10 @@ async def _fake_stream(model: Any, context: Any, options: dict[str, Any]) -> _Fa
         return _FakeResponse()
 
     monkeypatch.setattr(agent_config, "stream_alchemy_openai_completions", _fake_stream)
-    monkeypatch.setattr(agent_config, "load_system_prompt", lambda _base_path, model=None: "")
-    monkeypatch.setattr(agent_config, "load_tunacode_context", lambda: "")
+    monkeypatch.setattr(
+        agent_config, "load_system_prompt", lambda _base_path, model=None: ("", None)
+    )
+    monkeypatch.setattr(agent_config, "load_tunacode_context", lambda: ("", None))
 
     agent = agent_config.get_or_create_agent(MINIMAX_CODING_PLAN_MODEL, state_manager)
     response_text = await agent.prompt_text("Reply with ok")

tests/integration/core/test_mtime_caches_end_to_end.py

@@ -43,7 +43,7 @@ def test_tunacode_context_cache_invalidates_on_mtime_ns(
     second = load_tunacode_context()
 
     assert first == second
-    assert "one" in first
+    assert "one" in first[0]
 
     agents_path.write_text("two\n", encoding="utf-8")
 
@@ -54,7 +54,7 @@ def test_tunacode_context_cache_invalidates_on_mtime_ns(
     third = load_tunacode_context()
 
     assert third != first
-    assert "two" in third
+    assert "two" in third[0]
 
 
 def test_ignore_manager_cache_invalidates_on_mtime_ns(