pplx-zero 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pplx-zero",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Fast, minimal Perplexity AI CLI. Stream answers, analyze PDFs/images, continue conversations. Zero bloat.",
   "author": "kenzo",
   "license": "MIT",

package/src/index.ts

@@ -6,7 +6,7 @@ import { getEnv } from './env';
 import { fmt, write, writeLn } from './output';
 import { appendHistory, readHistory, getLastEntry } from './history';
 import { renderMarkdown, createMarkdownState } from './markdown';
-import { search as ragSearch, ingestDirectory, ingestFile, ingestPath, getDocCount, getKnowledgeDir } from './rag';
+import { search as ragSearch, searchForRag, ingestDirectory, ingestFile, ingestPath, getDocCount, getKnowledgeDir } from './rag';
 
 getEnv();
 
@@ -42,7 +42,7 @@ Options:
   -i, --image <path>   Attach an image (PNG, JPG, etc.)
   -o, --output <path>  Save output to file (.md, .txt)
   -c, --continue       Continue from last query (add context)
-  -l, --local          Search local knowledge base first
+  -l, --local          RAG: search local docs, inject as context
   --ingest [path]      Index file/dir/glob (default: ~/.pplx/knowledge/)
   --history            Show query history
   --no-history         Don't save this query to history
@@ -99,6 +99,8 @@ if (values.ingest) {
   process.exit(0);
 }
 
+let ragContext = '';
+
 if (values.local) {
   const query = positionals.join(' ');
   if (!query) {
@@ -106,26 +108,24 @@ if (values.local) {
     process.exit(2);
   }
   
-  const results = ragSearch(query);
+  const results = searchForRag(query);
   
   if (results.length === 0) {
-    console.log('No local documents match. Try --ingest first or check ~/.pplx/knowledge/');
-    process.exit(0);
-  }
-  
-  console.log(`\n${fmt.model('local')} Found ${results.length} result(s):\n`);
-  
-  for (let i = 0; i < results.length; i++) {
-    const r = results[i]!;
-    console.log(`[${i + 1}] ${r.title}`);
-    console.log(`    ${r.path}`);
-    console.log(`    ${r.snippet}\n`);
+    console.log('No local documents match. Proceeding with Perplexity only...\n');
+  } else {
+    if (!values.json) {
+      console.log(`${fmt.model('local')} Found ${results.length} relevant doc(s), using as context...\n`);
+    }
+    
+    ragContext = 'Context from user\'s knowledge base:\n---\n';
+    for (const r of results) {
+      ragContext += `[${r.title}]:\n${r.content}\n\n`;
+    }
+    ragContext += '---\n\nQuestion: ';
   }
-  
-  process.exit(0);
 }
 
-if (positionals.length === 0 && !values.continue) {
+if (positionals.length === 0 && !values.continue && !values.local) {
   console.error(fmt.error('No query provided. Use -h for help.'));
   process.exit(2);
 }
@@ -139,6 +139,10 @@ const model = values.model as Model;
 
 let query = positionals.join(' ');
 
+if (ragContext) {
+  query = ragContext + query;
+}
+
 if (values.continue) {
   const last = await getLastEntry();
   if (last) {

package/src/rag.ts

@@ -103,6 +103,12 @@ export async function ingestDirectory(dir?: string): Promise<IngestStats> {
 export function search(query: string, limit = 5): SearchResult[] {
   const db = getDb();
   
+  const ftsQuery = query
+    .trim()
+    .split(/\s+/)
+    .map(word => `${word}*`)
+    .join(' OR ');
+  
   const stmt = db.prepare(`
     SELECT 
       path,
@@ -116,7 +122,62 @@ export function search(query: string, limit = 5): SearchResult[] {
   `);
   
   try {
-    return stmt.all(query, limit) as SearchResult[];
+    return stmt.all(ftsQuery, limit) as SearchResult[];
+  } catch {
+    return [];
+  }
+}
+
+export interface RagContext {
+  title: string;
+  content: string;
+}
+
+function truncateUtf8Safe(str: string, maxLen: number): string {
+  if (str.length <= maxLen) return str;
+  let truncated = str.slice(0, maxLen);
+  const lastChar = truncated.charCodeAt(truncated.length - 1);
+  if (lastChar >= 0xD800 && lastChar <= 0xDBFF) {
+    truncated = truncated.slice(0, -1);
+  }
+  return truncated;
+}
+
+export function searchForRag(query: string, limit = 3, maxChars = 4000): RagContext[] {
+  const db = getDb();
+  
+  const ftsQuery = query
+    .trim()
+    .split(/\s+/)
+    .map(word => `${word}*`)
+    .join(' OR ');
+  
+  const stmt = db.prepare(`
+    SELECT title, content
+    FROM docs_fts
+    WHERE docs_fts MATCH ?
+    ORDER BY bm25(docs_fts)
+    LIMIT ?
+  `);
+  
+  try {
+    const results = stmt.all(ftsQuery, limit) as { title: string; content: string }[];
+    let totalChars = 0;
+    const truncated: RagContext[] = [];
+    
+    for (const r of results) {
+      const remaining = maxChars - totalChars;
+      if (remaining <= 0) break;
+      
+      const content = truncateUtf8Safe(r.content, remaining);
+      truncated.push({
+        title: r.title,
+        content,
+      });
+      totalChars += content.length;
+    }
+    
+    return truncated;
   } catch {
     return [];
   }