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

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

@@ -1,6 +1,6 @@
 jinx_name: edit_file
-description: Examines a file, determines what changes are needed, and applies those
-  changes.
+description: Creates or edits a file. If the file does not exist, creates it with
+  the specified content. If the file exists, examines it and applies changes.
 inputs:
 - file_path
 - edit_instructions
@@ -17,19 +17,42 @@ steps:
       edit_instructions = {{ edit_instructions | string | tojson }}
       backup_str = {{ backup | default("true") | string | tojson }}
       create_backup = backup_str.lower() not in ('false', 'no', '0', '')
-      
-    
-      with open(file_path, 'r') as f:
-          original_content = f.read()
-      
-    
-      if create_backup:
-          backup_path = file_path + ".bak"
-          with open(backup_path, 'w') as f:
-              f.write(original_content)
-      
-    
-      prompt = """You are a code editing assistant. Analyze this file and make the requested changes.
+
+      # Ensure parent directory exists
+      os.makedirs(os.path.dirname(file_path) or '.', exist_ok=True)
+
+      # If file doesn't exist, create it
+      if not os.path.exists(file_path):
+          prompt = """You are a code writing assistant. Create the content for a new file based on these instructions.
+
+        Instructions: """ + edit_instructions + """
+
+        Return a JSON object with:
+        1. "content": The full content to write to the file
+        2. "explanation": Brief explanation of what was created
+
+        Example response:
+        {"content": "print('hello world')", "explanation": "Created a Python hello world script"}
+        """
+          response = get_llm_response(prompt, model=npc.model, provider=npc.provider, npc=npc, format="json")
+          result = response.get("response", {})
+          content = result.get("content", edit_instructions)
+          explanation = result.get("explanation", "Created new file")
+
+          with open(file_path, 'w') as f:
+              f.write(content)
+
+          output = "Created " + file_path + "\n\n" + explanation
+      else:
+          with open(file_path, 'r') as f:
+              original_content = f.read()
+
+          if create_backup:
+              backup_path = file_path + ".bak"
+              with open(backup_path, 'w') as f:
+                  f.write(original_content)
+
+          prompt = """You are a code editing assistant. Analyze this file and make the requested changes.
 
         File content:
         """ + original_content + """
@@ -49,49 +72,48 @@ steps:
         Example response:
         {"modifications": [{"type": "replace", "original": "old code", "replacement": "new code"}], "explanation": "Updated the code"}
         """
-    
-      response = get_llm_response(prompt, model=npc.model, provider=npc.provider, npc=npc, format="json")
-      
-      result = response.get("response", {})
-      modifications = result.get("modifications", [])
-      explanation = result.get("explanation", "No explanation provided")
-      
-    
-      updated_content = original_content
-      changes_applied = 0
-      
-      for mod in modifications:
-          print(mod)
-          mod_type = mod.get("type")
-          
-          if mod_type == "replace":
-              original = mod.get("original")
-              replacement = mod.get("replacement")
-              if original in updated_content:
-                  updated_content = updated_content.replace(original, replacement)
-                  changes_applied += 1
-          
-          elif mod_type == "insert_after":
-              target = mod.get("target")
-              insertion = mod.get("insertion")
-              if target in updated_content:
-                  updated_content = updated_content.replace(target, target + insertion)
-                  changes_applied += 1
-          
-          elif mod_type == "insert_before":
-              target = mod.get("target")
-              insertion = mod.get("insertion")
-              if target in updated_content:
-                  updated_content = updated_content.replace(target, insertion + target)
-                  changes_applied += 1
-          
-          elif mod_type == "delete":
-              target = mod.get("target")
-              if target in updated_content:
-                  updated_content = updated_content.replace(target, "")
-                  changes_applied += 1
-      
-      with open(file_path, 'w') as f:
-          f.write(updated_content)
-      
-      output = "Applied " + str(changes_applied) + " changes to " + file_path + "\n\n" + explanation
+
+          response = get_llm_response(prompt, model=npc.model, provider=npc.provider, npc=npc, format="json")
+
+          result = response.get("response", {})
+          modifications = result.get("modifications", [])
+          explanation = result.get("explanation", "No explanation provided")
+
+          updated_content = original_content
+          changes_applied = 0
+
+          for mod in modifications:
+              print(mod)
+              mod_type = mod.get("type")
+
+              if mod_type == "replace":
+                  original = mod.get("original")
+                  replacement = mod.get("replacement")
+                  if original in updated_content:
+                      updated_content = updated_content.replace(original, replacement)
+                      changes_applied += 1
+
+              elif mod_type == "insert_after":
+                  target = mod.get("target")
+                  insertion = mod.get("insertion")
+                  if target in updated_content:
+                      updated_content = updated_content.replace(target, target + insertion)
+                      changes_applied += 1
+
+              elif mod_type == "insert_before":
+                  target = mod.get("target")
+                  insertion = mod.get("insertion")
+                  if target in updated_content:
+                      updated_content = updated_content.replace(target, insertion + target)
+                      changes_applied += 1
+
+              elif mod_type == "delete":
+                  target = mod.get("target")
+                  if target in updated_content:
+                      updated_content = updated_content.replace(target, "")
+                      changes_applied += 1
+
+          with open(file_path, 'w') as f:
+              f.write(updated_content)
+
+          output = "Applied " + str(changes_applied) + " changes to " + file_path + "\n\n" + explanation

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

@@ -1,5 +1,6 @@
 jinx_name: db_search
 description: Search conversation history database with interactive TUI
+interactive: true
 inputs:
 - query: ""
 - path: ""
@@ -179,7 +180,7 @@ steps:
                               header = f" DB SEARCH ({len(display_rows)} results): '{query}' [sort:{sort_mode}({sort_ind}) filter:{role_filter}] "
                           else:
                               header = f" PREVIEW: {display_rows[selected]['conversation_id'][:16]} "
-                          sys.stdout.write(f'\033[44;37;1m{header.ljust(width)}\033[0m\n')
+                          sys.stdout.write(f'\033[7;1m{header.ljust(width)}\033[0m\n')
 
                           # Column headers
                           if mode == 'list':
@@ -225,7 +226,7 @@ steps:
                               if len(path) > 40:
                                   path = '...' + path[-37:]
                               sys.stdout.write(f'\033[{height-1};1H\033[K {cid}  @ {path}'.ljust(width))
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Nav 1/2/3:Sort f:Filter p:Preview r:Reattach q:Quit [{selected+1}/{len(display_rows)}] \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Nav 1/2/3:Sort f:Filter p:Preview r:Reattach q:Quit [{selected+1}/{len(display_rows)}] \033[0m')
 
                           else:  # preview mode
                               sel = display_rows[selected]
@@ -243,16 +244,26 @@ steps:
                               npc_name = sel.get('npc') or 'default'
                               ts = format_ts(sel.get('timestamp'))
                               sys.stdout.write(f'\033[{height-1};1H\033[K {role}/{npc_name} - {ts}  [{preview_scroll+1}/{len(lines)} lines]')
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Scroll b:Back r:Reattach q:Quit \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Scroll b:Back r:Reattach q:Quit \033[0m')
 
                           sys.stdout.flush()
 
-                          c = sys.stdin.read(1)
+                          c = os.read(fd, 1).decode('latin-1')
 
                           if c == '\x1b':
-                              c2 = sys.stdin.read(1)
+                              import select as _sel
+                              if _sel.select([fd], [], [], 0.05)[0]:
+                                  c2 = os.read(fd, 1).decode('latin-1')
+                              else:
+                                  if mode == 'preview':
+                                      mode = 'list'
+                                      sys.stdout.write('\033[2J\033[H')
+                                  else:
+                                      context['output'] = "Cancelled."
+                                      break
+                                  continue
                               if c2 == '[':
-                                  c3 = sys.stdin.read(1)
+                                  c3 = os.read(fd, 1).decode('latin-1')
                                   if c3 == 'A':  # Up
                                       if mode == 'list' and selected > 0:
                                           selected -= 1

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

@@ -1,5 +1,6 @@
 jinx_name: file_search
 description: Find and browse files with interactive TUI
+interactive: true
 inputs:
 - pattern: ""
 - path: "."
@@ -176,7 +177,7 @@ steps:
                               header = f" FILES ({len(display_files)}): '{pattern}' [sort:{sort_mode}({sort_ind})] "
                           else:
                               header = f" PREVIEW: {display_files[selected]['name']} "
-                          sys.stdout.write(f'\033[44;37;1m{header.ljust(width)}\033[0m\n')
+                          sys.stdout.write(f'\033[7;1m{header.ljust(width)}\033[0m\n')
 
                           # Column headers
                           if mode == 'list':
@@ -216,7 +217,7 @@ steps:
                               f = display_files[selected] if display_files else {}
                               full_path = f.get('path', '')
                               sys.stdout.write(f'\033[{height-1};1H\033[K {full_path}'.ljust(width)[:width])
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Nav 1/2/3:Sort p:Preview o:Edit i:Incog c:Copy q:Quit [{selected+1}/{len(display_files)}] \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Nav 1/2/3:Sort p:Preview o:Edit i:Incog c:Copy q:Quit [{selected+1}/{len(display_files)}] \033[0m')
 
                           elif mode == 'preview':
                               for i in range(list_height):
@@ -227,16 +228,26 @@ steps:
 
                               sys.stdout.write(f'\033[{height-2};1H\033[K\033[90m{"─" * width}\033[0m')
                               sys.stdout.write(f'\033[{height-1};1H\033[K [{preview_scroll+1}/{len(preview_lines)} lines]')
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Scroll b:Back o:Edit q:Quit \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Scroll b:Back o:Edit q:Quit \033[0m')
 
                           sys.stdout.flush()
 
-                          c = sys.stdin.read(1)
+                          c = os.read(fd, 1).decode('latin-1')
 
                           if c == '\x1b':
-                              c2 = sys.stdin.read(1)
+                              import select as _sel
+                              if _sel.select([fd], [], [], 0.05)[0]:
+                                  c2 = os.read(fd, 1).decode('latin-1')
+                              else:
+                                  if mode == 'preview':
+                                      mode = 'list'
+                                      sys.stdout.write('\033[2J\033[H')
+                                  else:
+                                      context['output'] = "Cancelled."
+                                      break
+                                  continue
                               if c2 == '[':
-                                  c3 = sys.stdin.read(1)
+                                  c3 = os.read(fd, 1).decode('latin-1')
                                   if c3 == 'A':
                                       if mode == 'list' and selected > 0:
                                           selected -= 1

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

@@ -1,5 +1,6 @@
 jinx_name: web_search
 description: Search the web with interactive TUI
+interactive: true
 inputs:
 - query: ""
 - provider: ""
@@ -54,18 +55,50 @@ steps:
           try:
               raw_results = search_web(query, provider=provider, num_results=num_results)
 
-              # Normalize results
+              # Normalize results - handle different provider formats
               results = []
               if raw_results:
-                  for res in raw_results:
-                      if isinstance(res, dict):
+                  # Perplexity returns [answer_text, [url1, url2, ...]]
+                  if (len(raw_results) == 2
+                      and isinstance(raw_results[0], str)
+                      and isinstance(raw_results[1], (list, tuple))):
+                      answer_text = raw_results[0]
+                      citations = raw_results[1]
+                      # First result: the AI answer
+                      results.append({
+                          'title': 'AI Answer',
+                          'url': '',
+                          'snippet': answer_text[:500]
+                      })
+                      # Then each citation as a result
+                      for url in citations:
+                          url_str = str(url).strip()
+                          try:
+                              from urllib.parse import urlparse
+                              domain = urlparse(url_str).netloc
+                          except:
+                              domain = url_str[:40]
                           results.append({
-                              'title': res.get('title', 'No title'),
-                              'url': res.get('url', res.get('link', '')),
-                              'snippet': res.get('snippet', res.get('description', ''))
+                              'title': domain or url_str[:60],
+                              'url': url_str,
+                              'snippet': ''
                           })
-                      else:
-                          results.append({'title': str(res)[:50], 'url': str(res), 'snippet': ''})
+                  else:
+                      for res in raw_results:
+                          if isinstance(res, dict):
+                              results.append({
+                                  'title': res.get('title', 'No title'),
+                                  'url': res.get('url', res.get('link', '')),
+                                  'snippet': res.get('snippet', res.get('description', res.get('content', '')))
+                              })
+                          elif isinstance(res, str):
+                              # Could be a URL or text
+                              if res.startswith('http'):
+                                  results.append({'title': res[:60], 'url': res, 'snippet': ''})
+                              else:
+                                  results.append({'title': res[:60], 'url': '', 'snippet': res[:200]})
+                          else:
+                              results.append({'title': str(res)[:60], 'url': str(res), 'snippet': ''})
 
               if not results:
                   context['output'] = "No web results found."
@@ -128,7 +161,7 @@ steps:
                               header = f" WEB SEARCH ({len(results)} results): '{query}' "
                           else:
                               header = f" PREVIEW: {results[selected]['title'][:width-12]} "
-                          sys.stdout.write(f'\033[44;37;1m{header.ljust(width)}\033[0m\n')
+                          sys.stdout.write(f'\033[7;1m{header.ljust(width)}\033[0m\n')
 
                           # Column headers
                           if mode == 'list':
@@ -162,7 +195,7 @@ steps:
                               sel = results[selected] if results else {}
                               snippet = (sel.get('snippet') or '')[:width-2]
                               sys.stdout.write(f'\033[{height-1};1H\033[K {snippet}'.ljust(width))
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Nav p:Preview o:Open i:Incog c:Copy q:Quit [{selected+1}/{len(results)}] \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Nav p:Preview o:Open i:Incog c:Copy q:Quit [{selected+1}/{len(results)}] \033[0m')
 
                           else:  # preview mode
                               for i in range(list_height):
@@ -173,16 +206,21 @@ steps:
 
                               sys.stdout.write(f'\033[{height-2};1H\033[K\033[90m{"─" * width}\033[0m')
                               sys.stdout.write(f'\033[{height-1};1H\033[K [{preview_scroll+1}/{len(preview_content)} lines]')
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Scroll b:Back o:Open c:Copy q:Quit \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Scroll b:Back o:Open c:Copy q:Quit \033[0m')
 
                           sys.stdout.flush()
 
-                          c = sys.stdin.read(1)
+                          c = os.read(fd, 1).decode('latin-1')
 
                           if c == '\x1b':
-                              c2 = sys.stdin.read(1)
+                              import select as _sel
+                              if _sel.select([fd], [], [], 0.05)[0]:
+                                  c2 = os.read(fd, 1).decode('latin-1')
+                              else:
+                                  context['output'] = "Cancelled."
+                                  break
                               if c2 == '[':
-                                  c3 = sys.stdin.read(1)
+                                  c3 = os.read(fd, 1).decode('latin-1')
                                   if c3 == 'A':
                                       if mode == 'list' and selected > 0:
                                           selected -= 1

npcsh/npc_team/jinxs/{bin → lib/utils}/benchmark.jinx

@@ -23,7 +23,7 @@ steps:
       if not model:
           model = npc.model if npc and npc.model else ""
       if not provider:
-          provider = npc.provider if npc and npc.provider else "anthropic"
+          provider = npc.provider if npc and npc.provider else ""
 
       try:
           from npcsh.benchmark import BenchmarkRunner, run_benchmark
@@ -56,7 +56,7 @@ steps:
           output += "\n### Usage:\n"
           output += "```\n"
           output += "/benchmark action=quick\n"
-          output += "/benchmark action=run model=gpt-4o provider=openai\n"
+          output += "/benchmark action=run model=<model> provider=<provider>\n"
           output += "/benchmark action=list\n"
           output += "```\n"
 

npcsh/npc_team/jinxs/{bin → lib/utils}/jinxs.jinx

@@ -104,8 +104,8 @@ steps:
 
               # Search filter
               if ui.search_query:
-                  q = ui.search_query.lower()
-                  items = [j for j in items if q in j['name'].lower() or q in j['description'].lower()]
+                  srch = ui.search_query.lower()
+                  items = [j for j in items if srch in j['name'].lower() or srch in j['description'].lower()]
 
               ui.filtered = items
               # Clamp selection
@@ -129,8 +129,8 @@ steps:
               # ── header ──
               hdr = " Jinxs "
               pad = '=' * W
-              out.append(wline(1, f"\033[44;37;1m{pad}\033[0m"))
-              out.append(f"\033[1;{max(1, (W - len(hdr)) // 2)}H\033[44;37;1m{hdr}\033[0m")
+              out.append(wline(1, f"\033[7;1m{pad}\033[0m"))
+              out.append(f"\033[1;{max(1, (W - len(hdr)) // 2)}H\033[7;1m{hdr}\033[0m")
 
               # ── tabs ──
               tb = ""
@@ -184,7 +184,7 @@ steps:
                   foot = " [j/k] Scroll  [q/Esc] Back"
               else:
                   foot = " [Tab] Filter  [j/k] Nav  [Enter] Detail  [/] Search  [q] Quit"
-              out.append(wline(H, f"\033[44;37m{foot[:W].ljust(W)}\033[0m"))
+              out.append(wline(H, f"\033[7m{foot[:W].ljust(W)}\033[0m"))
 
               sys.stdout.write(''.join(out))
               sys.stdout.flush()
@@ -296,10 +296,10 @@ steps:
               return True
 
           def handle_esc():
-              if select.select([sys.stdin], [], [], 0.05)[0]:
-                  c2 = sys.stdin.read(1)
+              if select.select([fd], [], [], 0.05)[0]:
+                  c2 = os.read(fd, 1).decode('latin-1')
                   if c2 == '[':
-                      c3 = sys.stdin.read(1)
+                      c3 = os.read(fd, 1).decode('latin-1')
                       if c3 == 'A':
                           nav_up()
                       elif c3 == 'B':
@@ -322,10 +322,10 @@ steps:
           def handle_search(c):
               if c == '\x1b':
                   # Check if arrow key or bare esc
-                  if select.select([sys.stdin], [], [], 0.05)[0]:
-                      c2 = sys.stdin.read(1)
+                  if select.select([fd], [], [], 0.05)[0]:
+                      c2 = os.read(fd, 1).decode('latin-1')
                       if c2 == '[':
-                          sys.stdin.read(1)  # consume arrow char
+                          os.read(fd, 1).decode('latin-1')  # consume arrow char
                   else:
                       ui.search_mode = False
                       ui.search_buf = ""
@@ -395,7 +395,7 @@ steps:
               sys.stdout.flush()
               render()
               while True:
-                  c = sys.stdin.read(1)
+                  c = os.read(fd, 1).decode('latin-1')
                   if not handle(c):
                       break
                   render()

npcsh/npc_team/jinxs/{bin → lib/utils}/models.jinx

@@ -120,8 +120,8 @@ steps:
               # -- header --
               hdr = " Models "
               pad = '=' * W
-              out.append(wline(1, f"\033[44;37;1m{pad}\033[0m"))
-              out.append(f"\033[1;{max(1,(W - len(hdr)) // 2)}H\033[44;37;1m{hdr}\033[0m")
+              out.append(wline(1, f"\033[7;1m{pad}\033[0m"))
+              out.append(f"\033[1;{max(1,(W - len(hdr)) // 2)}H\033[7;1m{hdr}\033[0m")
 
               # -- tabs --
               tb = ""
@@ -205,7 +205,7 @@ steps:
               # combine status into footer area
               foot = " [Tab] Filter  [j/k] Nav  [c] Set Chat  [v] Set Vision  [e] Set Embed  [r] Set Reasoning  [d] Refresh  [q] Quit"
               out.append(wline(H - 1, stat_line))
-              out.append(wline(H, f"\033[44;37m{foot[:W].ljust(W)}\033[0m"))
+              out.append(wline(H, f"\033[7m{foot[:W].ljust(W)}\033[0m"))
 
               sys.stdout.write(''.join(out))
               sys.stdout.flush()
@@ -240,10 +240,10 @@ steps:
               return True
 
           def handle_esc():
-              if select.select([sys.stdin], [], [], 0.05)[0]:
-                  c2 = sys.stdin.read(1)
+              if select.select([fd], [], [], 0.05)[0]:
+                  c2 = os.read(fd, 1).decode('latin-1')
                   if c2 == '[':
-                      c3 = sys.stdin.read(1)
+                      c3 = os.read(fd, 1).decode('latin-1')
                       if c3 == 'A':
                           nav_up()
                       elif c3 == 'B':
@@ -331,7 +331,7 @@ steps:
               sys.stdout.flush()
               render()
               while True:
-                  c = sys.stdin.read(1)
+                  c = os.read(fd, 1).decode('latin-1')
                   if not handle(c):
                       break
                   render()

npcsh/npc_team/jinxs/{bin → lib/utils}/setup.jinx

@@ -103,8 +103,8 @@ steps:
               out = []
               out.append("\033[2J\033[H")
               header = " NPCSH Setup Wizard "
-              out.append(f"\033[1;1H\033[44;37;1m{'=' * width}\033[0m")
-              out.append(f"\033[1;{(width - len(header)) // 2}H\033[44;37;1m{header}\033[0m")
+              out.append(f"\033[1;1H\033[7;1m{'=' * width}\033[0m")
+              out.append(f"\033[1;{(width - len(header)) // 2}H\033[7;1m{header}\033[0m")
 
               if state.phase == 'detect':
                   out.append(f"\033[3;2H\033[1mDetected Providers:\033[0m")
@@ -149,10 +149,10 @@ steps:
               if c == 'q':
                   return False
               if c == '\x1b':
-                  if select.select([sys.stdin], [], [], 0.05)[0]:
-                      c2 = sys.stdin.read(1)
+                  if select.select([fd], [], [], 0.05)[0]:
+                      c2 = os.read(fd, 1).decode('latin-1')
                       if c2 == '[':
-                          c3 = sys.stdin.read(1)
+                          c3 = os.read(fd, 1).decode('latin-1')
                           if c3 == 'A' and state.phase == 'select_chat':
                               state.selected_idx = max(0, state.selected_idx - 1)
                               if state.selected_idx < state.scroll_offset:
@@ -225,7 +225,7 @@ steps:
               run_detection()
               render_screen()
               while True:
-                  c = sys.stdin.read(1)
+                  c = os.read(fd, 1).decode('latin-1')
                   if not handle_input(c):
                       break
                   render_screen()