@rind-ai/cli 0.6.1 → 0.7.0

package/lib/tui/tui.js

@@ -5,9 +5,16 @@ export const CURSOR_MARKER = "\x1b_pi:c\x07";
 
 const SYNC_START = "\x1b[?2026h";
 const SYNC_END = "\x1b[?2026l";
+const SHOW_CURSOR = "\x1b[?25h";
+const HIDE_CURSOR = "\x1b[?25l";
 const LINE_RESET = "\x1b[0m";
 const PASTE_ENABLE = "\x1b[?2004h";
 const PASTE_DISABLE = "\x1b[?2004l";
+const KITTY_KEYBOARD_ENABLE = "\x1b[>7u\x1b[?u\x1b[c";
+const KITTY_KEYBOARD_DISABLE = "\x1b[<u";
+const MODIFY_OTHER_KEYS_ENABLE = "\x1b[>4;2m";
+const MODIFY_OTHER_KEYS_DISABLE = "\x1b[>4;0m";
+const KEYBOARD_QUERY_TIMEOUT_MS = 150;
 const DEFAULT_COLUMNS = 80;
 const DEFAULT_ROWS = 24;
 const DEFAULT_RENDER_INTERVAL_MS = 16;
@@ -40,14 +47,20 @@ export function createTui(options = {}) {
   let previousHeight = 0;
   let cursorRow = 0;
   let hardwareCursorRow = 0;
+  let hardwareCursorCol = 0;
   let maxLinesRendered = 0;
   let previousViewportTop = 0;
 
   let clearOnShrink = false;
   let cursorVisible = false;
   let replayRequested = false;
+  let keyboardQueryActive = false;
+  let kittyKeyboardActive = false;
+  let modifyOtherKeysActive = false;
+  let keyboardQueryTimer = null;
+  let keyboardProtocolPushed = false;
   const inputBuffer = createInputBuffer({
-    onSequence: (sequence) => inputHandler?.(sequence),
+    onSequence: handleInputSequence,
     onPaste: (payload) => pasteHandler?.(payload),
     setTimeout: schedule,
     clearTimeout: cancelSchedule,
@@ -127,6 +140,7 @@ export function createTui(options = {}) {
       output.on("resize", handleResize);
     }
     write(PASTE_ENABLE);
+    enableKeyboardProtocol();
     hideCursor();
     requestRender();
   }
@@ -167,6 +181,7 @@ export function createTui(options = {}) {
       input.setRawMode(rawModeBeforeStart);
     }
     write(PASTE_DISABLE);
+    disableKeyboardProtocol();
     inputBuffer.clear();
   }
 
@@ -174,6 +189,64 @@ export function createTui(options = {}) {
     inputBuffer.feed(data);
   }
 
+  function handleInputSequence(sequence) {
+    const kittyFlags = keyboardQueryActive ? kittyKeyboardFlags(sequence) : null;
+    if (kittyFlags !== null) {
+      clearKeyboardQuery();
+      if (kittyFlags > 0) {
+        kittyKeyboardActive = true;
+      } else {
+        enableModifyOtherKeys();
+      }
+      return;
+    }
+    if (keyboardQueryActive && isDeviceAttributesResponse(sequence)) {
+      clearKeyboardQuery();
+      enableModifyOtherKeys();
+      return;
+    }
+    inputHandler?.(sequence);
+  }
+
+  function enableKeyboardProtocol() {
+    keyboardQueryActive = true;
+    keyboardProtocolPushed = true;
+    keyboardQueryTimer = schedule(() => {
+      keyboardQueryTimer = null;
+      keyboardQueryActive = false;
+    }, KEYBOARD_QUERY_TIMEOUT_MS);
+    write(KITTY_KEYBOARD_ENABLE);
+  }
+
+  function clearKeyboardQuery() {
+    keyboardQueryActive = false;
+    if (keyboardQueryTimer !== null) {
+      cancelSchedule(keyboardQueryTimer);
+      keyboardQueryTimer = null;
+    }
+  }
+
+  function disableKeyboardProtocol() {
+    if (keyboardProtocolPushed) {
+      write(KITTY_KEYBOARD_DISABLE);
+    }
+    if (modifyOtherKeysActive) {
+      write(MODIFY_OTHER_KEYS_DISABLE);
+    }
+    clearKeyboardQuery();
+    keyboardProtocolPushed = false;
+    kittyKeyboardActive = false;
+    modifyOtherKeysActive = false;
+  }
+
+  function enableModifyOtherKeys() {
+    if (kittyKeyboardActive || modifyOtherKeysActive) {
+      return;
+    }
+    write(MODIFY_OTHER_KEYS_ENABLE);
+    modifyOtherKeysActive = true;
+  }
+
   function handleResize() {
     requestRender();
   }
@@ -260,6 +333,7 @@ export function createTui(options = {}) {
       previousHeight = -1;
       cursorRow = 0;
       hardwareCursorRow = 0;
+      hardwareCursorCol = -1;
       maxLinesRendered = 0;
       previousViewportTop = 0;
     }
@@ -292,14 +366,15 @@ export function createTui(options = {}) {
         }
         buffer += writableLine(newLines[index], width);
       }
-      buffer += SYNC_END;
-      write(buffer);
       cursorRow = Math.max(0, newLines.length - 1);
       hardwareCursorRow = cursorRow;
+      hardwareCursorCol = -1;
+      buffer += hardwareCursorSequence(cursorPos, newLines);
+      buffer += SYNC_END;
+      write(buffer);
       maxLinesRendered = clear ? newLines.length : Math.max(maxLinesRendered, newLines.length);
       const bufferLength = Math.max(height, newLines.length);
       previousViewportTop = Math.max(0, bufferLength - height);
-      positionHardwareCursor(cursorPos, newLines);
       previousLines = newLines;
       previousWidth = width;
       previousHeight = height;
@@ -352,7 +427,7 @@ export function createTui(options = {}) {
     const appendStart = appendedLines && firstChanged === previousLines.length && firstChanged > 0;
 
     if (firstChanged === -1) {
-      positionHardwareCursor(cursorPos, newLines);
+      emitCursorSequence(cursorPos, newLines);
       previousViewportTop = prevViewportTop;
       previousHeight = height;
       return;
@@ -373,6 +448,9 @@ export function createTui(options = {}) {
           return;
         }
         let buffer = SYNC_START;
+        cursorRow = targetRow;
+        hardwareCursorRow = targetRow;
+        hardwareCursorCol = -1;
         const lineDiff = computeLineDiff(targetRow);
         if (lineDiff > 0) {
           buffer += `\x1b[${lineDiff}B`;
@@ -394,12 +472,11 @@ export function createTui(options = {}) {
         if (moveBack > 0) {
           buffer += `\x1b[${moveBack}A`;
         }
+        buffer += hardwareCursorSequence(cursorPos, newLines);
         buffer += SYNC_END;
         write(buffer);
-        cursorRow = targetRow;
-        hardwareCursorRow = targetRow;
       }
-      positionHardwareCursor(cursorPos, newLines);
+      emitCursorSequence(cursorPos, newLines);
       previousLines = newLines;
       previousWidth = width;
       previousHeight = height;
@@ -461,14 +538,15 @@ export function createTui(options = {}) {
       buffer += `\x1b[${extraLines}A`;
     }
 
-    buffer += SYNC_END;
-    write(buffer);
-
     cursorRow = Math.max(0, newLines.length - 1);
     hardwareCursorRow = finalCursorRow;
+    hardwareCursorCol = -1;
     maxLinesRendered = Math.max(maxLinesRendered, newLines.length);
     previousViewportTop = Math.max(prevViewportTop, finalCursorRow - height + 1);
-    positionHardwareCursor(cursorPos, newLines);
+    buffer += hardwareCursorSequence(cursorPos, newLines);
+    buffer += SYNC_END;
+    write(buffer);
+
     previousLines = newLines;
     previousWidth = width;
     previousHeight = height;
@@ -510,38 +588,49 @@ export function createTui(options = {}) {
     return null;
   }
 
-  function positionHardwareCursor(cursorPos, lines) {
-    const totalLines = lines.length;
-    if (!cursorPos || totalLines <= 0) {
-      if (cursorVisible) {
-        hideCursor();
+  function hardwareCursorSequence(cursorPos, lines) {
+    if (!cursorPos || lines.length <= 0) {
+      if (!cursorVisible) {
+        return "";
       }
-      return;
+      cursorVisible = false;
+      return HIDE_CURSOR;
     }
-    let targetRow;
-    let targetCol;
-    targetRow = Math.max(0, Math.min(cursorPos.row, totalLines - 1));
-    targetCol = Math.max(0, cursorPos.col);
+    const targetRow = Math.max(0, Math.min(cursorPos.row, lines.length - 1));
+    const targetCol = Math.max(0, cursorPos.col);
+    let sequence = "";
     const rowDelta = targetRow - hardwareCursorRow;
-    let buffer = "";
     if (rowDelta > 0) {
-      buffer += `\x1b[${rowDelta}B`;
+      sequence += `\x1b[${rowDelta}B`;
     } else if (rowDelta < 0) {
-      buffer += `\x1b[${-rowDelta}A`;
+      sequence += `\x1b[${-rowDelta}A`;
+    }
+    if (hardwareCursorCol !== targetCol) {
+      sequence += `\x1b[${targetCol + 1}G`;
+    }
+    if (!cursorVisible) {
+      sequence += SHOW_CURSOR;
     }
-    buffer += `\x1b[${targetCol + 1}G`;
-    write(buffer);
     hardwareCursorRow = targetRow;
-    showCursor();
+    hardwareCursorCol = targetCol;
+    cursorVisible = true;
+    return sequence;
+  }
+
+  function emitCursorSequence(cursorPos, lines) {
+    const sequence = hardwareCursorSequence(cursorPos, lines);
+    if (sequence) {
+      write(`${SYNC_START}${sequence}${SYNC_END}`);
+    }
   }
 
   function hideCursor() {
-    write("\x1b[?25l");
+    write(HIDE_CURSOR);
     cursorVisible = false;
   }
 
   function showCursor() {
-    write("\x1b[?25h");
+    write(SHOW_CURSOR);
     cursorVisible = true;
   }
 
@@ -589,3 +678,12 @@ function finitePositive(value, fallback) {
   const number = Number(value);
   return Number.isFinite(number) && number > 0 ? Math.floor(number) : fallback;
 }
+
+function kittyKeyboardFlags(sequence) {
+  const match = String(sequence || "").match(/^\x1b\[\?(\d+)u$/);
+  return match ? Number(match[1]) : null;
+}
+
+function isDeviceAttributesResponse(sequence) {
+  return /^\x1b\[\?[\d;]*c$/.test(sequence);
+}

package/lib/turn-controller.js

@@ -1,6 +1,11 @@
 import { runtimeMethods } from "./runtime-protocol.js";
 
-export function createTurnController({ request, state, output, refreshGoalState = () => {}, onTurnStart = () => {} }) {
+export function createTurnController({
+  request,
+  state,
+  output,
+  onTurnStart = () => {},
+}) {
   function submit(text, extra = {}) {
     if (state.activeTurn) {
       void submitQueuedInput(runtimeMethods.sessionSteer, text, text, "steering");
@@ -41,14 +46,18 @@ export function createTurnController({ request, state, output, refreshGoalState
   }
 
   async function run(text, extra = {}) {
+    let requestSucceeded = false;
     try {
       await request(runtimeMethods.sessionPrompt, { input: text, ...extra });
+      requestSucceeded = true;
     } finally {
-      void refreshGoalState();
-      state.activeTurn = false;
-      state.interruptRequested = false;
       output.closeAssistant();
       output.refreshInputState();
+      if (!requestSucceeded) {
+        state.activeTurn = false;
+        state.interruptRequested = false;
+        output.refreshInputState();
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rind-ai/cli",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Rind command-line client",
   "license": "MIT",
   "repository": "https://github.com/Azzurroooo/rind.git",
@@ -16,10 +16,10 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@rind-ai/runtime-win32-x64": "0.6.1",
-    "@rind-ai/runtime-linux-x64": "0.6.1",
-    "@rind-ai/runtime-darwin-x64": "0.6.1",
-    "@rind-ai/runtime-darwin-arm64": "0.6.1"
+    "@rind-ai/runtime-win32-x64": "0.7.0",
+    "@rind-ai/runtime-linux-x64": "0.7.0",
+    "@rind-ai/runtime-darwin-x64": "0.7.0",
+    "@rind-ai/runtime-darwin-arm64": "0.7.0"
   },
   "publishConfig": {
     "access": "public",

package/lib/frontend-cli.js

@@ -1,5 +0,0 @@
-import { runFrontendCliApp } from "./frontend-cli-implementation.js";
-
-export function runFrontendCli(cliArgs = process.argv.slice(2)) {
-  return runFrontendCliApp(cliArgs);
-}