@genesislcap/ai-assistant 15.9.1 → 15.10.0-GENC-1480.2

package/dist/chat-driver.cjs

@@ -31,21 +31,36 @@ __export(chat_driver_node_exports, {
   REQUEST_CONTINUATION_TOOL: () => REQUEST_CONTINUATION_TOOL,
   SUPPORTED_ANTHROPIC_MODEL_IDS: () => SUPPORTED_ANTHROPIC_MODEL_IDS,
   SUPPORTED_GEMINI_MODEL_IDS: () => SUPPORTED_GEMINI_MODEL_IDS,
+  addUsage: () => addUsage,
   agenticActivityBus: () => agenticActivityBus,
   assembleDebugLog: () => assembleDebugLog,
   buildTimelineEntries: () => buildTimelineEntries,
   clearSession: () => clearSession,
   defineAgent: () => defineAgent,
   defineStatefulAgent: () => defineStatefulAgent,
+  emptyUsage: () => emptyUsage,
   friendlyFallbackAgent: () => friendlyFallbackAgent,
   getMetaEvents: () => getMetaEvents,
   isObservableAIProviderRegistry: () => isObservableAIProviderRegistry,
   restoreMachine: () => restoreMachine,
-  strictFallbackAgent: () => strictFallbackAgent
+  strictFallbackAgent: () => strictFallbackAgent,
+  sumUsage: () => sumUsage,
+  totalTokens: () => totalTokens
 });
 module.exports = __toCommonJS(chat_driver_node_exports);
 
 // ../../../../node_modules/tslib/tslib.es6.mjs
+function __rest(s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+    t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function")
+    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+      if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+        t[p[i]] = s[p[i]];
+    }
+  return t;
+}
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function(resolve) {
@@ -1102,6 +1117,277 @@ function scaleTemperature(normalized, { defaultTemp, maxTemp }) {
   return t <= DEFAULT_ANCHOR ? t / DEFAULT_ANCHOR * defaultTemp : defaultTemp + (t - DEFAULT_ANCHOR) / (1 - DEFAULT_ANCHOR) * (maxTemp - defaultTemp);
 }
 
+// ../../foundation-ai/dist/esm/utils/token-cost.js
+var TOKENS_PER_MILLION = 1e6;
+function anthropicRatesFor(model) {
+  if (model === "claude-haiku-4-5-20251001") {
+    return { promptPerMillion: 1, candidatePerMillion: 5 };
+  }
+  if (model === "claude-fable-5") {
+    return { promptPerMillion: 10, candidatePerMillion: 50 };
+  }
+  if (model === "claude-sonnet-5" || model === "claude-sonnet-4-6") {
+    return { promptPerMillion: 3, candidatePerMillion: 15 };
+  }
+  return { promptPerMillion: 5, candidatePerMillion: 25 };
+}
+var ANTHROPIC_CACHE_READ_MULTIPLIER = 0.1;
+var ANTHROPIC_CACHE_WRITE_5M_MULTIPLIER = 1.25;
+var ANTHROPIC_CACHE_WRITE_1H_MULTIPLIER = 2;
+function anthropicTokenCost(model, usage) {
+  const { promptPerMillion, candidatePerMillion } = anthropicRatesFor(model);
+  const m = TOKENS_PER_MILLION;
+  const cacheWrite5mTokens = Math.max(0, usage.cacheWriteTokens - usage.cacheWrite1hTokens);
+  const promptCost = usage.uncachedInputTokens / m * promptPerMillion;
+  const cacheReadCost = usage.cacheReadTokens / m * promptPerMillion * ANTHROPIC_CACHE_READ_MULTIPLIER;
+  const cacheWriteCost = cacheWrite5mTokens / m * promptPerMillion * ANTHROPIC_CACHE_WRITE_5M_MULTIPLIER + usage.cacheWrite1hTokens / m * promptPerMillion * ANTHROPIC_CACHE_WRITE_1H_MULTIPLIER;
+  const candidateCost = usage.outputTokens / m * candidatePerMillion;
+  const cacheReadFull = usage.cacheReadTokens / m * promptPerMillion;
+  const cacheWriteFull = usage.cacheWriteTokens / m * promptPerMillion;
+  return {
+    costUsd: promptCost + cacheReadCost + cacheWriteCost + candidateCost,
+    savedUsd: cacheReadFull - cacheReadCost + (cacheWriteFull - cacheWriteCost),
+    breakdown: {
+      promptUsd: promptCost,
+      cacheReadUsd: cacheReadCost,
+      cacheWriteUsd: cacheWriteCost,
+      candidateUsd: candidateCost
+    }
+  };
+}
+var GEMINI_LONG_CONTEXT_THRESHOLD = 2e5;
+var GEMINI_CACHED_INPUT_MULTIPLIER = 0.1;
+var GEMINI_PRICING = {
+  "gemini-2.5-flash-lite": {
+    kind: "flat",
+    rate: { promptPerMillion: 0.1, candidatePerMillion: 0.4 }
+  },
+  "gemini-2.5-flash": { kind: "flat", rate: { promptPerMillion: 0.3, candidatePerMillion: 2.5 } },
+  "gemini-2.5-pro": {
+    kind: "tiered",
+    standard: { promptPerMillion: 1.25, candidatePerMillion: 10 },
+    longContext: { promptPerMillion: 2.5, candidatePerMillion: 15 }
+  },
+  "gemini-3.1-flash-lite": {
+    kind: "flat",
+    rate: { promptPerMillion: 0.25, candidatePerMillion: 1.5 }
+  },
+  "gemini-3.5-flash": { kind: "flat", rate: { promptPerMillion: 1.5, candidatePerMillion: 9 } },
+  "gemini-3.1-pro-preview": {
+    kind: "tiered",
+    standard: { promptPerMillion: 2, candidatePerMillion: 12 },
+    longContext: { promptPerMillion: 4, candidatePerMillion: 18 }
+  }
+};
+function geminiRatesFor(model, promptTokens) {
+  const pricing = GEMINI_PRICING[model];
+  if (pricing.kind === "flat") {
+    return pricing.rate;
+  }
+  return promptTokens > GEMINI_LONG_CONTEXT_THRESHOLD ? pricing.longContext : pricing.standard;
+}
+function geminiTokenCost(model, usage) {
+  const { promptPerMillion, candidatePerMillion } = geminiRatesFor(model, usage.promptTokens);
+  const m = TOKENS_PER_MILLION;
+  const uncachedPromptTokens = Math.max(0, usage.promptTokens - usage.cachedTokens);
+  const promptCost = uncachedPromptTokens / m * promptPerMillion;
+  const cacheReadCost = usage.cachedTokens / m * promptPerMillion * GEMINI_CACHED_INPUT_MULTIPLIER;
+  const candidateCost = (usage.candidateTokens + usage.thoughtTokens) / m * candidatePerMillion;
+  return {
+    costUsd: promptCost + cacheReadCost + candidateCost,
+    // Implicit caching has no write premium, so this is always >= 0.
+    savedUsd: usage.cachedTokens / m * promptPerMillion - cacheReadCost,
+    breakdown: {
+      promptUsd: promptCost,
+      cacheReadUsd: cacheReadCost,
+      cacheWriteUsd: 0,
+      candidateUsd: candidateCost
+    }
+  };
+}
+
+// ../../foundation-ai/dist/esm/utils/tool-schema.js
+var SCHEMA_MAP_KEYS = ["properties", "patternProperties", "$defs", "definitions"];
+var SCHEMA_LIST_KEYS = ["anyOf", "oneOf", "allOf", "prefixItems"];
+var SCHEMA_VALUE_KEYS = [
+  "items",
+  "not",
+  "additionalProperties",
+  "propertyNames",
+  "contains"
+];
+var isPlainObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+function cloneValue(value) {
+  if (Array.isArray(value))
+    return value.map(cloneValue);
+  if (isPlainObject2(value)) {
+    const out = {};
+    for (const [k, v] of Object.entries(value))
+      out[k] = cloneValue(v);
+    return out;
+  }
+  return value;
+}
+function mapChildSchemas(node, visit, path) {
+  const out = {};
+  for (const [key, value] of Object.entries(node)) {
+    const here = `${path}/${key}`;
+    if (SCHEMA_MAP_KEYS.includes(key) && isPlainObject2(value)) {
+      out[key] = Object.fromEntries(Object.entries(value).map(([name, child]) => [
+        name,
+        isPlainObject2(child) ? visit(child, `${here}/${name}`) : cloneValue(child)
+      ]));
+    } else if (SCHEMA_LIST_KEYS.includes(key) && Array.isArray(value)) {
+      out[key] = value.map((child, i) => isPlainObject2(child) ? visit(child, `${here}/${i}`) : cloneValue(child));
+    } else if (SCHEMA_VALUE_KEYS.includes(key)) {
+      if (isPlainObject2(value))
+        out[key] = visit(value, here);
+      else if (Array.isArray(value))
+        out[key] = value.map((child, i) => isPlainObject2(child) ? visit(child, `${here}/${i}`) : cloneValue(child));
+      else
+        out[key] = cloneValue(value);
+    } else {
+      out[key] = cloneValue(value);
+    }
+  }
+  return out;
+}
+function mapSchema(node, transform, path = "") {
+  return transform(mapChildSchemas(node, (child, childPath) => mapSchema(child, transform, childPath), path), path);
+}
+var UNENFORCEABLE_KEYWORDS = [
+  "minimum",
+  "maximum",
+  "exclusiveMinimum",
+  "exclusiveMaximum",
+  "multipleOf",
+  "maxItems",
+  "uniqueItems",
+  "minProperties",
+  "maxProperties"
+];
+var UNDROPPABLE_KEYWORDS = ["oneOf", "not"];
+function toEnforcedAnthropicSchema(parameters) {
+  const stripped = [];
+  const overridden = [];
+  const undroppable = [];
+  const schema = mapSchema(parameters, (node, path) => {
+    for (const keyword of UNENFORCEABLE_KEYWORDS) {
+      if (keyword in node) {
+        delete node[keyword];
+        stripped.push(`${path}/${keyword}`);
+      }
+    }
+    if (typeof node.minItems === "number" && node.minItems > 1) {
+      delete node.minItems;
+      stripped.push(`${path}/minItems`);
+    }
+    for (const keyword of UNDROPPABLE_KEYWORDS) {
+      if (keyword in node)
+        undroppable.push(`${path}/${keyword}`);
+    }
+    const isObjectNode = node.type === "object" || Array.isArray(node.type) && node.type.includes("object") || isPlainObject2(node.properties);
+    if (isObjectNode) {
+      if (node.additionalProperties !== false) {
+        if (node.additionalProperties !== void 0) {
+          overridden.push(`${path}/additionalProperties`);
+        }
+        node.additionalProperties = false;
+      }
+    }
+    return node;
+  });
+  return { schema, stripped, overridden, undroppable };
+}
+function enforceAnthropicToolSchema(parameters, toolName) {
+  const { schema, stripped, overridden, undroppable } = toEnforcedAnthropicSchema(parameters);
+  if (stripped.length) {
+    logger.warn(`AnthropicTransport: tool "${toolName}" requested schema enforcement; these keywords cannot be enforced and were removed \u2014 validate them yourself: ${stripped.join(", ")}`);
+  }
+  if (overridden.length) {
+    logger.warn(`AnthropicTransport: tool "${toolName}" requested schema enforcement, which requires closed objects; \`additionalProperties\` was set to false at: ${overridden.join(", ")}. The tool now accepts fewer inputs than its schema declared.`);
+  }
+  if (undroppable.length) {
+    logger.warn(`AnthropicTransport: tool "${toolName}" uses schema keywords enforcement cannot express (${undroppable.join(", ")}). They cannot be removed without changing the schema's meaning, so the request will be rejected. Rewrite them or drop enforceSchema for this tool.`);
+  }
+  return schema;
+}
+var GEMINI_UNSUPPORTED_KEYWORDS = [
+  "additionalProperties",
+  "examples",
+  "multipleOf",
+  "patternProperties",
+  // Both spellings of the definitions block. `$defs` would also fall to the
+  // `$`-prefix sweep below, but the draft-07 spelling has no `$` and would
+  // otherwise survive inlining and 400 the request — so list the pair together.
+  "$defs",
+  "definitions"
+];
+function resolvePointer(root, ref) {
+  if (!ref.startsWith("#/"))
+    return void 0;
+  let current = root;
+  for (const segment of ref.slice(2).split("/")) {
+    if (!isPlainObject2(current))
+      return void 0;
+    current = current[segment.replace(/~1/g, "/").replace(/~0/g, "~")];
+  }
+  return isPlainObject2(current) ? current : void 0;
+}
+function inlineRefs(root, node, seen, unresolved) {
+  let current = node;
+  let visited = seen;
+  let ref = typeof current.$ref === "string" ? current.$ref : void 0;
+  while (ref && !visited.has(ref)) {
+    const target = resolvePointer(root, ref);
+    if (!target)
+      break;
+    const { $ref: _dropped } = current, siblings = __rest(current, ["$ref"]);
+    current = Object.assign(Object.assign({}, cloneValue(target)), siblings);
+    visited = /* @__PURE__ */ new Set([...visited, ref]);
+    ref = typeof current.$ref === "string" ? current.$ref : void 0;
+  }
+  if (typeof current.$ref === "string")
+    unresolved.push(current.$ref);
+  return mapChildSchemas(current, (child) => inlineRefs(root, child, visited, unresolved), "");
+}
+function toGeminiSchema(parameters) {
+  const unresolved = [];
+  const inlined = inlineRefs(parameters, parameters, /* @__PURE__ */ new Set(), unresolved);
+  if (unresolved.length) {
+    logger.warn(`GeminiTransport: these \`$ref\` pointers could not be inlined \u2014 a cycle, a typo, or an external ref: ${[...new Set(unresolved)].join(", ")}. They are left in the schema, so Gemini will reject this declaration; that is deliberate, because dropping them would send a node that constrains nothing.`);
+  }
+  const translated = mapSchema(inlined, (node) => {
+    if (Array.isArray(node.type)) {
+      const types = node.type.filter((t) => t !== "null");
+      if (types.length === 1 && node.type.length !== types.length) {
+        node.type = types[0];
+        node.nullable = true;
+      }
+    }
+    if (Array.isArray(node.anyOf)) {
+      const branches = node.anyOf.filter(isPlainObject2);
+      const nonNull = branches.filter((b) => b.type !== "null");
+      if (branches.length === 2 && nonNull.length === 1) {
+        const { anyOf: _dropped } = node, siblings = __rest(node, ["anyOf"]);
+        return Object.assign(Object.assign(Object.assign({}, nonNull[0]), siblings), { nullable: true });
+      }
+    }
+    if ("const" in node) {
+      node.enum = [node.const];
+      delete node.const;
+    }
+    for (const keyword of GEMINI_UNSUPPORTED_KEYWORDS)
+      delete node[keyword];
+    for (const key of Object.keys(node)) {
+      if (key.startsWith("$") && key !== "$ref")
+        delete node[key];
+    }
+    return node;
+  });
+  return translated;
+}
+
 // ../../foundation-ai/dist/esm/utils/abort-reason.js
 function authoritativeAbortReason(error, timeoutSignal, callerSignal) {
   const abortShaped = (error instanceof DOMException || error instanceof Error) && (error.name === "AbortError" || error.name === "TimeoutError");
@@ -1321,18 +1607,6 @@ function assertSupportedAnthropicModel(model) {
     throw new Error(`AnthropicTransport: unsupported model "${model}". Use one of: ${SUPPORTED_ANTHROPIC_MODEL_IDS.join(", ")}.`);
   }
 }
-function estimatedAnthropicRatesUsdPerMillion(model) {
-  if (model === "claude-haiku-4-5-20251001") {
-    return { promptPerMillion: 1, candidatePerMillion: 5 };
-  }
-  if (model === "claude-fable-5") {
-    return { promptPerMillion: 10, candidatePerMillion: 50 };
-  }
-  if (model === "claude-sonnet-5" || model === "claude-sonnet-4-6") {
-    return { promptPerMillion: 3, candidatePerMillion: 15 };
-  }
-  return { promptPerMillion: 5, candidatePerMillion: 25 };
-}
 function rejectsSamplingParams(model) {
   return model === "claude-fable-5" || model === "claude-opus-4-8" || model === "claude-opus-4-7" || model === "claude-sonnet-5";
 }
@@ -1344,9 +1618,6 @@ function anthropicThinking(model) {
     return void 0;
   return { type: "adaptive", display: "summarized" };
 }
-var ANTHROPIC_CACHE_READ_MULTIPLIER = 0.1;
-var ANTHROPIC_CACHE_WRITE_5M_MULTIPLIER = 1.25;
-var ANTHROPIC_CACHE_WRITE_1H_MULTIPLIER = 2;
 var ResponseTruncatedError = class extends Error {
   constructor(model, maxTokens, outputTokens, toolNames) {
     super(`Response truncated at ${maxTokens != null ? `the max_tokens cap (${maxTokens})` : "the model's output-token limit"} for model ${model}` + (toolNames.length > 0 ? ` while emitting tool call(s): ${toolNames.join(", ")}` : "") + ". The output exceeds the per-response limit \u2014 raise the provider maxTokens (where configurable) or split the work into smaller outputs.");
@@ -1452,11 +1723,7 @@ var AnthropicTransport = class _AnthropicTransport {
       if (options === null || options === void 0 ? void 0 : options.systemPrompt)
         body.system = options.systemPrompt;
       if ((_a = options === null || options === void 0 ? void 0 : options.tools) === null || _a === void 0 ? void 0 : _a.length) {
-        body.tools = options.tools.map((t) => ({
-          name: t.name,
-          description: t.description,
-          input_schema: t.parameters
-        }));
+        body.tools = options.tools.map((t) => Object.assign({ name: t.name, description: t.description, input_schema: t.enforceSchema ? enforceAnthropicToolSchema(t.parameters, t.name) : t.parameters }, t.enforceSchema ? { strict: true } : {}));
       }
       if ((_b = body.tools) === null || _b === void 0 ? void 0 : _b.length) {
         const toolChoice = toAnthropicToolChoice(options === null || options === void 0 ? void 0 : options.toolChoice);
@@ -1549,30 +1816,26 @@ var AnthropicTransport = class _AnthropicTransport {
    * message.
    */
   logTokenUsage(promptTokens, candidateTokens, cacheReadTokens, cacheCreationTokens, cacheCreation1hTokens) {
-    const { promptPerMillion, candidatePerMillion } = estimatedAnthropicRatesUsdPerMillion(this.model);
-    const m = _AnthropicTransport.TOKENS_PER_MILLION;
-    const cacheCreation5mTokens = Math.max(0, cacheCreationTokens - cacheCreation1hTokens);
-    const promptCost = promptTokens / m * promptPerMillion;
-    const cacheReadCost = cacheReadTokens / m * promptPerMillion * ANTHROPIC_CACHE_READ_MULTIPLIER;
-    const cacheWriteCost = cacheCreation5mTokens / m * promptPerMillion * ANTHROPIC_CACHE_WRITE_5M_MULTIPLIER + cacheCreation1hTokens / m * promptPerMillion * ANTHROPIC_CACHE_WRITE_1H_MULTIPLIER;
-    const candidateCost = candidateTokens / m * candidatePerMillion;
-    const totalCost = promptCost + cacheReadCost + cacheWriteCost + candidateCost;
-    this.lifetimeCostUsd += totalCost;
-    const cacheReadFull = cacheReadTokens / m * promptPerMillion;
-    const cacheWriteFull = cacheCreationTokens / m * promptPerMillion;
-    const saved = cacheReadFull - cacheReadCost + (cacheWriteFull - cacheWriteCost);
-    this.lifetimeSavingsUsd += saved;
+    const { costUsd, savedUsd, breakdown } = anthropicTokenCost(this.model, {
+      uncachedInputTokens: promptTokens,
+      outputTokens: candidateTokens,
+      cacheReadTokens,
+      cacheWriteTokens: cacheCreationTokens,
+      cacheWrite1hTokens: cacheCreation1hTokens
+    });
+    this.lifetimeCostUsd += costUsd;
+    this.lifetimeSavingsUsd += savedUsd;
     const dp = _AnthropicTransport.COST_DECIMAL_PLACES;
     console.log(`--- Anthropic Token Usage (${this.model}) ---`);
-    console.log(`Prompt Tokens:    ${promptTokens} ($${promptCost.toFixed(dp)})`);
-    console.log(`Cache Read:       ${cacheReadTokens} ($${cacheReadCost.toFixed(dp)})`);
-    console.log(`Cache Write:      ${cacheCreationTokens} ($${cacheWriteCost.toFixed(dp)})`);
-    console.log(`Candidate Tokens: ${candidateTokens} ($${candidateCost.toFixed(dp)})`);
-    console.log(`Total Cost:       $${totalCost.toFixed(dp)}`);
-    console.log(`Cache Saved:      $${saved.toFixed(dp)} (lifetime $${this.lifetimeSavingsUsd.toFixed(dp)})`);
+    console.log(`Prompt Tokens:    ${promptTokens} ($${breakdown.promptUsd.toFixed(dp)})`);
+    console.log(`Cache Read:       ${cacheReadTokens} ($${breakdown.cacheReadUsd.toFixed(dp)})`);
+    console.log(`Cache Write:      ${cacheCreationTokens} ($${breakdown.cacheWriteUsd.toFixed(dp)})`);
+    console.log(`Candidate Tokens: ${candidateTokens} ($${breakdown.candidateUsd.toFixed(dp)})`);
+    console.log(`Total Cost:       $${costUsd.toFixed(dp)}`);
+    console.log(`Cache Saved:      $${savedUsd.toFixed(dp)} (lifetime $${this.lifetimeSavingsUsd.toFixed(dp)})`);
     console.log(`Lifetime Cost:    $${this.lifetimeCostUsd.toFixed(dp)}`);
     console.log("--------------------------");
-    return totalCost;
+    return costUsd;
   }
   /**
    * Convert the internal `ChatMessage[]` history into Anthropic's message format.
@@ -1995,37 +2258,6 @@ function assertSupportedGeminiModel(model) {
     throw new Error(`GeminiTransport: unsupported model "${model}". Use one of: ${SUPPORTED_GEMINI_MODEL_IDS.join(", ")}.`);
   }
 }
-var GEMINI_LONG_CONTEXT_THRESHOLD = 2e5;
-var GEMINI_CACHED_INPUT_MULTIPLIER = 0.1;
-var GEMINI_PRICING = {
-  "gemini-2.5-flash-lite": {
-    kind: "flat",
-    rate: { promptPerMillion: 0.1, candidatePerMillion: 0.4 }
-  },
-  "gemini-2.5-flash": { kind: "flat", rate: { promptPerMillion: 0.3, candidatePerMillion: 2.5 } },
-  "gemini-2.5-pro": {
-    kind: "tiered",
-    standard: { promptPerMillion: 1.25, candidatePerMillion: 10 },
-    longContext: { promptPerMillion: 2.5, candidatePerMillion: 15 }
-  },
-  "gemini-3.1-flash-lite": {
-    kind: "flat",
-    rate: { promptPerMillion: 0.25, candidatePerMillion: 1.5 }
-  },
-  "gemini-3.5-flash": { kind: "flat", rate: { promptPerMillion: 1.5, candidatePerMillion: 9 } },
-  "gemini-3.1-pro-preview": {
-    kind: "tiered",
-    standard: { promptPerMillion: 2, candidatePerMillion: 12 },
-    longContext: { promptPerMillion: 4, candidatePerMillion: 18 }
-  }
-};
-function estimatedGeminiPaidRatesUsdPerMillion(model, promptTokens) {
-  const pricing = GEMINI_PRICING[model];
-  if (pricing.kind === "flat") {
-    return pricing.rate;
-  }
-  return promptTokens > GEMINI_LONG_CONTEXT_THRESHOLD ? pricing.longContext : pricing.standard;
-}
 var GEMINI_MODEL_WARNINGS = {
   "gemini-2.5-flash": "GeminiTransport: using gemini-2.5-flash \u2014 higher cost than flash-lite; use for harder reasoning or agent tasks.",
   "gemini-2.5-pro": "GeminiTransport: using gemini-2.5-pro \u2014 significantly higher, prompt-size-tiered cost; reserve for tasks where flash reliability is insufficient.",
@@ -2106,7 +2338,7 @@ var GeminiTransport = class _GeminiTransport {
           functionDeclarations: options.tools.map((t) => ({
             name: t.name,
             description: t.description,
-            parameters: t.parameters
+            parameters: toGeminiSchema(t.parameters)
           }))
         }
       ] : void 0;
@@ -2129,7 +2361,7 @@ var GeminiTransport = class _GeminiTransport {
         systemInstruction,
         toolConfig,
         generationConfig
-      }, applyResponseSchema ? { responseSchema: options.responseSchema } : {}), options === null || options === void 0 ? void 0 : options.signal);
+      }, applyResponseSchema ? { responseSchema: toGeminiSchema(options.responseSchema) } : {}), options === null || options === void 0 ? void 0 : options.signal);
       return this.fromGeminiResponse(response, offeredToolNames);
     });
   }
@@ -2139,25 +2371,23 @@ var GeminiTransport = class _GeminiTransport {
    * message.
    */
   logTokenUsage(promptTokens, candidateTokens, thoughtTokens, cachedTokens) {
-    const { promptPerMillion, candidatePerMillion } = estimatedGeminiPaidRatesUsdPerMillion(this.model, promptTokens);
-    const m = _GeminiTransport.TOKENS_PER_MILLION;
-    const uncachedPromptTokens = Math.max(0, promptTokens - cachedTokens);
-    const promptCost = uncachedPromptTokens / m * promptPerMillion;
-    const cacheReadCost = cachedTokens / m * promptPerMillion * GEMINI_CACHED_INPUT_MULTIPLIER;
-    const candidateCost = (candidateTokens + thoughtTokens) / m * candidatePerMillion;
-    const totalCost = promptCost + cacheReadCost + candidateCost;
-    this.lifetimeCostUsd += totalCost;
-    const saved = cachedTokens / m * promptPerMillion - cacheReadCost;
-    this.lifetimeSavingsUsd += saved;
+    const { costUsd, savedUsd, breakdown } = geminiTokenCost(this.model, {
+      promptTokens,
+      candidateTokens,
+      thoughtTokens,
+      cachedTokens
+    });
+    this.lifetimeCostUsd += costUsd;
+    this.lifetimeSavingsUsd += savedUsd;
     const dp = _GeminiTransport.COST_DECIMAL_PLACES;
     console.log(`--- Gemini Token Usage (${this.model}) ---`);
-    console.log(`Prompt Tokens:    ${promptTokens} (${cachedTokens} cached) ($${promptCost.toFixed(dp)} + $${cacheReadCost.toFixed(dp)})`);
-    console.log(`Candidate Tokens: ${candidateTokens} (+${thoughtTokens} thinking) ($${candidateCost.toFixed(dp)})`);
-    console.log(`Total Cost:       $${totalCost.toFixed(dp)}`);
-    console.log(`Cache Saved:      $${saved.toFixed(dp)} (lifetime $${this.lifetimeSavingsUsd.toFixed(dp)})`);
+    console.log(`Prompt Tokens:    ${promptTokens} (${cachedTokens} cached) ($${breakdown.promptUsd.toFixed(dp)} + $${breakdown.cacheReadUsd.toFixed(dp)})`);
+    console.log(`Candidate Tokens: ${candidateTokens} (+${thoughtTokens} thinking) ($${breakdown.candidateUsd.toFixed(dp)})`);
+    console.log(`Total Cost:       $${costUsd.toFixed(dp)}`);
+    console.log(`Cache Saved:      $${savedUsd.toFixed(dp)} (lifetime $${this.lifetimeSavingsUsd.toFixed(dp)})`);
     console.log(`Lifetime Cost:    $${this.lifetimeCostUsd.toFixed(dp)}`);
     console.log("--------------------------");
-    return totalCost;
+    return costUsd;
   }
   toGeminiContents(history, userMessage, attachments) {
     var _a, _b, _c;
@@ -3122,6 +3352,18 @@ function emptyUsage() {
     outputTokens: 0
   };
 }
+function totalTokens(usage) {
+  return usage.uncachedInputTokens + usage.cacheReadTokens + usage.cacheWriteTokens + usage.outputTokens;
+}
+function addUsage(a, b) {
+  return {
+    costUsd: a.costUsd + b.costUsd,
+    uncachedInputTokens: a.uncachedInputTokens + b.uncachedInputTokens,
+    cacheReadTokens: a.cacheReadTokens + b.cacheReadTokens,
+    cacheWriteTokens: a.cacheWriteTokens + b.cacheWriteTokens,
+    outputTokens: a.outputTokens + b.outputTokens
+  };
+}
 function sumUsage(messages) {
   const total = emptyUsage();
   accumulate(messages, total);
@@ -6108,16 +6350,20 @@ function assembleDebugLog(entries, readme) {
   REQUEST_CONTINUATION_TOOL,
   SUPPORTED_ANTHROPIC_MODEL_IDS,
   SUPPORTED_GEMINI_MODEL_IDS,
+  addUsage,
   agenticActivityBus,
   assembleDebugLog,
   buildTimelineEntries,
   clearSession,
   defineAgent,
   defineStatefulAgent,
+  emptyUsage,
   friendlyFallbackAgent,
   getMetaEvents,
   isObservableAIProviderRegistry,
   restoreMachine,
-  strictFallbackAgent
+  strictFallbackAgent,
+  sumUsage,
+  totalTokens
 });
 //# sourceMappingURL=chat-driver.cjs.map