Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(models): restrict summary quotes to exact or estimated prices
fmfsaisai937faab4dce2
diff --git a/apps/desktop/scripts/fixtures/display-pricing/display-pricing-fixture.tsx b/apps/desktop/scripts/fixtures/display-pricing/display-pricing-fixture.tsxindex 8fa995a9d1..d79f6b8fda 100644--- a/apps/desktop/scripts/fixtures/display-pricing/display-pricing-fixture.tsx+++ b/apps/desktop/scripts/fixtures/display-pricing/display-pricing-fixture.tsx@@ -36,7 +36,6 @@ const video: ModelDisplayPricing = {tier: '480P/720P/1080P',unit: 'second',quantity: 1,- priceType: 'starting_at',},],},diff --git a/apps/desktop/src/renderer/components/DisplayPricingDetails.tsx b/apps/desktop/src/renderer/components/DisplayPricingDetails.tsxindex 74f7f85a5d..b09bcc1e9b 100644--- a/apps/desktop/src/renderer/components/DisplayPricingDetails.tsx+++ b/apps/desktop/src/renderer/components/DisplayPricingDetails.tsx@@ -20,7 +20,7 @@ export function DisplayPricingQuote({currency,costDiscount,}: {- quote: SummaryQuote;+ quote: SummaryQuote | ModelDisplayPricing['items'][number];currency: 'CNY' | 'USD';costDiscount?: number;}) {diff --git a/apps/desktop/src/renderer/components/__tests__/DisplayPricingDetails.test.tsx b/apps/desktop/src/renderer/components/__tests__/DisplayPricingDetails.test.tsxindex 6b687c9d7b..a63c18428c 100644--- a/apps/desktop/src/renderer/components/__tests__/DisplayPricingDetails.test.tsx+++ b/apps/desktop/src/renderer/components/__tests__/DisplayPricingDetails.test.tsx@@ -3,7 +3,7 @@ import { cleanup, render, screen, within } from '@testing-library/react';import { afterEach, describe, expect, it } from 'vitest';import { createInstance } from 'i18next';import { I18nextProvider } from 'react-i18next';-import type { CatalogModel } from '@cindy/model-providers';+import { parseModelDisplayPricing, type CatalogModel } from '@cindy/model-providers';import en from '@/i18n/locales/en/common.json';import zhCN from '@/i18n/locales/zh-CN/common.json';import zhTW from '@/i18n/locales/zh-TW/common.json';@@ -28,6 +28,21 @@ async function renderPricing(model: PricingModel, locale: keyof typeof locales =afterEach(cleanup);describe('DisplayPricingDetails', () => {+ // Unit contract: summary starting_at is invalid, but published item starting_at remains visible.+ // Previous render cases bypassed parsing; minimum input is the same qualifier on one item and summary.+ it('preserves and renders item starting prices after discarding an invalid summary', async () => {+ const displayPricing = parseModelDisplayPricing({+ items: [{ ...item, priceType: 'starting_at' }],+ summary: { output: [{ ...item, priceType: 'starting_at' }] },+ });+ expect(displayPricing?.summary).toBeUndefined();+ expect(displayPricing?.items).toEqual([{ ...item, priceType: 'starting_at' }]);+ await renderPricing({ currency: 'CNY', displayPricing }, 'zh-CN');+ expect(screen.getByText('Output')).toBeTruthy();+ expect(screen.getByText('¥0.5 起')).toBeTruthy();+ expect(screen.getByText('/ 秒')).toBeTruthy();+ });+it('groups repeated labels in first-seen order and keeps tiers, quote qualifiers and notes', async () => {const { container } = await renderPricing({currency: 'USD',@@ -84,13 +99,13 @@ describe('DisplayPricingDetails', () => {// Summary contract, unit tier: real quote/table rendering with million quantities and range qualifiers.// Earlier cases had no summary or localized million denominator; minimal input is one output quote.- it.each(['estimated', 'starting_at'] as const)('renders summary range, tier, discount and %s in this locale', async priceType => {+ it.each(['exact', 'estimated'] as const)('renders summary range, tier, discount and %s in this locale', async priceType => {const copy = locales[locale].newChat.modelSelector.displayPricing;const { container } = await renderPricing({ currency: 'CNY', costDiscount: 0.2, displayPricing: {items: [item], summary: { output: [{ price: 6, maxPrice: 10, tier: '480P/720P', unit: 'token', quantity: 1000000, priceType }] },} }, locale, true);expect(container.textContent).toContain('480P/720P');- expect(container.textContent).toContain((priceType === 'estimated' ? copy.estimated : copy.startingAt).replace('{{price}}', '¥4.8–¥8'));+ expect(container.textContent).toContain((priceType === 'estimated' ? copy.estimated.replace('{{price}}', '¥4.8–¥8') : '¥4.8–¥8'));expect(container.querySelector('s')?.textContent).toBe('¥6–¥10');expect(screen.getByText(locales[locale].settings.providers.models.advanced.perMtok)).toBeTruthy();});diff --git a/apps/desktop/src/renderer/lib/__tests__/displayPricingFormat.test.ts b/apps/desktop/src/renderer/lib/__tests__/displayPricingFormat.test.tsindex 3bb7154835..e7d8a2b973 100644--- a/apps/desktop/src/renderer/lib/__tests__/displayPricingFormat.test.ts+++ b/apps/desktop/src/renderer/lib/__tests__/displayPricingFormat.test.ts@@ -53,7 +53,7 @@ describe('supplementary price table deduplication', () => {it('matches across roles regardless of order, without mutating the summary', () => {const pricing: ModelDisplayPricing = {items: [{ ...item, price: 2, priceType: 'exact' }, item], notes: [],- summary: { input: [quote], output: [{ ...quote, price: 2, priceType: 'starting_at' }] },+ summary: { input: [quote], output: [{ ...quote, price: 2, priceType: 'exact' }] },};expect(isDisplayPricingTableRedundant(pricing)).toBe(true);expect(pricing.summary!.input).toEqual([quote]);diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex 859f4eebe1..4057c5eee0 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -110,7 +110,9 @@ Registry/defaults、ModelPriceQuote 或 token 成本估算,不跨供应商补展示字段变化不构成整份目录失败;网络或核心模型协议失败仍沿用既有目录恢复语义。Desktop 设置页模型详情有 `displayPricing.summary` 时优先按输入、输出、缓存读取、缓存写入-展示主报价,每个角色允许 1–4 段、各带单位与数量,可带最高价形成区间。summary 缺失或无效时+展示主报价,每个角色允许 1–4 段、各带单位与数量,区间统一用 `maxPrice` 表示。摘要的+`priceType` 仅允许缺省、`exact` 或 `estimated`;任一段为 `starting_at` 时整份 summary 无效,+只丢弃摘要,保留价目表。items 的已发布契约不变,仍支持 `starting_at`。summary 缺失或无效时沿用原价目表;summary 无效只清除摘要,不丢价目表。补充价目表仅在以下条件全部满足时隐藏:有 summary 且没有 notes;所有 item 都没有 tier,priceType 缺省或 exact;item 总数等于所有角色报价段数,且每个 item 能按 unit、quantity、price 一一匹配不同的摘要报价,@@ -118,7 +120,7 @@ Desktop 设置页模型详情有 `displayPricing.summary` 时优先按输入、模型不显示价格;选择器、浮层和聊天价格档位逻辑保持原样。详情中的有效折扣仍单列显示。摘要的 tier 单独一行使用次要文字,金额、原价区间和单位分别保持完整,多段报价允许换行。`price` / `maxPrice` 为每 `quantity` 个 `unit` 的折扣前报价,只在展示时应用一次折扣,保留币种-与“约/起价”语义;角色和已知单位本地化,label、tier、notes 仅按纯文本呈现,未知单位不猜换算。+与“约”的语义;items 另外保留“起价”语义。角色和已知单位本地化,label、tier、notes 仅按纯文本呈现,未知单位不猜换算。数量 1 省略,百万按语言简写,其余按本地数字格式显示。共享目录可传递这些可选展示字段,旧端缺字段仍合法,不新增能力声明;此 UI 仅覆盖 Desktop 设置页。解析与展示回归见`modelDisplayPricing.test.ts`、`DisplayPricingDetails.test.tsx` 与 `ModelAdvancedDrawer.test.tsx`。diff --git a/packages/model-providers/src/__tests__/modelDisplayPricing.test.ts b/packages/model-providers/src/__tests__/modelDisplayPricing.test.tsindex e54907d9de..d80022bac5 100644--- a/packages/model-providers/src/__tests__/modelDisplayPricing.test.ts+++ b/packages/model-providers/src/__tests__/modelDisplayPricing.test.ts@@ -82,7 +82,7 @@ describe("optional primary quote summary", () => {unit: "token",quantity: 1000000,tier: "480P/720P",- priceType: "starting_at",+ priceType: "estimated",},],cacheRead: [{ ...quote, priceType: "exact" }],@@ -115,6 +115,9 @@ describe("optional primary quote summary", () => {{ unit: "x".repeat(129) },{ tier: "" },{ priceType: "future" },+ // Summary-only contract: one unsupported segment invalidates all roles, not the table.+ { priceType: "starting_at" },+ { priceType: "starting_at", maxPrice: 2 },{ maxPrice: 0 },{ maxPrice: -1 },{ maxPrice: Infinity },diff --git a/packages/model-providers/src/modelDisplayPricing.ts b/packages/model-providers/src/modelDisplayPricing.tsindex cb330999e7..50625fbcc2 100644--- a/packages/model-providers/src/modelDisplayPricing.ts+++ b/packages/model-providers/src/modelDisplayPricing.ts@@ -5,7 +5,7 @@ export interface SummaryQuote {unit: string;quantity: number;tier?: string;- priceType?: "exact" | "estimated" | "starting_at";+ priceType?: "exact" | "estimated";}export type ModelDisplayPricingSummary = Partial<@@ -79,9 +79,11 @@ function parseSummary(value: unknown): ModelDisplayPricingSummary | undefined {for (const quote of quotes) {if (!quote || typeof quote !== "object" || Array.isArray(quote))return undefined;- // Reuse the item's unit, quantity, tier and priceType contract, without retaining labels.+ // Reuse item validation, then restrict summary qualifiers to exact or estimated.const item = parseQuote(quote as Record<string, unknown>);if (!item) return undefined;+ const { priceType, ...fields } = item;+ if (priceType === "starting_at") return undefined;const maxPrice: unknown = quote.maxPrice;if (maxPrice !== undefined &&@@ -99,7 +101,11 @@ function parseSummary(value: unknown): ModelDisplayPricingSummary | undefined {) {return undefined;}- result.push({ ...item, ...(maxPrice !== undefined ? { maxPrice } : {}) });+ result.push({+ ...fields,+ ...(priceType !== undefined ? { priceType } : {}),+ ...(maxPrice !== undefined ? { maxPrice } : {}),+ });}summary[role] = result;}@@ -112,10 +118,10 @@ function text(value: unknown, max: number): value is string {);}-/** Detailed rows and summaries use exactly the same single-quote validation. */+/** Shared quote fields; summaries additionally reject the item-only starting_at qualifier. */function parseQuote(row: Record<string, unknown>,-): Omit<SummaryQuote, "maxPrice"> | undefined {+): Omit<ModelDisplayPricing["items"][number], "label"> | undefined {if (!text(row.unit, 128) ||(row.tier !== undefined && !text(row.tier, 256)) ||