@rind-ai/cli 0.6.1 → 0.7.0

package/lib/runtime-client.js

@@ -50,12 +50,11 @@ export function createRuntimeClient({
   cwd = process.cwd(),
   rindHome = process.env.RIND_HOME,
   runtimePath = process.env.RIND_RUNTIME_PATH || "",
-  onEvent = () => {},
   onMessage = null,
   onStderr = () => {},
   onExit = () => {},
 }) {
-  const handleEvent = onMessage || onEvent;
+  const handleEvent = onMessage;
   const launch = resolveRuntimeLaunch({ python, repoRoot, runtimePath, cliArgs });
 
   let nextId = 1;
@@ -120,13 +119,13 @@ export function createRuntimeClient({
     onExit(code, signal, { closing, error });
   }
 
-  function request(method, params = {}) {
-    const id = nextId++;
-    return new Promise((resolve, reject) => {
-      if (!child || !child.stdin.writable || child.destroyed) {
-        reject(new Error("Runtime is not running. Start it before sending a request."));
-        return;
-      }
+  function request(method, params = {}) {
+    const id = nextId++;
+    return new Promise((resolve, reject) => {
+      if (!child || !child.stdin.writable || child.destroyed) {
+        reject(new Error("Runtime is not running. Start it before sending a request."));
+        return;
+      }
       const entry = { resolve, reject };
       if (!LONG_RUNNING_METHODS.has(method)) {
         entry.timer = setTimeout(() => {
@@ -145,8 +144,8 @@ export function createRuntimeClient({
         reject(error);
       });
     });
-  }
-
+  }
+
   function receive(line) {
     let message;
     try {
@@ -239,8 +238,8 @@ export function createRuntimeClient({
     get child() {
       return child;
     },
-    start,
-    request,
+    start,
+    request,
     shutdown,
     forceShutdown,
     closeInput,

package/lib/runtime-protocol.js

@@ -8,6 +8,7 @@ export const runtimeMethods = Object.freeze({
   sessionNew: "session/new",
   sessionList: "session/list",
   sessionSwitch: "session/switch",
+  sessionFork: "session/fork",
   sessionReplay: "session/replay",
   sessionPrompt: "session/prompt",
   sessionCancel: "session/cancel",
@@ -28,12 +29,15 @@ export const runtimeMethods = Object.freeze({
   goalSet: "rind/goal/set",
   goalStatus: "rind/goal/status",
   goalClear: "rind/goal/clear",
+  contextInspect: "rind/context/inspect",
+  usageSummary: "rind/usage/summary",
 });
 
 export const sessionScopedMethods = new Set([
   runtimeMethods.sessionPrompt,
   runtimeMethods.sessionReplay,
   runtimeMethods.sessionSwitch,
+  runtimeMethods.sessionFork,
   runtimeMethods.sessionCancel,
   runtimeMethods.modelSet,
   runtimeMethods.modelEffortSet,
@@ -51,6 +55,7 @@ export const sessionScopedMethods = new Set([
   runtimeMethods.goalSet,
   runtimeMethods.goalStatus,
   runtimeMethods.goalClear,
+  runtimeMethods.contextInspect,
 ]);
 
 export const turnScopedMethods = new Set([

package/lib/send.js

@@ -0,0 +1,53 @@
+import { sendIpc } from "./ipc.js";
+import { paint } from "./theme.js";
+
+export const sendHelp = [
+  "Usage: rind send --session <id> \"<prompt>\"",
+  "",
+  "Sends a prompt to the running rind session with that id. Find the id in",
+  "the target session's startup banner or /status. Delivery is acknowledged",
+  "immediately; the reply appears in that session.",
+].join("\n");
+
+export function parseSendArgs(args) {
+  const result = { prompt: null, session: null };
+  for (let index = 1; index < args.length; index += 1) {
+    const flag = args[index];
+    if (flag === "--session") {
+      const value = args[index + 1];
+      if (value === undefined || value.startsWith("--")) {
+        throw new Error("--session requires a value.");
+      }
+      index += 1;
+      if (result.session !== null) throw new Error("--session may only be specified once.");
+      if (!/^[A-Za-z0-9_-]+$/.test(value)) throw new Error("Invalid session id.");
+      result.session = value;
+      continue;
+    }
+    if (flag.startsWith("--")) {
+      throw new Error(`Unknown send option: ${flag}`);
+    }
+    if (result.prompt !== null) {
+      throw new Error("send accepts exactly one prompt.");
+    }
+    result.prompt = flag;
+  }
+  if (!result.session) {
+    throw new Error("send requires --session <id>.");
+  }
+  if (!String(result.prompt || "").trim()) {
+    throw new Error("send requires a non-empty prompt.");
+  }
+  return result;
+}
+
+export async function runSend({ args, stdout = process.stdout, stderr = process.stderr }) {
+  const options = parseSendArgs(args);
+  const result = await sendIpc({ session: options.session, input: options.prompt });
+  if (!result.ok) {
+    stderr.write(`${result.message}\n`);
+    return 1;
+  }
+  stdout.write(`${paint.success("✓")} sent to rind · session ${options.session}\n`);
+  return 0;
+}

package/lib/task-monitor-controller.js

@@ -16,11 +16,11 @@ export function createTaskMonitorController({
   let refreshTimer = null;
   let listInFlight = null;
   let monitorTimer = null;
-  let monitorPollInFlight = false;
-  let monitor = null;
-  let monitorInputWasActive = false;
-  let generation = 0;
-  let pollToken = 0;
+  let monitorPollInFlight = false;
+  let monitor = null;
+  let monitorInputWasActive = false;
+  let generation = 0;
+  let pollToken = 0;
 
   function refresh() {
     if (!terminalUi || state.runtimeClosing) {
@@ -29,12 +29,12 @@ export function createTaskMonitorController({
     if (listInFlight) {
       return listInFlight;
     }
-    const requestGeneration = generation;
-    const promise = request(runtimeMethods.backgroundList)
-      .then((result) => {
-        if (requestGeneration !== generation) {
-          return;
-        }
+    const requestGeneration = generation;
+    const promise = request(runtimeMethods.backgroundList)
+      .then((result) => {
+        if (requestGeneration !== generation) {
+          return;
+        }
         const listed = Array.isArray(result?.tasks) ? result.tasks : [];
         const ids = new Set();
         for (const task of listed) {
@@ -50,19 +50,19 @@ export function createTaskMonitorController({
             tasks.delete(bgId);
           }
         }
-        updateCount();
-        if (monitor) {
-          monitor.selectedIndex = clampIndex(monitor.selectedIndex);
-          redraw();
-        }
-      })
-      .finally(() => {
-        if (listInFlight === promise) {
-          listInFlight = null;
-        }
-      });
-    listInFlight = promise;
-    return promise;
+        updateCount();
+        if (monitor) {
+          monitor.selectedIndex = clampIndex(monitor.selectedIndex);
+          redraw();
+        }
+      })
+      .finally(() => {
+        if (listInFlight === promise) {
+          listInFlight = null;
+        }
+      });
+    listInFlight = promise;
+    return promise;
   }
 
   function updateCount() {
@@ -104,12 +104,12 @@ export function createTaskMonitorController({
     refreshTimer = null;
   }
 
-  function clear() {
-    generation += 1;
-    listInFlight = null;
-    pollToken += 1;
-    monitorPollInFlight = false;
-    tasks.clear();
+  function clear() {
+    generation += 1;
+    listInFlight = null;
+    pollToken += 1;
+    monitorPollInFlight = false;
+    tasks.clear();
     pendingCommands.clear();
     delegates.clear();
     stopRefresh();
@@ -266,15 +266,15 @@ export function createTaskMonitorController({
     if (!selected?.bg_id) {
       return;
     }
-    const requestGeneration = generation;
-    const requestToken = ++pollToken;
-    monitorPollInFlight = true;
+    const requestGeneration = generation;
+    const requestToken = ++pollToken;
+    monitorPollInFlight = true;
     try {
       const result = await request(runtimeMethods.backgroundOutput, {
         bg_id: selected.bg_id,
         max_output_chars: 20000,
       });
-      if (requestGeneration === generation && result?.task && typeof result.task === "object") {
+      if (requestGeneration === generation && result?.task && typeof result.task === "object") {
         tasks.set(selected.bg_id, {
           ...selected,
           ...result.task,
@@ -285,10 +285,10 @@ export function createTaskMonitorController({
       }
     } catch {
       // Periodic list refresh reconciles expired tasks without interrupting input.
-    } finally {
-      if (requestToken === pollToken) {
-        monitorPollInFlight = false;
-      }
+    } finally {
+      if (requestToken === pollToken) {
+        monitorPollInFlight = false;
+      }
     }
   }
 
@@ -369,12 +369,12 @@ export function createTaskMonitorController({
     };
   }
 
-  function stop() {
-    generation += 1;
-    listInFlight = null;
-    pollToken += 1;
-    monitorPollInFlight = false;
-    stopRefresh();
+  function stop() {
+    generation += 1;
+    listInFlight = null;
+    pollToken += 1;
+    monitorPollInFlight = false;
+    stopRefresh();
     stopMonitorPolling();
     monitor = null;
     pendingCommands.clear();
@@ -390,7 +390,7 @@ export function createTaskMonitorController({
     return tasks.size ? "background" : "delegates";
   }
 
-  function clampIndex(index, page = monitor?.page || "background") {
+  function clampIndex(index, page = monitor?.page || "background") {
     const count = pageItems(page).length;
     if (!count) {
       return 0;

package/lib/terminal-key.js

@@ -44,12 +44,40 @@ export function parseTerminalKey(raw = "") {
     return { kind: "text", name: "", text: value };
   }
 
-  const modifiedArrow = value.match(/^\x1b\[1;([2-8])([ABCDHF])$/);
+  const kitty = value.match(/^\x1b\[(\d+)(?::(\d*))?(?::(\d+))?(?:;(\d+))?(?::(\d+))?u$/);
+  if (kitty) {
+    const codepoint = Number(kitty[1]);
+    const shiftedCodepoint = kitty[2] ? Number(kitty[2]) : codepoint;
+    const modifier = Number(kitty[4] || 1);
+    if (kitty[5] === "3") {
+      return null;
+    }
+    const special = kittySpecialKey(codepoint, modifier);
+    if (special) {
+      return special;
+    }
+    if (codepoint < 32 || codepoint === 127) {
+      return null;
+    }
+    const character = String.fromCodePoint(shiftedCodepoint);
+    if (modifier === 1 || modifier === 2) {
+      return { kind: "text", name: "", text: character };
+    }
+    return key(character.toLowerCase(), modifier);
+  }
+
+  const modifiedArrow = value.match(/^\x1b\[1;([0-9]+)(?::([1-3]))?([ABCDHF])$/);
   if (modifiedArrow) {
-    return key(ARROW_KEYS[modifiedArrow[2]], Number(modifiedArrow[1]));
+    if (modifiedArrow[2] === "3") {
+      return null;
+    }
+    return key(ARROW_KEYS[modifiedArrow[3]], Number(modifiedArrow[1]));
   }
-  const tilde = value.match(/^\x1b\[([0-9]+)(?:;([2-8]))?~$/);
+  const tilde = value.match(/^\x1b\[([0-9]+)(?:;([0-9]+))?(?::([1-3]))?~$/);
   if (tilde) {
+    if (tilde[3] === "3") {
+      return null;
+    }
     return Number(tilde[1]) === 3 ? key("delete", Number(tilde[2] || 1)) : null;
   }
   const csiKey = value.match(/^\x1b\[([ABCDHFZ])$/);
@@ -95,3 +123,19 @@ function key(name, modifier = 1) {
     text: "",
   };
 }
+
+function kittySpecialKey(codepoint, modifier) {
+  if (codepoint === 13) {
+    return key("enter", modifier);
+  }
+  if (codepoint === 9) {
+    return key("tab", modifier);
+  }
+  if (codepoint === 127) {
+    return key("backspace", modifier);
+  }
+  if (codepoint === 27) {
+    return key("escape", modifier);
+  }
+  return null;
+}

package/lib/text-width.js

@@ -4,6 +4,8 @@ const segmenter = typeof Intl?.Segmenter === "function"
   ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
   : null;
 
+export const ANSI_SEQUENCE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+
 export function stripAnsi(value) {
   return String(value || "").replace(ANSI_RE, "");
 }
@@ -82,25 +84,6 @@ export function truncateToWidth(value, maxWidth, ellipsis = "...") {
   return `${takeStartCells(text, maxWidth - suffixWidth)}${ellipsis}`;
 }
 
-export function expandTabs(value, tabWidth = 4) {
-  const text = String(value || "");
-  if (!text.includes("\t")) {
-    return text;
-  }
-  let column = 0;
-  let output = "";
-  for (const segment of graphemes(text)) {
-    if (segment === "\t") {
-      const spaces = tabWidth - (column % tabWidth);
-      output += " ".repeat(spaces);
-      column += spaces;
-      continue;
-    }
-    output += segment;
-    column += segmentWidth(segment);
-  }
-  return output;
-}
 
 export function wrapTextWithAnsi(value, firstWidth, continuationWidth = firstWidth) {
   const source = String(value ?? "");

package/lib/tool-display.js

@@ -133,7 +133,7 @@ function resultDataFromRaw(result) {
   };
 }
 
-export function renderToolRunning(context, width) {
+export function renderToolRunning(context, width) {
   const renderer = TOOL_RENDERERS[context.name] || GENERIC_RENDERER;
   const elapsedSeconds = Math.floor((context.elapsedMs || 0) / 1000);
   const elapsed = ELAPSED_TITLE_TOOLS.has(context.name) ? dim(` · ${elapsedSeconds}s`) : "";
@@ -143,8 +143,8 @@ export function renderToolRunning(context, width) {
   if (context.progressMessage) {
     lines.push(dim(`    ↳ ${clipText(context.progressMessage, width, 8)}`));
   }
-  return indentToolLines(lines, width);
-}
+  return indentToolLines(lines, width);
+}
 
 export function renderToolFinished(context, width) {
   const renderer = TOOL_RENDERERS[context.name] || GENERIC_RENDERER;
@@ -152,10 +152,10 @@ export function renderToolFinished(context, width) {
   const lines = [clipCells(renderer.finished(context, width, state), Math.max(1, width))];
   if (state.kind === "error") {
     const detail = errorDetail(context.event, width);
-    if (detail) {
-      lines.push(detail);
-    }
-    return indentToolLines(lines, width);
+    if (detail) {
+      lines.push(detail);
+    }
+    return indentToolLines(lines, width);
   }
   const bodyLimit = context.expanded ? EXPANDED_HARD_CAPS[context.name] ?? 200 : COLLAPSED_BODY_CAPS[context.name] ?? 0;
   const produced = renderer.body ? renderer.body(context, width, bodyLimit) : [];
@@ -164,20 +164,20 @@ export function renderToolFinished(context, width) {
     if (normalized.total > 0) {
       lines.push(bodyFooter(normalized.total, context.expanded));
     }
-    return indentToolLines(lines, width);
+    return indentToolLines(lines, width);
   }
   lines.push(...normalized.lines);
   const hidden = Math.max(0, normalized.total - normalized.lines.length);
   if (hidden > 0) {
     lines.push(bodyFooter(hidden, context.expanded));
   }
-  return indentToolLines(lines, width);
-}
-
-function indentToolLines(lines, width) {
-  const limit = Math.max(1, Number(width) || 1);
-  return lines.map((line) => clipCells(`  ${line}`, limit));
-}
+  return indentToolLines(lines, width);
+}
+
+function indentToolLines(lines, width) {
+  const limit = Math.max(1, Number(width) || 1);
+  return lines.map((line) => clipCells(`  ${line}`, limit));
+}
 
 function normalizeBody(produced) {
   if (Array.isArray(produced)) {
@@ -233,7 +233,7 @@ function durationPart(name, event) {
   return dim(` · ${formatDuration(event?.duration_ms)}`);
 }
 
-function formatDuration(durationMs) {
+export function formatDuration(durationMs) {
   const value = Number(durationMs || 0);
   if (!Number.isFinite(value) || value <= 0) {
     return "0ms";
@@ -388,12 +388,12 @@ const BASH_RENDERER = {
 
 const BASH_OUTPUT_RENDERER = {
   runningMain(context, width) {
-    return `${bold("bg")} ${bgIdArg(context.args.bg_id, width, 10)}`;
+    return `${bold("bg")} ${commandArg(context.args.bg_id, width, 10)}`;
   },
   finished(context, width, state) {
     const { data } = resultData(context);
     const id = context.args.bg_id || data.bg_id;
-    let main = `${bold("bg")} ${bgIdArg(id, width, 14)}`;
+    let main = `${bold("bg")} ${commandArg(id, width, 14)}`;
     if (state.kind === "cancelled") {
       main += ` ${dim("(cancelled)")}`;
     }
@@ -658,11 +658,6 @@ function commandArg(value, width, reserve) {
   return text ? clipText(text, width, reserve) : dim("…");
 }
 
-function bgIdArg(value, width, reserve) {
-  const text = singleLineText(value);
-  return text ? clipText(text, width, reserve) : dim("…");
-}
-
 export const TOOL_RENDERERS = {
   bash: BASH_RENDERER,
   bash_output: BASH_OUTPUT_RENDERER,

package/lib/tui/cursor.js

@@ -1,7 +1,9 @@
 import { CURSOR_MARKER } from "./tui.js";
+
+// Non-global: String.match must expose match.index for cursor placement.
+const ANSI_SEQUENCE = /\[[0-?]*[ -/]*[@-~]/;
 import { graphemes, textWidth } from "../text-width.js";
 
-const ANSI_SEQUENCE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
 
 export function insertCursorMarker(line, column) {
   const text = String(line || "");
@@ -16,14 +18,21 @@ export function insertCursorMarker(line, column) {
         continue;
       }
     }
-    const codePoint = text.codePointAt(position);
-    const segment = String.fromCodePoint(codePoint);
-    const segmentWidth = textWidth(segment);
-    if (width + segmentWidth > target) {
-      break;
+    const ansiIndex = text.indexOf("\x1b", position);
+    const end = ansiIndex === -1 ? text.length : ansiIndex;
+    const content = text.slice(position, end);
+    if (!content) {
+      position += 1;
+      continue;
+    }
+    for (const segment of graphemes(content)) {
+      const segmentWidth = textWidth(segment);
+      if (width + segmentWidth > target) {
+        return `${text.slice(0, position)}${CURSOR_MARKER}${text.slice(position)}`;
+      }
+      width += segmentWidth;
+      position += segment.length;
     }
-    width += segmentWidth;
-    position += segment.length;
   }
   return `${text.slice(0, position)}${CURSOR_MARKER}${text.slice(position)}`;
 }

package/lib/tui/input-buffer.js

@@ -3,6 +3,42 @@ const PASTE_START = "\x1b[200~";
 const PASTE_END = "\x1b[201~";
 const DEFAULT_INPUT_TIMEOUT_MS = 10;
 
+function sequenceStatus(value) {
+  if (!value.startsWith(ESC)) {
+    return "not-escape";
+  }
+  if (value.length === 1) {
+    return "incomplete";
+  }
+
+  const type = value[1];
+  if (type === "[") {
+    if (value.startsWith(`${ESC}[M`)) {
+      return value.length >= 6 ? "complete" : "incomplete";
+    }
+    return csiStatus(value);
+  }
+  if (type === "O") {
+    return value.length >= 3 ? "complete" : "incomplete";
+  }
+  if (type === "]" || type === "P" || type === "_") {
+    return value.includes("\x07") || value.includes(`${ESC}\\`) ? "complete" : "incomplete";
+  }
+  const codepoint = value.codePointAt(1);
+  if (codepoint >= 0xd800 && codepoint <= 0xdbff && value.length < 3) {
+    return "incomplete";
+  }
+  return "complete";
+}
+
+function csiStatus(value) {
+  if (value.length < 3) {
+    return "incomplete";
+  }
+  const final = value.charCodeAt(value.length - 1);
+  return final >= 0x40 && final <= 0x7e ? "complete" : "incomplete";
+}
+
 export function createInputBuffer(options = {}) {
   const onSequence = typeof options.onSequence === "function" ? options.onSequence : () => {};
   const onPaste = typeof options.onPaste === "function" ? options.onPaste : () => {};
@@ -14,6 +50,7 @@ export function createInputBuffer(options = {}) {
   let timer = null;
   let pasteMode = false;
   let pasteBuffer = "";
+  let pendingKittyCodepoint = null;
 
   function feed(data) {
     const value = Buffer.isBuffer(data) ? data.toString("utf8") : String(data || "");
@@ -39,6 +76,7 @@ export function createInputBuffer(options = {}) {
     buffer = "";
     pasteMode = false;
     pasteBuffer = "";
+    pendingKittyCodepoint = null;
   }
 
   function clearTimer() {
@@ -50,9 +88,20 @@ export function createInputBuffer(options = {}) {
   }
 
   function emit(sequence) {
-    if (sequence) {
-      onSequence(sequence);
+    if (!sequence) {
+      return;
+    }
+    if (pendingKittyCodepoint !== null) {
+      const codepoint = sequence.codePointAt(0);
+      if (!sequence.startsWith(ESC) && sequence.length === String.fromCodePoint(codepoint).length && codepoint === pendingKittyCodepoint) {
+        pendingKittyCodepoint = null;
+        return;
+      }
+      pendingKittyCodepoint = null;
     }
+    onSequence(sequence);
+    const kittyPrintable = sequence.match(/^\x1b\[(\d+)u$/);
+    pendingKittyCodepoint = kittyPrintable ? Number(kittyPrintable[1]) : null;
   }
 
   function processBuffer() {
@@ -77,6 +126,7 @@ export function createInputBuffer(options = {}) {
       pasteMode = true;
       pasteBuffer = pasteContent;
       buffer = "";
+      pendingKittyCodepoint = null;
       const endIndex = pasteBuffer.indexOf(PASTE_END);
       if (endIndex !== -1) {
         finishPaste(endIndex);
@@ -92,6 +142,7 @@ export function createInputBuffer(options = {}) {
     const remaining = pasteBuffer.slice(endIndex + PASTE_END.length);
     pasteMode = false;
     pasteBuffer = "";
+    pendingKittyCodepoint = null;
     onPaste(content);
     if (remaining) {
       feed(remaining);
@@ -130,10 +181,18 @@ export function splitSequences(value) {
       continue;
     }
 
-    const end = findEscapeEnd(value, position);
+    let end = findEscapeEnd(value, position);
     if (end === -1) {
       return { sequences, remainder: value.slice(position) };
     }
+    if (value.slice(position, end) === `${ESC}${ESC}`) {
+      const next = value[end];
+      if (["[", "]", "O", "P", "_"].includes(next)) {
+        sequences.push(ESC);
+        position += 1;
+        continue;
+      }
+    }
     sequences.push(value.slice(position, end));
     position = end;
   }
@@ -141,32 +200,14 @@ export function splitSequences(value) {
 }
 
 function findEscapeEnd(value, start) {
-  if (start + 1 >= value.length) {
-    return -1;
-  }
-  const type = value[start + 1];
-  if (type === "[") {
-    for (let index = start + 2; index < value.length; index += 1) {
-      const code = value.charCodeAt(index);
-      if (code >= 0x40 && code <= 0x7e) {
-        return index + 1;
-      }
-    }
-    return -1;
-  }
-  if (type === "O") {
-    return start + 3 <= value.length ? start + 3 : -1;
-  }
-  if (type === "]" || type === "P" || type === "_") {
-    const bell = value.indexOf("\x07", start + 2);
-    const stringTerminator = value.indexOf(`${ESC}\\`, start + 2);
-    if (bell === -1 && stringTerminator === -1) {
-      return -1;
+  for (let end = start + 1; end <= value.length; end += 1) {
+    const status = sequenceStatus(value.slice(start, end));
+    if (status === "complete") {
+      return end;
     }
-    if (bell !== -1 && (stringTerminator === -1 || bell < stringTerminator)) {
-      return bell + 1;
+    if (status === "not-escape") {
+      return start + 1;
     }
-    return stringTerminator + 2;
   }
-  return start + 1 + String.fromCodePoint(value.codePointAt(start + 1)).length;
+  return -1;
 }