npcsh 1.1.20__py3-none-any.whl → 1.1.22__py3-none-any.whl

npcsh/_state.py

@@ -2537,19 +2537,16 @@ def collect_llm_tools(state: ShellState) -> Tuple[List[Dict[str, Any]], Dict[str
     elif npc_obj and getattr(npc_obj, "tool_map", None):
         tool_map.update(npc_obj.tool_map)
 
-    # Jinx tools from NPC and Team
+    # Jinx tools from NPC only (NPC.jinxs_dict is already filtered by jinxs_spec
+    # during initialize_jinxs - don't add the full team catalog which overwhelms small models)
     aggregated_jinxs: Dict[str, Any] = {}
     if npc_obj and getattr(npc_obj, "jinxs_dict", None):
         aggregated_jinxs.update(npc_obj.jinxs_dict)
-    if state.team and isinstance(state.team, Team) and getattr(state.team, "jinxs_dict", None):
-        aggregated_jinxs.update({k: v for k, v in state.team.jinxs_dict.items() if k not in aggregated_jinxs})
 
     if aggregated_jinxs:
         jinx_catalog: Dict[str, Dict[str, Any]] = {}
         if npc_obj and getattr(npc_obj, "jinx_tool_catalog", None):
             jinx_catalog.update(npc_obj.jinx_tool_catalog or {})
-        if state.team and isinstance(state.team, Team) and getattr(state.team, "jinx_tool_catalog", None):
-            jinx_catalog.update(state.team.jinx_tool_catalog or {})
         if not jinx_catalog:
             jinx_catalog = build_jinx_tool_catalog(aggregated_jinxs)
 
@@ -2898,6 +2895,14 @@ def process_pipeline_command(
             tools_for_llm, tool_exec_map = collect_llm_tools(state)
             if not tools_for_llm:
                 tool_capable = False
+            else:
+                # Add tool guidance so model knows to use function calls
+                tool_names = [t['function']['name'] for t in tools_for_llm if 'function' in t]
+                info += (
+                    f"\nYou have access to these tools: {', '.join(tool_names)}. "
+                    f"You MUST use the function calling interface to invoke them. "
+                    f"Do NOT write tool names as text - call them as functions."
+                )
 
         npc_name = (
             state.npc.name 
@@ -3444,9 +3449,9 @@ def setup_shell() -> Tuple[CommandHistory, Team, Optional[NPC]]:
     command_history = CommandHistory(db_path)
 
     if not is_npcsh_initialized():
-        print("Initializing NPCSH...")
+        print("Setting up npcsh for first use...")
         initialize_base_npcs_if_needed(db_path)
-        print("NPCSH initialization complete. Restart or source ~/.npcshrc.")
+        print("Setup complete.")
 
     try:
         setup_readline()
@@ -3458,80 +3463,17 @@ def setup_shell() -> Tuple[CommandHistory, Team, Optional[NPC]]:
     project_team_path = os.path.abspath(PROJECT_NPC_TEAM_PATH)
     global_team_path = os.path.expanduser(DEFAULT_NPC_TEAM_PATH)
 
-    team_dir = None
-    default_forenpc_name = None
-    global_team_path = os.path.expanduser(DEFAULT_NPC_TEAM_PATH)
     if not os.path.exists(global_team_path):
-        print("Global NPC team directory doesn't exist. Initializing...")
         initialize_base_npcs_if_needed(db_path)
     if os.path.exists(project_team_path):
         team_dir = project_team_path
         default_forenpc_name = "forenpc"
     else:
-        if not os.path.exists('.npcsh_global'):
-            try:
-                resp = input(f"No npc_team found in {os.getcwd()}. Create a new team here? [Y/n]: ").strip().lower()
-            except (KeyboardInterrupt, EOFError):
-                print("\nAborted.")
-                sys.exit(0)
-            if resp in ("", "y", "yes"):
-                team_dir = project_team_path
-                os.makedirs(team_dir, exist_ok=True)
-                default_forenpc_name = "forenpc"
-                try:
-                    forenpc_directive = input(
-                        f"Enter a primary directive for {default_forenpc_name} (default: 'You are the forenpc of the team...'): "
-                    ).strip() or "You are the forenpc of the team, coordinating activities between NPCs on the team, verifying that results from NPCs are high quality and can help to adequately answer user requests."
-                    forenpc_model = input("Enter a model for your forenpc (default: llama3.2): ").strip() or "llama3.2"
-                    forenpc_provider = input("Enter a provider for your forenpc (default: ollama): ").strip() or "ollama"
-                except (KeyboardInterrupt, EOFError):
-                    print("\nAborted.")
-                    sys.exit(0)
-
-                with open(os.path.join(team_dir, f"{default_forenpc_name}.npc"), "w") as f:
-                    yaml.dump({
-                        "name": default_forenpc_name, "primary_directive": forenpc_directive,
-                        "model": forenpc_model, "provider": forenpc_provider
-                    }, f)
-
-                ctx_path = os.path.join(team_dir, "team.ctx")
-                try:
-                    folder_context = input("Enter a short description for this project/team (optional): ").strip()
-                    team_ctx_data = {
-                        "forenpc": default_forenpc_name,
-                        "model": forenpc_model,
-                        "provider": forenpc_provider,
-                        "context": folder_context if folder_context else None
-                    }
-                    use_jinxs = input("Use global jinxs folder (g) or copy to this project (c)? [g/c, default: g]: ").strip().lower()
-                except (KeyboardInterrupt, EOFError):
-                    print("\nAborted.")
-                    sys.exit(0)
-                if use_jinxs == "c":
-                    global_jinxs_dir = os.path.expanduser("~/.npcsh/npc_team/jinxs")
-                    if os.path.exists(global_jinxs_dir):
-                        # Create the 'jinxs' subfolder within the new team's directory
-                        destination_jinxs_dir = os.path.join(team_dir, "jinxs")
-                        os.makedirs(destination_jinxs_dir, exist_ok=True)
-                        shutil.copytree(global_jinxs_dir, destination_jinxs_dir, dirs_exist_ok=True)
-                else:
-                    team_ctx_data["use_global_jinxs"] = True
-                with open(ctx_path, "w") as f:
-                    yaml.dump(team_ctx_data, f)
-            else:
-                render_markdown('From now on, npcsh will assume you will use the global team when activating from this folder. \n If you change your mind and want to initialize a team, use /init from within npcsh, `npc init` or `rm .npcsh_global` from the current working directory.')
-                with open(".npcsh_global", "w") as f:
-                    pass
-                team_dir = global_team_path
-                default_forenpc_name = "sibiji"
-        else:
-            team_dir = global_team_path
-            default_forenpc_name = "sibiji"
-    
-    if team_dir is None:
+        # No project team in this directory - use global team.
+        # To create a project team, use /init from within npcsh or `npc init`.
         team_dir = global_team_path
         default_forenpc_name = "sibiji"
-    
+
     if not os.path.exists(team_dir):
         print(f"Creating team directory: {team_dir}")
         os.makedirs(team_dir, exist_ok=True)
@@ -3548,11 +3490,8 @@ def setup_shell() -> Tuple[CommandHistory, Team, Optional[NPC]]:
     forenpc_name = team_ctx.get("forenpc", default_forenpc_name)
     if forenpc_name is None:
         forenpc_name = "sibiji"
-  
-    print('forenpc_name:', forenpc_name)
 
     forenpc_path = os.path.join(team_dir, f"{forenpc_name}.npc")
-    print('forenpc_path:', forenpc_path)
 
     team = Team(team_path=team_dir, db_conn=command_history.engine)
     

npcsh/benchmark/npcsh_agent.py

@@ -53,11 +53,11 @@ class NpcshAgent(BaseInstalledAgent):
         Returns:
             List of ExecInput commands to execute
         """
-        # Wrap the instruction with explicit jinx usage directions and retry logic
-        tool_instruction = f"""You have access to jinxs including edit_file (for writing/creating files), sh (for running shell commands), and python (for running Python code).
+        # Wrap the instruction with tool usage directions and retry logic
+        tool_instruction = f"""You have access to tools: edit_file (for writing/creating files), sh (for running shell commands), and python (for running Python code).
 
 IMPORTANT RULES:
-1. You MUST use these jinxs to complete the task. Do NOT just output code as text - use the edit_file jinx to actually write files to disk.
+1. You MUST call these tools using the function calling interface to complete the task. Do NOT write tool names as text - invoke them as function calls.
 2. After implementing a solution, you MUST verify it works by running any provided test scripts.
 3. If a test fails or produces an error, you MUST try a DIFFERENT approach. Do not give up.
 4. Keep trying different approaches until you succeed or have tried at least 10 different solutions.
@@ -66,13 +66,11 @@ IMPORTANT RULES:
 Task: {instruction}
 
 WORKFLOW:
-1. Implement your solution using edit_file and sh
+1. Call edit_file to write code files. Call sh to run commands.
 2. Run any test scripts mentioned in the task
 3. Check the output carefully - look for "PASS", "SUCCESS", "OK" or similar
 4. If the test failed, analyze why and try a completely different approach
-5. Repeat until the test passes
-
-Remember: Use edit_file to write code files. Use sh to run commands. VERIFY your solution works before concluding."""
+5. Repeat until the test passes"""
 
         escaped_instruction = shlex.quote(tool_instruction)
         model_name = self.model_name
@@ -146,8 +144,14 @@ Remember: Use edit_file to write code files. Use sh to run commands. VERIFY your
         # Using corca NPC which has edit_file tool for writing files
         # Using the npc CLI which supports single-command execution
         # NPCSH_DEFAULT_MODE=agent enables automatic tool execution
+        ollama_env = ""
+        if npcsh_provider == "ollama":
+            ollama_host = os.environ.get("OLLAMA_HOST", "http://host.docker.internal:11434")
+            ollama_env = f'OLLAMA_HOST="{ollama_host}" '
+
         npcsh_cmd = (
             f'{env_prefix}'
+            f'{ollama_env}'
             f'NPCSH_CHAT_MODEL="{model}" '
             f'NPCSH_CHAT_PROVIDER="{npcsh_provider}" '
             f'NPCSH_STREAM_OUTPUT=0 '
@@ -234,11 +238,11 @@ class NpcshAgentWithNpc(NpcshAgent):
 
     def create_run_agent_commands(self, instruction: str) -> list:
         """Create commands using a specific NPC."""
-        # Wrap the instruction with explicit jinx usage directions and retry logic
-        tool_instruction = f"""You have access to jinxs including edit_file (for writing/creating files), sh (for running shell commands), and python (for running Python code).
+        # Wrap the instruction with tool usage directions and retry logic
+        tool_instruction = f"""You have access to tools: edit_file (for writing/creating files), sh (for running shell commands), and python (for running Python code).
 
 IMPORTANT RULES:
-1. You MUST use these jinxs to complete the task. Do NOT just output code as text - use the edit_file jinx to actually write files to disk.
+1. You MUST call these tools using the function calling interface to complete the task. Do NOT write tool names as text - invoke them as function calls.
 2. After implementing a solution, you MUST verify it works by running any provided test scripts.
 3. If a test fails or produces an error, you MUST try a DIFFERENT approach. Do not give up.
 4. Keep trying different approaches until you succeed or have tried at least 10 different solutions.
@@ -247,13 +251,11 @@ IMPORTANT RULES:
 Task: {instruction}
 
 WORKFLOW:
-1. Implement your solution using edit_file and sh
+1. Call edit_file to write code files. Call sh to run commands.
 2. Run any test scripts mentioned in the task
 3. Check the output carefully - look for "PASS", "SUCCESS", "OK" or similar
 4. If the test failed, analyze why and try a completely different approach
-5. Repeat until the test passes
-
-Remember: Use edit_file to write code files. Use sh to run commands. VERIFY your solution works before concluding."""
+5. Repeat until the test passes"""
 
         escaped_instruction = shlex.quote(tool_instruction)
         model_name = self.model_name
@@ -309,8 +311,14 @@ Remember: Use edit_file to write code files. Use sh to run commands. VERIFY your
 
         # Use specific NPC with --npc flag
         # NPCSH_DEFAULT_MODE=agent enables automatic tool execution
+        ollama_env = ""
+        if npcsh_provider == "ollama":
+            ollama_host = os.environ.get("OLLAMA_HOST", "http://host.docker.internal:11434")
+            ollama_env = f'OLLAMA_HOST="{ollama_host}" '
+
         npcsh_cmd = (
             f'{env_prefix}'
+            f'{ollama_env}'
             f'NPCSH_CHAT_MODEL="{model}" '
             f'NPCSH_CHAT_PROVIDER="{npcsh_provider}" '
             f'NPCSH_STREAM_OUTPUT=0 '

npcsh/benchmark/templates/install-npcsh.sh.j2

@@ -14,8 +14,8 @@ fi
 
 # Install npcsh with lite dependencies (API providers only, no local models)
 # Use --break-system-packages for PEP 668 compliance (Ubuntu 24.04+)
-echo "Installing npcsh[lite]..."
-pip install --quiet --break-system-packages npcsh[lite] || pip install --quiet npcsh[lite]
+echo "Installing npcsh[lite] + ollama..."
+pip install --quiet --break-system-packages npcsh[lite] ollama || pip install --quiet npcsh[lite] ollama
 
 # Verify installation
 echo "Verifying npcsh installation..."

npcsh/diff_viewer.py

@@ -6,7 +6,7 @@ import os
 import sys
 import difflib
 from dataclasses import dataclass, field
-from typing import List, Dict, Optional, Tuple
+from typing import List, Dict, Tuple
 from enum import Enum
 
 # Platform-specific imports
@@ -324,8 +324,8 @@ class DiffViewer:
                 start = hunk.start_original - 1 + offset
 
                 # Count removals and additions in this hunk
-                removals = [l[1:] for l in hunk.lines if l.startswith('-')]
-                additions = [l[1:] for l in hunk.lines if l.startswith('+')]
+                removals = [ln[1:] for ln in hunk.lines if ln.startswith('-')]
+                additions = [ln[1:] for ln in hunk.lines if ln.startswith('+')]
 
                 # Remove old lines
                 del result_lines[start:start + len(removals)]

npcsh/mcp_server.py

@@ -1,9 +1,17 @@
 
 """
-Enhanced MCP server that incorporates functionality from npcpy.routes, 
+Enhanced MCP server that incorporates functionality from npcpy.routes,
 npcpy.llm_funcs, and npcpy.npc_compiler as tools.
 """
 
+# When run as a subprocess, Python adds the script directory to sys.path[0].
+# Since this file lives inside the npcsh package, that shadows the package
+# (npcsh.py is found instead of the npcsh/ package). Remove it.
+import sys as _sys, os as _os
+_script_dir = _os.path.dirname(_os.path.abspath(__file__))
+if _script_dir in _sys.path:
+    _sys.path.remove(_script_dir)
+
 import os
 import subprocess
 import json

npcsh/npc_team/alicanto.npc

@@ -11,13 +11,19 @@ colors:
   top: "255,215,0"
   bottom: "218,165,32"
 primary_directive: |
-  You are alicanto, the research and exploration specialist of the NPC team.
-  Like the mythical bird, you lead users to discover valuable information.
-  Your role is web research, searching, and helping users explore topics.
-  Use search tools to find information and present findings clearly.
+  You are alicanto, a research agent. You investigate hypotheses through experimentation and evidence gathering.
+  Search academic papers to ground your work in existing literature.
+  Search the web for data, documentation, and recent findings.
+  Write and execute Python code to analyze data, compute statistics, and generate results.
+  Use shell commands for data processing and system tasks.
+  Create files to record your findings, analyses, and evidence.
+  When exploring a hypothesis, gather evidence from multiple sources, analyze it quantitatively where possible, and document what you find.
+  Say RESEARCH_COMPLETE when you have sufficient evidence to evaluate your hypothesis.
 jinxs:
-  - lib/core/search
+  - lib/core/search/web_search
+  - lib/core/search/file_search
+  - lib/core/search/db_search
   - lib/core/sh
   - lib/core/python
   - lib/core/load_file
-  - lib/research/*
+  - lib/core/edit_file

npcsh/npc_team/corca.npc

@@ -27,5 +27,4 @@ jinxs:
   - lib/core/python
   - lib/core/edit_file
   - lib/core/load_file
-  - lib/core/search
     

npcsh/npc_team/frederic.npc

@@ -22,6 +22,5 @@ jinxs:
   - lib/core/sql
   - lib/core/sh
   - lib/core/load_file
-  - lib/core/search
-  - lib/gen/*
-  - bin/wander
+  - lib/core/search/web_search
+  - lib/core/edit_file