@adhdev/session-host-core 1.0.82-rc.26 → 1.0.82-rc.29

package/dist/index.d.mts

@@ -148,6 +148,26 @@ interface ResizeSessionPayload {
 interface StopSessionPayload {
     sessionId: string;
 }
+interface MeshWriterAssignment {
+    meshId: string;
+    nodeId: string;
+    taskId: string;
+    attemptId: string;
+    generation: number;
+    dispatchNonce: number;
+    ownerDaemonId: string;
+}
+interface MeshWriterStopTarget {
+    runtimeKey: string;
+    startedAt: number;
+    osPid: number;
+    providerType: string;
+    assignment: MeshWriterAssignment;
+}
+interface StopMeshWriterPayload extends MeshWriterStopTarget {
+    sessionId: string;
+    clientId: string;
+}
 interface DeleteSessionPayload {
     sessionId: string;
     /** Stop a live runtime before deleting the persisted record. */
@@ -304,6 +324,9 @@ type SessionHostRequest = {
 } | {
     type: 'stop_session';
     payload: StopSessionPayload;
+} | {
+    type: 'stop_mesh_writer';
+    payload: StopMeshWriterPayload;
 } | {
     type: 'delete_session';
     payload: DeleteSessionPayload;
@@ -663,6 +686,8 @@ interface SessionHostClientOptions {
     endpoint?: SessionHostEndpoint;
     appName?: string;
     requestTimeoutMs?: number;
+    /** Join the shared client registry (default true). Disable for short-lived probes. */
+    registerAsShared?: boolean;
 }
 /**
  * Why an established session-host connection went away.
@@ -672,6 +697,7 @@ interface SessionHostClientOptions {
  */
 type SessionHostDisconnectReason = 'error' | 'ended' | 'closed';
 declare function disconnectSessionHostClients(endpoint?: SessionHostEndpoint, error?: Error): void;
+declare function findConnectedSessionHostClient(endpoint?: SessionHostEndpoint): SessionHostClient | null;
 interface SessionHostDisconnectInfo {
     reason: SessionHostDisconnectReason;
     endpointPath: string;
@@ -703,6 +729,8 @@ declare class SessionHostClient {
     private attachedSessions;
     constructor(options?: SessionHostClientOptions);
     static disconnectClients(endpoint?: SessionHostEndpoint, error?: Error): void;
+    static findConnectedClient(endpoint?: SessionHostEndpoint): SessionHostClient | null;
+    isConnected(): boolean;
     /**
      * Fires when an established connection to the session host goes away.
      *
@@ -718,9 +746,11 @@ declare class SessionHostClient {
     onDisconnect(listener: (info: SessionHostDisconnectInfo) => void): () => void;
     private handleDisconnect;
     private sendRawRequestOnSocket;
-    connect(): Promise<void>;
+    connect(timeoutMs?: number): Promise<void>;
     onEvent(listener: (event: SessionHostEvent) => void): () => void;
-    request<T = unknown>(request: SessionHostRequest): Promise<SessionHostResponse<T>>;
+    request<T = unknown>(request: SessionHostRequest, options?: {
+        timeoutMs?: number;
+    }): Promise<SessionHostResponse<T>>;
     disconnect(error?: Error): void;
     close(): Promise<void>;
 }
@@ -880,4 +910,4 @@ interface SessionHostControlTransport {
  */
 declare function createSessionHostControlPlane(transport: SessionHostControlTransport): SessionHostControlPlane;
 
-export { type AcquireWritePayload, type AttachSessionPayload, CLI_CHILD_NICE_ENV, CLI_CHILD_NICE_INCREMENT, CLI_CHILD_SCHEDULING_ENV, type ClearSessionBufferPayload, type CreateSessionPayload, DEFAULT_CONFIG_DIR_NAME, DEFAULT_SESSION_RING_BUFFER_MAX_BYTES, type DetachSessionPayload, type ForceDetachClientPayload, type GetHostDiagnosticsPayload, type GetSnapshotPayload, type GetTerminalSnapshotPayload, type HostUpgradeLeasePayload, type PruneDuplicateSessionsPayload, type ReleaseWritePayload, type ResizeSessionPayload, type RestartSessionPayload, type ResumeSessionPayload, SESSION_HOST_SUPPORTED_REQUEST_TYPES, type SendInputPayload, type SendSignalPayload, type SessionAttachedClient, type SessionBufferSnapshot, type SessionClientType, type SessionHostCategory, SessionHostClient, type SessionHostClientOptions, type SessionHostControlPlane, type SessionHostControlTransport, type SessionHostDiagnostics, type SessionHostDisconnectInfo, type SessionHostDisconnectReason, type SessionHostDuplicateSessionGroup, type SessionHostEndpoint, type SessionHostEndpointOptions, type SessionHostEvent, type SessionHostEventEnvelope, type SessionHostLogEntry, type SessionHostPruneDuplicatesResult, type SessionHostRecord, SessionHostRegistry, type SessionHostRequest, type SessionHostRequestEnvelope, type SessionHostRequestTrace, type SessionHostRequestType, type SessionHostResponse, type SessionHostResponseEnvelope, type SessionHostRuntimeTransition, type SessionHostSnapshot, type SessionHostSurfaceKind, type SessionHostSurfaceRecordLike, type SessionHostWireEnvelope, type SessionLaunchCommand, type SessionLifecycle, type SessionOwnerType, SessionRingBuffer, type SessionRingBufferOptions, type SessionTerminalSnapshot, type SessionTerminalState, type SessionTermination, type SessionTransport, type SessionWriteOwner, type StopSessionPayload, type UpdateSessionMetaPayload, applyTerminalColorEnv, buildRuntimeDisplayName, buildRuntimeKey, canonicalizeInstancePath, classifyTermination, createCliChildPriorityPolicy, createLineParser, createResponseEnvelope, createSessionHostControlPlane, disconnectSessionHostClients, ensureNodePtySpawnHelperPermissions, formatRuntimeOwner, getDefaultSessionHostEndpoint, getSessionHostRecoveryLabel, getSessionHostSurfaceKind, getWorkspaceLabel, hiddenSpawn as hiddenSpawnProcess, isDefaultInstanceConfigDir, isSessionHostLiveRuntime, isSessionHostRecoverySnapshot, isTerminalRecord, partitionSessionHostDiagnosticsSessions, partitionSessionHostRecords, replayLaunchEnv, resolveAttachableRuntimeRecord, resolveInstanceConfigDir, resolveRuntimeRecord, resolveSessionHostIpcKey, sanitizeSpawnEnv, spawnCliChild, writeEnvelope };
+export { type AcquireWritePayload, type AttachSessionPayload, CLI_CHILD_NICE_ENV, CLI_CHILD_NICE_INCREMENT, CLI_CHILD_SCHEDULING_ENV, type ClearSessionBufferPayload, type CreateSessionPayload, DEFAULT_CONFIG_DIR_NAME, DEFAULT_SESSION_RING_BUFFER_MAX_BYTES, type DetachSessionPayload, type ForceDetachClientPayload, type GetHostDiagnosticsPayload, type GetSnapshotPayload, type GetTerminalSnapshotPayload, type HostUpgradeLeasePayload, type MeshWriterAssignment, type MeshWriterStopTarget, type PruneDuplicateSessionsPayload, type ReleaseWritePayload, type ResizeSessionPayload, type RestartSessionPayload, type ResumeSessionPayload, SESSION_HOST_SUPPORTED_REQUEST_TYPES, type SendInputPayload, type SendSignalPayload, type SessionAttachedClient, type SessionBufferSnapshot, type SessionClientType, type SessionHostCategory, SessionHostClient, type SessionHostClientOptions, type SessionHostControlPlane, type SessionHostControlTransport, type SessionHostDiagnostics, type SessionHostDisconnectInfo, type SessionHostDisconnectReason, type SessionHostDuplicateSessionGroup, type SessionHostEndpoint, type SessionHostEndpointOptions, type SessionHostEvent, type SessionHostEventEnvelope, type SessionHostLogEntry, type SessionHostPruneDuplicatesResult, type SessionHostRecord, SessionHostRegistry, type SessionHostRequest, type SessionHostRequestEnvelope, type SessionHostRequestTrace, type SessionHostRequestType, type SessionHostResponse, type SessionHostResponseEnvelope, type SessionHostRuntimeTransition, type SessionHostSnapshot, type SessionHostSurfaceKind, type SessionHostSurfaceRecordLike, type SessionHostWireEnvelope, type SessionLaunchCommand, type SessionLifecycle, type SessionOwnerType, SessionRingBuffer, type SessionRingBufferOptions, type SessionTerminalSnapshot, type SessionTerminalState, type SessionTermination, type SessionTransport, type SessionWriteOwner, type StopMeshWriterPayload, type StopSessionPayload, type UpdateSessionMetaPayload, applyTerminalColorEnv, buildRuntimeDisplayName, buildRuntimeKey, canonicalizeInstancePath, classifyTermination, createCliChildPriorityPolicy, createLineParser, createResponseEnvelope, createSessionHostControlPlane, disconnectSessionHostClients, ensureNodePtySpawnHelperPermissions, findConnectedSessionHostClient, formatRuntimeOwner, getDefaultSessionHostEndpoint, getSessionHostRecoveryLabel, getSessionHostSurfaceKind, getWorkspaceLabel, hiddenSpawn as hiddenSpawnProcess, isDefaultInstanceConfigDir, isSessionHostLiveRuntime, isSessionHostRecoverySnapshot, isTerminalRecord, partitionSessionHostDiagnosticsSessions, partitionSessionHostRecords, replayLaunchEnv, resolveAttachableRuntimeRecord, resolveInstanceConfigDir, resolveRuntimeRecord, resolveSessionHostIpcKey, sanitizeSpawnEnv, spawnCliChild, writeEnvelope };

package/dist/index.d.ts

@@ -148,6 +148,26 @@ interface ResizeSessionPayload {
 interface StopSessionPayload {
     sessionId: string;
 }
+interface MeshWriterAssignment {
+    meshId: string;
+    nodeId: string;
+    taskId: string;
+    attemptId: string;
+    generation: number;
+    dispatchNonce: number;
+    ownerDaemonId: string;
+}
+interface MeshWriterStopTarget {
+    runtimeKey: string;
+    startedAt: number;
+    osPid: number;
+    providerType: string;
+    assignment: MeshWriterAssignment;
+}
+interface StopMeshWriterPayload extends MeshWriterStopTarget {
+    sessionId: string;
+    clientId: string;
+}
 interface DeleteSessionPayload {
     sessionId: string;
     /** Stop a live runtime before deleting the persisted record. */
@@ -304,6 +324,9 @@ type SessionHostRequest = {
 } | {
     type: 'stop_session';
     payload: StopSessionPayload;
+} | {
+    type: 'stop_mesh_writer';
+    payload: StopMeshWriterPayload;
 } | {
     type: 'delete_session';
     payload: DeleteSessionPayload;
@@ -663,6 +686,8 @@ interface SessionHostClientOptions {
     endpoint?: SessionHostEndpoint;
     appName?: string;
     requestTimeoutMs?: number;
+    /** Join the shared client registry (default true). Disable for short-lived probes. */
+    registerAsShared?: boolean;
 }
 /**
  * Why an established session-host connection went away.
@@ -672,6 +697,7 @@ interface SessionHostClientOptions {
  */
 type SessionHostDisconnectReason = 'error' | 'ended' | 'closed';
 declare function disconnectSessionHostClients(endpoint?: SessionHostEndpoint, error?: Error): void;
+declare function findConnectedSessionHostClient(endpoint?: SessionHostEndpoint): SessionHostClient | null;
 interface SessionHostDisconnectInfo {
     reason: SessionHostDisconnectReason;
     endpointPath: string;
@@ -703,6 +729,8 @@ declare class SessionHostClient {
     private attachedSessions;
     constructor(options?: SessionHostClientOptions);
     static disconnectClients(endpoint?: SessionHostEndpoint, error?: Error): void;
+    static findConnectedClient(endpoint?: SessionHostEndpoint): SessionHostClient | null;
+    isConnected(): boolean;
     /**
      * Fires when an established connection to the session host goes away.
      *
@@ -718,9 +746,11 @@ declare class SessionHostClient {
     onDisconnect(listener: (info: SessionHostDisconnectInfo) => void): () => void;
     private handleDisconnect;
     private sendRawRequestOnSocket;
-    connect(): Promise<void>;
+    connect(timeoutMs?: number): Promise<void>;
     onEvent(listener: (event: SessionHostEvent) => void): () => void;
-    request<T = unknown>(request: SessionHostRequest): Promise<SessionHostResponse<T>>;
+    request<T = unknown>(request: SessionHostRequest, options?: {
+        timeoutMs?: number;
+    }): Promise<SessionHostResponse<T>>;
     disconnect(error?: Error): void;
     close(): Promise<void>;
 }
@@ -880,4 +910,4 @@ interface SessionHostControlTransport {
  */
 declare function createSessionHostControlPlane(transport: SessionHostControlTransport): SessionHostControlPlane;
 
-export { type AcquireWritePayload, type AttachSessionPayload, CLI_CHILD_NICE_ENV, CLI_CHILD_NICE_INCREMENT, CLI_CHILD_SCHEDULING_ENV, type ClearSessionBufferPayload, type CreateSessionPayload, DEFAULT_CONFIG_DIR_NAME, DEFAULT_SESSION_RING_BUFFER_MAX_BYTES, type DetachSessionPayload, type ForceDetachClientPayload, type GetHostDiagnosticsPayload, type GetSnapshotPayload, type GetTerminalSnapshotPayload, type HostUpgradeLeasePayload, type PruneDuplicateSessionsPayload, type ReleaseWritePayload, type ResizeSessionPayload, type RestartSessionPayload, type ResumeSessionPayload, SESSION_HOST_SUPPORTED_REQUEST_TYPES, type SendInputPayload, type SendSignalPayload, type SessionAttachedClient, type SessionBufferSnapshot, type SessionClientType, type SessionHostCategory, SessionHostClient, type SessionHostClientOptions, type SessionHostControlPlane, type SessionHostControlTransport, type SessionHostDiagnostics, type SessionHostDisconnectInfo, type SessionHostDisconnectReason, type SessionHostDuplicateSessionGroup, type SessionHostEndpoint, type SessionHostEndpointOptions, type SessionHostEvent, type SessionHostEventEnvelope, type SessionHostLogEntry, type SessionHostPruneDuplicatesResult, type SessionHostRecord, SessionHostRegistry, type SessionHostRequest, type SessionHostRequestEnvelope, type SessionHostRequestTrace, type SessionHostRequestType, type SessionHostResponse, type SessionHostResponseEnvelope, type SessionHostRuntimeTransition, type SessionHostSnapshot, type SessionHostSurfaceKind, type SessionHostSurfaceRecordLike, type SessionHostWireEnvelope, type SessionLaunchCommand, type SessionLifecycle, type SessionOwnerType, SessionRingBuffer, type SessionRingBufferOptions, type SessionTerminalSnapshot, type SessionTerminalState, type SessionTermination, type SessionTransport, type SessionWriteOwner, type StopSessionPayload, type UpdateSessionMetaPayload, applyTerminalColorEnv, buildRuntimeDisplayName, buildRuntimeKey, canonicalizeInstancePath, classifyTermination, createCliChildPriorityPolicy, createLineParser, createResponseEnvelope, createSessionHostControlPlane, disconnectSessionHostClients, ensureNodePtySpawnHelperPermissions, formatRuntimeOwner, getDefaultSessionHostEndpoint, getSessionHostRecoveryLabel, getSessionHostSurfaceKind, getWorkspaceLabel, hiddenSpawn as hiddenSpawnProcess, isDefaultInstanceConfigDir, isSessionHostLiveRuntime, isSessionHostRecoverySnapshot, isTerminalRecord, partitionSessionHostDiagnosticsSessions, partitionSessionHostRecords, replayLaunchEnv, resolveAttachableRuntimeRecord, resolveInstanceConfigDir, resolveRuntimeRecord, resolveSessionHostIpcKey, sanitizeSpawnEnv, spawnCliChild, writeEnvelope };
+export { type AcquireWritePayload, type AttachSessionPayload, CLI_CHILD_NICE_ENV, CLI_CHILD_NICE_INCREMENT, CLI_CHILD_SCHEDULING_ENV, type ClearSessionBufferPayload, type CreateSessionPayload, DEFAULT_CONFIG_DIR_NAME, DEFAULT_SESSION_RING_BUFFER_MAX_BYTES, type DetachSessionPayload, type ForceDetachClientPayload, type GetHostDiagnosticsPayload, type GetSnapshotPayload, type GetTerminalSnapshotPayload, type HostUpgradeLeasePayload, type MeshWriterAssignment, type MeshWriterStopTarget, type PruneDuplicateSessionsPayload, type ReleaseWritePayload, type ResizeSessionPayload, type RestartSessionPayload, type ResumeSessionPayload, SESSION_HOST_SUPPORTED_REQUEST_TYPES, type SendInputPayload, type SendSignalPayload, type SessionAttachedClient, type SessionBufferSnapshot, type SessionClientType, type SessionHostCategory, SessionHostClient, type SessionHostClientOptions, type SessionHostControlPlane, type SessionHostControlTransport, type SessionHostDiagnostics, type SessionHostDisconnectInfo, type SessionHostDisconnectReason, type SessionHostDuplicateSessionGroup, type SessionHostEndpoint, type SessionHostEndpointOptions, type SessionHostEvent, type SessionHostEventEnvelope, type SessionHostLogEntry, type SessionHostPruneDuplicatesResult, type SessionHostRecord, SessionHostRegistry, type SessionHostRequest, type SessionHostRequestEnvelope, type SessionHostRequestTrace, type SessionHostRequestType, type SessionHostResponse, type SessionHostResponseEnvelope, type SessionHostRuntimeTransition, type SessionHostSnapshot, type SessionHostSurfaceKind, type SessionHostSurfaceRecordLike, type SessionHostWireEnvelope, type SessionLaunchCommand, type SessionLifecycle, type SessionOwnerType, SessionRingBuffer, type SessionRingBufferOptions, type SessionTerminalSnapshot, type SessionTerminalState, type SessionTermination, type SessionTransport, type SessionWriteOwner, type StopMeshWriterPayload, type StopSessionPayload, type UpdateSessionMetaPayload, applyTerminalColorEnv, buildRuntimeDisplayName, buildRuntimeKey, canonicalizeInstancePath, classifyTermination, createCliChildPriorityPolicy, createLineParser, createResponseEnvelope, createSessionHostControlPlane, disconnectSessionHostClients, ensureNodePtySpawnHelperPermissions, findConnectedSessionHostClient, formatRuntimeOwner, getDefaultSessionHostEndpoint, getSessionHostRecoveryLabel, getSessionHostSurfaceKind, getWorkspaceLabel, hiddenSpawn as hiddenSpawnProcess, isDefaultInstanceConfigDir, isSessionHostLiveRuntime, isSessionHostRecoverySnapshot, isTerminalRecord, partitionSessionHostDiagnosticsSessions, partitionSessionHostRecords, replayLaunchEnv, resolveAttachableRuntimeRecord, resolveInstanceConfigDir, resolveRuntimeRecord, resolveSessionHostIpcKey, sanitizeSpawnEnv, spawnCliChild, writeEnvelope };

package/dist/index.js

@@ -52,6 +52,7 @@ __export(index_exports, {
   createSessionHostControlPlane: () => createSessionHostControlPlane,
   disconnectSessionHostClients: () => disconnectSessionHostClients,
   ensureNodePtySpawnHelperPermissions: () => ensureNodePtySpawnHelperPermissions,
+  findConnectedSessionHostClient: () => findConnectedSessionHostClient,
   formatRuntimeOwner: () => formatRuntimeOwner,
   getDefaultSessionHostEndpoint: () => getDefaultSessionHostEndpoint,
   getSessionHostRecoveryLabel: () => getSessionHostRecoveryLabel,
@@ -88,6 +89,7 @@ var SESSION_HOST_SUPPORTED_REQUEST_TYPES = [
   "send_input",
   "resize_session",
   "stop_session",
+  "stop_mesh_writer",
   "delete_session",
   "resume_session",
   "acquire_write",
@@ -818,6 +820,19 @@ function disconnectSessionHostClients(endpoint, error) {
     }
   }
 }
+function findConnectedSessionHostClient(endpoint) {
+  for (const ref of activeClientRefs) {
+    const client = ref.deref();
+    if (!client) {
+      activeClientRefs.delete(ref);
+      continue;
+    }
+    if ((!endpoint || client.endpoint.path === endpoint.path) && client.isConnected()) {
+      return client;
+    }
+  }
+  return null;
+}
 var SessionHostClient = class {
   endpoint;
   socket = null;
@@ -835,11 +850,17 @@ var SessionHostClient = class {
     if (typeof options.requestTimeoutMs === "number" && options.requestTimeoutMs > 0) {
       this.requestTimeoutMs = options.requestTimeoutMs;
     }
-    activeClientRefs.add(new WeakRef(this));
+    if (options.registerAsShared !== false) activeClientRefs.add(new WeakRef(this));
   }
   static disconnectClients(endpoint, error) {
     disconnectSessionHostClients(endpoint, error);
   }
+  static findConnectedClient(endpoint) {
+    return findConnectedSessionHostClient(endpoint);
+  }
+  isConnected() {
+    return Boolean(this.socket && !this.socket.destroyed && establishedSockets.has(this.socket));
+  }
   /**
    * Fires when an established connection to the session host goes away.
    *
@@ -901,18 +922,32 @@ var SessionHostClient = class {
       }
     }
   }
-  sendRawRequestOnSocket(socket, request) {
+  sendRawRequestOnSocket(socket, request, timeoutMs = this.requestTimeoutMs) {
     const requestId = generateUUID();
     const envelope = {
       kind: "request",
       requestId,
       request
     };
-    const timeoutMs = this.requestTimeoutMs > 0 ? this.requestTimeoutMs : 3e4;
     const timeoutLabel = timeoutMs % 1e3 === 0 ? `${timeoutMs / 1e3}s` : `${timeoutMs}ms`;
+    const startedAt = Date.now();
+    const startedMonotonicAt = performance.now();
     return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
-        const timeoutError = new Error(`Session host request timed out after ${timeoutLabel} (${request.type})`);
+        const actualElapsedMs = Math.max(0, Math.round(performance.now() - startedMonotonicAt));
+        const wallElapsedMs = Math.max(0, Date.now() - startedAt);
+        const observerLagMs = Math.max(0, actualElapsedMs - timeoutMs);
+        const timeoutError = Object.assign(
+          new Error(`Session host request timed out after ${timeoutLabel} (${request.type})`),
+          {
+            code: "SESSION_HOST_REQUEST_TIMEOUT",
+            requestType: request.type,
+            scheduledTimeoutMs: timeoutMs,
+            actualElapsedMs,
+            wallElapsedMs,
+            observerLagMs
+          }
+        );
         if (this.socket === socket) {
           this.disconnect(timeoutError);
         } else {
@@ -938,7 +973,7 @@ var SessionHostClient = class {
       socket.write(serializeEnvelope(envelope));
     });
   }
-  async connect() {
+  async connect(timeoutMs = this.requestTimeoutMs) {
     if (this.socket && !this.socket.destroyed) {
       if (this.connectPromise) await this.connectPromise;
       return;
@@ -986,11 +1021,44 @@ var SessionHostClient = class {
     });
     const connectTask = (async () => {
       await new Promise((resolve3, reject) => {
-        socket.once("connect", () => {
+        const cleanup = () => {
+          clearTimeout(timer);
+          socket.off("connect", connected);
+          socket.off("error", failed);
+          socket.off("close", closed);
+        };
+        const connected = () => {
+          cleanup();
           establishedSockets.add(socket);
           resolve3();
-        });
-        socket.once("error", reject);
+        };
+        const failed = (error) => {
+          cleanup();
+          reject(error);
+        };
+        const closed = () => failed(new Error("Session host connection closed before connect"));
+        const connectStartedAt = Date.now();
+        const connectStartedMonotonicAt = performance.now();
+        const timer = setTimeout(() => {
+          const actualElapsedMs = Math.max(0, Math.round(performance.now() - connectStartedMonotonicAt));
+          const wallElapsedMs = Math.max(0, Date.now() - connectStartedAt);
+          const observerLagMs = Math.max(0, actualElapsedMs - timeoutMs);
+          const error = Object.assign(
+            new Error(`Session host connect timed out after ${timeoutMs}ms`),
+            {
+              code: "SESSION_HOST_CONNECT_TIMEOUT",
+              scheduledTimeoutMs: timeoutMs,
+              actualElapsedMs,
+              wallElapsedMs,
+              observerLagMs
+            }
+          );
+          failed(error);
+          if (this.socket === socket) this.disconnect(error);
+        }, timeoutMs);
+        socket.once("connect", connected);
+        socket.once("error", failed);
+        socket.once("close", closed);
       });
       if (this.attachedSessions.size > 0 && this.socket === socket && !socket.destroyed) {
         for (const [sessionId, sub] of [...this.attachedSessions.entries()]) {
@@ -1020,11 +1088,46 @@ var SessionHostClient = class {
       this.eventListeners.delete(listener);
     };
   }
-  async request(request) {
-    await this.connect();
+  async request(request, options = {}) {
+    const timeoutMs = Math.max(1, options.timeoutMs ?? this.requestTimeoutMs);
+    const deadline = Date.now() + timeoutMs;
+    const alreadyConnected = this.isConnected() && !this.connectPromise;
+    if (options.timeoutMs !== void 0) {
+      let timer;
+      const raceStartedAt = Date.now();
+      const raceStartedMonotonicAt = performance.now();
+      try {
+        await Promise.race([
+          this.connect(timeoutMs),
+          new Promise((_resolve, reject) => {
+            timer = setTimeout(() => {
+              const actualElapsedMs = Math.max(0, Math.round(performance.now() - raceStartedMonotonicAt));
+              const wallElapsedMs = Math.max(0, Date.now() - raceStartedAt);
+              const observerLagMs = Math.max(0, actualElapsedMs - timeoutMs);
+              const error = Object.assign(
+                new Error(`Session host connect timed out after ${timeoutMs}ms`),
+                {
+                  code: "SESSION_HOST_CONNECT_TIMEOUT",
+                  scheduledTimeoutMs: timeoutMs,
+                  actualElapsedMs,
+                  wallElapsedMs,
+                  observerLagMs
+                }
+              );
+              reject(error);
+              this.disconnect(error);
+            }, timeoutMs);
+          })
+        ]);
+      } finally {
+        if (timer) clearTimeout(timer);
+      }
+    } else {
+      await this.connect(timeoutMs);
+    }
     const requestSocket = this.socket;
     if (!requestSocket) throw new Error("Session host socket unavailable");
-    const response = await this.sendRawRequestOnSocket(requestSocket, request);
+    const response = await this.sendRawRequestOnSocket(requestSocket, request, options.timeoutMs === void 0 || alreadyConnected ? timeoutMs : Math.max(1, deadline - Date.now()));
     if (response.success) {
       if (request.type === "attach_session") {
         this.attachedSessions.set(request.payload.sessionId, {
@@ -1285,6 +1388,7 @@ function createSessionHostControlPlane(transport) {
   createSessionHostControlPlane,
   disconnectSessionHostClients,
   ensureNodePtySpawnHelperPermissions,
+  findConnectedSessionHostClient,
   formatRuntimeOwner,
   getDefaultSessionHostEndpoint,
   getSessionHostRecoveryLabel,