claude-yes 1.24.1 → 1.25.0

package/dist/index.js

@@ -4826,7 +4826,7 @@ function fromWritable(i) {
   });
 }
 
-// index.ts
+// ts/index.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
 import path3 from "path";
 
@@ -5234,7 +5234,75 @@ class TerminalTextRender {
   }
 }
 
-// idleWaiter.ts
+// ts/defineConfig.ts
+async function defineCliYesConfig(cfg) {
+  if (typeof cfg === "function")
+    cfg = await cfg({ clis: {} });
+  return cfg;
+}
+
+// cli-yes.config.ts
+process.env.VERBOSE && console.log("loading cli-yes.config.ts from " + import.meta.url);
+var cli_yes_config_default = defineCliYesConfig({
+  clis: {
+    qwen: {
+      install: "npm install -g @qwen-code/qwen-code@latest",
+      version: "qwen --version"
+    },
+    grok: {
+      install: "npm install -g @vibe-kit/grok-cli",
+      ready: [/^  │ ❯ /],
+      enter: [/^   1. Yes/]
+    },
+    claude: {
+      promptArg: "first-arg",
+      install: "npm install -g @anthropic-ai/claude-code",
+      restoreArgs: ["--continue"],
+      ready: [/\? for shortcuts/],
+      enter: [/❯ 1. Yes/, /❯ 1. Dark mode✔/, /Press Enter to continue…/],
+      fatal: [
+        /No conversation found to continue/,
+        /⎿  Claude usage limit reached\./,
+        /^error: unknown option/
+      ],
+      defaultArgs: ["--model=sonnet"]
+    },
+    gemini: {
+      install: "npm install -g @google/gemini-cli",
+      ready: [/Type your message/],
+      enter: [/│ ● 1. Yes, allow once/],
+      fatal: []
+    },
+    codex: {
+      promptArg: "first-arg",
+      install: "npm install -g @openai/codex-cli",
+      ready: [/⏎ send/],
+      enter: [
+        /> 1. Yes, allow Codex to work in this folder/,
+        /> 1. Approve and run now/
+      ],
+      fatal: [/Error: The cursor position could not be read within/],
+      defaultArgs: ["--search"],
+      noEOL: true
+    },
+    copilot: {
+      promptArg: "--prompt",
+      install: "npm install -g @github/copilot",
+      ready: [/^ +> /, /Ctrl\+c Exit/],
+      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/]
+    }
+  }
+});
+
+// ts/idleWaiter.ts
 class IdleWaiter {
   lastActivityTime = Date.now();
   checkInterval = 100;
@@ -5251,7 +5319,7 @@ class IdleWaiter {
   }
 }
 
-// ReadyManager.ts
+// ts/ReadyManager.ts
 class ReadyManager {
   isReady = false;
   readyQueue = [];
@@ -5271,12 +5339,12 @@ class ReadyManager {
   }
 }
 
-// removeControlCharacters.ts
+// ts/removeControlCharacters.ts
 function removeControlCharacters(str) {
   return str.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "");
 }
 
-// runningLock.ts
+// ts/runningLock.ts
 import { execSync } from "child_process";
 import { existsSync } from "fs";
 import { mkdir, readFile, rename, writeFile } from "fs/promises";
@@ -5400,10 +5468,47 @@ async function removeTask(pid) {
 }
 async function waitForUnlock(blockingTasks, currentTask) {
   const blockingTask = blockingTasks[0];
+  if (!blockingTask)
+    return;
   console.log(`⏳ Queueing for unlock of: ${blockingTask.task}`);
+  console.log(`   Press 'b' to bypass queue, 'k' to kill previous instance`);
   await addTask({ ...currentTask, status: "queued" });
+  const stdin = process.stdin;
+  const wasRaw = stdin.isRaw;
+  stdin.setRawMode?.(true);
+  stdin.resume();
+  let bypassed = false;
+  let killed = false;
+  const keyHandler = (key) => {
+    const char = key.toString();
+    if (char === "b" || char === "B") {
+      console.log(`
+⚡ Bypassing queue...`);
+      bypassed = true;
+    } else if (char === "k" || char === "K") {
+      console.log(`
+\uD83D\uDD2A Killing previous instance...`);
+      killed = true;
+    }
+  };
+  stdin.on("data", keyHandler);
   let dots = 0;
   while (true) {
+    if (bypassed) {
+      await updateTaskStatus(currentTask.pid, "running");
+      console.log("✓ Queue bypassed, starting task...");
+      break;
+    }
+    if (killed && blockingTask) {
+      try {
+        process.kill(blockingTask.pid, "SIGTERM");
+        console.log(`✓ Killed process ${blockingTask.pid}`);
+        await sleep2(1000);
+      } catch (err) {
+        console.log(`⚠️  Could not kill process ${blockingTask.pid}: ${err}`);
+      }
+      killed = false;
+    }
     await sleep2(POLL_INTERVAL);
     const lockCheck = await checkLock(currentTask.cwd, currentTask.task);
     if (!lockCheck.isLocked) {
@@ -5415,6 +5520,10 @@ async function waitForUnlock(blockingTasks, currentTask) {
     dots = (dots + 1) % 4;
     process.stdout.write(`\r⏳ Queueing${".".repeat(dots)}${" ".repeat(3 - dots)}`);
   }
+  stdin.off("data", keyHandler);
+  stdin.setRawMode?.(wasRaw);
+  if (!wasRaw)
+    stdin.pause();
 }
 async function acquireLock(cwd, prompt = "no prompt provided") {
   const resolvedCwd = resolveRealPath(cwd);
@@ -5446,96 +5555,106 @@ function shouldUseLock(cwd) {
   return true;
 }
 
-// index.ts
-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: [/\? for shortcuts/],
-    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: [
-      /> 1. Yes, allow Codex to work in this folder/,
-      /> 1. Approve and run now/
-    ],
-    fatal: [/Error: The cursor position could not be read within/],
-    ensureArgs: (args) => {
-      if (!args.includes("--search"))
-        return ["--search", ...args];
-      return args;
+// ts/tryCatch.ts
+function catcher(catchFn, fn) {
+  if (!fn)
+    return (fn2) => catcher(catchFn, fn2);
+  return (...args) => {
+    try {
+      return fn(...args);
+    } catch (error) {
+      return catchFn(error);
     }
-  },
-  copilot: {
-    install: "npm install -g @github/copilot",
-    ready: [/^ +> /, /Ctrl\+c Exit/],
-    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",
+  };
+}
+
+// ts/yesLog.ts
+import { appendFileSync, rmSync } from "node:fs";
+
+// node_modules/tsa-composer/dist/index.js
+function tsaStringJoiner(tsa, ...slots) {
+  return [tsa.reduce((acc, s, i) => acc + s + (slots[i] ?? ""), "")];
+}
+function tsaComposer(parse, fn) {
+  if (!parse)
+    return tsaComposer(tsaStringJoiner);
+  if (!fn)
+    return (fn2) => tsaComposer(parse, fn2);
+  const composedFn = function(...args) {
+    const [tsa, ...slots] = args;
+    if (!isTSA(tsa))
+      return fn(...args);
+    return fn(...parse(tsa, ...slots));
+  };
+  Object.setPrototypeOf(composedFn, fn);
+  Object.getOwnPropertyNames(fn).forEach((prop2) => {
+    if (prop2 !== "length" && prop2 !== "name" && prop2 !== "prototype") {
+      Object.defineProperty(composedFn, prop2, Object.getOwnPropertyDescriptor(fn, prop2));
+    }
+  });
+  return composedFn;
+}
+function isTSA(tsa) {
+  return Array.isArray(tsa) && "raw" in tsa && Array.isArray(tsa.raw);
+}
+
+// ts/yesLog.ts
+var initial = true;
+var yesLog = tsaComposer()(catcher((error) => {
+  console.error("yesLog error:", error);
+}, function yesLog2(msg) {
+  if (!process.env.VERBOSE)
+    return;
+  if (initial)
+    rmSync("./agent-yes.log");
+  initial = false;
+  appendFileSync("./agent-yes.log", `${msg}
+`);
+}));
+
+// ts/index.ts
+var config = await cli_yes_config_default;
+var CLIS_CONFIG = config.clis;
+var SUPPORTED_CLIS = Object.keys(CLIS_CONFIG);
+async function cliYes({
+  cli,
   cliArgs = [],
   prompt,
-  continueOnCrash,
+  robust = true,
   cwd,
   env,
   exitOnIdle,
   logFile,
   removeControlCharactersFromStdout = false,
   verbose = false,
-  disableLock = false
-} = {}) {
-  const continueArgs = {
-    codex: "resume --last".split(" "),
-    claude: "--continue".split(" "),
-    gemini: []
-  };
+  queue = true
+}) {
+  if (!cli)
+    throw new Error(`cli is required`);
+  const conf = CLIS_CONFIG[cli] || phpdie_default2(`Unsupported cli tool: ${cli}`);
   const workingDir = cwd ?? process.cwd();
-  if (!disableLock && shouldUseLock(workingDir)) {
-    await acquireLock(workingDir, prompt ?? "Interactive session");
-  }
-  const cleanupLock = async () => {
-    if (!disableLock && shouldUseLock(workingDir)) {
-      await releaseLock().catch(() => null);
+  if (queue) {
+    if (queue && shouldUseLock(workingDir)) {
+      await acquireLock(workingDir, prompt ?? "Interactive session");
     }
-  };
-  process.on("exit", () => {
-    if (!disableLock) {
-      releaseLock().catch(() => null);
-    }
-  });
-  process.on("SIGINT", async () => {
-    await cleanupLock();
-    process.exit(130);
-  });
-  process.on("SIGTERM", async () => {
-    await cleanupLock();
-    process.exit(143);
-  });
+    const cleanupLock = async () => {
+      if (queue && shouldUseLock(workingDir)) {
+        await releaseLock().catch(() => null);
+      }
+    };
+    process.on("exit", () => {
+      if (queue)
+        releaseLock().catch(() => null);
+    });
+    process.on("SIGINT", async (code) => {
+      await cleanupLock();
+      process.exit(code);
+    });
+    process.on("SIGTERM", async (code) => {
+      await cleanupLock();
+      process.exit(code);
+    });
+  }
   process.stdin.setRawMode?.(true);
   let isFatal = false;
   const stdinReady = new ReadyManager;
@@ -5549,36 +5668,53 @@ async function claudeYes({
     cwd: cwd ?? process.cwd(),
     env: env ?? process.env
   });
-  const cliConf = CLI_CONFIGURES[cli] || {};
-  cliArgs = cliConf.ensureArgs?.(cliArgs) ?? cliArgs;
+  const cliConf = CLIS_CONFIG[cli] || {};
+  cliArgs = cliConf.defaultArgs ? [...cliConf.defaultArgs, ...cliArgs] : cliArgs;
+  if (prompt && cliConf.promptArg) {
+    if (cliConf.promptArg === "first-arg") {
+      cliArgs = [prompt, ...cliArgs];
+      prompt = undefined;
+    } else if (cliConf.promptArg === "last-arg") {
+      cliArgs = [...cliArgs, prompt];
+      prompt = undefined;
+    } else if (cliConf.promptArg.startsWith("--")) {
+      cliArgs = [cliConf.promptArg, prompt, ...cliArgs];
+      prompt = undefined;
+    } else {
+      console.warn(`Unknown promptArg format: ${cliConf.promptArg}`);
+    }
+  }
   const cliCommand = cliConf?.binary || cli;
-  let shell = tryCatch(() => pty.spawn(cliCommand, cliArgs, getPtyOptions()), (error) => {
+  let shell = catcher((error) => {
     console.error(`Fatal: Failed to start ${cliCommand}.`);
-    if (cliConf?.install)
+    if (cliConf?.install && isCommandNotFoundError(error))
       console.error(`If you did not installed it yet, Please install it first: ${cliConf.install}`);
     throw error;
-  });
+    function isCommandNotFoundError(e) {
+      if (e instanceof Error) {
+        return e.message.includes("command not found") || e.message.includes("ENOENT") || e.message.includes("spawn");
+      }
+      return false;
+    }
+  }, () => pty.spawn(cliCommand, cliArgs, getPtyOptions()))();
   const pendingExitCode = Promise.withResolvers();
   let pendingExitCodeValue = null;
   async function onData(data) {
-    nextStdout.ready();
     await outputWriter.write(data);
   }
   shell.onData(onData);
   shell.onExit(function onExit({ exitCode: exitCode2 }) {
-    nextStdout.ready();
     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 (agentCrashed && robust && conf?.restoreArgs) {
+      if (!conf.restoreArgs) {
+        return console.warn(`robust is only supported for ${Object.entries(CLIS_CONFIG).filter(([_, v]) => v.restoreArgs).map(([k]) => k).join(", ")} currently, not ${cli}`);
       }
       if (isFatal) {
         return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
       }
       console.log(`${cli} crashed, restarting...`);
-      shell = pty.spawn(cli, continueArg, getPtyOptions());
+      shell = pty.spawn(cli, conf.restoreArgs, getPtyOptions());
       shell.onData(onData);
       shell.onExit(onExit);
       return;
@@ -5609,7 +5745,7 @@ async function claudeYes({
       }
     }),
     readable: shellOutputStream.readable
-  }).forEach(() => idleWaiter.ping()).forEach((text) => {
+  }).forEach(() => idleWaiter.ping()).forEach(() => nextStdout.ready()).forEach(async (text) => {
     terminalRender.write(text);
     if (process.stdin.isTTY)
       return;
@@ -5617,24 +5753,25 @@ async function claudeYes({
       return;
     const { col, row } = terminalRender.getCursorPosition();
     shell.write(`\x1B[${row};${col}R`);
+    await yesLog`cursor|respond position: row=${String(row)}, col=${String(col)}`;
   }).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).by((s) => {
-    if (cli === "codex")
+    if (conf.noEOL)
       return s;
     return s.lines({ EOL: "NONE" });
-  }).forEach(async (e2, i) => {
-    const conf = CLI_CONFIGURES[cli] || null;
-    if (!conf)
-      return;
+  }).forEach((e2) => yesLog`output|${e2}`).forEach(async (e2, i) => {
     if (conf.ready?.some((rx) => e2.match(rx))) {
+      await yesLog`ready |${e2}`;
       if (cli === "gemini" && i <= 80)
         return;
       stdinReady.ready();
     }
     if (conf.enter?.some((rx) => e2.match(rx))) {
+      await yesLog`enter |${e2}`;
       await sendEnter(300);
       return;
     }
     if (conf.fatal?.some((rx) => e2.match(rx))) {
+      await yesLog`fatal |${e2}`;
       isFatal = true;
       await exitAgent();
     }
@@ -5645,7 +5782,7 @@ async function claudeYes({
     await sendMessage(prompt);
   const exitCode = await pendingExitCode.promise;
   console.log(`[${cli}-yes] ${cli} exited with code ${exitCode}`);
-  if (!disableLock && shouldUseLock(workingDir)) {
+  if (queue && shouldUseLock(workingDir)) {
     await updateCurrentTaskStatus(exitCode === 0 ? "completed" : "failed").catch(() => null);
     await releaseLock().catch(() => null);
   }
@@ -5660,18 +5797,33 @@ async function claudeYes({
     const st = Date.now();
     await idleWaiter.wait(waitms);
     const et = Date.now();
+    await yesLog`sendEn| idleWaiter.wait(${String(waitms)}) took ${String(et - st)}ms`;
+    nextStdout.unready();
     shell.write("\r");
+    await Promise.race([
+      nextStdout.wait(),
+      new Promise((resolve) => setTimeout(() => {
+        if (!nextStdout.ready) {
+          shell.write("\r");
+        }
+        resolve();
+      }, 1000))
+    ]);
   }
   async function sendMessage(message) {
     await stdinReady.wait();
-    shell.write(message);
+    yesLog`send  |${message}`;
     nextStdout.unready();
+    shell.write(message);
     idleWaiter.ping();
+    yesLog`waiting next stdout|${message}`;
     await nextStdout.wait();
-    await sendEnter();
+    yesLog`sending enter`;
+    await sendEnter(1000);
+    yesLog`sent enter`;
   }
   async function exitAgent() {
-    continueOnCrash = false;
+    robust = false;
     await sendMessage("/exit");
     let exited = false;
     await Promise.race([
@@ -5693,18 +5845,13 @@ async function claudeYes({
     };
   }
 }
-function tryCatch(fn, catchFn) {
-  try {
-    return fn();
-  } catch (error) {
-    return catchFn(error);
-  }
-}
 export {
   removeControlCharacters,
-  claudeYes as default,
-  CLI_CONFIGURES
+  cliYes as default,
+  config,
+  SUPPORTED_CLIS,
+  CLIS_CONFIG
 };
 
-//# debugId=C257F9AC903EC67664756E2164756E21
+//# debugId=266F6AAC46785FCA64756E2164756E21
 //# sourceMappingURL=index.js.map