@lzhzzzzwill/cofos 1.1.13 → 1.1.15

package/bin/cofos.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawn, spawnSync } from "node:child_process";
-import { createInterface, emitKeypressEvents } from "node:readline";
+import { clearLine, createInterface, cursorTo } from "node:readline";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -45,37 +45,43 @@ function row(left, right, lw, rw) { return "│ " + cell(left, lw) + " │ " + c
 function full(t, w) { return "│ " + cell(t, w - 2) + " │"; }
 function empty(w) { return full("", w); }
 
-function render() {
+function logoLines(width) {
+  if (width >= ART_W) return ART.map((line) => C + B + line + R);
+  return [C + B + "COFOS" + R];
+}
+
+function render({ modelPath, cacheDir, pdfDir }) {
   console.clear();
   const w = fw();
   const minSplit = 96;
   const cwd = process.cwd();
-  const rag = "RAG: KG + BM25 + optional PDFs";
-  const leftTitle = C + B + "COFOS" + R;
+  const rag = pdfDir ? "RAG: KG + BM25 + local PDFs" : "RAG: KG + BM25";
   const left = [
-    leftTitle,
-    G + "9B scientific RAG CLI" + R,
+    ...logoLines(Math.floor((w - 5) * 0.48)),
     "",
-    W + "Model" + R + "  Willlzh/COFOS",
+    G + "Scientific RAG CLI" + R,
+    W + "Model" + R + "   " + modelPath,
     W + "Params" + R + "  9B",
-    W + "Path" + R + "   " + cwd,
+    W + "Path" + R + "    " + cwd,
+    W + "Cache" + R + "   " + cacheDir,
   ];
   const right = [
     W + B + "What COFOS Does" + R,
-    "Answers COF / photocatalysis / ROS questions with a local 9B model.",
+    "COFOS answers scientific questions about covalent organic frameworks,",
+    "photocatalysis, reactive oxygen species, and oxygen-reduction products.",
     rag,
     "",
     W + B + "Suggested Commands" + R,
-    "/help     show commands and PDF-RAG usage",
-    "/topk 5   change retrieval depth",
-    "/rag off  answer without retrieval",
-    "cofos --pdf-dir ./new_pdfs  add local papers",
+    "/help      show commands and PDF-RAG usage",
+    "/topk 5    change retrieval depth",
+    "/rag off   answer without retrieval",
+    "cofos --pdf-dir ./new_pdfs   add local papers",
   ];
 
   const lines = [top(w)];
   if (w >= minSplit) {
     const inner = w - 5;
-    const lw = Math.max(28, Math.floor(inner * 0.34));
+    const lw = Math.max(46, Math.floor(inner * 0.48));
     const rw = inner - lw;
     const n = Math.max(left.length, right.length);
     for (let i = 0; i < n; i++) lines.push(row(left[i] || "", right[i] || "", lw, rw));
@@ -84,8 +90,6 @@ function render() {
     lines.push(sep(w));
     for (const item of right) lines.push(full(item, w));
   }
-  lines.push(empty(w));
-  lines.push(full(G + "Type / for commands · /exit · /topk 5 · /rag off · \\ for multiline" + R, w));
   lines.push(bot(w));
   console.log(lines.join("\n"));
 }
@@ -110,7 +114,7 @@ function slashMatches(line) {
 function slashCompletions(line) {
   if (!line.startsWith("/")) return [[], line];
   const hits = slashMatches(line).map(({ cmd }) => cmd);
-  return [hits.length ? hits : SLASH_COMMANDS.map(({ cmd }) => cmd), line];
+  return [hits, line];
 }
 
 function slashHint(line = "/") {
@@ -205,7 +209,7 @@ function main() {
   if (pdfDir) backendArgs.push("--pdf-dir", pdfDir);
   if (rebuildPdfIndex) backendArgs.push("--rebuild-pdf-index");
 
-  render();
+  render({ modelPath, cacheDir, pdfDir });
 
   const py = findPy();
   if (!py) die("Python not found. Install Python 3.9+ and re-run.");
@@ -250,32 +254,33 @@ function main() {
     prompt: mainPrompt,
     completer: slashCompletions,
   });
-  let lastSlashHint = "";
   rl.on("line", (l) => {
-    lastSlashHint = "";
     if (!ready || generating) inputQ.push(l);
     else if (!handle(l)) ask();
   });
-  if (process.stdin.isTTY) {
-    emitKeypressEvents(process.stdin, rl);
-    process.stdin.on("keypress", () => {
-      if (!ready || generating || closed) return;
-      const line = rl.line || "";
-      if (!line.startsWith("/")) {
-        lastSlashHint = "";
-        return;
-      }
-      const key = line.trim();
-      if (key && key !== lastSlashHint) {
-        lastSlashHint = key;
-        rl.output.write(slashHint(line));
-        rl.prompt(true);
-      }
-    });
+
+  function preserveInputWrite(stream, chunk) {
+    const data = String(chunk);
+    if (!rl.terminal || closed) {
+      stream.write(data);
+      return;
+    }
+    const activeInput = !generating;
+    if (activeInput) {
+      clearLine(rl.output, 0);
+      cursorTo(rl.output, 0);
+    }
+    stream.write(data);
+    if (activeInput) rl.prompt(true);
   }
 
-  // Forward Python stderr (status / progress messages) to our stderr.
-  proc.stderr.on("data", (chunk) => { process.stderr.write(chunk); });
+  // Let users type while the Python backend is still loading. Submitted lines
+  // are queued until READY, while status logs are written above and the input
+  // line is restored afterward.
+  ask();
+
+  // Forward Python stderr (status / progress messages) without destroying the input line.
+  proc.stderr.on("data", (chunk) => { preserveInputWrite(process.stderr, chunk); });
 
   proc.stdout.on("data", (chunk) => {
     buf += chunk;
@@ -310,19 +315,19 @@ function main() {
     const di = buf.indexOf(DONE);
     if (di !== -1) {
       const pre = buf.slice(0, di);
-      if (pre) process.stdout.write(pre);
+      if (pre) preserveInputWrite(process.stdout, pre);
       buf = buf.slice(di + DONE.length);
       if (buf[0] === "\n") buf = buf.slice(1);
       generating = false;
       responseOpen = false;
-      console.log("");
+      preserveInputWrite(process.stdout, "\n");
       drain();
     } else {
       // Stream buffered content, keeping enough tail to catch a partial DONE marker.
       const keep = DONE.length - 1;
       if (buf.length > keep) {
         const out = buf.slice(0, -keep);
-        if (out) process.stdout.write(out);
+        if (out) preserveInputWrite(process.stdout, out);
         buf = buf.slice(-keep);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzhzzzzwill/cofos",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "COFOS 9B + RAG chat CLI with optional local PDF ingestion.",
   "type": "module",
   "bin": {