@lzhzzzzwill/cofos 1.3.0 → 1.3.2

package/bin/cofos.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawn, spawnSync } from "node:child_process";
-import { createInterface } from "node:readline";
+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; }
@@ -352,9 +358,17 @@ async function createTui() {
   };
 }
 
-function stripBlessedTags(text) {
+function blessedToAnsi(text) {
   return String(text)
-    .replace(/\{\/?(?:bold|cyan-fg|yellow-fg|green-fg|gray-fg|red-fg|black-fg|yellow-bg)\}/g, "")
+    .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, "");
 }
 
@@ -368,6 +382,7 @@ function createPlainUi() {
   let onSubmit = () => {};
   let onExit = () => {};
   let prompt = "cofos";
+  let slashHintShown = false;
 
   function setPrompt(label) {
     prompt = label;
@@ -375,7 +390,23 @@ function createPlainUi() {
   }
 
   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());
@@ -383,11 +414,11 @@ function createPlainUi() {
 
   return {
     supportsReplace: false,
-    append: (text = "") => process.stdout.write(stripBlessedTags(text)),
-    print: (text = "") => console.log(stripBlessedTags(text)),
+    append: (text = "") => process.stdout.write(blessedToAnsi(text)),
+    print: (text = "") => console.log(blessedToAnsi(text)),
     clear: () => console.clear(),
     length: () => 0,
-    replaceFrom: (_index, text = "") => process.stdout.write(stripBlessedTags(text)),
+    replaceFrom: (_index, text = "") => process.stdout.write(blessedToAnsi(text)),
     setSubmitHandler: (fn) => { onSubmit = fn; },
     setExitHandler: (fn) => { onExit = fn; },
     focus: () => rl.prompt(),
@@ -510,7 +541,8 @@ async function main() {
   proc.stderr.setEncoding("utf-8");
 
   let buf = "", ready = false, generating = false, responseOpen = false, commandOpen = false, closed = false;
-  let currentAnswer = "", assistantStart = -1;
+  let currentAnswer = "", assistantStart = -1, plainAssistantMode = "undecided", plainAssistantPending = "";
+  let plainReasonBuffer = "", plainReasonPrinted = 0;
   const inputQ = [];
   let mlBuf = [];
 
@@ -551,6 +583,10 @@ async function main() {
     input = input.trim();
     if (!input) return false;
 
+    if (input === "/") {
+      ui.print(slashHint("/"));
+      return false;
+    }
     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.");
@@ -566,6 +602,10 @@ async function main() {
       responseOpen = false;
       assistantStart = -1;
       currentAnswer = "";
+      plainAssistantMode = "undecided";
+      plainAssistantPending = "";
+      plainReasonBuffer = "";
+      plainReasonPrinted = 0;
       commandOpen = true;
       proc.stdin.write(input + "\n");
       generating = true;
@@ -575,6 +615,10 @@ async function main() {
       responseOpen = false;
       assistantStart = -1;
       currentAnswer = "";
+      plainAssistantMode = "undecided";
+      plainAssistantPending = "";
+      plainReasonBuffer = "";
+      plainReasonPrinted = 0;
       commandOpen = true;
       proc.stdin.write(input + "\n");
       generating = true;
@@ -593,14 +637,22 @@ async function main() {
     responseOpen = false;
     assistantStart = -1;
     currentAnswer = "";
+    plainAssistantMode = "undecided";
+    plainAssistantPending = "";
+    plainReasonBuffer = "";
+    plainReasonPrinted = 0;
     generating = true;
     proc.stdin.write(input + "\n");
     return true;
   }
 
   ui.setSubmitHandler((line) => {
-    if (!ready || generating) inputQ.push(line);
-    else handle(line);
+    if (!ready || generating) {
+      inputQ.push(line);
+      return;
+    }
+    const started = handle(line);
+    if (!started && !closed) ui.focus();
   });
 
   proc.stderr.on("data", (chunk) => ui.append(chunk));
@@ -635,11 +687,73 @@ async function main() {
     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 {
+        return;
+      }
+    }
+
+    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 {
+        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 = "";
+      }
+    }
+  }
+
 
   proc.stdout.on("data", (chunk) => {
     buf += chunk;
@@ -684,16 +798,20 @@ async function main() {
       responseOpen = true;
       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) { currentAnswer += pre; redrawAssistant(); }
+      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 (ui.supportsReplace) redrawAssistant();
-      else ui.print(formatAssistant(currentAnswer));
+      else streamPlainAssistant("", true);
       generating = false;
       responseOpen = false;
       if (ui.supportsReplace) ui.append("\n");
@@ -704,7 +822,7 @@ async function main() {
       const keep = DONE.length - 1;
       if (buf.length > keep) {
         const out = buf.slice(0, -keep);
-        if (out) { currentAnswer += out; redrawAssistant(); }
+        if (out) { currentAnswer += out; if (ui.supportsReplace) redrawAssistant(); else streamPlainAssistant(out); }
         buf = buf.slice(-keep);
       }
     }

package/package.json

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