remote-codex 0.11.32 → 0.11.33

package/apps/supervisor-api/dist/index.js

@@ -12502,6 +12502,7 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
   sessionApprovalModes = /* @__PURE__ */ new Map();
   liveUserPrompts = /* @__PURE__ */ new Map();
   subscriptionUsageWindows = /* @__PURE__ */ new Map();
+  subscriptionAuthKind = "unknown";
   subscriptionUsageObservedAt = null;
   clientApp;
   sdkLoadError = null;
@@ -12519,7 +12520,7 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     }));
     return {
       provider: "claude",
-      authKind: windows.length > 0 ? "subscription" : "unknown",
+      authKind: this.subscriptionAuthKind,
       observedAt,
       stale: false,
       windows
@@ -12537,8 +12538,37 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
       usedPercent: Math.max(0, Math.min(100, info.utilization * 100)),
       resetsAt: typeof info.resetsAt === "number" ? new Date(info.resetsAt * 1e3).toISOString() : null
     });
+    this.subscriptionAuthKind = "subscription";
     this.subscriptionUsageObservedAt = (/* @__PURE__ */ new Date()).toISOString();
   }
+  async captureStructuredSubscriptionUsage(query) {
+    const getUsage = query.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET;
+    if (!getUsage) {
+      return;
+    }
+    try {
+      const usage = await getUsage.call(query);
+      const nextWindows = /* @__PURE__ */ new Map();
+      const addWindow = (id, window) => {
+        if (typeof window?.utilization !== "number" || !Number.isFinite(window.utilization)) {
+          return;
+        }
+        nextWindows.set(id, {
+          usedPercent: Math.max(0, Math.min(100, window.utilization)),
+          resetsAt: typeof window.resets_at === "string" ? window.resets_at : null
+        });
+      };
+      addWindow("five_hour", usage.rate_limits?.five_hour);
+      addWindow("seven_day", usage.rate_limits?.seven_day);
+      this.subscriptionUsageWindows.clear();
+      for (const [id, window] of nextWindows) {
+        this.subscriptionUsageWindows.set(id, window);
+      }
+      this.subscriptionAuthKind = usage.subscription_type ? "subscription" : usage.rate_limits_available ? "subscription" : "apiKey";
+      this.subscriptionUsageObservedAt = (/* @__PURE__ */ new Date()).toISOString();
+    } catch {
+    }
+  }
   updateToolboxItemsFromSystemInit(message) {
     this.managementSchema.toolboxItems = buildClaudeToolboxItems(
       normalizeClaudeSlashCommands(message.slash_commands)
@@ -12683,9 +12713,14 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     let providerSessionId = null;
     let model = input.model;
     const rawMessages = [];
+    let capturedStructuredUsage = false;
     try {
       for await (const message of query) {
         rawMessages.push(message);
+        if (!capturedStructuredUsage) {
+          capturedStructuredUsage = true;
+          await this.captureStructuredSubscriptionUsage(query);
+        }
         this.captureRateLimit(message);
         if (message.type === "system" && message.subtype === "init") {
           this.updateToolboxItemsFromSystemInit(message);
@@ -12931,9 +12966,14 @@ var ClaudeRuntimeAdapter = class extends EventEmitter5 {
     const rawMessages = [];
     let terminalStatus = null;
     let terminalError = null;
+    let capturedStructuredUsage = false;
     try {
       for await (const message of state.query) {
         rawMessages.push(message);
+        if (!capturedStructuredUsage) {
+          capturedStructuredUsage = true;
+          await this.captureStructuredSubscriptionUsage(state.query);
+        }
         this.captureRateLimit(message);
         this.consumeMessage(state, message);
         const status = queryResultStatus(message);