claude-yes 1.16.1 → 1.17.0

package/dist/index.js

@@ -112,7 +112,7 @@ class PolyfillTextEncoderStream {
   });
 }
 
-// node_modules/rambda/dist/rambda.js
+// node_modules/sflow/node_modules/rambda/dist/rambda.js
 var cloneList = (list) => Array.prototype.slice.call(list);
 function curry(fn, args = []) {
   return (..._args) => ((rest) => rest.length >= fn.length ? fn(...rest) : curry(fn, rest))([...args, ..._args]);
@@ -5090,12 +5090,36 @@ class TerminalTextRender {
 import { writeFile } from "fs/promises";
 import path2 from "path";
 import { mkdir } from "fs/promises";
+
+// ReadyManager.ts
+class ReadyManager {
+  isReady = false;
+  readyQueue = [];
+  wait() {
+    return new Promise((resolve) => {
+      if (this.isReady)
+        return 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());
+  }
+}
+
+// index.ts
 async function claudeYes({
   claudeArgs = [],
   continueOnCrash,
-  cwd = process.cwd(),
-  env = process.env,
-  exitOnIdle,
+  cwd,
+  env,
+  exitOnIdle = 60000,
   logFile,
   removeControlCharactersFromStdout = false,
   verbose = false
@@ -5117,52 +5141,47 @@ async function claudeYes({
   const prefix = "";
   const PREFIXLENGTH = prefix.length;
   let errorNoConversation = false;
+  const shellReady = new ReadyManager;
   const shellOutputStream = new TransformStream;
   const outputWriter = shellOutputStream.writable.getWriter();
   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
   });
+  let shell = pty.spawn("claude", claudeArgs, getPtyOptions());
   let pendingExitCode = Promise.withResolvers();
+  let pendingExitCodeValue = null;
   async function onData(data) {
     await outputWriter.write(data);
+    shellReady.ready();
   }
   shell.onData(onData);
   shell.onExit(function onExit({ exitCode: exitCode2 }) {
-    if (continueOnCrash && exitCode2 !== 0) {
+    shellReady.unready();
+    const claudeCrashed = exitCode2 !== 0;
+    if (claudeCrashed && continueOnCrash) {
       if (errorNoConversation) {
         console.log('Claude crashed with "No conversation found to continue", exiting...');
-        return pendingExitCode.resolve(exitCode2);
+        return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
       }
       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(exitCode2);
+    return pendingExitCode.resolve(pendingExitCodeValue = exitCode2);
   });
   const exitClaudeCode = async () => {
-    await src_default(["\r", "/exit", "\r"]).forEach(async (e) => {
-      await sleepms(200);
-      shell.write(e);
-    }).run();
+    continueOnCrash = false;
+    await src_default(["\r", "/exit", "\r"]).forEach(async () => await sleepms(200)).forEach(async (e) => shell.write(e)).run();
     let exited = false;
     await Promise.race([
-      new Promise((resolve) => shell.onExit(() => {
-        resolve();
-        exited = true;
-      })),
+      pendingExitCode.promise.then(() => exited = true),
       new Promise((resolve) => setTimeout(() => {
         if (exited)
           return;
@@ -5175,16 +5194,9 @@ async function claudeYes({
     const { columns, rows } = process.stdout;
     shell.resize(columns - PREFIXLENGTH, rows);
   });
-  const shellStdio = {
-    writable: new WritableStream({
-      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().replace(/\s+/g, " ").match(/esc to interrupt|to run in background/)) {
+    if (render.render().replace(/\s+/g, " ").match(/esc to interrupt|to run in background/)) {
       console.log("[claude-yes] Claude is idle, but seems still working, not exiting yet");
     } else {
       console.log("[claude-yes] Claude is idle, exiting...");
@@ -5195,7 +5207,15 @@ async function claudeYes({
     await sleepms(200);
     shell.write("\r");
   };
-  src_default(fromReadable(process.stdin)).map((buffer2) => buffer2.toString()).by(shellStdio).forEach((text) => ttr.write(text)).forEach(() => idleWatcher?.ping()).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).forEach(async (e2) => {
+  src_default(fromReadable(process.stdin)).map((buffer2) => buffer2.toString()).by({
+    writable: new WritableStream({
+      write: async (data) => {
+        await shellReady.wait();
+        shell.write(data);
+      }
+    }),
+    readable: shellOutputStream.readable
+  }).forEach((text) => render.write(text)).forEach(() => idleWatcher?.ping()).forkTo((e) => e.map((e2) => removeControlCharacters(e2)).map((e2) => e2.replaceAll("\r", "")).forEach(async (e2) => {
     if (e2.match(/❯ 1. Yes/))
       return await confirm();
     if (e2.match(/❯ 1. Dark mode✔|Press Enter to continue…/))
@@ -5206,19 +5226,19 @@ async function claudeYes({
     }
   }).run()).replaceAll(/.*(?:\r\n?|\r?\n)/g, (line) => prefix + line).map((e) => removeControlCharactersFromStdout ? removeControlCharacters(e) : e).to(fromWritable(process.stdout));
   const exitCode = await pendingExitCode.promise;
-  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}`);
     const logFilePath = path2.resolve(logFile);
     await mkdir(path2.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,
   claudeYes as default
 };
 
-//# debugId=3F612601EADFF57764756E2164756E21
+//# debugId=9DCC732BF3D33A1E64756E2164756E21
 //# sourceMappingURL=index.js.map