@ccpocket/bridge 1.89.0 → 1.91.0

package/dist/claude-usage.d.ts

@@ -0,0 +1,13 @@
+import type { UsageInfo } from "./usage.js";
+/**
+ * Map the experimental SDK usage response to UsageInfo.
+ * Returns null when plan limits do not apply or no supported window exists,
+ * so callers can omit Claude instead of showing an empty card.
+ */
+export declare function mapClaudeUsageResponse(response: unknown): UsageInfo | null;
+/**
+ * Fetch Claude plan usage. Resolves to null when Claude plan limits are not
+ * applicable (not configured, API key/Bedrock/Vertex auth, OAuth not opted in,
+ * or an SDK without the experimental API). Never rejects.
+ */
+export declare function fetchClaudeUsage(): Promise<UsageInfo | null>;

package/dist/claude-usage.js

@@ -0,0 +1,139 @@
+import { homedir } from "node:os";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import { canStartClaudeSdk, isClaudeOAuthOptInEnabled, } from "./sdk-process.js";
+// Claude plan usage is read only through the Claude Agent SDK's experimental
+// `/usage` API. This adapter isolates the unstable method name and response
+// shape so upstream changes stay contained here. It must never read
+// credentials or call claude.ai endpoints directly; the SDK resolves auth.
+const CLAUDE_USAGE_TIMEOUT_MS = 15_000;
+async function* createIdleUserMessageStream() {
+    await new Promise(() => { });
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
+function mapClaudeWindow(value) {
+    if (!isRecord(value))
+        return null;
+    const { utilization, resets_at: resetsAt } = value;
+    if (typeof utilization !== "number" || !Number.isFinite(utilization)) {
+        return null;
+    }
+    if (typeof resetsAt !== "string" || Number.isNaN(Date.parse(resetsAt))) {
+        return null;
+    }
+    return {
+        utilization: Math.min(100, Math.max(0, utilization)),
+        resetsAt: new Date(resetsAt).toISOString(),
+    };
+}
+/**
+ * Map the experimental SDK usage response to UsageInfo.
+ * Returns null when plan limits do not apply or no supported window exists,
+ * so callers can omit Claude instead of showing an empty card.
+ */
+export function mapClaudeUsageResponse(response) {
+    if (!isRecord(response))
+        return null;
+    if (response.rate_limits_available !== true)
+        return null;
+    const rateLimits = response.rate_limits;
+    if (!isRecord(rateLimits))
+        return null;
+    const fiveHour = mapClaudeWindow(rateLimits.five_hour);
+    const sevenDay = mapClaudeWindow(rateLimits.seven_day);
+    if (!fiveHour && !sevenDay)
+        return null;
+    return { provider: "claude", fiveHour, sevenDay };
+}
+class ClaudeUsageUnavailable extends Error {
+}
+function withTimeout(promise, ms) {
+    let timer;
+    const timeout = new Promise((_, reject) => {
+        timer = setTimeout(() => reject(new Error(`timed out after ${ms}ms`)), ms);
+    });
+    return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
+async function readClaudeUsage() {
+    // Same preflight as Claude sessions: without an explicit credential,
+    // Bedrock, or the OAuth opt-in, Claude is simply not configured here.
+    if (!canStartClaudeSdk())
+        return null;
+    const queryInstance = query({
+        prompt: createIdleUserMessageStream(),
+        options: {
+            cwd: homedir(),
+            permissionMode: "default",
+            settingSources: ["user"],
+            stderr: (data) => {
+                const trimmed = data.trim();
+                if (trimmed)
+                    console.error(`[claude-usage:stderr] ${trimmed}`);
+            },
+        },
+    });
+    const drain = (async () => {
+        try {
+            for await (const _message of queryInstance) {
+                // Drain initialization/status messages so control requests resolve.
+            }
+        }
+        catch {
+            // close() can reject the iterator; the usage result is handled below.
+        }
+    })();
+    try {
+        const response = await withTimeout((async () => {
+            const initialization = await queryInstance.initializationResult();
+            if (initialization.account.apiKeySource === "oauth" &&
+                !isClaudeOAuthOptInEnabled()) {
+                throw new ClaudeUsageUnavailable();
+            }
+            const getUsage = queryInstance
+                .usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET;
+            if (typeof getUsage !== "function") {
+                throw new ClaudeUsageUnavailable();
+            }
+            // skipBehaviors avoids scanning every transcript from the last week.
+            return getUsage.call(queryInstance, { skipBehaviors: true });
+        })(), CLAUDE_USAGE_TIMEOUT_MS);
+        return mapClaudeUsageResponse(response);
+    }
+    catch (err) {
+        if (err instanceof ClaudeUsageUnavailable)
+            return null;
+        return {
+            provider: "claude",
+            fiveHour: null,
+            sevenDay: null,
+            error: `Failed to fetch Claude usage: ${err instanceof Error ? err.message : String(err)}`,
+        };
+    }
+    finally {
+        queryInstance.close();
+        void drain;
+    }
+}
+// Share concurrent reads (launch/resume/refresh can overlap), but never cache
+// a completed snapshot so a manual refresh always queries fresh data.
+let pendingClaudeUsage = null;
+/**
+ * Fetch Claude plan usage. Resolves to null when Claude plan limits are not
+ * applicable (not configured, API key/Bedrock/Vertex auth, OAuth not opted in,
+ * or an SDK without the experimental API). Never rejects.
+ */
+export function fetchClaudeUsage() {
+    pendingClaudeUsage ??= readClaudeUsage()
+        .catch((err) => ({
+        provider: "claude",
+        fiveHour: null,
+        sevenDay: null,
+        error: `Failed to fetch Claude usage: ${err instanceof Error ? err.message : String(err)}`,
+    }))
+        .finally(() => {
+        pendingClaudeUsage = null;
+    });
+    return pendingClaudeUsage;
+}
+//# sourceMappingURL=claude-usage.js.map

package/dist/claude-usage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-usage.js","sourceRoot":"","sources":["../src/claude-usage.ts"],"names":[],"mappings":"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"}

package/dist/codex-process.d.ts

@@ -107,6 +107,8 @@ export interface CodexModelMetadata {
 }
 export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     private transport;
+    private reloadingProject;
+    private launchOptions;
     private _status;
     private _threadId;
     private _agentNickname;
@@ -264,6 +266,8 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     listAvailableModelMetadata(): Promise<CodexModelMetadata[]>;
     start(projectPath: string, options?: CodexStartOptions): void;
     initializeOnly(projectPath: string, timeoutMs?: number): Promise<void>;
+    trustProject(projectPath: string): Promise<void>;
+    trustProjectAndReload(projectPath: string): Promise<void>;
     readRateLimits(timeoutMs?: number): Promise<CodexRateLimitsResponse>;
     waitUntilReady(): Promise<void>;
     stop(): void;

package/dist/codex-process.js

@@ -1,3 +1,4 @@
+import { readCodexAppServerMode } from "./codex-app-server-config.js";
 import { CodexRecovery } from "./codex-recovery.js";
 import { EventEmitter } from "node:events";
 import { randomUUID } from "node:crypto";
@@ -63,6 +64,8 @@ function codexAppServerStartError(err) {
 }
 export class CodexProcess extends EventEmitter {
     transport = null;
+    reloadingProject = false;
+    launchOptions;
     _status = "starting";
     _threadId = null;
     _agentNickname = null;
@@ -140,7 +143,7 @@ export class CodexProcess extends EventEmitter {
         return this._status;
     }
     get isWaitingForInput() {
-        return this.inputResolve !== null;
+        return !this.reloadingProject && this.inputResolve !== null;
     }
     getMessageModel() {
         return sanitizeCodexModel(this.startModel) ?? "";
@@ -289,7 +292,7 @@ export class CodexProcess extends EventEmitter {
     cancelRecovery() { this.manualInputVersion++; this.recovery.cancel(); }
     noteManualInput() { this.manualInputVersion++; this.recovery.manualInput(); }
     canDispatchRecovery() {
-        return !this.stopped && this._threadId !== null && this.inputResolve !== null &&
+        return !this.stopped && !this.reloadingProject && this._threadId !== null && this.inputResolve !== null &&
             this.pendingTurnId === null && this.pendingTurnCompletion === null &&
             this.pendingApprovals.size === 0 && !this.hasBlockingUserInput() &&
             this.pendingPlanCompletion === null && this._pendingPlanInput === null;
@@ -620,6 +623,7 @@ export class CodexProcess extends EventEmitter {
         if (this.transport) {
             this.stop();
         }
+        this.launchOptions = options ? { ...options } : undefined;
         this.resetReadiness();
         this.prepareLaunch(projectPath, options);
         this.launchAppServer(projectPath, options);
@@ -642,6 +646,55 @@ export class CodexProcess extends EventEmitter {
             throw error;
         }
     }
+    async trustProject(projectPath) {
+        const response = await this.request("config/value/write", {
+            keyPath: `projects.${JSON.stringify(projectPath)}.trust_level`,
+            value: "trusted",
+            mergeStrategy: "replace",
+        });
+        if (response.overriddenMetadata != null)
+            throw new Error("Project trust is overridden by a higher-priority configuration");
+    }
+    async trustProjectAndReload(projectPath) {
+        if (readCodexAppServerMode() !== "private")
+            throw new Error("Live trust reload requires a private Codex app-server. Shared app-server sessions must be reopened after configuring project trust.");
+        if (!this._threadId || this.status !== "idle" || this.pendingTurnId || this.pendingApprovals.size || this.pendingUserInputs.size || this._pendingPlanInput) {
+            throw new Error("Wait until the Codex session is idle before trusting this project");
+        }
+        const options = {
+            ...this.launchOptions,
+            threadId: this._threadId,
+            model: this.model,
+            modelReasoningEffort: this._runtimeModelReasoningEffort,
+            serviceTier: this._runtimeServiceTier ?? undefined,
+            approvalPolicy: this._approvalPolicy,
+            approvalsReviewer: this._approvalsReviewer,
+            codexPermissionsMode: this._codexPermissionsMode,
+            collaborationMode: this._collaborationMode,
+        };
+        const recoveryEnabled = this.recovery.state.enabled;
+        this.reloadingProject = true;
+        this.setStatus("starting");
+        try {
+            await this.trustProject(projectPath);
+            await this._completionFetchInFlight;
+            // Only this session's transport is replaced. Late events from the old
+            // process must not clear the new transport or mark the session stopped.
+            this.transport?.removeAllListeners();
+            this.stop();
+            this.reloadingProject = false;
+            this.start(projectPath, options);
+            await this.waitUntilReady();
+            this.setRecoveryEnabled(recoveryEnabled);
+        }
+        catch (error) {
+            this.reloadingProject = false;
+            this.setStatus("idle");
+            if (this.inputResolve)
+                this.emit("input_ready");
+            throw error;
+        }
+    }
     async readRateLimits(timeoutMs = 10_000) {
         return (await this.request("account/rateLimits/read", undefined, timeoutMs));
     }