very-happy-cli 0.2.195 → 0.2.196

package/dist/{AcpBackend-BTIF87yb.mjs → AcpBackend-RqGkFeeY.mjs}

@@ -1,11 +1,11 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-UgDpJA2u.mjs';
-import { d as delay } from './time-CIkdLyza.mjs';
+import { l as logger } from './logger-D1hb3CG8.mjs';
+import { d as delay } from './time-CgAwVt5R.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { r as readableStderrTail, a as appendStderrRing, s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
-import { p as packageJson } from './package-C4OfB2YF.mjs';
+import { p as packageJson } from './package-CpmoMPuj.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-CXSV6FF5.cjs → AcpBackend-tL_g_UJ5.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-BZ5TcbEh.cjs');
-var time = require('./time-BPPTQ_sE.cjs');
+var logger = require('./logger-HQ9yDb8R.cjs');
+var time = require('./time-BqPZjTpo.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
-var _package = require('./package-B61-BBlh.cjs');
+var _package = require('./package-Dn7zZkY1.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-CEpU_GVk.mjs → AcpSessionManager-C-R6yHXc.mjs}

@@ -1,6 +1,6 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, k as createEnvelope } from './index-BlWyEpMw.mjs';
-import { t as textResultPayload, b as toolResultPayload } from './api-DOzNOoVJ.mjs';
+import { s as streamKeyOf, k as createEnvelope } from './index-C27JFCbe.mjs';
+import { t as textResultPayload, b as toolResultPayload } from './api-CiNezCys.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-BbWODxSp.cjs → AcpSessionManager-CFB24qBh.cjs}

@@ -2,7 +2,7 @@
 
 var cuid2 = require('@paralleldrive/cuid2');
 var index = require('./index-D9Hidq-g.cjs');
-var api = require('./api-TpjZJXV-.cjs');
+var api = require('./api-fuwEEEkT.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{BasePermissionHandler-C6iF28Ct.cjs → BasePermissionHandler-C0JS37Jt.cjs}

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

package/dist/{BasePermissionHandler-B5ka7Aaf.mjs → BasePermissionHandler-CgHLVNKT.mjs}

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

package/dist/{account-Bvcdk9CH.cjs → account-DOil1Hn8.cjs}

@@ -2,17 +2,17 @@
 
 var chalk = require('chalk');
 var promises = require('node:readline/promises');
-var configuration = require('./configuration-CKaq0tNe.cjs');
-var controlClient = require('./controlClient-D_HIbnnS.cjs');
+var configuration = require('./configuration-CWRKSOyj.cjs');
+var controlClient = require('./controlClient-DyNgxNl7.cjs');
 var accountService = require('./accountService-DL6xhVUa.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-B61-BBlh.cjs');
+require('./package-Dn7zZkY1.cjs');
 require('node:fs/promises');
-require('./logger-BZ5TcbEh.cjs');
+require('./logger-HQ9yDb8R.cjs');
 require('node:util');
-require('./persistence-DBmeYlwT.cjs');
+require('./persistence-BiyvEYaR.cjs');
 require('zod');
 require('./authRelay-Dy1qU9td.cjs');
 require('node:crypto');

package/dist/{account-WSJcdMGl.mjs → account-EzL-zwwE.mjs}

@@ -1,26 +1,26 @@
 import chalk from 'chalk';
 import { createInterface } from 'node:readline/promises';
-import { c as configuration } from './configuration-CwfgJZKs.mjs';
-import { g as getDaemonAgentProfiles, r as restartDaemonSession, l as listDaemonSessions } from './controlClient-Dv6IvvUq.mjs';
-import { A as AccountService, b as bindResultMessages, a as AccountError, l as localRestartFailure } from './accountService-BtEgv0fC.mjs';
+import { c as configuration } from './configuration-C8r6uD9k.mjs';
+import { g as getDaemonAgentProfiles, r as restartDaemonSession, l as listDaemonSessions } from './controlClient-DYQ1g2ar.mjs';
+import { A as AccountService, b as bindResultMessages, a as AccountError, l as localRestartFailure } from './accountService-DQ21IlBs.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-C4OfB2YF.mjs';
+import './package-CpmoMPuj.mjs';
 import 'node:fs/promises';
-import './logger-UgDpJA2u.mjs';
+import './logger-D1hb3CG8.mjs';
 import 'node:util';
-import './persistence-CQhmtobL.mjs';
+import './persistence-CagHeZ-f.mjs';
 import 'zod';
 import './authRelay-DhQhkBvX.mjs';
 import 'node:crypto';
 import 'tweetnacl';
-import './index-BlWyEpMw.mjs';
+import './index-C27JFCbe.mjs';
 import '@paralleldrive/cuid2';
 import 'node:child_process';
-import './claudeAccountEnv-NyoxjLuJ.mjs';
-import './store-Tf-r1ouq.mjs';
-import './codexAccount-CKXpXq0B.mjs';
+import './claudeAccountEnv-CPO6CGNd.mjs';
+import './store-BlPvTr_Q.mjs';
+import './codexAccount-iZwmpYti.mjs';
 import 'node:readline';
 
 const ACCOUNT_HELP = `Usage:
@@ -183,7 +183,7 @@ Waiting (expires in 15 minutes; Ctrl-C to cancel)\u2026`);
   }
 }
 async function loginInteractive(target) {
-  const { spawnSetupTokenPty } = await import('./daemonAccounts-QT-RDDEp.mjs');
+  const { spawnSetupTokenPty } = await import('./daemonAccounts-CnAEaJE_.mjs');
   const { homedir } = await import('node:os');
   const svc = new AccountService({ home: configuration.happyHomeDir, spawnPty: (env) => spawnSetupTokenPty(homedir(), env) });
   const started = await svc.loginStart({ agent: "claude", kind: "claude-subscription", ...target });

package/dist/{accountService-BtEgv0fC.mjs → accountService-DQ21IlBs.mjs}

@@ -1,12 +1,12 @@
 import { randomUUID } from 'node:crypto';
 import { mkdirSync, writeFileSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { G as AGENT_PROFILE_FEATURE_LAUNCH, H as AgentProfileAddRequestSchema, I as AgentProfileLoginStartRequestSchema, J as AgentProfileLoginSubmitRequestSchema, K as AgentProfileBindRequestSchema } from './index-BlWyEpMw.mjs';
+import { E as AGENT_PROFILE_FEATURE_LAUNCH, F as AgentProfileAddRequestSchema, G as AgentProfileLoginStartRequestSchema, H as AgentProfileLoginSubmitRequestSchema, I as AgentProfileBindRequestSchema } from './index-C27JFCbe.mjs';
 import { spawn } from 'node:child_process';
-import { A as ACCOUNT_STRIPPED_ENV_KEYS } from './claudeAccountEnv-NyoxjLuJ.mjs';
-import { C as CODEX_ALWAYS_STRIPPED_ENV_KEYS, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome } from './codexAccount-CKXpXq0B.mjs';
+import { A as ACCOUNT_STRIPPED_ENV_KEYS } from './claudeAccountEnv-CPO6CGNd.mjs';
+import { C as CODEX_ALWAYS_STRIPPED_ENV_KEYS, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome } from './codexAccount-iZwmpYti.mjs';
 import { createInterface } from 'node:readline';
-import { h as buildAgentProfilesState, d as defaultSecretProbe, a as readAccounts, s as summarizeAccount, c as readAccountsFileV2, n as newAccountId, i as writeAccountSecret, f as writeAccountsFile, j as sessionsBoundTo, r as readSessionBindings, k as removeAccountSecret, b as accountSecretPath, e as expandHome, l as accountCodexHomePath, m as SUBSCRIPTION_TOKEN_TTL_MS, w as writeSessionBinding, o as readSessionBindingV2 } from './store-Tf-r1ouq.mjs';
+import { h as buildAgentProfilesState, d as defaultSecretProbe, a as readAccounts, s as summarizeAccount, c as readAccountsFileV2, n as newAccountId, i as writeAccountSecret, f as writeAccountsFile, j as sessionsBoundTo, r as readSessionBindings, k as removeAccountSecret, b as accountSecretPath, e as expandHome, l as accountCodexHomePath, m as SUBSCRIPTION_TOKEN_TTL_MS, w as writeSessionBinding, o as readSessionBindingV2 } from './store-BlPvTr_Q.mjs';
 
 const CHECK_TIMEOUT_MS = 2e4;
 const DEFAULT_CHECK_MODEL = "claude-haiku-4-5";

package/dist/{acpSessionResume-B2hd1Wub.cjs → acpSessionResume-B01oHWDS.cjs}

@@ -2,7 +2,7 @@
 
 var node_fs = require('node:fs');
 var path = require('node:path');
-var configuration = require('./configuration-CKaq0tNe.cjs');
+var configuration = require('./configuration-CWRKSOyj.cjs');
 
 const SESSION_MODE_DIR = "session-modes";
 const ACP_PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"];

package/dist/{acpSessionResume-BYMm4w8Q.mjs → acpSessionResume-DEOIZUuj.mjs}

@@ -1,6 +1,6 @@
 import { mkdirSync, renameSync, existsSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
-import { w as writePrivateFileSync, c as configuration } from './configuration-CwfgJZKs.mjs';
+import { w as writePrivateFileSync, c as configuration } from './configuration-C8r6uD9k.mjs';
 
 const SESSION_MODE_DIR = "session-modes";
 const ACP_PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"];

package/dist/{agentHome-CVM15_3U.cjs → agentHome-BulDO_1K.cjs}

@@ -2,14 +2,14 @@
 
 var chalk = require('chalk');
 var os = require('node:os');
-var persistence = require('./persistence-DBmeYlwT.cjs');
+var persistence = require('./persistence-BiyvEYaR.cjs');
 require('node:fs');
-require('./logger-BZ5TcbEh.cjs');
+require('./logger-HQ9yDb8R.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 require('node:fs/promises');
-require('./configuration-CKaq0tNe.cjs');
+require('./configuration-CWRKSOyj.cjs');
 require('node:path');
-require('./package-B61-BBlh.cjs');
+require('./package-Dn7zZkY1.cjs');
 require('zod');
 require('./authRelay-Dy1qU9td.cjs');
 require('node:crypto');

package/dist/{agentHome-Jl8yWAjF.mjs → agentHome-DucTue1n.mjs}

@@ -1,13 +1,13 @@
 import chalk from 'chalk';
 import { homedir } from 'node:os';
-import { r as readSettings, u as updateSettings } from './persistence-CQhmtobL.mjs';
+import { r as readSettings, u as updateSettings } from './persistence-CagHeZ-f.mjs';
 import 'node:fs';
-import './logger-UgDpJA2u.mjs';
+import './logger-D1hb3CG8.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-CwfgJZKs.mjs';
+import './configuration-C8r6uD9k.mjs';
 import 'node:path';
-import './package-C4OfB2YF.mjs';
+import './package-CpmoMPuj.mjs';
 import 'zod';
 import './authRelay-DhQhkBvX.mjs';
 import 'node:crypto';

package/dist/{api-DOzNOoVJ.mjs → api-CiNezCys.mjs}

@@ -1,20 +1,20 @@
 import axios from 'axios';
-import { l as logger, r as redactLogValue } from './logger-UgDpJA2u.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-Cb3TbhPb.mjs';
+import { l as logger, r as redactLogValue } from './logger-D1hb3CG8.mjs';
+import { A as AsyncLock, S as SESSION_SUPERSEDED_ERROR, a as agentInstanceAuth, b as MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES, U as UserMessageSchema, F as FileEventMessageSchema, P as PushNotificationClient } from './pushNotifications-4sNESDMv.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-BflRFw38.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, P as PushNotificationClient } from './pushNotifications-67GmbVfE.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-DhQhkBvX.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-CIkdLyza.mjs';
-import { c as configuration } from './configuration-CwfgJZKs.mjs';
+import { b as backoff, d as delay, e as exponentialBackoffDelay } from './time-CgAwVt5R.mjs';
+import { c as configuration } from './configuration-C8r6uD9k.mjs';
 import { createHmac, randomUUID } from 'node:crypto';
-import { k as createEnvelope, s as streamKeyOf, a3 as ReleaseDrainNoticeSchema, a4 as RelayAssignmentResponseSchema } from './index-BlWyEpMw.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-C7hlztAO.mjs';
+import { k as createEnvelope, s as streamKeyOf, a3 as ReleaseDrainNoticeSchema, a4 as RelayAssignmentResponseSchema } from './index-C27JFCbe.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-PTJ8TBj9.mjs';
 import { createId } from '@paralleldrive/cuid2';
-import { I as InvalidateSync } from './sync-GJkf-HGu.mjs';
+import { I as InvalidateSync } from './sync-DtzoF9sw.mjs';
 import { B as BackgroundTaskReporter } from './backgroundTaskActivity-8PdPxrvy.mjs';
-import { q as notifyDaemonTurnEvent, t as notifyDaemonBackgroundTasks } from './controlClient-Dv6IvvUq.mjs';
+import { q as notifyDaemonTurnEvent, t as notifyDaemonBackgroundTasks } from './controlClient-DYQ1g2ar.mjs';
 import chalk from 'chalk';
 
 async function hmac_sha512(key, data) {
@@ -1225,6 +1225,7 @@ class ApiSessionClient extends EventEmitter {
   on(event, listener) {
     super.on(event, listener);
     if (event === "archived" && this.archiveSignalled) queueMicrotask(() => listener());
+    if (event === "superseded" && this.supersededAt !== null) queueMicrotask(() => listener());
     return this;
   }
   token;
@@ -1349,8 +1350,16 @@ class ApiSessionClient extends EventEmitter {
         this.emit("archived");
         return;
       }
+      if (error.message === SESSION_SUPERSEDED_ERROR) {
+        this.markSuperseded(null);
+        return;
+      }
       this.startSmartReconnect();
     });
+    this.socket.on("session-superseded", (notice) => {
+      if (notice?.sessionId !== this.sessionId) return;
+      this.markSuperseded(notice);
+    });
     this.socket.on("session-archive", ({ sessionId }) => {
       if (sessionId !== this.sessionId) return;
       logger.debug("[SOCKET] Server archived this session; exiting...");
@@ -1439,6 +1448,7 @@ class ApiSessionClient extends EventEmitter {
         clientType: "session-scoped",
         sessionId: this.sessionId,
         happyClient: `cli-coding-session/${configuration.currentCliVersion}`,
+        ...agentInstanceAuth,
         ...handover ? { handoverEpoch: handover.epoch } : {}
       },
       ...handover ? { query: { vh_slot: handover.candidateSlot }, forceNew: true } : {},
@@ -1484,7 +1494,7 @@ class ApiSessionClient extends EventEmitter {
         candidate.close();
         return;
       }
-      for (const event of ["session-archive", "update", "error", "server-draining"]) {
+      for (const event of ["session-archive", "session-superseded", "update", "error", "server-draining"]) {
         const listeners = previous.listeners(event);
         previous.removeAllListeners(event);
         for (const listener of listeners) candidate.on(event, listener);
@@ -1503,8 +1513,12 @@ class ApiSessionClient extends EventEmitter {
         this.rpcHandlerManager.onSocketDisconnect(candidate);
         this.startSmartReconnect();
       });
-      candidate.on("connect_error", () => {
+      candidate.on("connect_error", (error) => {
         this.rpcHandlerManager.onSocketDisconnect(candidate);
+        if (error?.message === SESSION_SUPERSEDED_ERROR) {
+          this.markSuperseded(null);
+          return;
+        }
         this.startSmartReconnect();
       });
       this.receiveSync.invalidate();
@@ -1859,7 +1873,7 @@ class ApiSessionClient extends EventEmitter {
       if (!assignment) return;
       const relaySocket = io(assignment.url, {
         path: "/v1/relay",
-        auth: { token: assignment.token },
+        auth: { token: assignment.token, ...agentInstanceAuth },
         transports: ["websocket"],
         reconnection: true,
         reconnectionDelay: 500,
@@ -1867,6 +1881,9 @@ class ApiSessionClient extends EventEmitter {
       });
       this.relaySocket?.close();
       this.relaySocket = relaySocket;
+      relaySocket.on("session-superseded", (notice) => {
+        if (notice?.sessionId === this.sessionId) this.markSuperseded(notice);
+      });
       relaySocket.on("connect", () => {
         if (this.relaySocket !== relaySocket) return;
         this.rpcHandlerManager.onSocketConnect(relaySocket);
@@ -2527,6 +2544,22 @@ class ApiSessionClient extends EventEmitter {
       }, 1e4);
     });
   }
+  /** B-864: set once the server handed this session to a newer wrapper process. */
+  supersededAt = null;
+  get superseded() {
+    return this.supersededAt !== null;
+  }
+  markSuperseded(notice) {
+    if (this.supersededAt !== null) return;
+    this.supersededAt = Date.now();
+    const by = notice?.by ? ` by a wrapper started at ${new Date(notice.by.startedAt).toISOString()}${notice.by.happyClient ? ` (${notice.by.happyClient})` : ""}` : " by a newer wrapper";
+    const message = `Session ${this.sessionId} was taken over${by}; this process (pid ${process.pid}) stops driving it.`;
+    logger.debug(`[API] [SUPERSEDED] ${message}`);
+    console.error(message);
+    this.inboundFrozen = true;
+    void this.close();
+    this.emit("superseded", notice);
+  }
   async close() {
     logger.debug("[API] socket.close() called");
     this.closedByClient = true;
@@ -3073,7 +3106,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await import('./apiMachine-M-Fs9g5Y.mjs');
+    const { ApiMachineClient } = await import('./apiMachine-DCmKjms1.mjs');
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{api-TpjZJXV-.cjs → api-fuwEEEkT.cjs}

@@ -1,22 +1,22 @@
 'use strict';
 
 var axios = require('axios');
-var logger = require('./logger-BZ5TcbEh.cjs');
-var lidState = require('./lidState-Btv4N_B8.cjs');
+var logger = require('./logger-HQ9yDb8R.cjs');
+var pushNotifications = require('./pushNotifications-DRDWUnP-.cjs');
+var lidState = require('./lidState-VZ1j_QYw.cjs');
 var node_events = require('node:events');
 var socket_ioClient = require('socket.io-client');
-var pushNotifications = require('./pushNotifications-qCS7_tDF.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-BPPTQ_sE.cjs');
-var configuration = require('./configuration-CKaq0tNe.cjs');
+var time = require('./time-BqPZjTpo.cjs');
+var configuration = require('./configuration-CWRKSOyj.cjs');
 var node_crypto = require('node:crypto');
 var index = require('./index-D9Hidq-g.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-G2p0MJu4.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-CEV9KUsq.cjs');
 var cuid2 = require('@paralleldrive/cuid2');
-var sync = require('./sync-Cj8Vhltg.cjs');
+var sync = require('./sync-DfI78smj.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var controlClient = require('./controlClient-D_HIbnnS.cjs');
+var controlClient = require('./controlClient-DyNgxNl7.cjs');
 var chalk = require('chalk');
 
 async function hmac_sha512(key, data) {
@@ -1227,6 +1227,7 @@ class ApiSessionClient extends node_events.EventEmitter {
   on(event, listener) {
     super.on(event, listener);
     if (event === "archived" && this.archiveSignalled) queueMicrotask(() => listener());
+    if (event === "superseded" && this.supersededAt !== null) queueMicrotask(() => listener());
     return this;
   }
   token;
@@ -1351,8 +1352,16 @@ class ApiSessionClient extends node_events.EventEmitter {
         this.emit("archived");
         return;
       }
+      if (error.message === pushNotifications.SESSION_SUPERSEDED_ERROR) {
+        this.markSuperseded(null);
+        return;
+      }
       this.startSmartReconnect();
     });
+    this.socket.on("session-superseded", (notice) => {
+      if (notice?.sessionId !== this.sessionId) return;
+      this.markSuperseded(notice);
+    });
     this.socket.on("session-archive", ({ sessionId }) => {
       if (sessionId !== this.sessionId) return;
       logger.logger.debug("[SOCKET] Server archived this session; exiting...");
@@ -1441,6 +1450,7 @@ class ApiSessionClient extends node_events.EventEmitter {
         clientType: "session-scoped",
         sessionId: this.sessionId,
         happyClient: `cli-coding-session/${configuration.configuration.currentCliVersion}`,
+        ...pushNotifications.agentInstanceAuth,
         ...handover ? { handoverEpoch: handover.epoch } : {}
       },
       ...handover ? { query: { vh_slot: handover.candidateSlot }, forceNew: true } : {},
@@ -1486,7 +1496,7 @@ class ApiSessionClient extends node_events.EventEmitter {
         candidate.close();
         return;
       }
-      for (const event of ["session-archive", "update", "error", "server-draining"]) {
+      for (const event of ["session-archive", "session-superseded", "update", "error", "server-draining"]) {
         const listeners = previous.listeners(event);
         previous.removeAllListeners(event);
         for (const listener of listeners) candidate.on(event, listener);
@@ -1505,8 +1515,12 @@ class ApiSessionClient extends node_events.EventEmitter {
         this.rpcHandlerManager.onSocketDisconnect(candidate);
         this.startSmartReconnect();
       });
-      candidate.on("connect_error", () => {
+      candidate.on("connect_error", (error) => {
         this.rpcHandlerManager.onSocketDisconnect(candidate);
+        if (error?.message === pushNotifications.SESSION_SUPERSEDED_ERROR) {
+          this.markSuperseded(null);
+          return;
+        }
         this.startSmartReconnect();
       });
       this.receiveSync.invalidate();
@@ -1861,7 +1875,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       if (!assignment) return;
       const relaySocket = socket_ioClient.io(assignment.url, {
         path: "/v1/relay",
-        auth: { token: assignment.token },
+        auth: { token: assignment.token, ...pushNotifications.agentInstanceAuth },
         transports: ["websocket"],
         reconnection: true,
         reconnectionDelay: 500,
@@ -1869,6 +1883,9 @@ class ApiSessionClient extends node_events.EventEmitter {
       });
       this.relaySocket?.close();
       this.relaySocket = relaySocket;
+      relaySocket.on("session-superseded", (notice) => {
+        if (notice?.sessionId === this.sessionId) this.markSuperseded(notice);
+      });
       relaySocket.on("connect", () => {
         if (this.relaySocket !== relaySocket) return;
         this.rpcHandlerManager.onSocketConnect(relaySocket);
@@ -2529,6 +2546,22 @@ class ApiSessionClient extends node_events.EventEmitter {
       }, 1e4);
     });
   }
+  /** B-864: set once the server handed this session to a newer wrapper process. */
+  supersededAt = null;
+  get superseded() {
+    return this.supersededAt !== null;
+  }
+  markSuperseded(notice) {
+    if (this.supersededAt !== null) return;
+    this.supersededAt = Date.now();
+    const by = notice?.by ? ` by a wrapper started at ${new Date(notice.by.startedAt).toISOString()}${notice.by.happyClient ? ` (${notice.by.happyClient})` : ""}` : " by a newer wrapper";
+    const message = `Session ${this.sessionId} was taken over${by}; this process (pid ${process.pid}) stops driving it.`;
+    logger.logger.debug(`[API] [SUPERSEDED] ${message}`);
+    console.error(message);
+    this.inboundFrozen = true;
+    void this.close();
+    this.emit("superseded", notice);
+  }
   async close() {
     logger.logger.debug("[API] socket.close() called");
     this.closedByClient = true;
@@ -3075,7 +3108,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-COkvJAmd.cjs'); });
+    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-CxmiSa2-.cjs'); });
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {

package/dist/{apiMachine-COkvJAmd.cjs → apiMachine-CxmiSa2-.cjs}

@@ -2,46 +2,46 @@
 
 var socket_ioClient = require('socket.io-client');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
-var logger = require('./logger-BZ5TcbEh.cjs');
-var lidState = require('./lidState-Btv4N_B8.cjs');
-var mirrorProtocol = require('./mirrorProtocol-Ci9YmCEV.cjs');
-var configuration = require('./configuration-CKaq0tNe.cjs');
+var logger = require('./logger-HQ9yDb8R.cjs');
+var lidState = require('./lidState-VZ1j_QYw.cjs');
+var mirrorProtocol = require('./mirrorProtocol-Cv2otcvM.cjs');
+var configuration = require('./configuration-CWRKSOyj.cjs');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-G2p0MJu4.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-CEV9KUsq.cjs');
 var promises = require('node:fs/promises');
 var path = require('node:path');
 var os = require('node:os');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-DBmeYlwT.cjs');
+var persistence = require('./persistence-BiyvEYaR.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var index = require('./index-D9Hidq-g.cjs');
 var accountService = require('./accountService-DL6xhVUa.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-BPPTQ_sE.cjs');
+var time = require('./time-BqPZjTpo.cjs');
 var pty = require('node-pty');
 var terminals = require('./terminals-B_bfC9c2.cjs');
 var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var index$1 = require('./index-CGKn-GTK.cjs');
+var index$1 = require('./index-CQZg9jKx.cjs');
 var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var axios = require('axios');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var ids = require('./ids-B6ZC0HGt.cjs');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var localHappyAgentAuth = require('./localHappyAgentAuth-B3Q5DNLR.cjs');
+var localHappyAgentAuth = require('./localHappyAgentAuth-oxhpgJOb.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var claudeSessionFork = require('./claudeSessionFork-DH_Su4uO.cjs');
-var codexAppServerClient = require('./codexAppServerClient-C1xBSuVk.cjs');
+var claudeSessionFork = require('./claudeSessionFork-OffWLYgd.cjs');
+var codexAppServerClient = require('./codexAppServerClient-C-UwVMUN.cjs');
 var codexThreadFork = require('./codexThreadFork-C6ZmcT2z.cjs');
-var rateLimitWindows = require('./rateLimitWindows-BIfLMxOk.cjs');
+var rateLimitWindows = require('./rateLimitWindows-U4fc1-_6.cjs');
 require('chalk');
 require('node:util');
 require('os');
 require('child_process');
-require('./package-B61-BBlh.cjs');
+require('./package-Dn7zZkY1.cjs');
 require('util');
 require('fs/promises');
 require('crypto');

package/dist/{apiMachine-M-Fs9g5Y.mjs → apiMachine-DCmKjms1.mjs}

@@ -1,45 +1,45 @@
 import { io } from 'socket.io-client';
 import { a as webPanelsSignature } from './webPanels-B2_C2-3g.mjs';
-import { l as logger } from './logger-UgDpJA2u.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-Cb3TbhPb.mjs';
-import { i as isClaudeSessionId, s as stableVersion, a as sanitizeTagList, p as pickMirrorForTerminal, l as liveSnapshotChanged, b as sanitizeLiveSnapshot, c as serializeLiveSnapshot, r as registerWorktreeHandlers, d as configureWorktreeService, e as summarizeSpawnSessionForLog, f as parseMirrorSendParams } from './mirrorProtocol-BH5eT99U.mjs';
-import { c as configuration } from './configuration-CwfgJZKs.mjs';
+import { l as logger } from './logger-D1hb3CG8.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-BflRFw38.mjs';
+import { i as isClaudeSessionId, s as stableVersion, a as sanitizeTagList, p as pickMirrorForTerminal, l as liveSnapshotChanged, b as sanitizeLiveSnapshot, c as serializeLiveSnapshot, r as registerWorktreeHandlers, d as configureWorktreeService, e as summarizeSpawnSessionForLog, f as parseMirrorSendParams } from './mirrorProtocol-C9Zc6GFT.mjs';
+import { c as configuration } from './configuration-C8r6uD9k.mjs';
 import { w as withCurrentCliUpdateState } from './cliUpdate-Y34VGe9Y.mjs';
-import { r as registerCommonHandlers } from './registerCommonHandlers-C7hlztAO.mjs';
+import { r as registerCommonHandlers } from './registerCommonHandlers-PTJ8TBj9.mjs';
 import { stat, readdir, lstat, open, readFile, rm, mkdir, chmod, writeFile, rename } from 'node:fs/promises';
 import { join, isAbsolute, resolve } from 'node:path';
 import os, { homedir } from 'node:os';
 import { f as fsMkdir } from './fsMkdir-DumgLTzR.mjs';
 import { spawn, execFile, spawnSync } from 'node:child_process';
-import { r as readSettings, c as readPersistedSessions, p as readTrackedClaudeSessionIds, q as readTrackedCodexThreadIds } from './persistence-CQhmtobL.mjs';
+import { r as readSettings, c as readPersistedSessions, p as readTrackedClaudeSessionIds, q as readTrackedCodexThreadIds } from './persistence-CagHeZ-f.mjs';
 import { M as ModelConfigError } from './fileStore-5qpetZS0.mjs';
-import { a8 as AGENT_PROFILE_RPC, a9 as RelayCandidatesResponseSchema, a4 as RelayAssignmentResponseSchema, a3 as ReleaseDrainNoticeSchema } from './index-BlWyEpMw.mjs';
-import { a as AccountError } from './accountService-BtEgv0fC.mjs';
+import { a8 as AGENT_PROFILE_RPC, a9 as RelayCandidatesResponseSchema, a4 as RelayAssignmentResponseSchema, a3 as ReleaseDrainNoticeSchema } from './index-C27JFCbe.mjs';
+import { a as AccountError } from './accountService-DQ21IlBs.mjs';
 import { e as encodeBase64, g as encrypt, h as decrypt, d as decodeBase64 } from './authRelay-DhQhkBvX.mjs';
 import { p as prepareClipboardText, d as prepareClipboardHistoryText } from './limits-DIo7rEBR.mjs';
-import { b as backoff, d as delay } from './time-CIkdLyza.mjs';
+import { b as backoff, d as delay } from './time-CgAwVt5R.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, refreshAgentHomes } from './index-BENDk1i9.mjs';
+import { locateClaudeConversation, refreshAgentHomes } from './index-BZCIkrFj.mjs';
 import { randomBytes } from 'node:crypto';
 import { readdirSync, unlinkSync, existsSync, mkdirSync, writeFileSync, readFileSync, statSync, chmodSync, renameSync, rmSync, accessSync, constants } from 'node:fs';
 import axios from 'axios';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { a as isValidTerminalId } from './ids-DU6sLx4C.mjs';
 import { d as detectCLIAvailability } from './detectCLI-CSGMlV51.mjs';
-import { d as detectResumeSupport } from './localHappyAgentAuth-CAAIUJyY.mjs';
+import { d as detectResumeSupport } from './localHappyAgentAuth-BAK_nqMG.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, b as forkAndTruncateSession, c as ForkTruncateUuidNotFoundError, e as forkBeforeUserMessage, a as forkCompletedTurns } from './claudeSessionFork-HFFwivGY.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-mln0W8vT.mjs';
+import { f as forkSession, F as ForkSourceMissingError, d as discardForkedSession, l as listClaudeRewindPoints, b as forkAndTruncateSession, c as ForkTruncateUuidNotFoundError, e as forkBeforeUserMessage, a as forkCompletedTurns } from './claudeSessionFork-BqV6E0ep.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-aV5m-FpZ.mjs';
 import { f as forkCodexThread, C as CodexForkRewindPointNotFoundError, l as listCodexRewindPoints, b as forkCodexBeforeUserMessage, a as forkCodexCompletedTurns } from './codexThreadFork-CVzAqELg.mjs';
-import { p as planRateLimitWrite, m as mergeRateLimitReports } from './rateLimitWindows-8-khalzj.mjs';
+import { p as planRateLimitWrite, m as mergeRateLimitReports } from './rateLimitWindows-4uhuwKnU.mjs';
 import 'chalk';
 import 'node:util';
 import 'os';
 import 'child_process';
-import './package-C4OfB2YF.mjs';
+import './package-CpmoMPuj.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
@@ -47,9 +47,9 @@ import 'path';
 import 'cross-spawn';
 import 'zod';
 import '@paralleldrive/cuid2';
-import './claudeAccountEnv-NyoxjLuJ.mjs';
-import './store-Tf-r1ouq.mjs';
-import './codexAccount-CKXpXq0B.mjs';
+import './claudeAccountEnv-CPO6CGNd.mjs';
+import './store-BlPvTr_Q.mjs';
+import './codexAccount-iZwmpYti.mjs';
 import 'node:readline';
 import 'tweetnacl';
 import './terminalTitleSuggest-CeKsX_V6.mjs';