very-happy-cli 0.2.162 → 0.2.164

package/dist/{AcpBackend--TmFHgRH.mjs → AcpBackend-B8l1ZePt.mjs}

@@ -1,10 +1,10 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-CGE4C8ho.mjs';
-import { d as delay } from './time-CVvxdEDh.mjs';
+import { l as logger } from './logger-8dtZPn3n.mjs';
+import { d as delay } from './time-CRvAaC5H.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
-import { p as packageJson } from './package-DQsvY1XN.mjs';
+import { p as packageJson } from './package-tVYgFJoK.mjs';
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpBackend-9asD_DL7.cjs → AcpBackend-CHDqSii9.cjs}

@@ -3,10 +3,10 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-7ucWm9wp.cjs');
-var time = require('./time-CLwVAz6s.cjs');
+var logger = require('./logger-B1k7eZnq.cjs');
+var time = require('./time-C7BplxuS.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
-var _package = require('./package-D1A-8ZJy.cjs');
+var _package = require('./package-CC_txQ31.cjs');
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpSessionManager-BvIuBzoO.cjs → AcpSessionManager-9yN2iH4b.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var index = require('./index-DJ-oV52i.cjs');
+var index = require('./index-DqlyNgt4.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-BSIBnWUb.mjs → AcpSessionManager-BQnDJvct.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, e as createEnvelope } from './index-BBg9j0XK.mjs';
+import { s as streamKeyOf, e as createEnvelope } from './index-vVWpCoTr.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{BasePermissionHandler-D4B-NNu2.cjs → BasePermissionHandler-DGQYvBPg.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var logger = require('./logger-7ucWm9wp.cjs');
+var logger = require('./logger-B1k7eZnq.cjs');
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{BasePermissionHandler-DUBySe0f.mjs → BasePermissionHandler-DgtAtJTV.mjs}

@@ -1,4 +1,4 @@
-import { l as logger } from './logger-CGE4C8ho.mjs';
+import { l as logger } from './logger-8dtZPn3n.mjs';
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{BaseReasoningProcessor-CqLl-ikP.cjs → BaseReasoningProcessor-BqalZhQO.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-7ucWm9wp.cjs');
+var logger = require('./logger-B1k7eZnq.cjs');
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{BaseReasoningProcessor-9TybUGTq.mjs → BaseReasoningProcessor-Dfacnfhj.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-CGE4C8ho.mjs';
+import { l as logger } from './logger-8dtZPn3n.mjs';
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{agentHome-DQrq_FG1.mjs → agentHome-DM0urHEI.mjs}

@@ -1,13 +1,13 @@
 import chalk from 'chalk';
 import { homedir } from 'node:os';
-import { readSettings, updateSettings } from './persistence-Cw8aLoyL.mjs';
+import { readSettings, updateSettings } from './persistence-C_xFQLsD.mjs';
 import 'node:fs';
-import './logger-CGE4C8ho.mjs';
+import './logger-8dtZPn3n.mjs';
 import { d as describeAgentHome, p as probeLoginShellEnv, r as resolveAgentHomes, e as expandHomePath, A as AGENT_HOME_ENV_NAMES } from './loginShellEnv-Dw8M7tkI.mjs';
 import 'node:fs/promises';
-import './configuration-A5gW_0GE.mjs';
+import './configuration-CiBUH72C.mjs';
 import 'node:path';
-import './package-DQsvY1XN.mjs';
+import './package-tVYgFJoK.mjs';
 import 'zod';
 import './authRelay-DSAvg1uv.mjs';
 import 'node:crypto';

package/dist/{agentHome-BohNUYnE.cjs → agentHome-DtsPKfTS.cjs}

@@ -2,14 +2,14 @@
 
 var chalk = require('chalk');
 var os = require('node:os');
-var persistence = require('./persistence-i0nQMLlk.cjs');
+var persistence = require('./persistence-d3ZyER6o.cjs');
 require('node:fs');
-require('./logger-7ucWm9wp.cjs');
+require('./logger-B1k7eZnq.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 require('node:fs/promises');
-require('./configuration-UsI0sxEv.cjs');
+require('./configuration-PXAE4-FP.cjs');
 require('node:path');
-require('./package-D1A-8ZJy.cjs');
+require('./package-CC_txQ31.cjs');
 require('zod');
 require('./authRelay-BdYkC1Po.cjs');
 require('node:crypto');

package/dist/{api-CQnLOqRS.cjs → api-EKlS0r1w.cjs}

@@ -1,22 +1,22 @@
 'use strict';
 
 var axios = require('axios');
-var logger = require('./logger-7ucWm9wp.cjs');
+var logger = require('./logger-B1k7eZnq.cjs');
+var lidState = require('./lidState-De2HP6nu.cjs');
 var node_events = require('node:events');
 var socket_ioClient = require('socket.io-client');
-var attachmentLimits = require('./attachmentLimits-DzlBPyJP.cjs');
+var attachmentLimits = require('./attachmentLimits-eJZ4ZBjF.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-CLwVAz6s.cjs');
-var lidState = require('./lidState-Ds-6ytZV.cjs');
-var configuration = require('./configuration-UsI0sxEv.cjs');
+var time = require('./time-C7BplxuS.cjs');
+var configuration = require('./configuration-PXAE4-FP.cjs');
 var node_crypto = require('node:crypto');
-var index = require('./index-DJ-oV52i.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-CMROPdJz.cjs');
+var index = require('./index-DqlyNgt4.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-Dausbdsb.cjs');
 var cuid2 = require('@paralleldrive/cuid2');
-var sync = require('./sync-Dj92ZJ8Y.cjs');
+var sync = require('./sync--uxtLWbo.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var controlClient = require('./controlClient-BXktrQ4z.cjs');
+var controlClient = require('./controlClient-DI-Er-Ww.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var chalk = require('chalk');
 
@@ -1137,6 +1137,7 @@ class PromptQueueDrain {
   }
 }
 
+const guardOptions = { log: (message) => logger.logger.debug(message) };
 class ApiSessionClient extends node_events.EventEmitter {
   /**
    * B-512: the session socket now connects before the runner has attached its
@@ -1353,10 +1354,10 @@ class ApiSessionClient extends node_events.EventEmitter {
       if (!parsed.success || parsed.data.deadline <= Date.now()) return;
       void this.startReleaseHandover(parsed.data);
     });
-    this.socket.connect();
+    lidState.connectGuarded(this.socket, "initial", guardOptions);
   }
   createControlSocket(handover) {
-    return socket_ioClient.io(configuration.configuration.serverUrl, {
+    const socket = socket_ioClient.io(configuration.configuration.serverUrl, {
       auth: {
         token: this.token,
         clientType: "session-scoped",
@@ -1371,6 +1372,8 @@ class ApiSessionClient extends node_events.EventEmitter {
       withCredentials: true,
       autoConnect: false
     });
+    lidState.socketConnectGuard(socket, guardOptions);
+    return socket;
   }
   startReleaseHandover(notice) {
     if (this.handoverInFlight) return this.handoverInFlight;
@@ -1397,7 +1400,7 @@ class ApiSessionClient extends node_events.EventEmitter {
           clearTimeout(timer);
           reject(error);
         });
-        candidate.connect();
+        lidState.connectGuarded(candidate, "release-handover", guardOptions);
       });
       await this.rpcHandlerManager.onSocketConnectAndWait(candidate, timeoutMs);
       if (this.socket !== previous) {
@@ -1703,6 +1706,22 @@ class ApiSessionClient extends node_events.EventEmitter {
       this.pendingOutbox.splice(0, batch.length);
     }
   }
+  /**
+   * B-531: resolve once the server has accepted (POST answered, seq assigned)
+   * every message that was in the outbox when this was called. Messages
+   * enqueued later do not extend the wait. Returns false when the client was
+   * closed first — the caller must not treat that as "committed". Retries are
+   * the outbox's own (InvalidateSync backoff), so a server that keeps failing
+   * keeps this pending rather than resolving early.
+   */
+  async drainOutbox() {
+    const target = new Set(this.pendingOutbox);
+    while (this.pendingOutbox.some((item) => target.has(item))) {
+      if (this.sendSync.stopped) return false;
+      await this.sendSync.invalidateAndAwait();
+    }
+    return true;
+  }
   rememberRoutedInbound(localId) {
     this.routedInboundLocalIds.add(localId);
     if (this.routedInboundLocalIds.size > 2e3) {
@@ -2181,6 +2200,29 @@ class ApiSessionClient extends node_events.EventEmitter {
   skipExistingMessages() {
     this.skipInitialMessages = true;
   }
+  /**
+   * B-544: the newest `limit` session records, decrypted, ascending seq.
+   * Read-only (no routing, no lastSeq change) — rewind reconcile reads the
+   * durable log with it. Undecryptable records come back with `body: null`.
+   */
+  async readLogTail(limit) {
+    const response = await axios.get(
+      `${configuration.configuration.serverUrl}/v3/sessions/${encodeURIComponent(this.sessionId)}/messages`,
+      { params: { before_seq: 2147483647, limit }, headers: this.authHeaders(), timeout: 3e4 }
+    );
+    const messages = Array.isArray(response.data.messages) ? [...response.data.messages].reverse() : [];
+    return messages.map((message) => {
+      let body = null;
+      if (message.content?.t === "encrypted") {
+        try {
+          body = authRelay.decrypt(this.encryptionKey, this.encryptionVariant, authRelay.decodeBase64(message.content.c));
+        } catch {
+          body = null;
+        }
+      }
+      return { seq: message.seq, localId: message.localId ?? null, body };
+    });
+  }
   updateMetadata(handler) {
     this.metadataLock.inLock(async () => {
       let rateRefusals = 0;
@@ -2297,12 +2339,12 @@ class ApiSessionClient extends node_events.EventEmitter {
         return;
       }
       logger.logger.debug("[API] Attempting reconnect");
-      this.socket.connect();
+      lidState.connectGuarded(this.socket, "reconnect-interval", guardOptions);
     }, 3e3);
     if (lidState.shouldReconnect()) {
       logger.logger.debug("[API] Network up + lid open \u2014 reconnecting in 1s");
       setTimeout(() => {
-        if (!this.socket.connected) this.socket.connect();
+        lidState.connectGuarded(this.socket, "reconnect-soon", guardOptions);
       }, 1e3);
     }
   }
@@ -3044,7 +3086,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-fFFaWxYy.cjs'); });
+    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-q71suojS.cjs'); });
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{api-D57dsd6_.mjs → api-Yoh_zKdR.mjs}

@@ -1,20 +1,20 @@
 import axios from 'axios';
-import { l as logger, r as redactLogValue } from './logger-CGE4C8ho.mjs';
+import { l as logger, r as redactLogValue } from './logger-8dtZPn3n.mjs';
+import { R as RpcHandlerManager, a as answerSocketRequest, c as connectGuarded, s as socketConnectGuard, d as describeSocketAckDrop, b as safeAck, i as isRateQuotaCode, p as pauseForRateQuota, e as shouldReconnect } from './lidState-BbR6y9rq.mjs';
 import { EventEmitter } from 'node:events';
 import { io } from 'socket.io-client';
-import { A as AsyncLock, a as MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES, U as UserMessageSchema, F as FileEventMessageSchema } from './attachmentLimits-D5pgmASK.mjs';
+import { A as AsyncLock, a as MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES, U as UserMessageSchema, F as FileEventMessageSchema } from './attachmentLimits-B8nzhw-i.mjs';
 import { h as decrypt, d as decodeBase64, i as decryptBlob, e as encodeBase64, g as encrypt, l as libsodiumEncryptForPublicKey, j as libsodiumPublicKeyFromSecretKey, k as getRandomBytes } from './authRelay-DSAvg1uv.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-CVvxdEDh.mjs';
-import { R as RpcHandlerManager, a as answerSocketRequest, d as describeSocketAckDrop, s as safeAck, i as isRateQuotaCode, p as pauseForRateQuota, b as shouldReconnect } from './lidState-CigXWxhe.mjs';
-import { c as configuration } from './configuration-A5gW_0GE.mjs';
+import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-CRvAaC5H.mjs';
+import { c as configuration } from './configuration-CiBUH72C.mjs';
 import { createHmac, randomUUID } from 'node:crypto';
-import { e as createEnvelope, s as streamKeyOf, R as ReleaseDrainNoticeSchema, m as RelayAssignmentResponseSchema } from './index-BBg9j0XK.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-Ckv5boQI.mjs';
+import { e as createEnvelope, s as streamKeyOf, R as ReleaseDrainNoticeSchema, m as RelayAssignmentResponseSchema } from './index-vVWpCoTr.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-bSskMveZ.mjs';
 import { createId } from '@paralleldrive/cuid2';
-import { I as InvalidateSync } from './sync-BpLasLu2.mjs';
+import { I as InvalidateSync } from './sync-SCvDzRy6.mjs';
 import { B as BackgroundTaskReporter } from './backgroundTaskActivity-8PdPxrvy.mjs';
-import { h as notifyDaemonTurnEvent, j as notifyDaemonBackgroundTasks } from './controlClient-CYzHrh3e.mjs';
+import { h as notifyDaemonTurnEvent, j as notifyDaemonBackgroundTasks } from './controlClient-DzmCQrY_.mjs';
 import { c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import chalk from 'chalk';
 
@@ -1135,6 +1135,7 @@ class PromptQueueDrain {
   }
 }
 
+const guardOptions = { log: (message) => logger.debug(message) };
 class ApiSessionClient extends EventEmitter {
   /**
    * B-512: the session socket now connects before the runner has attached its
@@ -1351,10 +1352,10 @@ class ApiSessionClient extends EventEmitter {
       if (!parsed.success || parsed.data.deadline <= Date.now()) return;
       void this.startReleaseHandover(parsed.data);
     });
-    this.socket.connect();
+    connectGuarded(this.socket, "initial", guardOptions);
   }
   createControlSocket(handover) {
-    return io(configuration.serverUrl, {
+    const socket = io(configuration.serverUrl, {
       auth: {
         token: this.token,
         clientType: "session-scoped",
@@ -1369,6 +1370,8 @@ class ApiSessionClient extends EventEmitter {
       withCredentials: true,
       autoConnect: false
     });
+    socketConnectGuard(socket, guardOptions);
+    return socket;
   }
   startReleaseHandover(notice) {
     if (this.handoverInFlight) return this.handoverInFlight;
@@ -1395,7 +1398,7 @@ class ApiSessionClient extends EventEmitter {
           clearTimeout(timer);
           reject(error);
         });
-        candidate.connect();
+        connectGuarded(candidate, "release-handover", guardOptions);
       });
       await this.rpcHandlerManager.onSocketConnectAndWait(candidate, timeoutMs);
       if (this.socket !== previous) {
@@ -1701,6 +1704,22 @@ class ApiSessionClient extends EventEmitter {
       this.pendingOutbox.splice(0, batch.length);
     }
   }
+  /**
+   * B-531: resolve once the server has accepted (POST answered, seq assigned)
+   * every message that was in the outbox when this was called. Messages
+   * enqueued later do not extend the wait. Returns false when the client was
+   * closed first — the caller must not treat that as "committed". Retries are
+   * the outbox's own (InvalidateSync backoff), so a server that keeps failing
+   * keeps this pending rather than resolving early.
+   */
+  async drainOutbox() {
+    const target = new Set(this.pendingOutbox);
+    while (this.pendingOutbox.some((item) => target.has(item))) {
+      if (this.sendSync.stopped) return false;
+      await this.sendSync.invalidateAndAwait();
+    }
+    return true;
+  }
   rememberRoutedInbound(localId) {
     this.routedInboundLocalIds.add(localId);
     if (this.routedInboundLocalIds.size > 2e3) {
@@ -2179,6 +2198,29 @@ class ApiSessionClient extends EventEmitter {
   skipExistingMessages() {
     this.skipInitialMessages = true;
   }
+  /**
+   * B-544: the newest `limit` session records, decrypted, ascending seq.
+   * Read-only (no routing, no lastSeq change) — rewind reconcile reads the
+   * durable log with it. Undecryptable records come back with `body: null`.
+   */
+  async readLogTail(limit) {
+    const response = await axios.get(
+      `${configuration.serverUrl}/v3/sessions/${encodeURIComponent(this.sessionId)}/messages`,
+      { params: { before_seq: 2147483647, limit }, headers: this.authHeaders(), timeout: 3e4 }
+    );
+    const messages = Array.isArray(response.data.messages) ? [...response.data.messages].reverse() : [];
+    return messages.map((message) => {
+      let body = null;
+      if (message.content?.t === "encrypted") {
+        try {
+          body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(message.content.c));
+        } catch {
+          body = null;
+        }
+      }
+      return { seq: message.seq, localId: message.localId ?? null, body };
+    });
+  }
   updateMetadata(handler) {
     this.metadataLock.inLock(async () => {
       let rateRefusals = 0;
@@ -2295,12 +2337,12 @@ class ApiSessionClient extends EventEmitter {
         return;
       }
       logger.debug("[API] Attempting reconnect");
-      this.socket.connect();
+      connectGuarded(this.socket, "reconnect-interval", guardOptions);
     }, 3e3);
     if (shouldReconnect()) {
       logger.debug("[API] Network up + lid open \u2014 reconnecting in 1s");
       setTimeout(() => {
-        if (!this.socket.connected) this.socket.connect();
+        connectGuarded(this.socket, "reconnect-soon", guardOptions);
       }, 1e3);
     }
   }
@@ -3042,7 +3084,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await import('./apiMachine-78Aqzg--.mjs');
+    const { ApiMachineClient } = await import('./apiMachine-s3HiV-SL.mjs');
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{apiMachine-fFFaWxYy.cjs → apiMachine-q71suojS.cjs}

@@ -1,40 +1,41 @@
 'use strict';
 
 var socket_ioClient = require('socket.io-client');
-var logger = require('./logger-7ucWm9wp.cjs');
+var logger = require('./logger-B1k7eZnq.cjs');
+var lidState = require('./lidState-De2HP6nu.cjs');
 var mirrorProtocol = require('./mirrorProtocol-BUtmg1ws.cjs');
-var configuration = require('./configuration-UsI0sxEv.cjs');
+var configuration = require('./configuration-PXAE4-FP.cjs');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-CMROPdJz.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-Dausbdsb.cjs');
 var promises = require('node:fs/promises');
 var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-i0nQMLlk.cjs');
+var persistence = require('./persistence-d3ZyER6o.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-CLwVAz6s.cjs');
-var lidState = require('./lidState-Ds-6ytZV.cjs');
+var time = require('./time-C7BplxuS.cjs');
 var pty = require('node-pty');
 var terminals = require('./terminals-B_bfC9c2.cjs');
 var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var index = require('./index-CZWAiydF.cjs');
+var index = require('./index-DaTxsAC3.cjs');
 var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var axios = require('axios');
 var ids = require('./ids-B6ZC0HGt.cjs');
 var detectCLI = require('./detectCLI-DR9ZaN6B.cjs');
-var localHappyAgentAuth = require('./localHappyAgentAuth-l0Na-5Ys.cjs');
+var localHappyAgentAuth = require('./localHappyAgentAuth-CboZb3_a.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var claudeSessionFork = require('./claudeSessionFork-D9-mANmu.cjs');
-var codexAppServerClient = require('./codexAppServerClient-DlKv5TjG.cjs');
-var index$1 = require('./index-DJ-oV52i.cjs');
+var claudeSessionFork = require('./claudeSessionFork-BWdhyy9B.cjs');
+var codexAppServerClient = require('./codexAppServerClient-JddkV_aP.cjs');
+var index$1 = require('./index-DqlyNgt4.cjs');
 var codexThreadFork = require('./codexThreadFork-DNekT4nQ.cjs');
 require('chalk');
 require('node:util');
-require('./package-D1A-8ZJy.cjs');
+require('os');
 require('child_process');
+require('./package-CC_txQ31.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
@@ -42,7 +43,6 @@ require('path');
 require('cross-spawn');
 require('./projectPath-ChLhdOyt.cjs');
 require('url');
-require('os');
 require('zod');
 require('tweetnacl');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
@@ -8403,6 +8403,7 @@ async function discoverAndClaimRelay(input) {
   }
 }
 
+const guardOptions = { log: (message) => logger.logger.debug(message) };
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function requireNonEmptyString(value, name) {
   if (typeof value !== "string" || value.length === 0) {
@@ -9245,7 +9246,7 @@ class ApiMachineClient {
   }
   createControlSocket(handover) {
     const serverUrl = configuration.configuration.serverUrl.replace(/^http/, "ws");
-    return socket_ioClient.io(serverUrl, {
+    const socket = socket_ioClient.io(serverUrl, {
       transports: ["websocket"],
       auth: {
         token: this.token,
@@ -9259,6 +9260,8 @@ class ApiMachineClient {
       reconnection: false,
       ...handover ? { autoConnect: false } : {}
     });
+    lidState.socketConnectGuard(socket, guardOptions);
+    return socket;
   }
   activateControlSocket(socket, rpcAlreadyRegistered = false) {
     logger.logger.debug("[API MACHINE] Connected to server");
@@ -9364,7 +9367,7 @@ class ApiMachineClient {
           clearTimeout(timer);
           reject(error);
         });
-        candidate.connect();
+        lidState.connectGuarded(candidate, "release-handover", guardOptions);
       });
       await this.rpcHandlerManager.onSocketConnectAndWait(candidate, timeoutMs);
       if (this.socket !== previous) {
@@ -9576,12 +9579,12 @@ class ApiMachineClient {
         return;
       }
       logger.logger.debug("[API MACHINE] Attempting reconnect");
-      this.socket.connect();
+      lidState.connectGuarded(this.socket, "reconnect-interval", guardOptions);
     }, 3e3);
     if (lidState.shouldReconnect()) {
       logger.logger.debug("[API MACHINE] Network up + lid open \u2014 reconnecting in 1s");
       setTimeout(() => {
-        if (!this.socket.connected) this.socket.connect();
+        lidState.connectGuarded(this.socket, "reconnect-soon", guardOptions);
       }, 1e3);
     }
   }

package/dist/{apiMachine-78Aqzg--.mjs → apiMachine-s3HiV-SL.mjs}

@@ -1,38 +1,39 @@
 import { io } from 'socket.io-client';
-import { l as logger } from './logger-CGE4C8ho.mjs';
+import { l as logger } from './logger-8dtZPn3n.mjs';
+import { R as RpcHandlerManager, i as isRateQuotaCode, p as pauseForRateQuota, s as socketConnectGuard, c as connectGuarded, a as answerSocketRequest, e as shouldReconnect, d as describeSocketAckDrop } from './lidState-BbR6y9rq.mjs';
 import { i as isClaudeSessionId, s as sanitizeTagList, p as pickMirrorForTerminal, l as liveSnapshotChanged, a as sanitizeLiveSnapshot, b as serializeLiveSnapshot, c as summarizeSpawnSessionForLog, d as parseMirrorSendParams } from './mirrorProtocol-BNLtoWjO.mjs';
-import { c as configuration } from './configuration-A5gW_0GE.mjs';
+import { c as configuration } from './configuration-CiBUH72C.mjs';
 import { w as withCurrentCliUpdateState } from './cliUpdate-Y34VGe9Y.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-Ckv5boQI.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-bSskMveZ.mjs';
 import { stat, readdir, lstat, open, readFile } from 'node:fs/promises';
 import { join, isAbsolute, resolve } from 'node:path';
 import os, { homedir } from 'node:os';
 import { spawn, spawnSync } from 'node:child_process';
-import { readSettings, readPersistedSessions, readTrackedClaudeSessionIds, readTrackedCodexThreadIds } from './persistence-Cw8aLoyL.mjs';
+import { readSettings, readPersistedSessions, readTrackedClaudeSessionIds, readTrackedCodexThreadIds } from './persistence-C_xFQLsD.mjs';
 import { e as encodeBase64, g as encrypt, h as decrypt, d as decodeBase64 } from './authRelay-DSAvg1uv.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay } from './time-CVvxdEDh.mjs';
-import { R as RpcHandlerManager, i as isRateQuotaCode, p as pauseForRateQuota, a as answerSocketRequest, b as shouldReconnect, d as describeSocketAckDrop } from './lidState-CigXWxhe.mjs';
+import { b as backoff, d as delay } from './time-CRvAaC5H.mjs';
 import * as pty from 'node-pty';
 import { a as attachStartupCommand, v as validateTerminalTags, d as deriveAutoTitle, T as TMUX_SESSION_ID_RE, i as isSafeTmuxSessionName, b as isVhSessionName, U as USER_SESSIONS_FORMAT, p as parseUserSessions, L as LIST_SESSIONS_FORMAT, c as parseSessionListLine, e as LIST_FIELD_SEP, s as sendToVhTerminal } from './terminals-Dlg0x3nY.mjs';
 import { t as tmuxArgs, V as VH_TMUX_SOCKET_ENV, a as scrubTmuxClientEnv } from './tmuxSocket-B8Yx20sT.mjs';
-import { locateClaudeConversation } from './index-DK2JpTJf.mjs';
+import { locateClaudeConversation } from './index-OEGj3BxE.mjs';
 import { randomBytes } from 'node:crypto';
 import { existsSync, statSync, writeFileSync, unlinkSync, readFileSync, mkdirSync, accessSync, constants } from 'node:fs';
 import axios from 'axios';
 import { a as isValidTerminalId } from './ids-DU6sLx4C.mjs';
 import { d as detectCLIAvailability } from './detectCLI-CSGMlV51.mjs';
-import { d as detectResumeSupport } from './localHappyAgentAuth-CaCyKzYp.mjs';
+import { d as detectResumeSupport } from './localHappyAgentAuth-C7rDePjF.mjs';
 import { g as getProjectPath, a as getClaudeProjectsRoot } from './path-D2wdaNSk.mjs';
 import { i as isVeryHappyOneShotPrompt } from './oneShotPrompts-DT4p6RNd.mjs';
-import { f as forkSession, F as ForkSourceMissingError, d as discardForkedSession, l as listClaudeRewindPoints, a as forkAndTruncateSession, b as ForkTruncateUuidNotFoundError, c as forkBeforeUserMessage } from './claudeSessionFork-_DUrXaqd.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-C2ybs2mZ.mjs';
-import { o as RelayCandidatesResponseSchema, m as RelayAssignmentResponseSchema, R as ReleaseDrainNoticeSchema } from './index-BBg9j0XK.mjs';
+import { f as forkSession, F as ForkSourceMissingError, d as discardForkedSession, l as listClaudeRewindPoints, a as forkAndTruncateSession, b as ForkTruncateUuidNotFoundError, c as forkBeforeUserMessage } from './claudeSessionFork-BfPW9D2S.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-CfF33X-8.mjs';
+import { o as RelayCandidatesResponseSchema, m as RelayAssignmentResponseSchema, R as ReleaseDrainNoticeSchema } from './index-vVWpCoTr.mjs';
 import { f as forkCodexThread, C as CodexForkRewindPointNotFoundError, l as listCodexRewindPoints, a as forkCodexBeforeUserMessage } from './codexThreadFork-R76RU5H0.mjs';
 import 'chalk';
 import 'node:util';
-import './package-DQsvY1XN.mjs';
+import 'os';
 import 'child_process';
+import './package-tVYgFJoK.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
@@ -40,7 +41,6 @@ import 'path';
 import 'cross-spawn';
 import './projectPath-BTBIMB57.mjs';
 import 'url';
-import 'os';
 import 'zod';
 import 'tweetnacl';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
@@ -8382,6 +8382,7 @@ async function discoverAndClaimRelay(input) {
   }
 }
 
+const guardOptions = { log: (message) => logger.debug(message) };
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function requireNonEmptyString(value, name) {
   if (typeof value !== "string" || value.length === 0) {
@@ -9224,7 +9225,7 @@ class ApiMachineClient {
   }
   createControlSocket(handover) {
     const serverUrl = configuration.serverUrl.replace(/^http/, "ws");
-    return io(serverUrl, {
+    const socket = io(serverUrl, {
       transports: ["websocket"],
       auth: {
         token: this.token,
@@ -9238,6 +9239,8 @@ class ApiMachineClient {
       reconnection: false,
       ...handover ? { autoConnect: false } : {}
     });
+    socketConnectGuard(socket, guardOptions);
+    return socket;
   }
   activateControlSocket(socket, rpcAlreadyRegistered = false) {
     logger.debug("[API MACHINE] Connected to server");
@@ -9343,7 +9346,7 @@ class ApiMachineClient {
           clearTimeout(timer);
           reject(error);
         });
-        candidate.connect();
+        connectGuarded(candidate, "release-handover", guardOptions);
       });
       await this.rpcHandlerManager.onSocketConnectAndWait(candidate, timeoutMs);
       if (this.socket !== previous) {
@@ -9555,12 +9558,12 @@ class ApiMachineClient {
         return;
       }
       logger.debug("[API MACHINE] Attempting reconnect");
-      this.socket.connect();
+      connectGuarded(this.socket, "reconnect-interval", guardOptions);
     }, 3e3);
     if (shouldReconnect()) {
       logger.debug("[API MACHINE] Network up + lid open \u2014 reconnecting in 1s");
       setTimeout(() => {
-        if (!this.socket.connected) this.socket.connect();
+        connectGuarded(this.socket, "reconnect-soon", guardOptions);
       }, 1e3);
     }
   }