claude-yes 1.16.0 → 1.17.0

package/index.ts

@@ -7,6 +7,7 @@ import { TerminalTextRender } from 'terminal-render';
 import { writeFile } from 'fs/promises';
 import path from 'path';
 import { mkdir } from 'fs/promises';
+import { ReadyManager } from './ReadyManager';
 
 /**
  * Main function to run Claude with automatic yes/no respojnses
@@ -23,9 +24,9 @@ import { mkdir } from 'fs/promises';
 export default async function claudeYes({
   claudeArgs = [],
   continueOnCrash,
-  cwd = process.cwd(),
-  env = process.env as Record<string, string>,
-  exitOnIdle,
+  cwd,
+  env,
+  exitOnIdle = 60e3,
   logFile,
   removeControlCharactersFromStdout = false, // = !process.stdout.isTTY,
   verbose = false,
@@ -61,6 +62,7 @@ export default async function claudeYes({
   const prefix = ''; // "YESC|"
   const PREFIXLENGTH = prefix.length;
   let errorNoConversation = false; // match 'No conversation found to continue'
+  const shellReady = new ReadyManager();
 
   const shellOutputStream = new TransformStream<string, string>();
   const outputWriter = shellOutputStream.writable.getWriter();
@@ -70,64 +72,60 @@ export default async function claudeYes({
   const pty = process.versions.bun
     ? await import('bun-pty')
     : await import('node-pty');
-  let shell = pty.spawn('claude', claudeArgs, {
+
+  const getPtyOptions = () => ({
     name: 'xterm-color',
     cols: process.stdout.columns - PREFIXLENGTH,
     rows: process.stdout.rows,
-    cwd,
-    env,
+    cwd: cwd ?? process.cwd(),
+    env: env ?? (process.env as Record<string, string>),
   });
+  let shell = pty.spawn('claude', claudeArgs, getPtyOptions());
   let pendingExitCode = Promise.withResolvers<number | null>();
+  let pendingExitCodeValue = null;
+
   // TODO handle error if claude is not installed, show msg:
   // npm install -g @anthropic-ai/claude-code
 
   async function onData(data: string) {
     // append data to the buffer, so we can process it later
     await outputWriter.write(data);
+    shellReady.ready(); // shell has output, also means ready for stdin
   }
+
   shell.onData(onData);
-  // when claude process exits, exit the main process with the same exit code
   shell.onExit(function onExit({ exitCode }) {
-    if (continueOnCrash && exitCode !== 0) {
+    shellReady.unready(); // start buffer stdin
+    const claudeCrashed = exitCode !== 0;
+    if (claudeCrashed && continueOnCrash) {
       if (errorNoConversation) {
         console.log(
           'Claude crashed with "No conversation found to continue", exiting...'
         );
-        return pendingExitCode.resolve(exitCode);
+        return pendingExitCode.resolve((pendingExitCodeValue = exitCode));
       }
       console.log('Claude crashed, restarting...');
-      shell = pty.spawn('claude', ['--continue', 'continue'], {
-        name: 'xterm-color',
-        cols: process.stdout.columns - PREFIXLENGTH,
-        rows: process.stdout.rows,
-        cwd,
-        env,
-      });
+
+      shell = pty.spawn('claude', ['--continue', 'continue'], getPtyOptions());
       shell.onData(onData);
       shell.onExit(onExit);
       return;
     }
-    return pendingExitCode.resolve(exitCode);
+    return pendingExitCode.resolve((pendingExitCodeValue = exitCode));
   });
 
   const exitClaudeCode = async () => {
+    continueOnCrash = false;
     // send exit command to the shell, must sleep a bit to avoid claude treat it as pasted input
     await sflow(['\r', '/exit', '\r'])
-      .forEach(async (e) => {
-        await sleepms(200);
-        shell.write(e);
-      })
+      .forEach(async () => await sleepms(200))
+      .forEach(async (e) => shell.write(e))
       .run();
 
     // wait for shell to exit or kill it with a timeout
     let exited = false;
     await Promise.race([
-      new Promise<void>((resolve) =>
-        shell.onExit(() => {
-          resolve();
-          exited = true;
-        })
-      ), // resolve when shell exits
+      pendingExitCode.promise.then(() => (exited = true)), // resolve when shell exits
       // if shell doesn't exit in 5 seconds, kill it
       new Promise<void>((resolve) =>
         setTimeout(() => {
@@ -145,20 +143,12 @@ export default async function claudeYes({
     shell.resize(columns - PREFIXLENGTH, rows);
   });
 
-  const shellStdio = {
-    writable: new WritableStream<string>({
-      write: (data) => shell.write(data),
-      close: () => {},
-    }),
-    readable: shellOutputStream.readable,
-  };
-
-  const ttr = new TerminalTextRender();
+  const render = new TerminalTextRender();
   const idleWatcher = !exitOnIdle
     ? null
     : createIdleWatcher(async () => {
         if (
-          ttr
+          render
             .render()
             .replace(/\s+/g, ' ')
             .match(/esc to interrupt|to run in background/)
@@ -179,9 +169,18 @@ export default async function claudeYes({
   sflow(fromReadable<Buffer>(process.stdin))
     .map((buffer) => buffer.toString())
     // .forEach(e => appendFile('.cache/io.log', "input |" + JSON.stringify(e) + '\n')) // for debugging
-    .by(shellStdio)
-    // handle ttr render
-    .forEach((text) => ttr.write(text))
+    // pipe
+    .by({
+      writable: new WritableStream<string>({
+        write: async (data) => {
+          await shellReady.wait();
+          shell.write(data);
+        },
+      }),
+      readable: shellOutputStream.readable,
+    })
+    // handle terminal render
+    .forEach((text) => render.write(text))
 
     // handle idle
     .forEach(() => idleWatcher?.ping()) // ping the idle watcher on output for last active time to keep track of claude status
@@ -209,7 +208,7 @@ export default async function claudeYes({
     .to(fromWritable(process.stdout));
 
   const exitCode = await pendingExitCode.promise; // wait for the shell to exit
-  verbose && console.log(`[claude-yes] claude exited with code ${exitCode}`);
+  console.log(`[claude-yes] claude exited with code ${exitCode}`);
 
   if (logFile) {
     verbose && console.log(`[claude-yes] Writing rendered logs to ${logFile}`);
@@ -217,10 +216,10 @@ export default async function claudeYes({
     await mkdir(path.dirname(logFilePath), { recursive: true }).catch(
       () => null
     );
-    await writeFile(logFilePath, ttr.render());
+    await writeFile(logFilePath, render.render());
   }
 
-  return { exitCode, logs: ttr.render() };
+  return { exitCode, logs: render.render() };
 }
 
 export { removeControlCharacters };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-yes",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "A wrapper tool that automates interactions with the Claude CLI by automatically handling common prompts and responses.",
   "keywords": [
     "claude",
@@ -41,7 +41,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "bun build index.ts cli.ts --outdir=dist --packages=external --target=node --sourcemap",
+    "build": "bun build index.ts cli.ts --outdir=dist --external=node-pty --external=bun-pty --target=node --sourcemap",
     "dev": "tsx index.ts",
     "fmt": "prettier -w .",
     "prepare": "husky",
@@ -54,9 +54,7 @@
   },
   "dependencies": {
     "bun-pty": "^0.3.2",
-    "node-pty": "^1.0.0",
-    "terminal-render": "^1.1.0",
-    "yargs": "^18.0.0"
+    "node-pty": "^1.0.0"
   },
   "devDependencies": {
     "@types/bun": "^1.2.18",
@@ -69,11 +67,14 @@
     "husky": "^9.1.7",
     "lint-staged": "^16.1.4",
     "prettier": "^3.6.2",
+    "rambda": "^10.3.2",
     "semantic-release": "^24.2.6",
     "sflow": "^1.20.2",
     "strip-ansi-control-characters": "^2.0.0",
+    "terminal-render": "^1.1.0",
     "tsx": "^4.20.3",
-    "vitest": "^3.2.4"
+    "vitest": "^3.2.4",
+    "yargs": "^18.0.0"
   },
   "peerDependencies": {
     "typescript": "^5.8.3"