claude-yes 1.167.0 → 1.168.0

package/dist/{SUPPORTED_CLIS-DFBATC85.js → SUPPORTED_CLIS-D0nNJGNj.js}

@@ -1,8 +1,8 @@
-import { t as CLIS_CONFIG } from "./ts-s3wYccKf.js";
+import { t as CLIS_CONFIG } from "./ts-DBwi5BWW.js";
 
 //#region ts/SUPPORTED_CLIS.ts
 const SUPPORTED_CLIS = Object.keys(CLIS_CONFIG);
 
 //#endregion
 export { SUPPORTED_CLIS as t };
-//# sourceMappingURL=SUPPORTED_CLIS-DFBATC85.js.map
+//# sourceMappingURL=SUPPORTED_CLIS-D0nNJGNj.js.map

package/dist/SUPPORTED_CLIS-Dy_o9sj6.js

@@ -0,0 +1,8 @@
+import "./ts-DBwi5BWW.js";
+import "./logger-CDIsZ-Pp.js";
+import "./versionChecker-DVv-WHIp.js";
+import "./pidStore-BfoBWUjc.js";
+import "./globalPidIndex-DlmmJlO8.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-D0nNJGNj.js";
+
+export { SUPPORTED_CLIS };

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import { t as invokedCliName } from "./invokedCli-uqM2YYA7.js";
 import { n as logger } from "./logger-CDIsZ-Pp.js";
-import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-BvR6tV3u.js";
+import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-DVv-WHIp.js";
 import { argv } from "process";
 import { execFileSync, spawn } from "child_process";
 import ms from "ms";
@@ -481,7 +481,7 @@ function buildRustArgs(argv, cliFromScript, supportedClis) {
 	const rawArg = process.argv[2];
 	const managerCommands = !invokedCliName(process.argv);
 	const isHelpFlag = rawArg === "-h" || rawArg === "--help";
-	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-B-WoBVhk.js");
+	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-B2QAXBkH.js");
 	if (isHelpFlag && process.argv.length === 3) {
 		await cmdHelp(managerCommands);
 		process.exit(0);
@@ -523,7 +523,7 @@ if (config.useRust) {
 		}
 	}
 	if (rustBinary) {
-		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-DLFqRE8W.js");
+		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-Dy_o9sj6.js");
 		const rustArgs = buildRustArgs(process.argv, config.cli, SUPPORTED_CLIS);
 		if (config.verbose) {
 			console.log(`[rust] Using binary: ${rustBinary}`);

package/dist/index.js

@@ -1,6 +1,6 @@
-import { a as removeControlCharacters, i as AgentContext, n as agentYes, r as config, t as CLIS_CONFIG } from "./ts-s3wYccKf.js";
+import { a as removeControlCharacters, i as AgentContext, n as agentYes, r as config, t as CLIS_CONFIG } from "./ts-DBwi5BWW.js";
 import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-BvR6tV3u.js";
+import "./versionChecker-DVv-WHIp.js";
 import "./pidStore-BfoBWUjc.js";
 import "./globalPidIndex-DlmmJlO8.js";
 

package/dist/{schedule-C2RMA3qm.js → schedule-BPUyALF_.js}

@@ -1,9 +1,9 @@
-import "./ts-s3wYccKf.js";
+import "./ts-DBwi5BWW.js";
 import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-BvR6tV3u.js";
+import "./versionChecker-DVv-WHIp.js";
 import "./pidStore-BfoBWUjc.js";
 import "./globalPidIndex-DlmmJlO8.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DFBATC85.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-D0nNJGNj.js";
 import { l as resolveSpawnCwd } from "./workspaceConfig-D3OH7and.js";
 import { createHash } from "node:crypto";
 
@@ -141,4 +141,4 @@ async function cmdSchedule(rest) {
 
 //#endregion
 export { cmdSchedule };
-//# sourceMappingURL=schedule-C2RMA3qm.js.map
+//# sourceMappingURL=schedule-BPUyALF_.js.map

package/dist/{serve-mLqsRwfR.js → serve-DAuLdt_d.js}

@@ -1,16 +1,16 @@
-import "./ts-s3wYccKf.js";
+import "./ts-DBwi5BWW.js";
 import "./logger-CDIsZ-Pp.js";
-import { r as getInstalledPackage } from "./versionChecker-BvR6tV3u.js";
+import { r as getInstalledPackage } from "./versionChecker-DVv-WHIp.js";
 import "./pidStore-BfoBWUjc.js";
 import { a as updateGlobalPidStatus } from "./globalPidIndex-DlmmJlO8.js";
 import { t as pgidForWrapper } from "./reaper-C-eWAxIj.js";
 import "./configShared-CEyhl0WH.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DFBATC85.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-D0nNJGNj.js";
 import "./e2e-Bfw7qL9O.js";
 import "./webrtcLink-CBZkZ-LT.js";
 import "./remotes-T6nf0t3K.js";
 import { c as isProvisionAllowed, i as getSpawnHook, l as resolveSpawnCwd, r as getProvisionRoot, s as hasSpawnHook } from "./workspaceConfig-D3OH7and.js";
-import { A as writeToIpc, D as snapshotStatus, S as resolveOne, b as renderRawLog, c as extractNeedsInput, h as listRecords, i as controlCodeFromName, l as extractTaskCounts, o as deriveLiveStatus, v as readNotes, y as readPtysize } from "./subcommands-DWeo7ZLc.js";
+import { A as writeToIpc, D as snapshotStatus, S as resolveOne, b as renderRawLog, c as extractNeedsInput, h as listRecords, i as controlCodeFromName, l as extractTaskCounts, o as deriveLiveStatus, v as readNotes, y as readPtysize } from "./subcommands-VimbMSTG.js";
 import { r as spawnRejectionReason } from "./spawnGate-B_VDMXYL.js";
 import yargs from "yargs";
 import { mkdir, open, readFile, stat, unlink, writeFile } from "fs/promises";
@@ -1445,4 +1445,4 @@ Options:
 
 //#endregion
 export { cmdServe };
-//# sourceMappingURL=serve-mLqsRwfR.js.map
+//# sourceMappingURL=serve-DAuLdt_d.js.map

package/dist/{setup-BtqKZx3q.js → setup-YLHUtCC0.js}

@@ -32,7 +32,7 @@ async function cmdSetup(rest) {
 	if (!existsSync(abs)) process.stderr.write(`  note: that directory doesn't exist yet — create it, or agents spawned there will fail\n`);
 	if (noShare) return 0;
 	process.stdout.write(`\nsharing this machine to agent-yes.com…\n`);
-	const { cmdServe } = await import("./serve-mLqsRwfR.js");
+	const { cmdServe } = await import("./serve-DAuLdt_d.js");
 	return cmdServe([
 		"install",
 		"--share",
@@ -42,4 +42,4 @@ async function cmdSetup(rest) {
 
 //#endregion
 export { cmdSetup };
-//# sourceMappingURL=setup-BtqKZx3q.js.map
+//# sourceMappingURL=setup-YLHUtCC0.js.map

package/dist/{subcommands-B-WoBVhk.js → subcommands-B2QAXBkH.js}

@@ -4,6 +4,6 @@ import "./configShared-CEyhl0WH.js";
 import "./e2e-Bfw7qL9O.js";
 import "./webrtcLink-CBZkZ-LT.js";
 import "./remotes-T6nf0t3K.js";
-import { A as writeToIpc, C as resolveReadWindow, D as snapshotStatus, E as runSubcommand, O as stopTipForCli, S as resolveOne, T as restartHintLines, _ as menuSelectKeys, a as cursorAbs, b as renderRawLog, c as extractNeedsInput, d as isAgentStuck, f as isExitRequest, g as matchKeyword, h as listRecords, i as controlCodeFromName, k as writeKeysPaced, l as extractTaskCounts, m as isSubcommand, n as READ_PAGE_DEFAULT, o as deriveLiveStatus, p as isPidAlive, r as cmdHelp, s as extractMenu, t as GRACEFUL_EXIT_COMMANDS, u as finalizedLines, v as readNotes, w as resolveResumeArgs, x as renderRawLogLines, y as readPtysize } from "./subcommands-DWeo7ZLc.js";
+import { A as writeToIpc, C as resolveReadWindow, D as snapshotStatus, E as runSubcommand, O as stopTipForCli, S as resolveOne, T as restartHintLines, _ as menuSelectKeys, a as cursorAbs, b as renderRawLog, c as extractNeedsInput, d as isAgentStuck, f as isExitRequest, g as matchKeyword, h as listRecords, i as controlCodeFromName, k as writeKeysPaced, l as extractTaskCounts, m as isSubcommand, n as READ_PAGE_DEFAULT, o as deriveLiveStatus, p as isPidAlive, r as cmdHelp, s as extractMenu, t as GRACEFUL_EXIT_COMMANDS, u as finalizedLines, v as readNotes, w as resolveResumeArgs, x as renderRawLogLines, y as readPtysize } from "./subcommands-VimbMSTG.js";
 
 export { cmdHelp, isSubcommand, runSubcommand };

package/dist/{subcommands-DWeo7ZLc.js → subcommands-VimbMSTG.js}

@@ -597,15 +597,15 @@ async function runSubcommand(argv) {
 			case "restart": return await cmdRestart(rest);
 			case "note": return await cmdNote(rest);
 			case "serve": {
-				const { cmdServe } = await import("./serve-mLqsRwfR.js");
+				const { cmdServe } = await import("./serve-DAuLdt_d.js");
 				return cmdServe(rest);
 			}
 			case "setup": {
-				const { cmdSetup } = await import("./setup-BtqKZx3q.js");
+				const { cmdSetup } = await import("./setup-YLHUtCC0.js");
 				return cmdSetup(rest);
 			}
 			case "schedule": {
-				const { cmdSchedule } = await import("./schedule-C2RMA3qm.js");
+				const { cmdSchedule } = await import("./schedule-BPUyALF_.js");
 				return cmdSchedule(rest);
 			}
 			case "remote": {
@@ -3025,4 +3025,4 @@ async function cmdResultSet(rest) {
 
 //#endregion
 export { writeToIpc as A, resolveReadWindow as C, snapshotStatus as D, runSubcommand as E, stopTipForCli as O, resolveOne as S, restartHintLines as T, menuSelectKeys as _, cursorAbs as a, renderRawLog as b, extractNeedsInput as c, isAgentStuck as d, isExitRequest as f, matchKeyword as g, listRecords as h, controlCodeFromName as i, writeKeysPaced as k, extractTaskCounts as l, isSubcommand as m, READ_PAGE_DEFAULT as n, deriveLiveStatus as o, isPidAlive as p, cmdHelp as r, extractMenu as s, GRACEFUL_EXIT_COMMANDS as t, finalizedLines as u, readNotes as v, resolveResumeArgs as w, renderRawLogLines as x, readPtysize as y };
-//# sourceMappingURL=subcommands-DWeo7ZLc.js.map
+//# sourceMappingURL=subcommands-VimbMSTG.js.map

package/dist/{ts-s3wYccKf.js → ts-DBwi5BWW.js}

@@ -1,5 +1,5 @@
 import { n as logger, t as addTransport } from "./logger-CDIsZ-Pp.js";
-import { r as getInstalledPackage } from "./versionChecker-BvR6tV3u.js";
+import { r as getInstalledPackage } from "./versionChecker-DVv-WHIp.js";
 import { t as agentYesHome } from "./agentYesHome-_eJa3DaX.js";
 import { i as shouldUseLock, r as releaseLock, t as acquireLock } from "./runningLock-V4qvXgAw.js";
 import { t as PidStore } from "./pidStore-BfoBWUjc.js";
@@ -289,8 +289,14 @@ var pty_default = pty;
 
 //#endregion
 //#region ts/removeControlCharacters.ts
+const ESC = String.fromCharCode(27);
+const C1 = String.fromCharCode(155);
+const BACKSLASH = String.fromCharCode(92);
+const ST_PATTERN_SOURCE = ESC + BACKSLASH + BACKSLASH;
+const OSC_PATTERN = new RegExp(ESC + "][^\x07\x1B]*(?:\x07|" + ST_PATTERN_SOURCE + ")", "g");
+const CSI_PATTERN = new RegExp("[" + ESC + C1 + "][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]", "g");
 function removeControlCharacters(str) {
-	return str.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "");
+	return str.replace(OSC_PATTERN, "").replace(CSI_PATTERN, "");
 }
 
 //#endregion
@@ -474,6 +480,10 @@ var IdleWaiter = class {
 		this.lastActivityTime = Date.now();
 		return this;
 	}
+	/** Milliseconds since the last ping. */
+	idleTimeMs() {
+		return Date.now() - this.lastActivityTime;
+	}
 	async wait(ms) {
 		while (this.lastActivityTime >= Date.now() - ms) await new Promise((resolve) => setTimeout(resolve, this.checkInterval));
 	}
@@ -511,8 +521,12 @@ async function sendEnter(context, waitms = 1e3) {
 	logger.debug(`sendEnter| idleWait took ${String(Date.now() - st)}ms`);
 	context.nextStdout.unready();
 	context.shell.write("\r");
+	context.idleWaiter.ping();
 	for (const ms of [1e3, 3e3]) await Promise.race([context.nextStdout.wait(), new Promise((resolve) => setTimeout(() => {
-		if (!context.nextStdout.isReady) context.shell.write("\r");
+		if (!context.nextStdout.isReady) {
+			context.shell.write("\r");
+			context.idleWaiter.ping();
+		}
 		resolve();
 	}, ms))]);
 }
@@ -543,11 +557,21 @@ async function sendMessage(context, message, { waitForReady = true } = {}) {
 const AUTO_RETRY_BASE_SECS = 8;
 const AUTO_RETRY_MAX_DELAY_SECS = 256;
 const AUTO_RETRY_GIVE_UP_MS = 8 * 3600 * 1e3;
+const AUTO_RETRY_MIN_IDLE_MS = 5e3;
 /** Backoff (ms) before the Nth consecutive auto-retry — doubles, then caps. */
 function autoRetryBackoffMs(streak) {
 	const shift = Math.min(streak, 20);
 	return Math.min(AUTO_RETRY_BASE_SECS * 2 ** shift, AUTO_RETRY_MAX_DELAY_SECS) * 1e3;
 }
+/**
+* Whether a scheduled auto-retry may actually fire: the agent must be sitting
+* idle at a ready prompt (not mid-work) AND the terminal must have been quiet
+* for at least `minIdleMs` — see AUTO_RETRY_MIN_IDLE_MS. Mirrors Rust's
+* should_fire_retry in rs/src/context.rs.
+*/
+function shouldFireRetry(working, ready, idleMs, minIdleMs) {
+	return !working && ready && idleMs >= minIdleMs;
+}
 
 //#endregion
 //#region ts/core/logging.ts
@@ -1503,17 +1527,13 @@ async function agentYes({ cli, cliArgs = [], skipPermissions = false, prompt, ro
 					retryNextAt = null;
 					retryStartedAt = null;
 					retryStreak = 0;
-				} else if (now >= retryNextAt) {
-					const working = conf.working?.some((rx) => rx.test(autoRetryScreen)) ?? false;
-					const readyNow = conf.ready?.some((rx) => rx.test(autoRetryScreen)) ?? false;
-					if (working || !readyNow) retryNextAt = now + 500;
-					else {
-						retryStreak += 1;
-						logger.warn(`[${cli}-yes] auto-retry: typing 'retry' (attempt ${retryStreak})`);
-						ctx.messageContext.shell.write("retry\r");
-						ctx.idleWaiter.ping();
-						retryNextAt = now + autoRetryBackoffMs(retryStreak);
-					}
+				} else if (now >= retryNextAt) if (!shouldFireRetry(conf.working?.some((rx) => rx.test(autoRetryScreen)) ?? false, conf.ready?.some((rx) => rx.test(autoRetryScreen)) ?? false, ctx.idleWaiter.idleTimeMs(), AUTO_RETRY_MIN_IDLE_MS)) retryNextAt = now + 500;
+				else {
+					retryStreak += 1;
+					logger.warn(`[${cli}-yes] auto-retry: typing 'retry' (attempt ${retryStreak})`);
+					ctx.messageContext.shell.write("retry\r");
+					ctx.idleWaiter.ping();
+					retryNextAt = now + autoRetryBackoffMs(retryStreak);
 				}
 			}
 			if (rendered === lastHeartbeatRendered) return;
@@ -1689,10 +1709,11 @@ async function agentYes({ cli, cliArgs = [], skipPermissions = false, prompt, ro
 		writable: new WritableStream({ write: async (data) => {
 			await ctx.stdinReady.wait();
 			shell.write(data);
+			ctx.idleWaiter.ping();
 		} }),
 		readable: xtermProxy.readable
-	}).forEach(() => {
-		ctx.idleWaiter.ping();
+	}).forEach((chunk) => {
+		if (removeControlCharacters(chunk).trim()) ctx.idleWaiter.ping();
 		pidStore.updateStatus(shell.pid, "active").catch(() => null);
 		ctx.nextStdout.ready();
 	}).forkTo(async function rawLogger(f) {
@@ -1803,4 +1824,4 @@ function sleep(ms) {
 
 //#endregion
 export { removeControlCharacters as a, AgentContext as i, agentYes as n, config as r, CLIS_CONFIG as t };
-//# sourceMappingURL=ts-s3wYccKf.js.map
+//# sourceMappingURL=ts-DBwi5BWW.js.map

package/dist/{versionChecker-BvR6tV3u.js → versionChecker-DVv-WHIp.js}

@@ -7,7 +7,7 @@ import { fileURLToPath } from "url";
 
 //#region package.json
 var name = "claude-yes";
-var version = "1.167.0";
+var version = "1.168.0";
 
 //#endregion
 //#region ts/versionChecker.ts
@@ -215,4 +215,4 @@ async function displayVersion() {
 
 //#endregion
 export { versionString as i, displayVersion as n, getInstalledPackage as r, checkAndAutoUpdate as t };
-//# sourceMappingURL=versionChecker-BvR6tV3u.js.map
+//# sourceMappingURL=versionChecker-DVv-WHIp.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-yes",
-  "version": "1.167.0",
+  "version": "1.168.0",
   "description": "A wrapper tool that automates interactions with various AI CLI tools by automatically handling common prompts and responses.",
   "keywords": [
     "ai",

package/ts/autoRetry.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { AUTO_RETRY_MAX_DELAY_SECS, autoRetryBackoffMs } from "./autoRetry.ts";
+import { AUTO_RETRY_MAX_DELAY_SECS, autoRetryBackoffMs, shouldFireRetry } from "./autoRetry.ts";
 
 describe("autoRetryBackoffMs", () => {
   it("doubles 8,16,32,…,256 then caps", () => {
@@ -17,3 +17,18 @@ describe("autoRetryBackoffMs", () => {
     expect(Number.isFinite(autoRetryBackoffMs(1000))).toBe(true);
   });
 });
+
+describe("shouldFireRetry", () => {
+  it("requires ready + not working + past the idle window", () => {
+    // Busy — never fire even if otherwise ready and quiet.
+    expect(shouldFireRetry(true, true, 10_000, 5_000)).toBe(false);
+    // Not at a recognized ready prompt — don't fire.
+    expect(shouldFireRetry(false, false, 10_000, 5_000)).toBe(false);
+    // Ready and idle, but the quiet window hasn't elapsed yet (user may still
+    // be mid-typing) — defer.
+    expect(shouldFireRetry(false, true, 4_999, 5_000)).toBe(false);
+    // Ready, idle, and past the quiet window — fire.
+    expect(shouldFireRetry(false, true, 5_000, 5_000)).toBe(true);
+    expect(shouldFireRetry(false, true, 10_000, 5_000)).toBe(true);
+  });
+});

package/ts/autoRetry.ts

@@ -8,9 +8,32 @@ export const AUTO_RETRY_BASE_SECS = 8; // first backoff; doubles each consecutiv
 export const AUTO_RETRY_MAX_DELAY_SECS = 256; // cap: 8,16,32,…,256 then hold
 export const AUTO_RETRY_GIVE_UP_MS = 8 * 3600 * 1000; // stop after 8h (claude's usage window is ~5h)
 
+// Minimum quiet time (no CLI output, no forwarded stdin — see idleWaiter.ping()
+// call sites) required before a scheduled auto-retry may actually fire, on top
+// of the backoff delay above. The backoff schedule alone can elapse while the
+// user is mid-typing into the prompt; typing "retry" + Enter over that would
+// submit a mangled line. Deliberately short — this only debounces against
+// active typing, not a real excuse to delay recovery.
+export const AUTO_RETRY_MIN_IDLE_MS = 5_000;
+
 /** Backoff (ms) before the Nth consecutive auto-retry — doubles, then caps. */
 export function autoRetryBackoffMs(streak: number): number {
   const shift = Math.min(streak, 20); // guard against absurd streaks blowing up 2 ** n
   const secs = Math.min(AUTO_RETRY_BASE_SECS * 2 ** shift, AUTO_RETRY_MAX_DELAY_SECS);
   return secs * 1000;
 }
+
+/**
+ * Whether a scheduled auto-retry may actually fire: the agent must be sitting
+ * idle at a ready prompt (not mid-work) AND the terminal must have been quiet
+ * for at least `minIdleMs` — see AUTO_RETRY_MIN_IDLE_MS. Mirrors Rust's
+ * should_fire_retry in rs/src/context.rs.
+ */
+export function shouldFireRetry(
+  working: boolean,
+  ready: boolean,
+  idleMs: number,
+  minIdleMs: number,
+): boolean {
+  return !working && ready && idleMs >= minIdleMs;
+}

package/ts/idleWaiter.spec.ts

@@ -59,6 +59,18 @@ describe("IdleWaiter", () => {
     expect(result).toBe(waiter);
   });
 
+  it("idleTimeMs reflects elapsed time since the last ping", async () => {
+    const waiter = new IdleWaiter();
+    waiter.ping();
+    expect(waiter.idleTimeMs()).toBeLessThan(20);
+
+    await new Promise((r) => setTimeout(r, 50));
+    expect(waiter.idleTimeMs()).toBeGreaterThanOrEqual(50);
+
+    waiter.ping();
+    expect(waiter.idleTimeMs()).toBeLessThan(20);
+  });
+
   it("should wait until idle period has passed", async () => {
     const waiter = new IdleWaiter();
     waiter.checkInterval = 10;

package/ts/idleWaiter.ts

@@ -24,6 +24,11 @@ export class IdleWaiter {
     return this;
   }
 
+  /** Milliseconds since the last ping. */
+  idleTimeMs() {
+    return Date.now() - this.lastActivityTime;
+  }
+
   async wait(ms: number) {
     while (this.lastActivityTime >= Date.now() - ms)
       await new Promise((resolve) => setTimeout(resolve, this.checkInterval));

package/ts/index.ts

@@ -18,7 +18,12 @@ import { logger } from "./logger.ts";
 import { createFifoStream } from "./beta/fifo.ts";
 import { PidStore } from "./pidStore.ts";
 import { sendEnter, sendMessage } from "./core/messaging.ts";
-import { AUTO_RETRY_GIVE_UP_MS, autoRetryBackoffMs } from "./autoRetry.ts";
+import {
+  AUTO_RETRY_GIVE_UP_MS,
+  AUTO_RETRY_MIN_IDLE_MS,
+  autoRetryBackoffMs,
+  shouldFireRetry,
+} from "./autoRetry.ts";
 import {
   initializeLogPaths,
   setupDebugLogging,
@@ -805,8 +810,12 @@ export default async function agentYes({
         } else if (now >= retryNextAt) {
           const working = conf.working?.some((rx: RegExp) => rx.test(autoRetryScreen)) ?? false;
           const readyNow = conf.ready?.some((rx: RegExp) => rx.test(autoRetryScreen)) ?? false;
-          if (working || !readyNow) {
-            retryNextAt = now + 500; // busy / not at prompt — re-check shortly
+          // Also require a few quiet seconds on top of the backoff delay, so a
+          // scheduled retry doesn't collide with a line the user is actively
+          // typing into the prompt (see AUTO_RETRY_MIN_IDLE_MS).
+          const idleMs = ctx.idleWaiter.idleTimeMs();
+          if (!shouldFireRetry(working, readyNow, idleMs, AUTO_RETRY_MIN_IDLE_MS)) {
+            retryNextAt = now + 500; // busy / not at prompt / still active — re-check shortly
           } else {
             retryStreak += 1;
             logger.warn(`[${cli}-yes] auto-retry: typing 'retry' (attempt ${retryStreak})`);
@@ -1096,13 +1105,22 @@ export default async function agentYes({
         write: async (data) => {
           await ctx.stdinReady.wait();
           shell.write(data);
+          // Forwarded user input counts as activity too (mirrors the Rust
+          // runtime's ping on stdin forward) — the auto-retry idle gate below
+          // must not fire while the user is actively typing.
+          ctx.idleWaiter.ping();
         },
       }),
       readable: xtermProxy.readable,
     })
 
-    .forEach(() => {
-      ctx.idleWaiter.ping();
+    .forEach((chunk) => {
+      // Only ping activity if there's visible content (not just ANSI/cursor
+      // control sequences) — mirrors the Rust runtime's handle_output gate.
+      // Without this, periodic control-only chatter (e.g. cursor position
+      // queries) would keep resetting the auto-retry idle clock and the
+      // scheduled retry could defer indefinitely without ever firing.
+      if (removeControlCharacters(chunk).trim()) ctx.idleWaiter.ping();
       pidStore.updateStatus(shell.pid, "active").catch(() => null);
       ctx.nextStdout.ready();
     })

package/ts/removeControlCharacters.spec.ts

@@ -70,4 +70,25 @@ describe("removeControlCharacters", () => {
     const expected = "TextClearLine";
     expect(removeControlCharacters(input)).toBe(expected);
   });
+
+  it("should remove OSC sequences (e.g. window title updates)", () => {
+    const input = "Before\u001b]0;window title\u0007After";
+    const expected = "BeforeAfter";
+    expect(removeControlCharacters(input)).toBe(expected);
+  });
+
+  it("does NOT strip trailing text when an OSC sequence is unterminated (no BEL)", () => {
+    const input = "Before\u001b]0;titleAfter";
+    expect(removeControlCharacters(input)).toBe(input);
+  });
+
+  it("should remove OSC sequences terminated by ST (ESC backslash), not just BEL", () => {
+    const input = "Before\u001b]8;;https://example.com\u001b\\After";
+    expect(removeControlCharacters(input)).toBe("BeforeAfter");
+  });
+
+  it("does not let an ST-terminated OSC run on and eat real text before a later BEL", () => {
+    const input = "Before\u001b]0;t\u001b\\visible\u0007After";
+    expect(removeControlCharacters(input)).toBe("Beforevisible\u0007After");
+  });
 });

package/ts/removeControlCharacters.ts

@@ -1,8 +1,34 @@
+const ESC = String.fromCharCode(0x1b);
+const C1 = String.fromCharCode(0x9b);
+const BEL = String.fromCharCode(0x07);
+const BACKSLASH = String.fromCharCode(0x5c);
+// String Terminator (ESC \) as REGEX SOURCE text: a literal backslash inside a
+// regex pattern is itself an escape character, so matching one literal
+// backslash requires two backslash characters in the pattern source.
+const ST_PATTERN_SOURCE = ESC + BACKSLASH + BACKSLASH;
+
+// OSC sequences (window/tab title updates, hyperlinks, etc.): ESC ] ...
+// terminated by either BEL or ST (ESC \) — both are valid per-spec and used
+// by real terminal apps. Not covered by the CSI pattern below — without this,
+// e.g. a periodic title update would count as "visible" content to callers
+// that gate activity on non-empty output.
+// The terminator is required, not optional: an unterminated ESC]... (the
+// terminator never arrives, e.g. a truncated chunk boundary) must NOT strip
+// through to end-of-string — that would eat real trailing text as if it were
+// part of the title sequence. The body excludes ESC too (not just BEL) so an
+// ST-terminated sequence can't accidentally run on and swallow real text up
+// to some unrelated, later BEL.
+const OSC_PATTERN = new RegExp(
+  ESC + "][^" + BEL + ESC + "]*(?:" + BEL + "|" + ST_PATTERN_SOURCE + ")",
+  "g",
+);
+
+// Matches control characters in the C0 and C1 ranges, including Delete (U+007F)
+const CSI_PATTERN = new RegExp(
+  "[" + ESC + C1 + "][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]",
+  "g",
+);
+
 export function removeControlCharacters(str: string): string {
-  // Matches control characters in the C0 and C1 ranges, including Delete (U+007F)
-  return str.replace(
-    // eslint-disable-next-line no-control-regex This is a control regex
-    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-    "",
-  );
+  return str.replace(OSC_PATTERN, "").replace(CSI_PATTERN, "");
 }

package/dist/SUPPORTED_CLIS-DLFqRE8W.js

@@ -1,8 +0,0 @@
-import "./ts-s3wYccKf.js";
-import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-BvR6tV3u.js";
-import "./pidStore-BfoBWUjc.js";
-import "./globalPidIndex-DlmmJlO8.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DFBATC85.js";
-
-export { SUPPORTED_CLIS };