very-happy-cli 0.2.111 → 0.2.113

package/dist/{types-k_ipDb0c.mjs → types-CAzzJ4tO.mjs}

@@ -29,7 +29,7 @@ import { SandboxManager } from '@anthropic-ai/sandbox-runtime';
 import { Expo } from 'expo-server-sdk';
 
 var name = "very-happy-cli";
-var version = "0.2.111";
+var version = "0.2.113";
 var description = "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.";
 var author = "Kirill Dubovitskiy";
 var contributors = [
@@ -142,12 +142,12 @@ var dependencies = {
 	zod: "^4.0.0"
 };
 var optionalDependencies = {
-	"very-happy-tools-arm64-darwin": "0.2.111",
-	"very-happy-tools-x64-darwin": "0.2.111",
-	"very-happy-tools-arm64-linux": "0.2.111",
-	"very-happy-tools-x64-linux": "0.2.111",
-	"very-happy-tools-arm64-win32": "0.2.111",
-	"very-happy-tools-x64-win32": "0.2.111"
+	"very-happy-tools-arm64-darwin": "0.2.113",
+	"very-happy-tools-x64-darwin": "0.2.113",
+	"very-happy-tools-arm64-linux": "0.2.113",
+	"very-happy-tools-x64-linux": "0.2.113",
+	"very-happy-tools-arm64-win32": "0.2.113",
+	"very-happy-tools-x64-win32": "0.2.113"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -747,6 +747,14 @@ const sessionEnvelopeSchema = z.object({
   // Codex app-server item id for this envelope. Used as the precise
   // rollback point for Codex thread duplicate/fork-from-message.
   codexItemId: z.string().min(1).optional(),
+  // B-309: identity of the live draft this envelope supersedes,
+  // `"<api message id>:<content block index>"`. Set on text/thinking
+  // envelopes mapped from a Claude assistant message so the web can replace
+  // the streamed draft with the persisted message in a single frame instead
+  // of letting it flicker out and back in. Absent from every other producer
+  // (and from CLIs older than the streaming relay) — consumers must treat a
+  // missing key as "no draft to claim", never as an error.
+  streamKey: z.string().min(1).optional(),
   // Per-API-call token usage of the assistant message this envelope was
   // mapped from (B-108). Envelope-level (not inside `ev`) so every envelope
   // type carries it uniformly — the web feeds it into its context meter.
@@ -785,6 +793,7 @@ function createEnvelope(role, ev, opts = {}) {
     ...opts.subagent ? { subagent: opts.subagent } : {},
     ...opts.claudeUuid ? { claudeUuid: opts.claudeUuid } : {},
     ...opts.codexItemId ? { codexItemId: opts.codexItemId } : {},
+    ...opts.streamKey ? { streamKey: opts.streamKey } : {},
     ...opts.usage ? { usage: opts.usage } : {},
     ev
   });
@@ -887,6 +896,44 @@ z.object({
   body: CoreUpdateBodySchema,
   createdAt: z.number()
 });
+const STREAM_DELTA_MAX_CHARS = 16 * 1024;
+const sessionStreamBlockKindSchema = z.enum(["text", "thinking"]);
+const sessionStreamBlockStartSchema = z.object({
+  t: z.literal("block-start"),
+  mid: z.string().min(1),
+  idx: z.number().int().min(0),
+  kind: sessionStreamBlockKindSchema
+});
+const sessionStreamBlockDeltaSchema = z.object({
+  t: z.literal("block-delta"),
+  mid: z.string().min(1),
+  idx: z.number().int().min(0),
+  text: z.string().max(STREAM_DELTA_MAX_CHARS)
+});
+const sessionStreamBlockEndSchema = z.object({
+  t: z.literal("block-end"),
+  mid: z.string().min(1),
+  idx: z.number().int().min(0)
+});
+const sessionStreamProgressSchema = z.object({
+  t: z.literal("progress"),
+  thinkingTokens: z.number().int().min(0).optional(),
+  outputTokens: z.number().int().min(0).optional(),
+  status: z.enum(["requesting", "compacting"]).optional()
+});
+const sessionStreamTurnEndSchema = z.object({
+  t: z.literal("turn-end")
+});
+z.discriminatedUnion("t", [
+  sessionStreamBlockStartSchema,
+  sessionStreamBlockDeltaSchema,
+  sessionStreamBlockEndSchema,
+  sessionStreamProgressSchema,
+  sessionStreamTurnEndSchema
+]);
+function streamKeyOf(messageId, blockIndex) {
+  return `${messageId}:${blockIndex}`;
+}
 const VoiceConversationGrantedSchema = z.object({
   allowed: z.literal(true),
   conversationToken: z.string(),
@@ -1368,6 +1415,23 @@ let backoff = createBackoff({
   }
 });
 
+function isRateQuotaCode(code) {
+  return typeof code === "string" && code.endsWith("_rate_quota_exceeded");
+}
+const RATE_RETRY_MIN_DELAY_MS = 2e3;
+const RATE_RETRY_MAX_DELAY_MS = 6e4;
+function rateRetryDelayMs(attempt, random = Math.random()) {
+  const exponent = Math.max(0, Math.min(attempt, 32) - 1);
+  const ceiling = Math.min(RATE_RETRY_MIN_DELAY_MS * 2 ** exponent, RATE_RETRY_MAX_DELAY_MS);
+  return Math.round(RATE_RETRY_MIN_DELAY_MS + random * (ceiling - RATE_RETRY_MIN_DELAY_MS));
+}
+async function pauseForRateQuota(opts) {
+  const ms = rateRetryDelayMs(opts.attempt);
+  opts.log?.(`[RATE] ${opts.label} write refused (${opts.code}), attempt ${opts.attempt} \u2014 waiting ${ms}ms`);
+  await opts.sleep(ms);
+  return ms;
+}
+
 class AsyncLock {
   permits = 1;
   promiseResolverQueue = [];
@@ -2769,13 +2833,24 @@ function mapClaudeLogMessageToSessionEnvelopesInternal(message, state) {
     maybeEmitSubagentStart(state, turnId, subagent, envelopes);
     const usage = pickAssistantUsage(message);
     const blocks = Array.isArray(message.message?.content) ? message.message.content : [];
-    for (const block of blocks) {
+    const apiMessageId = !isSidechainMessage(message) && typeof message.message?.id === "string" && message.message.id.length > 0 ? message.message.id : void 0;
+    let blockCursor = 0;
+    if (apiMessageId) {
+      if (state.streamBlockMessageId !== apiMessageId) {
+        state.streamBlockMessageId = apiMessageId;
+        state.streamBlockCursor = 0;
+      }
+      blockCursor = state.streamBlockCursor ?? 0;
+      state.streamBlockCursor = blockCursor + blocks.length;
+    }
+    const draftKey = (index) => apiMessageId ? streamKeyOf(apiMessageId, blockCursor + index) : void 0;
+    for (const [blockIndex, block] of blocks.entries()) {
       if (block.type === "text" && typeof block.text === "string" && block.text.trim().length > 0) {
-        envelopes.push(createEnvelope("agent", { t: "text", text: block.text }, { turn: turnId, subagent, claudeUuid, usage }));
+        envelopes.push(createEnvelope("agent", { t: "text", text: block.text }, { turn: turnId, subagent, claudeUuid, usage, streamKey: draftKey(blockIndex) }));
         continue;
       }
       if (block.type === "thinking" && typeof block.thinking === "string" && block.thinking.trim().length > 0) {
-        envelopes.push(createEnvelope("agent", { t: "text", text: block.thinking, thinking: true }, { turn: turnId, subagent, claudeUuid, usage }));
+        envelopes.push(createEnvelope("agent", { t: "text", text: block.thinking, thinking: true }, { turn: turnId, subagent, claudeUuid, usage, streamKey: draftKey(blockIndex) }));
         continue;
       }
       if (block.type === "tool_use") {
@@ -3774,6 +3849,33 @@ class ApiSessionClient extends EventEmitter {
       mode
     });
   }
+  /**
+   * B-309: push one live stream frame (thinking/text delta or progress) to
+   * this account's web clients.
+   *
+   * Encrypted with the SESSION key and relayed without being stored —
+   * clipboard-push's shape, for clipboard-push's reasons: the relay must not
+   * be able to read thinking text, and the session id is stamped by the
+   * server from the authenticated connection rather than trusted from here.
+   *
+   * `volatile` on purpose. A draft that misses the wire while disconnected
+   * is worth nothing — the persisted message is still coming, and replaying
+   * stale deltas after a reconnect would paint text that has already landed.
+   */
+  sendStreamFrame(frame) {
+    if (!this.socket.connected) return;
+    try {
+      this.socket.volatile.emit("session-stream", {
+        // The frame object, NOT a JSON string: `encrypt` serializes
+        // internally, so pre-stringifying would double-encode and
+        // escape every quote in the streamed text.
+        payload: encodeBase64(encrypt(this.encryptionKey, this.encryptionVariant, frame)),
+        enc: true
+      });
+    } catch (error) {
+      logger.debug(`[API] Failed to relay stream frame: ${error}`);
+    }
+  }
   /**
    * Send session death message
    */
@@ -3904,12 +4006,14 @@ class ApiSessionClient extends EventEmitter {
   }
   updateMetadata(handler) {
     this.metadataLock.inLock(async () => {
+      let rateRefusals = 0;
       await backoff(async () => {
         let updated = handler(this.metadata);
         const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(this.encryptionKey, this.encryptionVariant, updated)) });
         if (answer.result === "success") {
           this.metadata = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(answer.metadata));
           this.metadataVersion = answer.version;
+          rateRefusals = 0;
         } else if (answer.result === "version-mismatch") {
           if (answer.version > this.metadataVersion) {
             this.metadataVersion = answer.version;
@@ -3917,6 +4021,16 @@ class ApiSessionClient extends EventEmitter {
           }
           throw new Error("Metadata version mismatch");
         } else if (answer.result === "error") {
+          if (isRateQuotaCode(answer.error)) {
+            rateRefusals += 1;
+            await pauseForRateQuota({
+              label: "session metadata",
+              code: answer.error,
+              attempt: rateRefusals,
+              sleep: delay,
+              log: (message) => logger.debug(message)
+            });
+          }
           throw new Error("Metadata update failed");
         }
       });
@@ -3929,12 +4043,14 @@ class ApiSessionClient extends EventEmitter {
   updateAgentState(handler) {
     logger.debugLargeJson("Updating agent state", this.agentState);
     this.agentStateLock.inLock(async () => {
+      let rateRefusals = 0;
       await backoff(async () => {
         let updated = handler(this.agentState || {});
         const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(this.encryptionKey, this.encryptionVariant, updated)) : null });
         if (answer.result === "success") {
           this.agentState = answer.agentState ? decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(answer.agentState)) : null;
           this.agentStateVersion = answer.version;
+          rateRefusals = 0;
           logger.debug("Agent state updated", this.agentState);
         } else if (answer.result === "version-mismatch") {
           if (answer.version > this.agentStateVersion) {
@@ -3943,6 +4059,16 @@ class ApiSessionClient extends EventEmitter {
           }
           throw new Error("Agent state version mismatch");
         } else if (answer.result === "error") {
+          if (isRateQuotaCode(answer.error)) {
+            rateRefusals += 1;
+            await pauseForRateQuota({
+              label: "session agent state",
+              code: answer.error,
+              attempt: rateRefusals,
+              sleep: delay,
+              log: (message) => logger.debug(message)
+            });
+          }
           throw new Error("Agent state update failed");
         }
       });
@@ -14844,6 +14970,7 @@ class ApiMachineClient {
    * for example to set a custom name.
    */
   async updateMachineMetadata(handler) {
+    let rateRefusals = 0;
     await backoff(async () => {
       const updated = handler(this.machine.metadata);
       const answer = await this.socket.emitWithAck("machine-update-metadata", {
@@ -14854,6 +14981,7 @@ class ApiMachineClient {
       if (answer.result === "success") {
         this.machine.metadata = decrypt(this.machine.encryptionKey, this.machine.encryptionVariant, decodeBase64(answer.metadata));
         this.machine.metadataVersion = answer.version;
+        rateRefusals = 0;
         logger.debug("[API MACHINE] Metadata updated successfully");
       } else if (answer.result === "version-mismatch") {
         if (answer.version > this.machine.metadataVersion) {
@@ -14861,6 +14989,18 @@ class ApiMachineClient {
           this.machine.metadata = decrypt(this.machine.encryptionKey, this.machine.encryptionVariant, decodeBase64(answer.metadata));
         }
         throw new Error("Metadata version mismatch");
+      } else if (answer.result === "error") {
+        if (isRateQuotaCode(answer.error)) {
+          rateRefusals += 1;
+          await pauseForRateQuota({
+            label: "machine metadata",
+            code: answer.error,
+            attempt: rateRefusals,
+            sleep: delay,
+            log: (message) => logger.debug(message)
+          });
+        }
+        throw new Error("Machine metadata update failed");
       }
     });
   }
@@ -14869,6 +15009,7 @@ class ApiMachineClient {
    * Simplified without lock - relies on backoff for retry
    */
   async updateDaemonState(handler) {
+    let rateRefusals = 0;
     await backoff(async () => {
       const updated = handler(this.machine.daemonState);
       const answer = await this.socket.emitWithAck("machine-update-state", {
@@ -14879,6 +15020,7 @@ class ApiMachineClient {
       if (answer.result === "success") {
         this.machine.daemonState = decrypt(this.machine.encryptionKey, this.machine.encryptionVariant, decodeBase64(answer.daemonState));
         this.machine.daemonStateVersion = answer.version;
+        rateRefusals = 0;
         logger.debug("[API MACHINE] Daemon state updated successfully");
       } else if (answer.result === "version-mismatch") {
         if (answer.version > this.machine.daemonStateVersion) {
@@ -14886,6 +15028,18 @@ class ApiMachineClient {
           this.machine.daemonState = decrypt(this.machine.encryptionKey, this.machine.encryptionVariant, decodeBase64(answer.daemonState));
         }
         throw new Error("Daemon state version mismatch");
+      } else if (answer.result === "error") {
+        if (isRateQuotaCode(answer.error)) {
+          rateRefusals += 1;
+          await pauseForRateQuota({
+            label: "daemon state",
+            code: answer.error,
+            attempt: rateRefusals,
+            sleep: delay,
+            log: (message) => logger.debug(message)
+          });
+        }
+        throw new Error("Daemon state update failed");
       }
     });
   }
@@ -16302,4 +16456,4 @@ const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
   }).passthrough()
 ]);
 
-export { mirrorLocalId as $, ApiClient as A, credentialRelayProblem as B, deriveLocalCliUpdateSummary as C, updateSettings as D, encodeBase64Url as E, decodeBase64 as F, writeCredentialsLegacy as G, writeCredentialsDataKey as H, InvalidateSync as I, readCredentialsForConfiguredRelay as J, encrypt as K, isClaudeSessionId as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, getLocalHappyAgentCredentialPath as N, readLocalHappyAgentCredentials as O, decryptWithDataKey as P, decryptLegacy as Q, RawJSONLinesSchema as R, extractCompleteLines as S, decideBackfill as T, parseTerminalHookPayload as U, tmuxArgs as V, scrubTmuxClientEnv as W, decideMirrorBinding as X, MIRROR_BACKFILL_LINES_DEFAULT as Y, persistSession as Z, mirrorLineKey as _, ApiSessionClient as a, detectResumeSupport as a0, detectCLIAvailability as a1, acquireDaemonLock as a2, summarizeSpawnSessionForLog as a3, deletePersistedSessions as a4, shellescape as a5, decrypt as a6, writeDaemonState as a7, writeSettings as a8, fetchCliUpdateState as a9, resolveCliUpdateCheckInterval as aa, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as ab, releaseDaemonLock as ac, listVhTerminals as ad, isValidTerminalId as ae, readVhTerminal as af, sendToVhTerminal as ag, TITLE_PROMPT_PREFIX as ah, BOARD_ANALYZER_PROMPT_PREFIX as ai, startOfflineReconnection as aj, clearCredentials as ak, clearMachineId as al, SandboxConfigSchema as am, CodexAppServerClient as an, getLatestDaemonLog as ao, persistence as ap, api as aq, createEnvelope as b, configuration as c, contentLogMetadata as d, errorLogMetadata as e, packageJson as f, delay as g, connectionState as h, isValidSessionId as i, readSettings as j, encodeBase64 as k, logger as l, ensurePrivateDirectorySync as m, hardenPrivateFileSync as n, readDaemonState as o, projectPath as p, clearDaemonState as q, readPersistedSessions as r, getProjectPath as s, initializeSandbox as t, wrapCommand as u, AsyncLock as v, writePrivateFileSync as w, ensurePrivateDirectory as x, hardenPrivateFile as y, readCredentials as z };
+export { mirrorLineKey as $, ApiClient as A, credentialRelayProblem as B, deriveLocalCliUpdateSummary as C, updateSettings as D, encodeBase64Url as E, decodeBase64 as F, writeCredentialsLegacy as G, writeCredentialsDataKey as H, InvalidateSync as I, readCredentialsForConfiguredRelay as J, encrypt as K, isClaudeSessionId as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, getLocalHappyAgentCredentialPath as N, readLocalHappyAgentCredentials as O, decryptWithDataKey as P, decryptLegacy as Q, RawJSONLinesSchema as R, STREAM_DELTA_MAX_CHARS as S, extractCompleteLines as T, decideBackfill as U, parseTerminalHookPayload as V, tmuxArgs as W, scrubTmuxClientEnv as X, decideMirrorBinding as Y, MIRROR_BACKFILL_LINES_DEFAULT as Z, persistSession as _, ApiSessionClient as a, mirrorLocalId as a0, detectResumeSupport as a1, detectCLIAvailability as a2, acquireDaemonLock as a3, summarizeSpawnSessionForLog as a4, deletePersistedSessions as a5, shellescape as a6, decrypt as a7, writeDaemonState as a8, writeSettings as a9, fetchCliUpdateState as aa, resolveCliUpdateCheckInterval as ab, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as ac, releaseDaemonLock as ad, listVhTerminals as ae, isValidTerminalId as af, readVhTerminal as ag, sendToVhTerminal as ah, TITLE_PROMPT_PREFIX as ai, BOARD_ANALYZER_PROMPT_PREFIX as aj, startOfflineReconnection as ak, clearCredentials as al, clearMachineId as am, SandboxConfigSchema as an, CodexAppServerClient as ao, getLatestDaemonLog as ap, persistence as aq, api as ar, createEnvelope as b, configuration as c, contentLogMetadata as d, errorLogMetadata as e, packageJson as f, delay as g, connectionState as h, isValidSessionId as i, readSettings as j, encodeBase64 as k, logger as l, ensurePrivateDirectorySync as m, hardenPrivateFileSync as n, readDaemonState as o, projectPath as p, clearDaemonState as q, readPersistedSessions as r, getProjectPath as s, initializeSandbox as t, wrapCommand as u, AsyncLock as v, writePrivateFileSync as w, ensurePrivateDirectory as x, hardenPrivateFile as y, readCredentials as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "very-happy-cli",
-  "version": "0.2.111",
+  "version": "0.2.113",
   "description": "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.",
   "author": "Kirill Dubovitskiy",
   "contributors": [
@@ -113,12 +113,12 @@
     "zod": "^4.0.0"
   },
   "optionalDependencies": {
-    "very-happy-tools-arm64-darwin": "0.2.111",
-    "very-happy-tools-x64-darwin": "0.2.111",
-    "very-happy-tools-arm64-linux": "0.2.111",
-    "very-happy-tools-x64-linux": "0.2.111",
-    "very-happy-tools-arm64-win32": "0.2.111",
-    "very-happy-tools-x64-win32": "0.2.111"
+    "very-happy-tools-arm64-darwin": "0.2.113",
+    "very-happy-tools-x64-darwin": "0.2.113",
+    "very-happy-tools-arm64-linux": "0.2.113",
+    "very-happy-tools-x64-linux": "0.2.113",
+    "very-happy-tools-arm64-win32": "0.2.113",
+    "very-happy-tools-x64-win32": "0.2.113"
   },
   "devDependencies": {
     "@slopus/happy-wire": "workspace:*",