fix: resolve git conflicts in LLM abstraction layer

- Fix gui() function import in __init__.py (use cli.selector)
- Fix prompt builder system message merging logic
- Add default max_tokens for Anthropic API in claude.py
- Fix openai tool_call arguments parsing with json.loads
- Fix test_builder.py PromptConfig import and assertions

pyproject.toml

@@ -28,15 +28,9 @@ dev = [
     "pytest>=8.0",
     "pytest-asyncio>=0.23",
     "pytest-cov>=4.1",
+    "pytest-mock>=3.12",
     "ruff>=0.4",
     "mypy>=1.10",
-    "ruff>=0.4",
-]
-test = [
-    "pytest>=8.0",
-    "pytest-asyncio>=0.23",
-    "pytest-cov>=4.1",
-    "pytest-mock>=3.12",
 ]
 
 [project.urls]

src/llm/__init__.py

@@ -28,6 +28,6 @@ __all__ = [
 
 
 def gui() -> None:
-    from llm.gui.selector import main
+    from llm.cli.selector import main
     main()
 

src/llm/prompt/builder.py

@@ -39,6 +39,7 @@ class PromptBuilder:
 
         if messages[0].role == Role.SYSTEM:
             system_parts.insert(0, messages[0].content)
+            result.insert(0, Message(role=Role.SYSTEM, content="\n\n".join(system_parts)))
             result.extend(messages[1:])
         else:
             if system_parts:

src/llm/providers/claude.py

@@ -57,6 +57,8 @@ class ClaudeProvider(LLMProvider):
             }
             if input.max_tokens:
                 params["max_tokens"] = input.max_tokens
+            else:
+                params["max_tokens"] = 8192  # required by Anthropic API
             if input.tools:
                 params["tools"] = [tool.to_dict() for tool in input.tools]
 

src/llm/providers/openai.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import json
 import os
 from typing import Any
 
@@ -77,7 +78,7 @@ class OpenAIProvider(LLMProvider):
                     ToolCall(
                         id=tc.id or "",
                         name=tc.function.name,
-                        arguments={} if tc.function.arguments == "" else tc.function.arguments,
+                        arguments={} if not tc.function.arguments else json.loads(tc.function.arguments),
                     )
                     for tc in choice.message.tool_calls
                 ]

tests/test_builder.py

@@ -1,6 +1,7 @@
 import pytest
 from llm.core.types import LLMInput, Message, Role, ToolDefinition
 from llm.prompt import PromptBuilder, adapt_messages_for_provider
+from llm.prompt.builder import PromptConfig
 
 
 class TestPromptBuilder:
@@ -31,6 +32,13 @@ class TestPromptBuilder:
         assert len(result) == 2
         assert "pirate" in result[0].content
 
+    def test_build_adds_system_from_config(self):
+        messages = [Message(role=Role.USER, content="Hello")]
+        builder = PromptBuilder(config=PromptConfig(system_template="You are a pirate."))
+        result = builder.build(messages)
+
+        assert len(result) == 2
+        assert "pirate" in result[0].content
     def test_build_with_tools(self):
         messages = [Message(role=Role.USER, content="Search for something")]
         tools = [