@cursor/july 0.1.101 → 0.1.102

package/dist/internal/turn-cost.d.ts

@@ -17,6 +17,20 @@ export interface EstimateTurnCostInput {
 }
 export type EstimateTurnCostFn = (input: EstimateTurnCostInput) => Promise<TurnCost | undefined>;
 export declare function modelSettingId(model: ModelSetting): string;
+/**
+ * This estimate-cost client treats OpenAI-compat usage as **provider-gross**
+ * (local playground: `prompt_tokens` includes `cachedPromptTokens`). Catalog
+ * `costForBaseTier` assumes Anthropic / billing-style disjoint nets and ADDs
+ * `cacheRead × cachedRate` on top of `input × inputRate`, so we send
+ * `input − cache` for Grok / xAI / GPT / o-series.
+ *
+ * Non-OpenAI-compat models are left alone. `input < cache` is only a
+ * defensive clamp (avoid a negative uncached count), not a detector for
+ * billed / openaiProxy-shaped tokens. Cloud catalog fallback with already-
+ * netted OpenAI-compat usage is out of scope here.
+ */
+export declare function isOpenAiCompatGrossCacheModel(model: ModelSetting): boolean;
+export declare function toCatalogDisjointUsage(usage: TurnUsage, model?: ModelSetting): TurnUsage;
 export declare function roundCostUsd(usd: number): number;
 export declare function turnCostFromCents(args: {
     model: string | ModelSetting;

package/dist/internal/turn-cost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-cost.d.ts","sourceRoot":"","sources":["../../src/internal/turn-cost.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,KAAK,EAAE,qBAAqB,KACzB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;AAEnC,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE1D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CAC5B,GAAG,QAAQ,CAeX;AAQD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CA8C/B"}
+{"version":3,"file":"turn-cost.d.ts","sourceRoot":"","sources":["../../src/internal/turn-cost.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,KAAK,EAAE,qBAAqB,KACzB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;AAEnC,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE1D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAQ1E;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,YAAY,GACnB,SAAS,CAYX;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CAC5B,GAAG,QAAQ,CAeX;AAQD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAkD/B"}

package/dist/internal/turn-cost.js

@@ -16,6 +16,35 @@ import { cursorExternalApiUrl, resolveApiKey } from "./cursor/credentials.js";
 export function modelSettingId(model) {
     return typeof model === "string" ? model : model.id;
 }
+/**
+ * This estimate-cost client treats OpenAI-compat usage as **provider-gross**
+ * (local playground: `prompt_tokens` includes `cachedPromptTokens`). Catalog
+ * `costForBaseTier` assumes Anthropic / billing-style disjoint nets and ADDs
+ * `cacheRead × cachedRate` on top of `input × inputRate`, so we send
+ * `input − cache` for Grok / xAI / GPT / o-series.
+ *
+ * Non-OpenAI-compat models are left alone. `input < cache` is only a
+ * defensive clamp (avoid a negative uncached count), not a detector for
+ * billed / openaiProxy-shaped tokens. Cloud catalog fallback with already-
+ * netted OpenAI-compat usage is out of scope here.
+ */
+export function isOpenAiCompatGrossCacheModel(model) {
+    const id = modelSettingId(model).toLowerCase();
+    return (id.includes("grok") ||
+        id.includes("xai") ||
+        id.includes("gpt") ||
+        /(^|[-_/])o[1-9]/.test(id));
+}
+export function toCatalogDisjointUsage(usage, model) {
+    if (model === undefined || !isOpenAiCompatGrossCacheModel(model)) {
+        return usage;
+    }
+    const cachedTokens = usage.cacheReadTokens + usage.cacheWriteTokens;
+    if (cachedTokens === 0 || usage.inputTokens < cachedTokens) {
+        return usage;
+    }
+    return Object.assign(Object.assign({}, usage), { inputTokens: usage.inputTokens - cachedTokens });
+}
 export function roundCostUsd(usd) {
     return Math.round(usd * 1e6) / 1e6;
 }
@@ -36,13 +65,16 @@ export function turnCostFromCents(args) {
 }
 export function estimateTurnCostFromApi(input) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        var _f;
+        var _a;
+        var _b;
         const resolved = yield resolveApiKey();
         if (resolved === undefined) {
             return undefined;
         }
         const model = modelSettingId(input.model);
+        const catalogUsage = input.usage === undefined
+            ? undefined
+            : toCatalogDisjointUsage(input.usage, input.model);
         const response = yield fetch(`${cursorExternalApiUrl()}/v1/models/estimate-cost`, {
             method: "POST",
             headers: {
@@ -51,10 +83,10 @@ export function estimateTurnCostFromApi(input) {
             },
             body: JSON.stringify({
                 model,
-                inputTokens: (_a = input.usage) === null || _a === void 0 ? void 0 : _a.inputTokens,
-                outputTokens: (_b = input.usage) === null || _b === void 0 ? void 0 : _b.outputTokens,
-                cacheReadTokens: (_c = input.usage) === null || _c === void 0 ? void 0 : _c.cacheReadTokens,
-                cacheWriteTokens: (_d = input.usage) === null || _d === void 0 ? void 0 : _d.cacheWriteTokens,
+                inputTokens: catalogUsage === null || catalogUsage === void 0 ? void 0 : catalogUsage.inputTokens,
+                outputTokens: catalogUsage === null || catalogUsage === void 0 ? void 0 : catalogUsage.outputTokens,
+                cacheReadTokens: catalogUsage === null || catalogUsage === void 0 ? void 0 : catalogUsage.cacheReadTokens,
+                cacheWriteTokens: catalogUsage === null || catalogUsage === void 0 ? void 0 : catalogUsage.cacheWriteTokens,
                 agentId: input.agentId,
                 conversationId: input.conversationId,
                 runId: input.runId,
@@ -67,15 +99,15 @@ export function estimateTurnCostFromApi(input) {
         try {
             body = (yield response.json());
         }
-        catch (_g) {
+        catch (_c) {
             return undefined;
         }
-        if (typeof ((_e = body.cost) === null || _e === void 0 ? void 0 : _e.rawCostCents) !== "number" ||
+        if (typeof ((_a = body.cost) === null || _a === void 0 ? void 0 : _a.rawCostCents) !== "number" ||
             typeof body.cost.chargedCents !== "number") {
             return undefined;
         }
         return turnCostFromCents({
-            model: (_f = body.model) !== null && _f !== void 0 ? _f : model,
+            model: (_b = body.model) !== null && _b !== void 0 ? _b : model,
             cost: body.cost,
             source: body.source === "usage" ? "usage" : "catalog",
         });

package/dist/internal/v2-hosting.d.ts

@@ -0,0 +1,22 @@
+import type { AgentArchitecture } from "../types.js";
+import { type CursorManagedV2StoreIds } from "./cursor/hosted-store-secrets.js";
+export type AgentV2Hosting = {
+    kind: "not-v2";
+} | {
+    kind: "self-hosted";
+} | {
+    kind: "cursor-managed";
+    resolveStoreIds: () => CursorManagedV2StoreIds;
+};
+/**
+ * Close the architecture/hosting inputs into a compiler-owned union.
+ *
+ * Managed freeze processes exist before task bind, so store resolution stays
+ * lazy. Consumers can branch once on `kind`; managed storage operations then
+ * receive a resolver whose successful result always contains both ids.
+ */
+export declare function resolveAgentV2Hosting(input: {
+    architecture: AgentArchitecture | undefined;
+    env?: NodeJS.ProcessEnv;
+}): AgentV2Hosting;
+//# sourceMappingURL=v2-hosting.d.ts.map

package/dist/internal/v2-hosting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"v2-hosting.d.ts","sourceRoot":"","sources":["../../src/internal/v2-hosting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,uBAAuB,CAAC;CAChD,CAAC;AAEN;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,cAAc,CAYjB"}

package/dist/internal/v2-hosting.js

@@ -0,0 +1,23 @@
+import { requireCursorManagedV2StoreIdsSync, } from "./cursor/hosted-store-secrets.js";
+import { AGENT_SERVE_GENERATION_ENV_VAR } from "./cursor-relay-core.js";
+/**
+ * Close the architecture/hosting inputs into a compiler-owned union.
+ *
+ * Managed freeze processes exist before task bind, so store resolution stays
+ * lazy. Consumers can branch once on `kind`; managed storage operations then
+ * receive a resolver whose successful result always contains both ids.
+ */
+export function resolveAgentV2Hosting(input) {
+    var _a;
+    if (input.architecture !== "v2") {
+        return { kind: "not-v2" };
+    }
+    const env = (_a = input.env) !== null && _a !== void 0 ? _a : process.env;
+    if (env[AGENT_SERVE_GENERATION_ENV_VAR] === undefined) {
+        return { kind: "self-hosted" };
+    }
+    return {
+        kind: "cursor-managed",
+        resolveStoreIds: () => requireCursorManagedV2StoreIdsSync(env),
+    };
+}

package/dist/otel.d.ts

@@ -85,4 +85,20 @@ export type OtelDefinition = OtelConfig & {
 };
 /** Author OpenTelemetry export under `agent/otel.ts`. */
 export declare function defineOtel(config?: OtelConfig): OtelDefinition;
+export declare const TRACEPARENT_HEADER = "traceparent";
+/** Cursor backend prefers this; `remoteSpanContextFromRequest` falls back to W3C. */
+export declare const BACKEND_TRACEPARENT_HEADER = "backend-traceparent";
+export declare function formatTraceparent(spanContext: {
+    traceId: string;
+    spanId: string;
+    traceFlags: number;
+}): string | undefined;
+/**
+ * Copy the active span onto outbound headers as W3C `traceparent` and
+ * Cursor `backend-traceparent`. No-op when no valid span is active.
+ */
+export declare function injectActiveTraceContext(headers: {
+    get(name: string): string | null;
+    set(name: string, value: string): void;
+}): void;
 //# sourceMappingURL=otel.d.ts.map

package/dist/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvD,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC;IACzC;;;;OAIG;IACH,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,8CAA8C;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;;OAGG;IACH,SAAS,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACjC,4CAA4C;IAC5C,MAAM,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACpC,6CAA6C;IAC7C,OAAO,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC;IACtC,4DAA4D;IAC5D,IAAI,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,MAAM,GAAE,UAAe,GAAG,cAAc,CA+BlE"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvD,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC;IACzC;;;;OAIG;IACH,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,8CAA8C;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;;OAGG;IACH,SAAS,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACjC,4CAA4C;IAC5C,MAAM,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACpC,6CAA6C;IAC7C,OAAO,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC;IACtC,4DAA4D;IAC5D,IAAI,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,MAAM,GAAE,UAAe,GAAG,cAAc,CA+BlE;AA+BD,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,qFAAqF;AACrF,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,GAAG,SAAS,CAOrB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACjC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,GAAG,IAAI,CAWP"}

package/dist/otel.js

@@ -11,6 +11,7 @@
  * });
  * ```
  */
+import { context, trace } from "@opentelemetry/api";
 import { brandDefinition } from "./internal/brand.js";
 /** Author OpenTelemetry export under `agent/otel.ts`. */
 export function defineOtel(config = {}) {
@@ -62,3 +63,28 @@ function assertSampleRatio(traces) {
         throw new Error("defineOtel: traces.sampleRatio must be in [0, 1]");
     }
 }
+export const TRACEPARENT_HEADER = "traceparent";
+/** Cursor backend prefers this; `remoteSpanContextFromRequest` falls back to W3C. */
+export const BACKEND_TRACEPARENT_HEADER = "backend-traceparent";
+export function formatTraceparent(spanContext) {
+    if (!trace.isSpanContextValid(spanContext)) {
+        return undefined;
+    }
+    return `00-${spanContext.traceId}-${spanContext.spanId}-${spanContext.traceFlags.toString(16).padStart(2, "0")}`;
+}
+/**
+ * Copy the active span onto outbound headers as W3C `traceparent` and
+ * Cursor `backend-traceparent`. No-op when no valid span is active.
+ */
+export function injectActiveTraceContext(headers) {
+    const span = trace.getSpan(context.active());
+    if (span === undefined) {
+        return;
+    }
+    const traceparent = formatTraceparent(span.spanContext());
+    if (traceparent === undefined) {
+        return;
+    }
+    headers.set(TRACEPARENT_HEADER, traceparent);
+    headers.set(BACKEND_TRACEPARENT_HEADER, traceparent);
+}