@lzhzzzzwill/cofos 1.2.1 → 1.2.3

package/bin/cofos.js

@@ -169,7 +169,7 @@ function createTui() {
     alwaysScroll: true,
     keys: true,
     vi: true,
-    mouse: true,
+    mouse: false,
     tags: false,
     scrollbar: { ch: " ", track: { bg: "black" }, style: { bg: "cyan" } },
   });
@@ -192,7 +192,7 @@ function createTui() {
     height: 3,
     inputOnFocus: true,
     keys: true,
-    mouse: true,
+    mouse: false,
     border: { type: "line" },
     label: " cofos ",
     style: {
@@ -207,6 +207,10 @@ function createTui() {
 
   let buffer = "";
   let onSubmit = () => {};
+  let onExit = () => {};
+  let submitting = false;
+  let suggestionMatches = [];
+  let selectedSuggestion = 0;
 
   function append(text = "") {
     const data = String(text).replace(/\x1b\[[0-9;]*[A-Za-z]/g, "");
@@ -226,59 +230,91 @@ function createTui() {
   }
 
   function hideSuggestions() {
+    suggestionMatches = [];
+    selectedSuggestion = 0;
     if (!suggestions.hidden) {
       suggestions.hide();
       screen.render();
     }
   }
 
-  function updateSuggestions() {
-    const value = input.getValue() || "";
-    if (!value.startsWith("/")) {
+  function renderSuggestions() {
+    if (!suggestionMatches.length) {
       hideSuggestions();
       return;
     }
-    const matches = slashMatches(value);
-    if (!matches.length) {
+    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;
     }
-    suggestions.setContent(matches.map(({ cmd, desc }) => `{cyan-fg}${cmd}{/cyan-fg}  ${desc}`).join("\n"));
-    suggestions.height = Math.min(8, matches.length + 2);
-    suggestions.show();
-    screen.render();
+    suggestionMatches = slashMatches(value);
+    selectedSuggestion = 0;
+    renderSuggestions();
+  }
+
+  function selectedCommand() {
+    return suggestionMatches[selectedSuggestion]?.cmd || "";
   }
 
   function submitInput() {
-    const value = input.getValue();
+    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", () => setTimeout(updateSuggestions, 0));
+  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;
-    const matches = slashMatches(value);
-    if (!matches.length) return;
-    if (matches.length === 1) {
-      input.setValue(matches[0].cmd);
-      hideSuggestions();
-      input.focus();
-      screen.render();
-      return;
-    }
-    updateSuggestions();
+    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(["C-c"], () => process.emit("SIGINT"));
+  screen.key(["C-c"], () => onExit());
 
   input.focus();
   screen.render();
@@ -289,6 +325,8 @@ function createTui() {
     append,
     print: (text = "") => append(String(text) + "\n"),
     setSubmitHandler: (fn) => { onSubmit = fn; },
+    setExitHandler: (fn) => { onExit = fn; },
+    focus: () => { input.focus(); screen.render(); },
     setPrompt: (label) => { input.setLabel(` ${label} `); screen.render(); },
     destroy: () => screen.destroy(),
   };
@@ -393,7 +431,7 @@ function main() {
   proc.stdout.setEncoding("utf-8");
   proc.stderr.setEncoding("utf-8");
 
-  let buf = "", ready = false, generating = false, responseOpen = false, closed = false;
+  let buf = "", ready = false, generating = false, responseOpen = false, commandOpen = false, closed = false;
   const inputQ = [];
   let mlBuf = [];
 
@@ -405,6 +443,7 @@ function main() {
     ui.destroy();
   }
 
+  ui.setExitHandler(shutdown);
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
 
@@ -440,6 +479,14 @@ function main() {
     if (/^\/(clear)$/.test(input)) {
       mlBuf = [];
       responseOpen = false;
+      commandOpen = true;
+      proc.stdin.write(input + "\n");
+      generating = true;
+      return true;
+    }
+    if (/^\/(topk)(?:\s+\d+)?$/.test(input) || /^\/rag\s+(?:on|off)$/.test(input)) {
+      responseOpen = false;
+      commandOpen = true;
       proc.stdin.write(input + "\n");
       generating = true;
       return true;
@@ -449,7 +496,7 @@ function main() {
       return false;
     }
 
-    ui.print(G + "  you   " + R + input);
+    ui.print(Y + "● " + R + input);
     responseOpen = false;
     generating = true;
     proc.stdin.write(input + "\n");
@@ -477,6 +524,20 @@ function main() {
     }
     if (!generating) { buf = ""; return; }
 
+    if (commandOpen) {
+      const di = buf.indexOf(DONE);
+      if (di === -1) return;
+      const pre = buf.slice(0, di).trim();
+      if (pre) ui.print(G + "• " + R + pre);
+      buf = buf.slice(di + DONE.length);
+      if (buf[0] === "\n") buf = buf.slice(1);
+      generating = false;
+      commandOpen = false;
+      ui.focus();
+      drain();
+      return;
+    }
+
     if (!responseOpen) {
       const ri = buf.indexOf(RESPONSE);
       if (ri === -1) {
@@ -487,6 +548,7 @@ function main() {
       buf = buf.slice(ri + RESPONSE.length);
       if (buf[0] === "\n") buf = buf.slice(1);
       responseOpen = true;
+      ui.append(GR + B + "◆ COFOS " + R);
     }
 
     const di = buf.indexOf(DONE);
@@ -498,6 +560,7 @@ function main() {
       generating = false;
       responseOpen = false;
       ui.append("\n");
+      ui.focus();
       drain();
     } else {
       const keep = DONE.length - 1;

package/package.json

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