claude-yes 1.24.1 → 1.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-yes",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "description": "A wrapper tool that automates interactions with various AI CLI tools by automatically handling common prompts and responses.",
   "keywords": [
     "claude",
@@ -25,11 +25,11 @@
   "type": "module",
   "exports": {
     "import": "./dist/index.js",
-    "types": "./index.ts"
+    "types": "./ts/index.ts"
   },
   "main": "dist/index.js",
-  "module": "index.ts",
-  "types": "./index.ts",
+  "module": "ts/index.ts",
+  "types": "./ts/index.ts",
   "bin": {
     "claude-yes": "dist/claude-yes.js",
     "codex-yes": "dist/codex-yes.js",
@@ -42,13 +42,13 @@
     "doc": "docs"
   },
   "files": [
-    "*.ts",
+    "ts/*.ts",
     "dist"
   ],
   "scripts": {
-    "build": "bun build index.ts cli.ts --outdir=dist --target=node --sourcemap --external=bun-pty --external=node-pty",
-    "postbuild": "bun ./postbuild.ts",
-    "dev": "tsx index.ts",
+    "build": "bun build ts/index.ts ts/cli.ts --outdir=dist --target=node --sourcemap --external=bun-pty --external=node-pty",
+    "postbuild": "bun ./ts/postbuild.ts",
+    "dev": "tsx ts/index.ts",
     "fmt": "bunx @biomejs/biome check --fix && bunx sort-package-json",
     "prepack": "bun run build",
     "prepare": "bunx husky",

package/{cli.ts → ts/cli.ts}

@@ -6,27 +6,22 @@ import claudeYes from '.';
 
 // cli entry point
 const argv = yargs(hideBin(process.argv))
-  .usage('Usage: $0 [options] [claude args] [--] [prompts...]')
+  .usage('Usage: $0 [options] [agent-cli 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',
-    alias: 'c',
-  })
+  // .option('continue-on-crash', {
+  //   type: 'boolean',
+  //   default: true,
+  //   description:
+  //     'spawn Claude with --continue if it crashes, only works for claude',
+  //   alias: 'c',
+  // })
   .option('log-file', {
     type: 'string',
     description: 'Log file to write to',
   })
-  .option('cli', {
-    type: 'string',
-    description:
-      'CLI command to run. Supports: claude, gemini, codex, copilot, cursor, grok. Defaults to the CLI inferred from the executable name or "claude".',
-  })
   .option('prompt', {
     type: 'string',
     description: 'Prompt to send to Claude',
@@ -56,39 +51,37 @@ const argv = yargs(hideBin(process.argv))
   })
   .parseSync();
 
+console.log(argv);
+
 // detect cli name for cli, while package.json have multiple bin link: {"claude-yes": "cli.js", "codex-yes": "cli.js", "gemini-yes": "cli.js"}
-if (!argv.cli) {
-  const cliName = process.argv[1]?.split('/').pop()?.split('-')[0];
-  argv.cli = cliName || 'claude';
-}
+const cliName = process.argv[1]?.split('/').pop()?.split('-')[0];
+
+const rawArgs = process.argv.slice(2);
+const cliArgIndex = rawArgs.indexOf(String(argv._[0]));
+const dashIndex = rawArgs.indexOf('--');
 
 // Support: everything after a literal `--` is a prompt string. Example:
 //   claude-yes --exit-on-idle=30s -- "help me refactor this"
 // In that example the prompt will be `help me refactor this` and won't be
 // passed as args to the underlying CLI binary.
-const rawArgs = process.argv.slice(2);
-const dashIndex = rawArgs.indexOf('--');
-let promptFromDash: string | undefined = undefined;
-let cliArgsForSpawn: string[] = [];
-if (dashIndex !== -1) {
-  // join everything after `--` into a single prompt string
-  const after = rawArgs.slice(dashIndex + 1);
-  promptFromDash = after.join(' ');
-  // use everything before `--` as the cli args
-  cliArgsForSpawn = rawArgs.slice(0, dashIndex).map(String);
-} else {
-  // fallback to yargs parsed positional args when `--` is not used
-  cliArgsForSpawn = argv._.map((e) => String(e));
-}
 
+const cliArgsForSpawn = rawArgs.slice(
+  cliArgIndex === -1 ? 0 : cliArgIndex,
+  dashIndex === -1 ? undefined : dashIndex,
+); // default to all args
+const promptFromDash: string | undefined = rawArgs
+  .slice(dashIndex + 1)
+  .join(' ');
+
+console.log({ rawArgs, cliArgsForSpawn, promptFromDash });
 console.clear();
-const { exitCode, logs } = await claudeYes({
-  cli: argv.cli,
+const { exitCode } = await claudeYes({
+  cli: cliName,
   // prefer explicit --prompt / -p; otherwise use the text after `--` if present
   prompt: argv.prompt || promptFromDash,
   exitOnIdle: argv.exitOnIdle ? enhancedMs(argv.exitOnIdle) : undefined,
   cliArgs: cliArgsForSpawn,
-  continueOnCrash: argv.continueOnCrash,
+  // continueOnCrash: argv.continueOnCrash,
   logFile: argv.logFile,
   verbose: argv.verbose,
   disableLock: argv.disableLock,

package/{index.ts → ts/index.ts}

@@ -14,7 +14,6 @@ import {
   shouldUseLock,
   updateCurrentTaskStatus,
 } from './runningLock';
-
 // const yesLog = tsaComposer()(async function yesLog(msg: string) {
 //   // await rm('agent-yes.log').catch(() => null); // ignore error if file doesn't exist
 //   await appendFile("agent-yes.log", `${msg}\n`).catch(() => null);
@@ -115,7 +114,7 @@ export default async function claudeYes({
   cli = 'claude',
   cliArgs = [],
   prompt,
-  continueOnCrash,
+  // continueOnCrash,
   cwd,
   env,
   exitOnIdle,
@@ -127,7 +126,7 @@ export default async function claudeYes({
   cli?: (string & {}) | keyof typeof CLI_CONFIGURES;
   cliArgs?: string[];
   prompt?: string;
-  continueOnCrash?: boolean;
+  // continueOnCrash?: boolean;
   cwd?: string;
   env?: Record<string, string>;
   exitOnIdle?: number;
@@ -227,23 +226,23 @@ export default async function claudeYes({
     const agentCrashed = exitCode !== 0;
     const continueArg = (continueArgs as Record<string, string[]>)[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 = exitCode));
-      }
-
-      console.log(`${cli} crashed, restarting...`);
-
-      shell = pty.spawn(cli, continueArg, getPtyOptions());
-      shell.onData(onData);
-      shell.onExit(onExit);
-      return;
-    }
+    // 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 = exitCode));
+    //   }
+
+    //   console.log(`${cli} crashed, restarting...`);
+
+    //   shell = pty.spawn(cli, continueArg, getPtyOptions());
+    //   shell.onData(onData);
+    //   shell.onExit(onExit);
+    //   return;
+    // }
     return pendingExitCode.resolve((pendingExitCodeValue = exitCode));
   });
 
@@ -406,7 +405,7 @@ export default async function claudeYes({
   }
 
   async function exitAgent() {
-    continueOnCrash = false;
+    // continueOnCrash = false;
     // send exit command to the shell, must sleep a bit to avoid claude treat it as pasted input
     await sendMessage('/exit');
 

package/{postbuild.ts → ts/postbuild.ts}

@@ -1,8 +1,8 @@
 #! /usr/bin/env bun
 import { execaCommand } from 'execa';
 import { copyFile } from 'fs/promises';
+import * as pkg from '../package.json';
 import { CLI_CONFIGURES } from '.';
-import * as pkg from './package.json';
 
 const src = 'dist/cli.js';
 await Promise.all(
@@ -11,5 +11,6 @@ await Promise.all(
     if (!pkg.bin?.[cli as keyof typeof pkg.bin])
       await execaCommand(`npm pkg set bin.${cli}-yes=${dst}`);
     await copyFile(src, dst);
+    console.log(`Created ${dst}`);
   }),
 );

package/{runningLock.ts → ts/runningLock.ts}

@@ -221,13 +221,57 @@ async function waitForUnlock(
   currentTask: Task,
 ): Promise<void> {
   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`);
 
   // Add current task as 'queued'
   await addTask({ ...currentTask, status: 'queued' });
 
+  // Set up keyboard input handling
+  const stdin = process.stdin;
+  const wasRaw = stdin.isRaw;
+  stdin.setRawMode?.(true);
+  stdin.resume();
+
+  let bypassed = false;
+  let killed = false;
+
+  const keyHandler = (key: Buffer) => {
+    const char = key.toString();
+    if (char === 'b' || char === 'B') {
+      console.log('\n⚡ Bypassing queue...');
+      bypassed = true;
+    } else if (char === 'k' || char === 'K') {
+      console.log('\n🔪 Killing previous instance...');
+      killed = true;
+    }
+  };
+
+  stdin.on('data', keyHandler);
+
   let dots = 0;
   while (true) {
+    if (bypassed) {
+      // Force bypass - update status to running immediately
+      await updateTaskStatus(currentTask.pid, 'running');
+      console.log('✓ Queue bypassed, starting task...');
+      break;
+    }
+
+    if (killed && blockingTask) {
+      // Kill the blocking task's process
+      try {
+        process.kill(blockingTask.pid, 'SIGTERM');
+        console.log(`✓ Killed process ${blockingTask.pid}`);
+        // Wait a bit for the process to be killed
+        await sleep(1000);
+      } catch (err) {
+        console.log(`⚠️  Could not kill process ${blockingTask.pid}: ${err}`);
+      }
+      killed = false; // Reset flag after attempting kill
+    }
+
     await sleep(POLL_INTERVAL);
 
     const lockCheck = await checkLock(currentTask.cwd, currentTask.task);
@@ -245,6 +289,11 @@ async function waitForUnlock(
       `\r⏳ Queueing${'.'.repeat(dots)}${' '.repeat(3 - dots)}`,
     );
   }
+
+  // Clean up keyboard handler
+  stdin.off('data', keyHandler);
+  stdin.setRawMode?.(wasRaw);
+  if (!wasRaw) stdin.pause();
 }
 
 /**