very-happy-cli 0.2.120 → 0.2.122

package/dist/{index-CUJ6faw1.mjs → index-BTnlYGaP.mjs}

@@ -1,7 +1,7 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir, userInfo, tmpdir } from 'node:os';
 import { randomUUID, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { o as readDaemonState, l as logger, c as configuration, q as clearDaemonState, s as getProjectPath, p as projectPath, t as initializeSandbox, u as wrapCommand, g as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, k as delay, v as AsyncLock, S as STREAM_DELTA_MAX_CHARS, x as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, y as hardenPrivateFile, j as packageJson, z as commandOnPath, e as readSettings, B as readCredentials, C as credentialRelayProblem, D as deriveLocalCliUpdateSummary, f as encodeBase64, E as readSettingsOutcome, F as updateSettings, G as encodeBase64Url, H as decodeBase64, J as writeCredentialsLegacy, K as writeCredentialsDataKey, L as readCredentialsForConfiguredRelay, N as encrypt, r as readPersistedSessions, O as isClaudeSessionId, w as writePrivateFileSync, P as getLocalHappyAgentCredentialPath, Q as readLocalHappyAgentCredentials, T as decryptWithDataKey, U as decryptLegacy, V as compareExactVersions, W as extractCompleteLines, X as decideBackfill, Y as parseTerminalHookPayload, Z as tmuxArgs, _ as scrubTmuxClientEnv, $ as decideMirrorBinding, a0 as MIRROR_BACKFILL_LINES_DEFAULT, a1 as persistSession, a2 as mirrorLineKey, a3 as mirrorLocalId, a4 as detectCLIAvailability, a5 as detectResumeSupport, a6 as acquireDaemonLock, a7 as summarizeSpawnSessionForLog, a8 as deletePersistedSessions, a9 as shellescape, aa as decrypt, ab as writeDaemonState, A as ApiClient, ac as writeSettings, ad as fetchCliUpdateState, ae as resolveCliUpdateCheckInterval, af as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, ag as releaseDaemonLock, i as isValidSessionId, ah as listVhTerminals, ai as isValidTerminalId, aj as readVhTerminal, ak as sendToVhTerminal, al as TITLE_PROMPT_PREFIX, am as BOARD_ANALYZER_PROMPT_PREFIX, d as connectionState, an as startOfflineReconnection, ao as clearCredentials, ap as clearMachineId, m as ensurePrivateDirectorySync, aq as SandboxConfigSchema, b as createEnvelope, ar as CodexAppServerClient, as as getLatestDaemonLog } from './types-Di0o0BdV.mjs';
+import { o as readDaemonState, l as logger, c as configuration, q as clearDaemonState, t as getProjectPath, p as projectPath, u as initializeSandbox, v as wrapCommand, g as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, k as delay, x as AsyncLock, S as STREAM_DELTA_MAX_CHARS, y as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, z as hardenPrivateFile, j as packageJson, B as commandOnPath, e as readSettings, C as readCredentials, D as credentialRelayProblem, E as deriveLocalCliUpdateSummary, f as encodeBase64, F as readSettingsOutcome, G as updateSettings, H as encodeBase64Url, J as decodeBase64, K as writeCredentialsLegacy, L as writeCredentialsDataKey, N as readCredentialsForConfiguredRelay, O as encrypt, r as readPersistedSessions, P as isClaudeSessionId, w as writePrivateFileSync, Q as getLocalHappyAgentCredentialPath, T as readLocalHappyAgentCredentials, U as decryptWithDataKey, V as decryptLegacy, W as compareExactVersions, X as extractCompleteLines, Y as decideBackfill, Z as parseTerminalHookPayload, _ as tmuxArgs, $ as scrubTmuxClientEnv, a0 as decideMirrorBinding, a1 as MIRROR_BACKFILL_LINES_DEFAULT, a2 as persistSession, a3 as mirrorLineKey, a4 as mirrorLocalId, a5 as detectCLIAvailability, a6 as detectResumeSupport, a7 as acquireDaemonLock, a8 as summarizeSpawnSessionForLog, a9 as deletePersistedSessions, aa as shellescape, ab as decrypt, ac as writeDaemonState, A as ApiClient, ad as writeSettings, ae as fetchCliUpdateState, af as resolveCliUpdateCheckInterval, ag as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, ah as releaseDaemonLock, i as isValidSessionId, ai as listVhTerminals, aj as isValidTerminalId, ak as readVhTerminal, al as sendToVhTerminal, am as TITLE_PROMPT_PREFIX, an as BOARD_ANALYZER_PROMPT_PREFIX, d as connectionState, ao as startOfflineReconnection, ap as clearCredentials, aq as clearMachineId, m as ensurePrivateDirectorySync, ar as SandboxConfigSchema, b as createEnvelope, as as CodexAppServerClient, at as getLatestDaemonLog } from './types-q7wtjfxb.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, basename, delimiter, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -3384,9 +3384,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") {
@@ -3394,16 +3392,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") {
@@ -3414,7 +3408,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();
     }
@@ -3434,6 +3450,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);
@@ -3456,11 +3488,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(() => {
@@ -4303,10 +4330,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;
     logger.debug(`[MessageQueue2] Initialized`);
   }
   /**
@@ -4315,6 +4349,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.
@@ -4382,6 +4429,7 @@ class MessageQueue2 {
     }
     const modeHash = this.modeHasher(mode);
     logger.debug(`[MessageQueue2] pushIsolateAndClear() called with mode hash: ${modeHash} - clearing ${this.queue.length} pending messages`);
+    this.notifyDiscard("cleared");
     this.queue = [];
     this.queue.push({
       message,
@@ -4433,6 +4481,7 @@ class MessageQueue2 {
    */
   reset() {
     logger.debug(`[MessageQueue2] reset() called. Clearing ${this.queue.length} messages`);
+    this.notifyDiscard("aborted");
     this.queue = [];
     this.closed = false;
     this.waiter = null;
@@ -9976,6 +10025,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;
@@ -10007,6 +10077,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;
@@ -10068,15 +10141,24 @@ async function resolvePermissionRequest(sessionId, requestId, verdict, deps = {}
   const params = encodeBase64(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();
   }
@@ -10084,7 +10166,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 (; ; ) {
@@ -11215,7 +11296,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 import('./index-DKj_0dqB.mjs');
+    const { query } = await import('./index-CaIsj1q7.mjs');
     return runSideQuestion(query, input);
   });
   const slots = /* @__PURE__ */ new Map();
@@ -11897,6 +11978,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,
@@ -12021,6 +12103,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,
@@ -15233,10 +15325,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";
 }
 
@@ -15421,6 +15513,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) {
@@ -15443,6 +15536,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;
@@ -15524,7 +15621,8 @@ async function runCodex(opts) {
     const enqueueResult = enqueueCodexUserText({
       text: message.content.text,
       mode: enhancedMode,
-      queue: messageQueue
+      queue: messageQueue,
+      sourceId: message.localKey
     });
     if (enqueueResult === "clear") {
       logger.debug("[Codex] /clear command pushed to isolated queue");
@@ -16149,7 +16247,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 import('./installTerminalHooks-B3EGNaJr.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-DFmKhCto.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -16166,7 +16264,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-B6kP4YjA.mjs');
+      const { handleSpawnCommand } = await import('./spawn-BRdfNDsu.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16178,7 +16276,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await import('./sessions-CKVfXHyi.mjs');
+      const { handleSessionsCommand } = await import('./sessions-BuMgxuxd.mjs');
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16190,7 +16288,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-DFGH_-s_.mjs');
+      const { handleSendCommand } = await import('./send-DRZppEr2.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -16296,9 +16394,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 import('./config-CGDxsTZg.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-Di0o0BdV.mjs').then(function (n) { return n.at; });
-        const { ApiClient: ApiClient2 } = await import('./types-Di0o0BdV.mjs').then(function (n) { return n.au; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-BTEW041n.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-q7wtjfxb.mjs').then(function (n) { return n.au; });
+        const { ApiClient: ApiClient2 } = await import('./types-q7wtjfxb.mjs').then(function (n) { return n.av; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -16329,7 +16427,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 import('./config-CGDxsTZg.mjs');
+        const { readGeminiLocalConfig } = await import('./config-BTEW041n.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -16369,7 +16467,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-C3BCKTMp.mjs');
+      const { runGemini } = await import('./runGemini-BsfadDSa.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -16399,7 +16497,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-D4_LW69g.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-BeHr5uMY.mjs');
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -16426,7 +16524,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 import('./index-D4_LW69g.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-BeHr5uMY.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -16466,7 +16564,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-DEYzcGSV.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-xGtbJ7f8.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -16517,7 +16615,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 import('./mcp-CZ1Z6AI5.mjs');
+      const { handleMcpCommand } = await import('./mcp-DnKBKXYa.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -16878,4 +16976,4 @@ ${chalk.bold("Examples:")}
   }
 }
 
-export { ALLOWED_SPAWN_PERMISSION_MODES as A, registerKillSessionHandler as B, BasePermissionHandler as C, DEFAULT_RECENT_LIMIT as D, writeSessionModeFile as E, normalizeAcpPermissionMode as F, GEMINI_MODEL_ENV as G, removeSessionModeFile as H, GEMINI_API_KEY_ENV as I, GOOGLE_API_KEY_ENV as J, BaseReasoningProcessor as K, MessageBuffer as L, MAX_READ_LIMIT as M, CHANGE_TITLE_INSTRUCTION as N, SPAWN_AGENTS as S, TitleGenerator as T, sessionWebUrl as a, sanitizeSpawnPermissionMode as b, checkIfDaemonRunningAndCleanupStaleState as c, sendUserMessage as d, listSessions as e, stopSession as f, resolvePermissionRequest as g, archiveSession as h, isValidSpawnOrigin as i, DEFAULT_GEMINI_MODEL as j, setTerminalTitleViaDaemon as k, listAccountSessions as l, registerAssistantSessionTools as m, initialMachineMetadata as n, createSessionMetadata as o, pushClipboardViaDaemon as p, query as q, readSessionTranscript as r, spawnDaemonSession as s, tmuxSupportsSessionEnv as t, setupOfflineReconnection as u, notifyDaemonSessionStarted as v, waitForSessionKey as w, MessageQueue2 as x, hashObject as y, startHappyServer as z };
+export { ALLOWED_SPAWN_PERMISSION_MODES as A, startHappyServer as B, registerKillSessionHandler as C, DEFAULT_RECENT_LIMIT as D, BasePermissionHandler as E, writeSessionModeFile as F, GEMINI_MODEL_ENV as G, normalizeAcpPermissionMode as H, removeSessionModeFile as I, GEMINI_API_KEY_ENV as J, GOOGLE_API_KEY_ENV as K, BaseReasoningProcessor as L, MAX_READ_LIMIT as M, MessageBuffer as N, CHANGE_TITLE_INSTRUCTION as O, SPAWN_AGENTS as S, TitleGenerator as T, sessionWebUrl as a, sanitizeSpawnPermissionMode as b, checkIfDaemonRunningAndCleanupStaleState as c, sendUserMessage as d, listSessions as e, stopSession as f, resolvePermissionRequest as g, archiveSession as h, isValidSpawnOrigin as i, DEFAULT_GEMINI_MODEL as j, setTerminalTitleViaDaemon as k, listAccountSessions as l, registerAssistantSessionTools as m, initialMachineMetadata as n, createSessionMetadata as o, pushClipboardViaDaemon as p, query as q, readSessionTranscript as r, spawnDaemonSession as s, tmuxSupportsSessionEnv as t, setupOfflineReconnection as u, notifyDaemonSessionStarted as v, waitForSessionKey as w, StreamRelay as x, MessageQueue2 as y, hashObject as z };

package/dist/{index-D4_LW69g.mjs → index-BeHr5uMY.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-DiIJaJWG.mjs';
-export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-DiIJaJWG.mjs';
-import { d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, p as projectPath } from './types-Di0o0BdV.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-CZ0Az0GG.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-pgDnK76l.mjs';
+export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-pgDnK76l.mjs';
+import { d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, p as projectPath } from './types-q7wtjfxb.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-Bq5Tiky1.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as MessageQueue2, y as hashObject, z as startHappyServer, T as TitleGenerator, B as registerKillSessionHandler, C as BasePermissionHandler, E as writeSessionModeFile, F as normalizeAcpPermissionMode, H as removeSessionModeFile } from './index-CUJ6faw1.mjs';
+import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as StreamRelay, y as MessageQueue2, z as hashObject, B as startHappyServer, T as TitleGenerator, C as registerKillSessionHandler, E as BasePermissionHandler, F as writeSessionModeFile, H as normalizeAcpPermissionMode, I as removeSessionModeFile } from './index-BTnlYGaP.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';
@@ -636,7 +636,11 @@ async function runAcp(opts) {
   }
   permissionHandler = new GenericAcpPermissionHandler(session, opts.agentName);
   permissionHandler.reset("Previous CLI process exited before responding");
-  const sessionManager = new AcpSessionManager();
+  const streamingEnabled = process.env.HAPPY_SESSION_STREAM_DISABLED !== "1";
+  const streamRelay = new StreamRelay({
+    send: (frame) => session.sendStreamFrame(frame)
+  });
+  const sessionManager = new AcpSessionManager(streamingEnabled ? { stream: streamRelay } : {});
   const messageQueue = new MessageQueue2((mode) => hashObject(mode));
   let currentPermissionMode;
   let currentModel;
@@ -690,6 +694,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();
@@ -934,11 +945,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();
       }
@@ -1051,6 +1057,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) {
@@ -1062,12 +1069,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)));
@@ -1075,7 +1086,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-DKj_0dqB.mjs → index-CaIsj1q7.mjs}

@@ -1,9 +1,9 @@
-import { q as query } from './index-CUJ6faw1.mjs';
+import { q as query } from './index-BTnlYGaP.mjs';
 export { AbortError } from '@anthropic-ai/claude-agent-sdk';
 import 'chalk';
 import 'node:os';
 import 'node:crypto';
-import './types-Di0o0BdV.mjs';
+import './types-q7wtjfxb.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs';