@codexhost/cli-darwin-x64 0.12.2 → 0.13.1

package/app/plugins/cursor-cli/plugin.mjs

@@ -2220,20 +2220,20 @@ var require_resolve = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count = 0;
+      let count2 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count++;
+        count2++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count2 += countKeys(sch));
         }
-        if (count === Infinity)
+        if (count2 === Infinity)
           return Infinity;
       }
-      return count;
+      return count2;
     }
     function getFullPath(resolver, id = "", normalize) {
       if (normalize !== false)
@@ -5411,8 +5411,8 @@ var require_contains = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count)));
+          const count2 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count2)));
         }
         function validateItems(_valid, block) {
           gen.forRange("i", 0, len, (i) => {
@@ -5425,16 +5425,16 @@ var require_contains = __commonJS({
             block();
           });
         }
-        function checkLimits(count) {
-          gen.code((0, codegen_1._)`${count}++`);
+        function checkLimits(count2) {
+          gen.code((0, codegen_1._)`${count2}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count2} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -8933,20 +8933,20 @@ var require_resolve2 = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count = 0;
+      let count2 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count++;
+        count2++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count2 += countKeys(sch));
         }
-        if (count === Infinity)
+        if (count2 === Infinity)
           return Infinity;
       }
-      return count;
+      return count2;
     }
     function getFullPath(resolver, id = "", normalize) {
       if (normalize !== false)
@@ -11309,8 +11309,8 @@ var require_contains2 = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count)));
+          const count2 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count2)));
         }
         function validateItems(_valid, block) {
           gen.forRange("i", 0, len, (i) => {
@@ -11323,16 +11323,16 @@ var require_contains2 = __commonJS({
             block();
           });
         }
-        function checkLimits(count) {
-          gen.code((0, codegen_1._)`${count}++`);
+        function checkLimits(count2) {
+          gen.code((0, codegen_1._)`${count2}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count2} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count2} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -12594,6 +12594,11 @@ var require_dist = __commonJS({
 var require_content_type = __commonJS({
   "../../../node_modules/content-type/index.js"(exports) {
     "use strict";
+    /*!
+     * content-type
+     * Copyright(c) 2015 Douglas Christopher Wilson
+     * MIT Licensed
+     */
     var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g;
     var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/;
     var TOKEN_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
@@ -17697,8 +17702,8 @@ function az_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/be.js
-function getBelarusianPlural(count, one2, few, many) {
-  const absCount = Math.abs(count);
+function getBelarusianPlural(count2, one2, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -19776,8 +19781,8 @@ function hu_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/hy.js
-function getArmenianPlural(count, one2, many) {
-  return Math.abs(count) === 1 ? one2 : many;
+function getArmenianPlural(count2, one2, many) {
+  return Math.abs(count2) === 1 ? one2 : many;
 }
 function withDefiniteArticle(word) {
   if (!word)
@@ -21905,8 +21910,8 @@ function ro_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/ru.js
-function getRussianPlural(count, one2, few, many) {
-  const absCount = Math.abs(count);
+function getRussianPlural(count2, one2, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -27575,6 +27580,15 @@ function date4(params) {
 // ../../../node_modules/zod/v4/classic/external.js
 config(en_default());
 
+// ../../shared-contracts/dist/delegation-read.js
+var REMOTE_THREAD_REPLY_MAX_BYTES = 16 * 1024 * 1024;
+var delegationReadParamsSchema = external_exports.strictObject({
+  threadId: external_exports.string().min(1).max(1024),
+  view: external_exports.enum(["result", "messages"]),
+  cursor: external_exports.string().min(1).max(8192).optional(),
+  limit: external_exports.number().int().min(1).max(100).optional()
+});
+
 // ../../shared-contracts/dist/credential-imports.js
 var credentialSourceSchema = external_exports.object({
   id: external_exports.string().min(1).max(256),
@@ -27645,6 +27659,160 @@ var harnessDisplaySetSchema = external_exports.strictObject({
   initializeOnly: external_exports.boolean().optional()
 });
 
+// ../../shared-contracts/dist/model-price-overrides.js
+var usdPerMillionTokens = external_exports.number().finite().nonnegative();
+var modelPriceOverrideSchema = external_exports.strictObject({
+  input: usdPerMillionTokens,
+  output: usdPerMillionTokens,
+  cacheRead: usdPerMillionTokens.optional(),
+  cacheWrite: usdPerMillionTokens.optional(),
+  cacheWrite1h: usdPerMillionTokens.optional()
+});
+var modelPriceKeySchema = external_exports.string().max(512).refine((key) => key.trim() === key && key.length > 0, "Model ID is required");
+var modelPriceOverridesSchema = external_exports.strictObject({
+  /** Absolute path of the Host's `pricing.json`. */
+  path: external_exports.string(),
+  entries: external_exports.array(external_exports.strictObject({ key: external_exports.string(), price: modelPriceOverrideSchema })),
+  /** Why the existing file is unusable; the Host then ignores it and refuses to overwrite it. */
+  error: external_exports.string().nullable()
+});
+var modelPriceOverridesGetSchema = external_exports.strictObject({});
+var modelPriceOverridesSetSchema = external_exports.strictObject({
+  key: modelPriceKeySchema,
+  price: modelPriceOverrideSchema.nullable(),
+  previousKey: modelPriceKeySchema.optional()
+});
+var modelPriceDefaultParamsSchema = external_exports.strictObject({
+  model: modelPriceKeySchema
+});
+var modelPriceSuggestionSchema = external_exports.strictObject({
+  /** Verified from catalog canonical links, not inferred from names or equal prices. */
+  official: external_exports.boolean().optional(),
+  canonicalModelId: external_exports.string().min(1).optional(),
+  provider: external_exports.string().min(1).max(512),
+  model: external_exports.string().min(1).max(512),
+  price: modelPriceOverrideSchema
+});
+var modelPriceDefaultResultSchema = external_exports.strictObject({
+  price: modelPriceOverrideSchema.nullable(),
+  /** Local catalog suggestions only; never used automatically for pricing. */
+  suggestions: external_exports.array(modelPriceSuggestionSchema).max(6).optional()
+});
+
+// ../../shared-contracts/dist/usage-statistics.js
+var USAGE_STATISTICS_RANGES = ["today", "7d", "30d", "90d", "all"];
+var count = external_exports.number().int().min(0).max(Number.MAX_SAFE_INTEGER);
+var localDate = external_exports.string().regex(/^\d{4}-\d{2}-\d{2}$/u);
+var harness = external_exports.string().min(1).max(128);
+var model = external_exports.string().min(1).max(512);
+var project = external_exports.string().min(1).max(4096);
+var usageStatisticsParamsSchema = external_exports.strictObject({
+  range: external_exports.enum(USAGE_STATISTICS_RANGES),
+  harness: harness.optional(),
+  model: model.nullable().optional(),
+  project: project.nullable().optional(),
+  /** One local date inside the range. */
+  date: localDate.optional()
+});
+var usageStatisticsTotalsSchema = external_exports.strictObject({
+  requests: count,
+  inputTokens: count,
+  cachedInputTokens: count,
+  cacheWriteInputTokens: count,
+  cacheKnownInputTokens: count,
+  outputTokens: count,
+  reasoningOutputTokens: count,
+  /** USD at the public price, summed over the priced requests only. */
+  costUsd: external_exports.number().finite().min(0),
+  /** Requests without a price (or the cache data the price needs); not in `costUsd`. */
+  unpricedRequests: count,
+  /**
+   * Requests whose storage gave no token counts: counted as requests, with neither tokens nor
+   * cost, and not as unpriced.
+   */
+  unmeteredRequests: count
+});
+var totals = usageStatisticsTotalsSchema.shape;
+var usageStatisticsSessionSchema = external_exports.strictObject({
+  harness,
+  sessionId: external_exports.string().min(1).max(512),
+  project: project.nullable(),
+  /** Persisted Desktop title for a mapped Session, otherwise its native name; may be absent. */
+  title: external_exports.string().min(1).max(200).optional(),
+  /** Models the session used, most requests first. */
+  models: external_exports.array(model).max(16),
+  firstAtMs: count,
+  lastAtMs: count,
+  ...totals
+});
+var usageStatisticsResultSchema = external_exports.strictObject({
+  range: external_exports.enum(USAGE_STATISTICS_RANGES),
+  /** First local date of the range; null for all time. */
+  from: localDate.nullable(),
+  to: localDate,
+  /** The filters these figures apply, echoed so a late answer to older filters is recognised. */
+  filters: external_exports.strictObject({
+    harness: harness.nullable(),
+    model: model.nullable(),
+    unknownModel: external_exports.boolean(),
+    project: project.nullable(),
+    unknownProject: external_exports.boolean(),
+    date: localDate.nullable()
+  }),
+  /** Reading of native storage: incomplete while the first read, or a refresh, is under way. */
+  reading: external_exports.strictObject({ complete: external_exports.boolean(), sources: count, read: count }),
+  /** Harnesses whose storage could not be read; their part is missing, the rest is complete. */
+  failures: external_exports.array(external_exports.strictObject({ harness, message: external_exports.string().max(2048) })).max(256),
+  /** Every value seen in the range, ignoring the filters, to choose filters from. */
+  options: external_exports.strictObject({
+    harnesses: external_exports.array(harness).max(256),
+    models: external_exports.array(model.nullable()).max(4096),
+    projects: external_exports.array(project.nullable()).max(4096)
+  }),
+  /** Current display metadata, scoped by Harness. Never a pricing or filter identity.
+   * Optional for older Hosts; missing/conflicting labels fall back to the native model ID.
+   */
+  modelLabels: external_exports.array(external_exports.strictObject({ harness, model, label: model })).max(4096).optional(),
+  /** Native credits, all filters applied, never combined across Harnesses or treated as USD.
+   * Only groups with at least one reported value appear; reportedRequests exposes partial data.
+   */
+  credits: external_exports.array(external_exports.strictObject({
+    harness,
+    model: model.nullable(),
+    credits: external_exports.number().finite().min(0),
+    reportedRequests: count,
+    requests: count
+  })).max(4096).optional(),
+  /** All filters applied. */
+  totals: usageStatisticsTotalsSchema,
+  /** Each date and Harness of the range: every filter except the day. */
+  daily: external_exports.array(external_exports.strictObject({ date: localDate, harness, ...totals })).max(2e5),
+  /** Local weekday (0 = Sunday) and hour, all filters applied. */
+  hourly: external_exports.array(external_exports.strictObject({
+    weekday: external_exports.number().int().min(0).max(6),
+    hour: external_exports.number().int().min(0).max(23),
+    ...totals
+  })).max(168),
+  byHarness: external_exports.array(external_exports.strictObject({ harness, ...totals })).max(256),
+  byModel: external_exports.array(external_exports.strictObject({
+    model: model.nullable(),
+    ...totals,
+    /** Requests priced by what the Harness recorded they cost, not by a price list. */
+    harnessPricedRequests: count
+  })).max(4096),
+  byProject: external_exports.array(external_exports.strictObject({ project: project.nullable(), ...totals })).max(4096),
+  /**
+   * The sessions that spent the most, by cost and by tokens without cache, all filters applied;
+   * requests without a native session are not listed here but count everywhere else.
+   */
+  sessions: external_exports.array(usageStatisticsSessionSchema).max(100),
+  /**
+   * The sessions last active in the range, newest first, all filters applied. Optional for older
+   * Hosts; missing is treated as no list rather than no sessions.
+   */
+  recentSessions: external_exports.array(usageStatisticsSessionSchema).max(100).optional()
+});
+
 // ../../shared-contracts/dist/ids.js
 var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
   message: "Identifier must not be empty or whitespace"
@@ -27692,6 +27860,10 @@ var CONSOLE_HOST_METHODS = Object.freeze([
   "codexhost/account/list",
   "codexhost/account/refresh",
   "codexhost/account/usage/inspect",
+  "codexhost/usage/model-prices/get",
+  "codexhost/usage/model-prices/set",
+  "codexhost/usage/model-prices/default",
+  "codexhost/usage/statistics/get",
   "codexhost/update/check",
   "codexhost/update/start",
   "codexhost/update/status"
@@ -27756,6 +27928,7 @@ var threadUsageSnapshotSchema = external_exports.object({
   cacheWriteInputTokens: nonNegativeSafeIntegerSchema.optional(),
   outputTokens: nonNegativeSafeIntegerSchema.optional(),
   outputTokensPerSecond: finiteNonNegativeNumberSchema.optional(),
+  apiOutputTokensPerSecond: finiteNonNegativeNumberSchema.optional(),
   reasoningOutputTokens: nonNegativeSafeIntegerSchema.optional(),
   totalTokens: nonNegativeSafeIntegerSchema.optional(),
   totalCostUsd: finiteNonNegativeNumberSchema.optional(),
@@ -27767,7 +27940,11 @@ var threadUsageSnapshotSchema = external_exports.object({
   planFiveHourUsedPercent: cacheHitRatePercentSchema.optional(),
   planFiveHourResetsAtUnix: nonNegativeSafeIntegerSchema.optional(),
   planSevenDayUsedPercent: cacheHitRatePercentSchema.optional(),
-  planSevenDayResetsAtUnix: nonNegativeSafeIntegerSchema.optional()
+  planSevenDayResetsAtUnix: nonNegativeSafeIntegerSchema.optional(),
+  sessionCacheHitRatePercent: cacheHitRatePercentSchema.optional(),
+  timeToFirstOutputMs: nonNegativeSafeIntegerSchema.optional(),
+  costSource: external_exports.enum(["publicPrice", "native"]).optional(),
+  unpricedModels: external_exports.array(external_exports.string().min(1)).min(1).optional()
 }).strict().superRefine((usage, context) => {
   if (Object.keys(usage).length === 0) {
     context.addIssue({ code: "custom", message: "Thread Usage must contain a reliable field" });
@@ -27788,6 +27965,20 @@ var threadUsageSnapshotSchema = external_exports.object({
       path: ["contextWindowTokens"]
     });
   }
+  if (usage.costSource !== void 0 && usage.totalCostUsd === void 0) {
+    context.addIssue({
+      code: "custom",
+      message: "Thread Usage costSource must be provided with totalCostUsd",
+      path: ["costSource"]
+    });
+  }
+  if (usage.unpricedModels !== void 0 && usage.costSource !== "publicPrice") {
+    context.addIssue({
+      code: "custom",
+      message: "Thread Usage unpricedModels must be provided with a publicPrice cost",
+      path: ["unpricedModels"]
+    });
+  }
   if (usage.planFiveHourResetsAtUnix !== void 0 && usage.planFiveHourUsedPercent === void 0) {
     context.addIssue({
       code: "custom",
@@ -28042,27 +28233,27 @@ var harnessModelCatalogSchema = external_exports.object({
 }).strict().superRefine((catalog, context) => {
   const refs = /* @__PURE__ */ new Set();
   const thinkingIds = new Set(catalog.thinkingOptions.map(({ id }) => id));
-  for (const [index, model] of catalog.models.entries()) {
-    if (refs.has(model.ref.id)) {
+  for (const [index, model2] of catalog.models.entries()) {
+    if (refs.has(model2.ref.id)) {
       context.addIssue({
         code: "custom",
         message: "Model Catalog refs must be unique",
         path: ["models", index, "ref", "id"]
       });
     }
-    refs.add(model.ref.id);
-    if (model.fastModel) {
-      if (refs.has(model.fastModel.id) || catalog.models.some((entry) => entry.ref.id === model.fastModel?.id)) {
+    refs.add(model2.ref.id);
+    if (model2.fastModel) {
+      if (refs.has(model2.fastModel.id) || catalog.models.some((entry) => entry.ref.id === model2.fastModel?.id)) {
         context.addIssue({
           code: "custom",
           message: "Fast Model refs must be distinct and unique",
           path: ["models", index, "fastModel"]
         });
       }
-      refs.add(model.fastModel.id);
+      refs.add(model2.fastModel.id);
     }
     const supportedThinkingIds = /* @__PURE__ */ new Set();
-    for (const [optionIndex, optionId] of (model.supportedThinkingOptionIds ?? []).entries()) {
+    for (const [optionIndex, optionId] of (model2.supportedThinkingOptionIds ?? []).entries()) {
       if (supportedThinkingIds.has(optionId)) {
         context.addIssue({
           code: "custom",
@@ -28256,13 +28447,40 @@ var HARNESS_PLUGIN_LIMIT = 128;
 var harnessPluginIdSchema = external_exports.string().min(1).max(128).regex(/^[a-z][a-z0-9]*(?:[._-][a-z0-9]+)*$/u).refine((id) => id !== "codex", "The official Codex identity is reserved").pipe(harnessIdSchema);
 var relativeResourceSchema = external_exports.string().min(1).max(512).refine((value) => !/[\\\u0000:#?]/u.test(value) && !value.startsWith("/") && !value.split("/").some((part) => part === ".." || part === ""), "Plugin resources must be relative paths inside the plugin");
 var documentationUrlSchema = external_exports.url().refine((value) => /^https:\/\/[^/?#@]+(?:[/?#]|$)/iu.test(value), "Plugin documentation links must be credential-free HTTPS URLs");
+var localizedTextSchema = external_exports.object({ en: external_exports.string().max(4096), "zh-CN": external_exports.string().max(4096).optional() }).strict();
+var harnessInstallationGuideSchema = external_exports.object({
+  commands: external_exports.array(external_exports.object({ terminal: external_exports.string().max(256), command: external_exports.string().max(4096) }).strict()).max(8),
+  before: localizedTextSchema.optional(),
+  after: localizedTextSchema.optional(),
+  downloads: external_exports.array(external_exports.object({ label: external_exports.string().max(128), url: documentationUrlSchema }).strict()).max(8).optional()
+}).strict();
 var pluginPresentationShape = {
   id: harnessPluginIdSchema,
   name: external_exports.string().trim().min(1).max(128),
   version: external_exports.string().min(1).max(128),
+  /** Capability-only plugin; omitted for existing session-capable plugins. */
+  kind: external_exports.literal("usage").optional(),
+  /** Original image styling or bounded vector paths; never arbitrary CSS/SVG markup. */
+  iconStyle: external_exports.object({
+    vector: external_exports.object({
+      viewBox: external_exports.string().max(128).regex(/^-?\d+(?:\.\d+)?(?: +-?\d+(?:\.\d+)?){3}$/u),
+      color: external_exports.string().regex(/^(?:currentColor|#[a-f0-9]{6})$/iu),
+      paths: external_exports.array(external_exports.object({
+        d: external_exports.string().min(1).max(32768).regex(/^[MmLlHhVvCcSsQqTtAaZz\d.,+eE\s-]+$/u),
+        fillRule: external_exports.enum(["evenodd", "nonzero"]).optional(),
+        fill: external_exports.string().regex(/^(?:currentColor|#[a-f0-9]{6})$/iu).optional()
+      }).strict()).min(1).max(32)
+    }).strict().optional(),
+    background: external_exports.string().regex(/^#[a-f0-9]{6}$/iu).optional(),
+    borderRadius: external_exports.number().min(0).max(50).optional(),
+    paddingRatio: external_exports.number().min(0).max(0.25).optional()
+  }).strict().optional(),
+  installation: harnessInstallationGuideSchema.optional(),
+  notice: localizedTextSchema.optional(),
   /** The factory accepts a persisted local entrypoint through its construction context. */
   launchCommand: external_exports.literal(true).optional(),
   links: external_exports.object({
+    website: documentationUrlSchema.optional(),
     documentation: documentationUrlSchema.optional(),
     installation: documentationUrlSchema.optional()
   }).strict().optional()
@@ -28681,6 +28899,11 @@ var codexSshDraftSchema = external_exports.strictObject({
 });
 var remoteConnectionsRequestSchema = external_exports.discriminatedUnion("action", [
   external_exports.strictObject({ action: external_exports.literal("list") }),
+  external_exports.strictObject({
+    action: external_exports.literal("read-thread"),
+    hostId: hostId.refine((id) => id !== "local"),
+    input: delegationReadParamsSchema
+  }),
   external_exports.strictObject({
     action: external_exports.literal("save"),
     draft: codexSshDraftSchema,
@@ -28836,10 +29059,12 @@ var tokenFields = [
 ];
 var safeIntegerFields = [
   "planFiveHourResetsAtUnix",
-  "planSevenDayResetsAtUnix"
+  "planSevenDayResetsAtUnix",
+  "timeToFirstOutputMs"
 ];
 var percentFields = [
   "cacheHitRatePercent",
+  "sessionCacheHitRatePercent",
   "planFiveHourUsedPercent",
   "planSevenDayUsedPercent"
 ];
@@ -28847,10 +29072,14 @@ var usageFields = /* @__PURE__ */ new Set([
   ...tokenFields,
   ...safeIntegerFields,
   ...percentFields,
+  "sessionCacheUsage",
   "totalCostUsd",
   "totalCredits",
   "contextUsagePercent",
-  "outputTokensPerSecond"
+  "outputTokensPerSecond",
+  "apiOutputTokensPerSecond",
+  "costSource",
+  "unpricedModels"
 ]);
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -28866,7 +29095,11 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage contains unknown field '${key}'`);
     }
   }
-  for (const field of ["totalCredits", "contextUsagePercent"]) {
+  for (const field of [
+    "totalCredits",
+    "contextUsagePercent",
+    "apiOutputTokensPerSecond"
+  ]) {
     const candidate = value[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
       throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
@@ -28896,6 +29129,12 @@ function parseHostUsage(value) {
       throw new Error(`Harness Usage '${field}' must be between 0 and 100`);
     }
   }
+  if (value.sessionCacheUsage !== void 0) {
+    const totals2 = value.sessionCacheUsage;
+    if (!isRecord(totals2) || Object.keys(totals2).some((key) => key !== "inputTokens" && key !== "cachedInputTokens") || typeof totals2.inputTokens !== "number" || !Number.isSafeInteger(totals2.inputTokens) || totals2.inputTokens < 0 || typeof totals2.cachedInputTokens !== "number" || !Number.isSafeInteger(totals2.cachedInputTokens) || totals2.cachedInputTokens < 0 || totals2.cachedInputTokens > totals2.inputTokens) {
+      throw new Error("Harness Usage 'sessionCacheUsage' must contain complete bounded token totals");
+    }
+  }
   const hasContextUsed = value.contextUsedTokens !== void 0;
   const hasContextWindow = value.contextWindowTokens !== void 0;
   if (hasContextUsed !== hasContextWindow) {
@@ -28910,8 +29149,43 @@ function parseHostUsage(value) {
   if (value.planSevenDayResetsAtUnix !== void 0 && value.planSevenDayUsedPercent === void 0) {
     throw new Error("Harness Usage 'planSevenDayResetsAtUnix' must be provided with 'planSevenDayUsedPercent'");
   }
+  if (value.costSource !== void 0) {
+    if (value.costSource !== "publicPrice" && value.costSource !== "native") {
+      throw new Error("Harness Usage 'costSource' must be 'publicPrice' or 'native'");
+    }
+    if (value.totalCostUsd === void 0) {
+      throw new Error("Harness Usage 'costSource' must be provided with 'totalCostUsd'");
+    }
+  }
+  if (value.unpricedModels !== void 0) {
+    const models = value.unpricedModels;
+    if (!Array.isArray(models) || models.length === 0 || !models.every((model2) => typeof model2 === "string" && model2.length > 0)) {
+      throw new Error("Harness Usage 'unpricedModels' must be a non-empty list of Model IDs");
+    }
+    if (value.costSource !== "publicPrice") {
+      throw new Error("Harness Usage 'unpricedModels' must be provided with a 'publicPrice' cost");
+    }
+    return { ...value, unpricedModels: [...models] };
+  }
   return { ...value };
 }
+var requestTokenFields = [
+  "inputTokens",
+  "cachedInputTokens",
+  "cacheWriteInputTokens",
+  "cacheWrite1hInputTokens",
+  "outputTokens",
+  "reasoningOutputTokens",
+  "startedAtMs",
+  "completedAtMs"
+];
+var requestFields = /* @__PURE__ */ new Set([
+  ...requestTokenFields,
+  "requestId",
+  "historical",
+  "model",
+  "provider"
+]);
 
 // ../../harness-adapter/dist/live-command-catalog.js
 var COMMON_EXCLUDED_LIVE_COMMANDS = /* @__PURE__ */ new Set([
@@ -29653,14 +29927,14 @@ function cursorModels(info) {
 function cursorCatalog(info) {
   const native = cursorModels(info);
   const thinking = /* @__PURE__ */ new Map();
-  const models = native.models.map((model) => {
-    const config2 = model.value === native.current ? info.configOptions : info.nativeModels?.find((entry) => entry.value === model.value)?.configOptions;
+  const models = native.models.map((model2) => {
+    const config2 = model2.value === native.current ? info.configOptions : info.nativeModels?.find((entry) => entry.value === model2.value)?.configOptions;
     const options = cursorThinking(config2);
     for (const { id, label } of options)
       thinking.set(id, { id, label });
     return {
-      ref: cursorConfiguredModelRef(model.value, config2),
-      label: model.name,
+      ref: cursorConfiguredModelRef(model2.value, config2),
+      label: model2.name,
       supportedThinkingOptionIds: options.map(({ id }) => id)
     };
   });
@@ -29677,13 +29951,13 @@ function cursorCatalog(info) {
 function parseCursorNativeModels(input) {
   if (!Array.isArray(input.models))
     throw new Error("Cursor returned no parameterized model catalog");
-  return input.models.map((model) => {
-    if (typeof model !== "object" || model === null || !("value" in model) || !("name" in model) || !("configOptions" in model) || typeof model.value !== "string" || typeof model.name !== "string" || !Array.isArray(model.configOptions))
+  return input.models.map((model2) => {
+    if (typeof model2 !== "object" || model2 === null || !("value" in model2) || !("name" in model2) || !("configOptions" in model2) || typeof model2.value !== "string" || typeof model2.name !== "string" || !Array.isArray(model2.configOptions))
       throw new Error("Invalid Cursor model metadata");
     return {
-      value: model.value,
-      name: model.name,
-      configOptions: model.configOptions.map((option) => {
+      value: model2.value,
+      name: model2.name,
+      configOptions: model2.configOptions.map((option) => {
         if (typeof option !== "object" || option === null || !("id" in option) || !("name" in option) || !("type" in option) || !("currentValue" in option) || !("options" in option) || typeof option.id !== "string" || typeof option.name !== "string" || option.type !== "select" || typeof option.currentValue !== "string" || !Array.isArray(option.options))
           throw new Error("Invalid Cursor parameter metadata");
         const entries = option.options.map((entry) => {
@@ -29704,7 +29978,7 @@ function parseCursorNativeModels(input) {
   });
 }
 function cursorModelSelection(info, ref) {
-  const exact = cursorModels(info).models.find((model2) => cursorModelRef(model2.value).id === ref);
+  const exact = cursorModels(info).models.find((model3) => cursorModelRef(model3.value).id === ref);
   if (exact)
     return [["model", exact.value]];
   if (!ref.startsWith("cursor."))
@@ -29713,8 +29987,8 @@ function cursorModelSelection(info, ref) {
   if (cursorModelRef(decoded).id !== ref)
     throw new Error("Invalid Cursor model reference");
   const match = /^([^\[\]]+)\[([^\[\]]*)\]$/u.exec(decoded);
-  const model = match && info.nativeModels?.find((entry) => entry.value === match[1]);
-  if (!match || !model)
+  const model2 = match && info.nativeModels?.find((entry) => entry.value === match[1]);
+  if (!match || !model2)
     throw new Error("Model is not in this Cursor session's native catalog");
   const parameters = [];
   for (const parameter of match[2] ? match[2].split(",") : []) {
@@ -29722,12 +29996,12 @@ function cursorModelSelection(info, ref) {
     const [id, value] = pair;
     if (pair.length !== 2 || !id || value === void 0 || parameters.some(([key]) => key === id))
       throw new Error("Invalid Cursor model parameters");
-    const option = model.configOptions.find((option2) => option2.id === id);
+    const option = model2.configOptions.find((option2) => option2.id === id);
     if (!option || option.type !== "select" || !option.options.flatMap((entry) => "value" in entry ? [entry] : entry.options).some((entry) => entry.value === value))
       throw new Error("Legacy Cursor model parameter is not selectable in the native catalog");
     parameters.push([id, value]);
   }
-  return [["model", model.value], ...parameters];
+  return [["model", model2.value], ...parameters];
 }
 function cursorCapabilities(info) {
   return {
@@ -29738,9 +30012,9 @@ function cursorCapabilities(info) {
     }
   };
 }
-function cursorConfiguredModelRef(model, options) {
+function cursorConfiguredModelRef(model2, options) {
   const parameters = (options ?? []).flatMap((option) => option.category === "model_config" && option.type === "select" ? [`${option.id}=${option.currentValue}`] : []);
-  return cursorModelRef(parameters.length ? `${model}[${parameters.join(",")}]` : model);
+  return cursorModelRef(parameters.length ? `${model2}[${parameters.join(",")}]` : model2);
 }
 
 // dist/transport.js
@@ -32030,9 +32304,9 @@ var Connection = class {
       return;
     }
     const responseBatch = isResponseBatch(batch);
-    const responseCount = responseBatch ? 0 : batch.reduce((count, message) => count + (isNotificationMessage(message) ? 0 : 1), 0);
+    const responseCount = responseBatch ? 0 : batch.reduce((count2, message) => count2 + (isNotificationMessage(message) ? 0 : 1), 0);
     let remaining = responseCount;
-    let remainingNotifications = batch.reduce((count, message) => count + (isNotificationMessage(message) ? 1 : 0), 0);
+    let remainingNotifications = batch.reduce((count2, message) => count2 + (isNotificationMessage(message) ? 1 : 0), 0);
     let responseSent = false;
     const responses = [];
     const sendResponsesIfReady = async () => {
@@ -45337,7 +45611,7 @@ async function createCursorDelegationBridge(cwd, environment, commandTimeoutMs =
     server.registerTool("harness_inspect", {
       description: "Read a Harness's native Models and Thinking choices. Use opaque IDs only when explicitly selecting; omission retains native defaults.",
       inputSchema: { harness: text, cwd: text.optional() }
-    }, ({ harness, cwd: cwd2 }) => run(["harness", "inspect", harness, ...optional2("--cwd", cwd2)]));
+    }, ({ harness: harness2, cwd: cwd2 }) => run(["harness", "inspect", harness2, ...optional2("--cwd", cwd2)]));
     server.registerTool("delegate_start", {
       description: "Start an independent task in another Harness when the user requests delegation. Returns immediately with a task link; use thread_wait for completion. Parent attribution and credentials come from this Cursor session. Do not delegate to Cursor: unattended inbound Cursor tasks are unsupported.",
       inputSchema: {
@@ -45348,15 +45622,15 @@ async function createCursorDelegationBridge(cwd, environment, commandTimeoutMs =
         thinking: text.optional(),
         requestId: text.optional()
       }
-    }, ({ harness, task, cwd: cwd2, model, thinking, requestId }) => run([
+    }, ({ harness: harness2, task, cwd: cwd2, model: model2, thinking, requestId }) => run([
       "delegate",
       "start",
       "--harness",
-      harness,
+      harness2,
       "--task",
       task,
       ...optional2("--cwd", cwd2),
-      ...optional2("--model", model),
+      ...optional2("--model", model2),
       ...optional2("--thinking", thinking),
       ...optional2("--request-id", requestId)
     ]));
@@ -45581,7 +45855,7 @@ var CursorTransport = class {
         return info;
       const modelOption = info.configOptions?.find((option) => option.id === "model");
       const available = modelOption?.type === "select" ? modelOption.options.flatMap((entry) => "value" in entry ? [entry] : entry.options) : void 0;
-      if (this.cachedModels?.length && available?.length === this.cachedModels.length && available.every((model) => this.cachedModels?.some((cached2) => cached2.value === model.value && cached2.name === model.name)))
+      if (this.cachedModels?.length && available?.length === this.cachedModels.length && available.every((model2) => this.cachedModels?.some((cached2) => cached2.value === model2.value && cached2.name === model2.name)))
         return { ...info, nativeModels: structuredClone(this.cachedModels) };
       try {
         const models = await this.#bounded(this.#connection.extMethod("cursor/list_available_models", {}));
@@ -46378,7 +46652,13 @@ var CursorTurnOutput = class {
   constructor(turnId, emit, nativeTurnIndex = 0) {
     this.turnId = turnId;
     this.emit = emit;
-    this.subagents = new CursorSubagents(turnId, emit, nativeTurnIndex);
+    this.subagents = new CursorSubagents(turnId, (event) => {
+      if (event.type === "item.started") {
+        this.#flushHold();
+        this.#finishText();
+      }
+      emit(event);
+    }, nativeTurnIndex);
   }
   sawWritableIterableClosed() {
     return this.#writableIterableClosed || takeCursorWritableIterableClosed(this.#hold).closed;
@@ -46428,11 +46708,8 @@ var CursorTurnOutput = class {
     this.#text = void 0;
   }
   update(notification) {
-    if (this.subagents.update(notification)) {
-      this.#flushHold();
-      this.#finishText();
+    if (this.subagents.update(notification))
       return;
-    }
     const { update } = notification;
     if (update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk") {
       if (update.content.type !== "text")
@@ -46448,12 +46725,12 @@ var CursorTurnOutput = class {
       this.#hold = hold;
       this.#appendText(type, emit);
     } else if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
-      this.#flushHold();
-      this.#finishText();
       if (this.#finishedTools.has(update.toolCallId))
         return;
       let tool = this.#tools.get(update.toolCallId);
       if (!tool) {
+        this.#flushHold();
+        this.#finishText();
         const args = jsonValueSchema.safeParse(update.rawInput ?? {});
         const item2 = {
           type: "toolExecution",
@@ -47253,7 +47530,7 @@ var CursorAdapter = class {
         throw staged.reason;
       if (!derived)
         throw new Error("Cursor native fork did not return a target");
-      const model = input.kind === "rollbackLastTurn" ? input.model ?? source?.initialState.effectiveModel : source?.initialState.effectiveModel;
+      const model2 = input.kind === "rollbackLastTurn" ? input.model ?? source?.initialState.effectiveModel : source?.initialState.effectiveModel;
       const thinking = input.kind === "rollbackLastTurn" ? input.thinkingOptionId ?? source?.initialState.effectiveThinkingOptionId : source?.initialState.effectiveThinkingOptionId;
       const mode = input.kind === "rollbackLastTurn" ? input.permissionModeId ?? source?.initialState.effectivePermissionModeId : source?.initialState.effectivePermissionModeId;
       const opened = await this.#openSession({
@@ -47261,7 +47538,7 @@ var CursorAdapter = class {
         cwd: input.cwd,
         environment: options.environment,
         nativeRef: cursorNativeSessionRef(derived.sessionId, executionPolicy),
-        ...model ? { model } : {},
+        ...model2 ? { model: model2 } : {},
         ...thinking ? { thinkingOptionId: thinking } : {},
         ...mode ? { permissionModeId: mode } : {}
       }, transport);
@@ -47477,9 +47754,9 @@ var CursorSession = class {
         if (!result.configOptions.some((option) => option.id === configId && option.currentValue === value))
           throw new Error("Cursor did not confirm configuration selection");
         this.info.configOptions = result.configOptions;
-        const model = result.configOptions.find((option) => option.id === "model");
-        if (model?.type === "select")
-          this.initialState.effectiveModel = cursorConfiguredModelRef(model.currentValue, result.configOptions);
+        const model2 = result.configOptions.find((option) => option.id === "model");
+        if (model2?.type === "select")
+          this.initialState.effectiveModel = cursorConfiguredModelRef(model2.currentValue, result.configOptions);
         const mode = result.configOptions.find((option) => option.id === "mode");
         if (mode)
           this.initialState.effectivePermissionModeId = harnessPermissionModeIdSchema.parse(mode.currentValue);
@@ -47902,6 +48179,8 @@ var harnessSessionStateSchema = external_exports.custom((value) => {
 var eventKeys = /* @__PURE__ */ new Map([
   ["session.state.changed", /* @__PURE__ */ new Set(["type", "state"])],
   ["session.usage.changed", /* @__PURE__ */ new Set(["type", "usage", "observedForTurnId"])],
+  ["usage.request", /* @__PURE__ */ new Set(["type", "request"])],
+  ["usage.history", /* @__PURE__ */ new Set(["type", "complete"])],
   ["subagent.state.changed", /* @__PURE__ */ new Set(["type", "nativeSubagentId", "status", "resultSummary"])],
   ["subagent.transcript.changed", /* @__PURE__ */ new Set(["type", "nativeSubagentId"])],
   ["turn.started", /* @__PURE__ */ new Set(["type", "turnId"])],
@@ -47950,6 +48229,8 @@ var harnessOutputSchema = external_exports.custom((value) => {
       return harnessSessionStateSchema.safeParse(event.state).success;
     if (event.type === "session.faulted")
       return harnessErrorSchema.safeParse(event.error).success;
+    if (event.type === "usage.history")
+      return typeof event.complete === "boolean";
     return true;
   }
   if (output.kind === "interaction") {