@lzhzzzzwill/cofos 1.2.4 → 1.3.1

package/README.md

@@ -6,6 +6,8 @@ COFOS CLI is a standalone Node.js command line wrapper around the COFOS Python r
 npx @lzhzzzzwill/cofos
 ```
 
+By default COFOS uses a plain terminal interface, so normal terminal scrollback, mouse selection, copy, and `Ctrl+C` work as expected. The fixed-input full-screen interface is still available as an experimental mode with `--tui`.
+
 ## Runtime Model
 
 The standalone npm package includes a minimal Python runtime under `runtime/`:
@@ -69,6 +71,18 @@ Disable RAG for a session:
 npx @lzhzzzzwill/cofos --no-rag
 ```
 
+Ask once and exit, useful for scripts and smoke tests:
+
+```bash
+npx @lzhzzzzwill/cofos -p "What ROS does TT-T-COF generate under visible-light photocatalysis?"
+```
+
+Use the experimental fixed-input TUI:
+
+```bash
+npx @lzhzzzzwill/cofos --tui
+```
+
 ## Startup Behavior
 
 On startup, the CLI does the following:
@@ -118,6 +132,8 @@ cofos \
 | `--cache-dir` | Folder for model, KG/BM25, and parsed PDF cache; defaults to `./.cofos` |
 | `--rebuild-pdf-index` | Force PDF parsing and BM25 rebuild |
 | `--top-k` | Retrieval top-k |
+| `-p`, `--prompt` | Ask one question and exit |
+| `--tui` | Use the experimental fixed-input full-screen TUI |
 | `--max-new-tokens` | Override generation length |
 | `--no-rag` | Run without KG/BM25 retrieval |
 

package/bin/cofos.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawn, spawnSync } from "node:child_process";
-import blessed from "blessed";
+import { createInterface, emitKeypressEvents } from "node:readline";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -134,6 +134,12 @@ function slashHint(line = "/") {
   return `\n  Commands\n${rows}\n  Press Tab to complete.\n`;
 }
 
+function slashInlineHint(line = "/") {
+  const hits = slashMatches(line);
+  if (!hits.length) return "";
+  return hits.map(({ cmd, desc }) => `  ${C}${cmd}${R}  ${desc}`).join("\n");
+}
+
 /* ─── helpers ─── */
 
 function cmdExist(c) { return spawnSync(c, ["--version"], { encoding: "utf-8", stdio: "pipe" }).status === 0; }
@@ -154,12 +160,15 @@ function ensureDeps(py, log = console.log) {
 
 /* ─── TUI ─── */
 
-function createTui() {
+async function createTui() {
+  const { default: blessed } = await import("blessed");
   const screen = blessed.screen({
     smartCSR: true,
     fullUnicode: true,
     title: "COFOS",
+    mouse: false,
   });
+  screen.program.disableMouse();
 
   const history = blessed.box({
     top: 0,
@@ -170,7 +179,7 @@ function createTui() {
     alwaysScroll: true,
     keys: true,
     vi: true,
-    mouse: true,
+    mouse: false,
     tags: true,
     scrollbar: { ch: " ", track: { bg: "black" }, style: { bg: "cyan" } },
   });
@@ -213,6 +222,12 @@ function createTui() {
   let suggestionMatches = [];
   let selectedSuggestion = 0;
 
+  function renderBuffer(wasAtBottom = true) {
+    history.setContent(buffer);
+    if (wasAtBottom) history.setScrollPerc(100);
+    screen.render();
+  }
+
   function append(text = "") {
     const wasAtBottom = history.getScrollPerc() >= 98;
     const data = String(text).replace(/\x1b\[[0-9;]*[A-Za-z]/g, "");
@@ -226,9 +241,7 @@ function createTui() {
       }
     }
     if (buffer.length > 250000) buffer = buffer.slice(-220000);
-    history.setContent(buffer);
-    if (wasAtBottom) history.setScrollPerc(100);
-    screen.render();
+    renderBuffer(wasAtBottom);
   }
 
   function hideSuggestions() {
@@ -326,25 +339,100 @@ function createTui() {
   screen.render();
 
   return {
+    supportsReplace: true,
     screen,
     input,
     append,
     print: (text = "") => append(String(text) + "\n"),
-    clear: () => { buffer = ""; history.setContent(""); history.setScrollPerc(100); screen.render(); },
+    clear: () => { buffer = ""; renderBuffer(true); },
+    length: () => buffer.length,
+    replaceFrom: (index, text = "") => { buffer = buffer.slice(0, Math.max(0, index)) + String(text); renderBuffer(true); },
     setSubmitHandler: (fn) => { onSubmit = fn; },
     setExitHandler: (fn) => { onExit = fn; },
     focus: () => { input.focus(); screen.render(); },
     setPrompt: (label) => { input.setLabel(` ${label} `); screen.render(); },
-    destroy: () => screen.destroy(),
+    destroy: () => {
+      try { screen.program.disableMouse(); } catch (_) {}
+      screen.destroy();
+    },
+  };
+}
+
+function blessedToAnsi(text) {
+  return String(text)
+    .replace(/\{bold\}/g, B)
+    .replace(/\{\/bold\}/g, R)
+    .replace(/\{cyan-fg\}/g, C)
+    .replace(/\{yellow-fg\}/g, Y)
+    .replace(/\{green-fg\}/g, GR)
+    .replace(/\{gray-fg\}/g, G)
+    .replace(/\{red-fg\}/g, "\x1b[91m")
+    .replace(/\{black-fg\}|\{yellow-bg\}|\{\/yellow-bg\}|\{\/black-fg\}/g, "")
+    .replace(/\{\/(?:cyan-fg|yellow-fg|green-fg|gray-fg|red-fg)\}/g, R)
+    .replace(/[{}]/g, "");
+}
+
+function createPlainUi() {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true,
+    completer: (line) => slashCompletions(line),
+  });
+  let onSubmit = () => {};
+  let onExit = () => {};
+  let prompt = "cofos";
+  let slashHintShown = false;
+
+  function setPrompt(label) {
+    prompt = label;
+    rl.setPrompt(`${C}${prompt}${R} `);
+  }
+
+  setPrompt(prompt);
+  if (process.stdin.isTTY) {
+    emitKeypressEvents(process.stdin, rl);
+    process.stdin.on("keypress", () => {
+      setTimeout(() => {
+        const line = rl.line || "";
+        if (line === "/" && !slashHintShown) {
+          slashHintShown = true;
+          process.stdout.write(`\n${slashInlineHint("/")}\n`);
+          rl.prompt(true);
+        } else if (!line.startsWith("/")) {
+          slashHintShown = false;
+        }
+      }, 0);
+    });
+  }
+  rl.on("line", (line) => {
+    slashHintShown = false;
+    onSubmit(line);
+  });
+  rl.on("SIGINT", () => onExit());
+  rl.on("close", () => onExit());
+
+  return {
+    supportsReplace: false,
+    append: (text = "") => process.stdout.write(blessedToAnsi(text)),
+    print: (text = "") => console.log(blessedToAnsi(text)),
+    clear: () => console.clear(),
+    length: () => 0,
+    replaceFrom: (_index, text = "") => process.stdout.write(blessedToAnsi(text)),
+    setSubmitHandler: (fn) => { onSubmit = fn; },
+    setExitHandler: (fn) => { onExit = fn; },
+    focus: () => rl.prompt(),
+    setPrompt,
+    destroy: () => { try { rl.close(); } catch (_) {} },
   };
 }
 
 /* ─── main ─── */
 
-function main() {
+async function main() {
   if (process.argv.includes("-h") || process.argv.includes("--help")) {
     console.log("\n  COFOS CLI — 9B + RAG chat (Willlzh/COFOS)\n");
-    console.log("  Usage:  cofos [--model PATH] [--config PATH] [--pdf-dir DIR] [--cache-dir DIR] [--top-k N] [--no-rag]\n");
+    console.log("  Usage:  cofos [--tui] [-p QUESTION] [--model PATH] [--config PATH] [--pdf-dir DIR] [--cache-dir DIR] [--top-k N] [--no-rag]\n");
     console.log("  Commands in chat:");
     console.log("    /help        Show this help");
     console.log("    /exit        Quit");
@@ -356,6 +444,9 @@ function main() {
     console.log("  Startup options:");
     console.log("    --pdf-dir DIR          Add PDFs from DIR as extra BM25 evidence");
     console.log("    --cache-dir DIR        Store model/data cache here (default: ./.cofos)");
+    console.log("    --max-new-tokens N     Override generation length");
+    console.log("    --tui                  Use the experimental fixed-input TUI");
+    console.log("    -p, --prompt TEXT      Ask once and exit");
     console.log("    --rebuild-pdf-index    Force reparsing PDFs and rebuilding BM25\n");
     console.log("  Multi-line: end a line with \\ to continue on the next line.\n");
     process.exit(0);
@@ -368,8 +459,11 @@ function main() {
   let configPath = DEFAULT_CONFIG;
   let topK = "5";
   let pdfDir = null;
+  let maxNewTokens = null;
   let cacheDir = process.env.COFOS_CACHE_DIR ? resolve(process.env.COFOS_CACHE_DIR) : resolve(process.cwd(), ".cofos");
   let rebuildPdfIndex = false;
+  let useTui = false;
+  let singlePrompt = null;
   const backendArgs = [chatScript];
 
   const die = (msg) => { console.error("[cofos] " + msg); process.exit(1); };
@@ -393,10 +487,17 @@ function main() {
     } else if (arg === "--pdf-dir") {
       pdfDir = resolve(value(++i, arg));
       if (!existsSync(pdfDir)) die(`--pdf-dir does not exist: ${pdfDir}`);
+    } else if (arg === "--max-new-tokens") {
+      maxNewTokens = value(++i, arg);
+      if (!/^\d+$/.test(maxNewTokens) || Number(maxNewTokens) < 1) die(`--max-new-tokens must be a positive integer, got "${maxNewTokens}"`);
     } else if (arg === "--cache-dir") {
       cacheDir = resolve(value(++i, arg));
     } else if (arg === "--rebuild-pdf-index") {
       rebuildPdfIndex = true;
+    } else if (arg === "--tui") {
+      useTui = true;
+    } else if (arg === "-p" || arg === "--prompt") {
+      singlePrompt = value(++i, arg);
     } else if (arg === "--no-rag") {
       backendArgs.push("--no-rag");
     } else {
@@ -405,14 +506,15 @@ function main() {
   }
   backendArgs.push("--merged-model-path", modelPath, "--config", configPath, "--top-k", topK);
   if (pdfDir) backendArgs.push("--pdf-dir", pdfDir);
+  if (maxNewTokens) backendArgs.push("--max-new-tokens", maxNewTokens);
   if (rebuildPdfIndex) backendArgs.push("--rebuild-pdf-index");
 
   const py = findPy();
   if (!py) die("Python not found. Install Python 3.9+ and re-run.");
   if (!existsSync(chatScript)) die(`Missing script: ${chatScript}`);
 
-  const ui = createTui();
-  ui.print(plain(render({ modelPath, cacheDir, pdfDir })));
+  const ui = useTui ? await createTui() : createPlainUi();
+  ui.print(useTui ? plain(render({ modelPath, cacheDir, pdfDir })) : render({ modelPath, cacheDir, pdfDir }));
   ensureDeps(py, (msg) => ui.print(msg));
   ui.print("  Loading COFOS 9B + RAG backend from Hugging Face … first run may take a while");
   if (pdfDir) ui.print("  Local PDF RAG: enabled for this session");
@@ -439,7 +541,8 @@ function main() {
   proc.stderr.setEncoding("utf-8");
 
   let buf = "", ready = false, generating = false, responseOpen = false, commandOpen = false, closed = false;
-  let responseMaybeReasoning = false, responseReasoning = false, responseBuffer = "";
+  let currentAnswer = "", assistantStart = -1, plainAssistantMode = "undecided", plainAssistantPending = "";
+  let plainReasonBuffer = "", plainReasonPrinted = 0;
   const inputQ = [];
   let mlBuf = [];
 
@@ -449,6 +552,7 @@ function main() {
     try { proc.stdin.end(); } catch (_) {}
     try { proc.kill("SIGTERM"); } catch (_) {}
     ui.destroy();
+    process.exit(0);
   }
 
   ui.setExitHandler(shutdown);
@@ -479,7 +583,7 @@ function main() {
     input = input.trim();
     if (!input) return false;
 
-    if (/^\/(exit|quit)$/.test(input)) { proc.stdin.write("/exit\n"); proc.stdin.end(); return true; }
+    if (/^\/(exit|quit)$/.test(input)) { shutdown(); return true; }
     if (/^\/(help)$/.test(input)) {
       ui.print(slashHint("/") + "\n  Add local papers to RAG:\n    cofos --pdf-dir ./new_pdfs\n    cofos --pdf-dir ./new_pdfs --rebuild-pdf-index\n\n  Multi-line: end a line with \\ to continue.");
       return false;
@@ -492,13 +596,25 @@ function main() {
       ui.clear();
       mlBuf = [];
       responseOpen = false;
+      assistantStart = -1;
+      currentAnswer = "";
+      plainAssistantMode = "undecided";
+      plainAssistantPending = "";
+      plainReasonBuffer = "";
+      plainReasonPrinted = 0;
       commandOpen = true;
       proc.stdin.write(input + "\n");
       generating = true;
       return true;
     }
-    if (/^\/(topk)(?:\s+\d+)?$/.test(input) || /^\/rag\s+(?:on|off)$/.test(input)) {
+    if (/^\/(save)$/.test(input) || /^\/(topk)(?:\s+\d+)?$/.test(input) || /^\/rag\s+(?:on|off)$/.test(input)) {
       responseOpen = false;
+      assistantStart = -1;
+      currentAnswer = "";
+      plainAssistantMode = "undecided";
+      plainAssistantPending = "";
+      plainReasonBuffer = "";
+      plainReasonPrinted = 0;
       commandOpen = true;
       proc.stdin.write(input + "\n");
       generating = true;
@@ -515,6 +631,12 @@ function main() {
 
     ui.print("{yellow-fg}●{/yellow-fg} " + input);
     responseOpen = false;
+    assistantStart = -1;
+    currentAnswer = "";
+    plainAssistantMode = "undecided";
+    plainAssistantPending = "";
+    plainReasonBuffer = "";
+    plainReasonPrinted = 0;
     generating = true;
     proc.stdin.write(input + "\n");
     return true;
@@ -527,39 +649,104 @@ function main() {
 
   proc.stderr.on("data", (chunk) => ui.append(chunk));
 
-  function appendAssistant(text) {
-    if (!text) return;
-    if (responseMaybeReasoning) {
-      responseBuffer += text;
-      const enough = responseBuffer.length > 80 || responseBuffer.includes("\n\n") || responseBuffer.includes("。") || responseBuffer.includes(".");
-      if (!enough) return;
-      const start = responseBuffer.trimStart();
-      responseReasoning = /^(The user|Okay[,，]|I need|We need|Based on the provided information[,，]? I can|用户)/i.test(start);
-      responseMaybeReasoning = false;
-      if (responseReasoning) {
-        ui.append("{gray-fg}- " + responseBuffer + "{/gray-fg}");
+  function escapeTags(text) {
+    return String(text).replace(/[{}]/g, "");
+  }
+
+  function formatAssistant(answer) {
+    const raw = escapeTags(answer).trimStart();
+    if (!raw) return "";
+    if (raw.includes("</think>")) {
+      const [reason, ...answerParts] = raw.split("</think>");
+      const cleanReason = reason.replace(/^<think>\s*/i, "").trim();
+      const finalAnswer = answerParts.join("</think>").trimStart();
+      return finalAnswer
+        ? "{gray-fg}- " + cleanReason + "{/gray-fg}\n{green-fg}{bold}◆{/bold}{/green-fg} " + finalAnswer
+        : "{gray-fg}- " + cleanReason + "{/gray-fg}";
+    }
+
+    const paragraphs = raw.split(/\n\s*\n/);
+    const reasonRe = /^(The user|Okay[,，]|I need|We need|I should|I'll|Let me|Since the input|In COF nomenclature|Based on the provided information[,，]? I can|用户|让我)/i;
+    let reasonCount = 0;
+    while (reasonCount < paragraphs.length && reasonRe.test(paragraphs[reasonCount].trim())) reasonCount += 1;
+    if (reasonCount > 0) {
+      const reason = paragraphs.slice(0, reasonCount).join("\n\n").trim();
+      const finalAnswer = paragraphs.slice(reasonCount).join("\n\n").trimStart();
+      return finalAnswer
+        ? "{gray-fg}- " + reason + "{/gray-fg}\n{green-fg}{bold}◆{/bold}{/green-fg} " + finalAnswer
+        : "{gray-fg}- " + reason + "{/gray-fg}";
+    }
+    return "{green-fg}{bold}◆{/bold}{/green-fg} " + raw;
+  }
+
+  const reasonRe = /^(The user|Okay[,，]|I need|We need|I should|I'll|Let me|Since the input|In COF nomenclature|Based on the provided information[,，]? I can|用户|让我)/i;
+
+  function redrawAssistant() {
+    if (assistantStart < 0 || !ui.supportsReplace) return;
+    ui.replaceFrom(assistantStart, formatAssistant(currentAnswer));
+  }
+
+  function streamPlainAssistant(text, final = false) {
+    if (ui.supportsReplace) return;
+    plainAssistantPending += text;
+    if (plainAssistantMode === "undecided") {
+      const start = plainAssistantPending.trimStart();
+      if (!start && !final) return;
+      if (start.startsWith("<think>") || reasonRe.test(start)) {
+        plainAssistantMode = "reason";
+        plainReasonBuffer = start.replace(/^<think>\s*/i, "");
+        plainReasonPrinted = 0;
+        plainAssistantPending = "";
+        ui.append(`${G}-${R} ${G}`);
+      } else if (final || start.length >= 12 || /\s/.test(start)) {
+        plainAssistantMode = "answer";
+        plainAssistantPending = start;
+        ui.append(`${GR}${B}◆${R} `);
       } else {
-        ui.append(responseBuffer);
+        return;
       }
-      responseBuffer = "";
-      return;
     }
-    if (responseReasoning) {
-      const end = text.indexOf("\n\n");
-      if (end !== -1) {
-        const reason = text.slice(0, end);
-        const answer = text.slice(end).replace(/^\s+/, "");
-        if (reason) ui.append("{gray-fg}" + reason + "{/gray-fg}");
-        responseReasoning = false;
-        if (answer) ui.append("\n{green-fg}{bold}◆{/bold}{/green-fg} " + answer);
+
+    if (plainAssistantMode === "reason") {
+      plainReasonBuffer += plainAssistantPending;
+      plainAssistantPending = "";
+      const thinkEnd = plainReasonBuffer.indexOf("</think>");
+      const paraEnd = plainReasonBuffer.search(/\n\s*\n/);
+      const split = thinkEnd !== -1 ? thinkEnd : paraEnd;
+      if (split !== -1) {
+        const reason = plainReasonBuffer.slice(plainReasonPrinted, split).replace(/<\/think>/gi, "");
+        const restStart = thinkEnd !== -1 ? split + "</think>".length : split;
+        const rest = plainReasonBuffer.slice(restStart).trimStart();
+        if (reason) ui.append(reason);
+        ui.append(`${R}\n${GR}${B}◆${R} `);
+        plainAssistantMode = "answer";
+        plainAssistantPending = rest;
+        plainReasonBuffer = "";
+        plainReasonPrinted = 0;
       } else {
-        ui.append("{gray-fg}" + text + "{/gray-fg}");
+        const printableUntil = final ? plainReasonBuffer.length : Math.max(0, plainReasonBuffer.length - 2);
+        if (printableUntil > plainReasonPrinted) {
+          ui.append(plainReasonBuffer.slice(plainReasonPrinted, printableUntil));
+          plainReasonPrinted = printableUntil;
+        }
+        if (!final) return;
+        if (plainReasonPrinted < plainReasonBuffer.length) ui.append(plainReasonBuffer.slice(plainReasonPrinted));
+        plainReasonBuffer = "";
+        plainReasonPrinted = 0;
+        ui.append(R);
+        return;
+      }
+    }
+
+    if (plainAssistantMode === "answer") {
+      if (plainAssistantPending) {
+        ui.append(plainAssistantPending);
+        plainAssistantPending = "";
       }
-      return;
     }
-    ui.append(text);
   }
 
+
   proc.stdout.on("data", (chunk) => {
     buf += chunk;
     if (!ready) {
@@ -568,6 +755,8 @@ function main() {
         ready = true;
         buf = buf.slice(i + READY.length);
         if (buf[0] === "\n") buf = buf.slice(1);
+        if (singlePrompt) inputQ.push(singlePrompt);
+        else ui.focus();
         drain();
       }
       return;
@@ -583,7 +772,8 @@ function main() {
       if (buf[0] === "\n") buf = buf.slice(1);
       generating = false;
       commandOpen = false;
-      ui.focus();
+      if (singlePrompt && inputQ.length === 0) shutdown();
+      else ui.focus();
       drain();
       return;
     }
@@ -598,29 +788,33 @@ function main() {
       buf = buf.slice(ri + RESPONSE.length);
       if (buf[0] === "\n") buf = buf.slice(1);
       responseOpen = true;
-      responseMaybeReasoning = true;
-      responseReasoning = false;
-      responseBuffer = "";
-      ui.append("{green-fg}{bold}◆{/bold}{/green-fg} ");
+      assistantStart = ui.supportsReplace ? ui.length() : 0;
+      currentAnswer = "";
+      plainAssistantMode = "undecided";
+      plainAssistantPending = "";
+      plainReasonBuffer = "";
+      plainReasonPrinted = 0;
     }
 
     const di = buf.indexOf(DONE);
     if (di !== -1) {
       const pre = buf.slice(0, di);
-      if (pre) appendAssistant(pre);
+      if (pre) { currentAnswer += pre; if (ui.supportsReplace) redrawAssistant(); else streamPlainAssistant(pre); }
       buf = buf.slice(di + DONE.length);
       if (buf[0] === "\n") buf = buf.slice(1);
-      if (responseBuffer) { appendAssistant("\n"); }
+      if (ui.supportsReplace) redrawAssistant();
+      else streamPlainAssistant("", true);
       generating = false;
       responseOpen = false;
-      ui.append("\n");
-      ui.focus();
+      if (ui.supportsReplace) ui.append("\n");
+      if (singlePrompt && inputQ.length === 0) shutdown();
+      else ui.focus();
       drain();
     } else {
       const keep = DONE.length - 1;
       if (buf.length > keep) {
         const out = buf.slice(0, -keep);
-        if (out) appendAssistant(out);
+        if (out) { currentAnswer += out; if (ui.supportsReplace) redrawAssistant(); else streamPlainAssistant(out); }
         buf = buf.slice(-keep);
       }
     }
@@ -628,12 +822,18 @@ function main() {
 
   proc.on("error", (e) => { ui.print("[cofos] Python error: " + e.message); shutdown(); });
   proc.on("exit", (c) => {
-    closed = true;
-    if (c && c !== 0) ui.print("[cofos] Python exited with code " + c);
-    ui.destroy();
+    if (closed) return;
+    ui.print(c && c !== 0 ? "[cofos] Python exited with code " + c : "[cofos] Python backend exited.");
+    ui.print("Press Ctrl+C to close.");
+    ui.focus();
     process.exitCode = c ?? 0;
   });
 
 }
 
+process.on("uncaughtException", (err) => {
+  try { process.stderr.write(`[cofos] Uncaught error: ${err?.stack || err}\n`); } catch (_) {}
+  process.exit(1);
+});
+
 main();

package/package.json

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