npcsh 1.1.13__tar.gz → 1.1.14__tar.gz

{npcsh-1.1.13 → npcsh-1.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.13
+Version: 1.1.14
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.13 → npcsh-1.1.14}/npcsh/_state.py

@@ -2524,8 +2524,7 @@ def process_pipeline_command(
                     # Only add tool_choice for providers that support it (not gemini)
                     is_gemini = (exec_provider and "gemini" in exec_provider.lower()) or \
                                 (exec_model and "gemini" in exec_model.lower())
-                    if not is_gemini:
-                        llm_kwargs["tool_choice"] = {"type": "auto"}
+                    llm_kwargs["tool_choice"] = 'auto'
 
                     llm_result = get_llm_response(
                         full_llm_cmd,
@@ -2552,7 +2551,8 @@ def process_pipeline_command(
                         images=state.attachments,
                         stream=stream_final,
                         context=info,
-                        extra_globals=application_globals_for_jinx
+                        extra_globals=application_globals_for_jinx,
+                        tool_capable=tool_capable,
                     )
             except KeyboardInterrupt:
                 print(colored("\nLLM processing interrupted by user.", "yellow"))

{npcsh-1.1.13 → npcsh-1.1.14}/npcsh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.13
+Version: 1.1.14
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.13 → npcsh-1.1.14}/npcsh.egg-info/SOURCES.txt

@@ -81,4 +81,5 @@ npcsh/npc_team/jinxs/utils/core/compile.jinx
 npcsh/npc_team/jinxs/utils/core/help.jinx
 npcsh/npc_team/jinxs/utils/core/init.jinx
 npcsh/npc_team/jinxs/utils/core/jinxs.jinx
-npcsh/npc_team/jinxs/utils/core/set.jinx
+npcsh/npc_team/jinxs/utils/core/set.jinx
+tests/test_tool_routing.py

{npcsh-1.1.13 → npcsh-1.1.14}/setup.py

@@ -78,7 +78,7 @@ extra_files = package_files("npcsh/npc_team/")
 
 setup(
     name="npcsh",
-    version="1.1.13",
+    version="1.1.14",
     packages=find_packages(exclude=["tests*"]),
     install_requires=base_requirements,  # Only install base requirements by default
     extras_require={

npcsh-1.1.14/tests/test_tool_routing.py

@@ -0,0 +1,81 @@
+import pytest
+
+import npcsh._state as state_module
+from npcsh._state import ShellState, process_pipeline_command
+
+
+@pytest.fixture(autouse=True)
+def stub_available_models(monkeypatch):
+    monkeypatch.setattr(state_module, "get_locally_available_models", lambda path: {})
+
+
+def test_model_supports_tool_calls_uses_heuristics(monkeypatch):
+    # Force ollama inspection to be inconclusive so heuristics are used.
+    monkeypatch.setattr(state_module, "_ollama_supports_tools", lambda model: None)
+    assert not state_module.model_supports_tool_calls("gemma3:4b", "ollama")
+    assert state_module.model_supports_tool_calls("qwen3:0.6b", "ollama")
+
+
+def test_react_flow_used_for_non_tool_models(tmp_path, monkeypatch):
+    calls = {"check": 0, "llm": 0}
+
+    def fake_check_llm_command(*args, **kwargs):
+        calls["check"] += 1
+        return {"output": "react-path", "messages": kwargs.get("messages", [])}
+
+    monkeypatch.setattr(state_module, "model_supports_tool_calls", lambda m, p: False)
+    monkeypatch.setattr(state_module, "check_llm_command", fake_check_llm_command)
+    monkeypatch.setattr(state_module, "get_llm_response", lambda *a, **k: None)
+
+    shell_state = ShellState(current_path=str(tmp_path))
+    updated_state, output = process_pipeline_command(
+        "explain something", None, shell_state, stream_final=False, router=None
+    )
+
+    assert calls["check"] == 1
+    assert output == "react-path"
+    # user message should be appended
+    assert updated_state.messages and updated_state.messages[0]["role"] == "user"
+
+
+def test_tool_call_flow_for_tool_capable_models(tmp_path, monkeypatch):
+    calls = {"check": 0, "llm": 0}
+
+    def fake_get_llm_response(*args, **kwargs):
+        calls["llm"] += 1
+        msgs = kwargs.get("messages", [])
+        return {"response": "tool-route", "messages": msgs + [{"role": "assistant", "content": "tool-route"}]}
+
+    monkeypatch.setattr(state_module, "model_supports_tool_calls", lambda m, p: True)
+    monkeypatch.setattr(state_module, "get_llm_response", fake_get_llm_response)
+    monkeypatch.setattr(
+        state_module,
+        "collect_llm_tools",
+        lambda _state: (
+            [
+                {
+                    "type": "function",
+                    "function": {"name": "dummy", "description": "d", "parameters": {"type": "object", "properties": {}}},
+                }
+            ],
+            {"dummy": lambda **kwargs: "ok"},
+        ),
+    )
+    monkeypatch.setattr(
+        state_module,
+        "check_llm_command",
+        lambda *args, **kwargs: (
+            calls.__setitem__("check", calls["check"] + 1)
+            or {"output": "should-not-run", "messages": kwargs.get("messages", [])}
+        ),
+    )
+
+    shell_state = ShellState(current_path=str(tmp_path))
+    updated_state, output = process_pipeline_command(
+        "explain something", None, shell_state, stream_final=False, router=None
+    )
+
+    assert calls["llm"] == 1
+    assert calls["check"] == 0
+    assert output == "tool-route"
+    assert updated_state.messages and updated_state.messages[-1]["role"] == "assistant"