@getpaseo/client 0.1.101 → 0.1.102

package/dist/daemon-client.d.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod";
-import { AgentRefreshedStatusPayloadSchema, CheckoutRenameBranchResponseSchema, RenameTerminalResponseSchema, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, type ServerInfoStatusPayload } from "@getpaseo/protocol/messages";
-import type { AgentStreamEventPayload, AgentSnapshotPayload, ProjectPlacementPayload, AgentPermissionResolvedMessage, CreateAgentRequestMessage, CreatePaseoWorktreeRequest, FileDownloadTokenResponse, FileUploadResponse, FileExplorerResponse, FetchAgentTimelineResponseMessage, GitSetupOptions, CheckoutStatusResponse, CheckoutCommitResponse, CheckoutMergeResponse, CheckoutMergeFromBaseResponse, CheckoutPullResponse, CheckoutPushResponse, CheckoutRefreshResponse, CheckoutPrCreateResponse, CheckoutPrMergeResponse, CheckoutPrMergeMethod, CheckoutGithubSetAutoMergeResponse, CheckoutGithubGetCheckDetailsResponse, CheckoutPrStatusResponse, PullRequestTimelineResponse, CheckoutSwitchBranchResponse, StashSaveResponse, StashPopResponse, StashListResponse, ValidateBranchResponse, BranchSuggestionsResponse, GitHubSearchResponse, GitHubSearchRequest, DirectorySuggestionsResponse, PaseoWorktreeListResponse, PaseoWorktreeArchiveResponse, ProjectIconResponse, ProjectAddResponse, OpenProjectResponseMessage, ArchiveWorkspaceResponseMessage, WorkspaceSetupStatusResponseMessage, ListCommandsResponse, ListProviderFeaturesResponseMessage, ListProviderModelsResponseMessage, ListProviderModesResponseMessage, ListAvailableProvidersResponse, GetProvidersSnapshotResponseMessage, RefreshProvidersSnapshotResponseMessage, ProviderDiagnosticResponseMessage, ProviderUsageListResponseMessage, DaemonGetStatusResponse, DaemonGetPairingOfferResponse, DiagnosticsResponse, AgentRewindResponseMessage, ListTerminalsResponse, CreateTerminalResponse, SubscribeTerminalResponse, SubscribeTerminalRequest, CloseItemsResponse, KillTerminalResponse, CaptureTerminalResponse, TerminalInput, SessionInboundMessage, SessionOutboundMessage, SendAgentMessageRequest, PaseoConfigRaw, PaseoConfigRevision, WorkspaceCreateRequest } from "@getpaseo/protocol/messages";
+import { AgentRefreshedStatusPayloadSchema, CheckoutRenameBranchResponseSchema, RenameTerminalResponseSchema, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, DaemonUpdateResponseSchema, type ServerInfoStatusPayload } from "@getpaseo/protocol/messages";
+import type { AgentStreamEventPayload, AgentSnapshotPayload, ProjectPlacementPayload, AgentPermissionResolvedMessage, CreateAgentRequestMessage, CreatePaseoWorktreeRequest, FileDownloadTokenResponse, FileUploadResponse, FileExplorerResponse, FetchAgentTimelineResponseMessage, AgentForkContextResponseMessage, GitSetupOptions, CheckoutStatusResponse, CheckoutCommitResponse, CheckoutMergeResponse, CheckoutMergeFromBaseResponse, CheckoutPullResponse, CheckoutPushResponse, CheckoutRefreshResponse, CheckoutPrCreateResponse, CheckoutPrMergeResponse, CheckoutPrMergeMethod, CheckoutGithubSetAutoMergeResponse, CheckoutGithubGetCheckDetailsResponse, CheckoutPrStatusResponse, PullRequestTimelineResponse, CheckoutSwitchBranchResponse, StashSaveResponse, StashPopResponse, StashListResponse, ValidateBranchResponse, BranchSuggestionsResponse, GitHubSearchResponse, GitHubSearchRequest, DirectorySuggestionsResponse, PaseoWorktreeListResponse, PaseoWorktreeArchiveResponse, ProjectIconResponse, ProjectAddResponse, OpenProjectResponseMessage, ArchiveWorkspaceResponseMessage, WorkspaceSetupStatusResponseMessage, ListCommandsResponse, ListProviderFeaturesResponseMessage, ListProviderModelsResponseMessage, ListProviderModesResponseMessage, ListAvailableProvidersResponse, GetProvidersSnapshotResponseMessage, RefreshProvidersSnapshotResponseMessage, ProviderDiagnosticResponseMessage, ProviderUsageListResponseMessage, DaemonGetStatusResponse, DaemonGetPairingOfferResponse, DiagnosticsResponse, AgentRewindResponseMessage, ListTerminalsResponse, CreateTerminalResponse, SubscribeTerminalResponse, SubscribeTerminalRequest, CloseItemsResponse, KillTerminalResponse, CaptureTerminalResponse, TerminalInput, SessionInboundMessage, SessionOutboundMessage, SendAgentMessageRequest, PaseoConfigRaw, PaseoConfigRevision, WorkspaceCreateRequest } from "@getpaseo/protocol/messages";
 import type { AgentPermissionRequest, AgentPermissionResponse, AgentPersistenceHandle, AgentProviderNotice, AgentProvider, AgentSessionConfig } from "@getpaseo/protocol/agent-types";
 import type { MutableDaemonConfig, MutableDaemonConfigPatch } from "@getpaseo/protocol/messages";
 import { type DaemonTransportFactory, type WebSocketFactory } from "./daemon-client-transport.js";
@@ -224,9 +224,11 @@ export interface WriteProjectConfigInput {
     requestId?: string;
 }
 interface ListCommandsOptions {
+    agentId: string;
     requestId?: string;
     draftConfig?: ListCommandsDraftConfig;
 }
+type LegacyListCommandsOptions = Omit<ListCommandsOptions, "agentId">;
 type SetVoiceModePayload = Extract<SessionOutboundMessage, {
     type: "set_voice_mode_response";
 }>["payload"];
@@ -302,19 +304,44 @@ type ScheduleUpdatePayload = Extract<SessionOutboundMessage, {
     type: "schedule/update/response";
 }>["payload"];
 export type FetchAgentTimelinePayload = FetchAgentTimelineResponseMessage["payload"];
+export type AgentForkContextPayload = AgentForkContextResponseMessage["payload"];
 export type FetchAgentTimelineDirection = FetchAgentTimelinePayload["direction"];
 export type FetchAgentTimelineProjection = FetchAgentTimelinePayload["projection"];
 export type FetchAgentTimelineCursor = NonNullable<FetchAgentTimelinePayload["startCursor"]>;
+export interface FetchAgentOptions {
+    agentId: string;
+    requestId?: string;
+    timeout?: number;
+}
+type LegacyFetchAgentOptions = Omit<FetchAgentOptions, "agentId">;
 export interface FetchAgentTimelineOptions {
     direction?: FetchAgentTimelineDirection;
     cursor?: FetchAgentTimelineCursor;
     limit?: number;
     projection?: FetchAgentTimelineProjection;
     requestId?: string;
+    timeout?: number;
+}
+export interface AgentForkContextOptions {
+    boundaryMessageId?: string;
+    requestId?: string;
 }
 type AgentRefreshedStatusPayload = z.infer<typeof AgentRefreshedStatusPayloadSchema>;
 type RestartRequestedStatusPayload = z.infer<typeof RestartRequestedStatusPayloadSchema>;
 type ShutdownRequestedStatusPayload = z.infer<typeof ShutdownRequestedStatusPayloadSchema>;
+export interface ShutdownServerOptions {
+    requestId?: string;
+    timeout?: number;
+}
+export interface DaemonStatusOptions {
+    requestId?: string;
+    timeout?: number;
+}
+export interface DaemonPairingOfferOptions {
+    requestId?: string;
+    timeout?: number;
+}
+type DaemonUpdateResponse = z.infer<typeof DaemonUpdateResponseSchema>;
 type FetchAgentsPayload = Extract<SessionOutboundMessage, {
     type: "fetch_agents_response";
 }>["payload"];
@@ -323,6 +350,7 @@ type FetchAgentsRequest = Extract<SessionInboundMessage, {
 }>;
 export type FetchAgentsOptions = Omit<FetchAgentsRequest, "type" | "requestId"> & {
     requestId?: string;
+    timeout?: number;
 };
 export type FetchAgentsEntry = FetchAgentsPayload["entries"][number];
 export type FetchAgentsPageInfo = FetchAgentsPayload["pageInfo"];
@@ -384,6 +412,7 @@ export interface ReadChatMessagesOptions {
     since?: string;
     authorAgentId?: string;
     requestId?: string;
+    timeout?: number;
 }
 export interface WaitForChatMessagesOptions {
     room: string;
@@ -637,7 +666,9 @@ export declare class DaemonClient {
     }>["payload"]>;
     archiveWorkspace(workspaceId: string, requestId?: string): Promise<ArchiveWorkspacePayload>;
     fetchWorkspaceSetupStatus(workspaceId: string, requestId?: string): Promise<WorkspaceSetupStatusPayload>;
+    fetchAgent(options: FetchAgentOptions): Promise<FetchAgentResult | null>;
     fetchAgent(agentId: string, requestId?: string): Promise<FetchAgentResult | null>;
+    fetchAgent(agentId: string, options?: LegacyFetchAgentOptions): Promise<FetchAgentResult | null>;
     private resubscribeCheckoutDiffSubscriptions;
     private resubscribeTerminalDirectorySubscriptions;
     createAgent(options: CreateAgentRequestOptions): Promise<AgentSnapshotPayload>;
@@ -663,6 +694,7 @@ export declare class DaemonClient {
     importAgent(input: ImportAgentInput): Promise<AgentSnapshotPayload>;
     refreshAgent(agentId: string, requestId?: string): Promise<AgentRefreshedStatusPayload>;
     fetchAgentTimeline(agentId: string, options?: FetchAgentTimelineOptions): Promise<FetchAgentTimelinePayload>;
+    buildAgentForkContext(agentId: string, options?: AgentForkContextOptions): Promise<AgentForkContextPayload>;
     sendAgentMessage(agentId: string, text: string, options?: SendMessageOptions): Promise<void>;
     sendMessage(agentId: string, text: string, options?: SendMessageOptions): Promise<void>;
     rewindAgent(agentId: string, messageId: string, mode: "conversation" | "files" | "both"): Promise<AgentRewindResponseMessage["payload"]>;
@@ -672,7 +704,8 @@ export declare class DaemonClient {
     setAgentFeature(agentId: string, featureId: string, value: unknown): Promise<void>;
     setAgentThinkingOption(agentId: string, thinkingOptionId: string | null): Promise<AgentProviderNotice | null>;
     restartServer(reason?: string, requestId?: string): Promise<RestartRequestedStatusPayload>;
-    shutdownServer(requestId?: string): Promise<ShutdownRequestedStatusPayload>;
+    shutdownServer(options?: ShutdownServerOptions): Promise<ShutdownRequestedStatusPayload>;
+    updateDaemon(requestId?: string): Promise<DaemonUpdateResponse["payload"]>;
     setVoiceMode(enabled: boolean, agentId?: string): Promise<SetVoiceModePayload>;
     sendVoiceAudioChunk(audio: string, format: string, isLast?: boolean): Promise<void>;
     startDictationStream(dictationId: string, format: string): Promise<void>;
@@ -823,8 +856,8 @@ export declare class DaemonClient {
         requestId: string;
         config: MutableDaemonConfig;
     }>;
-    getDaemonStatus(requestId?: string): Promise<DaemonStatusPayload>;
-    getDaemonPairingOffer(requestId?: string): Promise<DaemonPairingOfferPayload>;
+    getDaemonStatus(options?: DaemonStatusOptions): Promise<DaemonStatusPayload>;
+    getDaemonPairingOffer(options?: DaemonPairingOfferOptions): Promise<DaemonPairingOfferPayload>;
     collectDiagnostics(requestId?: string): Promise<DiagnosticsPayload>;
     patchDaemonConfig(config: MutableDaemonConfigPatch, requestId?: string): Promise<{
         requestId: string;
@@ -843,8 +876,9 @@ export declare class DaemonClient {
     listProviderUsage(options?: {
         requestId?: string;
     }): Promise<ProviderUsageListPayload>;
+    listCommands(options: ListCommandsOptions): Promise<ListCommandsPayload>;
     listCommands(agentId: string, requestId?: string): Promise<ListCommandsPayload>;
-    listCommands(agentId: string, options?: ListCommandsOptions): Promise<ListCommandsPayload>;
+    listCommands(agentId: string, options?: LegacyListCommandsOptions): Promise<ListCommandsPayload>;
     respondToPermission(agentId: string, requestId: string, response: AgentPermissionResponse): Promise<void>;
     respondToPermissionAndWait(agentId: string, requestId: string, response: AgentPermissionResponse, timeout?: number): Promise<AgentPermissionResolvedPayload>;
     waitForAgentUpsert(agentId: string, predicate: (snapshot: AgentSnapshotPayload) => boolean, timeout?: number): Promise<AgentSnapshotPayload>;

package/dist/daemon-client.js

@@ -1,5 +1,5 @@
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
-import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, parseServerInfoStatusPayload, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, SessionInboundMessageSchema, WSOutboundMessageSchema, } from "@getpaseo/protocol/messages";
+import { AgentCreateFailedStatusPayloadSchema, AgentCreatedStatusPayloadSchema, AgentRefreshedStatusPayloadSchema, AgentResumedStatusPayloadSchema, parseServerInfoStatusPayload, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, DaemonUpdateResponseSchema, SessionInboundMessageSchema, WSOutboundMessageSchema, } from "@getpaseo/protocol/messages";
 import { isRelayClientWebSocketUrl } from "@getpaseo/protocol/daemon-endpoints";
 import { terminalSubscriptionKey } from "@getpaseo/protocol/terminal-subscription-key";
 import { asUint8Array, decodeFileTransferFrame, encodeFileTransferFrame, decodeTerminalStreamFrame, FileTransferOpcode, TerminalStreamOpcode, } from "@getpaseo/protocol/binary-frames/index";
@@ -21,6 +21,26 @@ function normalizePassword(value) {
     }
     return value.length > 0 ? value : null;
 }
+// COMPAT(daemon-client-object-options): added in v0.1.102; remove after
+// 2026-12-29 once SDK callers have migrated to object parameters.
+function normalizeFetchAgentOptions(input, legacyOptions) {
+    if (typeof input !== "string") {
+        return input;
+    }
+    if (typeof legacyOptions === "string") {
+        return { agentId: input, requestId: legacyOptions };
+    }
+    return { agentId: input, ...legacyOptions };
+}
+function normalizeListCommandsOptions(input, legacyOptions) {
+    if (typeof input !== "string") {
+        return input;
+    }
+    if (typeof legacyOptions === "string") {
+        return { agentId: input, requestId: legacyOptions };
+    }
+    return { agentId: input, ...legacyOptions };
+}
 class DaemonRpcError extends Error {
     constructor(params) {
         const parts = [params.error];
@@ -50,14 +70,15 @@ function toTimeoutError(error, label, timeoutMs) {
 }
 const DEFAULT_RECONNECT_BASE_DELAY_MS = 1500;
 const DEFAULT_RECONNECT_MAX_DELAY_MS = 30000;
+const DEFAULT_SESSION_RPC_TIMEOUT_MS = 60000;
 const DEFAULT_CONNECT_TIMEOUT_MS = 15000;
 const DEFAULT_LIVENESS_TIMEOUT_MS = 5000;
 const LIVENESS_HEARTBEAT_INTERVAL_MS = 10000;
 const LIVENESS_HEARTBEAT_TIMEOUT_MS = 15000;
 const LIVENESS_FAILURE_RECONNECT_THRESHOLD = 2;
 /** Default timeout for waiting for connection before sending queued messages */
-const DEFAULT_SEND_QUEUE_TIMEOUT_MS = 10000;
-const DEFAULT_DICTATION_FINISH_ACCEPT_TIMEOUT_MS = 15000;
+const DEFAULT_SEND_QUEUE_TIMEOUT_MS = DEFAULT_SESSION_RPC_TIMEOUT_MS;
+const DEFAULT_DICTATION_FINISH_ACCEPT_TIMEOUT_MS = DEFAULT_SESSION_RPC_TIMEOUT_MS;
 const DEFAULT_DICTATION_FINISH_FALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 const DEFAULT_DICTATION_FINISH_TIMEOUT_GRACE_MS = 5000;
 function isWaiterTimeoutError(error) {
@@ -603,6 +624,7 @@ export class DaemonClient {
         }
     }
     async sendRequest(params) {
+        const timeout = params.timeout ?? DEFAULT_SESSION_RPC_TIMEOUT_MS;
         const { promise, cancel } = this.waitForWithCancel((msg) => {
             if (msg.type === "rpc_error" && msg.payload.requestId === params.requestId) {
                 return {
@@ -620,7 +642,7 @@ export class DaemonClient {
                 return null;
             }
             return { kind: "ok", value };
-        }, params.timeout, params.options);
+        }, timeout, params.options);
         try {
             await this.sendSessionMessageOrThrow(params.message);
         }
@@ -702,7 +724,6 @@ export class DaemonClient {
         await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "clear_agent_attention_response") {
@@ -725,7 +746,6 @@ export class DaemonClient {
         const response = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "workspace.clear_attention.response") {
@@ -891,7 +911,7 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
+            timeout: options?.timeout,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_agents_response") {
@@ -916,7 +936,6 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_agent_history_response") {
@@ -942,7 +961,6 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_recent_provider_sessions_response") {
@@ -968,7 +986,6 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_workspaces_response") {
@@ -989,7 +1006,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "open_project_response",
-            timeout: 10000,
         });
     }
     async addProject(cwd, requestId) {
@@ -1000,7 +1016,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "project.add.response",
-            timeout: 10000,
         });
     }
     async startWorkspaceScript(workspaceId, scriptName, requestId) {
@@ -1012,7 +1027,6 @@ export class DaemonClient {
                 scriptName,
             },
             responseType: "start_workspace_script_response",
-            timeout: 10000,
         });
     }
     async archiveWorkspace(workspaceId, requestId) {
@@ -1023,7 +1037,6 @@ export class DaemonClient {
                 workspaceId,
             },
             responseType: "archive_workspace_response",
-            timeout: 10000,
         });
     }
     async fetchWorkspaceSetupStatus(workspaceId, requestId) {
@@ -1034,20 +1047,20 @@ export class DaemonClient {
                 workspaceId,
             },
             responseType: "workspace_setup_status_response",
-            timeout: 10000,
         });
     }
-    async fetchAgent(agentId, requestId) {
-        const resolvedRequestId = this.createRequestId(requestId);
+    async fetchAgent(input, legacyOptions) {
+        const options = normalizeFetchAgentOptions(input, legacyOptions);
+        const resolvedRequestId = this.createRequestId(options.requestId);
         const message = SessionInboundMessageSchema.parse({
             type: "fetch_agent_request",
             requestId: resolvedRequestId,
-            agentId,
+            agentId: options.agentId,
         });
         const payload = await this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
+            timeout: options.timeout,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_agent_response") {
@@ -1126,7 +1139,6 @@ export class DaemonClient {
         const status = await this.sendRequest({
             requestId,
             message,
-            timeout: 60000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1158,7 +1170,6 @@ export class DaemonClient {
         await this.sendRequest({
             requestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "agent_deleted") {
@@ -1181,7 +1192,6 @@ export class DaemonClient {
         const result = await this.sendRequest({
             requestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "agent_archived") {
@@ -1201,7 +1211,6 @@ export class DaemonClient {
                 type: "agent.detach.request",
                 agentId,
             },
-            timeout: 10000,
         });
         if (!payload.accepted) {
             throw new Error(payload.error ?? "detachAgent rejected");
@@ -1221,7 +1230,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "update_agent_response") {
@@ -1246,7 +1254,6 @@ export class DaemonClient {
                 customName,
             },
             responseType: "project.rename.response",
-            timeout: 10000,
         });
         if (!payload.accepted) {
             throw new Error(payload.error ?? "renameProject rejected");
@@ -1260,7 +1267,6 @@ export class DaemonClient {
                 type: "project.remove.request",
                 projectId,
             },
-            timeout: 10000,
         });
         if (!payload.accepted) {
             throw new Error(payload.error ?? "removeProject rejected");
@@ -1276,7 +1282,6 @@ export class DaemonClient {
                 title,
             },
             responseType: "workspace.title.set.response",
-            timeout: 10000,
         });
         if (!payload.accepted) {
             throw new Error(payload.error ?? "setWorkspaceTitle rejected");
@@ -1294,7 +1299,6 @@ export class DaemonClient {
         const status = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1323,7 +1327,6 @@ export class DaemonClient {
         const status = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1355,7 +1358,6 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1383,7 +1385,7 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 15000,
+            timeout: options.timeout,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "fetch_agent_timeline_response") {
@@ -1400,6 +1402,34 @@ export class DaemonClient {
         }
         return payload;
     }
+    async buildAgentForkContext(agentId, options = {}) {
+        const resolvedRequestId = this.createRequestId(options.requestId);
+        const message = SessionInboundMessageSchema.parse({
+            type: "agent.fork_context.request",
+            agentId,
+            requestId: resolvedRequestId,
+            ...(options.boundaryMessageId ? { boundaryMessageId: options.boundaryMessageId } : {}),
+        });
+        const payload = await this.sendRequest({
+            requestId: resolvedRequestId,
+            message,
+            timeout: 15000,
+            options: { skipQueue: true },
+            select: (msg) => {
+                if (msg.type !== "agent.fork_context.response") {
+                    return null;
+                }
+                if (msg.payload.requestId !== resolvedRequestId) {
+                    return null;
+                }
+                return msg.payload;
+            },
+        });
+        if (payload.error) {
+            throw new Error(payload.error);
+        }
+        return payload;
+    }
     // ============================================================================
     // Agent Interaction
     // ============================================================================
@@ -1418,7 +1448,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "send_agent_message_response") {
@@ -1449,7 +1478,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "agent.rewind.response") {
@@ -1476,7 +1504,6 @@ export class DaemonClient {
         await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "cancel_agent_response") {
@@ -1500,7 +1527,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "set_agent_mode_response") {
@@ -1528,7 +1554,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "set_agent_model_response") {
@@ -1556,7 +1581,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "set_agent_feature_response") {
@@ -1583,7 +1607,6 @@ export class DaemonClient {
         const payload = await this.sendRequest({
             requestId,
             message,
-            timeout: 15000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "set_agent_thinking_response") {
@@ -1610,7 +1633,6 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1627,8 +1649,8 @@ export class DaemonClient {
             },
         });
     }
-    async shutdownServer(requestId) {
-        const resolvedRequestId = this.createRequestId(requestId);
+    async shutdownServer(options) {
+        const resolvedRequestId = this.createRequestId(options?.requestId);
         const message = SessionInboundMessageSchema.parse({
             type: "shutdown_server_request",
             requestId: resolvedRequestId,
@@ -1636,7 +1658,7 @@ export class DaemonClient {
         return this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 10000,
+            timeout: options?.timeout,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "status") {
@@ -1653,6 +1675,29 @@ export class DaemonClient {
             },
         });
     }
+    async updateDaemon(requestId) {
+        const resolvedRequestId = this.createRequestId(requestId);
+        const message = SessionInboundMessageSchema.parse({
+            type: "daemon.update.request",
+            requestId: resolvedRequestId,
+        });
+        return this.sendRequest({
+            requestId: resolvedRequestId,
+            message,
+            timeout: 300000, // 5 minutes — npm update can be slow on remote machines
+            options: { skipQueue: true },
+            select: (msg) => {
+                const parsed = DaemonUpdateResponseSchema.safeParse(msg);
+                if (!parsed.success) {
+                    return null;
+                }
+                if (parsed.data.payload.requestId !== resolvedRequestId) {
+                    return null;
+                }
+                return parsed.data.payload;
+            },
+        });
+    }
     // ============================================================================
     // Audio / Voice
     // ============================================================================
@@ -1667,7 +1712,6 @@ export class DaemonClient {
         const response = await this.sendRequest({
             requestId,
             message,
-            timeout: 10000,
             select: (msg) => {
                 if (msg.type !== "set_voice_mode_response") {
                     return null;
@@ -1874,7 +1918,6 @@ export class DaemonClient {
         const responsePromise = this.sendRequest({
             requestId: resolvedRequestId,
             message,
-            timeout: 60000,
             options: { skipQueue: true },
             select: (msg) => {
                 if (msg.type !== "checkout_status_response") {
@@ -1958,7 +2001,6 @@ export class DaemonClient {
                 requestId: resolvedRequestId,
                 message,
                 responseType: "subscribe_checkout_diff_response",
-                timeout: 60000,
                 options: { skipQueue: true },
                 selectPayload: (payload) => {
                     if (payload.subscriptionId !== subscriptionId) {
@@ -1995,7 +2037,6 @@ export class DaemonClient {
                 addAll: input.addAll,
             },
             responseType: "checkout_commit_response",
-            timeout: 60000,
         });
     }
     async checkoutMerge(cwd, input, requestId) {
@@ -2009,7 +2050,6 @@ export class DaemonClient {
                 requireCleanTarget: input.requireCleanTarget,
             },
             responseType: "checkout_merge_response",
-            timeout: 60000,
         });
     }
     async checkoutMergeFromBase(cwd, input, requestId) {
@@ -2022,7 +2062,6 @@ export class DaemonClient {
                 requireCleanTarget: input.requireCleanTarget,
             },
             responseType: "checkout_merge_from_base_response",
-            timeout: 60000,
         });
     }
     async checkoutPull(cwd, requestId) {
@@ -2033,7 +2072,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "checkout_pull_response",
-            timeout: 60000,
         });
     }
     async checkoutPush(cwd, requestId) {
@@ -2044,7 +2082,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "checkout_push_response",
-            timeout: 60000,
         });
     }
     async checkoutRefresh(cwd, requestId) {
@@ -2055,7 +2092,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "checkout.refresh.response",
-            timeout: 60000,
         });
     }
     async checkoutPrCreate(cwd, input, requestId) {
@@ -2069,7 +2105,6 @@ export class DaemonClient {
                 baseRef: input.baseRef,
             },
             responseType: "checkout_pr_create_response",
-            timeout: 60000,
         });
     }
     async checkoutPrMerge(cwd, input, requestId) {
@@ -2081,7 +2116,6 @@ export class DaemonClient {
                 mergeMethod: input.method,
             },
             responseType: "checkout_pr_merge_response",
-            timeout: 60000,
         });
     }
     async checkoutGithubSetAutoMerge(cwd, input, requestId) {
@@ -2093,7 +2127,6 @@ export class DaemonClient {
                 enabled: input.enabled,
                 ...(input.enabled ? { mergeMethod: input.method } : {}),
             },
-            timeout: 60000,
         });
     }
     async checkoutGithubGetCheckDetails(input, requestId) {
@@ -2107,7 +2140,6 @@ export class DaemonClient {
                 checkRunId: input.checkRunId,
                 workflowRunId: input.workflowRunId,
             },
-            timeout: 60000,
         });
     }
     async checkoutPrStatus(cwd, requestId) {
@@ -2118,7 +2150,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "checkout_pr_status_response",
-            timeout: 60000,
         });
     }
     async pullRequestTimeline(input, requestId) {
@@ -2132,7 +2163,6 @@ export class DaemonClient {
                 repoName: input.repoName,
             },
             responseType: "pull_request_timeline_response",
-            timeout: 60000,
         });
     }
     async checkoutSwitchBranch(cwd, branch, requestId) {
@@ -2144,7 +2174,6 @@ export class DaemonClient {
                 branch,
             },
             responseType: "checkout_switch_branch_response",
-            timeout: 30000,
         });
     }
     async renameBranch(input) {
@@ -2156,7 +2185,6 @@ export class DaemonClient {
                 branch: input.branch,
             },
             responseType: "checkout.rename_branch.response",
-            timeout: 30000,
         });
     }
     async stashSave(cwd, options, requestId) {
@@ -2168,7 +2196,6 @@ export class DaemonClient {
                 branch: options?.branch,
             },
             responseType: "stash_save_response",
-            timeout: 30000,
         });
     }
     async stashPop(cwd, stashIndex, requestId) {
@@ -2180,7 +2207,6 @@ export class DaemonClient {
                 stashIndex,
             },
             responseType: "stash_pop_response",
-            timeout: 30000,
         });
     }
     async stashList(cwd, options, requestId) {
@@ -2192,7 +2218,6 @@ export class DaemonClient {
                 paseoOnly: options?.paseoOnly,
             },
             responseType: "stash_list_response",
-            timeout: 10000,
         });
     }
     async getPaseoWorktreeList(input, requestId) {
@@ -2204,7 +2229,6 @@ export class DaemonClient {
                 repoRoot: input.repoRoot,
             },
             responseType: "paseo_worktree_list_response",
-            timeout: 60000,
         });
     }
     async archivePaseoWorktree(input, requestId) {
@@ -2219,7 +2243,6 @@ export class DaemonClient {
                 ...(input.scope !== undefined ? { scope: input.scope } : {}),
             },
             responseType: "paseo_worktree_archive_response",
-            timeout: 60000,
         });
     }
     async createPaseoWorktree(input, requestId) {
@@ -2238,7 +2261,6 @@ export class DaemonClient {
                 ...(input.githubPrNumber !== undefined ? { githubPrNumber: input.githubPrNumber } : {}),
             },
             responseType: "create_paseo_worktree_response",
-            timeout: 60000,
         });
     }
     async createWorkspace(input, requestId) {
@@ -2253,7 +2275,6 @@ export class DaemonClient {
                     : {}),
             },
             responseType: "workspace.create.response",
-            timeout: 60000,
         });
     }
     async validateBranch(options, requestId) {
@@ -2265,7 +2286,6 @@ export class DaemonClient {
                 branchName: options.branchName,
             },
             responseType: "validate_branch_response",
-            timeout: 10000,
         });
     }
     async getBranchSuggestions(options, requestId) {
@@ -2278,7 +2298,6 @@ export class DaemonClient {
                 limit: options.limit,
             },
             responseType: "branch_suggestions_response",
-            timeout: 10000,
         });
     }
     async searchGitHub(options, requestId) {
@@ -2292,7 +2311,6 @@ export class DaemonClient {
                 kinds: options.kinds,
             },
             responseType: "github_search_response",
-            timeout: 15000,
         });
     }
     async getDirectorySuggestions(options, requestId) {
@@ -2308,7 +2326,8 @@ export class DaemonClient {
                 limit: options.limit,
             },
             responseType: "directory_suggestions_response",
-            timeout: 10000,
+            // Home-tree scans on large home dirs can take several seconds; don't cut
+            // the suggestion request off early (it would surface as an empty list).
         });
     }
     // ============================================================================
@@ -2325,7 +2344,6 @@ export class DaemonClient {
                 ...(acceptBinary ? { acceptBinary: true } : {}),
             },
             responseType: "file_explorer_response",
-            timeout: 10000,
         });
     }
     async listDirectory(cwd, path, requestId) {
@@ -2379,7 +2397,6 @@ export class DaemonClient {
                 requestId: resolvedRequestId,
             },
             responseType: "file.upload.response",
-            timeout: 60000,
             options: { skipQueue: true },
         });
         this.sendBinaryFrame(encodeFileTransferFrame({
@@ -2416,7 +2433,6 @@ export class DaemonClient {
                 path,
             },
             responseType: "file_download_token_response",
-            timeout: 10000,
         });
     }
     async requestProjectIcon(cwd, requestId) {
@@ -2427,7 +2443,6 @@ export class DaemonClient {
                 cwd,
             },
             responseType: "project_icon_response",
-            timeout: 10000,
         });
     }
     // ============================================================================
@@ -2476,7 +2491,6 @@ export class DaemonClient {
                 type: "list_available_providers_request",
             },
             responseType: "list_available_providers_response",
-            timeout: 60000,
         });
     }
     async getProvidersSnapshot(options) {
@@ -2487,7 +2501,6 @@ export class DaemonClient {
                 cwd: options?.cwd,
             },
             responseType: "get_providers_snapshot_response",
-            timeout: 10000,
         });
     }
     async getDaemonConfig(requestId) {
@@ -2497,27 +2510,26 @@ export class DaemonClient {
                 type: "get_daemon_config_request",
             },
             responseType: "get_daemon_config_response",
-            timeout: 10000,
         });
     }
-    async getDaemonStatus(requestId) {
+    async getDaemonStatus(options) {
         return this.sendCorrelatedSessionRequest({
-            requestId,
+            requestId: options?.requestId,
             message: {
                 type: "daemon.get_status.request",
             },
             responseType: "daemon.get_status.response",
-            timeout: 10000,
+            timeout: options?.timeout,
         });
     }
-    async getDaemonPairingOffer(requestId) {
+    async getDaemonPairingOffer(options) {
         return this.sendCorrelatedSessionRequest({
-            requestId,
+            requestId: options?.requestId,
             message: {
                 type: "daemon.get_pairing_offer.request",
             },
             responseType: "daemon.get_pairing_offer.response",
-            timeout: 10000,
+            timeout: options?.timeout,
         });
     }
     async collectDiagnostics(requestId) {
@@ -2526,7 +2538,6 @@ export class DaemonClient {
             message: {
                 type: "diagnostics.request",
             },
-            timeout: 30000,
         });
     }
     async patchDaemonConfig(config, requestId) {
@@ -2537,7 +2548,6 @@ export class DaemonClient {
                 config,
             },
             responseType: "set_daemon_config_response",
-            timeout: 10000,
         });
     }
     async readProjectConfig(repoRoot, requestId) {
@@ -2548,7 +2558,6 @@ export class DaemonClient {
                 repoRoot,
             },
             responseType: "read_project_config_response",
-            timeout: 10000,
         });
     }
     async writeProjectConfig(input) {
@@ -2561,7 +2570,6 @@ export class DaemonClient {
                 expectedRevision: input.expectedRevision,
             },
             responseType: "write_project_config_response",
-            timeout: 10000,
         });
     }
     async refreshProvidersSnapshot(options) {
@@ -2593,21 +2601,18 @@ export class DaemonClient {
             message: {
                 type: "provider.usage.list.request",
             },
-            timeout: 30000,
         });
     }
-    async listCommands(agentId, requestIdOrOptions) {
-        const requestId = typeof requestIdOrOptions === "string" ? requestIdOrOptions : requestIdOrOptions?.requestId;
-        const draftConfig = typeof requestIdOrOptions === "string" ? undefined : requestIdOrOptions?.draftConfig;
+    async listCommands(input, legacyOptions) {
+        const options = normalizeListCommandsOptions(input, legacyOptions);
         return this.sendCorrelatedSessionRequest({
-            requestId,
+            requestId: options.requestId,
             message: {
                 type: "list_commands_request",
-                agentId,
-                ...(draftConfig ? { draftConfig } : {}),
+                agentId: options.agentId,
+                ...(options.draftConfig ? { draftConfig: options.draftConfig } : {}),
             },
             responseType: "list_commands_response",
-            timeout: 30000,
         });
     }
     // ============================================================================
@@ -2651,11 +2656,17 @@ export class DaemonClient {
     // Waiting / Streaming Helpers
     // ============================================================================
     async waitForAgentUpsert(agentId, predicate, timeout = 60000) {
-        const initialResult = await this.fetchAgent(agentId).catch(() => null);
+        const deadline = Date.now() + timeout;
+        const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
+        const timeoutError = () => new Error(`Timed out waiting for agent ${agentId}`);
+        const fetchAgentWithinDeadline = () => this.fetchAgent({ agentId, timeout: remainingTimeoutMs() }).catch(() => null);
+        const initialResult = await fetchAgentWithinDeadline();
         if (initialResult && predicate(initialResult.agent)) {
             return initialResult.agent;
         }
-        const deadline = Date.now() + timeout;
+        if (Date.now() >= deadline) {
+            throw timeoutError();
+        }
         return await new Promise((resolve, reject) => {
             let settled = false;
             let pollInFlight = false;
@@ -2701,7 +2712,7 @@ export class DaemonClient {
                 }
                 pollInFlight = true;
                 try {
-                    const result = await this.fetchAgent(agentId).catch(() => null);
+                    const result = await fetchAgentWithinDeadline();
                     maybeResolve(result?.agent ?? null);
                 }
                 finally {
@@ -2725,7 +2736,7 @@ export class DaemonClient {
             timeoutTimer = setTimeout(() => {
                 finish({
                     kind: "error",
-                    error: new Error(`Timed out waiting for agent ${agentId}`),
+                    error: timeoutError(),
                 });
             }, remaining);
             pollTimer = setInterval(() => {
@@ -2797,7 +2808,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "list_terminals_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
     }
@@ -2817,7 +2827,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "create_terminal_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
     }
@@ -2830,7 +2839,6 @@ export class DaemonClient {
                 title: input.title,
             },
             responseType: "terminal.rename.response",
-            timeout: 10000,
         });
     }
     async subscribeTerminal(terminalId, optionsOrRequestId) {
@@ -2847,7 +2855,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "subscribe_terminal_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
         if (payload.error === null) {
@@ -2885,7 +2892,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "kill_terminal_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
     }
@@ -2901,7 +2907,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "close_items_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
     }
@@ -2919,7 +2924,6 @@ export class DaemonClient {
             requestId: resolvedRequestId,
             message,
             responseType: "capture_terminal_response",
-            timeout: 10000,
             options: { skipQueue: true },
         });
     }
@@ -2932,7 +2936,6 @@ export class DaemonClient {
                 ...(options.purpose ? { purpose: options.purpose } : {}),
             },
             responseType: "chat/create/response",
-            timeout: 10000,
         });
     }
     async listChatRooms(requestId) {
@@ -2942,7 +2945,6 @@ export class DaemonClient {
                 type: "chat/list",
             },
             responseType: "chat/list/response",
-            timeout: 10000,
         });
     }
     async inspectChatRoom(options) {
@@ -2953,7 +2955,6 @@ export class DaemonClient {
                 room: options.room,
             },
             responseType: "chat/inspect/response",
-            timeout: 10000,
         });
     }
     async deleteChatRoom(options) {
@@ -2964,7 +2965,6 @@ export class DaemonClient {
                 room: options.room,
             },
             responseType: "chat/delete/response",
-            timeout: 10000,
         });
     }
     async postChatMessage(options) {
@@ -2978,7 +2978,6 @@ export class DaemonClient {
                 ...(options.replyToMessageId ? { replyToMessageId: options.replyToMessageId } : {}),
             },
             responseType: "chat/post/response",
-            timeout: 10000,
         });
     }
     async readChatMessages(options) {
@@ -2992,7 +2991,7 @@ export class DaemonClient {
                 ...(options.authorAgentId ? { authorAgentId: options.authorAgentId } : {}),
             },
             responseType: "chat/read/response",
-            timeout: 10000,
+            timeout: options.timeout,
         });
     }
     async waitForChatMessages(options) {
@@ -3022,7 +3021,6 @@ export class DaemonClient {
                 ...(typeof options.runOnCreate === "boolean" ? { runOnCreate: options.runOnCreate } : {}),
             },
             responseType: "schedule/create/response",
-            timeout: 10000,
         });
     }
     async scheduleList(requestId) {
@@ -3032,7 +3030,6 @@ export class DaemonClient {
                 type: "schedule/list",
             },
             responseType: "schedule/list/response",
-            timeout: 10000,
         });
     }
     async scheduleInspect(options) {
@@ -3043,7 +3040,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/inspect/response",
-            timeout: 10000,
         });
     }
     async scheduleLogs(options) {
@@ -3054,7 +3050,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/logs/response",
-            timeout: 10000,
         });
     }
     async schedulePause(options) {
@@ -3065,7 +3060,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/pause/response",
-            timeout: 10000,
         });
     }
     async scheduleResume(options) {
@@ -3076,7 +3070,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/resume/response",
-            timeout: 10000,
         });
     }
     async scheduleDelete(options) {
@@ -3087,7 +3080,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/delete/response",
-            timeout: 10000,
         });
     }
     async scheduleRunOnce(options) {
@@ -3098,7 +3090,6 @@ export class DaemonClient {
                 scheduleId: options.id,
             },
             responseType: "schedule/run-once/response",
-            timeout: 10000,
         });
     }
     async scheduleUpdate(options) {
@@ -3115,7 +3106,6 @@ export class DaemonClient {
                 ...(options.expiresAt !== undefined ? { expiresAt: options.expiresAt } : {}),
             },
             responseType: "schedule/update/response",
-            timeout: 10000,
         });
     }
     async loopRun(options) {
@@ -3143,7 +3133,6 @@ export class DaemonClient {
                 ...(typeof options.maxTimeMs === "number" ? { maxTimeMs: options.maxTimeMs } : {}),
             },
             responseType: "loop/run/response",
-            timeout: 15000,
         });
     }
     async loopList(requestId) {
@@ -3153,7 +3142,6 @@ export class DaemonClient {
                 type: "loop/list",
             },
             responseType: "loop/list/response",
-            timeout: 10000,
         });
     }
     async loopInspect(options) {
@@ -3165,7 +3153,6 @@ export class DaemonClient {
                 id: normalized.id,
             },
             responseType: "loop/inspect/response",
-            timeout: 10000,
         });
     }
     async loopLogs(options, afterSeq) {
@@ -3178,7 +3165,6 @@ export class DaemonClient {
                 ...(typeof normalized.afterSeq === "number" ? { afterSeq: normalized.afterSeq } : {}),
             },
             responseType: "loop/logs/response",
-            timeout: 10000,
         });
     }
     async loopStop(options) {
@@ -3190,7 +3176,6 @@ export class DaemonClient {
                 id: normalized.id,
             },
             responseType: "loop/stop/response",
-            timeout: 10000,
         });
     }
     onTerminalStreamEvent(handler) {

package/dist/index.js

@@ -117,7 +117,7 @@ function createAgentHandleFactory(daemonClient) {
             },
             latest: () => latest,
             refetch: async (requestId) => {
-                const result = await daemonClient.fetchAgent(id, requestId);
+                const result = await daemonClient.fetchAgent({ agentId: id, requestId });
                 latest = result?.agent ?? null;
                 return result;
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -35,8 +35,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.1.101",
-    "@getpaseo/relay": "0.1.101",
+    "@getpaseo/protocol": "0.1.102",
+    "@getpaseo/relay": "0.1.102",
     "zod": "^4.4.3"
   },
   "devDependencies": {