@getpaseo/server 0.1.30 → 0.1.32

package/dist/server/client/daemon-client.js

@@ -1,10 +1,8 @@
-import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, parseServerInfoStatusPayload, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, SessionInboundMessageSchema, WSOutboundMessageSchema, } from '../shared/messages.js';
-import { getAgentProviderDefinition } from '../server/agent/provider-manifest.js';
-import { isRelayClientWebSocketUrl } from '../shared/daemon-endpoints.js';
-import { asUint8Array, decodeBinaryMuxFrame, encodeBinaryMuxFrame, BinaryMuxChannel, TerminalBinaryFlags, TerminalBinaryMessageType, } from '../shared/binary-mux.js';
-import { encodeTerminalKeyInput } from '../shared/terminal-key-input.js';
-import { TerminalStreamManager, } from './daemon-client-terminal-stream-manager.js';
-import { createRelayE2eeTransportFactory, createWebSocketTransportFactory, decodeMessageData, defaultWebSocketFactory, describeTransportClose, describeTransportError, encodeUtf8String, } from './daemon-client-transport.js';
+import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, parseServerInfoStatusPayload, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, SessionInboundMessageSchema, WSOutboundMessageSchema, } from "../shared/messages.js";
+import { getAgentProviderDefinition } from "../server/agent/provider-manifest.js";
+import { isRelayClientWebSocketUrl } from "../shared/daemon-endpoints.js";
+import { asUint8Array, decodeTerminalSnapshotPayload, decodeTerminalStreamFrame, encodeTerminalResizePayload, encodeTerminalStreamFrame, TerminalStreamOpcode, } from "../shared/terminal-stream-protocol.js";
+import { createRelayE2eeTransportFactory, createWebSocketTransportFactory, decodeMessageData, defaultWebSocketFactory, describeTransportClose, describeTransportError, encodeUtf8String, } from "./daemon-client-transport.js";
 const consoleLogger = {
     debug: () => { },
     info: (obj, msg) => console.info(msg, obj),
@@ -13,8 +11,13 @@ const consoleLogger = {
 };
 class DaemonRpcError extends Error {
     constructor(params) {
-        super(params.error);
-        this.name = 'DaemonRpcError';
+        const parts = [params.error];
+        if (params.requestType)
+            parts.push(`requestType=${params.requestType}`);
+        if (params.code)
+            parts.push(`code=${params.code}`);
+        super(parts.join(" "));
+        this.name = "DaemonRpcError";
         this.requestId = params.requestId;
         this.requestType = params.requestType;
         this.code = params.code;
@@ -29,10 +32,10 @@ const DEFAULT_DICTATION_FINISH_ACCEPT_TIMEOUT_MS = 15000;
 const DEFAULT_DICTATION_FINISH_FALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 const DEFAULT_DICTATION_FINISH_TIMEOUT_GRACE_MS = 5000;
 function isWaiterTimeoutError(error) {
-    return error instanceof Error && error.message.startsWith('Timeout waiting for message');
+    return error instanceof Error && error.message.startsWith("Timeout waiting for message");
 }
 function normalizeClientId(value) {
-    if (typeof value !== 'string') {
+    if (typeof value !== "string") {
         return null;
     }
     const trimmed = value.trim();
@@ -50,22 +53,22 @@ function toReasonCode(reason) {
         return null;
     }
     const normalized = reason.toLowerCase();
-    if (normalized.includes('timed out')) {
-        return 'connect_timeout';
+    if (normalized.includes("timed out")) {
+        return "connect_timeout";
     }
-    if (normalized.includes('disposed')) {
-        return 'disposed';
+    if (normalized.includes("disposed")) {
+        return "disposed";
     }
-    if (normalized.includes('client closed')) {
-        return 'client_closed';
+    if (normalized.includes("client closed")) {
+        return "client_closed";
     }
-    if (normalized.includes('transport')) {
-        return 'transport_error';
+    if (normalized.includes("transport")) {
+        return "transport_error";
     }
-    if (normalized.includes('failed to connect')) {
-        return 'connect_failed';
+    if (normalized.includes("failed to connect")) {
+        return "connect_failed";
     }
-    return 'unknown';
+    return "unknown";
 }
 export class DaemonClient {
     constructor(config) {
@@ -87,13 +90,16 @@ export class DaemonClient {
         this.connectResolve = null;
         this.connectReject = null;
         this.lastErrorValue = null;
-        this.connectionState = { status: 'idle' };
+        this.connectionState = { status: "idle" };
         this.checkoutDiffSubscriptions = new Map();
         this.terminalDirectorySubscriptions = new Set();
+        this.terminalSlots = new Map();
+        this.slotTerminals = new Map();
+        this.terminalStreamListeners = new Set();
         this.pendingSendQueue = [];
         this.lastServerInfoMessage = null;
         this.logger = config.logger ?? consoleLogger;
-        this.logConnectionPath = isRelayClientWebSocketUrl(this.config.url) ? 'relay' : 'direct';
+        this.logConnectionPath = isRelayClientWebSocketUrl(this.config.url) ? "relay" : "direct";
         let parsedUrlForLog = null;
         try {
             parsedUrlForLog = new URL(this.config.url);
@@ -101,38 +107,28 @@ export class DaemonClient {
         catch {
             parsedUrlForLog = null;
         }
-        const parsedServerIdForLog = normalizeClientId(parsedUrlForLog?.searchParams.get('serverId'));
+        const parsedServerIdForLog = normalizeClientId(parsedUrlForLog?.searchParams.get("serverId"));
         this.logServerId = parsedServerIdForLog ?? parsedUrlForLog?.host ?? null;
         const resolvedClientId = normalizeClientId(this.config.clientId);
         if (!resolvedClientId) {
-            throw new Error('Daemon client requires a non-empty clientId');
+            throw new Error("Daemon client requires a non-empty clientId");
         }
         this.config.clientId = resolvedClientId;
         this.logClientIdHash = hashForLog(resolvedClientId);
         this.logGeneration =
-            typeof this.config.runtimeGeneration === 'number' && Number.isFinite(this.config.runtimeGeneration)
+            typeof this.config.runtimeGeneration === "number" &&
+                Number.isFinite(this.config.runtimeGeneration)
                 ? this.config.runtimeGeneration
                 : null;
-        this.terminalStreams = new TerminalStreamManager({
-            sendAck: (ack) => {
-                this.sendBinaryFrame({
-                    channel: BinaryMuxChannel.Terminal,
-                    messageType: TerminalBinaryMessageType.Ack,
-                    streamId: ack.streamId,
-                    offset: ack.offset,
-                    payload: new Uint8Array(0),
-                });
-            },
-        });
     }
     // ============================================================================
     // Connection
     // ============================================================================
     async connect() {
-        if (this.connectionState.status === 'disposed') {
-            throw new Error('Daemon client is disposed');
+        if (this.connectionState.status === "disposed") {
+            throw new Error("Daemon client is disposed");
         }
-        if (this.connectionState.status === 'connected') {
+        if (this.connectionState.status === "connected") {
             return;
         }
         if (this.connectPromise) {
@@ -147,20 +143,20 @@ export class DaemonClient {
         return this.connectPromise;
     }
     attemptConnect() {
-        if (this.connectionState.status === 'disposed') {
-            this.rejectConnect(new Error('Daemon client is disposed'));
+        if (this.connectionState.status === "disposed") {
+            this.rejectConnect(new Error("Daemon client is disposed"));
             return;
         }
         if (!this.shouldReconnect) {
-            this.rejectConnect(new Error('Daemon client is closed'));
+            this.rejectConnect(new Error("Daemon client is closed"));
             return;
         }
-        if (this.connectionState.status === 'connecting') {
+        if (this.connectionState.status === "connecting") {
             return;
         }
         const headers = {};
         if (this.config.authHeader) {
-            headers['Authorization'] = this.config.authHeader;
+            headers["Authorization"] = this.config.authHeader;
         }
         try {
             // Reconnect can overlap with browser close/error delivery ordering.
@@ -173,7 +169,7 @@ export class DaemonClient {
             if (shouldUseRelayE2ee) {
                 const daemonPublicKeyB64 = this.config.e2ee?.daemonPublicKeyB64;
                 if (!daemonPublicKeyB64) {
-                    throw new Error('daemonPublicKeyB64 is required for relay E2EE');
+                    throw new Error("daemonPublicKeyB64 is required for relay E2EE");
                 }
                 transportFactory = createRelayE2eeTransportFactory({
                     baseFactory: baseTransportFactory,
@@ -186,21 +182,21 @@ export class DaemonClient {
             this.transport = transport;
             this.lastServerInfoMessage = null;
             this.updateConnectionState({
-                status: 'connecting',
+                status: "connecting",
                 attempt: this.reconnectAttempt,
-            }, { event: 'CONNECT_REQUEST' });
+            }, { event: "CONNECT_REQUEST" });
             this.resetConnectTimeout();
             const timeoutMs = Math.max(1, this.config.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS);
             this.connectTimeout = setTimeout(() => {
-                if (this.connectionState.status !== 'connecting') {
+                if (this.connectionState.status !== "connecting") {
                     return;
                 }
-                this.lastErrorValue = 'Connection timed out';
-                this.disposeTransport(1001, 'Connection timed out');
+                this.lastErrorValue = "Connection timed out";
+                this.disposeTransport(1001, "Connection timed out");
                 this.scheduleReconnect({
-                    reason: 'Connection timed out',
-                    event: 'CONNECT_TIMEOUT',
-                    reasonCode: 'connect_timeout',
+                    reason: "Connection timed out",
+                    event: "CONNECT_TIMEOUT",
+                    reasonCode: "connect_timeout",
                 });
             }, timeoutMs);
             this.transportCleanup = [
@@ -224,14 +220,14 @@ export class DaemonClient {
                     }
                     this.scheduleReconnect({
                         reason,
-                        event: 'TRANSPORT_CLOSE',
-                        reasonCode: 'transport_closed',
+                        event: "TRANSPORT_CLOSE",
+                        reasonCode: "transport_closed",
                     });
                 }),
                 transport.onError((event) => {
                     this.resetConnectTimeout();
                     const reason = describeTransportError(event);
-                    const isGeneric = reason === 'Transport error';
+                    const isGeneric = reason === "Transport error";
                     // Browser WebSocket.onerror often provides no useful details and is followed
                     // by a close event (often with code 1006). Prefer surfacing the close details
                     // instead of immediately disconnecting with a generic "Transport error".
@@ -240,13 +236,13 @@ export class DaemonClient {
                         if (!this.pendingGenericTransportErrorTimeout) {
                             this.pendingGenericTransportErrorTimeout = setTimeout(() => {
                                 this.pendingGenericTransportErrorTimeout = null;
-                                if (this.connectionState.status === 'connected' ||
-                                    this.connectionState.status === 'connecting') {
+                                if (this.connectionState.status === "connected" ||
+                                    this.connectionState.status === "connecting") {
                                     this.lastErrorValue = reason;
                                     this.scheduleReconnect({
                                         reason,
-                                        event: 'TRANSPORT_ERROR',
-                                        reasonCode: 'transport_error',
+                                        event: "TRANSPORT_ERROR",
+                                        reasonCode: "transport_error",
                                     });
                                 }
                             }, 250);
@@ -260,8 +256,8 @@ export class DaemonClient {
                     this.lastErrorValue = reason;
                     this.scheduleReconnect({
                         reason,
-                        event: 'TRANSPORT_ERROR',
-                        reasonCode: 'transport_error',
+                        event: "TRANSPORT_ERROR",
+                        reasonCode: "transport_error",
                     });
                 }),
                 transport.onMessage((data) => this.handleTransportMessage(data)),
@@ -269,12 +265,12 @@ export class DaemonClient {
         }
         catch (error) {
             this.resetConnectTimeout();
-            const message = error instanceof Error ? error.message : 'Failed to connect';
+            const message = error instanceof Error ? error.message : "Failed to connect";
             this.lastErrorValue = message;
             this.scheduleReconnect({
                 reason: message,
-                event: 'CONNECT_FAILED',
-                reasonCode: 'connect_failed',
+                event: "CONNECT_FAILED",
+                reasonCode: "connect_failed",
             });
             this.rejectConnect(error instanceof Error ? error : new Error(message));
         }
@@ -296,7 +292,7 @@ export class DaemonClient {
         this.connectReject = null;
     }
     async close() {
-        if (this.connectionState.status === 'disposed') {
+        if (this.connectionState.status === "disposed") {
             return;
         }
         this.shouldReconnect = false;
@@ -308,22 +304,22 @@ export class DaemonClient {
             this.reconnectTimeout = null;
         }
         this.resetConnectTimeout();
-        this.disposeTransport(1000, 'Client closed');
-        this.clearWaiters(new Error('Daemon client closed'));
-        this.rejectPendingSendQueue(new Error('Daemon client closed'));
-        this.terminalStreams.clearAll();
+        this.disposeTransport(1000, "Client closed");
+        this.clearWaiters(new Error("Daemon client closed"));
+        this.rejectPendingSendQueue(new Error("Daemon client closed"));
+        this.clearTerminalSlots();
         this.lastServerInfoMessage = null;
-        this.updateConnectionState({ status: 'disposed' }, { event: 'DISPOSE', reason: 'Client closed', reasonCode: 'disposed' });
+        this.updateConnectionState({ status: "disposed" }, { event: "DISPOSE", reason: "Client closed", reasonCode: "disposed" });
     }
     ensureConnected() {
-        if (this.connectionState.status === 'disposed') {
+        if (this.connectionState.status === "disposed") {
             return;
         }
         if (!this.shouldReconnect) {
             this.shouldReconnect = true;
         }
-        if (this.connectionState.status === 'connected' ||
-            this.connectionState.status === 'connecting') {
+        if (this.connectionState.status === "connected" ||
+            this.connectionState.status === "connecting") {
             return;
         }
         void this.connect();
@@ -339,10 +335,10 @@ export class DaemonClient {
         };
     }
     get isConnected() {
-        return this.connectionState.status === 'connected';
+        return this.connectionState.status === "connected";
     }
     get isConnecting() {
-        return this.connectionState.status === 'connecting';
+        return this.connectionState.status === "connecting";
     }
     get lastError() {
         return this.lastErrorValue;
@@ -361,7 +357,7 @@ export class DaemonClient {
         };
     }
     on(arg1, arg2) {
-        if (typeof arg1 === 'function') {
+        if (typeof arg1 === "function") {
             return this.subscribe(arg1);
         }
         const type = arg1;
@@ -390,7 +386,7 @@ export class DaemonClient {
      * For RPC methods that wait for responses, use `sendSessionMessageOrThrow` instead.
      */
     sendSessionMessage(message) {
-        if (!this.transport || this.connectionState.status !== 'connected') {
+        if (!this.transport || this.connectionState.status !== "connected") {
             if (this.config.suppressSendErrors) {
                 return;
             }
@@ -398,7 +394,7 @@ export class DaemonClient {
         }
         const payload = SessionInboundMessageSchema.parse(message);
         try {
-            this.transport.send(JSON.stringify({ type: 'session', message: payload }));
+            this.transport.send(JSON.stringify({ type: "session", message: payload }));
         }
         catch (error) {
             if (this.config.suppressSendErrors) {
@@ -408,14 +404,14 @@ export class DaemonClient {
         }
     }
     sendBinaryFrame(frame) {
-        if (!this.transport || this.connectionState.status !== 'connected') {
+        if (!this.transport || this.connectionState.status !== "connected") {
             if (this.config.suppressSendErrors) {
                 return;
             }
             throw new Error(`Transport not connected (status: ${this.connectionState.status})`);
         }
         try {
-            this.transport.send(encodeBinaryMuxFrame(frame));
+            this.transport.send(frame);
         }
         catch (error) {
             if (this.config.suppressSendErrors) {
@@ -433,13 +429,13 @@ export class DaemonClient {
     sendSessionMessageOrThrow(message) {
         const status = this.connectionState.status;
         // If connected, send immediately
-        if (this.transport && status === 'connected') {
+        if (this.transport && status === "connected") {
             const payload = SessionInboundMessageSchema.parse(message);
-            this.transport.send(JSON.stringify({ type: 'session', message: payload }));
+            this.transport.send(JSON.stringify({ type: "session", message: payload }));
             return Promise.resolve();
         }
         // If connecting, queue the message to be sent once connected
-        if (status === 'connecting') {
+        if (status === "connecting") {
             return new Promise((resolve, reject) => {
                 const timeoutHandle = setTimeout(() => {
                     // Remove from queue
@@ -464,13 +460,13 @@ export class DaemonClient {
         for (const pending of queue) {
             clearTimeout(pending.timeoutHandle);
             try {
-                if (this.transport && this.connectionState.status === 'connected') {
+                if (this.transport && this.connectionState.status === "connected") {
                     const payload = SessionInboundMessageSchema.parse(pending.message);
-                    this.transport.send(JSON.stringify({ type: 'session', message: payload }));
+                    this.transport.send(JSON.stringify({ type: "session", message: payload }));
                     pending.resolve();
                 }
                 else {
-                    pending.reject(new Error('Connection lost before message could be sent'));
+                    pending.reject(new Error("Connection lost before message could be sent"));
                 }
             }
             catch (error) {
@@ -491,9 +487,9 @@ export class DaemonClient {
     }
     async sendRequest(params) {
         const { promise, cancel } = this.waitForWithCancel((msg) => {
-            if (msg.type === 'rpc_error' && msg.payload.requestId === params.requestId) {
+            if (msg.type === "rpc_error" && msg.payload.requestId === params.requestId) {
                 return {
-                    kind: 'error',
+                    kind: "error",
                     error: new DaemonRpcError({
                         requestId: msg.payload.requestId,
                         error: msg.payload.error,
@@ -506,7 +502,7 @@ export class DaemonClient {
             if (value === null) {
                 return null;
             }
-            return { kind: 'ok', value };
+            return { kind: "ok", value };
         }, params.timeout, params.options);
         try {
             await this.sendSessionMessageOrThrow(params.message);
@@ -518,7 +514,7 @@ export class DaemonClient {
             throw err;
         }
         const result = await promise;
-        if (result.kind === 'error') {
+        if (result.kind === "error") {
             throw result.error;
         }
         return result.value;
@@ -561,23 +557,23 @@ export class DaemonClient {
         });
     }
     sendSessionMessageStrict(message) {
-        if (!this.transport || this.connectionState.status !== 'connected') {
-            throw new Error('Transport not connected');
+        if (!this.transport || this.connectionState.status !== "connected") {
+            throw new Error("Transport not connected");
         }
         const payload = SessionInboundMessageSchema.parse(message);
         try {
-            this.transport.send(JSON.stringify({ type: 'session', message: payload }));
+            this.transport.send(JSON.stringify({ type: "session", message: payload }));
         }
         catch (error) {
             throw error instanceof Error ? error : new Error(String(error));
         }
     }
     clearAgentAttention(agentId) {
-        this.sendSessionMessage({ type: 'clear_agent_attention', agentId });
+        this.sendSessionMessage({ type: "clear_agent_attention", agentId });
     }
     sendHeartbeat(params) {
         this.sendSessionMessage({
-            type: 'client_heartbeat',
+            type: "client_heartbeat",
             deviceType: params.deviceType,
             focusedAgentId: params.focusedAgentId,
             lastActivityAt: params.lastActivityAt,
@@ -587,7 +583,7 @@ export class DaemonClient {
     }
     registerPushToken(token) {
         this.sendSessionMessage({
-            type: 'register_push_token',
+            type: "register_push_token",
             token,
         });
     }
@@ -596,16 +592,16 @@ export class DaemonClient {
         const clientSentAt = Date.now();
         const payload = await this.sendRequest({
             requestId,
-            message: { type: 'ping', requestId, clientSentAt },
+            message: { type: "ping", requestId, clientSentAt },
             timeout: params?.timeoutMs ?? 5000,
             select: (msg) => {
-                if (msg.type !== 'pong')
+                if (msg.type !== "pong")
                     return null;
                 if (msg.payload.requestId !== requestId)
                     return null;
-                if (typeof msg.payload.serverReceivedAt !== 'number')
+                if (typeof msg.payload.serverReceivedAt !== "number")
                     return null;
-                if (typeof msg.payload.serverSentAt !== 'number')
+                if (typeof msg.payload.serverSentAt !== "number")
                     return null;
                 return msg.payload;
             },
@@ -624,7 +620,7 @@ export class DaemonClient {
     async fetchAgents(options) {
         const resolvedRequestId = this.createRequestId(options?.requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'fetch_agents_request',
+            type: "fetch_agents_request",
             requestId: resolvedRequestId,
             ...(options?.filter ? { filter: options.filter } : {}),
             ...(options?.sort ? { sort: options.sort } : {}),
@@ -637,7 +633,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'fetch_agents_response') {
+                if (msg.type !== "fetch_agents_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== resolvedRequestId) {
@@ -650,7 +646,7 @@ export class DaemonClient {
     async fetchWorkspaces(options) {
         const resolvedRequestId = this.createRequestId(options?.requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'fetch_workspaces_request',
+            type: "fetch_workspaces_request",
             requestId: resolvedRequestId,
             ...(options?.filter ? { filter: options.filter } : {}),
             ...(options?.sort ? { sort: options.sort } : {}),
@@ -663,7 +659,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'fetch_workspaces_response') {
+                if (msg.type !== "fetch_workspaces_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== resolvedRequestId) {
@@ -677,10 +673,10 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'open_project_request',
+                type: "open_project_request",
                 cwd,
             },
-            responseType: 'open_project_response',
+            responseType: "open_project_response",
             timeout: 10000,
         });
     }
@@ -688,17 +684,17 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'archive_workspace_request',
+                type: "archive_workspace_request",
                 workspaceId,
             },
-            responseType: 'archive_workspace_response',
+            responseType: "archive_workspace_response",
             timeout: 10000,
         });
     }
     async fetchAgent(agentId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'fetch_agent_request',
+            type: "fetch_agent_request",
             requestId: resolvedRequestId,
             agentId,
         });
@@ -708,7 +704,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'fetch_agent_response') {
+                if (msg.type !== "fetch_agent_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== resolvedRequestId) {
@@ -731,7 +727,7 @@ export class DaemonClient {
         }
         for (const [subscriptionId, subscription] of this.checkoutDiffSubscriptions) {
             const message = SessionInboundMessageSchema.parse({
-                type: 'subscribe_checkout_diff_request',
+                type: "subscribe_checkout_diff_request",
                 subscriptionId,
                 cwd: subscription.cwd,
                 compare: subscription.compare,
@@ -746,7 +742,7 @@ export class DaemonClient {
         }
         for (const cwd of this.terminalDirectorySubscriptions) {
             this.sendSessionMessage({
-                type: 'subscribe_terminals_request',
+                type: "subscribe_terminals_request",
                 cwd,
             });
         }
@@ -758,7 +754,7 @@ export class DaemonClient {
         const requestId = this.createRequestId(options.requestId);
         const config = resolveAgentConfig(options);
         const message = SessionInboundMessageSchema.parse({
-            type: 'create_agent_request',
+            type: "create_agent_request",
             requestId,
             config,
             ...(options.initialPrompt ? { initialPrompt: options.initialPrompt } : {}),
@@ -777,7 +773,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'status') {
+                if (msg.type !== "status") {
                     return null;
                 }
                 const created = AgentCreatedStatusPayloadSchema.safeParse(msg.payload);
@@ -791,7 +787,7 @@ export class DaemonClient {
                 return null;
             },
         });
-        if (status.status === 'agent_create_failed') {
+        if (status.status === "agent_create_failed") {
             throw new Error(status.error);
         }
         return status.agent;
@@ -799,7 +795,7 @@ export class DaemonClient {
     async deleteAgent(agentId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'delete_agent_request',
+            type: "delete_agent_request",
             agentId,
             requestId,
         });
@@ -809,7 +805,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'agent_deleted') {
+                if (msg.type !== "agent_deleted") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -822,7 +818,7 @@ export class DaemonClient {
     async archiveAgent(agentId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'archive_agent_request',
+            type: "archive_agent_request",
             agentId,
             requestId,
         });
@@ -832,7 +828,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'agent_archived') {
+                if (msg.type !== "agent_archived") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -846,7 +842,7 @@ export class DaemonClient {
     async updateAgent(agentId, updates) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'update_agent_request',
+            type: "update_agent_request",
             agentId,
             ...(updates.name !== undefined ? { name: updates.name } : {}),
             ...(updates.labels && Object.keys(updates.labels).length > 0
@@ -860,7 +856,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'update_agent_response') {
+                if (msg.type !== "update_agent_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -870,13 +866,13 @@ export class DaemonClient {
             },
         });
         if (!payload.accepted) {
-            throw new Error(payload.error ?? 'updateAgent rejected');
+            throw new Error(payload.error ?? "updateAgent rejected");
         }
     }
     async resumeAgent(handle, overrides) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'resume_agent_request',
+            type: "resume_agent_request",
             requestId,
             handle,
             ...(overrides ? { overrides } : {}),
@@ -887,7 +883,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'status') {
+                if (msg.type !== "status") {
                     return null;
                 }
                 const resumed = AgentResumedStatusPayloadSchema.safeParse(msg.payload);
@@ -902,7 +898,7 @@ export class DaemonClient {
     async refreshAgent(agentId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'refresh_agent_request',
+            type: "refresh_agent_request",
             agentId,
             requestId: resolvedRequestId,
         });
@@ -912,7 +908,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'status') {
+                if (msg.type !== "status") {
                     return null;
                 }
                 const refreshed = AgentRefreshedStatusPayloadSchema.safeParse(msg.payload);
@@ -926,12 +922,12 @@ export class DaemonClient {
     async fetchAgentTimeline(agentId, options = {}) {
         const resolvedRequestId = this.createRequestId(options.requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'fetch_agent_timeline_request',
+            type: "fetch_agent_timeline_request",
             agentId,
             requestId: resolvedRequestId,
             ...(options.direction ? { direction: options.direction } : {}),
             ...(options.cursor ? { cursor: options.cursor } : {}),
-            ...(typeof options.limit === 'number' ? { limit: options.limit } : {}),
+            ...(typeof options.limit === "number" ? { limit: options.limit } : {}),
             ...(options.projection ? { projection: options.projection } : {}),
         });
         const payload = await this.sendRequest({
@@ -940,7 +936,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'fetch_agent_timeline_response') {
+                if (msg.type !== "fetch_agent_timeline_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== resolvedRequestId) {
@@ -961,7 +957,7 @@ export class DaemonClient {
         const requestId = this.createRequestId();
         const messageId = options?.messageId ?? crypto.randomUUID();
         const message = SessionInboundMessageSchema.parse({
-            type: 'send_agent_message_request',
+            type: "send_agent_message_request",
             requestId,
             agentId,
             text,
@@ -974,7 +970,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'send_agent_message_response') {
+                if (msg.type !== "send_agent_message_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -984,19 +980,19 @@ export class DaemonClient {
             },
         });
         if (!payload.accepted) {
-            throw new Error(payload.error ?? 'sendAgentMessage rejected');
+            throw new Error(payload.error ?? "sendAgentMessage rejected");
         }
     }
     async sendMessage(agentId, text, options) {
         await this.sendAgentMessage(agentId, text, options);
     }
     async cancelAgent(agentId) {
-        this.sendSessionMessage({ type: 'cancel_agent_request', agentId });
+        this.sendSessionMessage({ type: "cancel_agent_request", agentId });
     }
     async setAgentMode(agentId, modeId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'set_agent_mode_request',
+            type: "set_agent_mode_request",
             agentId,
             modeId,
             requestId,
@@ -1007,7 +1003,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'set_agent_mode_response') {
+                if (msg.type !== "set_agent_mode_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -1017,13 +1013,13 @@ export class DaemonClient {
             },
         });
         if (!payload.accepted) {
-            throw new Error(payload.error ?? 'setAgentMode rejected');
+            throw new Error(payload.error ?? "setAgentMode rejected");
         }
     }
     async setAgentModel(agentId, modelId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'set_agent_model_request',
+            type: "set_agent_model_request",
             agentId,
             modelId,
             requestId,
@@ -1034,7 +1030,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'set_agent_model_response') {
+                if (msg.type !== "set_agent_model_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -1044,13 +1040,13 @@ export class DaemonClient {
             },
         });
         if (!payload.accepted) {
-            throw new Error(payload.error ?? 'setAgentModel rejected');
+            throw new Error(payload.error ?? "setAgentModel rejected");
         }
     }
     async setAgentThinkingOption(agentId, thinkingOptionId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'set_agent_thinking_request',
+            type: "set_agent_thinking_request",
             agentId,
             thinkingOptionId,
             requestId,
@@ -1061,7 +1057,7 @@ export class DaemonClient {
             timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'set_agent_thinking_response') {
+                if (msg.type !== "set_agent_thinking_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -1071,13 +1067,13 @@ export class DaemonClient {
             },
         });
         if (!payload.accepted) {
-            throw new Error(payload.error ?? 'setAgentThinkingOption rejected');
+            throw new Error(payload.error ?? "setAgentThinkingOption rejected");
         }
     }
     async restartServer(reason, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'restart_server_request',
+            type: "restart_server_request",
             ...(reason && reason.trim().length > 0 ? { reason } : {}),
             requestId: resolvedRequestId,
         });
@@ -1087,7 +1083,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'status') {
+                if (msg.type !== "status") {
                     return null;
                 }
                 const restarted = RestartRequestedStatusPayloadSchema.safeParse(msg.payload);
@@ -1104,7 +1100,7 @@ export class DaemonClient {
     async shutdownServer(requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'shutdown_server_request',
+            type: "shutdown_server_request",
             requestId: resolvedRequestId,
         });
         return this.sendRequest({
@@ -1113,7 +1109,7 @@ export class DaemonClient {
             timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'status') {
+                if (msg.type !== "status") {
                     return null;
                 }
                 const shutdown = ShutdownRequestedStatusPayloadSchema.safeParse(msg.payload);
@@ -1133,7 +1129,7 @@ export class DaemonClient {
     async setVoiceMode(enabled, agentId) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: 'set_voice_mode',
+            type: "set_voice_mode",
             enabled,
             ...(agentId ? { agentId } : {}),
             requestId,
@@ -1143,7 +1139,7 @@ export class DaemonClient {
             message,
             timeout: 10000,
             select: (msg) => {
-                if (msg.type !== 'set_voice_mode_response') {
+                if (msg.type !== "set_voice_mode_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -1153,19 +1149,19 @@ export class DaemonClient {
             },
         });
         if (!response.accepted) {
-            const codeSuffix = typeof response.reasonCode === 'string' && response.reasonCode.trim().length > 0
+            const codeSuffix = typeof response.reasonCode === "string" && response.reasonCode.trim().length > 0
                 ? ` (${response.reasonCode})`
-                : '';
-            throw new Error((response.error ?? 'Failed to set voice mode') + codeSuffix);
+                : "";
+            throw new Error((response.error ?? "Failed to set voice mode") + codeSuffix);
         }
         return response;
     }
     async sendVoiceAudioChunk(audio, format, isLast = false) {
-        this.sendSessionMessage({ type: 'voice_audio_chunk', audio, format, isLast });
+        this.sendSessionMessage({ type: "voice_audio_chunk", audio, format, isLast });
     }
     async startDictationStream(dictationId, format) {
         const ack = this.waitForWithCancel((msg) => {
-            if (msg.type !== 'dictation_stream_ack') {
+            if (msg.type !== "dictation_stream_ack") {
                 return null;
             }
             if (msg.payload.dictationId !== dictationId) {
@@ -1178,7 +1174,7 @@ export class DaemonClient {
         }, 30000, { skipQueue: true });
         const ackPromise = ack.promise.then(() => undefined);
         const streamError = this.waitForWithCancel((msg) => {
-            if (msg.type !== 'dictation_stream_error') {
+            if (msg.type !== "dictation_stream_error") {
                 return null;
             }
             if (msg.payload.dictationId !== dictationId) {
@@ -1189,9 +1185,9 @@ export class DaemonClient {
         const errorPromise = streamError.promise.then((payload) => {
             throw new Error(payload.error);
         });
-        const cleanupError = new Error('Cancelled dictation start waiter');
+        const cleanupError = new Error("Cancelled dictation start waiter");
         try {
-            this.sendSessionMessageStrict({ type: 'dictation_stream_start', dictationId, format });
+            this.sendSessionMessageStrict({ type: "dictation_stream_start", dictationId, format });
             await Promise.race([ackPromise, errorPromise]);
         }
         finally {
@@ -1203,7 +1199,7 @@ export class DaemonClient {
     }
     sendDictationStreamChunk(dictationId, seq, audio, format) {
         this.sendSessionMessageStrict({
-            type: 'dictation_stream_chunk',
+            type: "dictation_stream_chunk",
             dictationId,
             seq,
             audio,
@@ -1212,7 +1208,7 @@ export class DaemonClient {
     }
     async finishDictationStream(dictationId, finalSeq) {
         const final = this.waitForWithCancel((msg) => {
-            if (msg.type !== 'dictation_stream_final') {
+            if (msg.type !== "dictation_stream_final") {
                 return null;
             }
             if (msg.payload.dictationId !== dictationId) {
@@ -1221,7 +1217,7 @@ export class DaemonClient {
             return msg.payload;
         }, 0, { skipQueue: true });
         const streamError = this.waitForWithCancel((msg) => {
-            if (msg.type !== 'dictation_stream_error') {
+            if (msg.type !== "dictation_stream_error") {
                 return null;
             }
             if (msg.payload.dictationId !== dictationId) {
@@ -1230,7 +1226,7 @@ export class DaemonClient {
             return msg.payload;
         }, 0, { skipQueue: true });
         const finishAccepted = this.waitForWithCancel((msg) => {
-            if (msg.type !== 'dictation_stream_finish_accepted') {
+            if (msg.type !== "dictation_stream_finish_accepted") {
                 return null;
             }
             if (msg.payload.dictationId !== dictationId) {
@@ -1244,64 +1240,68 @@ export class DaemonClient {
         });
         const finishAcceptedPromise = finishAccepted.promise;
         const finalOutcomePromise = finalPromise.then((payload) => ({
-            kind: 'final',
+            kind: "final",
             payload,
         }));
         const errorOutcomePromise = errorPromise.then(() => ({
-            kind: 'error',
-            error: new Error('Unexpected dictation stream error state'),
+            kind: "error",
+            error: new Error("Unexpected dictation stream error state"),
         }), (error) => ({
-            kind: 'error',
+            kind: "error",
             error: error instanceof Error ? error : new Error(String(error)),
         }));
-        const finishAcceptedOutcomePromise = finishAcceptedPromise.then((payload) => ({ kind: 'accepted', payload }), (error) => {
+        const finishAcceptedOutcomePromise = finishAcceptedPromise.then((payload) => ({ kind: "accepted", payload }), (error) => {
             if (isWaiterTimeoutError(error)) {
-                return { kind: 'accepted_timeout' };
+                return { kind: "accepted_timeout" };
             }
             return {
-                kind: 'accepted_error',
+                kind: "accepted_error",
                 error: error instanceof Error ? error : new Error(String(error)),
             };
         });
         const waitForFinalResult = async (timeoutMs) => {
             if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
                 const outcome = await Promise.race([finalOutcomePromise, errorOutcomePromise]);
-                if (outcome.kind === 'error') {
+                if (outcome.kind === "error") {
                     throw outcome.error;
                 }
                 return outcome.payload;
             }
             let timeoutHandle = null;
             const timeoutPromise = new Promise((resolve) => {
-                timeoutHandle = setTimeout(() => resolve({ kind: 'timeout' }), timeoutMs);
+                timeoutHandle = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs);
             });
-            const outcome = await Promise.race([finalOutcomePromise, errorOutcomePromise, timeoutPromise]);
+            const outcome = await Promise.race([
+                finalOutcomePromise,
+                errorOutcomePromise,
+                timeoutPromise,
+            ]);
             if (timeoutHandle) {
                 clearTimeout(timeoutHandle);
             }
-            if (outcome.kind === 'timeout') {
+            if (outcome.kind === "timeout") {
                 throw new Error(`Timeout waiting for dictation finalization (${timeoutMs}ms)`);
             }
-            if (outcome.kind === 'error') {
+            if (outcome.kind === "error") {
                 throw outcome.error;
             }
             return outcome.payload;
         };
-        const cleanupError = new Error('Cancelled dictation finish waiter');
+        const cleanupError = new Error("Cancelled dictation finish waiter");
         try {
-            this.sendSessionMessageStrict({ type: 'dictation_stream_finish', dictationId, finalSeq });
+            this.sendSessionMessageStrict({ type: "dictation_stream_finish", dictationId, finalSeq });
             const firstOutcome = await Promise.race([
                 finalOutcomePromise,
                 errorOutcomePromise,
                 finishAcceptedOutcomePromise,
             ]);
-            if (firstOutcome.kind === 'final') {
+            if (firstOutcome.kind === "final") {
                 return firstOutcome.payload;
             }
-            if (firstOutcome.kind === 'error') {
+            if (firstOutcome.kind === "error") {
                 throw firstOutcome.error;
             }
-            if (firstOutcome.kind === 'accepted') {
+            if (firstOutcome.kind === "accepted") {
                 return await waitForFinalResult(firstOutcome.payload.timeoutMs + DEFAULT_DICTATION_FINISH_TIMEOUT_GRACE_MS);
             }
             return await waitForFinalResult(DEFAULT_DICTATION_FINISH_FALLBACK_TIMEOUT_MS);
@@ -1316,13 +1316,13 @@ export class DaemonClient {
         }
     }
     cancelDictationStream(dictationId) {
-        this.sendSessionMessageStrict({ type: 'dictation_stream_cancel', dictationId });
+        this.sendSessionMessageStrict({ type: "dictation_stream_cancel", dictationId });
     }
     async abortRequest() {
-        this.sendSessionMessage({ type: 'abort_request' });
+        this.sendSessionMessage({ type: "abort_request" });
     }
     async audioPlayed(id) {
-        this.sendSessionMessage({ type: 'audio_played', id });
+        this.sendSessionMessage({ type: "audio_played", id });
     }
     // ============================================================================
     // Git Operations
@@ -1337,7 +1337,7 @@ export class DaemonClient {
         }
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'checkout_status_request',
+            type: "checkout_status_request",
             cwd,
             requestId: resolvedRequestId,
         });
@@ -1347,7 +1347,7 @@ export class DaemonClient {
             timeout: 60000,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'checkout_status_response') {
+                if (msg.type !== "checkout_status_response") {
                     return null;
                 }
                 if (msg.payload.requestId !== resolvedRequestId) {
@@ -1369,14 +1369,14 @@ export class DaemonClient {
         return responsePromise;
     }
     normalizeCheckoutDiffCompare(compare) {
-        if (compare.mode === 'uncommitted') {
-            return { mode: 'uncommitted' };
+        if (compare.mode === "uncommitted") {
+            return { mode: "uncommitted" };
         }
         const trimmedBaseRef = compare.baseRef?.trim();
         if (!trimmedBaseRef) {
-            return { mode: 'base' };
+            return { mode: "base" };
         }
-        return { mode: 'base', baseRef: trimmedBaseRef };
+        return { mode: "base", baseRef: trimmedBaseRef };
     }
     async getCheckoutDiff(cwd, compare, requestId) {
         const oneShotSubscriptionId = `oneshot-checkout-diff:${crypto.randomUUID()}`;
@@ -1411,7 +1411,7 @@ export class DaemonClient {
         });
         const resolvedRequestId = this.createRequestId(options?.requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'subscribe_checkout_diff_request',
+            type: "subscribe_checkout_diff_request",
             subscriptionId,
             cwd,
             compare: normalizedCompare,
@@ -1421,7 +1421,7 @@ export class DaemonClient {
             return await this.sendCorrelatedRequest({
                 requestId: resolvedRequestId,
                 message,
-                responseType: 'subscribe_checkout_diff_response',
+                responseType: "subscribe_checkout_diff_response",
                 timeout: 60000,
                 options: { skipQueue: true },
                 selectPayload: (payload) => {
@@ -1445,7 +1445,7 @@ export class DaemonClient {
     unsubscribeCheckoutDiff(subscriptionId) {
         this.checkoutDiffSubscriptions.delete(subscriptionId);
         this.sendSessionMessage({
-            type: 'unsubscribe_checkout_diff_request',
+            type: "unsubscribe_checkout_diff_request",
             subscriptionId,
         });
     }
@@ -1453,12 +1453,12 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_commit_request',
+                type: "checkout_commit_request",
                 cwd,
                 message: input.message,
                 addAll: input.addAll,
             },
-            responseType: 'checkout_commit_response',
+            responseType: "checkout_commit_response",
             timeout: 60000,
         });
     }
@@ -1466,13 +1466,13 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_merge_request',
+                type: "checkout_merge_request",
                 cwd,
                 baseRef: input.baseRef,
                 strategy: input.strategy,
                 requireCleanTarget: input.requireCleanTarget,
             },
-            responseType: 'checkout_merge_response',
+            responseType: "checkout_merge_response",
             timeout: 60000,
         });
     }
@@ -1480,12 +1480,12 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_merge_from_base_request',
+                type: "checkout_merge_from_base_request",
                 cwd,
                 baseRef: input.baseRef,
                 requireCleanTarget: input.requireCleanTarget,
             },
-            responseType: 'checkout_merge_from_base_response',
+            responseType: "checkout_merge_from_base_response",
             timeout: 60000,
         });
     }
@@ -1493,10 +1493,10 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_push_request',
+                type: "checkout_push_request",
                 cwd,
             },
-            responseType: 'checkout_push_response',
+            responseType: "checkout_push_response",
             timeout: 60000,
         });
     }
@@ -1504,13 +1504,13 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_pr_create_request',
+                type: "checkout_pr_create_request",
                 cwd,
                 title: input.title,
                 body: input.body,
                 baseRef: input.baseRef,
             },
-            responseType: 'checkout_pr_create_response',
+            responseType: "checkout_pr_create_response",
             timeout: 60000,
         });
     }
@@ -1518,10 +1518,10 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'checkout_pr_status_request',
+                type: "checkout_pr_status_request",
                 cwd,
             },
-            responseType: 'checkout_pr_status_response',
+            responseType: "checkout_pr_status_response",
             timeout: 60000,
         });
     }
@@ -1529,11 +1529,11 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'paseo_worktree_list_request',
+                type: "paseo_worktree_list_request",
                 cwd: input.cwd,
                 repoRoot: input.repoRoot,
             },
-            responseType: 'paseo_worktree_list_response',
+            responseType: "paseo_worktree_list_response",
             timeout: 60000,
         });
     }
@@ -1541,24 +1541,36 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'paseo_worktree_archive_request',
+                type: "paseo_worktree_archive_request",
                 worktreePath: input.worktreePath,
                 repoRoot: input.repoRoot,
                 branchName: input.branchName,
             },
-            responseType: 'paseo_worktree_archive_response',
+            responseType: "paseo_worktree_archive_response",
             timeout: 20000,
         });
     }
+    async createPaseoWorktree(input, requestId) {
+        return this.sendCorrelatedSessionRequest({
+            requestId,
+            message: {
+                type: "create_paseo_worktree_request",
+                cwd: input.cwd,
+                worktreeSlug: input.worktreeSlug,
+            },
+            responseType: "create_paseo_worktree_response",
+            timeout: 60000,
+        });
+    }
     async validateBranch(options, requestId) {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'validate_branch_request',
+                type: "validate_branch_request",
                 cwd: options.cwd,
                 branchName: options.branchName,
             },
-            responseType: 'validate_branch_response',
+            responseType: "validate_branch_response",
             timeout: 10000,
         });
     }
@@ -1566,12 +1578,12 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'branch_suggestions_request',
+                type: "branch_suggestions_request",
                 cwd: options.cwd,
                 query: options.query,
                 limit: options.limit,
             },
-            responseType: 'branch_suggestions_response',
+            responseType: "branch_suggestions_response",
             timeout: 10000,
         });
     }
@@ -1579,30 +1591,30 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'directory_suggestions_request',
+                type: "directory_suggestions_request",
                 query: options.query,
                 cwd: options.cwd,
                 includeFiles: options.includeFiles,
                 includeDirectories: options.includeDirectories,
                 limit: options.limit,
             },
-            responseType: 'directory_suggestions_response',
+            responseType: "directory_suggestions_response",
             timeout: 10000,
         });
     }
     // ============================================================================
     // File Explorer
     // ============================================================================
-    async exploreFileSystem(cwd, path, mode = 'list', requestId) {
+    async exploreFileSystem(cwd, path, mode = "list", requestId) {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'file_explorer_request',
+                type: "file_explorer_request",
                 cwd,
                 path,
                 mode,
             },
-            responseType: 'file_explorer_response',
+            responseType: "file_explorer_response",
             timeout: 10000,
         });
     }
@@ -1610,11 +1622,11 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'file_download_token_request',
+                type: "file_download_token_request",
                 cwd,
                 path,
             },
-            responseType: 'file_download_token_response',
+            responseType: "file_download_token_response",
             timeout: 10000,
         });
     }
@@ -1622,10 +1634,10 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'project_icon_request',
+                type: "project_icon_request",
                 cwd,
             },
-            responseType: 'project_icon_response',
+            responseType: "project_icon_response",
             timeout: 10000,
         });
     }
@@ -1636,11 +1648,11 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId: options?.requestId,
             message: {
-                type: 'list_provider_models_request',
+                type: "list_provider_models_request",
                 provider,
                 cwd: options?.cwd,
             },
-            responseType: 'list_provider_models_response',
+            responseType: "list_provider_models_response",
             // Provider SDK cold starts (especially model discovery) can exceed 30s.
             timeout: 45000,
         });
@@ -1649,9 +1661,9 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId: options?.requestId,
             message: {
-                type: 'list_available_providers_request',
+                type: "list_available_providers_request",
             },
-            responseType: 'list_available_providers_response',
+            responseType: "list_available_providers_response",
             timeout: 30000,
         });
     }
@@ -1659,9 +1671,9 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'speech_models_list_request',
+                type: "speech_models_list_request",
             },
-            responseType: 'speech_models_list_response',
+            responseType: "speech_models_list_response",
             timeout: 30000,
         });
     }
@@ -1669,24 +1681,24 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId: options?.requestId,
             message: {
-                type: 'speech_models_download_request',
+                type: "speech_models_download_request",
                 modelIds: options?.modelIds,
             },
-            responseType: 'speech_models_download_response',
+            responseType: "speech_models_download_response",
             timeout: 30 * 60 * 1000,
         });
     }
     async listCommands(agentId, requestIdOrOptions) {
-        const requestId = typeof requestIdOrOptions === 'string' ? requestIdOrOptions : requestIdOrOptions?.requestId;
-        const draftConfig = typeof requestIdOrOptions === 'string' ? undefined : requestIdOrOptions?.draftConfig;
+        const requestId = typeof requestIdOrOptions === "string" ? requestIdOrOptions : requestIdOrOptions?.requestId;
+        const draftConfig = typeof requestIdOrOptions === "string" ? undefined : requestIdOrOptions?.draftConfig;
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: 'list_commands_request',
+                type: "list_commands_request",
                 agentId,
                 ...(draftConfig ? { draftConfig } : {}),
             },
-            responseType: 'list_commands_response',
+            responseType: "list_commands_response",
             timeout: 30000,
         });
     }
@@ -1695,7 +1707,7 @@ export class DaemonClient {
     // ============================================================================
     async respondToPermission(agentId, requestId, response) {
         this.sendSessionMessage({
-            type: 'agent_permission_response',
+            type: "agent_permission_response",
             agentId,
             requestId,
             response,
@@ -1703,7 +1715,7 @@ export class DaemonClient {
     }
     async respondToPermissionAndWait(agentId, requestId, response, timeout = 15000) {
         const message = SessionInboundMessageSchema.parse({
-            type: 'agent_permission_response',
+            type: "agent_permission_response",
             agentId,
             requestId,
             response,
@@ -1714,7 +1726,7 @@ export class DaemonClient {
             timeout,
             options: { skipQueue: true },
             select: (msg) => {
-                if (msg.type !== 'agent_permission_resolved') {
+                if (msg.type !== "agent_permission_resolved") {
                     return null;
                 }
                 if (msg.payload.requestId !== requestId) {
@@ -1759,7 +1771,7 @@ export class DaemonClient {
                     unsubscribe();
                     unsubscribe = null;
                 }
-                if (result.kind === 'ok') {
+                if (result.kind === "ok") {
                     resolve(result.snapshot);
                     return;
                 }
@@ -1772,7 +1784,7 @@ export class DaemonClient {
                 if (!predicate(snapshot)) {
                     return false;
                 }
-                finish({ kind: 'ok', snapshot });
+                finish({ kind: "ok", snapshot });
                 return true;
             };
             const poll = async () => {
@@ -1788,14 +1800,14 @@ export class DaemonClient {
                     pollInFlight = false;
                 }
             };
-            unsubscribe = this.on('agent_update', (message) => {
+            unsubscribe = this.on("agent_update", (message) => {
                 if (settled) {
                     return;
                 }
-                if (message.type !== 'agent_update') {
+                if (message.type !== "agent_update") {
                     return;
                 }
-                if (message.payload.kind !== 'upsert') {
+                if (message.payload.kind !== "upsert") {
                     return;
                 }
                 const snapshot = message.payload.agent;
@@ -1807,7 +1819,7 @@ export class DaemonClient {
             const remaining = Math.max(1, deadline - Date.now());
             timeoutTimer = setTimeout(() => {
                 finish({
-                    kind: 'error',
+                    kind: "error",
                     error: new Error(`Timed out waiting for agent ${agentId}`),
                 });
             }, remaining);
@@ -1821,7 +1833,7 @@ export class DaemonClient {
         const requestId = this.createRequestId();
         const hasTimeout = Number.isFinite(timeout) && timeout > 0;
         const message = SessionInboundMessageSchema.parse({
-            type: 'wait_for_finish_request',
+            type: "wait_for_finish_request",
             requestId,
             agentId,
             ...(hasTimeout ? { timeoutMs: timeout } : {}),
@@ -1829,7 +1841,7 @@ export class DaemonClient {
         const payload = await this.sendCorrelatedRequest({
             requestId,
             message,
-            responseType: 'wait_for_finish_response',
+            responseType: "wait_for_finish_response",
             timeout: hasTimeout ? timeout + 5000 : 0,
             options: { skipQueue: true },
         });
@@ -1845,35 +1857,35 @@ export class DaemonClient {
     // ============================================================================
     subscribeTerminals(input) {
         this.terminalDirectorySubscriptions.add(input.cwd);
-        if (!this.transport || this.connectionState.status !== 'connected') {
+        if (!this.transport || this.connectionState.status !== "connected") {
             return;
         }
         this.sendSessionMessage({
-            type: 'subscribe_terminals_request',
+            type: "subscribe_terminals_request",
             cwd: input.cwd,
         });
     }
     unsubscribeTerminals(input) {
         this.terminalDirectorySubscriptions.delete(input.cwd);
-        if (!this.transport || this.connectionState.status !== 'connected') {
+        if (!this.transport || this.connectionState.status !== "connected") {
             return;
         }
         this.sendSessionMessage({
-            type: 'unsubscribe_terminals_request',
+            type: "unsubscribe_terminals_request",
             cwd: input.cwd,
         });
     }
     async listTerminals(cwd, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'list_terminals_request',
+            type: "list_terminals_request",
             cwd,
             requestId: resolvedRequestId,
         });
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: 'list_terminals_response',
+            responseType: "list_terminals_response",
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1881,7 +1893,7 @@ export class DaemonClient {
     async createTerminal(cwd, name, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'create_terminal_request',
+            type: "create_terminal_request",
             cwd,
             name,
             requestId: resolvedRequestId,
@@ -1889,7 +1901,7 @@ export class DaemonClient {
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: 'create_terminal_response',
+            responseType: "create_terminal_response",
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1897,27 +1909,54 @@ export class DaemonClient {
     async subscribeTerminal(terminalId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'subscribe_terminal_request',
+            type: "subscribe_terminal_request",
             terminalId,
             requestId: resolvedRequestId,
         });
-        return this.sendCorrelatedRequest({
+        const payload = await this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: 'subscribe_terminal_response',
+            responseType: "subscribe_terminal_response",
             timeout: 10000,
             options: { skipQueue: true },
         });
+        if (payload.error === null) {
+            this.setTerminalSlot(terminalId, payload.slot);
+        }
+        return payload;
     }
     unsubscribeTerminal(terminalId) {
+        this.removeTerminalSlot(terminalId);
         this.sendSessionMessage({
-            type: 'unsubscribe_terminal_request',
+            type: "unsubscribe_terminal_request",
             terminalId,
         });
     }
     sendTerminalInput(terminalId, message) {
+        const slot = this.terminalSlots.get(terminalId);
+        if (typeof slot === "number") {
+            if (message.type === "input") {
+                this.sendBinaryFrame(encodeTerminalStreamFrame({
+                    opcode: TerminalStreamOpcode.Input,
+                    slot,
+                    payload: encodeUtf8String(message.data),
+                }));
+                return;
+            }
+            if (message.type === "resize") {
+                this.sendBinaryFrame(encodeTerminalStreamFrame({
+                    opcode: TerminalStreamOpcode.Resize,
+                    slot,
+                    payload: encodeTerminalResizePayload({
+                        rows: message.rows,
+                        cols: message.cols,
+                    }),
+                }));
+                return;
+            }
+        }
         this.sendSessionMessage({
-            type: 'terminal_input',
+            type: "terminal_input",
             terminalId,
             message,
         });
@@ -1925,117 +1964,72 @@ export class DaemonClient {
     async killTerminal(terminalId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: 'kill_terminal_request',
-            terminalId,
-            requestId: resolvedRequestId,
-        });
-        return this.sendCorrelatedRequest({
-            requestId: resolvedRequestId,
-            message,
-            responseType: 'kill_terminal_response',
-            timeout: 10000,
-            options: { skipQueue: true },
-        });
-    }
-    async attachTerminalStream(terminalId, options, requestId) {
-        const resolvedRequestId = this.createRequestId(requestId);
-        const message = SessionInboundMessageSchema.parse({
-            type: 'attach_terminal_stream_request',
+            type: "kill_terminal_request",
             terminalId,
             requestId: resolvedRequestId,
-            ...(options?.resumeOffset !== undefined ? { resumeOffset: options.resumeOffset } : {}),
-            ...(options?.rows !== undefined ? { rows: options.rows } : {}),
-            ...(options?.cols !== undefined ? { cols: options.cols } : {}),
         });
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: 'attach_terminal_stream_response',
-            timeout: 10000,
-            options: { skipQueue: true },
-        });
-    }
-    async detachTerminalStream(streamId, requestId) {
-        const resolvedRequestId = this.createRequestId(requestId);
-        const message = SessionInboundMessageSchema.parse({
-            type: 'detach_terminal_stream_request',
-            streamId,
-            requestId: resolvedRequestId,
-        });
-        const payload = await this.sendCorrelatedRequest({
-            requestId: resolvedRequestId,
-            message,
-            responseType: 'detach_terminal_stream_response',
+            responseType: "kill_terminal_response",
             timeout: 10000,
             options: { skipQueue: true },
         });
-        this.terminalStreams.clearStream({ streamId });
-        return payload;
     }
-    onTerminalStreamData(streamId, handler) {
-        return this.terminalStreams.subscribe({ streamId, handler });
+    onTerminalStreamEvent(handler) {
+        this.terminalStreamListeners.add(handler);
+        return () => {
+            this.terminalStreamListeners.delete(handler);
+        };
     }
-    async waitForTerminalStreamData(streamId, predicate, timeout = 5000) {
+    async waitForTerminalStreamEvent(predicate, timeout = 5000) {
         return new Promise((resolve, reject) => {
             const timeoutHandle = setTimeout(() => {
                 unsubscribe();
-                reject(new Error(`Timeout waiting for terminal stream data (${timeout}ms)`));
+                reject(new Error(`Timeout waiting for terminal stream event (${timeout}ms)`));
             }, timeout);
-            const unsubscribe = this.onTerminalStreamData(streamId, (chunk) => {
-                if (!predicate(chunk)) {
+            const unsubscribe = this.onTerminalStreamEvent((event) => {
+                if (!predicate(event)) {
                     return;
                 }
                 clearTimeout(timeoutHandle);
                 unsubscribe();
-                resolve(chunk);
+                resolve(event);
             });
         });
     }
-    sendTerminalStreamInput(streamId, data) {
-        const payload = typeof data === 'string' ? encodeUtf8String(data) : data;
-        this.sendBinaryFrame({
-            channel: BinaryMuxChannel.Terminal,
-            messageType: TerminalBinaryMessageType.InputUtf8,
-            streamId,
-            offset: 0,
-            payload,
-        });
-    }
-    sendTerminalStreamKey(streamId, input) {
-        const encoded = encodeTerminalKeyInput(input);
-        if (!encoded) {
-            return;
-        }
-        this.sendTerminalStreamInput(streamId, encoded);
-    }
-    sendTerminalStreamAck(streamId, offset) {
-        const normalizedOffset = Math.max(0, Math.floor(offset));
-        this.terminalStreams.noteAck({ streamId, offset: normalizedOffset });
-        this.sendBinaryFrame({
-            channel: BinaryMuxChannel.Terminal,
-            messageType: TerminalBinaryMessageType.Ack,
-            streamId,
-            offset: normalizedOffset,
-            payload: new Uint8Array(0),
-        });
-    }
-    async waitForTerminalOutput(terminalId, timeout = 5000) {
-        return this.waitFor((msg) => {
-            if (msg.type !== 'terminal_output') {
-                return null;
-            }
-            if (msg.payload.terminalId !== terminalId) {
-                return null;
-            }
-            return msg.payload;
-        }, timeout, { skipQueue: true });
-    }
     // ============================================================================
     // Internals
     // ============================================================================
     createRequestId(requestId) {
         return requestId ?? crypto.randomUUID();
     }
+    setTerminalSlot(terminalId, slot) {
+        const existingTerminalId = this.slotTerminals.get(slot);
+        if (existingTerminalId && existingTerminalId !== terminalId) {
+            this.terminalSlots.delete(existingTerminalId);
+        }
+        const existingSlot = this.terminalSlots.get(terminalId);
+        if (typeof existingSlot === "number" && existingSlot !== slot) {
+            this.slotTerminals.delete(existingSlot);
+        }
+        this.terminalSlots.set(terminalId, slot);
+        this.slotTerminals.set(slot, terminalId);
+    }
+    removeTerminalSlot(terminalId) {
+        const slot = this.terminalSlots.get(terminalId);
+        if (typeof slot !== "number") {
+            return;
+        }
+        this.terminalSlots.delete(terminalId);
+        if (this.slotTerminals.get(slot) === terminalId) {
+            this.slotTerminals.delete(slot);
+        }
+    }
+    clearTerminalSlots() {
+        this.terminalSlots.clear();
+        this.slotTerminals.clear();
+    }
     getLastServerInfoMessage() {
         return this.lastServerInfoMessage;
     }
@@ -2045,31 +2039,31 @@ export class DaemonClient {
     sendHelloMessage() {
         if (!this.transport) {
             this.scheduleReconnect({
-                reason: 'Transport unavailable before hello',
-                event: 'HELLO_TRANSPORT_MISSING',
-                reasonCode: 'transport_error',
+                reason: "Transport unavailable before hello",
+                event: "HELLO_TRANSPORT_MISSING",
+                reasonCode: "transport_error",
             });
             return;
         }
         try {
             this.transport.send(JSON.stringify({
-                type: 'hello',
+                type: "hello",
                 clientId: this.config.clientId,
-                clientType: this.config.clientType ?? 'cli',
+                clientType: this.config.clientType ?? "cli",
                 protocolVersion: 1,
             }));
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : 'Failed to send hello message';
+            const message = error instanceof Error ? error.message : "Failed to send hello message";
             this.lastErrorValue = message;
             this.scheduleReconnect({
                 reason: message,
-                event: 'HELLO_SEND_FAILED',
-                reasonCode: 'transport_error',
+                event: "HELLO_SEND_FAILED",
+                reasonCode: "transport_error",
             });
         }
     }
-    disposeTransport(code = 1001, reason = 'Reconnecting') {
+    disposeTransport(code = 1001, reason = "Reconnecting") {
         this.cleanupTransport();
         if (this.transport) {
             try {
@@ -2105,10 +2099,10 @@ export class DaemonClient {
         this.connectTimeout = null;
     }
     handleTransportMessage(data) {
-        const rawData = data && typeof data === 'object' && 'data' in data ? data.data : data;
-        if (typeof Blob !== 'undefined' &&
+        const rawData = data && typeof data === "object" && "data" in data ? data.data : data;
+        if (typeof Blob !== "undefined" &&
             rawData instanceof Blob &&
-            typeof rawData.arrayBuffer === 'function') {
+            typeof rawData.arrayBuffer === "function") {
             void rawData
                 .arrayBuffer()
                 .then((buffer) => {
@@ -2121,7 +2115,7 @@ export class DaemonClient {
         }
         const rawBytes = asUint8Array(rawData);
         if (rawBytes) {
-            const frame = decodeBinaryMuxFrame(rawBytes);
+            const frame = decodeTerminalStreamFrame(rawBytes);
             if (frame) {
                 this.handleBinaryFrame(frame);
                 return;
@@ -2140,35 +2134,54 @@ export class DaemonClient {
         }
         const parsed = WSOutboundMessageSchema.safeParse(parsedJson);
         if (!parsed.success) {
-            const msgType = parsedJson?.type ?? 'unknown';
-            this.logger.warn({ msgType, error: parsed.error.message }, 'Message validation failed');
+            const msgType = parsedJson?.type ?? "unknown";
+            this.logger.warn({ msgType, error: parsed.error.message }, "Message validation failed");
             return;
         }
-        if (parsed.data.type === 'pong') {
+        if (parsed.data.type === "pong") {
             return;
         }
         this.handleSessionMessage(parsed.data.message);
     }
     handleBinaryFrame(frame) {
-        if (frame.channel === BinaryMuxChannel.Terminal &&
-            frame.messageType === TerminalBinaryMessageType.OutputUtf8) {
-            const chunk = {
-                streamId: frame.streamId,
-                offset: frame.offset,
-                endOffset: frame.offset + (frame.payload?.byteLength ?? 0),
-                replay: Boolean((frame.flags ?? 0) & TerminalBinaryFlags.Replay),
-                data: frame.payload ?? new Uint8Array(0),
-            };
-            this.terminalStreams.receiveChunk({ chunk });
+        const terminalId = this.slotTerminals.get(frame.slot);
+        if (!terminalId) {
             return;
         }
+        if (frame.opcode === TerminalStreamOpcode.Output) {
+            this.emitTerminalStreamEvent({
+                terminalId,
+                type: "output",
+                data: frame.payload,
+            });
+            return;
+        }
+        if (frame.opcode === TerminalStreamOpcode.Snapshot) {
+            const state = decodeTerminalSnapshotPayload(frame.payload);
+            if (!state) {
+                return;
+            }
+            this.emitTerminalStreamEvent({
+                terminalId,
+                type: "snapshot",
+                state,
+            });
+        }
+    }
+    emitTerminalStreamEvent(event) {
+        for (const listener of this.terminalStreamListeners) {
+            try {
+                listener(event);
+            }
+            catch {
+                // no-op
+            }
+        }
     }
     updateConnectionState(next, metadata) {
         const previous = this.connectionState;
         this.connectionState = next;
-        const reasonFromNext = next.status === 'disconnected' && typeof next.reason === 'string'
-            ? next.reason
-            : null;
+        const reasonFromNext = next.status === "disconnected" && typeof next.reason === "string" ? next.reason : null;
         const reason = metadata?.reason ?? reasonFromNext;
         const reasonCode = metadata?.reasonCode ?? toReasonCode(reason);
         this.logger.debug({
@@ -2176,12 +2189,12 @@ export class DaemonClient {
             clientIdHash: this.logClientIdHash,
             from: previous.status,
             to: next.status,
-            event: metadata?.event ?? 'STATE_UPDATE',
+            event: metadata?.event ?? "STATE_UPDATE",
             connectionPath: this.logConnectionPath,
             generation: this.logGeneration,
             reasonCode,
             reason,
-        }, 'DaemonClientTransition');
+        }, "DaemonClientTransition");
         for (const listener of this.connectionListeners) {
             try {
                 listener(next);
@@ -2199,31 +2212,31 @@ export class DaemonClient {
             clearTimeout(this.reconnectTimeout);
             this.reconnectTimeout = null;
         }
-        const wasDisposed = this.connectionState.status === 'disposed';
+        const wasDisposed = this.connectionState.status === "disposed";
         const reason = input?.reason;
-        if (typeof reason === 'string' && reason.trim().length > 0) {
+        if (typeof reason === "string" && reason.trim().length > 0) {
             this.lastErrorValue = reason.trim();
         }
         // Clear all pending waiters and queued sends since the connection was lost
         // and responses from the previous connection will never arrive.
-        this.clearWaiters(new Error(reason ?? 'Connection lost'));
-        this.rejectPendingSendQueue(new Error(reason ?? 'Connection lost'));
-        this.terminalStreams.clearAll();
+        this.clearWaiters(new Error(reason ?? "Connection lost"));
+        this.rejectPendingSendQueue(new Error(reason ?? "Connection lost"));
+        this.clearTerminalSlots();
         this.lastServerInfoMessage = null;
         if (wasDisposed) {
-            this.rejectConnect(new Error(reason ?? 'Daemon client is disposed'));
+            this.rejectConnect(new Error(reason ?? "Daemon client is disposed"));
             return;
         }
         this.updateConnectionState({
-            status: 'disconnected',
+            status: "disconnected",
             ...(reason ? { reason } : {}),
         }, {
-            event: input?.event ?? 'TRANSPORT_CLOSE',
+            event: input?.event ?? "TRANSPORT_CLOSE",
             ...(reason ? { reason } : {}),
             ...(input?.reasonCode ? { reasonCode: input.reasonCode } : {}),
         });
         if (!this.shouldReconnect || this.config.reconnect?.enabled === false) {
-            this.rejectConnect(new Error(reason ?? 'Transport disconnected before connect'));
+            this.rejectConnect(new Error(reason ?? "Transport disconnected before connect"));
             return;
         }
         const attempt = this.reconnectAttempt;
@@ -2240,14 +2253,14 @@ export class DaemonClient {
         }, delay);
     }
     handleSessionMessage(msg) {
-        if (msg.type === 'status') {
+        if (msg.type === "status") {
             const serverInfo = parseServerInfoStatusPayload(msg.payload);
             if (serverInfo) {
                 this.lastServerInfoMessage = serverInfo;
-                if (this.connectionState.status === 'connecting') {
+                if (this.connectionState.status === "connecting") {
                     this.resetConnectTimeout();
                     this.reconnectAttempt = 0;
-                    this.updateConnectionState({ status: 'connected' }, { event: 'HELLO_SERVER_INFO' });
+                    this.updateConnectionState({ status: "connected" }, { event: "HELLO_SERVER_INFO" });
                     this.resubscribeCheckoutDiffSubscriptions();
                     this.resubscribeTerminalDirectorySubscriptions();
                     this.flushPendingSendQueue();
@@ -2255,8 +2268,8 @@ export class DaemonClient {
                 }
             }
         }
-        if (msg.type === 'terminal_stream_exit') {
-            this.terminalStreams.clearStream({ streamId: msg.payload.streamId });
+        if (msg.type === "terminal_stream_exit") {
+            this.removeTerminalSlot(msg.payload.terminalId);
         }
         if (this.rawMessageListeners.size > 0) {
             for (const handler of this.rawMessageListeners) {
@@ -2310,40 +2323,40 @@ export class DaemonClient {
     }
     toEvent(msg) {
         switch (msg.type) {
-            case 'agent_update':
+            case "agent_update":
                 return {
-                    type: 'agent_update',
-                    agentId: msg.payload.kind === 'upsert' ? msg.payload.agent.id : msg.payload.agentId,
+                    type: "agent_update",
+                    agentId: msg.payload.kind === "upsert" ? msg.payload.agent.id : msg.payload.agentId,
                     payload: msg.payload,
                 };
-            case 'workspace_update':
+            case "workspace_update":
                 return {
-                    type: 'workspace_update',
-                    workspaceId: msg.payload.kind === 'upsert' ? msg.payload.workspace.id : msg.payload.id,
+                    type: "workspace_update",
+                    workspaceId: msg.payload.kind === "upsert" ? msg.payload.workspace.id : msg.payload.id,
                     payload: msg.payload,
                 };
-            case 'agent_stream':
+            case "agent_stream":
                 return {
-                    type: 'agent_stream',
+                    type: "agent_stream",
                     agentId: msg.payload.agentId,
                     event: msg.payload.event,
                     timestamp: msg.payload.timestamp,
-                    ...(typeof msg.payload.seq === 'number' ? { seq: msg.payload.seq } : {}),
-                    ...(typeof msg.payload.epoch === 'string' ? { epoch: msg.payload.epoch } : {}),
+                    ...(typeof msg.payload.seq === "number" ? { seq: msg.payload.seq } : {}),
+                    ...(typeof msg.payload.epoch === "string" ? { epoch: msg.payload.epoch } : {}),
                 };
-            case 'status':
-                return { type: 'status', payload: msg.payload };
-            case 'agent_deleted':
-                return { type: 'agent_deleted', agentId: msg.payload.agentId };
-            case 'agent_permission_request':
+            case "status":
+                return { type: "status", payload: msg.payload };
+            case "agent_deleted":
+                return { type: "agent_deleted", agentId: msg.payload.agentId };
+            case "agent_permission_request":
                 return {
-                    type: 'agent_permission_request',
+                    type: "agent_permission_request",
                     agentId: msg.payload.agentId,
                     request: msg.payload.request,
                 };
-            case 'agent_permission_resolved':
+            case "agent_permission_resolved":
                 return {
-                    type: 'agent_permission_resolved',
+                    type: "agent_permission_resolved",
                     agentId: msg.payload.agentId,
                     requestId: msg.payload.requestId,
                     resolution: msg.payload.resolution,
@@ -2352,9 +2365,6 @@ export class DaemonClient {
                 return null;
         }
     }
-    async waitFor(predicate, timeout = 30000, _options) {
-        return this.waitForWithCancel(predicate, timeout, _options).promise;
-    }
     waitForWithCancel(predicate, timeout = 30000, _options) {
         // Capture stack trace at call site, not inside setTimeout
         const timeoutError = new Error(`Timeout waiting for message (${timeout}ms)`);
@@ -2424,7 +2434,7 @@ function resolveAgentConfig(options) {
     };
     const merged = config ? { ...baseConfig, ...config } : baseConfig;
     if (!merged.provider || !merged.cwd) {
-        throw new Error('createAgent requires provider and cwd');
+        throw new Error("createAgent requires provider and cwd");
     }
     if (!merged.modeId) {
         merged.modeId = getAgentProviderDefinition(merged.provider).defaultModeId ?? undefined;