@lzhzzzzwill/cofos 1.2.0 → 1.2.2

package/bin/cofos.js

@@ -169,13 +169,8 @@ function createTui() {
     alwaysScroll: true,
     keys: true,
     vi: true,
-    mouse: true,
+    mouse: false,
     tags: false,
-    border: { type: "line" },
-    style: {
-      border: { fg: "cyan" },
-      scrollbar: { bg: "cyan" },
-    },
     scrollbar: { ch: " ", track: { bg: "black" }, style: { bg: "cyan" } },
   });
 
@@ -197,7 +192,7 @@ function createTui() {
     height: 3,
     inputOnFocus: true,
     keys: true,
-    mouse: true,
+    mouse: false,
     border: { type: "line" },
     label: " cofos ",
     style: {
@@ -212,9 +207,20 @@ function createTui() {
 
   let buffer = "";
   let onSubmit = () => {};
+  let suggestionMatches = [];
+  let selectedSuggestion = 0;
 
   function append(text = "") {
-    buffer += String(text).replace(/\r/g, "");
+    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);
     history.setContent(buffer);
     history.setScrollPerc(100);
@@ -222,51 +228,83 @@ 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 || "";
   }
 
-  input.on("submit", (value) => {
+  function submitInput() {
+    let value = input.getValue();
+    if (!suggestions.hidden && selectedCommand()) value = selectedCommand();
     hideSuggestions();
     input.clearValue();
+    input.focus();
     screen.render();
     onSubmit(String(value || ""));
-  });
+  }
 
-  input.on("keypress", () => setTimeout(updateSuggestions, 0));
+  input.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;
-    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);
@@ -441,7 +479,7 @@ function main() {
       return false;
     }
 
-    ui.print(G + "  you   " + R + input);
+    ui.print(Y + "● You" + R + "\n" + input);
     responseOpen = false;
     generating = true;
     proc.stdin.write(input + "\n");
@@ -479,6 +517,7 @@ function main() {
       buf = buf.slice(ri + RESPONSE.length);
       if (buf[0] === "\n") buf = buf.slice(1);
       responseOpen = true;
+      ui.append(GR + "◆ COFOS" + R + "\n");
     }
 
     const di = buf.indexOf(DONE);

package/package.json

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