oh-aicoding-tool 0.1.6 → 0.1.8

package/bin/cli.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-import fs from "node:fs";
-import path from "node:path";
-import readline from "node:readline";
-import { spawnSync } from "node:child_process";
-import { createRequire } from "node:module";
-import { createInterface } from "node:readline/promises";
+import fs from "node:fs";
+import path from "node:path";
+import { spawnSync } from "node:child_process";
+import { createRequire } from "node:module";
+import { createInterface } from "node:readline/promises";
 
 const require = createRequire(import.meta.url);
 
@@ -87,43 +86,6 @@ function emailIsValid(value) {
   return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(String(value || "").trim());
 }
 
-function keySeq(raw, key = {}) {
-  return String(key.sequence ?? raw ?? "");
-}
-
-function isCtrlC(raw, key = {}) {
-  return Boolean(key.ctrl && key.name === "c") || keySeq(raw, key) === "\x03";
-}
-
-function isEscape(raw, key = {}) {
-  const seq = keySeq(raw, key);
-  return key.name === "escape" || seq === "\x1b";
-}
-
-function isUpKey(raw, key = {}) {
-  const seq = keySeq(raw, key);
-  return key.name === "up" || seq === "\x1b[A" || seq === "\x1bOA";
-}
-
-function isDownKey(raw, key = {}) {
-  const seq = keySeq(raw, key);
-  return key.name === "down" || seq === "\x1b[B" || seq === "\x1bOB";
-}
-
-function isEnterKey(raw, key = {}) {
-  const seq = keySeq(raw, key);
-  return key.name === "return" || key.name === "enter" || seq === "\r" || seq === "\n";
-}
-
-function isSpaceKey(raw, key = {}) {
-  return key.name === "space" || keySeq(raw, key) === " ";
-}
-
-function numberKey(raw, key = {}) {
-  const seq = keySeq(raw, key);
-  return /^[1-9]$/.test(seq) ? Number.parseInt(seq, 10) : Number.NaN;
-}
-
 function renderMultiChoice(title, choices, index, selected, subtitle) {
   renderHeader(subtitle);
   console.log("");
@@ -139,21 +101,51 @@ function renderMultiChoice(title, choices, index, selected, subtitle) {
     if (choice.description) console.log(`      ${paint(choice.description, focused ? t.blue : t.muted)}`);
     if (idx < choices.length - 1) console.log("");
   });
-}
-
-async function askMultiChoice(rl, title, choices, subtitle) {
+}
+
+function rawKeySeq(raw) {
+  if (Buffer.isBuffer(raw)) return raw.toString("latin1");
+  return String(raw ?? "");
+}
+
+function readKeyFromBuffer(buffer) {
+  if (!buffer) return { pending: true, rest: "" };
+  if (buffer === "\x1b" || buffer === "\x1b[" || buffer === "\x1bO" || buffer === "\x00" || buffer === "\xe0") {
+    return { pending: true, rest: buffer };
+  }
+
+  const three = buffer.slice(0, 3);
+  if (three === "\x1b[A" || three === "\x1bOA") return { key: { name: "up", sequence: three }, rest: buffer.slice(3) };
+  if (three === "\x1b[B" || three === "\x1bOB") return { key: { name: "down", sequence: three }, rest: buffer.slice(3) };
+
+  const two = buffer.slice(0, 2);
+  if (two === "\x00H" || two === "\xe0H") return { key: { name: "up", sequence: two }, rest: buffer.slice(2) };
+  if (two === "\x00P" || two === "\xe0P") return { key: { name: "down", sequence: two }, rest: buffer.slice(2) };
+  if (two === "\r\n") return { key: { name: "enter", sequence: two }, rest: buffer.slice(2) };
+
+  const seq = buffer[0];
+  if (seq === "\x03") return { key: { name: "ctrl-c", sequence: seq }, rest: buffer.slice(1) };
+  if (seq === "\r" || seq === "\n") return { key: { name: "enter", sequence: seq }, rest: buffer.slice(1) };
+  if (seq === " ") return { key: { name: "space", sequence: seq }, rest: buffer.slice(1) };
+  if (seq === "\x1b") return { key: { name: "escape", sequence: seq }, rest: buffer.slice(1) };
+  if (/^[1-9]$/.test(seq)) return { key: { name: "number", number: Number.parseInt(seq, 10), sequence: seq }, rest: buffer.slice(1) };
+  return { key: { name: seq.toLowerCase(), sequence: seq }, rest: buffer.slice(1) };
+}
+
+async function askMultiChoice(rl, title, choices, subtitle) {
   if (process.stdin.isTTY && process.stdout.isTTY) {
     rl.pause();
     return await new Promise((resolve) => {
-      let index = 0;
-      const selected = new Set(choices.filter((choice) => choice.selected).map((choice) => choice.value));
-      const stdin = process.stdin;
-
-      function cleanup(value) {
-        stdin.off("keypress", onKeypress);
-        if (stdin.isTTY) stdin.setRawMode(false);
-        stdin.pause();
-        rl.resume();
+      let index = 0;
+      let keyBuffer = "";
+      const selected = new Set(choices.filter((choice) => choice.selected).map((choice) => choice.value));
+      const stdin = process.stdin;
+
+      function cleanup(value) {
+        stdin.off("data", onData);
+        if (stdin.isTTY) stdin.setRawMode(false);
+        stdin.pause();
+        rl.resume();
         clearScreen();
         resolve(value);
       }
@@ -162,37 +154,47 @@ async function askMultiChoice(rl, title, choices, subtitle) {
         const value = choices[index].value;
         if (selected.has(value)) selected.delete(value);
         else selected.add(value);
-        renderMultiChoice(title, choices, index, selected, subtitle);
-      }
-
-      function onKeypress(raw, key = {}) {
-        if (isCtrlC(raw, key)) return cleanup([]);
-        if (isUpKey(raw, key)) {
-          index = (index - 1 + choices.length) % choices.length;
-          renderMultiChoice(title, choices, index, selected, subtitle);
-          return;
-        }
-        if (isDownKey(raw, key)) {
-          index = (index + 1) % choices.length;
-          renderMultiChoice(title, choices, index, selected, subtitle);
-          return;
+        renderMultiChoice(title, choices, index, selected, subtitle);
+      }
+
+      function onData(raw) {
+        keyBuffer += rawKeySeq(raw);
+        while (keyBuffer) {
+          const result = readKeyFromBuffer(keyBuffer);
+          if (result.pending) {
+            keyBuffer = result.rest;
+            return;
+          }
+          keyBuffer = result.rest;
+          const key = result.key;
+
+          if (key.name === "ctrl-c") return cleanup([]);
+          if (key.name === "up") {
+            index = (index - 1 + choices.length) % choices.length;
+            renderMultiChoice(title, choices, index, selected, subtitle);
+            return;
+          }
+          if (key.name === "down") {
+            index = (index + 1) % choices.length;
+            renderMultiChoice(title, choices, index, selected, subtitle);
+            return;
+          }
+          if (key.name === "q" || key.name === "escape") return cleanup([]);
+          if (key.name === "space") return toggle();
+          if (key.name === "enter") return cleanup([...selected]);
+          const number = key.name === "number" ? key.number : Number.NaN;
+          if (Number.isInteger(number) && choices[number - 1]) {
+            index = number - 1;
+            toggle();
+          }
         }
-        if (keySeq(raw, key).toLowerCase() === "q" || isEscape(raw, key)) return cleanup([]);
-        if (isSpaceKey(raw, key)) return toggle();
-        if (isEnterKey(raw, key)) return cleanup([...selected]);
-        const number = numberKey(raw, key);
-        if (Number.isInteger(number) && choices[number - 1]) {
-          index = number - 1;
-          toggle();
-        }
-      }
-
-      readline.emitKeypressEvents(stdin);
-      if (stdin.isTTY) stdin.setRawMode(true);
-      stdin.on("keypress", onKeypress);
-      stdin.resume();
-      renderMultiChoice(title, choices, index, selected, subtitle);
-    });
+      }
+
+      if (stdin.isTTY) stdin.setRawMode(true);
+      stdin.on("data", onData);
+      stdin.resume();
+      renderMultiChoice(title, choices, index, selected, subtitle);
+    });
   }
 
   choices.forEach((choice, index) => console.log(`  ${index + 1}. ${choice.label}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-aicoding-tool",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "private": false,
   "type": "module",
   "description": "Interactive installer for AI coding tools: Langfuse tracing and oh-ai-report.",
@@ -25,7 +25,7 @@
   ],
   "license": "UNLICENSED",
   "dependencies": {
-    "oh-langfuse": "^0.1.9",
+    "oh-langfuse": "^0.1.10",
     "oh-aireport": "^0.1.1"
   }
 }