agentcode-cli 1.2.2__tar.gz → 1.3.1__tar.gz

{agentcode_cli-1.2.2/agentcode_cli.egg-info → agentcode_cli-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentcode-cli
-Version: 1.2.2
+Version: 1.3.1
 Summary: An open, multi-model agentic coding CLI — inspired by Claude Code
 Author: Vignesh Pai
 License: MIT License

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1}/agent.py

@@ -18,7 +18,10 @@ import litellm
 from rich.console import Console
 from rich.markdown import Markdown
 
-from xml_tool_parser import looks_like_xml_tool_call, parse_xml_tool_calls, strip_think
+from xml_tool_parser import (
+    looks_like_xml_tool_call, parse_xml_tool_calls, strip_think,
+    looks_like_json_tool_call, parse_json_tool_calls,
+)
 
 from tools import TOOL_DEFINITIONS, execute_tool
 from router import ModelRouter, display_routing_decision
@@ -348,17 +351,19 @@ def run_agent_loop(
                 cost,
             )
 
-        # Open-weight fine-tunes (e.g. Vigp17/agentcode-27b) may emit tool
-        # calls as inline XML in the text response. Detect and convert before
-        # treating this as a pure text turn.
-        if not tool_calls_accum and looks_like_xml_tool_call(full_text):
-            cleaned, xml_calls = parse_xml_tool_calls(full_text)
-            if xml_calls:
-                full_text = cleaned
-                for i, tc in enumerate(xml_calls):
-                    tool_calls_accum[i] = tc
-        elif not tool_calls_accum:
-            full_text = strip_think(full_text)
+        # Open-weight fine-tunes emit tool calls in the text response: the 27B
+        # uses XML (<function=...>), the 3B uses bare JSON. Detect and convert
+        # before treating this as a pure text turn.
+        if not tool_calls_accum:
+            if looks_like_xml_tool_call(full_text):
+                cleaned, parsed = parse_xml_tool_calls(full_text)
+            elif looks_like_json_tool_call(full_text):
+                cleaned, parsed = parse_json_tool_calls(full_text)
+            else:
+                cleaned, parsed = strip_think(full_text), []
+            full_text = cleaned
+            for i, tc in enumerate(parsed):
+                tool_calls_accum[i] = tc
 
         # Pure text response — done
         if not tool_calls_accum:

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1/agentcode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentcode-cli
-Version: 1.2.2
+Version: 1.3.1
 Summary: An open, multi-model agentic coding CLI — inspired by Claude Code
 Author: Vignesh Pai
 License: MIT License

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentcode-cli"
-version = "1.2.2"
+version = "1.3.1"
 description = "An open, multi-model agentic coding CLI — inspired by Claude Code"
 readme = "README.md"
 license = {file = "LICENSE"}

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1}/router.py

@@ -47,20 +47,11 @@ GEMINI_TIERS = [
     ModelTier("gemini/gemini-2.5-pro", "heavy", "Gemini 2.5 Pro", 1.25, 10.00),
 ]
 
-# Azure deployment names are user-defined, so tiers use common defaults.
-# Users can override via settings.json model.light/medium/heavy.
-AZURE_TIERS = [
-    ModelTier("azure/gpt-4o-mini", "light", "Azure GPT-4o Mini", 0.15, 0.60),
-    ModelTier("azure/gpt-4o", "medium", "Azure GPT-4o", 2.50, 10.00),
-    ModelTier("azure/gpt-4o", "heavy", "Azure GPT-4o", 2.50, 10.00),
-]
-
 # Provider configs keyed by prefix
 PROVIDER_TIERS = {
     "anthropic": ANTHROPIC_TIERS,
     "openai": OPENAI_TIERS,
     "gemini": GEMINI_TIERS,
-    "azure": AZURE_TIERS,
 }
 
 
@@ -212,9 +203,7 @@ class ModelRouter:
     def detect_provider(self, model_string: str) -> str:
         """Detect provider from a model string."""
         m = model_string.lower()
-        if m.startswith("azure/"):
-            return "azure"
-        elif "claude" in m or "anthropic" in m:
+        if "claude" in m or "anthropic" in m:
             return "anthropic"
         elif "gpt" in m or "openai" in m or "o1" in m or "o3" in m:
             return "openai"

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1}/server.py

@@ -12,7 +12,10 @@ from agent import (
     build_system_prompt, load_project_config, load_hooks,
     _run_subagents, _run_hook, _is_denied, _get_permission,
 )
-from xml_tool_parser import looks_like_xml_tool_call, parse_xml_tool_calls, strip_think
+from xml_tool_parser import (
+    looks_like_xml_tool_call, parse_xml_tool_calls, strip_think,
+    looks_like_json_tool_call, parse_json_tool_calls,
+)
 
 
 # ── Wire protocol ─────────────────────────────────────────────────────────────
@@ -107,17 +110,20 @@ def _server_turn(
                         if tc.function.arguments:
                             tool_calls_accum[idx]["arguments"] += tc.function.arguments
 
-        # Some open-weight fine-tunes (e.g. Vigp17/agentcode-27b) emit tool
-        # calls as inline XML in the text response instead of using litellm's
-        # structured tool_calls field. Detect and convert.
-        if not tool_calls_accum and looks_like_xml_tool_call(full_text):
-            cleaned, xml_calls = parse_xml_tool_calls(full_text)
-            if xml_calls:
-                full_text = cleaned
-                for i, tc in enumerate(xml_calls):
-                    tool_calls_accum[i] = tc
-        elif not tool_calls_accum:
-            full_text = strip_think(full_text)
+        # Open-weight fine-tunes emit tool calls in the text response instead of
+        # litellm's structured tool_calls field. The 27B uses XML
+        # (<function=...>), the 3B uses bare JSON ({"name":...,"arguments":...}).
+        # Detect and convert both.
+        if not tool_calls_accum:
+            if looks_like_xml_tool_call(full_text):
+                cleaned, parsed = parse_xml_tool_calls(full_text)
+            elif looks_like_json_tool_call(full_text):
+                cleaned, parsed = parse_json_tool_calls(full_text)
+            else:
+                cleaned, parsed = strip_think(full_text), []
+            full_text = cleaned
+            for i, tc in enumerate(parsed):
+                tool_calls_accum[i] = tc
 
         if router and usage:
             try:

{agentcode_cli-1.2.2 → agentcode_cli-1.3.1}/xml_tool_parser.py

@@ -85,3 +85,81 @@ def parse_xml_tool_calls(text: str) -> tuple[str, list[dict]]:
 
     cleaned = _TOOL_CALL_RE.sub("", cleaned).strip()
     return cleaned, tool_calls
+
+
+# ── JSON-style tool calls (e.g. the AgentCode 3B) ─────────────────────────────
+# Smaller fine-tunes often emit a bare JSON object instead of the XML form:
+#     {"name": "git_status", "arguments": {}}
+# optionally wrapped in <tool_call>...</tool_call>. litellm doesn't pick these
+# up as structured tool_calls, so we detect and convert them too.
+
+
+def looks_like_json_tool_call(text: str) -> bool:
+    """Cheap check: a JSON object mentioning both name and arguments."""
+    return '"name"' in text and '"arguments"' in text
+
+
+def _extract_json_objects(text: str) -> list[str]:
+    """Return top-level {...} substrings via brace matching (ignores braces in strings)."""
+    objs: list[str] = []
+    depth = 0
+    start = None
+    in_str = False
+    escape = False
+    for i, ch in enumerate(text):
+        if in_str:
+            if escape:
+                escape = False
+            elif ch == "\\":
+                escape = True
+            elif ch == '"':
+                in_str = False
+            continue
+        if ch == '"':
+            in_str = True
+        elif ch == "{":
+            if depth == 0:
+                start = i
+            depth += 1
+        elif ch == "}":
+            if depth > 0:
+                depth -= 1
+                if depth == 0 and start is not None:
+                    objs.append(text[start:i + 1])
+                    start = None
+    return objs
+
+
+def parse_json_tool_calls(text: str) -> tuple[str, list[dict]]:
+    """
+    Extract bare-JSON tool calls and return (cleaned_text, tool_calls).
+
+    Handles {"name": ..., "arguments": {...}} objects, with or without
+    surrounding <tool_call> tags. Returns the same accumulator shape as
+    parse_xml_tool_calls.
+    """
+    cleaned = strip_think(text)
+    inner = cleaned.replace("<tool_call>", "").replace("</tool_call>", "")
+
+    tool_calls: list[dict] = []
+    matched_spans: list[str] = []
+    for cand in _extract_json_objects(inner):
+        try:
+            obj = json.loads(cand)
+        except (json.JSONDecodeError, ValueError):
+            continue
+        if isinstance(obj, dict) and "name" in obj and "arguments" in obj:
+            args = obj["arguments"]
+            args_str = args if isinstance(args, str) else json.dumps(args)
+            tool_calls.append({
+                "id": f"call_{uuid.uuid4().hex[:8]}",
+                "name": obj["name"],
+                "arguments": args_str,
+            })
+            matched_spans.append(cand)
+
+    if tool_calls:
+        for span in matched_spans:
+            cleaned = cleaned.replace(span, "")
+        cleaned = cleaned.replace("<tool_call>", "").replace("</tool_call>", "").strip()
+    return cleaned, tool_calls