Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
chore: 合并上游 main,解决冲突
Zhang Yunjinb74587d973a6
diff --cc apps/desktop/src/renderer/contexts/AuthContext.tsxindex caa3529ee3,2bd9e57e09..2f0e83e5e1--- a/apps/desktop/src/renderer/contexts/AuthContext.tsx+++ b/apps/desktop/src/renderer/contexts/AuthContext.tsx@@@ -42,10 -42,8 +42,9 @@@ importimport { sessionsStore } from '@/lib/sessionsStore';import { recentWorkdirsStore } from '@/lib/recentWorkdirsStore';import { isSidebarWindow } from '@/lib/sidebarWindow';- import { isGhostPanelWindow } from '@/lib/ghostPanelWindow';import { setModelEnginePrefsOwner } from '@/state/modelEnginePrefs';import { setModelFavoritesOwner } from '@/state/modelFavorites';+import { setRecentModelsOwner } from '@/state/recentModels';import { setProviderModelMemoryOwner } from '@/state/providerModelMemory';import { setAgentDeviceModelMemoryOwner } from '@/state/agentDeviceModelMemory';import { setFavoriteAnchorMemoryOwner } from '@/state/favoriteAnchorMemory';diff --cc apps/desktop/src/renderer/state/modelFavorites.tsindex bf43211892,9ddb302ba5..57f9d7290e--- a/apps/desktop/src/renderer/state/modelFavorites.ts+++ b/apps/desktop/src/renderer/state/modelFavorites.ts@@@ -136,6 -141,55 +136,7 @@@ function seqOfUid(uid: string): numberreturn Number.isSafeInteger(n) ? n : null;}-function isCanonicalEffort(value: unknown): value is Effort {- return typeof value === 'string' && (EFFORT_VALUES as readonly string[]).includes(value);-}--/**- * `'*'` 是 providerModelMemory v2 的保留来源 id(跨来源模型预设槽)。收藏条目的 providerId- * 必须是真实来源,撞上保留位直接丢条目(规格 §4「偏好/记忆」的防撞要求)。- */-function isUsableProviderId(value: unknown): value is string {- return typeof value === 'string' && value.length > 0 && value !== MODEL_PRESET_SLOT_ID;-}--/** 归一化配置字段(供 add / update / sanitize 共用);模型身份或引擎不合法 → null。 */-function normalizeConfig(raw: {- providerId?: unknown;- modelId?: unknown;- agent?: unknown;- effort?: unknown;- fast?: unknown;-}): ModelFavoriteConfig | null {- const providerId = typeof raw.providerId === 'string' ? raw.providerId.trim() : '';- const modelId = typeof raw.modelId === 'string' ? raw.modelId.trim() : '';- if (!isUsableProviderId(providerId) || !modelId) return null;- // agent 非法 → **丢整条**:收藏是「配置副本」,引擎是副本的必要组成部分,缺了它这条- // 记录无法表达任何配置(与 effort 不同 —— effort 缺省有明确语义「跟随推荐档」)。- if (!isSelectableVendor(raw.agent)) return null;- const config: ModelFavoriteConfig = { providerId, modelId, agent: raw.agent };- // effort 非法(显示文案 / 过期档名 / 非字符串)→ 只丢这个字段,条目保留,调用层回落推荐档。- if (isCanonicalEffort(raw.effort)) config.effort = raw.effort;- if (raw.fast === true || raw.fast === 'ultrafast') config.fast = raw.fast;- return config;-}--/**- * 去重身份:providerId + modelId + agent + effort + fast(缺省字段参与,与「跟随推荐」区分)。- * 分隔符用空格而不是 NUL:源码里嵌一个裸 `\0` 会让整个文件被 git / rg / grep 判成二进制- * (diff 显示 `Bin`、搜不到任何符号),代价远大于它能防的那点分隔符冲突 —— provider id 与- * model id 都是 slug 形态,不含空格(与 unifiedSelection.entryKey 同一取舍)。- */-function identityOf(config: ModelFavoriteConfig): string {- return [- config.providerId,- config.modelId,- config.agent,- config.effort ?? '',- config.fast === 'ultrafast' ? '2' : config.fast === true ? '1' : '0',- ].join(' ');-}+/*** 严格校验 + 锚点补齐。老版本 / 手改 localStorage 损坏时静默回退空表,不抛。* - 形状非法的条目(非对象 / 缺模型身份 / 引擎不认识 / providerId 撞 `'*'`)整条丢弃;@@@ -689,12 -743,12 +690,12 @@@ export function accessHostModelFavoriterequireDurableWrite = true;try {if (op.kind === 'add') {- const config = normalizeConfig(op.item);+ const config = normalizeModelConfigCopy(op.item);if (!config) throw new Error('Invalid favorite');- if (base.items.length >= 4096 && !base.items.some(item => identityOf(item) === identityOf(config))) throw new Error('Favorites limit reached');+ if (base.items.length >= 4096 && !base.items.some(item => modelConfigCopyIdentity(item) === modelConfigCopyIdentity(config))) throw new Error('Favorites limit reached');commitOp({kind:'add',config,preferredUid:uidOfSeq(base.uidSeq)},base);} else if (op.kind === 'remove') commitOp({kind:'remove',uid:op.expected.uid},base);- else commitOp({kind:'update',uid:op.expected.uid,patch:{agent:op.item.agent, effort:(op.item.effort as Effort | undefined) ?? null, fast:!!op.item.fast}},base);+ else commitOp({kind:'update',uid:op.expected.uid,patch:{agent:op.item.agent, effort:(op.item.effort as Effort | undefined) ?? null, fast:op.item.fast ?? false}},base);return readDurable().items;} finally { requireDurableWrite = false; }}