npcsh 1.1.16__py3-none-any.whl → 1.1.18__py3-none-any.whl

npcsh/npc_team/jinxs/lib/core/search.jinx

@@ -1,131 +1,54 @@
-jinx_name: "search"
-description: >
-  Executes a search across various sources.
-  Usage:
-    /search <query>                         (Default: Web Search)
-    /search --memory <query>                (Search approved memories)
-    /search --kg <query>                    (Search the knowledge graph)
-    /search --rag [-f <paths>] <query>      (Execute a RAG search)
-    /search --brainblast <query>            (Advanced history search)
+jinx_name: search
+description: Unified search - routes to web_search, mem_search, kg_search, file_search, db_search
 inputs:
-  - query: ""
-  - sprovider: ""
-  - memory: false
-  - kg: false
-  - rag: false
-  - brainblast: false
-  - file_paths: ""
-  - history_db_path: "~/npcsh_history.db"
-  - vector_db_path: "~/npcsh_chroma.db"
-  - emodel: ""
-  - eprovider: ""
-steps:
-  - name: "execute_unified_search"
-    engine: "python"
-    code: |
-      import os
-      import traceback
-      from npcpy.data.web import search_web
-
-      # Access query from context
-      query = context.get('query')
-      if not query or not query.strip():
-          context['output'] = "Usage: /search [--memory|--kg|--rag|--brainblast] <query>"
-      else:
-          # state is available as a GLOBAL variable (from extra_globals)
-          # Access it directly, not from context
-          try:
-              current_state = state  # This should work now
-          except NameError:
-              context['output'] = "Error: Shell state not available in jinx context"
-              raise
-          
-          current_npc = current_state.npc
-          current_team = current_state.team
-
-          npc_name = getattr(current_npc, 'name', '__none__') if current_npc else '__none__'
-          team_name = getattr(current_team, 'name', '__none__') if current_team else '__none__'
-          current_path = os.getcwd()
-          db_path = os.path.expanduser(context.get("history_db_path") or "~/.npcsh/npcsh_history.db")
-          
-          try:
-              cmd_history = CommandHistory(db_path)
-              
-              if context.get('memory'):
-                  memories = get_relevant_memories(
-                      command_history=cmd_history, 
-                      npc_name=npc_name, 
-                      team_name=team_name,
-                      path=current_path, 
-                      query=query, 
-                      max_memories=10, 
-                      state=current_state  # Pass the state object
-                  )
-                  print(memories)
-                  
-                  if not memories:
-                      output = f"No memories found for query: '{query}'"
-                  else:
-                      output = f"Found {len(memories)} memories:\n\n" + "\n".join(
-                          f"{i}. [{mem.get('timestamp', 'unknown')}] {mem.get('final_memory') or mem.get('initial_memory')}" 
-                          for i, mem in enumerate(memories, 1)
-                      )
-              
-              elif context.get('kg'):
-                  facts = search_kg_facts(
-                      cmd_history, 
-                      npc_name, 
-                      team_name, 
-                      current_path, 
-                      query
-                  )
-                  print(facts)
-                  
-                  if not facts:
-                      output = f"No KG facts found for query: '{query}'"
-                  else:
-                      output = f"Found {len(facts)} KG facts:\n\n" + "\n".join(
-                          f"{i}. {fact.get('statement')}" for i, fact in enumerate(facts, 1)
-                      )
-
-              elif context.get('rag'):
-                  file_paths_str = context.get('file_paths', '')
-                  file_paths = [os.path.abspath(os.path.expanduser(p.strip())) for p in file_paths_str.split(',') if p.strip()]
-                  emodel = context.get('emodel') or current_state.embedding_model
-                  eprovider = context.get('eprovider') or current_state.embedding_provider
-                  
-                  file_contents = []
-                  for path in file_paths:
-                      chunks = load_file_contents(path)
-                      basename = os.path.basename(path)
-                      file_contents.extend([f"{basename}: {chunk}" for chunk in chunks])
-
-                  result = execute_rag_command(
-                      command=query,
-                      vector_db_path=os.path.expanduser(context.get('vector_db_path') or "~/.npcsh/npcsh_chroma.db"),
-                      embedding_model=emodel,
-                      embedding_provider=eprovider,
-                      file_contents=file_contents or None
-                  )
-                  print(result)
-                  output = result.get('response', 'No response from RAG.')
+- query: ""
+- type: "web"
+- provider: ""
+- num_results: ""
+- status: ""
+- npc_name: ""
+- team_name: ""
+- file_paths: ""
+- emodel: ""
+- eprovider: ""
+- concept: ""
+- db_path: ""
+- limit: ""
 
-              elif context.get('brainblast'):
-                  result = execute_brainblast_command(
-                      command=query, 
-                      command_history=cmd_history, 
-                      **context
-                  )
-                  print(result)
-                  output = result.get('output', 'Brainblast search executed.')
-
-              else:
-                  # Default to web search
-                  provider = context.get('sprovider') or current_state.search_provider
-                  results = search_web(query, provider=provider)
-                  output = "\n".join([f"- {res}" for res in results]) if results else "No web results found."
-
-          except Exception as e:
-              output = f"An error occurred in the search jinx: {e}\n{traceback.format_exc()}"
-
-          context['output'] = output
+steps:
+  {% if type == "mem" %}
+  - name: search
+    engine: mem_search
+    query: "{{ query }}"
+    status: "{{ status }}"
+    npc_name: "{{ npc_name }}"
+    team_name: "{{ team_name }}"
+    db_path: "{{ db_path }}"
+  {% elif type == "kg" %}
+  - name: search
+    engine: kg_search
+    query: "{{ query }}"
+    concept: "{{ concept }}"
+    npc_name: "{{ npc_name }}"
+    team_name: "{{ team_name }}"
+    db_path: "{{ db_path }}"
+  {% elif type == "file" %}
+  - name: search
+    engine: file_search
+    query: "{{ query }}"
+    file_paths: "{{ file_paths }}"
+    emodel: "{{ emodel }}"
+    eprovider: "{{ eprovider }}"
+  {% elif type == "db" %}
+  - name: search
+    engine: db_search
+    query: "{{ query }}"
+    db_path: "{{ db_path }}"
+    limit: "{{ limit }}"
+  {% else %}
+  - name: search
+    engine: web_search
+    query: "{{ query }}"
+    provider: "{{ provider }}"
+    num_results: "{{ num_results }}"
+  {% endif %}

npcsh/npc_team/jinxs/lib/core/sh.jinx

@@ -1,7 +1,7 @@
 jinx_name: sh
 description: Execute bash queries. Should be used to grep for file contents, list directories, explore information to answer user questions more practically. NEVER use ls -R on directories that may contain node_modules, .git, or other large dependency folders - this will exceed token limits. Use targeted ls commands instead.
 inputs:
-  - bash_command
+- bash_command
 steps:
   - name: execute_bash
     engine: python

npcsh/npc_team/jinxs/lib/core/sleep.jinx

@@ -1,10 +1,11 @@
 jinx_name: "sleep"
-description: "Evolve knowledge graph. Use --dream to also run creative synthesis."
+description: "Evolve knowledge graph. Use --dream for creative synthesis, --backfill to import approved memories."
 inputs:
-  - dream: False # Boolean flag to also run creative synthesis (dream process).
-  - ops: "" # Comma-separated list of operations to configure KG sleep process.
-  - model: "" # LLM model to use for KG evolution. Defaults to NPC's model.
-  - provider: "" # LLM provider to use for KG evolution. Defaults to NPC's provider.
+- dream: False
+- backfill: False
+- ops: ""
+- model: ""
+- provider: ""
 steps:
   - name: "evolve_knowledge_graph"
     engine: "python"
@@ -12,10 +13,10 @@ steps:
       import os
       import traceback
       from npcpy.memory.command_history import CommandHistory, load_kg_from_db, save_kg_to_db
-      from npcpy.memory.knowledge_graph import kg_sleep_process, kg_dream_process
-      # Assuming render_markdown is available if needed for logging progress
+      from npcpy.memory.knowledge_graph import kg_sleep_process, kg_dream_process, kg_backfill_from_memories
 
       is_dreaming = context.get('dream')
+      do_backfill = context.get('backfill')
       operations_str = context.get('ops')
       llm_model = context.get('model')
       llm_provider = context.get('provider')
@@ -26,25 +27,22 @@ steps:
       operations_config = None
       if operations_str and isinstance(operations_str, str):
           operations_config = [op.strip() for op in operations_str.split(',')]
-      
+
       # Fallback for model/provider if not explicitly set in Jinx inputs
       if not llm_model and current_npc and current_npc.model:
           llm_model = current_npc.model
       if not llm_provider and current_npc and current_npc.provider:
           llm_provider = current_npc.provider
-      
-      # Final fallbacks (these would ideally come from npcsh._state config)
-      if not llm_model: llm_model = "gemini-1.5-pro" # Example default
-      if not llm_provider: llm_provider = "gemini" # Example default
+
+      # Final fallbacks from state
+      if not llm_model: llm_model = state.chat_model if state else "llama3.2"
+      if not llm_provider: llm_provider = state.chat_provider if state else "ollama"
 
       team_name = current_team.name if current_team else "__none__"
-      npc_name = current_npc.name if isinstance(current_npc, type(None).__class__) else "__none__"
+      npc_name = current_npc.name if current_npc else "__none__"
       current_path = os.getcwd()
       scope_str = f"Team: '{team_name}', NPC: '{npc_name}', Path: '{current_path}'"
 
-      # Assume render_markdown exists
-      # render_markdown(f"- Checking knowledge graph for scope: {scope_str}")
-
       command_history = None
       try:
           db_path = os.getenv("NPCSH_DB_PATH", os.path.expanduser("~/npcsh_history.db"))
@@ -57,13 +55,26 @@ steps:
 
       output_result = ""
       try:
+          # Run backfill first if requested
+          if do_backfill:
+              print("Running backfill from approved memories...")
+              stats = kg_backfill_from_memories(
+                  engine,
+                  model=llm_model,
+                  provider=llm_provider,
+                  npc=current_npc,
+                  get_concepts=True,
+                  dry_run=False
+              )
+              output_result += f"Backfill: +{stats['facts_after'] - stats['facts_before']} facts, +{stats['concepts_after'] - stats['concepts_before']} concepts\n"
+
           current_kg = load_kg_from_db(engine, team_name, npc_name, current_path)
 
           if not current_kg or not current_kg.get('facts'):
               output_msg = f"Knowledge graph for the current scope is empty. Nothing to process.\n"
               output_msg += f"  - Scope Checked: {scope_str}\n\n"
-              output_msg += "**Hint:** Have a conversation or run some commands first to build up knowledge in this specific context. The KG is unique to each combination of Team, NPC, and directory."
-              context['output'] = output_msg
+              output_msg += "**Hint:** Run `/sleep backfill=true` to import approved memories, or have conversations first."
+              context['output'] = output_result + output_msg if output_result else output_msg
               context['messages'] = output_messages
               exit()
 

npcsh/npc_team/jinxs/lib/core/sql.jinx

@@ -1,16 +1,20 @@
 jinx_name: sql
-description: Execute queries on the ~/npcsh_history.db to pull data. The database
-  contains only information about conversations and other user-provided data. It does
-  not store any information about individual files. Avoid using percent signs unless absolutely necessary.
+description: Execute queries on the ~/npcsh_history.db to pull data. The database contains only information about conversations and other user-provided data. It does not store any information about individual files.
 inputs:
-- sql_query
+- sql_query: ""
+
 steps:
-  - engine: python
+  - name: execute_sql
+    engine: python
     code: |
       import pandas as pd
-      query = {{ sql_query | tojson }}
-      try:
-        df = pd.read_sql_query(query, npc.db_conn)
-      except Exception as e:
-        df = pd.DataFrame({'Error': [str(e)]})
-      output = df.to_string()
+
+      query = context.get('sql_query', '').strip()
+      if not query:
+          context['output'] = "Usage: /sql <query>"
+      else:
+          try:
+              df = pd.read_sql_query(query, npc.db_conn)
+              context['output'] = df.to_string()
+          except Exception as e:
+              context['output'] = "SQL Error: " + str(e)

npcsh/npc_team/jinxs/lib/orchestration/convene.jinx

@@ -1,11 +1,11 @@
 jinx_name: convene
 description: Run a cycle of discussions between NPCs on a topic. The orchestrator convenes agents to discuss and synthesize.
 inputs:
-  - topic: ""
-  - npcs: "alicanto,corca,guac"
-  - rounds: 3
-  - model: null
-  - provider: null
+- topic: ""
+- npcs: "alicanto,corca,guac"
+- rounds: 3
+- model: null
+- provider: null
 steps:
   - name: convene_discussion
     engine: python
@@ -21,8 +21,8 @@ steps:
       team = context.get('team')
       messages = context.get('messages', [])
 
-      model = context.get('model') or (npc.model if npc else 'gemini-1.5-flash')
-      provider = context.get('provider') or (npc.provider if npc else 'gemini')
+      model = context.get('model') or (npc.model if npc else (state.chat_model if state else 'llama3.2'))
+      provider = context.get('provider') or (npc.provider if npc else (state.chat_provider if state else 'ollama'))
 
       if not topic:
           context['output'] = """Usage: /convene <topic>

npcsh/npc_team/jinxs/lib/orchestration/delegate.jinx

@@ -1,11 +1,11 @@
 jinx_name: delegate
 description: Delegate a task to another NPC with review and feedback loop until completion. Choose the NPC whose directive best matches the task.
 inputs:
-  - npc_name:
+- npc_name:
       description: "Name of the NPC to delegate to"
-  - task:
+- task:
       description: "The task or request to delegate to the NPC"
-  - max_iterations: "10"
+- max_iterations: "10"
 steps:
   - name: delegate_with_review
     engine: python
@@ -43,8 +43,7 @@ steps:
       sep = '-' * 60
       print(colored("\n" + sep, "cyan"))
       print(colored("  Delegating to @" + target_name, "yellow", attrs=["bold"]))
-      task_preview = task_request[:100] + ('...' if len(task_request) > 100 else '')
-      print(colored("  Task: " + task_preview, "white", attrs=["dark"]))
+      print(colored("  Task: " + task_request, "white", attrs=["dark"]))
       print(colored(sep + "\n", "cyan"))
       print(colored("  [{}] Model: {}".format(target_name, target_npc.model), "white", attrs=["dark"]))
       jinx_list = ', '.join(list(target_jinxs.keys())[:8])
@@ -127,8 +126,8 @@ steps:
 
               review_result = get_llm_response(
                   review_prompt,
-                  model=getattr(orchestrator, 'model', 'gemini-2.5-flash'),
-                  provider=getattr(orchestrator, 'provider', 'gemini'),
+                  model=getattr(orchestrator, 'model', None) or (state.chat_model if state else 'llama3.2'),
+                  provider=getattr(orchestrator, 'provider', None) or (state.chat_provider if state else 'ollama'),
                   npc=orchestrator,
                   temperature=0.3
               )
@@ -150,12 +149,12 @@ steps:
                   task_complete = True
                   print(colored("\n  Task completed successfully", "green", attrs=["bold"]))
                   if summary:
-                      print(colored("  Summary: " + summary[:200], "white", attrs=["dark"]))
+                      print(colored("  Summary: " + summary, "white", attrs=["dark"]))
                   final_output = "[{}] Task completed.\n{}".format(target_name, summary)
               else:
                   print(colored("\n  Task incomplete - providing feedback", "yellow"))
                   if feedback:
-                      print(colored("  Feedback: " + feedback[:200] + "...", "white", attrs=["dark"]))
+                      print(colored("  Feedback: " + feedback, "white", attrs=["dark"]))
 
                   followup_lines = [
                       "Continue the previous task. Feedback from orchestrator:",