Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): Worker 改名的占位文字改用占位档 token
Zhang Yunjinb5260dd2244e
diff --git a/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsxindex 41406fcca5..a231485f22 100644--- a/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx@@ -198,7 +198,7 @@ export function EditWorkerPopover({<inputref={roleInputRef}type="text"- className="mt-2 w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-tertiary)] outline-none focus:border-[var(--text-secondary)]"+ className="mt-2 w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-placeholder)] outline-none focus:border-[var(--text-secondary)]"placeholder={t('orca.createWorker.customRolePlaceholder')}value={customRole}maxLength={32}@@ -238,7 +238,7 @@ export function EditWorkerPopover({</div><inputtype="text"- className="w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-tertiary)] outline-none focus:border-[var(--text-secondary)]"+ className="w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-placeholder)] outline-none focus:border-[var(--text-secondary)]"placeholder={t('orca.editWorker.labelPlaceholder')}value={label}maxLength={32}diff --git a/apps/desktop/src/shared/modelCatalogThinking.ts b/apps/desktop/src/shared/modelCatalogThinking.tsnew file mode 100644index 0000000000..b1d168c442--- /dev/null+++ b/apps/desktop/src/shared/modelCatalogThinking.ts@@ -0,0 +1,36 @@+import type { ModelPriceOverrideTarget } from './modelPriceOverride';++/**+ * 单模型思考档位的本地目录 override(设置 → 模型 → 高级设置)。+ *+ * 与价格 / 上下文上限 / 图片输入 override 共用 `(providerId, agent, modelId)` 目标形状。+ * 写入的是模型级 base patch 的 `efforts` + `defaultEffort`(思考档位是公共字段,见+ * `docs/product-rules/model-metadata-precedence.md`)。+ *+ * 为什么需要它:目录里的思考档位决定 Pi 能不能开真正的 thinking 通道+ * (`piThinkingLevels.mjs`:`reasoning !== true` → 零档位)。上游把一个**会推理**的模型+ * 声明成「不支持思考」时,Pi 没有通道可用,模型推理只能随 content 返回、被 Cindy 当+ * **普通 assistant 正文**渲染(实报:协同 worker 切到该模型后正文变成推理叙述)。+ * 这是「未声明」与「声明错误」两种真实状态,用户必须能自己显式声明。+ */+export interface ModelCatalogThinkingTarget extends ModelPriceOverrideTarget {+ /**+ * 同一行在**其它引擎**下的 wire id。桥接投影两端 id 不同(例如 openai 行:codex 用+ * `gpt-5.6-sol`、pi 用 `chatgpt/gpt-5.6-sol`),而本机 override 按 (providerId, modelId)+ * 精确匹配 —— 只写主展示引擎的 id,运行期真正消费档位的 Pi 读不到,UI 却显示已声明。+ */+ relatedTargets?: ModelPriceOverrideTarget[];+}++/** 读回视图。value=null 表示没有本地声明(跟随供应商)。 */+export interface ModelCatalogThinkingView {+ /** null = 没有本地声明(跟随供应商实报)。 */+ value: string[] | null;+ isCustomized: boolean;+ /**+ * 该行各引擎的声明**不一致**(手工改文件 / 旧版单键写入留下的存量数据)。展示值取运行期+ * 真正消费档位的引擎(Pi)那一侧,但 UI 必须允许用户「重选当前项」把分裂写回一致 ——+ * 否则同值 no-op 会让分叉永远修不掉。+ */+ diverged?: boolean;+}diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.tsindex 85792b2535..07fd4f16e6 100644--- a/packages/maker-core/src/agents/pi/index.ts+++ b/packages/maker-core/src/agents/pi/index.ts@@ -8004,7 +8004,18 @@ export class PiAgent extends BaseAgent {async setEffort(effort: Effort): Promise<void> {if (reviewMode) return;assertStartupEffortAllowed(activeEffortSnapshot, effort);- if (activeEffortSnapshot?.length === 0) return;+ if (activeEffortSnapshot?.length === 0) {+ // 防御:该模型在本次启动快照里没有任何思考档位(目录声明不支持思考)。+ // 静默 return 会让调用方以为「已应用」;而模型实际仍可能推理,推理文本只能走+ // content 通道、被当成普通正文渲染。留一行 warn,让这类目录错报能在日志里定位,+ // 而不是只能翻库看消息构成。+ deps.logger.warn('pi set_thinking_level skipped: model declares no thinking tiers', {+ model: opts.model,+ providerId: opts.providerId ?? null,+ requestedEffort: effort,+ });+ return;+ }const resp = await runExclusivePiRpc(() => proc.request({type: 'set_thinking_level',level: effortToPiThinkingLevel(effort),@@ -8019,6 +8030,16 @@ export class PiAgent extends BaseAgent {async setThinkingEnabled(enabled: boolean): Promise<void> {if (reviewMode) return;+ if (activeEffortSnapshot?.length === 0) {+ // 防御:与 setEffort 同因。模型无思考档位时思考开关无法生效,Pi 会把+ // thinkingLevelMap 的 null 当作关闭 reasoning;模型的推理仍会漏进正文。+ deps.logger.warn('pi set_thinking_level ignored: model declares no thinking tiers', {+ model: opts.model,+ providerId: opts.providerId ?? null,+ requestedThinkingEnabled: enabled,+ });+ return;+ }const resp = await proc.request({type: 'set_thinking_level',level: enabled ? 'xhigh' : 'off',