@lzhzzzzwill/cofos 1.3.2 → 1.3.4

package/README.md

@@ -6,7 +6,7 @@ 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`.
+COFOS uses a plain terminal interface, so normal terminal scrollback, mouse selection, copy, and `Ctrl+C` work as expected.
 
 ## Runtime Model
 
@@ -77,11 +77,6 @@ Ask once and exit, useful for scripts and smoke tests:
 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
 
@@ -133,7 +128,6 @@ 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 { createInterface, emitKeypressEvents } from "node:readline";
+import { createInterface } from "node:readline";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -121,23 +121,23 @@ function slashMatches(line) {
 }
 
 function slashCompletions(line) {
-  if (!line.startsWith("/")) return [[], line];
+  if (!line.startsWith("/") || line.trim() === "/") return [[], line];
   const hits = slashMatches(line).map(({ cmd }) => cmd);
   return [hits, line];
 }
 
 function slashHint(line = "/") {
-  const hits = slashMatches(line);
-  const rows = (hits.length ? hits : SLASH_COMMANDS)
+  const hits = line.trim() === "/" ? SLASH_COMMANDS : slashMatches(line);
+  const rows = hits
     .map(({ cmd, desc }) => `    ${cmd.padEnd(10)} ${desc}`)
     .join("\n");
   return `\n  Commands\n${rows}\n  Press Tab to complete.\n`;
 }
 
-function slashInlineHint(line = "/") {
+function slashPrefixHint(line) {
   const hits = slashMatches(line);
-  if (!hits.length) return "";
-  return hits.map(({ cmd, desc }) => `  ${C}${cmd}${R}  ${desc}`).join("\n");
+  if (!hits.length) return `No command matches ${line}. Run /help for commands.`;
+  return hits.map(({ cmd, desc }) => `  ${cmd.padEnd(10)} ${desc}`).join("\n");
 }
 
 /* ─── helpers ─── */
@@ -158,207 +158,7 @@ function ensureDeps(py, log = console.log) {
   if (r.status !== 0) { log("[cofos] Failed to install Python dependencies."); process.exit(1); }
 }
 
-/* ─── TUI ─── */
-
-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,
-    left: 0,
-    width: "100%",
-    height: "100%-3",
-    scrollable: true,
-    alwaysScroll: true,
-    keys: true,
-    vi: true,
-    mouse: false,
-    tags: true,
-    scrollbar: { ch: " ", track: { bg: "black" }, style: { bg: "cyan" } },
-  });
-
-  const suggestions = blessed.box({
-    bottom: 3,
-    left: 2,
-    width: "70%",
-    height: 6,
-    hidden: true,
-    border: { type: "line" },
-    tags: true,
-    style: { border: { fg: "yellow" }, fg: "white", bg: "black" },
-  });
-
-  const input = blessed.textbox({
-    bottom: 0,
-    left: 0,
-    width: "100%",
-    height: 3,
-    inputOnFocus: true,
-    keys: true,
-    mouse: false,
-    border: { type: "line" },
-    label: " cofos ",
-    style: {
-      border: { fg: "cyan" },
-      focus: { border: { fg: "green" } },
-    },
-  });
-
-  screen.append(history);
-  screen.append(suggestions);
-  screen.append(input);
-
-  let buffer = "";
-  let onSubmit = () => {};
-  let onExit = () => {};
-  let submitting = false;
-  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, "");
-    for (const part of data.split("\r")) {
-      if (part === "") continue;
-      if (data.includes("\r")) {
-        const lastNewline = buffer.lastIndexOf("\n");
-        buffer = (lastNewline === -1 ? "" : buffer.slice(0, lastNewline + 1)) + part;
-      } else {
-        buffer += part;
-      }
-    }
-    if (buffer.length > 250000) buffer = buffer.slice(-220000);
-    renderBuffer(wasAtBottom);
-  }
-
-  function hideSuggestions() {
-    suggestionMatches = [];
-    selectedSuggestion = 0;
-    if (!suggestions.hidden) {
-      suggestions.hide();
-      screen.render();
-    }
-  }
-
-  function renderSuggestions() {
-    if (!suggestionMatches.length) {
-      hideSuggestions();
-      return;
-    }
-    selectedSuggestion = Math.max(0, Math.min(selectedSuggestion, suggestionMatches.length - 1));
-    suggestions.setContent(suggestionMatches.map(({ cmd, desc }, i) => {
-      const marker = i === selectedSuggestion ? "{black-fg}{yellow-bg}›" : " ";
-      const close = i === selectedSuggestion ? "{/yellow-bg}{/black-fg}" : "";
-      return `${marker} {cyan-fg}${cmd}{/cyan-fg}  ${desc}${close}`;
-    }).join("\n"));
-    suggestions.height = Math.min(8, suggestionMatches.length + 2);
-    suggestions.show();
-    screen.render();
-  }
-
-  function updateSuggestions() {
-    const value = input.getValue() || "";
-    if (!value.startsWith("/")) {
-      hideSuggestions();
-      return;
-    }
-    suggestionMatches = slashMatches(value);
-    selectedSuggestion = 0;
-    renderSuggestions();
-  }
-
-  function selectedCommand() {
-    return suggestionMatches[selectedSuggestion]?.cmd || "";
-  }
-
-  function submitInput() {
-    if (submitting) return;
-    submitting = true;
-    let value = input.getValue();
-    if (!suggestions.hidden && selectedCommand()) value = selectedCommand();
-    hideSuggestions();
-    input.clearValue();
-    input.focus();
-    screen.render();
-    onSubmit(String(value || ""));
-    setTimeout(() => { submitting = false; }, 0);
-  }
-
-  input.key(["enter"], submitInput);
-  screen.key(["enter"], submitInput);
-
-  input.on("keypress", (_ch, key = {}) => {
-    if (["up", "down", "tab", "enter", "escape"].includes(key.name)) return;
-    setTimeout(updateSuggestions, 0);
-  });
-
-  screen.key(["tab"], () => {
-    const value = input.getValue() || "";
-    if (!value.startsWith("/")) return;
-    if (!suggestionMatches.length) suggestionMatches = slashMatches(value);
-    if (!suggestionMatches.length) return;
-    input.setValue(selectedCommand());
-    hideSuggestions();
-    input.focus();
-    screen.render();
-  });
-
-  screen.key(["up"], () => {
-    if (suggestions.hidden || !suggestionMatches.length) return;
-    selectedSuggestion = (selectedSuggestion - 1 + suggestionMatches.length) % suggestionMatches.length;
-    renderSuggestions();
-  });
-
-  screen.key(["down"], () => {
-    if (suggestions.hidden || !suggestionMatches.length) return;
-    selectedSuggestion = (selectedSuggestion + 1) % suggestionMatches.length;
-    renderSuggestions();
-  });
-
-  screen.key(["escape"], hideSuggestions);
-  screen.key(["pageup"], () => { history.scroll(-Math.max(3, Math.floor(screen.height * 0.8))); screen.render(); });
-  screen.key(["pagedown"], () => { history.scroll(Math.max(3, Math.floor(screen.height * 0.8))); screen.render(); });
-  screen.key(["home"], () => { history.setScrollPerc(0); screen.render(); });
-  screen.key(["end"], () => { history.setScrollPerc(100); screen.render(); });
-  screen.key(["C-c"], () => onExit());
-
-  input.focus();
-  screen.render();
-
-  return {
-    supportsReplace: true,
-    screen,
-    input,
-    append,
-    print: (text = "") => append(String(text) + "\n"),
-    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: () => {
-      try { screen.program.disableMouse(); } catch (_) {}
-      screen.destroy();
-    },
-  };
-}
-
-function blessedToAnsi(text) {
+function markupToAnsi(text) {
   return String(text)
     .replace(/\{bold\}/g, B)
     .replace(/\{\/bold\}/g, R)
@@ -382,7 +182,6 @@ function createPlainUi() {
   let onSubmit = () => {};
   let onExit = () => {};
   let prompt = "cofos";
-  let slashHintShown = false;
 
   function setPrompt(label) {
     prompt = label;
@@ -390,23 +189,7 @@ 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());
@@ -414,11 +197,12 @@ function createPlainUi() {
 
   return {
     supportsReplace: false,
-    append: (text = "") => process.stdout.write(blessedToAnsi(text)),
-    print: (text = "") => console.log(blessedToAnsi(text)),
+    echoUser: false,
+    append: (text = "") => process.stdout.write(markupToAnsi(text)),
+    print: (text = "") => console.log(markupToAnsi(text)),
     clear: () => console.clear(),
     length: () => 0,
-    replaceFrom: (_index, text = "") => process.stdout.write(blessedToAnsi(text)),
+    replaceFrom: (_index, text = "") => process.stdout.write(markupToAnsi(text)),
     setSubmitHandler: (fn) => { onSubmit = fn; },
     setExitHandler: (fn) => { onExit = fn; },
     focus: () => rl.prompt(),
@@ -432,7 +216,7 @@ function createPlainUi() {
 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 [--tui] [-p QUESTION] [--model PATH] [--config PATH] [--pdf-dir DIR] [--cache-dir DIR] [--top-k N] [--no-rag]\n");
+    console.log("  Usage:  cofos [-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");
@@ -445,7 +229,6 @@ async function main() {
     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");
@@ -462,7 +245,6 @@ async function main() {
   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];
 
@@ -494,8 +276,6 @@ async function main() {
       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") {
@@ -513,8 +293,8 @@ async function main() {
   if (!py) die("Python not found. Install Python 3.9+ and re-run.");
   if (!existsSync(chatScript)) die(`Missing script: ${chatScript}`);
 
-  const ui = useTui ? await createTui() : createPlainUi();
-  ui.print(useTui ? plain(render({ modelPath, cacheDir, pdfDir })) : render({ modelPath, cacheDir, pdfDir }));
+  const ui = createPlainUi();
+  ui.print(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");
@@ -584,7 +364,7 @@ async function main() {
     if (!input) return false;
 
     if (input === "/") {
-      ui.print(slashHint("/"));
+      ui.print("Commands: " + SLASH_COMMANDS.map(({ cmd }) => cmd).join("  ") + "\nType a prefix such as /r or /to, then press Tab for completion.");
       return false;
     }
     if (/^\/(exit|quit)$/.test(input)) { shutdown(); return true; }
@@ -629,11 +409,11 @@ async function main() {
       return false;
     }
     if (input.startsWith("/")) {
-      ui.print(`{red-fg}•{/red-fg} Unknown command: ${input}. Press / then Tab for commands, or run /help.`);
+      ui.print(`{red-fg}•{/red-fg} Unknown command: ${input}.\n${slashPrefixHint(input)}`);
       return false;
     }
 
-    ui.print("{yellow-fg}●{/yellow-fg} " + input);
+    if (ui.echoUser) ui.print("{yellow-fg}●{/yellow-fg} " + input);
     responseOpen = false;
     assistantStart = -1;
     currentAnswer = "";
@@ -674,7 +454,7 @@ async function main() {
     }
 
     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;
+    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) {
@@ -687,7 +467,7 @@ 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;
+  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;
@@ -696,65 +476,16 @@ async function main() {
 
   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 = "";
-      }
+      if (!text && !final) return;
+      plainAssistantMode = "answer";
+      ui.append(`${GR}${B}◆${R} `);
     }
+    if (text) ui.append(text);
   }
 
 
+
   proc.stdout.on("data", (chunk) => {
     buf += chunk;
     if (!ready) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzhzzzzwill/cofos",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "COFOS 9B + RAG chat CLI with optional local PDF ingestion.",
   "type": "module",
   "bin": {
@@ -38,8 +38,5 @@
   "license": "MIT",
   "engines": {
     "node": ">=18"
-  },
-  "dependencies": {
-    "blessed": "^0.1.81"
   }
 }

package/runtime/src/inference/student_adapter_inference.py

@@ -538,7 +538,23 @@ class StudentAdapterInference:
                 )
                 if not stripped.strip():
                     continue
-                buffer = stripped.lstrip()
+                stripped = stripped.lstrip()
+                if awaiting_initial_answer and re.match(
+                    r"(?is)^(?:the user|okay[,，]?\s+the user|用户问|用户用|i need|i should|i'll|let me|since the user|we need)\b",
+                    stripped,
+                ):
+                    paragraph_end = re.search(r"\n\s*\n", stripped)
+                    if paragraph_end is None:
+                        # Keep waiting for the end of the leading reasoning paragraph.
+                        buffer = stripped[-4000:]
+                        continue
+                    buffer = stripped[paragraph_end.end():].lstrip()
+                    awaiting_initial_answer = False
+                    if not buffer.strip():
+                        continue
+                else:
+                    buffer = stripped
+                    awaiting_initial_answer = False
                 started = True
 
             if len(buffer) > len("<think>"):