@camerontaylor/paseo-client 0.8.0-fork.1 → 0.9.0-beta.2.fork.1

package/dist/creation/index.js

@@ -14,6 +14,8 @@ export class CreationClient {
             if (request.workspaceId || request.agent?.agentId)
                 throw new Error("Update the host to use caller-selected creation IDs.");
             const { agent, ...workspaceInput } = request;
+            const sourceCwd = request.source.kind === "directory" ? request.source.path : request.source.cwd;
+            const relativeCwd = agent && sourceCwd ? relativeDirectory(agent.config.cwd, sourceCwd) : undefined;
             const workspace = await this.deps.legacyWorkspace(workspaceInput);
             if (workspace.error || !workspace.workspace)
                 return workspace;
@@ -30,10 +32,7 @@ export class CreationClient {
             });
             if (!agent)
                 return workspace;
-            const sourceCwd = request.source.kind === "directory" ? request.source.path : request.source.cwd;
-            const cwd = sourceCwd
-                ? remapDirectory(agent.config.cwd, sourceCwd, workspace.workspace.workspaceDirectory)
-                : workspace.workspace.workspaceDirectory;
+            const cwd = `${workspace.workspace.workspaceDirectory.replace(/[\\/]+$/, "")}${relativeCwd ?? relativeDirectory(agent.config.cwd, workspace.workspace.projectRootPath)}`;
             const created = await this.legacyAgent({
                 ...agent,
                 config: { ...agent.config, cwd },
@@ -46,23 +45,13 @@ export class CreationClient {
     async legacyAgent(input) {
         if (input.agentId)
             throw new Error("Update the host to use caller-selected creation IDs.");
+        const { idempotencyKey: _key, ...unkeyed } = input;
+        const hasPrompt = Boolean(input.initialPrompt || input.images?.length || input.attachments?.length);
         // COMPAT(creationLifecycle): added in v0.8.0, remove after 2027-03-11 once the daemon floor supports creationLifecycle.
-        // Old keyed creates reject initialPrompt. Keep this adaptation private to the SDK.
-        if (input.idempotencyKey) {
-            const { initialPrompt = "", images, attachments, ...creation } = input;
-            const hasPrompt = Boolean(initialPrompt.trim() || images?.length || attachments?.length);
-            if (hasPrompt && input.outputSchema)
-                throw new Error("Update the host to create a keyed agent with structured initial output.");
-            const agent = await this.deps.legacyAgent(creation);
-            if (hasPrompt)
-                await this.deps.sendMessage(agent.id, initialPrompt, {
-                    messageId: input.clientMessageId ?? `${input.idempotencyKey}:initial-message`,
-                    images,
-                    attachments,
-                });
-            return { agent, error: null };
-        }
-        return { agent: await this.deps.legacyAgent(input), error: null };
+        // Preserve the original create-and-prompt RPC: old hosts use its prompt for
+        // titles, creation context and startup. Their keyed create cannot accept it.
+        const request = !hasPrompt && this.deps.supports("agentRequestReceipts") ? input : unkeyed;
+        return { agent: await this.deps.legacyAgent(request), error: null };
     }
     start(kind, input, observer, legacy) {
         const key = typeof input.idempotencyKey === "string" ? input.idempotencyKey : this.deps.requestId();
@@ -98,7 +87,7 @@ export class CreationClient {
             resolve,
             reject,
             settled: false,
-            modern: this.deps.supports(),
+            modern: this.deps.supports("creationLifecycle"),
             recovering: false,
         };
         this.operations.set(identity, operation);
@@ -119,38 +108,22 @@ export class CreationClient {
             this.finish(operation, result);
         }
         catch (error) {
-            if (operation.settled || !this.deps.connected())
+            if (operation.settled ||
+                (error instanceof Error && "code" in error && error.code === "DAEMON_CONNECTION_LOST"))
                 return;
             this.fail(operation, error);
         }
     }
     receive(snapshot) {
         const operation = this.operations.get(JSON.stringify([snapshot.kind, snapshot.idempotencyKey]));
-        if (!operation || (operation.snapshot && operation.snapshot.revision >= snapshot.revision))
-            return;
-        operation.snapshot = snapshot;
-        for (const observer of operation.observers)
-            this.notify(observer, snapshot);
-        if (operation.recovering && (snapshot.phase === "completed" || snapshot.phase === "failed")) {
-            this.finish(operation, {
-                agent: snapshot.agent,
-                workspace: snapshot.workspace,
-                creation: snapshot,
-                setupSkippedReason: snapshot.setupSkippedReason,
-                error: snapshot.error,
-                errorCode: snapshot.errorCode,
-            });
-        }
-    }
-    async recover(operation) {
-        operation.recovering = true;
-        const snapshot = await this.deps.subscribe(operation.kind, operation.key);
-        if (!snapshot) {
-            await this.submit(operation);
+        if (!operation || (operation.snapshot && operation.snapshot.revision > snapshot.revision))
             return;
+        if (operation.snapshot?.revision !== snapshot.revision) {
+            operation.snapshot = snapshot;
+            for (const observer of operation.observers)
+                this.notify(observer, snapshot);
         }
-        this.receive(snapshot);
-        if (snapshot.phase === "completed" || snapshot.phase === "failed") {
+        if (operation.recovering && (snapshot.phase === "completed" || snapshot.phase === "failed")) {
             this.finish(operation, {
                 agent: snapshot.agent,
                 workspace: snapshot.workspace,
@@ -163,12 +136,17 @@ export class CreationClient {
     }
     reconnect() {
         for (const operation of this.operations.values()) {
-            if (operation.settled || !operation.modern)
+            if (operation.settled || !operation.modern || operation.recovering)
                 continue;
-            void this.recover(operation).catch((error) => {
-                if (this.deps.connected())
-                    this.fail(operation, error);
-            });
+            operation.recovering = true;
+            operation.stopObserving = this.deps.observe(operation.kind, operation.key, (snapshot) => {
+                if (!snapshot)
+                    void this.submit(operation);
+                else {
+                    // Re-subscription is authoritative even if its revision matches the last live event.
+                    this.receive(snapshot);
+                }
+            }, (error) => this.fail(operation, error));
         }
     }
     close() {
@@ -181,8 +159,7 @@ export class CreationClient {
         if (operation.settled)
             return;
         operation.settled = true;
-        if (operation.recovering)
-            void this.deps.subscribe(operation.kind, operation.key, false).catch(() => undefined);
+        operation.stopObserving?.();
         operation.resolve(result);
         operation.observers.clear();
         this.operations.delete(JSON.stringify([operation.kind, operation.key]));
@@ -191,6 +168,7 @@ export class CreationClient {
         if (operation.settled)
             return;
         operation.settled = true;
+        operation.stopObserving?.();
         operation.reject(error instanceof Error ? error : new Error(String(error)));
         operation.observers.clear();
         this.operations.delete(JSON.stringify([operation.kind, operation.key]));
@@ -204,13 +182,16 @@ export class CreationClient {
         }
     }
 }
-function remapDirectory(cwd, source, target) {
-    const normalize = (value) => value.replace(/\\/g, "/").replace(/\/$/, "");
+function relativeDirectory(cwd, source) {
+    const normalize = (value) => value.replace(/\\/g, "/").replace(/\/+$/, "");
     const normalized = normalize(cwd), root = normalize(source);
+    // Parent traversal must never survive mapping into the newly created checkout.
+    if ([normalized, root].some((path) => path.split("/").includes("..")))
+        throw new Error("Agent directory must be inside the workspace source");
     if (normalized === root)
-        return target;
+        return "";
     if (!normalized.startsWith(`${root}/`))
         throw new Error("Agent directory must be inside the workspace source");
-    return `${normalize(target)}${normalized.slice(root.length)}`;
+    return normalized.slice(root.length);
 }
 //# sourceMappingURL=index.js.map

package/dist/daemon-client.d.ts

@@ -1,10 +1,12 @@
-import { type TimelineSubscription } from "./connection/index.js";
+import { type TimelineMessage } from "./timeline-subscription/index.js";
+import { type OwnedSubscription, type TimelineSubscription } from "./connection/index.js";
 import type { CreationSnapshot } from "@camerontaylor/paseo-protocol/messages";
 import type { z } from "zod";
-import { type ClientCapability } from "@camerontaylor/paseo-protocol/client-capabilities";
+import type { SessionEventSubscription } from "@camerontaylor/paseo-protocol/messages";
+import type { ClientCapability } from "@camerontaylor/paseo-protocol/client-capabilities";
 import type { AgentAttentionNotificationPayload } from "@camerontaylor/paseo-protocol/agent-attention-notification";
 import { AgentRefreshedStatusPayloadSchema, CheckoutRenameBranchResponseSchema, RenameTerminalResponseSchema, RestartRequestedStatusPayloadSchema, ShutdownRequestedStatusPayloadSchema, DaemonUpdateResponseSchema, type ActiveTurnBehavior, type ServerInfoStatusPayload } from "@camerontaylor/paseo-protocol/messages";
-import type { AgentStreamEventPayload, AgentSnapshotPayload, ProjectPlacementPayload, AgentPermissionResolvedMessage, CreateAgentRequestMessage, CreatePaseoWorktreeRequest, FileDownloadTokenResponse, FileUploadResponse, FileExplorerResponse, FileVersion, FileWriteResult, FetchAgentTimelineResponseMessage, AgentForkContextResponseMessage, GitSetupOptions, CheckoutStatusResponse, CheckoutCommit, ParsedDiffFile, CheckoutCommitResponse, CheckoutMergeResponse, CheckoutMergeFromBaseResponse, CheckoutPullResponse, CheckoutPushResponse, CheckoutRefreshResponse, CheckoutPrCreateResponse, CheckoutPrMergeResponse, CheckoutPrMergeMethod, CheckoutForgeSetAutoMergeResponse, CheckoutGithubSetAutoMergeResponse, CheckoutForgeGetCheckDetailsResponse, CheckoutGithubGetCheckDetailsResponse, CheckoutPrStatusResponse, PullRequestTimelineResponse, CheckoutSwitchBranchResponse, StashSaveResponse, StashPopResponse, StashListResponse, ValidateBranchResponse, BranchSuggestionsResponse, ForgeSearchResponse, ForgeSearchRequest, GitHubSearchResponse, GitHubSearchRequest, DirectorySuggestionsResponse, PaseoWorktreeListResponse, PaseoWorktreeArchiveResponse, ProjectIconSource, ProjectIconResponse, ProjectIconGetResponse, ProjectAddResponse, ProjectCreateDirectoryResponse, OpenProjectResponseMessage, WorkspaceGithubSearchRepositoriesResponse, ProjectGithubCloneProtocol, ProjectGithubCloneResponse, ArchiveWorkspaceResponseMessage, WorkspaceSetupStatusResponseMessage, ListCommandsResponse, ListProviderFeaturesResponseMessage, ListProviderModelsResponseMessage, ListProviderModesResponseMessage, ListAvailableProvidersResponse, GetProvidersSnapshotResponseMessage, RefreshProvidersSnapshotResponseMessage, ProviderDiagnosticResponseMessage, ProviderUsageListResponseMessage, DaemonGetStatusResponse, DaemonGetPairingOfferResponse, DaemonConfigReloadResponse, DiagnosticsResponse, AgentRewindResponseMessage, ListTerminalsResponse, CreateTerminalResponse, SubscribeTerminalResponse, SubscribeTerminalRequest, CloseItemsResponse, KillTerminalResponse, CaptureTerminalResponse, TerminalInput, SessionInboundMessage, SessionOutboundMessage, SendAgentMessageRequest, PaseoConfigRaw, PaseoConfigRevision, WorkspaceCreateRequest, WorkspaceRecoveryState, PluginListItem, PluginLogEntry, PluginSourceStatusItem, PluginSourceUpdateItem, AgentSkillSelection, AgentSkillsStatus, AgentSkillsSaveResult } from "@camerontaylor/paseo-protocol/messages";
+import type { AgentStreamEventPayload, AgentSnapshotPayload, ProjectPlacementPayload, AgentPermissionResolvedMessage, CreateAgentRequestMessage, CreatePaseoWorktreeRequest, FileDownloadTokenResponse, FileUploadResponse, FileExplorerResponse, FileVersion, FileWriteResult, FetchAgentTimelineResponseMessage, AgentForkContextResponseMessage, GitSetupOptions, CheckoutStatusResponse, CheckoutCommit, ParsedDiffFile, CheckoutCommitResponse, CheckoutMergeResponse, CheckoutMergeFromBaseResponse, CheckoutPullResponse, CheckoutPushResponse, CheckoutRefreshResponse, CheckoutPrCreateResponse, CheckoutPrMergeResponse, CheckoutPrMergeMethod, CheckoutForgeSetAutoMergeResponse, CheckoutGithubSetAutoMergeResponse, CheckoutForgeGetCheckDetailsResponse, CheckoutGithubGetCheckDetailsResponse, CheckoutPrStatusResponse, PullRequestTimelineResponse, CheckoutSwitchBranchResponse, StashSaveResponse, StashPopResponse, StashListResponse, ValidateBranchResponse, BranchSuggestionsResponse, ForgeSearchResponse, ForgeSearchRequest, GitHubSearchResponse, GitHubSearchRequest, DirectorySuggestionsResponse, PaseoWorktreeListResponse, PaseoWorktreeArchiveResponse, ProjectIconSource, ProjectIconResponse, ProjectIconGetResponse, ProjectAddResponse, ProjectCreateDirectoryResponse, OpenProjectResponseMessage, WorkspaceGithubSearchRepositoriesResponse, ProjectGithubCloneProtocol, ProjectGithubCloneResponse, ArchiveWorkspaceResponseMessage, WorkspaceSetupStatusResponseMessage, ListCommandsResponse, ListProviderFeaturesResponseMessage, ListProviderModelsResponseMessage, ListProviderModesResponseMessage, ListAvailableProvidersResponse, GetProvidersSnapshotResponseMessage, RefreshProvidersSnapshotResponseMessage, ProviderDiagnosticResponseMessage, ProviderUsageListResponseMessage, DaemonGetStatusResponse, DaemonGetPairingOfferResponse, DaemonConfigReloadResponse, DiagnosticsResponse, AgentRewindResponseMessage, ListTerminalsResponse, CreateTerminalResponse, SubscribeTerminalResponse, SubscribeTerminalRequest, CloseItemsResponse, KillTerminalResponse, CaptureTerminalResponse, TerminalInput, SessionInboundMessage, SessionOutboundMessage, SendAgentMessageRequest, PaseoConfigRaw, PaseoConfigRevision, WorkspaceCreateRequest, WorkspaceRecoveryState, PluginListItem, PluginLogEntry, PluginSourceStatusItem, PluginSourceUpdateItem, PluginUpdateSelection, PluginUpdateProposal, PluginUpdatePreview, PluginUpdateResult, AgentSkillSelection, AgentSkillsStatus, AgentSkillsSaveResult } from "@camerontaylor/paseo-protocol/messages";
 import type { AgentPermissionRequest, AgentPermissionResponse, AgentPersistenceHandle, AgentProviderNotice, AgentProvider, AgentSessionConfig } from "@camerontaylor/paseo-protocol/agent-types";
 import type { AgentConfigApply, MutableDaemonConfig, MutableDaemonConfigPatch } from "@camerontaylor/paseo-protocol/messages";
 import { type DaemonTransportFactory, type WebSocketFactory } from "./daemon-client-transport.js";
@@ -336,6 +338,14 @@ export interface FetchAgentTimelineOptions {
     requestId?: string;
     timeout?: number;
 }
+export interface AgentTimelineSearchOptions {
+    agentId: string;
+    query: string;
+    cursor?: number;
+}
+export type AgentTimelineSearchPayload = Extract<SessionOutboundMessage, {
+    type: "agent.timeline.search.response";
+}>["payload"];
 export type AgentTimelinePromptIndexPayload = Extract<SessionOutboundMessage, {
     type: "agent.timeline.list_prompts.response";
 }>["payload"];
@@ -389,6 +399,7 @@ type FetchAgentsRequest = Extract<SessionInboundMessage, {
     type: "fetch_agents_request";
 }>;
 export type FetchAgentsOptions = Omit<FetchAgentsRequest, "type" | "requestId"> & {
+    signal?: AbortSignal;
     requestId?: string;
     timeout?: number;
 };
@@ -422,6 +433,7 @@ type FetchWorkspacesRequest = Extract<SessionInboundMessage, {
     type: "fetch_workspaces_request";
 }>;
 export type FetchWorkspacesOptions = Omit<FetchWorkspacesRequest, "type" | "requestId"> & {
+    signal?: AbortSignal;
     requestId?: string;
 };
 export type FetchWorkspacesEntry = FetchWorkspacesPayload["entries"][number];
@@ -549,15 +561,22 @@ type CorrelatedResponseMessage = Extract<SessionOutboundMessage, {
     payload: {
         requestId: string;
     };
+}> | Extract<SessionOutboundMessage, {
+    type: "terminals_changed";
 }> | GetDaemonConfigResponse | SetDaemonConfigResponse;
 type CorrelatedResponseType = CorrelatedResponseMessage["type"];
-type CorrelatedResponsePayload<TType extends CorrelatedResponseType> = Extract<CorrelatedResponseMessage, {
-    type: TType;
-}>["payload"];
+type CorrelatedResponsePayloads = {
+    [Message in CorrelatedResponseMessage as Message["type"]]: Message["payload"];
+};
+type CorrelatedResponsePayload<TType extends CorrelatedResponseType> = CorrelatedResponsePayloads[TType];
+export declare class DaemonConnectionError extends Error {
+    readonly code: "DAEMON_CONNECTION_LOST" | "DAEMON_REQUEST_TIMEOUT";
+    constructor(message: string, code?: "DAEMON_CONNECTION_LOST" | "DAEMON_REQUEST_TIMEOUT");
+}
 export declare class DaemonClient {
     private config;
     private readonly providerSnapshotUpdates;
-    private readonly subscriptions;
+    private readonly owned;
     private transport;
     private transportCleanup;
     private rawMessageListeners;
@@ -576,9 +595,6 @@ export declare class DaemonClient {
     private connectReject;
     private lastErrorValue;
     private connectionState;
-    private checkoutDiffSubscriptions;
-    private terminalDirectorySubscriptions;
-    private fileSubscriptions;
     private readonly terminalStreams;
     private pendingBinaryFileReads;
     private activeBinaryFileTransfers;
@@ -593,6 +609,7 @@ export declare class DaemonClient {
     private runtimeMetricsInterval;
     private runtimeMetrics;
     private pingProbe;
+    private connectionVerification;
     private livenessHeartbeatTimer;
     private lastLivenessRttMs;
     private consecutiveLivenessFailures;
@@ -602,7 +619,10 @@ export declare class DaemonClient {
     private resolveConnect;
     private rejectConnect;
     close(): Promise<void>;
-    ensureConnected(): void;
+    ensureConnected(options?: {
+        verify?: boolean;
+    }): void;
+    private verifyConnection;
     getConnectionState(): ConnectionState;
     subscribeConnectionStatus(listener: (status: ConnectionState) => void): () => void;
     get isConnected(): boolean;
@@ -679,18 +699,42 @@ export declare class DaemonClient {
     private startLivenessHeartbeat;
     private stopLivenessHeartbeat;
     private scheduleNextLivenessHeartbeat;
+    private observe;
+    registerBrowserHost(registration: Omit<Extract<SessionInboundMessage, {
+        type: "browser.host.register.request";
+    }>, "type" | "requestId">, options?: {
+        signal?: AbortSignal;
+    }): OwnedSubscription<CorrelatedResponsePayload<"browser.host.register.response">>;
+    observeEvents(events: SessionEventSubscription[], options?: {
+        signal?: AbortSignal;
+        notifications?: boolean;
+    }): OwnedSubscription<CorrelatedResponsePayload<"session.events.set_subscription.response">>;
+    observeAgents(options?: Omit<FetchAgentsOptions, "subscribe">): OwnedSubscription<FetchAgentsPayload>;
+    observeWorkspaces(options?: Omit<FetchWorkspacesOptions, "subscribe">): OwnedSubscription<FetchWorkspacesPayload>;
+    fetchAgents(options: FetchAgentsOptions & {
+        subscribe: {};
+    }): Promise<FetchAgentsPayload & {
+        subscription: OwnedSubscription<FetchAgentsPayload>;
+    }>;
     fetchAgents(options?: FetchAgentsOptions): Promise<FetchAgentsPayload>;
     fetchAgentHistory(options?: FetchAgentHistoryOptions): Promise<FetchAgentHistoryPayload>;
     fetchRecentProviderSessions(options?: FetchRecentProviderSessionsOptions): Promise<FetchRecentProviderSessionsPayload>;
+    fetchWorkspaces(options: FetchWorkspacesOptions & {
+        subscribe: {};
+    }): Promise<FetchWorkspacesPayload & {
+        subscription: OwnedSubscription<FetchWorkspacesPayload>;
+    }>;
     fetchWorkspaces(options?: FetchWorkspacesOptions): Promise<FetchWorkspacesPayload>;
-    listWorkspaceLabels(options: {
-        subscriptionId: string;
+    listWorkspaceLabels(options?: {
         sync?: {
             generation: string;
             afterSeq: number;
         };
         requestId?: string;
     }): Promise<WorkspaceLabelListPayload>;
+    observeWorkspaceLabels(options?: {
+        signal?: AbortSignal;
+    }): OwnedSubscription<WorkspaceLabelListPayload>;
     setWorkspaceLabel(options: {
         workspaceId: string;
         label: Extract<SessionInboundMessage, {
@@ -751,13 +795,9 @@ export declare class DaemonClient {
     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;
-    private resubscribeFileSubscriptions;
     private readonly creations;
     createAgent(options: CreateAgentRequestOptions): Promise<AgentSnapshotPayload>;
     private createLegacyAgent;
-    private requireAgentRequestReceipts;
     deleteAgent(agentId: string): Promise<void>;
     archiveAgent(agentId: string): Promise<{
         archivedAt: string;
@@ -790,6 +830,7 @@ export declare class DaemonClient {
         seq: number;
         epoch: string;
     }>;
+    searchAgentTimeline({ agentId, query, cursor, }: AgentTimelineSearchOptions): Promise<AgentTimelineSearchPayload>;
     listAgentTimelinePrompts(agentId: string, options?: {
         requestId?: string;
         timeout?: number;
@@ -799,6 +840,9 @@ export declare class DaemonClient {
         timeout?: number;
     }): Promise<ProviderSubagentListPayload>;
     fetchProviderSubagentTimeline(parentAgentId: string, subagentId: string, options?: FetchProviderSubagentTimelineOptions): Promise<ProviderSubagentTimelinePayload>;
+    observeTimeline(agentIds: string[], options?: {
+        signal?: AbortSignal;
+    }): OwnedSubscription<CorrelatedResponsePayload<"agent.timeline.set_subscription.response">>;
     askSideConversation(parentAgentId: string, threadId: string, question: string, options?: {
         requestId?: string;
         timeout?: number;
@@ -811,13 +855,7 @@ export declare class DaemonClient {
         requestId?: string;
         timeout?: number;
     }): Promise<SideConversationListPayload>;
-    setAgentTimelineSubscription(agentIds: string[]): Promise<void>;
-    subscribeAgentTimeline(agentId: string, handler: (message: Extract<SessionOutboundMessage, {
-        type: "agent_stream" | "agent.timeline.replacement";
-    }>) => void): TimelineSubscription;
-    private updateEventSubscriptions;
-    private sendEventSubscription;
-    private sendTimelineSubscription;
+    subscribeAgentTimeline(agentId: string, handler: (message: TimelineMessage) => void): TimelineSubscription;
     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>;
@@ -835,7 +873,9 @@ export declare class DaemonClient {
      * Gated on `server_info.features.agentConfigApply`.
      */
     applyAgentConfig(agentId: string, config: AgentConfigApply): Promise<AgentProviderNotice | null>;
-    restartServer(reason?: string, requestId?: string): Promise<RestartRequestedStatusPayload>;
+    restartServer(reason?: string, requestId?: string, options?: {
+        timeout?: number;
+    }): Promise<RestartRequestedStatusPayload>;
     shutdownServer(options?: ShutdownServerOptions): Promise<ShutdownRequestedStatusPayload>;
     updateDaemon(requestId?: string): Promise<DaemonUpdateResponse["payload"]>;
     setVoiceMode(enabled: boolean, agentId?: string): Promise<SetVoiceModePayload>;
@@ -858,15 +898,14 @@ export declare class DaemonClient {
         baseRef?: string;
         ignoreWhitespace?: boolean;
     }, requestId?: string): Promise<CheckoutDiffPayload>;
-    subscribeCheckoutDiff(cwd: string, compare: {
+    observeCheckoutDiff(cwd: string, compare: {
         mode: "uncommitted" | "base";
         baseRef?: string;
         ignoreWhitespace?: boolean;
     }, options?: {
-        subscriptionId?: string;
         requestId?: string;
-    }): Promise<SubscribeCheckoutDiffPayload>;
-    unsubscribeCheckoutDiff(subscriptionId: string): void;
+        signal?: AbortSignal;
+    }): OwnedSubscription<SubscribeCheckoutDiffPayload>;
     checkoutCommit(cwd: string, input: {
         message?: string;
         addAll?: boolean;
@@ -987,12 +1026,19 @@ export declare class DaemonClient {
     private requestFileExplorer;
     listDirectory(cwd: string, path: string, requestId?: string): Promise<FileExplorerDirectoryPayload>;
     readFile(cwd: string, path: string, requestId?: string, maxBytes?: number): Promise<FileReadResult>;
+    observeFile(input: {
+        cwd: string;
+        path: string;
+        signal?: AbortSignal;
+    }): OwnedSubscription<CorrelatedResponsePayload<"fs.file.subscribe.response">>;
     subscribeFile(input: {
         cwd: string;
         path: string;
+        signal?: AbortSignal;
     }, onUpdate: (version: FileVersion) => void): Promise<{
         initial: FileVersion;
-        unsubscribe: () => void;
+        subscription: OwnedSubscription<CorrelatedResponsePayload<"fs.file.subscribe.response">>;
+        unsubscribe: () => Promise<void>;
     }>;
     writeFile(input: {
         cwd: string;
@@ -1056,7 +1102,7 @@ export declare class DaemonClient {
     connectHub(hubUrl: string, token: string, permissions?: readonly string[], requestId?: string): Promise<{
         requestId: string;
         status: {
-            state: "connecting" | "connected" | "not_connected" | "reconnecting" | "disconnecting" | "revoked";
+            state: "not_connected" | "connecting" | "connected" | "reconnecting" | "disconnecting" | "revoked";
             daemonId: string | null;
             hubOrigin: string | null;
             permissions: ("daemon.read" | "daemon.manage" | "tunnel.manage" | "access.manage" | "workspace.read" | "workspace.write" | "workspace.manage" | "automation.manage" | "hub.execute")[];
@@ -1070,7 +1116,7 @@ export declare class DaemonClient {
     }, requestId?: string): Promise<{
         requestId: string;
         status: {
-            state: "connecting" | "connected" | "not_connected" | "reconnecting" | "disconnecting" | "revoked";
+            state: "not_connected" | "connecting" | "connected" | "reconnecting" | "disconnecting" | "revoked";
             daemonId: string | null;
             hubOrigin: string | null;
             permissions: ("daemon.read" | "daemon.manage" | "tunnel.manage" | "access.manage" | "workspace.read" | "workspace.write" | "workspace.manage" | "automation.manage" | "hub.execute")[];
@@ -1081,7 +1127,7 @@ export declare class DaemonClient {
     getHubStatus(requestId?: string): Promise<{
         requestId: string;
         status: {
-            state: "connecting" | "connected" | "not_connected" | "reconnecting" | "disconnecting" | "revoked";
+            state: "not_connected" | "connecting" | "connected" | "reconnecting" | "disconnecting" | "revoked";
             daemonId: string | null;
             hubOrigin: string | null;
             permissions: ("daemon.read" | "daemon.manage" | "tunnel.manage" | "access.manage" | "workspace.read" | "workspace.write" | "workspace.manage" | "automation.manage" | "hub.execute")[];
@@ -1092,7 +1138,7 @@ export declare class DaemonClient {
     disconnectHub(force?: boolean, requestId?: string): Promise<{
         requestId: string;
         status: {
-            state: "connecting" | "connected" | "not_connected" | "reconnecting" | "disconnecting" | "revoked";
+            state: "not_connected" | "connecting" | "connected" | "reconnecting" | "disconnecting" | "revoked";
             daemonId: string | null;
             hubOrigin: string | null;
             permissions: ("daemon.read" | "daemon.manage" | "tunnel.manage" | "access.manage" | "workspace.read" | "workspace.write" | "workspace.manage" | "automation.manage" | "hub.execute")[];
@@ -1149,6 +1195,12 @@ export declare class DaemonClient {
         ref?: string;
     }): Promise<PluginListItem>;
     getPluginSourceStatus(pluginId?: string): Promise<PluginSourceStatusItem[]>;
+    private requirePluginUpdates;
+    previewPluginUpdates(input?: {
+        pluginId?: string;
+        target?: PluginUpdateSelection;
+    }): Promise<PluginUpdatePreview[]>;
+    applyPluginUpdates(proposals: PluginUpdateProposal[]): Promise<PluginUpdateResult[]>;
     updatePluginSources(pluginId?: string): Promise<PluginSourceUpdateItem[]>;
     inspectDirectoryPlugin(path: string): Promise<{
         id: string;
@@ -1162,14 +1214,11 @@ export declare class DaemonClient {
     respondToPermissionAndWait(agentId: string, requestId: string, response: AgentPermissionResponse, timeout?: number): Promise<AgentPermissionResolvedPayload>;
     waitForAgentUpsert(agentId: string, predicate: (snapshot: AgentSnapshotPayload) => boolean, timeout?: number): Promise<AgentSnapshotPayload>;
     waitForFinish(agentId: string, timeout?: number): Promise<WaitForFinishResult>;
-    subscribeTerminals(input: {
+    observeTerminals(input: {
         cwd: string;
         workspaceId?: string;
-    }): void;
-    unsubscribeTerminals(input: {
-        cwd: string;
-        workspaceId?: string;
-    }): void;
+        signal?: AbortSignal;
+    }): OwnedSubscription<CorrelatedResponsePayload<"terminals_changed">>;
     listTerminals(cwd?: string, requestId?: string, options?: {
         workspaceId?: string;
     }): Promise<ListTerminalsPayload>;
@@ -1184,11 +1233,23 @@ export declare class DaemonClient {
         };
     }): Promise<CreateTerminalPayload>;
     renameTerminal(input: RenameTerminalInput): Promise<RenameTerminalResult>;
-    subscribeTerminal(terminalId: string, optionsOrRequestId?: {
+    /**
+     * Snapshot/restore and output arrive in receive. Subscribe to the returned handle
+     * for terminal_stream_exit: payload.error means observation failure, not PTY exit.
+     * Either outcome detaches this slot and releases the handle automatically.
+     */
+    observeTerminal(terminalId: string, receive: (event: TerminalStreamEvent) => void, options?: {
         restore?: SubscribeTerminalRequest["restore"];
+        signal?: AbortSignal;
         requestId?: string;
-    } | string): Promise<SubscribeTerminalPayload>;
-    unsubscribeTerminal(terminalId: string): void;
+    }): OwnedSubscription<SubscribeTerminalPayload>;
+    subscribeTerminal(terminalId: string, options?: {
+        restore?: SubscribeTerminalRequest["restore"];
+        signal?: AbortSignal;
+        requestId?: string;
+    }): Promise<SubscribeTerminalPayload & {
+        subscription: OwnedSubscription<SubscribeTerminalPayload>;
+    }>;
     sendTerminalInput(terminalId: string, message: TerminalInput["message"]): void;
     killTerminal(terminalId: string, requestId?: string): Promise<KillTerminalPayload>;
     closeItems(input: {