very-happy-cli 0.2.120 → 0.2.122

package/dist/{index-BlkIz9BQ.cjs → index-DKRU6E-x.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-7ZSxm6Pi.cjs');
+var persistence = require('./types-Jag0GwhO.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -3406,9 +3406,7 @@ class StreamRelay {
     if (e.type === "content_block_start") {
       const kind = e.content_block?.type === "thinking" ? "thinking" : e.content_block?.type === "text" ? "text" : null;
       if (!kind || !this.currentMid || typeof e.index !== "number") return;
-      this.flushPending();
-      this.openBlocks.add(e.index);
-      this.send({ t: "block-start", mid: this.currentMid, idx: e.index, kind });
+      this.openBlock(this.currentMid, e.index, kind);
       return;
     }
     if (e.type === "content_block_delta") {
@@ -3416,16 +3414,12 @@ class StreamRelay {
       const text = delta?.type === "text_delta" ? delta.text : delta?.type === "thinking_delta" ? delta.thinking : null;
       if (typeof text !== "string" || text.length === 0) return;
       if (!this.currentMid || typeof e.index !== "number") return;
-      if (!this.openBlocks.has(e.index)) return;
       this.appendDelta(this.currentMid, e.index, text);
       return;
     }
     if (e.type === "content_block_stop") {
       if (!this.currentMid || typeof e.index !== "number") return;
-      if (!this.openBlocks.has(e.index)) return;
-      this.flushPending();
-      this.openBlocks.delete(e.index);
-      this.send({ t: "block-end", mid: this.currentMid, idx: e.index });
+      this.closeBlock(this.currentMid, e.index);
       return;
     }
     if (e.type === "message_delta") {
@@ -3436,7 +3430,29 @@ class StreamRelay {
       return;
     }
   }
+  // ---- Block-level API (see module comment) --------------------------------
+  /** Open a draft block. A different `mid` than the one currently open closes
+   *  whatever the previous message left open, exactly like the SDK's
+   *  `message_start` does. Re-opening an already open block is a no-op. */
+  openBlock(mid, idx, kind) {
+    this.idleSinceTurnEnd = false;
+    if (this.currentMid !== mid) {
+      this.flushPending();
+      this.closeOpenBlocks();
+      this.currentMid = mid;
+    }
+    if (this.openBlocks.has(idx)) return;
+    this.flushPending();
+    this.openBlocks.add(idx);
+    this.send({ t: "block-start", mid, idx, kind });
+  }
+  /** Append text to an OPEN block; deltas for a block that was never opened
+   *  (or belongs to another message) are dropped — the SDK path relies on
+   *  this to ignore `input_json_delta` for tool_use blocks. */
   appendDelta(mid, idx, text) {
+    this.idleSinceTurnEnd = false;
+    if (text.length === 0) return;
+    if (this.currentMid !== mid || !this.openBlocks.has(idx)) return;
     if (this.pending && (this.pending.mid !== mid || this.pending.idx !== idx)) {
       this.flushPending();
     }
@@ -3456,6 +3472,22 @@ class StreamRelay {
       }, STREAM_FLUSH_MS);
     }
   }
+  /** Close an open block: pending text goes out first, then `block-end`. */
+  closeBlock(mid, idx) {
+    this.idleSinceTurnEnd = false;
+    if (this.currentMid !== mid || !this.openBlocks.has(idx)) return;
+    this.flushPending();
+    this.openBlocks.delete(idx);
+    this.send({ t: "block-end", mid, idx });
+  }
+  /** Merge quantified progress; flushed on the progress cadence. */
+  setProgress(patch) {
+    this.idleSinceTurnEnd = false;
+    this.progress = { ...this.progress, ...patch };
+    this.progressDirty = true;
+    this.scheduleProgress();
+  }
+  // -------------------------------------------------------------------------
   flushPending() {
     if (this.flushHandle !== null) {
       this.clearTimer(this.flushHandle);
@@ -3478,11 +3510,6 @@ class StreamRelay {
     }
     this.openBlocks.clear();
   }
-  setProgress(patch) {
-    this.progress = { ...this.progress, ...patch };
-    this.progressDirty = true;
-    this.scheduleProgress();
-  }
   scheduleProgress() {
     if (this.progressHandle !== null) return;
     this.progressHandle = this.setTimer(() => {
@@ -4325,10 +4352,17 @@ class MessageQueue2 {
   waiter = null;
   closed = false;
   onMessageHandler = null;
+  /**
+   * B-332: fired for every item the queue itself destroys before it was ever
+   * handed to the runner. The runner wires this to a queue-cancel tombstone
+   * so the web stops painting a silently-lost message as "queued".
+   */
+  onDiscardHandler = null;
   modeHasher;
-  constructor(modeHasher, onMessageHandler = null) {
+  constructor(modeHasher, onMessageHandler = null, onDiscardHandler = null) {
     this.modeHasher = modeHasher;
     this.onMessageHandler = onMessageHandler;
+    this.onDiscardHandler = onDiscardHandler;
     persistence.logger.debug(`[MessageQueue2] Initialized`);
   }
   /**
@@ -4337,6 +4371,19 @@ class MessageQueue2 {
   setOnMessage(handler) {
     this.onMessageHandler = handler;
   }
+  /**
+   * Set a handler that will be called when messages are discarded without ever
+   * being processed (B-332).
+   */
+  setOnDiscard(handler) {
+    this.onDiscardHandler = handler;
+  }
+  /** Report the current items as destroyed for `reason` (caller clears next). */
+  notifyDiscard(reason) {
+    if (this.queue.length === 0) return;
+    const entries = this.queue.map((item) => ({ sourceId: item.sourceId, reason }));
+    this.onDiscardHandler?.(entries);
+  }
   /**
    * Push a message to the queue with a mode and an optional list of
    * attachments that travel with this message.
@@ -4404,6 +4451,7 @@ class MessageQueue2 {
     }
     const modeHash = this.modeHasher(mode);
     persistence.logger.debug(`[MessageQueue2] pushIsolateAndClear() called with mode hash: ${modeHash} - clearing ${this.queue.length} pending messages`);
+    this.notifyDiscard("cleared");
     this.queue = [];
     this.queue.push({
       message,
@@ -4455,6 +4503,7 @@ class MessageQueue2 {
    */
   reset() {
     persistence.logger.debug(`[MessageQueue2] reset() called. Clearing ${this.queue.length} messages`);
+    this.notifyDiscard("aborted");
     this.queue = [];
     this.closed = false;
     this.waiter = null;
@@ -7352,7 +7401,7 @@ function parseJsonObject(text) {
     return null;
   }
 }
-function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BlkIz9BQ.cjs', document.baseURI).href))).resolve(s)) {
+function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DKRU6E-x.cjs', document.baseURI).href))).resolve(s)) {
   const platformArch = `${platform}-${arch}`;
   const candidates = [
     `@anthropic-ai/claude-agent-sdk-${platformArch}/claude`,
@@ -9998,6 +10047,27 @@ async function openUserScopedSocket(token, options = {}) {
   };
 }
 
+const RPC_RATE_LIMIT_ERROR = "RPC rate limit reached";
+const RPC_ACCOUNT_RATE_LIMIT_ERROR = "RPC account rate limit reached";
+const RPC_RATE_RETRY_MIN_DELAY_MS = 2e3;
+const RPC_RATE_RETRY_MAX_DELAY_MS = 6e4;
+const RPC_RATE_MAX_RETRIES = 2;
+function isRpcRateLimitAck(ack) {
+  if (!ack || typeof ack !== "object") return false;
+  const a = ack;
+  if (a.ok !== false) return false;
+  if (a.code === "rpc_rate_limited" || a.code === "rpc_account_rate_limited") return true;
+  return a.error === RPC_RATE_LIMIT_ERROR || a.error === RPC_ACCOUNT_RATE_LIMIT_ERROR;
+}
+function rpcRateRetryDelayMs(attempt, retryAfterMs, random = Math.random()) {
+  if (typeof retryAfterMs === "number" && Number.isFinite(retryAfterMs) && retryAfterMs > 0) {
+    return Math.min(RPC_RATE_RETRY_MAX_DELAY_MS, Math.round(retryAfterMs * (1 + random * 0.5)));
+  }
+  const exponent = Math.max(0, Math.min(attempt, 32) - 1);
+  const ceiling = Math.min(RPC_RATE_RETRY_MIN_DELAY_MS * 2 ** exponent, RPC_RATE_RETRY_MAX_DELAY_MS);
+  return Math.round(RPC_RATE_RETRY_MIN_DELAY_MS + random * (ceiling - RPC_RATE_RETRY_MIN_DELAY_MS));
+}
+
 const PERMISSION_OPS_CLIENT = "session-ops";
 const PERMISSION_RPC_TIMEOUT_MS = 3e4;
 const SETTLE_TIMEOUT_MS = 5e3;
@@ -10029,6 +10099,9 @@ function interpretPermissionAck(ack, decryptResult) {
     if (/timed? ?out/i.test(message)) {
       return { status: "timeout", message };
     }
+    if (isRpcRateLimitAck(ack)) {
+      return { status: "rate-limited", message, retryAfterMs: rpcRateRetryDelayMs(1, ack.retryAfterMs, 0) };
+    }
     return { status: "rejected", message };
   }
   let body = null;
@@ -10090,15 +10163,24 @@ async function resolvePermissionRequest(sessionId, requestId, verdict, deps = {}
   const params = persistence.encodeBase64(persistence.encrypt(key, persisted.encryptionVariant, payload));
   const transport = await (deps.openTransport ?? openUserScopedSocket)(token);
   const rpcTimeoutMs = deps.rpcTimeoutMs ?? PERMISSION_RPC_TIMEOUT_MS;
+  const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let ack;
   try {
-    ack = await withDeadline(
-      transport.rpcCall({ method: `${sessionId}:permission`, params }, rpcTimeoutMs),
-      rpcTimeoutMs + RPC_DEADLINE_GRACE_MS,
-      `permission RPC did not settle within ${rpcTimeoutMs}ms`
-    );
-  } catch (error) {
-    ack = { ok: false, error: error instanceof Error ? error.message : "RPC call failed" };
+    for (let attempt = 1; ; attempt++) {
+      try {
+        ack = await withDeadline(
+          transport.rpcCall({ method: `${sessionId}:permission`, params }, rpcTimeoutMs),
+          rpcTimeoutMs + RPC_DEADLINE_GRACE_MS,
+          `permission RPC did not settle within ${rpcTimeoutMs}ms`
+        );
+      } catch (error) {
+        ack = { ok: false, error: error instanceof Error ? error.message : "RPC call failed" };
+      }
+      if (!isRpcRateLimitAck(ack) || attempt > RPC_RATE_MAX_RETRIES) break;
+      const waitMs = rpcRateRetryDelayMs(attempt, ack.retryAfterMs, (deps.random ?? Math.random)());
+      deps.onRateLimited?.({ attempt, waitMs, serverError: ack.error ?? "RPC rate limit reached" });
+      await sleep(waitMs);
+    }
   } finally {
     transport.close();
   }
@@ -10106,7 +10188,6 @@ async function resolvePermissionRequest(sessionId, requestId, verdict, deps = {}
   if (outcome.status !== "acknowledged") {
     return { sessionId, requestId, payload, outcome };
   }
-  const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const deadline = now() + (deps.settleTimeoutMs ?? SETTLE_TIMEOUT_MS);
   let settled = false;
   for (; ; ) {
@@ -11237,7 +11318,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const run = deps.run ?? (async (input) => {
-    const { query } = await Promise.resolve().then(function () { return require('./index-CYizH-JC.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-BHg0P9cY.cjs'); });
     return runSideQuestion(query, input);
   });
   const slots = /* @__PURE__ */ new Map();
@@ -11339,7 +11420,7 @@ const MAX_TITLE_CHARS = 60;
 const GENERATION_TIMEOUT_MS = 3e4;
 function resolveClaudeBinary() {
   try {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BlkIz9BQ.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DKRU6E-x.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(persistence.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -11919,6 +12000,7 @@ async function runClaude(credentials, options = {}) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
+    void session.cancelUndeliveredQueuedInputs();
     session.updateMetadata((meta) => ({
       ...mergeReconnectMetadata(meta, metadata, Date.now()),
       queueCancellation: true,
@@ -12043,6 +12125,16 @@ async function runClaude(credentials, options = {}) {
     controlledByUser: options.startingMode !== "remote"
   }));
   const messageQueue = new MessageQueue2(claudeModeHash);
+  messageQueue.setOnDiscard((entries) => {
+    const byReason = /* @__PURE__ */ new Map();
+    for (const entry of entries) {
+      if (!entry.sourceId) continue;
+      const list = byReason.get(entry.reason) ?? [];
+      list.push(entry.sourceId);
+      byReason.set(entry.reason, list);
+    }
+    for (const [reason, keys] of byReason) session.sendQueueCancelReason(keys, reason);
+  });
   session.rpcHandlerManager.registerHandler("cancelQueuedMessage", async (params) => ({
     removed: messageQueue.cancelPending(
       typeof params?.localKey === "string" ? params.localKey : void 0,
@@ -13545,9 +13637,9 @@ function resolveLocalSignupBootstrap(configuredMode, configuredInviteCodes, gene
   };
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BlkIz9BQ.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DKRU6E-x.cjs', document.baseURI).href)));
 const __dirname$1 = path.dirname(__filename$1);
-const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BlkIz9BQ.cjs', document.baseURI).href)));
+const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DKRU6E-x.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -15255,10 +15347,10 @@ function isCodexClearText(text) {
 }
 function enqueueCodexUserText(opts) {
   if (isCodexClearText(opts.text)) {
-    opts.queue.pushIsolateAndClear(opts.text, opts.mode);
+    opts.queue.pushIsolateAndClear(opts.text, opts.mode, void 0, opts.sourceId);
     return "clear";
   }
-  opts.queue.push(opts.text, opts.mode);
+  opts.queue.push(opts.text, opts.mode, void 0, opts.sourceId);
   return "queued";
 }
 
@@ -15443,6 +15535,7 @@ async function runCodex(opts) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
+    void session.cancelUndeliveredQueuedInputs();
     session.updateMetadata((meta) => mergeReconnectMetadata(meta, metadata, Date.now()));
   }
   if (response) {
@@ -15465,6 +15558,10 @@ async function runCodex(opts) {
     }
   }
   const messageQueue = new MessageQueue2(hashCodexEnhancedMode);
+  messageQueue.setOnDiscard((entries) => {
+    const keys = entries.map((entry) => entry.sourceId).filter((key) => typeof key === "string");
+    if (keys.length > 0) session.sendQueueCancelReason(keys, entries[0].reason);
+  });
   let currentPermissionMode = initialPermissionMode;
   let currentModel = DEFAULT_CODEX_MODEL;
   let currentEffort = DEFAULT_CODEX_EFFORT;
@@ -15546,7 +15643,8 @@ async function runCodex(opts) {
     const enqueueResult = enqueueCodexUserText({
       text: message.content.text,
       mode: enhancedMode,
-      queue: messageQueue
+      queue: messageQueue,
+      sourceId: message.localKey
     });
     if (enqueueResult === "clear") {
       persistence.logger.debug("[Codex] /clear command pushed to isolated queue");
@@ -16171,7 +16269,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-MWVPJDxV.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-CGqopr1A.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -16188,7 +16286,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-xPV7-s4S.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-7U_4QTHw.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16200,7 +16298,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-BNyEJ2_6.cjs'); });
+      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-CTuUV0TW.cjs'); });
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16212,7 +16310,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-B9fh96vR.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-B0Wojz18.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16318,9 +16416,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-CEbOao_0.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-7ZSxm6Pi.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-7ZSxm6Pi.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-rQdv_Yr0.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-Jag0GwhO.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-Jag0GwhO.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -16351,7 +16449,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-CEbOao_0.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-rQdv_Yr0.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -16391,7 +16489,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BRUmjZgV.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DYawZQTu.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -16421,7 +16519,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-HKcuQ_fQ.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-uPpFZhhr.cjs'); });
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -16448,7 +16546,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-HKcuQ_fQ.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-uPpFZhhr.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -16488,7 +16586,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-o1ImBlcJ.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-C2XjFP2m.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -16539,7 +16637,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-DBKk5L6_.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-FlbfMw6_.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -16913,6 +17011,7 @@ exports.MAX_READ_LIMIT = MAX_READ_LIMIT;
 exports.MessageBuffer = MessageBuffer;
 exports.MessageQueue2 = MessageQueue2;
 exports.SPAWN_AGENTS = SPAWN_AGENTS;
+exports.StreamRelay = StreamRelay;
 exports.TitleGenerator = TitleGenerator;
 exports.archiveSession = archiveSession;
 exports.checkIfDaemonRunningAndCleanupStaleState = checkIfDaemonRunningAndCleanupStaleState;

package/dist/{index-HKcuQ_fQ.cjs → index-uPpFZhhr.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-tou8FQXI.cjs');
-var persistence = require('./types-7ZSxm6Pi.cjs');
-var AcpSessionManager = require('./AcpSessionManager-fF_HFB98.cjs');
+var AcpBackend = require('./AcpBackend-YPVwACkW.cjs');
+var persistence = require('./types-Jag0GwhO.cjs');
+var AcpSessionManager = require('./AcpSessionManager-6rypahwH.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-BlkIz9BQ.cjs');
+var index = require('./index-DKRU6E-x.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');
@@ -637,7 +637,11 @@ async function runAcp(opts) {
   }
   permissionHandler = new GenericAcpPermissionHandler(session, opts.agentName);
   permissionHandler.reset("Previous CLI process exited before responding");
-  const sessionManager = new AcpSessionManager.AcpSessionManager();
+  const streamingEnabled = process.env.HAPPY_SESSION_STREAM_DISABLED !== "1";
+  const streamRelay = new index.StreamRelay({
+    send: (frame) => session.sendStreamFrame(frame)
+  });
+  const sessionManager = new AcpSessionManager.AcpSessionManager(streamingEnabled ? { stream: streamRelay } : {});
   const messageQueue = new index.MessageQueue2((mode) => index.hashObject(mode));
   let currentPermissionMode;
   let currentModel;
@@ -691,6 +695,13 @@ async function runAcp(opts) {
     verbose
   });
   let thinking = false;
+  const setThinking = (next) => {
+    if (thinking === next) {
+      return;
+    }
+    thinking = next;
+    session.keepAlive(thinking, "remote");
+  };
   let acpSessionId = null;
   let shouldExit = false;
   let abortController = new AbortController();
@@ -935,11 +946,6 @@ async function runAcp(opts) {
       const suffix = msg.detail ? `: ${msg.detail}` : "";
       const statusLine = `Status: ${msg.status}${suffix}`;
       logAcp("muted", statusLine);
-      const nextThinking = msg.status === "running";
-      if (thinking !== nextThinking) {
-        thinking = nextThinking;
-        session.keepAlive(thinking, "remote");
-      }
       if (msg.status === "idle") {
         clearPendingTurn();
       }
@@ -1052,6 +1058,7 @@ async function runAcp(opts) {
       }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       sendEnvelopes(sessionManager.startTurn());
+      setThinking(true);
       const turnEnded = waitForTurnEnd();
       try {
         if (typeof batch.mode.permissionMode === "string" && batch.mode.permissionMode.length > 0) {
@@ -1063,12 +1070,16 @@ async function runAcp(opts) {
         await backend.sendPrompt(acpSessionId, batch.message);
         await turnEnded;
         sendEnvelopes(sessionManager.endTurn("completed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         if (verbose) {
           logAcp("muted", `Outgoing prompt completion from ${opts.agentName}`);
         }
       } catch (error) {
         sendEnvelopes(sessionManager.endTurn("failed"));
+        streamRelay.endTurn();
+        setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         logAcp("error", `Prompt error from ${opts.agentName}: ${error instanceof Error ? error.message : String(error)}`);
         clearPendingTurn(error instanceof Error ? error : new Error(String(error)));
@@ -1076,7 +1087,10 @@ async function runAcp(opts) {
       }
     }
   } finally {
+    setThinking(false);
     clearInterval(keepAliveInterval);
+    streamRelay.endTurn();
+    streamRelay.dispose();
     reconnectionHandle?.cancel();
     clearPendingTurn(new Error("ACP runner shutting down"));
     try {

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-BlkIz9BQ.cjs');
-require('./types-7ZSxm6Pi.cjs');
+require('./index-DKRU6E-x.cjs');
+require('./types-Jag0GwhO.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-CUJ6faw1.mjs';
-import './types-Di0o0BdV.mjs';
+import './index-BTnlYGaP.mjs';
+import './types-q7wtjfxb.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-MWVPJDxV.cjs → installTerminalHooks-CGqopr1A.cjs}

@@ -5,8 +5,8 @@ var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
 var chalk = require('chalk');
-var persistence = require('./types-7ZSxm6Pi.cjs');
-var index = require('./index-BlkIz9BQ.cjs');
+var persistence = require('./types-Jag0GwhO.cjs');
+var index = require('./index-DKRU6E-x.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/{installTerminalHooks-B3EGNaJr.mjs → installTerminalHooks-DFmKhCto.mjs}

@@ -3,8 +3,8 @@ import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { spawnSync } from 'node:child_process';
 import chalk from 'chalk';
-import { p as projectPath } from './types-Di0o0BdV.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-CUJ6faw1.mjs';
+import { p as projectPath } from './types-q7wtjfxb.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-BTnlYGaP.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var persistence = require('./types-7ZSxm6Pi.cjs');
+var persistence = require('./types-Jag0GwhO.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/lib.d.cts

@@ -137,6 +137,10 @@ declare const sessionEnvelopeSchema: z.ZodObject<{
         totalTokens: z.ZodOptional<z.ZodNumber>;
         durationMs: z.ZodOptional<z.ZodNumber>;
         summary: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        t: z.ZodLiteral<"queue-cancel">;
+        targetLocalKeys: z.ZodArray<z.ZodString>;
+        reason: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>], "t">;
 }, z.core.$strip>;
 type SessionEnvelope = z.infer<typeof sessionEnvelopeSchema>;
@@ -922,8 +926,24 @@ declare class ApiSessionClient extends EventEmitter {
     private connectSessionRelay;
     private pushCommittedMessagesToRelay;
     private enqueueMessage;
+    /** B-332: emit a queue-cancel tombstone, mirroring the web's own signal. */
+    sendQueueCancelReason(localKeys: string[], reason: 'cleared' | 'aborted' | 'restarted'): void;
     /**
-     * Send message to session
+     * B-332 site ③: find queued user input this wrapper destroyed (it was still
+     * in the previous wrapper's in-memory queue when it died) and tell the web.
+     *
+     * Walks NEWEST → OLDEST via `before_seq`, decrypting each page, and stops at
+     * the first turn-end. The runner calls this on EVERY reconnect (runClaude /
+     * runCodex), seeded or not: a cursor seeded at the server's latest seq skips
+     * the undelivered tail just as thoroughly as skipExistingMessages does —
+     * and the daemon's resume/restart always seeds, so gating on the skip path
+     * would miss the common case. Best-effort: a failed scan must not take a
+     * session down. Needs no socket; POSTs through the same session-message
+     * channel so the web receives it identically to a cancel-button tombstone.
+     */
+    cancelUndeliveredQueuedInputs(): Promise<void>;
+    /**
+     * Send a message to session
      * @param body - Message body (can be MessageContent or raw content for agent messages)
      */
     sendClaudeSessionMessage(body: RawJSONLines, opts?: {
@@ -1296,6 +1316,10 @@ declare class ApiMachineClient {
     private keepAliveInterval;
     private lastKnownCLIAvailability;
     private lastKnownResumeSupport;
+    /** Wall-clock of the last CLI availability probe. Initialised as "already
+     *  stale" so the FIRST keep-alive tick always probes and populates the
+     *  machine metadata that a connecting/reconnecting web client reads. */
+    private lastCliProbeAt;
     private cliUpdateState;
     private cliUpdatePushChain;
     private claudeAuthState;