claude-yes 1.21.0 → 1.22.0

package/dist/cursor-yes.js

@@ -25,7 +25,7 @@ import { hideBin } from "yargs/helpers";
 
 // dist/index.js
 import { fromReadable, fromWritable } from "from-node-stream";
-import { mkdir, writeFile } from "fs/promises";
+import { appendFile, mkdir, writeFile } from "fs/promises";
 import path from "path";
 import DIE from "phpdie";
 import sflow from "sflow";
@@ -70,7 +70,8 @@ function removeControlCharacters(str) {
 var CLI_CONFIGURES = {
   grok: {
     install: "npm install -g @vibe-kit/grok-cli",
-    ready: [/^ +│ ❯ /]
+    ready: [/^  │ ❯ /],
+    enter: [/^   1. Yes/]
   },
   claude: {
     install: "npm install -g @anthropic-ai/claude-code",
@@ -78,7 +79,7 @@ var CLI_CONFIGURES = {
     enter: [/❯ 1. Yes/, /❯ 1. Dark mode✔/, /Press Enter to continue…/],
     fatal: [
       /No conversation found to continue/,
-      /⎿ {2}Claude usage limit reached\./
+      /⎿  Claude usage limit reached\./
     ]
   },
   gemini: {
@@ -90,7 +91,10 @@ var CLI_CONFIGURES = {
   codex: {
     install: "npm install -g @openai/codex-cli",
     ready: [/⏎ send/],
-    enter: [/ > 1. Approve/, /> 1. Yes, allow Codex to work in this folder/],
+    enter: [
+      /\b▌ \> 1\. Approve and run now/,
+      /\b\> 1\. Yes, allow Codex to work in this folder/
+    ],
     fatal: [/Error: The cursor position could not be read within/],
     ensureArgs: (args) => {
       if (!args.includes("--search"))
@@ -109,7 +113,7 @@ var CLI_CONFIGURES = {
     binary: "cursor-agent",
     ready: [/\/ commands/],
     enter: [/→ Run \(once\) \(y\) \(enter\)/, /▶ \[a\] Trust this workspace/],
-    fatal: []
+    fatal: [/^  Error: You've hit your usage limit/]
   }
 };
 async function claudeYes({
@@ -165,7 +169,6 @@ async function claudeYes({
         return console.warn(`continueOnCrash is only supported for ${Object.keys(continueArgs).join(", ")} currently, not ${cli}`);
       }
       if (isFatal) {
-        console.log(`${cli} crashed with "No conversation found to continue", exiting...`);
         return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
       }
       console.log(`${cli} crashed, restarting...`);
@@ -192,6 +195,8 @@ async function claudeYes({
       console.log("[${cli}-yes] ${cli} is idle, exiting...");
       await exitAgent();
     });
+  console.log(`[${cli}-yes] Started ${cli} with args: ${[cliCommand, ...cliArgs].join(" ")}`);
+  shell.write("\x1B[1;1R");
   sflow(fromReadable(process.stdin)).map((buffer) => buffer.toString()).by({
     writable: new WritableStream({
       write: async (data) => {
@@ -206,13 +211,11 @@ async function claudeYes({
       return;
     if (text.includes("\x1B[6n"))
       return;
-    const rendered = terminalRender.render();
-    const row = rendered.split(`
-`).length + 1;
-    const col = (rendered.split(`
-`).slice(-1)[0]?.length || 0) + 1;
+    const { col, row } = terminalRender.getCursorPosition();
+    console.log(`[${cli}-yes] Responding cursor position: row=${row}, col=${col}`);
     shell.write(`\x1B[${row};${col}R`);
-  }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).lines({ EOL: "NONE" }).forEach(async (e2, i) => {
+  }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).forEach((e2) => appendFile("io.log", "output|" + JSON.stringify(e2) + `
+`)).forEach(async (e2, i) => {
     const conf = CLI_CONFIGURES[cli] || null;
     if (!conf)
       return;
@@ -221,15 +224,16 @@ async function claudeYes({
         return;
       stdinReady.ready();
     }
-    if (conf.enter?.some((rx) => e2.match(rx)))
+    if (conf.enter?.some((rx) => e2.match(rx))) {
       await sendEnter(300);
-    if (conf.fatal?.some((rx) => e2.match(rx)))
+    }
+    if (conf.fatal?.some((rx) => e2.match(rx))) {
       isFatal = true;
+      await exitAgent();
+    }
   }).run()).map((e) => removeControlCharactersFromStdout ? removeControlCharacters(e) : e).to(fromWritable(process.stdout)).then(() => null);
   if (prompt)
-    (async () => {
-      await sendMessage(prompt);
-    })();
+    await sendMessage(prompt);
   const exitCode = await pendingExitCode.promise;
   console.log(`[${cli}-yes] ${cli} exited with code ${exitCode}`);
   if (logFile) {
@@ -268,7 +272,7 @@ async function claudeYes({
   }
   function getTerminalDimensions() {
     return {
-      cols: Math.max(process.stdout.columns, 80),
+      cols: process.stdout.columns,
       rows: process.stdout.rows
     };
   }
@@ -334,5 +338,5 @@ var { exitCode, logs } = await claudeYes({
 });
 process.exit(exitCode ?? 1);
 
-//# debugId=6A4CE059DEBD884464756E2164756E21
+//# debugId=F98366DB626CC88164756E2164756E21
 //# sourceMappingURL=cli.js.map

package/dist/gemini-yes.js

@@ -25,7 +25,7 @@ import { hideBin } from "yargs/helpers";
 
 // dist/index.js
 import { fromReadable, fromWritable } from "from-node-stream";
-import { mkdir, writeFile } from "fs/promises";
+import { appendFile, mkdir, writeFile } from "fs/promises";
 import path from "path";
 import DIE from "phpdie";
 import sflow from "sflow";
@@ -70,7 +70,8 @@ function removeControlCharacters(str) {
 var CLI_CONFIGURES = {
   grok: {
     install: "npm install -g @vibe-kit/grok-cli",
-    ready: [/^ +│ ❯ /]
+    ready: [/^  │ ❯ /],
+    enter: [/^   1. Yes/]
   },
   claude: {
     install: "npm install -g @anthropic-ai/claude-code",
@@ -78,7 +79,7 @@ var CLI_CONFIGURES = {
     enter: [/❯ 1. Yes/, /❯ 1. Dark mode✔/, /Press Enter to continue…/],
     fatal: [
       /No conversation found to continue/,
-      /⎿ {2}Claude usage limit reached\./
+      /⎿  Claude usage limit reached\./
     ]
   },
   gemini: {
@@ -90,7 +91,10 @@ var CLI_CONFIGURES = {
   codex: {
     install: "npm install -g @openai/codex-cli",
     ready: [/⏎ send/],
-    enter: [/ > 1. Approve/, /> 1. Yes, allow Codex to work in this folder/],
+    enter: [
+      /\b▌ \> 1\. Approve and run now/,
+      /\b\> 1\. Yes, allow Codex to work in this folder/
+    ],
     fatal: [/Error: The cursor position could not be read within/],
     ensureArgs: (args) => {
       if (!args.includes("--search"))
@@ -109,7 +113,7 @@ var CLI_CONFIGURES = {
     binary: "cursor-agent",
     ready: [/\/ commands/],
     enter: [/→ Run \(once\) \(y\) \(enter\)/, /▶ \[a\] Trust this workspace/],
-    fatal: []
+    fatal: [/^  Error: You've hit your usage limit/]
   }
 };
 async function claudeYes({
@@ -165,7 +169,6 @@ async function claudeYes({
         return console.warn(`continueOnCrash is only supported for ${Object.keys(continueArgs).join(", ")} currently, not ${cli}`);
       }
       if (isFatal) {
-        console.log(`${cli} crashed with "No conversation found to continue", exiting...`);
         return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
       }
       console.log(`${cli} crashed, restarting...`);
@@ -192,6 +195,8 @@ async function claudeYes({
       console.log("[${cli}-yes] ${cli} is idle, exiting...");
       await exitAgent();
     });
+  console.log(`[${cli}-yes] Started ${cli} with args: ${[cliCommand, ...cliArgs].join(" ")}`);
+  shell.write("\x1B[1;1R");
   sflow(fromReadable(process.stdin)).map((buffer) => buffer.toString()).by({
     writable: new WritableStream({
       write: async (data) => {
@@ -206,13 +211,11 @@ async function claudeYes({
       return;
     if (text.includes("\x1B[6n"))
       return;
-    const rendered = terminalRender.render();
-    const row = rendered.split(`
-`).length + 1;
-    const col = (rendered.split(`
-`).slice(-1)[0]?.length || 0) + 1;
+    const { col, row } = terminalRender.getCursorPosition();
+    console.log(`[${cli}-yes] Responding cursor position: row=${row}, col=${col}`);
     shell.write(`\x1B[${row};${col}R`);
-  }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).lines({ EOL: "NONE" }).forEach(async (e2, i) => {
+  }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).forEach((e2) => appendFile("io.log", "output|" + JSON.stringify(e2) + `
+`)).forEach(async (e2, i) => {
     const conf = CLI_CONFIGURES[cli] || null;
     if (!conf)
       return;
@@ -221,15 +224,16 @@ async function claudeYes({
         return;
       stdinReady.ready();
     }
-    if (conf.enter?.some((rx) => e2.match(rx)))
+    if (conf.enter?.some((rx) => e2.match(rx))) {
       await sendEnter(300);
-    if (conf.fatal?.some((rx) => e2.match(rx)))
+    }
+    if (conf.fatal?.some((rx) => e2.match(rx))) {
       isFatal = true;
+      await exitAgent();
+    }
   }).run()).map((e) => removeControlCharactersFromStdout ? removeControlCharacters(e) : e).to(fromWritable(process.stdout)).then(() => null);
   if (prompt)
-    (async () => {
-      await sendMessage(prompt);
-    })();
+    await sendMessage(prompt);
   const exitCode = await pendingExitCode.promise;
   console.log(`[${cli}-yes] ${cli} exited with code ${exitCode}`);
   if (logFile) {
@@ -268,7 +272,7 @@ async function claudeYes({
   }
   function getTerminalDimensions() {
     return {
-      cols: Math.max(process.stdout.columns, 80),
+      cols: process.stdout.columns,
       rows: process.stdout.rows
     };
   }
@@ -334,5 +338,5 @@ var { exitCode, logs } = await claudeYes({
 });
 process.exit(exitCode ?? 1);
 
-//# debugId=6A4CE059DEBD884464756E2164756E21
+//# debugId=F98366DB626CC88164756E2164756E21
 //# sourceMappingURL=cli.js.map

package/dist/grok-yes.js

@@ -0,0 +1,342 @@
+#!/usr/bin/env node
+import { createRequire } from "node:module";
+var __create = Object.create;
+var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __toESM = (mod, isNodeMode, target) => {
+  target = mod != null ? __create(__getProtoOf(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  for (let key of __getOwnPropNames(mod))
+    if (!__hasOwnProp.call(to, key))
+      __defProp(to, key, {
+        get: () => mod[key],
+        enumerable: true
+      });
+  return to;
+};
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+
+// cli.ts
+import enhancedMs from "enhanced-ms";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+
+// dist/index.js
+import { fromReadable, fromWritable } from "from-node-stream";
+import { appendFile, mkdir, writeFile } from "fs/promises";
+import path from "path";
+import DIE from "phpdie";
+import sflow from "sflow";
+import { TerminalTextRender } from "terminal-render";
+class IdleWaiter {
+  lastActivityTime = Date.now();
+  checkInterval = 100;
+  constructor() {
+    this.ping();
+  }
+  ping() {
+    this.lastActivityTime = Date.now();
+    return this;
+  }
+  async wait(ms) {
+    while (this.lastActivityTime >= Date.now() - ms)
+      await new Promise((resolve) => setTimeout(resolve, this.checkInterval));
+  }
+}
+
+class ReadyManager {
+  isReady = false;
+  readyQueue = [];
+  wait() {
+    if (this.isReady)
+      return;
+    return new Promise((resolve) => this.readyQueue.push(resolve));
+  }
+  unready() {
+    this.isReady = false;
+  }
+  ready() {
+    this.isReady = true;
+    if (!this.readyQueue.length)
+      return;
+    this.readyQueue.splice(0).map((resolve) => resolve());
+  }
+}
+function removeControlCharacters(str) {
+  return str.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "");
+}
+var CLI_CONFIGURES = {
+  grok: {
+    install: "npm install -g @vibe-kit/grok-cli",
+    ready: [/^  │ ❯ /],
+    enter: [/^   1. Yes/]
+  },
+  claude: {
+    install: "npm install -g @anthropic-ai/claude-code",
+    ready: [/^> /],
+    enter: [/❯ 1. Yes/, /❯ 1. Dark mode✔/, /Press Enter to continue…/],
+    fatal: [
+      /No conversation found to continue/,
+      /⎿  Claude usage limit reached\./
+    ]
+  },
+  gemini: {
+    install: "npm install -g @google/gemini-cli",
+    ready: [/Type your message/],
+    enter: [/│ ● 1. Yes, allow once/],
+    fatal: []
+  },
+  codex: {
+    install: "npm install -g @openai/codex-cli",
+    ready: [/⏎ send/],
+    enter: [
+      /\b▌ \> 1\. Approve and run now/,
+      /\b\> 1\. Yes, allow Codex to work in this folder/
+    ],
+    fatal: [/Error: The cursor position could not be read within/],
+    ensureArgs: (args) => {
+      if (!args.includes("--search"))
+        return ["--search", ...args];
+      return args;
+    }
+  },
+  copilot: {
+    install: "npm install -g @github/copilot",
+    ready: [/^  > /],
+    enter: [/ │ ❯ 1. Yes, proceed/, /❯ 1. Yes/],
+    fatal: []
+  },
+  cursor: {
+    install: "open https://cursor.com/ja/docs/cli/installation",
+    binary: "cursor-agent",
+    ready: [/\/ commands/],
+    enter: [/→ Run \(once\) \(y\) \(enter\)/, /▶ \[a\] Trust this workspace/],
+    fatal: [/^  Error: You've hit your usage limit/]
+  }
+};
+async function claudeYes({
+  cli = "claude",
+  cliArgs = [],
+  prompt,
+  continueOnCrash,
+  cwd,
+  env,
+  exitOnIdle,
+  logFile,
+  removeControlCharactersFromStdout = false,
+  verbose = false
+} = {}) {
+  const continueArgs = {
+    codex: "resume --last".split(" "),
+    claude: "--continue".split(" "),
+    gemini: []
+  };
+  process.stdin.setRawMode?.(true);
+  let isFatal = false;
+  const stdinReady = new ReadyManager;
+  const shellOutputStream = new TransformStream;
+  const outputWriter = shellOutputStream.writable.getWriter();
+  const pty = await import("node-pty").catch(async () => await import("bun-pty")).catch(async () => DIE("Please install node-pty or bun-pty, run this: bun install bun-pty"));
+  const getPtyOptions = () => ({
+    name: "xterm-color",
+    ...getTerminalDimensions(),
+    cwd: cwd ?? process.cwd(),
+    env: env ?? process.env
+  });
+  const cliConf = CLI_CONFIGURES[cli] || {};
+  cliArgs = cliConf.ensureArgs?.(cliArgs) ?? cliArgs;
+  const cliCommand = cliConf?.binary || cli;
+  let shell = tryCatch(() => pty.spawn(cliCommand, cliArgs, getPtyOptions()), (error) => {
+    console.error(`Fatal: Failed to start ${cliCommand}.`);
+    if (cliConf?.install)
+      console.error(`If you did not installed it yet, Please install it first: ${cliConf.install}`);
+    throw error;
+  });
+  const pendingExitCode = Promise.withResolvers();
+  let pendingExitCodeValue = null;
+  async function onData(data) {
+    await outputWriter.write(data);
+  }
+  shell.onData(onData);
+  shell.onExit(function onExit({ exitCode: exitCode2 }) {
+    stdinReady.unready();
+    const agentCrashed = exitCode2 !== 0;
+    const continueArg = continueArgs[cli];
+    if (agentCrashed && continueOnCrash && continueArg) {
+      if (!continueArg) {
+        return console.warn(`continueOnCrash is only supported for ${Object.keys(continueArgs).join(", ")} currently, not ${cli}`);
+      }
+      if (isFatal) {
+        return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
+      }
+      console.log(`${cli} crashed, restarting...`);
+      shell = pty.spawn(cli, continueArg, getPtyOptions());
+      shell.onData(onData);
+      shell.onExit(onExit);
+      return;
+    }
+    return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
+  });
+  process.stdout.on("resize", () => {
+    const { cols, rows } = getTerminalDimensions();
+    shell.resize(cols, rows);
+  });
+  const terminalRender = new TerminalTextRender;
+  const isStillWorkingQ = () => terminalRender.render().replace(/\s+/g, " ").match(/esc to interrupt|to run in background/);
+  const idleWaiter = new IdleWaiter;
+  if (exitOnIdle)
+    idleWaiter.wait(exitOnIdle).then(async () => {
+      if (isStillWorkingQ()) {
+        console.log("[${cli}-yes] ${cli} is idle, but seems still working, not exiting yet");
+        return;
+      }
+      console.log("[${cli}-yes] ${cli} is idle, exiting...");
+      await exitAgent();
+    });
+  console.log(`[${cli}-yes] Started ${cli} with args: ${[cliCommand, ...cliArgs].join(" ")}`);
+  shell.write("\x1B[1;1R");
+  sflow(fromReadable(process.stdin)).map((buffer) => buffer.toString()).by({
+    writable: new WritableStream({
+      write: async (data) => {
+        await stdinReady.wait();
+        shell.write(data);
+      }
+    }),
+    readable: shellOutputStream.readable
+  }).forEach(() => idleWaiter.ping()).forEach((text) => {
+    terminalRender.write(text);
+    if (process.stdin.isTTY)
+      return;
+    if (text.includes("\x1B[6n"))
+      return;
+    const { col, row } = terminalRender.getCursorPosition();
+    console.log(`[${cli}-yes] Responding cursor position: row=${row}, col=${col}`);
+    shell.write(`\x1B[${row};${col}R`);
+  }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).forEach((e2) => appendFile("io.log", "output|" + JSON.stringify(e2) + `
+`)).forEach(async (e2, i) => {
+    const conf = CLI_CONFIGURES[cli] || null;
+    if (!conf)
+      return;
+    if (conf.ready?.some((rx) => e2.match(rx))) {
+      if (cli === "gemini" && i <= 80)
+        return;
+      stdinReady.ready();
+    }
+    if (conf.enter?.some((rx) => e2.match(rx))) {
+      await sendEnter(300);
+    }
+    if (conf.fatal?.some((rx) => e2.match(rx))) {
+      isFatal = true;
+      await exitAgent();
+    }
+  }).run()).map((e) => removeControlCharactersFromStdout ? removeControlCharacters(e) : e).to(fromWritable(process.stdout)).then(() => null);
+  if (prompt)
+    await sendMessage(prompt);
+  const exitCode = await pendingExitCode.promise;
+  console.log(`[${cli}-yes] ${cli} exited with code ${exitCode}`);
+  if (logFile) {
+    verbose && console.log(`[${cli}-yes] Writing rendered logs to ${logFile}`);
+    const logFilePath = path.resolve(logFile);
+    await mkdir(path.dirname(logFilePath), { recursive: true }).catch(() => null);
+    await writeFile(logFilePath, terminalRender.render());
+  }
+  return { exitCode, logs: terminalRender.render() };
+  async function sendEnter(waitms = 1000) {
+    const st = Date.now();
+    await idleWaiter.wait(waitms);
+    const et = Date.now();
+    process.stdout.write(`\ridleWaiter.wait(${waitms}) took ${et - st}ms\r`);
+    shell.write("\r");
+  }
+  async function sendMessage(message) {
+    await stdinReady.wait();
+    shell.write(message);
+    idleWaiter.ping();
+    await sendEnter();
+  }
+  async function exitAgent() {
+    continueOnCrash = false;
+    await sendMessage("/exit");
+    let exited = false;
+    await Promise.race([
+      pendingExitCode.promise.then(() => exited = true),
+      new Promise((resolve) => setTimeout(() => {
+        if (exited)
+          return;
+        shell.kill();
+        resolve();
+      }, 5000))
+    ]);
+  }
+  function getTerminalDimensions() {
+    return {
+      cols: process.stdout.columns,
+      rows: process.stdout.rows
+    };
+  }
+}
+function tryCatch(fn, catchFn) {
+  try {
+    return fn();
+  } catch (error) {
+    return catchFn(error);
+  }
+}
+
+// cli.ts
+var argv = yargs(hideBin(process.argv)).usage("Usage: $0 [options] [claude args] [--] [prompts...]").example('$0 --exit-on-idle=30s --continue-on-crash "help me solve all todos in my codebase"', "Run Claude with a 30 seconds idle timeout and continue on crash").option("continue-on-crash", {
+  type: "boolean",
+  default: true,
+  description: "spawn Claude with --continue if it crashes, only works for claude"
+}).option("log-file", {
+  type: "string",
+  description: "Log file to write to"
+}).option("cli", {
+  type: "string",
+  description: 'Claude CLI command, e.g. "claude,gemini,codex,cursor,copilot", default is "claude"'
+}).option("prompt", {
+  type: "string",
+  description: "Prompt to send to Claude",
+  alias: "p"
+}).option("verbose", {
+  type: "boolean",
+  description: "Enable verbose logging",
+  default: false
+}).option("exit-on-idle", {
+  type: "string",
+  description: 'Exit after a period of inactivity, e.g., "5s" or "1m"'
+}).parserConfiguration({
+  "unknown-options-as-args": true,
+  "halt-at-non-option": true
+}).parseSync();
+if (!argv.cli) {
+  const cliName = process.argv[1]?.split("/").pop()?.split("-")[0];
+  argv.cli = cliName || "claude";
+}
+var rawArgs = process.argv.slice(2);
+var dashIndex = rawArgs.indexOf("--");
+var promptFromDash = undefined;
+var cliArgsForSpawn = [];
+if (dashIndex !== -1) {
+  const after = rawArgs.slice(dashIndex + 1);
+  promptFromDash = after.join(" ");
+  cliArgsForSpawn = rawArgs.slice(0, dashIndex).map(String);
+} else {
+  cliArgsForSpawn = argv._.map((e) => String(e));
+}
+console.clear();
+var { exitCode, logs } = await claudeYes({
+  cli: argv.cli,
+  prompt: argv.prompt || promptFromDash,
+  exitOnIdle: argv.exitOnIdle ? enhancedMs(argv.exitOnIdle) : undefined,
+  cliArgs: cliArgsForSpawn,
+  continueOnCrash: argv.continueOnCrash,
+  logFile: argv.logFile,
+  verbose: argv.verbose
+});
+process.exit(exitCode ?? 1);
+
+//# debugId=F98366DB626CC88164756E2164756E21
+//# sourceMappingURL=cli.js.map