codeam-cli 1.3.7 → 1.3.9

package/dist/index.js

@@ -24,9 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/commands/start.ts
-var fs3 = __toESM(require("fs"));
+var fs4 = __toESM(require("fs"));
 var os4 = __toESM(require("os"));
-var path3 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var import_crypto = require("crypto");
 var import_picocolors2 = __toESM(require("picocolors"));
 
@@ -114,7 +114,7 @@ var import_picocolors = __toESM(require("picocolors"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "1.3.7",
+  version: "1.3.9",
   description: "Remote control Claude Code from your mobile device",
   main: "dist/index.js",
   bin: {
@@ -511,11 +511,27 @@ var CommandRelayService = class {
   }
 };
 
-// src/services/claude.service.ts
-var import_child_process = require("child_process");
+// src/services/pty/types.ts
 var fs2 = __toESM(require("fs"));
-var os3 = __toESM(require("os"));
 var path2 = __toESM(require("path"));
+function findInPath(name) {
+  const dirs = (process.env.PATH ?? "").split(path2.delimiter);
+  for (const dir of dirs) {
+    const full = `${dir}/${name}`;
+    try {
+      fs2.accessSync(full, fs2.constants.X_OK);
+      return full;
+    } catch {
+    }
+  }
+  return null;
+}
+
+// src/services/pty/unix.strategy.ts
+var import_child_process = require("child_process");
+var fs3 = __toESM(require("fs"));
+var os3 = __toESM(require("os"));
+var path3 = __toESM(require("path"));
 var PYTHON_PTY_HELPER = `import os,pty,sys,select,signal,struct,fcntl,termios,errno
 m,s=pty.openpty()
 try:
@@ -571,53 +587,30 @@ try:
     sys.exit((st>>8)&0xFF)
 except Exception:sys.exit(0)
 `;
-var ClaudeService = class {
+var UnixPtyStrategy = class {
   constructor(opts) {
     this.opts = opts;
   }
   opts;
   proc = null;
   helperPath = null;
-  spawn() {
-    if (this.proc) {
-      this.cleanup();
-      this.proc.kill();
-      this.proc = null;
-    }
-    if (!findInPath("claude") && !findInPath("claude-code")) {
-      console.error(
-        "\n  \u2717 claude not found in PATH.\n    Install it with: npm install -g @anthropic-ai/claude-code\n"
-      );
-      process.exit(1);
-    }
-    const claudeCmd = findInPath("claude") ? "claude" : "claude-code";
-    if (process.platform === "win32") {
-      this.spawnDirect(claudeCmd);
-    } else {
-      this.spawnWithPty(claudeCmd);
-    }
-  }
-  /**
-   * macOS / Linux: use a Python PTY helper to give Claude a real TTY.
-   * Falls back to direct spawn if python3 is not available.
-   */
-  spawnWithPty(claudeCmd) {
+  spawn(cmd, cwd) {
     const python = findInPath("python3") ?? findInPath("python");
     if (!python) {
       console.error(
         "  \xB7 python3 not found; mobile command injection may be limited.\n"
       );
-      this.spawnDirect(claudeCmd);
+      this.spawnDirect(cmd, cwd);
       return;
     }
     const shell = process.env.SHELL || "/bin/sh";
     const cols = process.stdout.columns || 220;
     const rows = process.stdout.rows || 50;
-    this.helperPath = path2.join(os3.tmpdir(), "codeam-pty-helper.py");
-    fs2.writeFileSync(this.helperPath, PYTHON_PTY_HELPER, { mode: 420 });
-    this.proc = (0, import_child_process.spawn)(python, [this.helperPath, shell, "-c", `exec ${claudeCmd}`], {
+    this.helperPath = path3.join(os3.tmpdir(), "codeam-pty-helper.py");
+    fs3.writeFileSync(this.helperPath, PYTHON_PTY_HELPER, { mode: 420 });
+    this.proc = (0, import_child_process.spawn)(python, [this.helperPath, shell, "-c", `exec ${cmd}`], {
       stdio: ["pipe", "pipe", "inherit"],
-      cwd: this.opts.cwd,
+      cwd,
       env: {
         ...process.env,
         TERM: "xterm-256color",
@@ -636,7 +629,7 @@ var ClaudeService = class {
     });
     this.proc.stdout?.on("data", (chunk) => {
       process.stdout.write(chunk);
-      this.opts.onData?.(chunk.toString("utf8"));
+      this.opts.onData(chunk.toString("utf8"));
     });
     if (process.stdin.isTTY) process.stdin.setRawMode(true);
     process.stdin.resume();
@@ -644,18 +637,18 @@ var ClaudeService = class {
     process.on("SIGWINCH", this.handleResize);
     this.proc.on("exit", (code) => {
       this.removeTempFile();
-      this.cleanup();
+      this.dispose();
       this.opts.onExit(code ?? 0);
     });
   }
   /**
-   * Windows (or Python-unavailable) fallback: direct spawn without PTY.
-   * Mobile command injection is limited on Windows.
+   * Python-unavailable fallback: direct spawn without PTY.
+   * Mobile command injection is limited (no real TTY for Claude).
    */
-  spawnDirect(claudeCmd) {
-    this.proc = (0, import_child_process.spawn)(claudeCmd, [], {
+  spawnDirect(cmd, cwd) {
+    this.proc = (0, import_child_process.spawn)(cmd, [], {
       stdio: ["pipe", "inherit", "inherit"],
-      cwd: this.opts.cwd,
+      cwd,
       env: process.env,
       shell: true
     });
@@ -674,54 +667,27 @@ var ClaudeService = class {
     process.stdin.on("data", this.stdinHandler);
     process.on("SIGWINCH", this.handleResize);
     this.proc.on("exit", (code) => {
-      this.cleanup();
+      this.dispose();
       this.opts.onExit(code ?? 0);
     });
   }
-  /** Send a command to Claude's stdin (remote control from mobile). */
-  sendCommand(text) {
-    this.proc?.stdin?.write(text + "\r");
-  }
-  /**
-   * Navigate a React Ink selector to the given 0-based index and confirm.
-   *
-   * 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
-   * ENTER_MS after the last arrow.
-   */
-  selectOption(index) {
-    if (index <= 0) {
-      this.proc?.stdin?.write("\r");
-      return;
-    }
-    const ARROW_MS = 80;
-    const ENTER_MS = 200;
-    for (let i = 0; i < index; i++) {
-      setTimeout(() => {
-        this.proc?.stdin?.write("\x1B[B");
-      }, i * ARROW_MS);
-    }
-    setTimeout(() => {
-      this.proc?.stdin?.write("\r");
-    }, index * ARROW_MS + ENTER_MS);
-  }
-  /** Send Escape key to Claude (cancels interactive prompts). */
-  sendEscape() {
-    this.proc?.stdin?.write("\x1B");
-  }
-  /** Send Ctrl+C to Claude. */
-  interrupt() {
-    this.proc?.stdin?.write("");
+  write(data) {
+    this.proc?.stdin?.write(data);
   }
   kill() {
     this.proc?.kill();
     this.removeTempFile();
-    this.cleanup();
+    this.dispose();
+  }
+  dispose() {
+    process.removeListener("SIGWINCH", this.handleResize);
+    process.stdin.removeListener("data", this.stdinHandler);
+    if (process.stdin.isTTY) {
+      try {
+        process.stdin.setRawMode(false);
+      } catch {
+      }
+    }
   }
   stdinHandler = (chunk) => {
     this.proc?.stdin?.write(chunk);
@@ -734,38 +700,156 @@ var ClaudeService = class {
       }
     }
   };
-  cleanup() {
-    process.removeListener("SIGWINCH", this.handleResize);
-    process.stdin.removeListener("data", this.stdinHandler);
-    if (process.stdin.isTTY) {
+  removeTempFile() {
+    if (this.helperPath) {
       try {
-        process.stdin.setRawMode(false);
+        fs3.unlinkSync(this.helperPath);
       } catch {
       }
+      this.helperPath = null;
     }
   }
-  removeTempFile() {
-    if (this.helperPath) {
+};
+
+// src/services/pty/windows.strategy.ts
+var import_child_process2 = require("child_process");
+var WindowsPtyStrategy = class {
+  constructor(opts) {
+    this.opts = opts;
+  }
+  opts;
+  proc = null;
+  spawn(cmd, cwd) {
+    this.proc = (0, import_child_process2.spawn)(cmd, [], {
+      stdio: ["pipe", "pipe", "inherit"],
+      cwd,
+      env: {
+        ...process.env,
+        TERM: "xterm-256color",
+        COLUMNS: "220",
+        LINES: "50"
+      },
+      shell: true
+    });
+    this.proc.on("error", (err) => {
+      console.error(
+        `
+  \u2717 Failed to launch Claude Code: ${err.message}
+    Make sure claude is correctly installed: npm install -g @anthropic-ai/claude-code
+`
+      );
+      process.exit(1);
+    });
+    this.proc.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+      this.opts.onData(chunk.toString("utf8"));
+    });
+    this.proc.stdin?.write("");
+    if (process.stdin.isTTY) process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("data", this.stdinHandler);
+    this.proc.on("exit", (code) => {
+      this.dispose();
+      this.opts.onExit(code ?? 0);
+    });
+  }
+  write(data) {
+    this.proc?.stdin?.write(data);
+  }
+  kill() {
+    this.proc?.kill();
+    this.dispose();
+  }
+  dispose() {
+    process.stdin.removeListener("data", this.stdinHandler);
+    if (process.stdin.isTTY) {
       try {
-        fs2.unlinkSync(this.helperPath);
+        process.stdin.setRawMode(false);
       } catch {
       }
-      this.helperPath = null;
     }
   }
+  stdinHandler = (chunk) => {
+    this.proc?.stdin?.write(chunk);
+  };
 };
-function findInPath(name) {
-  const dirs = (process.env.PATH ?? "").split(path2.delimiter);
-  for (const dir of dirs) {
-    const full = `${dir}/${name}`;
-    try {
-      fs2.accessSync(full, fs2.constants.X_OK);
-      return full;
-    } catch {
+
+// src/services/claude.service.ts
+var ClaudeService = class {
+  constructor(opts) {
+    this.opts = opts;
+    const strategyOpts = {
+      onData: opts.onData ?? (() => {
+      }),
+      onExit: opts.onExit
+    };
+    this.strategy = process.platform === "win32" ? new WindowsPtyStrategy(strategyOpts) : new UnixPtyStrategy(strategyOpts);
+  }
+  opts;
+  strategy;
+  spawn() {
+    if (!findInPath("claude") && !findInPath("claude-code")) {
+      console.error(
+        "\n  \u2717 claude not found in PATH.\n    Install it with: npm install -g @anthropic-ai/claude-code\n"
+      );
+      process.exit(1);
     }
+    const claudeCmd = findInPath("claude") ? "claude" : "claude-code";
+    this.strategy.spawn(claudeCmd, this.opts.cwd);
   }
-  return null;
-}
+  /** Send a command to Claude's stdin (remote control from mobile). */
+  sendCommand(text) {
+    this.strategy.write(text + "\r");
+  }
+  /**
+   * 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 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(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;
+    }
+    for (let i = 0; i < steps; i++) {
+      setTimeout(() => {
+        this.strategy.write(arrow);
+      }, i * ARROW_MS);
+    }
+    setTimeout(() => {
+      this.strategy.write("\r");
+    }, steps * ARROW_MS + ENTER_MS);
+  }
+  /** Send Escape key to Claude (cancels interactive prompts). */
+  sendEscape() {
+    this.strategy.write("\x1B");
+  }
+  /** Send Ctrl+C to Claude. */
+  interrupt() {
+    this.strategy.write("");
+  }
+  kill() {
+    this.strategy.kill();
+  }
+};
 
 // src/services/output.service.ts
 var https2 = __toESM(require("https"));
@@ -920,7 +1004,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) {
@@ -1002,13 +1139,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;
@@ -1031,11 +1168,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();
@@ -1103,8 +1240,8 @@ var OutputService = class _OutputService {
 function saveFilesTemp(files) {
   return files.filter(({ base64 }) => base64 && base64.length > 0).map(({ filename, base64 }) => {
     const safeName = filename.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 80);
-    const tmpPath = path3.join(os4.tmpdir(), `codeam-${(0, import_crypto.randomUUID)()}-${safeName}`);
-    fs3.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
+    const tmpPath = path4.join(os4.tmpdir(), `codeam-${(0, import_crypto.randomUUID)()}-${safeName}`);
+    fs4.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
     return tmpPath;
   });
 }
@@ -1140,7 +1277,7 @@ async function start() {
           setTimeout(() => {
             for (const p2 of paths) {
               try {
-                fs3.unlinkSync(p2);
+                fs4.unlinkSync(p2);
               } catch {
               }
             }
@@ -1157,8 +1294,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":
@@ -1191,7 +1329,7 @@ async function start() {
           setTimeout(() => {
             for (const p2 of paths) {
               try {
-                fs3.unlinkSync(p2);
+                fs4.unlinkSync(p2);
               } catch {
               }
             }
@@ -1204,8 +1342,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.7",
+  "version": "1.3.9",
   "description": "Remote control Claude Code from your mobile device",
   "main": "dist/index.js",
   "bin": {