npcsh 1.1.19__py3-none-any.whl → 1.1.21__py3-none-any.whl

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':
@@ -213,7 +214,7 @@ steps:
                                   line = line[:width+20]  # allow for color codes
 
                                   if idx == selected:
-                                      sys.stdout.write(f'\033[47;30;1m>{line}\033[0m')
+                                      sys.stdout.write(f'\033[7;1m>{line}\033[0m')
                                   else:
                                       sys.stdout.write(f' {line}')
 
@@ -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':
@@ -207,7 +208,7 @@ steps:
                                   line = line[:width-1]
 
                                   if idx == selected:
-                                      sys.stdout.write(f'\033[47;30;1m>{line}\033[0m')
+                                      sys.stdout.write(f'\033[7;1m>{line}\033[0m')
                                   else:
                                       sys.stdout.write(f' {line}')
 
@@ -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/kg_search.jinx

@@ -1,5 +1,6 @@
 jinx_name: kg_search
 description: Search the knowledge graph with interactive TUI
+interactive: true
 inputs:
 - query: ""
 - type: "facts"
@@ -241,11 +242,11 @@ steps:
                           # Header
                           if mode == 'list':
                               sort_ind = {'score': '1', 'concept': '2', 'type': '3'}[sort_mode]
-                              q = query or concept or search_type
-                              header = f" KG SEARCH ({len(display_results)} results): '{q}' [sort:{sort_mode}({sort_ind}) filter:{type_filter}] "
+                              label = query or concept or search_type
+                              header = f" KG SEARCH ({len(display_results)} results): '{label}' [sort:{sort_mode}({sort_ind}) filter:{type_filter}] "
                           else:
                               header = f" PREVIEW: {display_results[selected]['type']} "
-                          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':
@@ -277,7 +278,7 @@ steps:
                                   line = line[:width+15]
 
                                   if idx == selected:
-                                      sys.stdout.write(f'\033[47;30;1m>{line}\033[0m')
+                                      sys.stdout.write(f'\033[7;1m>{line}\033[0m')
                                   else:
                                       sys.stdout.write(f' {line}')
 
@@ -286,7 +287,7 @@ steps:
                               sel = display_results[selected] if display_results else {}
                               source = sel.get('source', '')
                               sys.stdout.write(f'\033[{height-1};1H\033[K Source: {source}'.ljust(width))
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Nav 1/2/3:Sort c:Concepts e:Explore p:Preview q:Quit [{selected+1}/{len(display_results)}] \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Nav 1/2/3:Sort c:Concepts e:Explore p:Preview q:Quit [{selected+1}/{len(display_results)}] \033[0m')
 
                           else:  # preview mode
                               sel = display_results[selected]
@@ -311,16 +312,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(all_lines)} lines]')
-                              sys.stdout.write(f'\033[{height};1H\033[K\033[44;37m j/k:Scroll b:Back e:Explore q:Quit \033[0m')
+                              sys.stdout.write(f'\033[{height};1H\033[K\033[7m j/k:Scroll b:Back e:Explore 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/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':
@@ -153,7 +186,7 @@ steps:
                                   line = line[:width-1]
 
                                   if idx == selected:
-                                      sys.stdout.write(f'\033[47;30;1m>{line}\033[0m')
+                                      sys.stdout.write(f'\033[7;1m>{line}\033[0m')
                                   else:
                                       sys.stdout.write(f' {line}')
 
@@ -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"