@getpaseo/server 0.1.13 → 0.1.15

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

@@ -1,10 +1,10 @@
-import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, RestartRequestedStatusPayloadSchema, 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, safeRandomId, } from "./daemon-client-transport.js";
+import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, RestartRequestedStatusPayloadSchema, 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, safeRandomId, } from './daemon-client-transport.js';
 const consoleLogger = {
     debug: (obj, msg) => console.debug(msg, obj),
     info: (obj, msg) => console.info(msg, obj),
@@ -14,7 +14,7 @@ const consoleLogger = {
 class DaemonRpcError extends Error {
     constructor(params) {
         super(params.error);
-        this.name = "DaemonRpcError";
+        this.name = 'DaemonRpcError';
         this.requestId = params.requestId;
         this.requestType = params.requestType;
         this.code = params.code;
@@ -28,7 +28,7 @@ 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');
 }
 export class DaemonClient {
     constructor(config) {
@@ -49,7 +49,7 @@ 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.pendingSendQueue = [];
@@ -72,9 +72,9 @@ export class DaemonClient {
         if (isRelayClientWebSocketUrl(this.config.url)) {
             try {
                 const parsed = new URL(this.config.url);
-                if (!parsed.searchParams.get("clientId")) {
+                if (!parsed.searchParams.get('clientId')) {
                     this.relayClientId = `clt_${safeRandomId()}`;
-                    parsed.searchParams.set("clientId", this.relayClientId);
+                    parsed.searchParams.set('clientId', this.relayClientId);
                     this.config.url = parsed.toString();
                 }
             }
@@ -87,7 +87,7 @@ export class DaemonClient {
     // Connection
     // ============================================================================
     async connect() {
-        if (this.connectionState.status === "connected") {
+        if (this.connectionState.status === 'connected') {
             return;
         }
         if (this.connectPromise) {
@@ -103,15 +103,15 @@ export class DaemonClient {
     }
     attemptConnect() {
         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 {
             // If we reconnect while the previous socket is still open (common in browsers
@@ -121,13 +121,12 @@ export class DaemonClient {
             this.disposeTransport();
             const baseTransportFactory = this.config.transportFactory ??
                 createWebSocketTransportFactory(this.config.webSocketFactory ?? defaultWebSocketFactory);
-            const shouldUseRelayE2ee = this.config.e2ee?.enabled === true &&
-                isRelayClientWebSocketUrl(this.config.url);
+            const shouldUseRelayE2ee = this.config.e2ee?.enabled === true && isRelayClientWebSocketUrl(this.config.url);
             let transportFactory = baseTransportFactory;
             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,
@@ -138,7 +137,7 @@ export class DaemonClient {
             const transport = transportFactory({ url: this.config.url, headers });
             this.transport = transport;
             this.updateConnectionState({
-                status: "connecting",
+                status: 'connecting',
                 attempt: this.reconnectAttempt,
             });
             this.transportCleanup = [
@@ -149,7 +148,7 @@ export class DaemonClient {
                     }
                     this.lastErrorValue = null;
                     this.reconnectAttempt = 0;
-                    this.updateConnectionState({ status: "connected" });
+                    this.updateConnectionState({ status: 'connected' });
                     this.resubscribeCheckoutDiffSubscriptions();
                     this.resubscribeTerminalDirectorySubscriptions();
                     this.flushPendingSendQueue();
@@ -161,10 +160,10 @@ export class DaemonClient {
                         this.pendingGenericTransportErrorTimeout = null;
                     }
                     const closeRecord = event;
-                    const closeCode = closeRecord && typeof closeRecord === "object" && typeof closeRecord.code === "number"
+                    const closeCode = closeRecord && typeof closeRecord === 'object' && typeof closeRecord.code === 'number'
                         ? closeRecord.code
                         : null;
-                    const closeReason = closeRecord && typeof closeRecord === "object" && typeof closeRecord.reason === "string"
+                    const closeReason = closeRecord && typeof closeRecord === 'object' && typeof closeRecord.reason === 'string'
                         ? closeRecord.reason
                         : null;
                     const reason = describeTransportClose(event);
@@ -172,7 +171,7 @@ export class DaemonClient {
                         this.lastErrorValue = reason;
                     }
                     this.updateConnectionState({
-                        status: "disconnected",
+                        status: 'disconnected',
                         ...(reason ? { reason } : {}),
                     });
                     // When connecting over the relay, only one client connection is allowed at a time.
@@ -180,18 +179,18 @@ export class DaemonClient {
                     // connection (which causes flapping where both sides repeatedly replace each other).
                     if (isRelayClientWebSocketUrl(this.config.url) &&
                         closeCode === 1008 &&
-                        (closeReason ?? reason) === "Replaced by new connection") {
+                        (closeReason ?? reason) === 'Replaced by new connection') {
                         this.shouldReconnect = false;
-                        this.clearWaiters(new Error(reason ?? "Replaced by new connection"));
-                        this.rejectPendingSendQueue(new Error(reason ?? "Replaced by new connection"));
-                        this.rejectConnect(new Error(reason ?? "Replaced by new connection"));
+                        this.clearWaiters(new Error(reason ?? 'Replaced by new connection'));
+                        this.rejectPendingSendQueue(new Error(reason ?? 'Replaced by new connection'));
+                        this.rejectConnect(new Error(reason ?? 'Replaced by new connection'));
                         return;
                     }
                     this.scheduleReconnect(reason);
                 }),
                 transport.onError((event) => {
                     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".
@@ -200,10 +199,10 @@ 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.updateConnectionState({ status: "disconnected", reason });
+                                    this.updateConnectionState({ status: 'disconnected', reason });
                                     this.scheduleReconnect(reason);
                                 }
                             }, 250);
@@ -215,14 +214,14 @@ export class DaemonClient {
                         this.pendingGenericTransportErrorTimeout = null;
                     }
                     this.lastErrorValue = reason;
-                    this.updateConnectionState({ status: "disconnected", reason });
+                    this.updateConnectionState({ status: 'disconnected', reason });
                     this.scheduleReconnect(reason);
                 }),
                 transport.onMessage((data) => this.handleTransportMessage(data)),
             ];
         }
         catch (error) {
-            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(message);
             this.rejectConnect(error instanceof Error ? error : new Error(message));
@@ -253,20 +252,20 @@ export class DaemonClient {
             clearTimeout(this.reconnectTimeout);
             this.reconnectTimeout = null;
         }
-        this.disposeTransport(1000, "Client closed");
-        this.clearWaiters(new Error("Daemon client closed"));
+        this.disposeTransport(1000, 'Client closed');
+        this.clearWaiters(new Error('Daemon client closed'));
         this.terminalStreams.clearAll();
         this.updateConnectionState({
-            status: "disconnected",
-            reason: "client_closed",
+            status: 'disconnected',
+            reason: 'client_closed',
         });
     }
     ensureConnected() {
         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();
@@ -282,10 +281,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;
@@ -304,7 +303,7 @@ export class DaemonClient {
         };
     }
     on(arg1, arg2) {
-        if (typeof arg1 === "function") {
+        if (typeof arg1 === 'function') {
             return this.subscribe(arg1);
         }
         const type = arg1;
@@ -333,7 +332,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;
             }
@@ -341,7 +340,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) {
@@ -351,7 +350,7 @@ export class DaemonClient {
         }
     }
     sendBinaryFrame(frame) {
-        if (!this.transport || this.connectionState.status !== "connected") {
+        if (!this.transport || this.connectionState.status !== 'connected') {
             if (this.config.suppressSendErrors) {
                 return;
             }
@@ -376,13 +375,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
@@ -407,13 +406,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) {
@@ -434,9 +433,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,
@@ -449,7 +448,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);
@@ -461,7 +460,7 @@ export class DaemonClient {
             throw err;
         }
         const result = await promise;
-        if (result.kind === "error") {
+        if (result.kind === 'error') {
             throw result.error;
         }
         return result.value;
@@ -504,23 +503,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,
@@ -530,26 +529,25 @@ export class DaemonClient {
     }
     registerPushToken(token) {
         this.sendSessionMessage({
-            type: "register_push_token",
+            type: 'register_push_token',
             token,
         });
     }
     async ping(params) {
-        const requestId = params?.requestId ??
-            `ping-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+        const requestId = params?.requestId ?? `ping-${Date.now()}-${Math.random().toString(36).slice(2)}`;
         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;
             },
@@ -568,7 +566,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 } : {}),
@@ -581,7 +579,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) {
@@ -594,7 +592,7 @@ export class DaemonClient {
     async fetchAgent(agentId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: "fetch_agent_request",
+            type: 'fetch_agent_request',
             requestId: resolvedRequestId,
             agentId,
         });
@@ -604,7 +602,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) {
@@ -624,7 +622,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,
@@ -639,7 +637,7 @@ export class DaemonClient {
         }
         for (const cwd of this.terminalDirectorySubscriptions) {
             this.sendSessionMessage({
-                type: "subscribe_terminals_request",
+                type: 'subscribe_terminals_request',
                 cwd,
             });
         }
@@ -651,14 +649,12 @@ 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 } : {}),
             ...(options.outputSchema ? { outputSchema: options.outputSchema } : {}),
-            ...(options.images && options.images.length > 0
-                ? { images: options.images }
-                : {}),
+            ...(options.images && options.images.length > 0 ? { images: options.images } : {}),
             ...(options.git ? { git: options.git } : {}),
             ...(options.worktreeName ? { worktreeName: options.worktreeName } : {}),
             ...(options.labels && Object.keys(options.labels).length > 0
@@ -671,7 +667,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);
@@ -685,7 +681,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;
@@ -693,7 +689,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,
         });
@@ -703,7 +699,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) {
@@ -716,7 +712,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,
         });
@@ -726,7 +722,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) {
@@ -740,7 +736,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
@@ -754,7 +750,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) {
@@ -764,13 +760,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 } : {}),
@@ -781,7 +777,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);
@@ -796,7 +792,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,
         });
@@ -806,7 +802,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);
@@ -820,12 +816,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({
@@ -834,7 +830,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) {
@@ -855,7 +851,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,
@@ -868,7 +864,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) {
@@ -878,19 +874,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,
@@ -901,7 +897,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) {
@@ -911,13 +907,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,
@@ -928,7 +924,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) {
@@ -938,13 +934,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,
@@ -955,7 +951,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) {
@@ -965,13 +961,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,
         });
@@ -981,7 +977,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);
@@ -1001,7 +997,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,
@@ -1011,7 +1007,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) {
@@ -1021,19 +1017,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) {
-        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) {
@@ -1046,7 +1042,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) {
@@ -1057,9 +1053,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 {
@@ -1070,11 +1066,17 @@ export class DaemonClient {
         }
     }
     sendDictationStreamChunk(dictationId, seq, audio, format) {
-        this.sendSessionMessageStrict({ type: "dictation_stream_chunk", dictationId, seq, audio, format });
+        this.sendSessionMessageStrict({
+            type: 'dictation_stream_chunk',
+            dictationId,
+            seq,
+            audio,
+            format,
+        });
     }
     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) {
@@ -1083,7 +1085,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) {
@@ -1092,7 +1094,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) {
@@ -1106,68 +1108,64 @@ 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);
@@ -1182,13 +1180,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
@@ -1203,7 +1201,7 @@ export class DaemonClient {
         }
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: "checkout_status_request",
+            type: 'checkout_status_request',
             cwd,
             requestId: resolvedRequestId,
         });
@@ -1213,7 +1211,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) {
@@ -1235,14 +1233,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()}`;
@@ -1277,7 +1275,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,
@@ -1287,7 +1285,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) => {
@@ -1311,7 +1309,7 @@ export class DaemonClient {
     unsubscribeCheckoutDiff(subscriptionId) {
         this.checkoutDiffSubscriptions.delete(subscriptionId);
         this.sendSessionMessage({
-            type: "unsubscribe_checkout_diff_request",
+            type: 'unsubscribe_checkout_diff_request',
             subscriptionId,
         });
     }
@@ -1319,12 +1317,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,
         });
     }
@@ -1332,13 +1330,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,
         });
     }
@@ -1346,12 +1344,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,
         });
     }
@@ -1359,10 +1357,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,
         });
     }
@@ -1370,13 +1368,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,
         });
     }
@@ -1384,10 +1382,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,
         });
     }
@@ -1395,11 +1393,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,
         });
     }
@@ -1407,12 +1405,12 @@ 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,
         });
     }
@@ -1420,11 +1418,11 @@ export class DaemonClient {
         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,
         });
     }
@@ -1432,12 +1430,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,
         });
     }
@@ -1445,27 +1443,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(agentId, path, mode = "list", requestId) {
+    async exploreFileSystem(agentId, path, mode = 'list', requestId) {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: "file_explorer_request",
+                type: 'file_explorer_request',
                 agentId,
                 path,
                 mode,
             },
-            responseType: "file_explorer_response",
+            responseType: 'file_explorer_response',
             timeout: 10000,
         });
     }
@@ -1473,11 +1474,11 @@ export class DaemonClient {
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: "file_download_token_request",
+                type: 'file_download_token_request',
                 agentId,
                 path,
             },
-            responseType: "file_download_token_response",
+            responseType: 'file_download_token_response',
             timeout: 10000,
         });
     }
@@ -1485,10 +1486,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,
         });
     }
@@ -1499,11 +1500,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',
             timeout: 30000,
         });
     }
@@ -1511,9 +1512,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,
         });
     }
@@ -1521,9 +1522,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,
         });
     }
@@ -1531,34 +1532,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, requestId) {
-        return this.sendCorrelatedSessionRequest({
-            requestId,
-            message: {
-                type: "list_commands_request",
-                agentId,
-            },
-            responseType: "list_commands_response",
-            timeout: 30000,
-        });
-    }
-    async executeCommand(agentId, commandName, args, requestId) {
+    async listCommands(agentId, requestIdOrOptions) {
+        const requestId = typeof requestIdOrOptions === 'string' ? requestIdOrOptions : requestIdOrOptions?.requestId;
+        const draftConfig = typeof requestIdOrOptions === 'string' ? undefined : requestIdOrOptions?.draftConfig;
         return this.sendCorrelatedSessionRequest({
             requestId,
             message: {
-                type: "execute_command_request",
+                type: 'list_commands_request',
                 agentId,
-                commandName,
-                args,
+                ...(draftConfig ? { draftConfig } : {}),
             },
-            responseType: "execute_command_response",
+            responseType: 'list_commands_response',
             timeout: 30000,
         });
     }
@@ -1567,7 +1558,7 @@ export class DaemonClient {
     // ============================================================================
     async respondToPermission(agentId, requestId, response) {
         this.sendSessionMessage({
-            type: "agent_permission_response",
+            type: 'agent_permission_response',
             agentId,
             requestId,
             response,
@@ -1575,7 +1566,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,
@@ -1586,7 +1577,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) {
@@ -1616,7 +1607,7 @@ export class DaemonClient {
     async waitForFinish(agentId, timeout = 60000) {
         const requestId = this.createRequestId();
         const message = SessionInboundMessageSchema.parse({
-            type: "wait_for_finish_request",
+            type: 'wait_for_finish_request',
             requestId,
             agentId,
             timeoutMs: timeout,
@@ -1624,7 +1615,7 @@ export class DaemonClient {
         const payload = await this.sendCorrelatedRequest({
             requestId,
             message,
-            responseType: "wait_for_finish_response",
+            responseType: 'wait_for_finish_response',
             timeout: timeout + 5000,
             options: { skipQueue: true },
         });
@@ -1640,35 +1631,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 },
         });
@@ -1676,7 +1667,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,
@@ -1684,7 +1675,7 @@ export class DaemonClient {
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: "create_terminal_response",
+            responseType: 'create_terminal_response',
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1692,27 +1683,27 @@ 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({
             requestId: resolvedRequestId,
             message,
-            responseType: "subscribe_terminal_response",
+            responseType: 'subscribe_terminal_response',
             timeout: 10000,
             options: { skipQueue: true },
         });
     }
     unsubscribeTerminal(terminalId) {
         this.sendSessionMessage({
-            type: "unsubscribe_terminal_request",
+            type: 'unsubscribe_terminal_request',
             terminalId,
         });
     }
     sendTerminalInput(terminalId, message) {
         this.sendSessionMessage({
-            type: "terminal_input",
+            type: 'terminal_input',
             terminalId,
             message,
         });
@@ -1720,14 +1711,14 @@ export class DaemonClient {
     async killTerminal(terminalId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: "kill_terminal_request",
+            type: 'kill_terminal_request',
             terminalId,
             requestId: resolvedRequestId,
         });
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: "kill_terminal_response",
+            responseType: 'kill_terminal_response',
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1735,7 +1726,7 @@ export class DaemonClient {
     async attachTerminalStream(terminalId, options, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: "attach_terminal_stream_request",
+            type: 'attach_terminal_stream_request',
             terminalId,
             requestId: resolvedRequestId,
             ...(options?.resumeOffset !== undefined ? { resumeOffset: options.resumeOffset } : {}),
@@ -1745,7 +1736,7 @@ export class DaemonClient {
         return this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: "attach_terminal_stream_response",
+            responseType: 'attach_terminal_stream_response',
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1753,14 +1744,14 @@ export class DaemonClient {
     async detachTerminalStream(streamId, requestId) {
         const resolvedRequestId = this.createRequestId(requestId);
         const message = SessionInboundMessageSchema.parse({
-            type: "detach_terminal_stream_request",
+            type: 'detach_terminal_stream_request',
             streamId,
             requestId: resolvedRequestId,
         });
         const payload = await this.sendCorrelatedRequest({
             requestId: resolvedRequestId,
             message,
-            responseType: "detach_terminal_stream_response",
+            responseType: 'detach_terminal_stream_response',
             timeout: 10000,
             options: { skipQueue: true },
         });
@@ -1787,7 +1778,7 @@ export class DaemonClient {
         });
     }
     sendTerminalStreamInput(streamId, data) {
-        const payload = typeof data === "string" ? encodeUtf8String(data) : data;
+        const payload = typeof data === 'string' ? encodeUtf8String(data) : data;
         this.sendBinaryFrame({
             channel: BinaryMuxChannel.Terminal,
             messageType: TerminalBinaryMessageType.InputUtf8,
@@ -1816,7 +1807,7 @@ export class DaemonClient {
     }
     async waitForTerminalOutput(terminalId, timeout = 5000) {
         return this.waitFor((msg) => {
-            if (msg.type !== "terminal_output") {
+            if (msg.type !== 'terminal_output') {
                 return null;
             }
             if (msg.payload.terminalId !== terminalId) {
@@ -1831,7 +1822,7 @@ export class DaemonClient {
     createRequestId(requestId) {
         return requestId ?? crypto.randomUUID();
     }
-    disposeTransport(code = 1001, reason = "Reconnecting") {
+    disposeTransport(code = 1001, reason = 'Reconnecting') {
         this.cleanupTransport();
         if (this.transport) {
             try {
@@ -1859,9 +1850,7 @@ export class DaemonClient {
         this.transportCleanup = [];
     }
     handleTransportMessage(data) {
-        const rawData = data && typeof data === "object" && "data" in data
-            ? data.data
-            : data;
+        const rawData = data && typeof data === 'object' && 'data' in data ? data.data : data;
         const rawBytes = asUint8Array(rawData);
         if (rawBytes) {
             const frame = decodeBinaryMuxFrame(rawBytes);
@@ -1883,11 +1872,11 @@ export class DaemonClient {
         }
         const parsed = WSOutboundMessageSchema.safeParse(parsedJson);
         if (!parsed.success) {
-            const msgType = parsedJson?.message?.type ?? "unknown";
-            this.logger.warn({ msgType, error: parsed.error.message }, "Message validation failed");
+            const msgType = parsedJson?.message?.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);
@@ -1923,7 +1912,7 @@ export class DaemonClient {
             this.reconnectTimeout = null;
         }
         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;
@@ -1931,16 +1920,16 @@ export class DaemonClient {
         const maxDelay = this.config.reconnect?.maxDelayMs ?? DEFAULT_RECONNECT_MAX_DELAY_MS;
         const delay = Math.min(baseDelay * 2 ** attempt, maxDelay);
         this.reconnectAttempt = attempt + 1;
-        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.clearWaiters(new Error(reason ?? 'Connection lost'));
+        this.rejectPendingSendQueue(new Error(reason ?? 'Connection lost'));
         this.terminalStreams.clearAll();
         this.updateConnectionState({
-            status: "disconnected",
+            status: 'disconnected',
             ...(reason ? { reason } : {}),
         });
         this.reconnectTimeout = setTimeout(() => {
@@ -1952,7 +1941,7 @@ export class DaemonClient {
         }, delay);
     }
     handleSessionMessage(msg) {
-        if (msg.type === "terminal_stream_exit") {
+        if (msg.type === 'terminal_stream_exit') {
             this.terminalStreams.clearStream({ streamId: msg.payload.streamId });
         }
         if (this.rawMessageListeners.size > 0) {
@@ -2007,36 +1996,34 @@ 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 "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,
@@ -2117,7 +2104,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;