Diego ImbertandClaude Opus 4.8 94295613aa Merge branch 'main' into free-token-limit ...

Catch up to main's latest 2 commits (AI agent evals #10633, AI token cost
tracking #10688), which the PR flagged as conflicting.

Resolutions, all keeping both sides:
- ai.rs AIConfig: keep our free_tier field alongside origin/main's model_pricing
  field + ModelPriceOverride struct/impl.
- aiStore.ts: import FreeTierInfo and ModelPriceOverride; carry both freeTier and
  modelPricing through copilotInfo.
- ContextUsageIndicator: keep our shared UsageMeter, import formatTokenCount from
  origin/main's new tokenUsage module.
- openapi.yaml / summarized_schema.txt: keep both the free-tier and the
  model-pricing / ai_token_usage schema additions.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

2026-08-24 15:05:04 +02:00

1.0 MiB

Raw Blame History