@camerontaylor/paseo-client 0.11.0-beta.1.fork.1 → 0.11.1-fork.1

package/dist/daemon-client.d.ts

@@ -6,7 +6,7 @@ import type { SessionEventSubscription } from "@camerontaylor/paseo-protocol/mes
 import type { ClientCapability } from "@camerontaylor/paseo-protocol/client-capabilities";
 import type { AgentAttentionNotificationPayload } from "@camerontaylor/paseo-protocol/agent-attention-notification";
 import { AgentRefreshedStatusPayloadSchema, CheckoutRenameBranchResponseSchema, CheckoutBaseRefSetResponseSchema, 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, UsageListReportsResponseMessage, 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 { 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, UsageReportEntry, 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";
@@ -266,7 +266,10 @@ type GetProvidersSnapshotPayload = GetProvidersSnapshotResponseMessage["payload"
 type RefreshProvidersSnapshotPayload = RefreshProvidersSnapshotResponseMessage["payload"];
 type ProviderDiagnosticPayload = ProviderDiagnosticResponseMessage["payload"];
 type ProviderUsageListPayload = ProviderUsageListResponseMessage["payload"];
-type UsageListReportsPayload = UsageListReportsResponseMessage["payload"];
+interface UsageListReportsPayload {
+    requestId: string;
+    reports: UsageReportEntry[];
+}
 type DaemonStatusPayload = DaemonGetStatusResponse["payload"];
 type DaemonPairingOfferPayload = DaemonGetPairingOfferResponse["payload"];
 type DiagnosticsPayload = DiagnosticsResponse["payload"];
@@ -1192,10 +1195,11 @@ export declare class DaemonClient {
         requestId?: string;
     }): Promise<ProviderUsageListPayload>;
     listUsageReports(options?: {
+        agentId?: string;
         requestId?: string;
         forceRefresh?: boolean;
         reportIds?: string[];
-    }): Promise<UsageListReportsPayload>;
+    }, onReport?: (report: UsageReportEntry) => void): Promise<UsageListReportsPayload>;
     listCommands(options: ListCommandsOptions): Promise<ListCommandsPayload>;
     listCommands(agentId: string, requestId?: string): Promise<ListCommandsPayload>;
     listCommands(agentId: string, options?: LegacyListCommandsOptions): Promise<ListCommandsPayload>;

package/dist/daemon-client.js

@@ -284,8 +284,8 @@ function toReasonCode(reason) {
     }
     return "unknown";
 }
+// COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
 export function supportsUsageReports(features) {
-    // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
     return features?.usageSources === true || features?.providerUsageList === true;
 }
 export class DaemonClient {
@@ -3580,45 +3580,105 @@ export class DaemonClient {
             },
         });
     }
-    async listUsageReports(options) {
+    async listUsageReports(options, onReport) {
         const features = this.getLastServerInfoMessage()?.features;
         if (!supportsUsageReports(features)) {
             throw new Error("Update the host to see usage.");
         }
+        if (options?.agentId !== undefined && options.reportIds !== undefined)
+            throw new Error("agentId and reportIds cannot be combined");
         // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
         if (features?.usageSources !== true) {
+            if (options?.agentId !== undefined)
+                return { requestId: this.createRequestId(options.requestId), reports: [] };
             // Released hosts serve a five-minute cache and have no forceRefresh option.
             const payload = await this.listProviderUsage({ requestId: options?.requestId });
             return {
                 requestId: payload.requestId,
                 reports: payload.providers
                     .filter((provider) => !options?.reportIds || options.reportIds.includes(provider.providerId))
-                    .map((provider) => ({
-                    id: provider.providerId,
-                    sourceId: provider.providerId,
-                    sourceLabel: provider.displayName,
-                    icon: legacyUsageIcon(provider.providerId),
-                    account: {},
-                    fetchedAt: provider.fetchedAt ?? payload.fetchedAt,
-                    report: {
-                        status: provider.status,
-                        windows: provider.windows,
-                        balances: provider.balances ?? undefined,
-                        details: provider.details ?? undefined,
-                        planLabel: provider.planLabel ?? undefined,
-                        error: provider.error ?? undefined,
-                    },
-                })),
+                    .map((provider) => {
+                    // COMPAT(providerUsageList): added in v0.1.98, remove after 2027-03-26.
+                    // 0.10 reports have no typed problems; preserve their unavailable badge and error text.
+                    let report;
+                    if (provider.status === "available") {
+                        report = {
+                            status: "available",
+                            windows: provider.windows,
+                            balances: provider.balances ?? undefined,
+                            details: provider.details ?? undefined,
+                            planLabel: provider.planLabel ?? undefined,
+                        };
+                    }
+                    else if (provider.status === "error") {
+                        report = { status: "error", error: provider.error ?? "" };
+                    }
+                    else {
+                        report = {
+                            status: "unavailable",
+                            problem: { kind: "no_quota", detail: provider.error ?? "" },
+                        };
+                    }
+                    return {
+                        id: provider.providerId,
+                        sourceId: provider.providerId,
+                        sourceLabel: provider.displayName,
+                        icon: legacyUsageIcon(provider.providerId),
+                        account: {},
+                        fetchedAt: provider.fetchedAt ?? payload.fetchedAt,
+                        report,
+                    };
+                }),
             };
         }
-        return this.sendNamespacedCorrelatedSessionRequest({
-            requestId: options?.requestId,
-            message: {
-                type: "usage.list_reports.request",
-                forceRefresh: options?.forceRefresh,
-                reportIds: options?.reportIds,
-            },
+        const requestId = this.createRequestId(options?.requestId);
+        const reports = [];
+        let active = true;
+        const unsubscribe = this.subscribeRawMessages((message) => {
+            if (!active ||
+                !("payload" in message) ||
+                !("requestId" in message.payload) ||
+                message.payload.requestId !== requestId)
+                return;
+            if (message.type === "usage.list_reports.response" || message.type === "rpc_error") {
+                active = false;
+                return;
+            }
+            if (message.type !== "usage.list_reports.update")
+                return;
+            reports.push(message.payload.report);
+            onReport?.(message.payload.report);
         });
+        try {
+            const response = await this.sendRequest({
+                requestId,
+                message: {
+                    type: "usage.list_reports.request",
+                    streaming: features?.usageReportsStreaming === true ? true : undefined,
+                    requestId,
+                    forceRefresh: options?.forceRefresh,
+                    reportIds: options?.reportIds,
+                    agentId: options?.agentId,
+                },
+                select: (message) => message.type === "usage.list_reports.response" && message.payload.requestId === requestId
+                    ? message.payload
+                    : null,
+            });
+            if (response.error != null)
+                throw new Error(response.error);
+            // COMPAT(usageReportsStreaming): added in v0.11.1, remove after 2027-04-08 once all hosts advertise usageReportsStreaming.
+            // beta.3 sends reports only; beta.4 through 0.11.1 send updates only.
+            if (response.reports !== undefined) {
+                if (reports.length === 0)
+                    response.reports.forEach((report) => onReport?.(report));
+                return { requestId, reports: response.reports };
+            }
+            return { requestId, reports };
+        }
+        finally {
+            active = false;
+            unsubscribe();
+        }
     }
     async listCommands(input, legacyOptions) {
         const options = normalizeListCommandsOptions(input, legacyOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camerontaylor/paseo-client",
-  "version": "0.11.0-beta.1.fork.1",
+  "version": "0.11.1-fork.1",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@camerontaylor/paseo-protocol": "0.11.0-beta.1.fork.1",
-    "@camerontaylor/paseo-relay": "0.11.0-beta.1.fork.1",
+    "@camerontaylor/paseo-protocol": "0.11.1-fork.1",
+    "@camerontaylor/paseo-relay": "0.11.1-fork.1",
     "zod": "^4.4.3"
   },
   "devDependencies": {