Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix: keep orca lead home same-engine and classify favorites by ipc code
PraiseZhud52adefe56f3
diff --git a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.tsindex 6bd476daa8..76e111226c 100644--- a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts+++ b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts@@ -23,7 +23,8 @@* 上述回落再降级)。** 边界:远程会话(remoteHostId)与 Orca 协同会话不支持切换(UNSUPPORTED_CAPABILITY);- * 例外:Orca Lead 从另一台电脑显式切回本机(agentDeviceId=null)允许登记/落地;+ * 例外:Orca Lead 从另一台电脑显式切回本机(agentDeviceId=null)且目标引擎与当前相同+ * 时允许登记/落地;模型/来源可随本机目录改变。Worker、换电脑、换引擎仍拒;* turn 进行中登记 pending 推迟到下一条消息发送时刻执行。** 远程 Agent 换电脑(agentDeviceId 变化,null = 任务所在电脑):原生会话记录在原来运行 Agent@@ -631,11 +632,13 @@ export async function performSessionAgentSwitch(params.applyNow === true &&normalizeDbAgentKind(row.agentKind) === makerToDbAgentKind(targetAgentKind) &&row.model === model;- // Orca Lead 的 Agent 在另一台电脑时允许显式切回本机(null)。跨电脑、Worker、换引擎入口仍拒。+ // Orca Lead 的 Agent 在另一台电脑时允许显式切回本机(null),且必须同引擎。+ // 跨电脑、Worker、换引擎入口仍拒。const orcaLeadReturnHome =row.orcaRole === 'lead' &&(row.agentDeviceId ?? null) !== null &&- requestedAgentDeviceId === null;+ requestedAgentDeviceId === null &&+ normalizeDbAgentKind(row.agentKind) === makerToDbAgentKind(targetAgentKind);if (row.orcaRole && !providerGroupRelocationOnly && !orcaLeadReturnHome) {// Orca lead/worker:协同运行时对 agent 形态有独立契约(docs/dev-rules/orca-team-architecture.md),不掺和。throwIpcError('UNSUPPORTED_CAPABILITY', 'agent switch is not supported for Orca sessions');diff --git a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.tsindex 25dbdacc9a..bd6e05c33a 100644--- a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts+++ b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts@@ -318,7 +318,7 @@ describe('ChatInput model source switching wiring', () => {// 单引擎链路,把另一个引擎的模型塞进当前会话。护栏:这类会话把联合列表锁定在// 当前引擎;引擎解析不出时整个回落旧面板。expect(chatInputSource).toContain(- 'const inSessionEngineLocked = Boolean(sessionId) && !sessionEngineFilter;',+ 'Boolean(sessionId) && (!sessionEngineFilter || orcaLeadLocalFallback)',);expect(chatInputSource).toContain('unifiedModelPanelEnabled && (!inSessionEngineLocked || lockedSessionAgentKind !== null)',diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex b7e5528dee..f4838fc148 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -7317,7 +7317,8 @@ export function ChatInput({// 没有跨引擎兜底,点任意一行都会把 Claude 模型经 onProviderChange 塞进 Codex 会话// (bug4)。所以身份未确认时不锁 —— 回落旧面板一帧,等 runtimeAgentKind 落地再进统一面板。const sessionEngineConfirmed = !sessionId || runtimeAgentKind != null;- const inSessionEngineLocked = Boolean(sessionId) && !sessionEngineFilter;+ const inSessionEngineLocked =+ Boolean(sessionId) && (!sessionEngineFilter || orcaLeadLocalFallback);const lockedSessionAgentKind =inSessionEngineLocked && sessionEngineConfirmed ? (runtimeAgentKind ?? agentKind) : null;// 新旧用户统一使用 A;仅在远端能力或任务引擎尚未确认时回落兼容列表。diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsxindex aaceb353cb..5588b295f1 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx@@ -17,10 +17,7 @@ import {import { toast } from '@/lib/toast';import { matchesModelName } from '@/lib/modelDisplayNames';import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';-import {- favoritesSyncFailureI18nKey,- favoritesSyncFailureKind,-} from './sessionAgentSwitchGate';+import { favoritesSyncFailureI18nKey } from './sessionAgentSwitchGate';import { Check, Loader2, TriangleAlert } from 'lucide-react';import { useTranslation } from 'react-i18next';@@ -1381,10 +1378,7 @@ export function UnifiedModelPanel({</span></div>)}- {favoritesListDeviceId && remoteFavorites.error ? <div role="status" className="px-3 py-2 text-13 text-[var(--text-secondary)]">{t(favoritesSyncFailureI18nKey(favoritesSyncFailureKind({- deviceId: favoritesListDeviceId,- unavailableDeviceIds: remoteSources?.unavailableDeviceIds,- })))}</div> : null}+ {favoritesListDeviceId && remoteFavorites.error ? <div role="status" className="px-3 py-2 text-13 text-[var(--text-secondary)]">{t(favoritesSyncFailureI18nKey(remoteFavorites.errorCode))}</div> : null}{remoteListPending ? (remoteSources?.failure ?? (<divdiff --git a/apps/desktop/src/renderer/components/new-chat/sessionAgentSwitchGate.ts b/apps/desktop/src/renderer/components/new-chat/sessionAgentSwitchGate.tsindex 827b32b4ff..ba0bd6e8a9 100644--- a/apps/desktop/src/renderer/components/new-chat/sessionAgentSwitchGate.ts+++ b/apps/desktop/src/renderer/components/new-chat/sessionAgentSwitchGate.ts@@ -39,20 +39,17 @@ export function sessionRemoteAgentDevicesForOrcaFallback<T>(return devices ?? [];}-export function favoritesSyncFailureKind(input: {- deviceId: string | undefined;- unavailableDeviceIds?: readonly string[];-}): 'unreachable' | 'unsupported' {- if (!input.deviceId) return 'unreachable';- if (!input.unavailableDeviceIds) return 'unreachable';- if (input.unavailableDeviceIds.includes(input.deviceId)) return 'unreachable';- return 'unsupported';-}+const FAVORITES_UNREACHABLE_CODES = new Set([+ 'DEVICE_LINK_NOT_CONNECTED',+ 'DEVICE_LINK_DEVICE_OFFLINE',+ 'DEVICE_LINK_TIMEOUT',+ 'DEVICE_LINK_BUSY',+]);export function favoritesSyncFailureI18nKey(- kind: 'unreachable' | 'unsupported',-): 'newChat.modelSelector.unified.favoritesSyncFailedUnreachable' | 'newChat.modelSelector.unified.favoritesSyncFailedUnsupported' {- return kind === 'unsupported'- ? 'newChat.modelSelector.unified.favoritesSyncFailedUnsupported'- : 'newChat.modelSelector.unified.favoritesSyncFailedUnreachable';+ errorCode: string | null | undefined,+): 'newChat.modelSelector.unified.favoritesSyncFailedUnreachable' | 'newChat.modelSelector.unified.favoritesSyncFailed' {+ return errorCode && FAVORITES_UNREACHABLE_CODES.has(errorCode)+ ? 'newChat.modelSelector.unified.favoritesSyncFailedUnreachable'+ : 'newChat.modelSelector.unified.favoritesSyncFailed';}diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 34c317617b..4c01b45b4d 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -9911,9 +9911,8 @@"effortEndSmart": "Smarter","railSameEngine": "{{agent}} only","crossEngineWarning": "Switching engines rebuilds context and may lose content",- "favoritesSyncFailed": "Favorites could not sync. Reopen the picker to retry.",- "favoritesSyncFailedUnreachable": "Favorites could not sync: the computer is unreachable. Check the connection and try again.",- "favoritesSyncFailedUnsupported": "Favorites could not sync: this computer's Cindy version does not support favorites sync.",+ "favoritesSyncFailed": "Favorites could not sync. Reopen the picker to retry; the remote computer may need an update.",+ "favoritesSyncFailedUnreachable": "Favorites are not synced yet: that computer is unreachable. Reopen the picker after the connection returns.","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}","providerGroupLabel": "{{provider}} · {{group}}","providerGroupRunningOn": "Running on {{device}}",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex f1ed5e9d7f..9e874b52c7 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -9874,9 +9874,8 @@"effortEndSmart": "高精度","railSameEngine": "{{agent}} のみ","crossEngineWarning": "エンジンを切り替えるとコンテキストが再構築され、内容が失われる場合があります",- "favoritesSyncFailed": "お気に入りを同期できません。選択画面を開き直してください。",- "favoritesSyncFailedUnreachable": "お気に入りを同期できません。接続先に到達できません。接続を確認して再試行してください。",- "favoritesSyncFailedUnsupported": "お気に入りを同期できません。接続先の Cindy バージョンがお気に入り同期に対応していません。",+ "favoritesSyncFailed": "お気に入りを同期できません。選択画面を開き直してください。接続先の更新が必要な場合があります。",+ "favoritesSyncFailedUnreachable": "お気に入りはまだ同期されていません。そのパソコンに現在接続できません。接続が戻ってから開き直してください。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}","providerGroupLabel": "{{provider}} · {{group}}","providerGroupRunningOn": "現在 {{device}} で実行中",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 71af1ea6c0..a1566d5f56 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -9874,9 +9874,8 @@"effortEndSmart": "더 똑똑하게","railSameEngine": "{{agent}} 전용","crossEngineWarning": "엔진을 전환하면 컨텍스트가 다시 구성되어 내용이 사라질 수 있습니다",- "favoritesSyncFailed": "즐겨찾기를 동기화할 수 없습니다. 선택 화면을 다시 여세요.",- "favoritesSyncFailedUnreachable": "즐겨찾기를 동기화할 수 없습니다. 연결할 수 없습니다. 연결을 확인한 후 다시 시도하세요.",- "favoritesSyncFailedUnsupported": "즐겨찾기를 동기화할 수 없습니다. 해당 컴퓨터의 Cindy 버전이 즐겨찾기 동기화를 지원하지 않습니다.",+ "favoritesSyncFailed": "즐겨찾기를 동기화할 수 없습니다. 선택 화면을 다시 여세요. 원격 컴퓨터를 업데이트해야 할 수 있습니다.",+ "favoritesSyncFailedUnreachable": "즐겨찾기가 아직 동기화되지 않았습니다. 그 컴퓨터에 현재 연결할 수 없습니다. 연결이 복구된 후 다시 여세요.","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}","providerGroupLabel": "{{provider}} · {{group}}","providerGroupRunningOn": "현재 {{device}}에서 실행 중",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 096257b126..5777226dda 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -9874,9 +9874,8 @@"effortEndSmart": "更智能","railSameEngine": "仅 {{agent}}","crossEngineWarning": "切换引擎会重建上下文,可能丢失内容",- "favoritesSyncFailed": "收藏未能同步。请重新打开重试。",- "favoritesSyncFailedUnreachable": "收藏未能同步:连接不可达。请检查连接后重试。",- "favoritesSyncFailedUnsupported": "收藏未能同步:该电脑上的 Cindy 版本不支持收藏同步。",+ "favoritesSyncFailed": "收藏未能同步。请重新打开重试;被控电脑可能需要更新。",+ "favoritesSyncFailedUnreachable": "收藏暂时没有同步:那台电脑当前连不上。恢复连接后重新打开即可。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}","providerGroupLabel": "{{provider}} · {{group}}","providerGroupRunningOn": "当前在 {{device}} 上运行",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 412b70d077..085c8dd4e5 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -9873,9 +9873,8 @@"effortEndSmart": "更聰明","railSameEngine": "僅 {{agent}}","crossEngineWarning": "切換引擎會重建上下文,可能遺失內容",- "favoritesSyncFailed": "收藏未能同步。請重新開啟重試。",- "favoritesSyncFailedUnreachable": "收藏未能同步:連線不可達。請檢查連線後重試。",- "favoritesSyncFailedUnsupported": "收藏未能同步:該電腦上的 Cindy 版本不支援收藏同步。",+ "favoritesSyncFailed": "收藏未能同步。請重新開啟重試;被控電腦可能需要更新。",+ "favoritesSyncFailedUnreachable": "收藏暫時沒有同步:那台電腦目前連不上。恢復連線後重新開啟即可。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}","providerGroupLabel": "{{provider}} · {{group}}","providerGroupRunningOn": "目前在 {{device}} 上執行",diff --git a/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts b/apps/desktop/src/renderer/state/useRemoteModelFavorites.tsindex 359c533dfc..07094d63e9 100644--- a/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts+++ b/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts@@ -7,6 +7,7 @@ import {type ModelFavoriteMutation,} from '@cindy/device-link';import { getDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';+import { extractIpcError } from '@/utils/ipcError';import type { ModelFavoriteItem, ModelFavoriteConfig, ModelFavoritePatch } from './modelFavorites';export interface FavoriteStore {@@ -24,6 +25,7 @@ export function useRemoteModelFavorites(deviceId?: string) {current.current = key;const [state, setState] = useState<{ key: string; items: ModelFavoriteItem[] } | null>(null);const [error, setError] = useState(false);+ const [errorCode, setErrorCode] = useState<string | null>(null);const [writeErrorKey, setWriteErrorKey] = useState<string | null>(null);const sequence = useRef(0);const items = state?.key === key ? state.items : [];@@ -40,9 +42,11 @@ export function useRemoteModelFavorites(deviceId?: string) {return;setState({ key, items: parseModelFavorites(value) as ModelFavoriteItem[] });setError(false);- } catch {+ setErrorCode(null);+ } catch (err) {if (current.current === key && sequence.current === seq) {setError(true);+ setErrorCode(extractIpcError(err)?.code ?? null);}}};@@ -98,6 +102,7 @@ export function useRemoteModelFavorites(deviceId?: string) {} catch (error) {if (current.current === key) {setWriteErrorKey(key);+ setErrorCode(extractIpcError(error)?.code ?? null);void refresh();}throw error;@@ -122,5 +127,5 @@ export function useRemoteModelFavorites(deviceId?: string) {},remove: (uid) => write({ kind: 'remove', expected: expected(uid) }),};- return { items, store, error: error || writeErrorKey === key };+ return { items, store, error: error || writeErrorKey === key, errorCode };}diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex 8c1b076c99..5c7324bdb5 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -394,7 +394,8 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍Lead 与 Worker 与普通任务一样归供应商组分配、出问题时自动换电脑(产品口径见 `docs/product-rules/provider-groups.md` §6.1「协同任务」),只有审查任务仍排除(`readProviderGroupSessionRow`)。要点:- **新 Worker 也分配**:Worker 的任务记录由启动这一步写入,分配时还读不到,`applyProviderGroupAssignment` 用启动参数作为「从没运行过」的快照(`assignBeforeStart` 的 `startRow`);记录已存在时以记录为准。- **跟 Lead 就是跟 Lead 的组**:Lead 有组绑定、Worker 选的位置就是 Lead 现在所在且来源没另选(或选的就是 Lead 现在的来源 / 组那一项)、同一种 Agent 时,Worker 改用组那一项(本机的组:任务所在电脑 + 组的供应商;另一台电脑上的组:那台 + 组的供应商),再由组按策略选电脑;组那一项不提供该模型或读不到时照旧跟 Lead 所在那台。`list_available_models` 不指定位置时同口径。实现:`OrcaLeadSessionSnapshot.providerGroupEntry`、`leadProviderGroupFollowCandidate`。- - **只放行组的换位置**:`performSessionAgentSwitch` 对协同任务仍拒绝用户发起的切换,只接受 main 内部带 `providerGroupRelocation` 的 applyNow 调用,且引擎与模型都不变;该标记不从 IPC 读取。+ - **只放行组的换位置**:`performSessionAgentSwitch` 对协同任务仍拒绝用户发起的切换,只接受 main 内部带 `providerGroupRelocation` 的 applyNow 调用,且引擎与模型都不变;该标记不从 IPC 读取。用户发起的唯一例外见下一条。+ - **Lead 离线切回本机(2026-10-14 用户裁决的唯一用户发起例外)**:Lead 的 Agent 在另一台电脑、且该电脑模型目录读取失败时,可显式切回本机(`agentDeviceId=null`)。必须同引擎;模型/来源随本机目录改变。Worker、换到其它电脑、换引擎仍拒。入口门控在 `sessionAgentSwitchGate.ts`;远程在线时不开放。未验证:未做实机 Orca 协同回归(Lead 回本机后 team/Worker 回报链路)。- **换电脑资格与等额度恢复分开**:组的 `isFailoverEligible` 用 `isProviderGroupFailoverEligible`(Worker 可换),额度恢复后自动继续仍用 `isUsageLimitAutoResumeEligible`(Worker 不等,失败交给 Lead)。- **换过去仍是成员**:`bootstrapSwitchedSession` 对协同任务调 `synthesizeOrcaVendorOptionsFromDb`,新会话带着协同身份、提示词与 `cindy_orca` / `orca_worker_bridge`,不靠下一次发送二次重启。- **Worker 终态按换电脑那次登记结算**(与 5a 同一原则):输入协调器登记「先不呈现」期间,Worker 的终态不调 `handleWorkerTerminalTurn`,而是按登记 id 暂存(`provider-group/heldWorkerTerminals.ts`;error 事件随 error 行一起暂存,只以 done 收尾的失败在 terminal 末尾暂存)。换成了(续跑已发出)丢掉,auto-bridge pending 保留到续跑那一轮的产品终态再回报;没换成、迟迟没有结局或有人接手时恰好一次回报这次异常终止,账号已切换则不回报。迟到的旧结算只认自己那次登记。diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 8af9ba2f26..938d4e30d8 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -295,7 +295,7 @@少见的时序例外:错误早于这一轮的用户消息落库完成到达时,错误卡与红点在判断之前已经出现,换电脑期间只是不再挂横幅。- 换过去之后任务固定在新电脑上,原电脑恢复后也不换回去(每换一次都要重新交接)。- **协同任务**(2026-10-10):Lead 与 Worker 都按上面的规则分配和换电脑,引擎与模型不变、只换 Agent 所在电脑;- 用户仍不能中途给协同任务换模型或换位置(`docs/dev-rules/orca-team-architecture.md`)。+ 用户仍不能中途给协同任务换模型或换到其它电脑(`docs/dev-rules/orca-team-architecture.md`)。唯一用户发起例外(2026-10-14):Lead 的 Agent 所在电脑模型目录读取失败时,可同引擎切回本机。- 新建的 Worker 跟普通新任务一样按组策略选电脑。Worker 跟着 Lead(没另选位置,或选的就是 Lead 现在所在那台)而 Lead 用的是组那一项时,Worker 跟的是这个组,不是 Lead 这次落到的那台;组那一项不提供所选模型时照旧跟 Lead所在那台。Lead 的 `list_available_models` 不指定位置时同样列组那一项所在电脑的模型。