cartethyia 2.7.3 → 2.7.5

package/src/providers/integrations/commandcode/quota.ts

@@ -1,10 +1,8 @@
 /**
- * Command Code quota, read from the four billing endpoints its client reads.
+ * Command Code quota, read from the billing endpoints its client reads.
  *
- * Command Code bills in credits, not in rate-limit windows, so a quota row here
- * is a credit balance rather than a 5-hour/weekly pair. The shape the console
- * renders still expects windows, so the balance is reported as one independent
- * window — the honest reading, since credits are the only thing consumed.
+ * Monthly allowance and purchased/free credits are separate pooled windows:
+ * the monthly cap and reset do not limit or expire the additional balance.
  *
  * The endpoints, all on `https://api.commandcode.ai` (not the Provider API
  * origin the model catalog lives on):
@@ -12,17 +10,42 @@
  *   `/alpha/whoami`                  identity, and the `orgId` when one exists
  *   `/alpha/billing/credits`         the balance and any window limits
  *   `/alpha/billing/subscriptions`   the plan, when there is one
- *   `/alpha/usage/summary`           spend in the period, for context
  *
- * Every call is optional to the result: a failure reports what is still known
- * rather than failing the whole read, because an operator who can see a zero
- * balance has already got the answer even if the usage summary never came back.
+ * Identity resolves the organization before billing is read. Billing reads are
+ * independent: retain the balance or subscription when the other is unavailable.
  */
 import type { FetchLike, ProviderQuotaResult, ProviderQuotaWindow } from "../../quota/quota-contracts";
 
 const COMMANDCODE_API_BASE = "https://api.commandcode.ai" as const;
 const REQUEST_TIMEOUT_MS = 15_000;
 
+const PLAN_CAPS: Readonly<Record<string, number>> = {
+  "individual-go": 10,
+  "individual-goat": 70,
+  "individual-pro": 30,
+  "individual-provider": 15,
+  "individual-max": 150,
+  "individual-ultra": 300,
+  "teams-pro": 40,
+};
+
+const PLAN_CAP_OVERRIDES: Readonly<Record<string, number>> = {
+  "individual-pro-v1": 80,
+};
+
+function commandCodePlan(planId: string): { readonly label: string; readonly cap: number | null } {
+  const [scope, tier] = planId.toLowerCase().split("-");
+  if ((scope !== "individual" && scope !== "teams") || !tier) {
+    return { label: planId, cap: PLAN_CAP_OVERRIDES[planId] ?? PLAN_CAPS[planId] ?? null };
+  }
+  const tierLabel = tier === "goat" ? "GOAT" : `${tier[0]?.toUpperCase() ?? ""}${tier.slice(1)}`;
+  const normalizedId = `${scope}-${tier}`;
+  return {
+    label: `CommandCode ${scope === "teams" ? "Teams " : ""}${tierLabel}`,
+    cap: PLAN_CAP_OVERRIDES[planId] ?? PLAN_CAPS[normalizedId] ?? null,
+  };
+}
+
 interface RequestOk {
   readonly ok: true;
   readonly value: unknown;
@@ -57,27 +80,69 @@ function recordValue(value: unknown): Record<string, unknown> | undefined {
 }
 
 function numberOrNull(value: unknown): number | null {
-  return typeof value === "number" && Number.isFinite(value) ? value : null;
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim() && Number.isFinite(Number(value))) {
+    return Number(value);
+  }
+  return null;
+}
+
+function isoTimestamp(value: unknown): string | null {
+  const numeric = numberOrNull(value);
+  if (numeric !== null) {
+    if (numeric <= 0) return null;
+    const date = new Date(numeric > 1_000_000_000_000 ? numeric : numeric * 1000);
+    return Number.isFinite(date.getTime()) ? date.toISOString() : null;
+  }
+  if (typeof value !== "string" || !Number.isFinite(Date.parse(value))) return null;
+  return new Date(value).toISOString();
 }
 
-/** The credit block: three balances that are summed, plus any window limits. */
-function creditWindow(credits: Record<string, unknown>): ProviderQuotaWindow | null {
+function withQuery(path: string, params: Readonly<Record<string, string | null>>): string {
+  const query = new URLSearchParams(
+    Object.entries(params).filter((entry): entry is [string, string] => entry[1] !== null),
+  ).toString();
+  return query ? `${path}?${query}` : path;
+}
+
+/** Only monthly credits share the subscription allowance and reset. */
+function creditWindows(
+  credits: Record<string, unknown>,
+  planCap: number | null,
+  resetsAt: string | null,
+): readonly ProviderQuotaWindow[] {
   const monthly = numberOrNull(credits["monthlyCredits"]) ?? 0;
   const purchased = numberOrNull(credits["purchasedCredits"]) ?? 0;
   const free = numberOrNull(credits["freeCredits"]) ?? 0;
-  const remaining = monthly + purchased + free;
-  // Command Code reports no ceiling for a credit balance, so there is no
-  // percentage to compute — unlike a rate-limit window, where the upstream
-  // states both sides. Reporting null is the truthful answer.
-  return {
+  const used = planCap === null ? null : Math.max(0, planCap - monthly);
+  const usedPercent = planCap !== null && planCap > 0 && used !== null
+    ? Math.min(100, Math.max(0, (used / planCap) * 100))
+    : null;
+  const windows: ProviderQuotaWindow[] = [{
     kind: "credits",
-    label: "Credits",
-    accounting: "independent",
-    usedPercent: null,
-    remainingPercent: null,
-    resetsAt: null,
-    remaining,
-  };
+    label: "Monthly credits",
+    accounting: "pooled",
+    usedPercent,
+    remainingPercent: usedPercent === null ? null : Math.max(0, 100 - usedPercent),
+    resetsAt,
+    used,
+    limit: planCap,
+    remaining: monthly,
+  }];
+  if (purchased + free > 0) {
+    windows.push({
+      kind: "additional_credits",
+      label: "Purchased/free credits",
+      accounting: "pooled",
+      usedPercent: null,
+      remainingPercent: null,
+      resetsAt: null,
+      used: null,
+      limit: null,
+      remaining: purchased + free,
+    });
+  }
+  return windows;
 }
 
 function windowLimits(
@@ -88,17 +153,25 @@ function windowLimits(
   const weekly = recordValue(limits["weekly"]);
   const push = (source: Record<string, unknown> | undefined, kind: string, label: string) => {
     if (source === undefined) return;
+    const used = numberOrNull(source["used"]) ?? 0;
+    const limit = numberOrNull(source["cap"]);
+    if ((limit === null || limit <= 0) && used <= 0) return;
+    const usedPercent = limit !== null && limit > 0
+      ? Math.min(100, Math.max(0, (used / limit) * 100))
+      : null;
     out.push({
       kind,
       label,
       accounting: "independent",
-      usedPercent: numberOrNull(source["usedPercent"]),
-      remainingPercent: numberOrNull(source["remainingPercent"]),
-      resetsAt: typeof source["resetsAt"] === "string" ? source["resetsAt"] : null,
-      remaining: numberOrNull(source["remaining"]),
+      usedPercent,
+      remainingPercent: usedPercent === null ? null : Math.max(0, 100 - usedPercent),
+      resetsAt: isoTimestamp(source["resetAt"]),
+      used,
+      limit,
+      remaining: limit === null ? null : Math.max(0, limit - used),
     });
   };
-  push(fiveHour, "five_hour", "5 Hour");
+  push(fiveHour, "five_hour", "Session (5h)");
   push(weekly, "weekly", "Weekly");
   return out;
 }
@@ -108,12 +181,8 @@ export async function fetchCommandCodeQuota(
   fetcher: FetchLike,
 ): Promise<ProviderQuotaResult> {
   const source = "commandcode";
-  const [whoami, creditsRaw, subscriptionRaw] = await Promise.all([
-    readJson("/alpha/whoami", credential, fetcher),
-    readJson("/alpha/billing/credits", credential, fetcher),
-    readJson("/alpha/billing/subscriptions", credential, fetcher),
-  ]);
-  if (!whoami.ok && !creditsRaw.ok) {
+  const whoami = await readJson(withQuery("/alpha/whoami", { limits: "1" }), credential, fetcher);
+  if (!whoami.ok) {
     return {
       source,
       plan: null,
@@ -124,32 +193,47 @@ export async function fetchCommandCodeQuota(
 
   const whoamiBody = whoami.ok ? recordValue(whoami.value) : undefined;
   const user = recordValue(whoamiBody?.["user"]);
+  const organization = recordValue(whoamiBody?.["org"]);
+  const orgId = typeof organization?.["id"] === "string" ? organization["id"] : null;
   const accountLabel =
     (typeof user?.["email"] === "string" && user["email"]) ||
     (typeof user?.["userName"] === "string" && user["userName"]) ||
+    (typeof user?.["name"] === "string" && user["name"]) ||
     undefined;
 
+  const [creditsRaw, subscriptionRaw] = await Promise.all([
+    readJson(withQuery("/alpha/billing/credits", { orgId }), credential, fetcher),
+    readJson(withQuery("/alpha/billing/subscriptions", { orgId }), credential, fetcher),
+  ]);
+  if (!creditsRaw.ok && !subscriptionRaw.ok) {
+    return {
+      source,
+      plan: null,
+      windows: [],
+      error: "Command Code did not answer its billing endpoints",
+      ...(accountLabel === undefined ? {} : { accountLabel }),
+    };
+  }
+
+  const subscriptionBody = subscriptionRaw.ok ? recordValue(subscriptionRaw.value) : undefined;
+  const planRecord = recordValue(subscriptionBody?.["data"]);
+  const planId = typeof planRecord?.["planId"] === "string" ? planRecord["planId"] : null;
+  const parsedPlan = planId === null ? null : commandCodePlan(planId);
+  const plan =
+    parsedPlan?.label ??
+    (typeof planRecord?.["name"] === "string" ? planRecord["name"] : null) ??
+    (creditsRaw.ok ? "Credits" : null);
+  const periodEnd = isoTimestamp(planRecord?.["currentPeriodEnd"]);
+
   const creditsBody = creditsRaw.ok ? recordValue(creditsRaw.value) : undefined;
   const windows: ProviderQuotaWindow[] = [];
   if (creditsBody !== undefined) {
     const credits = recordValue(creditsBody["credits"]);
-    if (credits !== undefined) {
-      const window = creditWindow(credits);
-      if (window !== null) windows.push(window);
-    }
+    if (credits !== undefined) windows.push(...creditWindows(credits, parsedPlan?.cap ?? null, periodEnd));
     const limits = recordValue(creditsBody["windowLimits"]);
     if (limits !== undefined) windows.push(...windowLimits(limits));
   }
 
-  const subscriptionBody = subscriptionRaw.ok ? recordValue(subscriptionRaw.value) : undefined;
-  const planRecord = recordValue(subscriptionBody?.["data"]);
-  const plan =
-    typeof planRecord?.["name"] === "string"
-      ? planRecord["name"]
-      : creditsRaw.ok
-        ? "Credits"
-        : null;
-
   return {
     source,
     plan,

package/src/providers/integrations/cursor/cursor-http2.ts

@@ -46,7 +46,7 @@ function connectErrorEnvelope(payload: Uint8Array): GatewayError | undefined {
     return new GatewayError(
       "quota_exceeded",
       429,
-      `Cursor refused the Run: ${detail}`,
+      `Cursor refused the Run: ${detail} (request {requestId}). You've maxed this window — pace yourself ⏳`,
       { providerId: "cursor", upstreamCode: code },
       "upstream",
     );
@@ -54,7 +54,7 @@ function connectErrorEnvelope(payload: Uint8Array): GatewayError | undefined {
   return new GatewayError(
     "platform_unavailable",
     502,
-    `Cursor refused the Run: ${detail}`,
+    `Cursor refused the Run: ${detail} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
     { providerId: "cursor", upstreamCode: code },
     "upstream",
   );
@@ -126,7 +126,7 @@ export async function openCursorRun(input: {
     throw new GatewayError(
       "invalid_request",
       400,
-      "Cursor Run requires an allowlisted Cursor agent origin",
+      "Cursor Run requires an allowlisted Cursor agent origin (request {requestId}). All roads blocked — time to find a new route 🗺️",
       { origin: input.origin },
     );
   }
@@ -153,7 +153,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "authentication_failed",
       401,
-      `Cursor refused the credential${detail}`,
+      `Cursor refused the credential${detail} (request {requestId}). Wrong key, right door — check the credential 🔑`,
       { grpcStatus: status },
       "upstream",
     );
@@ -162,7 +162,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "quota_exceeded",
       429,
-      `Cursor refused the Run${detail}`,
+      `Cursor refused the Run${detail} (request {requestId}). You've maxed this window — pace yourself ⏳`,
       { grpcStatus: status },
       "upstream",
     );
@@ -171,7 +171,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "deadline_exceeded",
       504,
-      `Cursor Run ended before it finished${detail}`,
+      `Cursor Run ended before it finished${detail} (request {requestId}). Some things just take longer 🐢`,
       { grpcStatus: status },
       "upstream",
     );
@@ -179,7 +179,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
   return new GatewayError(
     "platform_unavailable",
     502,
-    `Cursor Run failed (gRPC ${status})${detail}`,
+    `Cursor Run failed (gRPC ${status})${detail} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
     { grpcStatus: status },
     "upstream",
   );
@@ -205,7 +205,7 @@ export function cursorRunTerminationError(input: {
       : new GatewayError(
           "transport_unavailable",
           502,
-          `Cursor Run transport interrupted: ${input.reason.error.message}`,
+          `Cursor Run transport interrupted: ${input.reason.error.message} (request {requestId}). The connection ghosted us — come back in a moment 👻`,
           {},
           "network",
         );
@@ -216,7 +216,7 @@ export function cursorRunTerminationError(input: {
     return new GatewayError(
       status === 401 || status === 403 ? "authentication_failed" : "platform_unavailable",
       status === 401 || status === 403 ? 401 : 502,
-      `Cursor Run failed by remote: ${status}`,
+      `Cursor Run failed by remote: ${status} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
       { httpStatus: status, ...(message === undefined ? {} : { upstreamMessage: message }) },
       "upstream",
     );
@@ -229,7 +229,7 @@ export function cursorRunTerminationError(input: {
   return new GatewayError(
     "platform_unavailable",
     502,
-    "Cursor Run ended before turn_ended",
+    "Cursor Run ended before turn_ended (request {requestId}). The upstream came back empty-handed — retry 🌙",
     {},
     "upstream",
   );
@@ -253,7 +253,7 @@ export async function* decodeServerMessages(
       throw new GatewayError(
         "platform_unavailable",
         502,
-        "Cursor Run exceeded the frame buffer bound",
+        "Cursor Run exceeded the frame buffer bound (request {requestId}). The upstream sent more than we can hold — retry 🌙",
         {},
         "upstream",
       );
@@ -295,6 +295,3 @@ function concat(left: Uint8Array, right: Uint8Array): Uint8Array {
   out.set(right, left.byteLength);
   return out;
 }
-
-/** Heartbeat cadence while a Run is held open waiting for a tool result. */
-export const RUN_HEARTBEAT_INTERVAL_MS = 20_000;

package/src/providers/integrations/cursor/cursor-quota.ts

@@ -35,6 +35,7 @@ import {
 } from "../../quota/quota-contracts";
 import type { QuotaCollectionContext } from "../../quota/quota-support";
 import { cursorAccountIdentity } from "./cursor-auth";
+import { fnv1a32 } from "../shared/hash";
 import { CURSOR_API_HOST, CURSOR_WEBSITE_HOST } from "./cursor-shared";
 
 /** Timestamp keys naming the end of the current window. */
@@ -226,12 +227,7 @@ function authStateUserId(context: QuotaCollectionContext | undefined): string |
  * subject it replaces.
  */
 function cursorAccountTag(credential: string): string {
-  let hash = 0x811c9dc5;
-  for (let index = 0; index < credential.length; index += 1) {
-    hash ^= credential.charCodeAt(index);
-    hash = Math.imul(hash, 0x01000193) >>> 0;
-  }
-  return `cursor-${hash.toString(36).padStart(7, "0").slice(0, 7)}`;
+  return `cursor-${fnv1a32(credential).toString(36).padStart(7, "0").slice(0, 7)}`;
 }
 
 export async function fetchCursorQuota(

package/src/providers/integrations/cursor/cursor-request.ts

@@ -303,17 +303,6 @@ export function buildHeartbeat(): Uint8Array {
   return encodeMessage("AgentClientMessage", { client_heartbeat: {} });
 }
 
-/**
- * `ACM#5 exec_client_control_message.heartbeat{id}`: Cursor CLI sends one every
- * few seconds for each exec it is still running. A zero id is left out, as
- * proto3 does for a default scalar.
- */
-export function buildExecHeartbeat(execId: number): Uint8Array {
-  return encodeMessage("AgentClientMessage", {
-    exec_client_control_message: { heartbeat: execId === 0 ? {} : { id: execId } },
-  });
-}
-
 /** `ACM#5 exec_client_control_message.stream_close{id}` after an exec result. */
 export function buildExecStreamClose(execId: number, execIdString?: string): Uint8Array {
   return encodeMessage("AgentClientMessage", {
@@ -424,82 +413,6 @@ export function buildMcpResult(input: {
   });
 }
 
-/**
- * `ACM#2 exec_client_message{shell_result|write_result|read_result}` for a host
- * exec the canonical client executed locally.
- *
- * Cursor's executor replies to its own host requests with the variant's typed
- * result frame (the generic `mcp_result` leaves the server unmatched on a frame
- * it did rank), and after every exec result it sends `stream_close` — without
- * it the cloud waits forever on shell execs. `is_error` keeps the failure as
- * the variant's error/failure case rather than a crafted success.
- */
-export type CursorHostExecResultVariant = "shell" | "write" | "read";
-
-export function buildHostExecResult(input: {
-  readonly execId: number;
-  readonly execIdString?: string;
-  readonly variant: CursorHostExecResultVariant;
-  readonly text: string;
-  readonly isError: boolean;
-  readonly host: {
-    readonly command?: string;
-    readonly workingDirectory?: string;
-    readonly path?: string;
-    readonly lines?: number;
-    readonly fileSize?: number;
-  };
-}): Uint8Array[] {
-  const id = { id: input.execId, exec_id: input.execIdString ?? "" };
-  const variant = input.variant;
-  const text = input.text;
-  let result: Record<string, unknown>;
-  if (variant === "shell") {
-    result = {
-      shell_result: input.isError
-        ? { failure: { command: input.host.command ?? "", exit_code: 1, stderr: text } }
-        : {
-            success: {
-              command: input.host.command ?? "",
-              exit_code: 0,
-              stdout: text,
-              ...(input.host.workingDirectory === undefined ? {} : { working_directory: input.host.workingDirectory }),
-            },
-          },
-    };
-  } else if (variant === "write") {
-    result = {
-      write_result: input.isError
-        ? { error: { path: input.host.path ?? "", error: text } }
-        : {
-            success: {
-              path: input.host.path ?? "",
-              lines_created: input.host.lines ?? 0,
-              file_size: input.host.fileSize ?? 0,
-            },
-          },
-    };
-  } else {
-    result = {
-      read_result: input.isError
-        ? { error: { path: input.host.path ?? "", error: text } }
-        : {
-            success: {
-              path: input.host.path ?? "",
-              content: text,
-              total_lines: text.length > 0 ? text.split("\n").length : 0,
-            },
-          },
-    };
-  }
-  return [
-    encodeMessage("AgentClientMessage", { exec_client_message: { ...id, ...result } }),
-    // The real CLI pairs every typed exec result with stream_close — the cloud
-    // waits on it for shell execs specifically.
-    buildExecStreamClose(input.execId, input.execIdString),
-  ];
-}
-
 /**
  * `ACM#2 exec_client_message{mcp_result}` rejecting a tool the client never
  * declared.

package/src/providers/integrations/cursor/cursor-shared.ts

@@ -5,7 +5,6 @@
 // protocol was verified against: they are declared once so the auth flow, the
 // unary catalog calls, and the Run stream cannot drift apart on host, path, or
 // client id.
-import type { WireFamily } from "../../../protocol/canonical-model";
 
 /** Canonical bundled provider id. */
 export const CURSOR_PROVIDER_ID = "cursor";
@@ -72,9 +71,6 @@ export const SESSION_REFRESH_TIMEOUT_MS = 20_000;
  */
 export const RUN_IDLE_TTL_MS = 10 * 60_000;
 
-/** Chat wire is the declared default; the adapter owns the native protocol. */
-export const CURSOR_WIRE_FAMILY: WireFamily = "chat";
-
 /**
  * Any HTTPS subdomain of `cursor.sh` is an acceptable Run host: the region
  * Cursor routes an account to varies (`agentn.*`, `agent.*`, `api5`, …).