codeam-cli 1.3.8 → 1.4.0

package/dist/index.js

@@ -114,7 +114,7 @@ var import_picocolors = __toESM(require("picocolors"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "1.3.8",
+  version: "1.4.0",
   description: "Remote control Claude Code from your mobile device",
   main: "dist/index.js",
   bin: {
@@ -802,32 +802,41 @@ var ClaudeService = class {
     this.strategy.write(text + "\r");
   }
   /**
-   * Navigate a React Ink selector to the given 0-based index and confirm.
+   * Navigate a React Ink selector to the given 0-based target index and confirm.
+   *
+   * `fromIndex` is the current highlighted position (defaults to 0 for
+   * numbered selectors which always start at the first option). For list-style
+   * selectors (e.g. /mcp), the CLI sends `currentIndex` in the select_prompt
+   * chunk so the client can pass it back here as `fromIndex`, enabling both
+   * up-arrow and down-arrow navigation without always rewinding to position 0.
    *
    * Why not sendCommand(arrows + Enter) in one write()?
    * All bytes arrive as one chunk → readline fires all keypress events in the
    * same synchronous run → React Ink batches the state updates → each arrow
    * sees selectedIndex=0 → final state is still 0 or 1 → wrong option selected.
    *
-   * Fix: send each down-arrow in a separate write(), ARROW_MS apart, so React
-   * has time to process and re-render between each keystroke. Enter is sent
+   * Fix: send each arrow in a separate write(), ARROW_MS apart, so React has
+   * time to process and re-render between each keystroke.  Enter is sent
    * ENTER_MS after the last arrow.
    */
-  selectOption(index) {
-    if (index <= 0) {
+  selectOption(targetIndex, fromIndex = 0) {
+    const delta = targetIndex - fromIndex;
+    const steps = Math.abs(delta);
+    const arrow = delta >= 0 ? "\x1B[B" : "\x1B[A";
+    const ARROW_MS = 80;
+    const ENTER_MS = 200;
+    if (steps === 0) {
       this.strategy.write("\r");
       return;
     }
-    const ARROW_MS = 80;
-    const ENTER_MS = 200;
-    for (let i = 0; i < index; i++) {
+    for (let i = 0; i < steps; i++) {
       setTimeout(() => {
-        this.strategy.write("\x1B[B");
+        this.strategy.write(arrow);
       }, i * ARROW_MS);
     }
     setTimeout(() => {
       this.strategy.write("\r");
-    }, index * ARROW_MS + ENTER_MS);
+    }, steps * ARROW_MS + ENTER_MS);
   }
   /** Send Escape key to Claude (cancels interactive prompts). */
   sendEscape() {
@@ -953,10 +962,14 @@ function renderToLines(raw) {
 }
 function detectSelector(lines) {
   if (lines.some((l) => /\?\s+for\s+shortcuts/i.test(l.trim()))) return null;
-  if (!lines.some((l) => /^❯\s*\d+\./.test(l.trim()))) return null;
+  const clean = lines.map(
+    (l) => l.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "").replace(/\s*[│╭╰╮╯┌└┐┘├┤┬┴┼─━═]+\s*$/, "")
+    // strip trailing fill + border
+  );
+  if (!clean.some((l) => /^❯\s*\d+\./.test(l.trim()))) return null;
   let optionStartIdx = -1;
-  for (let i = 0; i < lines.length; i++) {
-    if (/^(?:❯\s*)?\d+\.\s/.test(lines[i].trim())) {
+  for (let i = 0; i < clean.length; i++) {
+    if (/^(?:❯\s*)?\d+\.\s/.test(clean[i].trim())) {
       optionStartIdx = i;
       break;
     }
@@ -964,7 +977,7 @@ function detectSelector(lines) {
   if (optionStartIdx === -1) return null;
   const questionParts = [];
   for (let i = 0; i < optionStartIdx; i++) {
-    const t = lines[i].trim();
+    const t = clean[i].trim();
     if (!t) continue;
     if (/^[─━—═\-]{3,}$/.test(t)) continue;
     if (/^\[.*\]$/.test(t)) continue;
@@ -975,8 +988,8 @@ function detectSelector(lines) {
   const optionLabels = /* @__PURE__ */ new Map();
   const optionDescs = /* @__PURE__ */ new Map();
   let currentNum = -1;
-  for (let i = optionStartIdx; i < lines.length; i++) {
-    const t = lines[i].trim();
+  for (let i = optionStartIdx; i < clean.length; i++) {
+    const t = clean[i].trim();
     if (!t) continue;
     const m = t.match(/^(?:❯\s*)?(\d+)\.\s+(.+)/);
     if (m) {
@@ -986,7 +999,7 @@ function detectSelector(lines) {
         optionDescs.set(num, []);
       }
       currentNum = num;
-    } else if (currentNum !== -1 && !/^Enter to/i.test(t) && !/^[─━—═\-]{3,}$/.test(t) && !/↑.*↓.*navigate/i.test(t) && !/Esc to cancel/i.test(t)) {
+    } else if (currentNum !== -1 && !/^Enter to/i.test(t) && !/^[─━—═\-]{3,}$/.test(t) && !/↑.*↓.*navigate/i.test(t) && !/Esc to/i.test(t)) {
       optionDescs.get(currentNum)?.push(t);
     }
   }
@@ -995,7 +1008,60 @@ function detectSelector(lines) {
   return {
     question,
     options: keys.map((k) => optionLabels.get(k)),
-    optionDescriptions: keys.map((k) => (optionDescs.get(k) ?? []).join(" ").trim())
+    optionDescriptions: keys.map((k) => (optionDescs.get(k) ?? []).join(" ").trim()),
+    currentIndex: 0
+  };
+}
+function detectListSelector(lines) {
+  if (!lines.some((l) => /[↑↓].*navigate/i.test(l.trim()))) return null;
+  if (lines.some((l) => /^❯\s*\d+\./.test(l.trim()))) return null;
+  if (!lines.some((l) => /^\s+❯\s+\S/.test(l))) return null;
+  const isSelected = (line) => /^\s+❯\s+\S/.test(line);
+  const isUnselected = (line) => /^    \S/.test(line);
+  const isItem = (line) => isSelected(line) || isUnselected(line);
+  let optionStartIdx = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (isItem(lines[i])) {
+      optionStartIdx = i;
+      break;
+    }
+  }
+  if (optionStartIdx === -1) return null;
+  const questionParts = [];
+  for (let i = 0; i < optionStartIdx; i++) {
+    const t = lines[i].trim();
+    if (!t) continue;
+    if (/^[─━—═\-]{3,}$/.test(t)) continue;
+    if (/[┌└│┐┘├┤┬┴┼]/.test(t)) {
+      const inner = t.replace(/[│┌└┐┘├┤┬┴┼─]/g, "").trim();
+      if (inner) questionParts.push(inner);
+      continue;
+    }
+    if (/^[>❯]\s/.test(t)) continue;
+    if (/[↑↓].*navigate/i.test(t)) continue;
+    questionParts.push(t);
+  }
+  const question = questionParts.join(" ").trim();
+  const options = [];
+  let currentIndex = 0;
+  for (const line of lines.slice(optionStartIdx)) {
+    const t = line.trim();
+    if (!t) continue;
+    if (/[↑↓].*navigate/i.test(t)) break;
+    if (/^[─━—═\-]{3,}$/.test(t)) continue;
+    if (isSelected(line)) {
+      currentIndex = options.length;
+      options.push(t.replace(/^❯\s+/, "").trim());
+    } else if (isUnselected(line)) {
+      options.push(t);
+    }
+  }
+  if (options.length < 2) return null;
+  return {
+    question,
+    options,
+    optionDescriptions: options.map(() => ""),
+    currentIndex
   };
 }
 function filterChrome(lines) {
@@ -1077,13 +1143,13 @@ var OutputService = class _OutputService {
       return;
     }
     const lines = renderToLines(this.rawBuffer);
-    const selector = detectSelector(lines);
+    const selector = detectSelector(lines) ?? detectListSelector(lines);
     if (selector) {
       const idleMs2 = this.lastPushTime > 0 ? now - this.lastPushTime : elapsed;
       if (idleMs2 >= _OutputService.SELECTOR_IDLE_MS) {
         this.stopPoll();
         this.active = false;
-        this.postChunk({ type: "select_prompt", content: selector.question, options: selector.options, optionDescriptions: selector.optionDescriptions, done: true }).catch(() => {
+        this.postChunk({ type: "select_prompt", content: selector.question, options: selector.options, optionDescriptions: selector.optionDescriptions, currentIndex: selector.currentIndex, done: true }).catch(() => {
         });
       }
       return;
@@ -1106,11 +1172,11 @@ var OutputService = class _OutputService {
   }
   finalize() {
     const lines = renderToLines(this.rawBuffer);
-    const selector = detectSelector(lines);
+    const selector = detectSelector(lines) ?? detectListSelector(lines);
     this.stopPoll();
     this.active = false;
     if (selector) {
-      this.postChunk({ type: "select_prompt", content: selector.question, options: selector.options, optionDescriptions: selector.optionDescriptions, done: true }).catch(() => {
+      this.postChunk({ type: "select_prompt", content: selector.question, options: selector.options, optionDescriptions: selector.optionDescriptions, currentIndex: selector.currentIndex, done: true }).catch(() => {
       });
     } else {
       const content = filterChrome(lines).join("\n").replace(/\n{3,}/g, "\n\n").trim();
@@ -1232,8 +1298,9 @@ async function start() {
       }
       case "select_option": {
         const index = cmd.payload.index ?? 0;
+        const from = cmd.payload.from ?? 0;
         outputSvc.newTurn();
-        claude.selectOption(index);
+        claude.selectOption(index, from);
         break;
       }
       case "escape_key":
@@ -1279,8 +1346,9 @@ async function start() {
         if (input) sendPrompt(input);
       } else if (cmdType === "select_option") {
         const index = inner.index ?? 0;
+        const from = inner.from ?? 0;
         outputSvc.newTurn();
-        claude.selectOption(index);
+        claude.selectOption(index, from);
       } else if (cmdType === "escape_key") {
         outputSvc.newTurn();
         claude.sendEscape();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "description": "Remote control Claude Code from your mobile device",
   "main": "dist/index.js",
   "bin": {