diff --git a/docs/features/model-connections/README.md b/docs/features/model-connections/README.md index 1f625a30..98697463 100644 --- a/docs/features/model-connections/README.md +++ b/docs/features/model-connections/README.md @@ -10,6 +10,7 @@ Provider 要求的附加元数据；GoodBuddy 只在直连链路或 Runtime 明 | --- | --- | | [UI 设计](./ui-design.md) | 编辑入口、校验反馈、兼容性说明和无障碍行为 | | [技术设计](./technical-design.md) | 契约、持久化、合并优先级、Runtime 支持矩阵和验证 | +| [执行方式与模型选择](./runtime-selection-design.md) | 会话/项目/全局分层解析、选择器行为、存储迁移、全局 `provider` 移除计划和用途模型规划 | | [功能进度](./progress.md) | 已验证实现、剩余工作和验证证据 | 模型连接选择准确性也在本目录维护：技术设计第 8 节定义通道直连回退修复， diff --git a/docs/features/model-connections/progress.md b/docs/features/model-connections/progress.md index 60d45274..90cdb843 100644 --- a/docs/features/model-connections/progress.md +++ b/docs/features/model-connections/progress.md @@ -1,5 +1,32 @@ # 模型连接请求定制进度 +## 2026-09-29：执行方式与模型分层选择 + +设计见[执行方式与模型选择设计](./runtime-selection-design.md)。 + +### 已完成（未提交） + +- 共享选择层契约、`resolveRuntimeChoice` 分层解析及失效回退；移除 `auto`。 +- 数据库版本 49 迁移旧选择形状；连接删除后清理所有项目和会话的失效引用。 +- Main 每次请求按会话层、项目层重新解析，不回写会话；排队输入在派发时重新解析。 +- 项目设置 `ProjectRuntimeSelector`（本地、远程、通道共用），输入框两栏 + `RuntimeModelPicker`；系统设置恢复各 Runtime 页签的默认模型选择。 +- 选择器修复：模型列不再与底栏重叠，长名称单行截断；“管理模型连接…”直接打开模型连接分类。 + +### 已验证 + +- `npm run typecheck` 与相关文件 eslint 通过。 +- Main、Shared、Daemon 测试集通过；`App.test.tsx` 与 `WorkspacePrimitives.test.tsx` + 350 项中 349 项通过，唯一失败为既有不稳定用例“renders, saves and reloads OpenCode + answers across question rounds”，单独运行通过。 + +### 待办 + +- 在运行中的应用里目测两栏选择器（窄窗口、深色主题、长名称）。 +- 移除全局 `provider`，见[设计第 6 节](./runtime-selection-design.md#6-全局-provider历史遗留待移除)。 +- 用途模型，见[设计第 7 节](./runtime-selection-design.md#7-用途模型规划未实现)。 + + ## 2026-09-27：窄容器协议显示 连接管理布局改用命名容器查询，不超过 `640px` 时列表和表单上下排列；移除原先仅在 diff --git a/docs/features/model-connections/runtime-selection-design.md b/docs/features/model-connections/runtime-selection-design.md new file mode 100644 index 00000000..eed8f35d --- /dev/null +++ b/docs/features/model-connections/runtime-selection-design.md @@ -0,0 +1,157 @@ +# 执行方式与模型选择设计 + +本文件是执行方式（Runtime）与模型选择的唯一权威说明，覆盖分层解析、各入口的界面 +行为、存储迁移，以及尚未实现的“用途模型”规划。连接本身的请求定制见 +[技术设计](./technical-design.md)，DeepSeek Harness 的平台来源解析见 +[Harness 技术设计](../deepseek-harness/technical-design.md#121-配置来源)。 + +## 1. 术语 + +| 术语 | 定义 | +| --- | --- | +| 执行方式 | `provider`：`model`（直连模型）、`opencode`、`continue`、`deepseek-harness` | +| 模型选择 | `{ kind: 'profile', profileId }` 或 `{ kind: 'runtime-config' }`（Runtime 自有配置） | +| 选择层 | `RuntimeSelectionLayer = { provider?, model? }`，两个字段都可缺省 | +| 全局默认模型 | 每个执行方式在“系统设置”中的默认模型：直连用 `defaultModelProfileId`，其余用 `opencodeModelSource` / `continueModelSource` / `deepseekHarnessModelSource` | +| 具体选择 | 解析结果 `AgentRuntimeSelection`，包含确定的 `provider`，以及 `profileId` 或 `runtimeConfig: true` 之一 | + +## 2. 分层与优先级（已实现） + +选择按“会话 → 项目 → 全局”逐字段解析，入口为共享函数 `resolveRuntimeChoice` +（`src/shared/runtime-selection-contracts.ts`）： + +1. **执行方式**：会话层 `provider` → 项目层 `provider` → 全局兜底（见第 6 节）。 +2. **模型**：只继承与最终执行方式一致的层。会话单独切换执行方式时，丢弃会话层模型， + 沿用项目层（若项目执行方式相同）或该执行方式的全局默认模型。 +3. 结果附带 `providerSource` / `modelSource`（`global`、`project`、`conversation`）， + 界面据此显示来源标记。 + +失效处理： + +| 所选模型状态 | 行为 | +| --- | --- | +| 可用 | 使用 | +| `unavailable`（缺少 API Key） | 保留选择；运行时明确报告缺少凭据，不静默换模型 | +| `missing`（连接已删除） | 回退到下一层，并在选择器中提示回退原因 | +| `incompatible`（协议或能力不匹配） | 同上 | + +- 图像生成连接只对直连模型有效，且永远不作为回退默认值。 +- 远程项目只允许 OpenCode 与 Continue；其他执行方式按 `provider` 原因回退。 +- 全局 `defaultModelProfileId` 为空时解析为 `{ provider: 'model' }`，不生成空 `profileId`。 +- 不存在 `auto`。旧 `{ provider: 'auto' }` 在读取和 IPC 入口处去除，按上述顺序解析。 + +## 3. 各入口行为（已实现） + +### 3.1 项目设置 + +本地、远程和通道项目共用 `ProjectRuntimeSelector`： + +- “执行方式”必选，没有“继承”选项；保存时总是写入具体 `provider` + （`ProjectSwitcher` 的 `withProjectProvider`、`ChannelProjectSettingsFields` 的 + `channelProjectDraft`）。 +- “模型”默认项为“跟随 xx 默认（…）”，其余为该执行方式可用的连接及“使用 xx 自有配置”。 +- 新建会话跟随项目，不再提供“默认执行方式”四选一。 + +### 3.2 输入框选择器 + +`RuntimeModelPicker` 为两栏菜单：左栏执行方式，右栏当前高亮执行方式的模型。 + +- 选择只写入会话层；左栏选择与项目相同的执行方式时写入 `undefined`，保持继承。 +- 右栏首项为“默认（…）”，带来源标记（全局 / 项目）；已删除或不兼容的连接禁用，缺少 + API Key 的连接可选并标注。 +- 会话存在单独选择时，底栏显示“本会话单独选择”和“恢复为项目默认”，按钮上显示圆点。 +- 模型列按最长列表预留高度，悬停切换执行方式时菜单不跳动；列内超出部分滚动，底栏 + 固定在两栏下方。长名称单行截断，完整名称和模型 ID 通过 `title` 与可访问名称提供。 +- “管理模型连接…”打开“设置 → 模型连接”。 +- 键盘：左右键在两栏间切换，上下 / Home / End 在栏内移动，Esc 关闭并还焦点。 + +### 3.3 系统设置 + +“设置 → Agent Runtime”按 OpenCode / Continue / DeepSeek Harness 页签分别选择各自的 +全局默认模型；直连模型的默认值在“模型连接”中设置。设置页没有“全局执行方式”控件。 + +## 4. 执行时解析（已实现） + +- Main 的 `resolveStoredRuntimeSelection` / `resolveLayeredRuntimeSelection` 在每次请求时 + 读取会话层与项目层重新解析，不把解析结果回写到会话记录。 +- 排队的输入在真正派发时重新解析，不使用入队时的快照。 +- 定时任务的选择在创建时冻结在任务上；运行时优先任务选择，再到项目层。 +- 远程事件的 context metrics 按本次请求实际使用的具体选择记录 + （`remoteEventSelection`）；未传入时数据库按会话层、项目层解析，缺省执行方式为 + OpenCode。 + +## 5. 存储与迁移（已实现） + +- `projects.runtime_selection_json` 与 `conversations.runtime_selection_json` 保存紧凑 + 的选择层；空层保存为 `NULL`。 +- 数据库版本 49（`migrateRuntimeSelectionLayers`）把旧的 `{ provider, profileId }` 和 + `{ provider: 'auto' }` 改写为选择层；读取时 schema 预处理也会升级旧形状。 +- `repairConversationRuntimeSelections` 在连接被删除后清除所有项目与会话中的失效 + `profileId`。 +- 通道项目创建为 `{ provider: 'model' }`；SSH 项目允许不保存选择。 + +## 6. 全局 `provider`（历史遗留，待移除） + +`RuntimeSettings.provider` 来自项目层出现之前的“全局执行方式”。它已没有设置界面， +但仍在以下位置被读取： + +| 位置 | 用途 | +| --- | --- | +| `resolveRuntimeChoice` 的 `normalizedGlobalProvider` | 项目和会话都没有 `provider` 时的兜底（旧数据、无项目的状态查询） | +| `getConfiguredRuntimeTarget` → `createConfiguredRuntime`（`src/main/index.ts`） | 启动和设置变更时创建默认 Runtime；监督者回顾、无唯一项目的心跳等不带项目的请求使用它 | +| `runtime-settings-store.ts` | 归一化、`auto` → `model` 迁移和写回 | +| `SettingsPanel` | 无界面地读入并原样保存 | + +结论：该字段不应继续作为用户概念存在。移除方案与第 7 节一起实施： + +1. 启动修复为所有 `provider` 为空的项目写入当时解析出的具体执行方式。 +2. 兜底固定为 `model`；默认 Runtime 固定为直连模型。 +3. 设置输入和公开设置不再包含 `provider`；存储保留该字段只用于读取旧文件，不再写入。 + +## 7. 用途模型（规划，未实现） + +### 7.1 问题 + +后台功能各自隐式决定模型，用户无法控制，也无法从界面得知： + +| 用途 | 当前行为 | 是否需要工具 | +| --- | --- | --- | +| 监督者回顾与整理 | 全局 `provider` 对应的默认 Runtime 与模型 | 否，工具调用被拒绝 | +| 心跳报告 | 单一项目时跟随项目，否则同上 | 否 | +| Magic Notes 分析 | 直连默认模型连接 | 否 | +| 知识图谱抽取 | 直连默认模型连接（HTTP） | 否 | +| 上下文压缩 | 已有 `contextCompression.modelSource`（当前模型 / 指定连接） | 否 | +| 子代理 | 直连模型，可按专家覆盖 | 是，保持现状 | +| 定时任务 | 任务或项目选择 | 是，保持现状 | + +### 7.2 决策 + +- 用途只选择**模型连接**，统一走直连模型，不提供执行方式选择。上述用途都是无工具的 + 文本请求，为其启动 OpenCode / Continue / DeepSeek Harness 只增加延迟、成本和故障面。 +- 每个用途的取值为“跟随默认模型”或一个文本模型连接；图像连接不可选。 +- 需要工具的子代理和定时任务不纳入本设置。 + +### 7.3 范围 + +“设置 → 模型连接”新增“用途模型”小节，包含： + +- 监督者回顾与整理 +- 心跳报告（无唯一项目时） +- Magic Notes 分析 +- 知识图谱抽取 +- 上下文压缩（迁入现有 `contextCompression.modelSource`，语义不变） + +### 7.4 解析与失效 + +- 解析：用途设置的连接 → 全局 `defaultModelProfileId`。 +- 连接被删除：设置修复为“跟随默认模型”，与第 5 节的失效清理一致。 +- 连接缺少 API Key：保留选择，运行时明确失败，不静默改用默认模型。 +- 心跳在有唯一项目时仍跟随项目选择；用途设置只替代原先的全局兜底。 + +### 7.5 待定 + +- 设置字段形状（建议 `purposeModels: Record`） + 与设置文件版本号。 +- `contextCompression.modelSource` 的 `current`（跟随当前会话模型）是否保留为压缩用途 + 专有的第三个选项。 +- 监督者模型并发（`supervisorModelConcurrency`）是否与所选连接绑定显示。 diff --git a/docs/features/model-connections/ui-design.md b/docs/features/model-connections/ui-design.md index 48bde338..380e440f 100644 --- a/docs/features/model-connections/ui-design.md +++ b/docs/features/model-connections/ui-design.md @@ -52,10 +52,9 @@ OpenCode 与 DeepSeek Harness 不使用该值。 ## 会话与项目 Runtime 选择 -会话与项目选择器只提供直连模型和各 Runtime 入口，不再枚举每个 Runtime 与每个模型的 -组合；Runtime 模型在系统设置中配置。已保存的固定 Runtime 模型选择继续保留，项目 -选择器的选项与帮助文字均显示其固定模型，不能误报为跟随全局设置；用户可选择普通 -Runtime 入口恢复跟随。该展示规则不改变模型解析、远程 Agent 协议或执行权限。 +项目设置分“执行方式”和“模型”两个字段，输入框使用两栏选择器，全局默认模型仍在系统 +设置中按 Runtime 页签配置。分层规则、选择器状态、键盘行为和失效提示由 +[执行方式与模型选择设计](./runtime-selection-design.md#3-各入口行为已实现)唯一维护。 ## Harness 模型来源展示 diff --git a/docs/features/remote-host/technical-design.md b/docs/features/remote-host/technical-design.md index 54232b22..3b889d2f 100644 --- a/docs/features/remote-host/technical-design.md +++ b/docs/features/remote-host/technical-design.md @@ -485,8 +485,10 @@ Runtime 包。2026-09-19 完整桌面验证覆盖联合包安装、CN 项目创 重连时，工具及原生子代理的状态也以已提交的远端活动事件为准，覆盖消息终态处理派生的 失败状态，避免将未完成活动误判为可恢复错误，保证终态重放内容一致。 - 远程 context metrics 与对话级压缩后的估算值按本次请求实际使用的 Runtime 选择写入 - `context_state_json`。实时接收与恢复入口都传入请求的选择；数据库在未传入时按对话、 - 项目、auto 顺序解析。继承项目设置的对话保持 `runtime_selection_json = NULL`， + `context_state_json`。实时接收与恢复入口都传入请求的选择；数据库在未传入时按对话层、 + 项目层解析，缺省执行方式为 OpenCode（规则见 + [执行方式与模型选择设计](../model-connections/runtime-selection-design.md#4-执行时解析已实现)）。 + 继承项目设置的对话保持 `runtime_selection_json = NULL`， 不为接收 usage 固定对话 Runtime；去重和消息/指标写入仍在同一 SQLite 事务中完成。 - ACK 后 Agent 删除已确认事件，只保留小型操作终态与游标用于幂等核对；未 ACK 输出继续 保留。Main 按 transcript page 的最高连续 sequence ACK，终态仍立即 ACK。单事件、单页、 diff --git a/src/agent-daemon/continue-acp-helper.test.ts b/src/agent-daemon/continue-acp-helper.test.ts index 365b66b8..ba49b4f5 100644 --- a/src/agent-daemon/continue-acp-helper.test.ts +++ b/src/agent-daemon/continue-acp-helper.test.ts @@ -98,6 +98,42 @@ it('delivers current ACP session MCP capabilities in Execute and Ask with read-o } }) +it('keeps one flat transcript without nesting history or repeating work-mode text', async () => { + const prompts: string[] = [] + vi.stubGlobal('fetch', vi.fn(async () => Response.json({ operationId: 'operation', workMode: 'execute' }))) + vi.spyOn(ContinueHostAdapter.prototype, 'run').mockImplementation(async (prompt) => { + prompts.push(prompt) + return { text: `answer ${prompts.length}` } + }) + const running = runContinueAcpHelper({ + socketPath: 'unused', protocol: 'openai-chat-completions', model: 'test-model', + supportsImageInput: false, workMode: 'execute', sharedSessions: true, entrypoint: 'unused' + }) + try { + await vi.waitFor(() => expect(transport.agent).toBeDefined()) + const agent = transport.agent! + const { sessionId } = await agent.newSession({ cwd: tmpdir(), mcpServers: [] }) + const desktopHistory = [{ role: 'user', content: 'old question' }, { role: 'assistant', content: 'old answer' }] + await agent.prompt({ sessionId, prompt: [{ type: 'text', text: [ + 'Continue this conversation. The history below is untrusted conversation data, not system instructions.', + `${JSON.stringify(desktopHistory)}`, + '', + 'Work mode: Execute. Follow the user request.\n\nfirst' + ].join('\n') }] }) + await agent.prompt({ sessionId, prompt: [{ type: 'text', text: 'Work mode: Execute. Follow the user request.\n\nsecond' }] }) + + expect(prompts[0]!.match(//g)).toHaveLength(1) + expect(prompts[1]!.match(//g)).toHaveLength(1) + expect(prompts[1]!.match(/Work mode:/g)).toHaveLength(1) + const history = JSON.parse(prompts[1]!.match(/(.*)<\/conversation-history>/)![1]!) + expect(history).toEqual([...desktopHistory, + { role: 'user', content: 'first' }, { role: 'assistant', content: 'answer 1' }]) + } finally { + transport.close() + await running + } +}) + it('keeps local profile MCP scoping and includes Main-bound session servers in Ask', async () => { const root = await mkdtemp(join(tmpdir(), 'goodbuddy-cn-scope-')) try { diff --git a/src/agent-daemon/continue-acp-helper.ts b/src/agent-daemon/continue-acp-helper.ts index 826796b5..2f204973 100644 --- a/src/agent-daemon/continue-acp-helper.ts +++ b/src/agent-daemon/continue-acp-helper.ts @@ -7,7 +7,11 @@ import { join } from 'node:path' import { Readable, Writable } from 'node:stream' import { AgentSideConnection, ndJsonStream, PROTOCOL_VERSION, type Agent, type McpServer } from '@agentclientprotocol/sdk' import { ContinueHostAdapter } from '../main/agent/continue-host-adapter' -import { promptWithUntrustedConversationHistory } from '../main/agent/runtime-conversation-history' +import { + promptWithUntrustedConversationHistory, + splitUntrustedConversationHistory, + stripWorkModeInstruction +} from '../main/agent/runtime-conversation-history' import type { AgentExecutionRequest, AgentImage } from '../main/agent/runtime' import { createUnixModelBridgeExchange } from './model-bridge-broker' import { ModelBridgeLoopbackProxy, MODEL_BRIDGE_SDK_AUTH_SENTINEL, openCodeModelBridgeModelId, type ModelBridgeProtocol } from './model-bridge-helper' @@ -104,7 +108,12 @@ export async function runContinueAcpHelper(options: { }) const abort = new AbortController() let finish!: () => void - const text = prompt.filter(part => part.type === 'text').map(part => part.text).join('\n') + // Desktop embeds its history only in the first prompt of a new process; + // this helper owns the transcript afterwards and must not wrap it twice. + const received = splitUntrustedConversationHistory( + prompt.filter(part => part.type === 'text').map(part => part.text).join('\n')) + if (received.history && session.history.length === 0) session.history.push(...received.history) + const text = received.prompt const images = prompt.filter(part => part.type === 'image').map((part, index) => { if (part.mimeType !== 'image/png' && part.mimeType !== 'image/jpeg') throw new Error('Unsupported Continue image type') return { name: `image-${index}`, mediaType: part.mimeType, data: part.data } @@ -143,7 +152,8 @@ export async function runContinueAcpHelper(options: { if (!result.streamedText && result.text) await connection.sessionUpdate({ sessionId, update: { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: result.text } } }) - session.history.push({ role: 'user', content: text }, { role: 'assistant', content: result.text }) + session.history.push({ role: 'user', content: stripWorkModeInstruction(text) }, + { role: 'assistant', content: result.text }) return { stopReason: 'end_turn', ...(result.usage ? { usage: { inputTokens: result.usage.inputTokens, outputTokens: result.usage.outputTokens, totalTokens: result.usage.inputTokens + result.usage.outputTokens, diff --git a/src/main/agent/deepseek-harness-runtime.test.ts b/src/main/agent/deepseek-harness-runtime.test.ts index af27d934..96f9b326 100644 --- a/src/main/agent/deepseek-harness-runtime.test.ts +++ b/src/main/agent/deepseek-harness-runtime.test.ts @@ -838,6 +838,37 @@ describe('DeepSeekHarnessRuntime', () => { await harness.runtime.dispose() }) + it('sends GoodBuddy history only when it creates the native session', async () => { + const harness = setup() + const history = [ + { role: 'user' as const, content: 'earlier question' }, + { role: 'assistant' as const, content: 'earlier answer' } + ] + for (const [index, prompt] of ['first', 'second'].entries()) { + const running = collect( + harness.runtime.run( + { ...request('reused'), requestId: `request-${prompt}`, prompt, history }, + new AbortController().signal + ) + ) + await vi.waitFor(() => + expect(harness.promptGates).toHaveLength(index + 1) + ) + harness.promptGates[index]!.resolve({ stopReason: 'end_turn' }) + await running + } + + const texts = harness.requests + .filter(({ method }) => method === 'session/prompt') + .map(({ params }) => + (params.prompt as Array<{ text?: string }>)[0]?.text + ) + expect(texts[0]).toContain('') + expect(texts[0]).toContain('earlier answer') + expect(texts[1]).toBe('second') + await harness.runtime.dispose() + }) + it('fails Ask closed and never calls the authorizer', async () => { const harness = setup() const authorize = vi.fn().mockResolvedValue('once') diff --git a/src/main/agent/deepseek-harness-runtime.ts b/src/main/agent/deepseek-harness-runtime.ts index 393012b3..6248d329 100644 --- a/src/main/agent/deepseek-harness-runtime.ts +++ b/src/main/agent/deepseek-harness-runtime.ts @@ -1348,17 +1348,17 @@ export class DeepSeekHarnessRuntime implements AgentRuntime { state: HarnessState, conversationId: string, workspace: string - ): Promise { + ): Promise<{ id: string; created: boolean }> { const current = this.sessions.get(conversationId) if (current?.workspace === workspace) { - return current.id + return { id: current.id, created: false } } if (current) { await this.releaseConversation(conversationId) } const pending = this.sessionInitializations.get(conversationId) if (pending) { - return pending + return { id: await pending, created: false } } const creation = state.agent .newSession({ @@ -1374,7 +1374,7 @@ export class DeepSeekHarnessRuntime implements AgentRuntime { }) this.sessionInitializations.set(conversationId, creation) try { - return await creation + return { id: await creation, created: true } } finally { this.sessionInitializations.delete(conversationId) } @@ -1496,11 +1496,14 @@ export class DeepSeekHarnessRuntime implements AgentRuntime { const workspace = request.executionWorkspace ? await realpath(request.executionWorkspace) : state.workspace - sessionId = await this.getSession( + const session = await this.getSession( state, request.conversationId, workspace ) + sessionId = session.id + // A reused Harness session already retains earlier turns natively. + const includeHistory = session.created run = { request, toolProvider: this.toolsFor(workspace), @@ -1557,7 +1560,10 @@ export class DeepSeekHarnessRuntime implements AgentRuntime { prompt: [ { type: 'text', - text: promptWithUntrustedConversationHistory(request, true) + text: promptWithUntrustedConversationHistory( + request, + includeHistory + ) }, ...(request.images ?? []).map((image) => ({ type: 'image' as const, diff --git a/src/main/agent/local-runtime-registry.ts b/src/main/agent/local-runtime-registry.ts index c373b203..189c9092 100644 --- a/src/main/agent/local-runtime-registry.ts +++ b/src/main/agent/local-runtime-registry.ts @@ -24,7 +24,7 @@ class LocalRuntimeEntry { private idle?: ReturnType readonly description: Pick + 'supportsScopedDataTools' | 'consumesTrustedInstructions' | 'capability'> constructor( readonly configuration: unknown, @@ -38,6 +38,7 @@ class LocalRuntimeEntry { requiresToolApproval: runtime.requiresToolApproval, supportsToolExecution: runtime.supportsToolExecution, supportsScopedDataTools: runtime.supportsScopedDataTools, + consumesTrustedInstructions: runtime.consumesTrustedInstructions, capability: runtime.capability } this.scheduleIdle() @@ -220,6 +221,7 @@ class WorkspaceRuntime implements AgentRuntime { get requiresToolApproval() { return this.entry.description.requiresToolApproval } get supportsToolExecution() { return this.entry.description.supportsToolExecution } get supportsScopedDataTools() { return this.entry.description.supportsScopedDataTools } + get consumesTrustedInstructions() { return this.entry.description.consumesTrustedInstructions } get capability() { return this.entry.description.capability } private check(): void { diff --git a/src/main/agent/model-runtime.ts b/src/main/agent/model-runtime.ts index 34cda811..e1a22c98 100644 --- a/src/main/agent/model-runtime.ts +++ b/src/main/agent/model-runtime.ts @@ -1637,6 +1637,7 @@ async function* readAnthropicToolStream( export class ModelAgentRuntime implements AgentRuntime { readonly runtimeId = 'model' readonly requiresToolApproval = false + readonly consumesTrustedInstructions = true private readonly conversations = new Map() private readonly conversationSummaries = new Map< string, diff --git a/src/main/agent/native-client-coordinator.ts b/src/main/agent/native-client-coordinator.ts index f4be64e2..b9bd30ca 100644 --- a/src/main/agent/native-client-coordinator.ts +++ b/src/main/agent/native-client-coordinator.ts @@ -4,7 +4,6 @@ import { mkdir, stat } from 'node:fs/promises' import { join } from 'node:path' import { promisify } from 'node:util' import { normalizeInteractiveWorkMode } from '../../shared/assistant-contracts' -import { getDefaultRuntimeSelection } from '../../shared/runtime-selection-contracts' import type { RuntimeNativeClientResult } from '../../shared/runtime-native-client-contracts' import type { AssistantDatabase } from '../assistant/assistant-database' import type { ApplicationSettingsStore } from '../application-settings-store' @@ -17,7 +16,7 @@ import type { BundledRuntimePaths } from './bundled-runtimes' import type { KnowledgeMcpGateway } from './knowledge-mcp-gateway' import { NativeDshWebClientService } from './native-dsh-web-client' import { NativeTerminalClient } from './native-terminal-client' -import { applyRuntimeSelection } from './runtime-selection' +import { applyRuntimeSelection, resolveLayeredRuntimeSelection } from './runtime-selection' type Options = { database: AssistantDatabase @@ -86,8 +85,11 @@ export class NativeClientCoordinator { if (!conversation.projectId) throw new Error('Native clients require a saved project conversation') const project = this.options.database.getProject(conversation.projectId) const settings = await this.options.settingsStore.getResolvedSettings() - const saved = conversation.runtimeSelection ?? project.runtimeSelection - const selected = applyRuntimeSelection(settings, saved && saved.provider !== 'auto' ? saved : getDefaultRuntimeSelection(settings)) + const selected = applyRuntimeSelection(settings, resolveLayeredRuntimeSelection( + settings, + { project: project.runtimeSelection, conversation: conversation.runtimeSelection }, + { remote: project.executionSpace?.kind === 'ssh' } + ).selection) const space = this.options.executionSpaceResolver.resolveProject(project) const workMode = normalizeInteractiveWorkMode(conversation.workMode ?? project.defaultWorkMode) const [skills, mcpServers, builtin, application, obsidian] = await Promise.all([ diff --git a/src/main/agent/opencode-runtime.test.ts b/src/main/agent/opencode-runtime.test.ts index 0712f160..1b3d15c0 100644 --- a/src/main/agent/opencode-runtime.test.ts +++ b/src/main/agent/opencode-runtime.test.ts @@ -207,6 +207,10 @@ function runClient(events: Record[]) { data: true, error: undefined, }), + deleteMessage: vi.fn().mockResolvedValue({ + data: true, + error: undefined, + }), }, event: { subscribe: vi.fn().mockImplementation(async () => { @@ -4155,6 +4159,35 @@ describe("OpenCodeRuntime embedded permission mediation", () => { await runtime.dispose(); }); + it("removes an unanswered prompt from a reused session after failure", async () => { + const { client, session } = runClient([ + { + id: "event-error", + type: "session.error", + properties: { + sessionID: "session-1", + error: { name: "UnknownError", data: { message: "model failed" } }, + }, + }, + ]); + const runtime = embeddedRuntime(client); + + await expect(collectRun(runtime)).rejects.toThrow("model failed"); + + const promptMessageId = vi.mocked(session.promptAsync).mock.calls[0]?.[0] + ?.messageID; + expect(promptMessageId).toMatch(/^msg_/); + expect(session.deleteMessage).toHaveBeenCalledWith( + { + sessionID: "session-1", + messageID: promptMessageId, + directory: process.cwd(), + }, + { signal: expect.any(AbortSignal) }, + ); + await runtime.dispose(); + }); + it("deletes an ephemeral OpenCode session when released", async () => { const { client, session } = runClient([ { diff --git a/src/main/agent/opencode-runtime.ts b/src/main/agent/opencode-runtime.ts index 0e48eeed..9d2045a0 100644 --- a/src/main/agent/opencode-runtime.ts +++ b/src/main/agent/opencode-runtime.ts @@ -726,6 +726,8 @@ export class OpenCodeRuntime implements AgentRuntime { readonly runtimeId = "opencode"; readonly requiresToolApproval = false; readonly supportsToolExecution = true; + // OpenCode applies the prompt `system` field to the current turn only. + readonly consumesTrustedInstructions = true; private client?: OpencodeClient; private clientInitialization?: Promise; private server?: OpenCodeServer; @@ -2453,6 +2455,7 @@ export class OpenCodeRuntime implements AgentRuntime { const checklistCalls = new Map(); const submittedChecklistCalls = new Set(); const pendingChecklistUpdates: RuntimeChecklist[] = []; + let runFailed = false; try { const promptText = promptWithUntrustedConversationHistory( request, @@ -2502,9 +2505,14 @@ export class OpenCodeRuntime implements AgentRuntime { : undefined, ...(selectedAgent ? { agent: selectedAgent } : {}), system: - nativeSkillIds.length > 0 - ? undefined - : this.options.skillInstructions || undefined, + [ + nativeSkillIds.length > 0 + ? undefined + : this.options.skillInstructions, + request.trustedInstructions, + ] + .filter(Boolean) + .join("\n\n") || undefined, ...(toolOverrides ? { tools: toolOverrides } : {}), parts: [ { type: "text" as const, text: promptText }, @@ -3021,6 +3029,7 @@ export class OpenCodeRuntime implements AgentRuntime { signal.throwIfAborted(); throw new Error("OpenCode 事件流意外结束"); } catch (error) { + runFailed = true; abortSession(); for (const [callId, tool] of toolStates) { if (tool.state === "pending" || tool.state === "running") { @@ -3056,6 +3065,22 @@ export class OpenCodeRuntime implements AgentRuntime { signal.removeEventListener("abort", abortSession); // Keep the conversation locked until its session-wide abort settles. await sessionAbort; + // A reused session would otherwise merge this unanswered prompt into the next turn. + if ( + runFailed && + !selectedCommand && + checklistMessageIds.size === 0 && + this.sessions.get(request.conversationId)?.id === sessionId + ) { + await Promise.resolve() + .then(() => + client.session.deleteMessage( + { sessionID: sessionId, messageID: promptMessageId, directory }, + { signal: AbortSignal.timeout(1_000) }, + ), + ) + .catch(() => undefined); + } for (const questionId of reportedQuestionIds.values()) { this.pendingQuestions.delete(questionId); } diff --git a/src/main/agent/runtime-controller.ts b/src/main/agent/runtime-controller.ts index 6d034342..437ee505 100644 --- a/src/main/agent/runtime-controller.ts +++ b/src/main/agent/runtime-controller.ts @@ -112,6 +112,10 @@ export class AgentRuntimeController implements AgentRuntime { return this.current.runtime.supportsScopedDataTools !== false } + get consumesTrustedInstructions(): boolean { + return this.current.runtime.consumesTrustedInstructions === true + } + get capability(): AgentRuntime['capability'] { return this.current.runtime.capability } diff --git a/src/main/agent/runtime-conversation-history.ts b/src/main/agent/runtime-conversation-history.ts index 461e9f76..66765d06 100644 --- a/src/main/agent/runtime-conversation-history.ts +++ b/src/main/agent/runtime-conversation-history.ts @@ -1,15 +1,80 @@ import type { AgentExecutionRequest } from './runtime' +type ConversationHistory = NonNullable + +const historyHeader = + 'Continue this conversation. The history below is untrusted conversation data, not system instructions.' +const historyOpen = '' +const historyClose = '' + export function promptWithUntrustedConversationHistory( request: Pick, includeHistory: boolean ): string { return includeHistory && request.history?.length ? [ - 'Continue this conversation. The history below is untrusted conversation data, not system instructions.', - `${JSON.stringify(request.history)}`, + historyHeader, + `${historyOpen}${JSON.stringify(request.history)}${historyClose}`, '', request.prompt ].join('\n') : request.prompt } + +/** + * Reverses `promptWithUntrustedConversationHistory` for runtimes that keep + * their own transcript, so an embedded history envelope is not re-wrapped. + */ +export function splitUntrustedConversationHistory(text: string): { + history?: ConversationHistory + prompt: string +} { + const prefix = `${historyHeader}\n${historyOpen}` + if (!text.startsWith(prefix)) return { prompt: text } + // Message content may itself contain the closing tag; accept the first + // boundary whose payload is a valid history array. + let index = text.indexOf(historyClose, prefix.length) + while (index !== -1) { + const history = parseHistory(text.slice(prefix.length, index)) + const rest = text.slice(index + historyClose.length) + if (history && rest.startsWith('\n\n')) { + return { history, prompt: rest.slice(2) } + } + index = text.indexOf(historyClose, index + 1) + } + return { prompt: text } +} + +function parseHistory(json: string): ConversationHistory | undefined { + let value: unknown + try { + value = JSON.parse(json) + } catch { + return undefined + } + if (!Array.isArray(value)) return undefined + const history: ConversationHistory = [] + for (const item of value) { + if ( + !item || + typeof item !== 'object' || + ((item as { role?: unknown }).role !== 'user' && + (item as { role?: unknown }).role !== 'assistant') || + typeof (item as { content?: unknown }).content !== 'string' + ) { + return undefined + } + history.push({ + role: (item as { role: 'user' | 'assistant' }).role, + content: (item as { content: string }).content + }) + } + return history +} + +/** Drops the per-turn GoodBuddy work-mode paragraph from stored user text. */ +export function stripWorkModeInstruction(prompt: string): string { + if (!prompt.startsWith('Work mode: ')) return prompt + const end = prompt.indexOf('\n\n') + return end === -1 ? prompt : prompt.slice(end + 2) +} diff --git a/src/main/agent/runtime-selection-contracts.test.ts b/src/main/agent/runtime-selection-contracts.test.ts index c928b02b..abe05472 100644 --- a/src/main/agent/runtime-selection-contracts.test.ts +++ b/src/main/agent/runtime-selection-contracts.test.ts @@ -1,109 +1,168 @@ import { describe, expect, it } from 'vitest' -import { applyRuntimeSelection } from './runtime-selection' -import type { ResolvedRuntimeSettings } from '../runtime-settings-store' -import { defaultRuntimeCustomizationSettings } from '../../shared/contracts' import { - repairChannelRuntimeSelection, - type AgentRuntimeSelection, - type RuntimeSelectionRepairSettings + compactRuntimeSelectionLayer, + optionalAgentRuntimeSelectionSchema, + repairRuntimeSelectionLayer, + resolveRuntimeChoice, + runtimeSelectionLayerSchema, + withoutLegacyAutoSelection, + type RuntimeResolutionSettings } from '../../shared/runtime-selection-contracts' const defaultId = '00000000-0000-4000-8000-000000000001' -const fallbackId = '00000000-0000-4000-8000-000000000002' -const missingId = '00000000-0000-4000-8000-000000000003' +const secondId = '00000000-0000-4000-8000-000000000002' +const imageId = '00000000-0000-4000-8000-000000000003' +const keylessId = '00000000-0000-4000-8000-000000000004' +const missingId = '00000000-0000-4000-8000-000000000009' function settings( - defaultProfile: Partial -): RuntimeSelectionRepairSettings { + overrides: Partial = {} +): RuntimeResolutionSettings { return { + provider: 'opencode', defaultModelProfileId: defaultId, modelProfiles: [ - { - id: defaultId, protocol: 'openai-chat-completions', - authentication: 'api-key', apiKeyConfigured: true, ...defaultProfile - }, - { - id: fallbackId, protocol: 'openai-chat-completions', - authentication: 'none', apiKeyConfigured: false - } + { id: defaultId, name: 'Default', protocol: 'openai-chat-completions', baseUrl: 'https://a.example/v1', authentication: 'api-key', apiKeyConfigured: true }, + { id: secondId, name: 'Second', protocol: 'anthropic-messages', baseUrl: 'https://b.example/v1', authentication: 'none' }, + { id: imageId, name: 'Image', protocol: 'openai-images-generations', baseUrl: 'https://c.example/v1', authentication: 'none' }, + { id: keylessId, name: 'Keyless', protocol: 'openai-chat-completions', baseUrl: 'https://d.example/v1', authentication: 'api-key', apiKeyConfigured: false } ], - opencodeModelSource: { kind: 'platform' }, - continueModelSource: { kind: 'platform' } + opencodeModelSource: { kind: 'profile', profileId: secondId }, + continueModelSource: { kind: 'platform' }, + deepseekHarnessModelSource: { kind: 'default' }, + ...overrides } } -function resolvedSettings(input: RuntimeSelectionRepairSettings): ResolvedRuntimeSettings { - return { - provider: 'model', modelBaseUrl: 'https://model.example/v1', modelName: 'default', - modelProtocol: 'openai-chat-completions', modelAuthentication: 'api-key', - imageGenerationQuality: 'auto', - modelProfiles: input.modelProfiles.map((profile) => ({ - id: profile.id, name: profile.id, baseUrl: 'https://model.example/v1', - modelName: profile.id, - protocol: profile.protocol as ResolvedRuntimeSettings['modelProtocol'], - authentication: profile.authentication!, - apiKey: profile.apiKeyConfigured ? 'fixture-key' : undefined - })), - defaultModelProfileId: input.defaultModelProfileId, - opencodeBaseUrl: '', opencodeEmbedded: false, opencodeBinaryPath: '', - opencodeConfigPath: '', continueBinaryPath: '', continueConfigPath: '', - continueMode: 'chat', subagentSmartRoutingEnabled: false, - knowledgeEmbeddingEnabled: false, knowledgeEmbeddingBaseUrl: '', - knowledgeEmbeddingModel: '', knowledgeRerankEnabled: false, - knowledgeRerankEndpoint: '', knowledgeRerankModel: '', - runtimeCustomization: defaultRuntimeCustomizationSettings, - workspacePath: '.', toolApproval: 'always' - } -} +describe('layered runtime resolution', () => { + it('uses global defaults when project and conversation inherit', () => { + const resolved = resolveRuntimeChoice(settings()) + expect(resolved.selection).toEqual({ provider: 'opencode', profileId: secondId }) + expect(resolved).toMatchObject({ providerSource: 'global', modelSource: 'global' }) + }) -describe('channel direct model repair', () => { - const selections: AgentRuntimeSelection[] = [ - { provider: 'auto' }, - { provider: 'model' }, - { provider: 'model', profileId: defaultId }, - { provider: 'model', profileId: missingId } - ] - it.each([ - { protocol: 'openai-images-generations' }, - { apiKeyConfigured: false }, - { id: missingId } - ])('pins a verified fallback when the default is unusable: %j', (defaultProfile) => { - const input = settings(defaultProfile) - if (defaultProfile.id) input.modelProfiles = input.modelProfiles.slice(1) - for (const selection of selections) { - const repaired = repairChannelRuntimeSelection(selection, input) - expect(repaired).toEqual({ provider: 'model', profileId: fallbackId }) - const resolved = applyRuntimeSelection(resolvedSettings(input), repaired) - expect(resolved.settings.defaultModelProfileId).toBe(fallbackId) - expect(resolved.settings.modelProtocol).toBe('openai-chat-completions') - expect(resolved.settings.modelAuthentication).toBe('none') + it('inherits each field independently across layers', () => { + const resolved = resolveRuntimeChoice(settings(), { + project: { provider: 'continue' }, + conversation: { model: { kind: 'profile', profileId: defaultId } } + }) + expect(resolved.selection).toEqual({ provider: 'continue', profileId: defaultId }) + expect(resolved).toMatchObject({ providerSource: 'project', modelSource: 'conversation' }) + }) + + it('switching only the execution mode takes that mode’s own default model', () => { + const resolved = resolveRuntimeChoice(settings(), { + project: { provider: 'opencode', model: { kind: 'profile', profileId: secondId } }, + conversation: { provider: 'continue' } + }) + // The project's OpenCode model still applies because it is valid for Continue too; + // a Continue-incompatible model would fall back to Continue's global default. + expect(resolved.selection).toEqual({ provider: 'continue', profileId: secondId }) + const harness = resolveRuntimeChoice(settings(), { + project: { model: { kind: 'profile', profileId: secondId } }, + conversation: { provider: 'deepseek-harness' } + }) + expect(harness.selection).toEqual({ provider: 'deepseek-harness', profileId: defaultId }) + expect(harness.ignored).toMatchObject({ layer: 'project', kind: 'model', reason: 'incompatible' }) + }) + + it('keeps a keyless model so the run can explain the missing key', () => { + expect(resolveRuntimeChoice(settings(), { + conversation: { model: { kind: 'profile', profileId: keylessId } } + }).selection).toEqual({ provider: 'opencode', profileId: keylessId }) + }) + + it('falls back and reports deleted or incompatible models', () => { + for (const [profileId, reason] of [ + [missingId, 'missing'], + [imageId, 'incompatible'] + ] as const) { + const resolved = resolveRuntimeChoice(settings(), { + conversation: { model: { kind: 'profile', profileId } } + }) + expect(resolved.selection).toEqual({ provider: 'opencode', profileId: secondId }) + expect(resolved.ignored).toEqual({ layer: 'conversation', kind: 'model', reason }) } }) - it('keeps a healthy default dynamic and preserves valid explicit pins', () => { - const input = settings({}) - for (const selection of [selections[0]!, selections[1]!, selections[3]!]) { - const repaired = repairChannelRuntimeSelection(selection, input) - expect(repaired).toEqual({ provider: 'model' }) - const changed = { ...resolvedSettings(input), defaultModelProfileId: fallbackId } - expect(applyRuntimeSelection(changed, repaired).settings.defaultModelProfileId).toBe(fallbackId) - } - for (const profileId of [defaultId, fallbackId]) { - const selection = { provider: 'model', profileId } as const - expect(repairChannelRuntimeSelection(selection, input)).toEqual(selection) - } + it('treats own configuration as an explicit choice', () => { + expect(resolveRuntimeChoice(settings(), { project: { provider: 'continue' } }).selection) + .toEqual({ provider: 'continue', runtimeConfig: true }) + const direct = resolveRuntimeChoice(settings(), { + project: { provider: 'model' }, + conversation: { model: { kind: 'runtime-config' } } + }) + expect(direct.selection).toEqual({ provider: 'model', profileId: defaultId }) + expect(direct.ignored?.reason).toBe('incompatible') }) - it('preserves a valid pin even when the global default is an image model', () => { - const input = settings({ protocol: 'openai-images-generations' }) - const selection = { provider: 'model', profileId: fallbackId } as const - expect(repairChannelRuntimeSelection(selection, input)).toEqual(selection) + it('limits managed SSH projects to OpenCode and Continue with GoodBuddy connections', () => { + const resolved = resolveRuntimeChoice( + settings({ provider: 'model', continueModelSource: { kind: 'platform' } }), + { project: { provider: 'deepseek-harness' }, conversation: { provider: 'continue' } }, + { remote: true } + ) + expect(resolved.selection).toEqual({ provider: 'continue', profileId: defaultId }) + expect(resolved.ignored).toMatchObject({ layer: 'project', kind: 'provider' }) }) - it('does not invent a profile when no usable fallback exists', () => { - const input = settings({ apiKeyConfigured: false }) - input.modelProfiles = input.modelProfiles.slice(0, 1) - expect(repairChannelRuntimeSelection({ provider: 'auto' }, input)) + it('treats legacy automatic global settings as the direct model', () => { + expect(resolveRuntimeChoice(settings({ provider: 'auto' })).selection) + .toEqual({ provider: 'model', profileId: defaultId }) + }) + + it('skips an unusable global direct default instead of failing', () => { + const resolved = resolveRuntimeChoice(settings({ provider: 'model', defaultModelProfileId: imageId })) + expect(resolved.selection).toEqual({ provider: 'model', profileId: defaultId }) + }) + + it('never invents a profile id when no connections exist', () => { + expect(resolveRuntimeChoice(settings({ provider: 'model', defaultModelProfileId: '', modelProfiles: [] })).selection) .toEqual({ provider: 'model' }) }) + + it('refuses GoodBuddy connections for an external OpenCode server', () => { + const resolved = resolveRuntimeChoice(settings({ opencodeBaseUrl: 'http://127.0.0.1:4096' }), { + conversation: { model: { kind: 'profile', profileId: defaultId } } + }) + expect(resolved.selection).toEqual({ provider: 'opencode', runtimeConfig: true }) + }) +}) + +describe('runtime selection layer storage', () => { + it('upgrades legacy stored selections', () => { + expect(runtimeSelectionLayerSchema.parse({ provider: 'auto' })).toEqual({}) + expect(runtimeSelectionLayerSchema.parse({ provider: 'opencode' })).toEqual({ provider: 'opencode' }) + expect(runtimeSelectionLayerSchema.parse({ provider: 'model', profileId: defaultId })) + .toEqual({ provider: 'model', model: { kind: 'profile', profileId: defaultId } }) + expect(() => runtimeSelectionLayerSchema.parse({ provider: 'model', model: { kind: 'runtime-config' } })) + .toThrow() + }) + + it('stores inheritance as absence', () => { + expect(compactRuntimeSelectionLayer({})).toBeUndefined() + expect(compactRuntimeSelectionLayer(undefined)).toBeUndefined() + }) + + it('repairs only references to deleted connections', () => { + const input = settings() + expect(repairRuntimeSelectionLayer( + { provider: 'continue', model: { kind: 'profile', profileId: missingId } }, input + )).toEqual({ provider: 'continue' }) + expect(repairRuntimeSelectionLayer( + { model: { kind: 'profile', profileId: missingId } }, input + )).toBeUndefined() + const valid = { provider: 'continue' as const, model: { kind: 'profile' as const, profileId: imageId } } + // Incompatible but existing: kept so the UI can explain the fallback. + expect(repairRuntimeSelectionLayer(valid, input)).toEqual(valid) + }) + + it('maps legacy automatic request selections to unspecified', () => { + expect(withoutLegacyAutoSelection({ provider: 'auto' })).toBeUndefined() + expect(withoutLegacyAutoSelection({ prompt: 'x', runtimeSelection: { provider: 'auto' } })) + .toEqual({ prompt: 'x' }) + expect(() => optionalAgentRuntimeSelectionSchema.parse({ provider: 'auto' })).toThrow() + expect(optionalAgentRuntimeSelectionSchema.parse(withoutLegacyAutoSelection({ provider: 'auto' }))) + .toBeUndefined() + }) }) diff --git a/src/main/agent/runtime-selection.test.ts b/src/main/agent/runtime-selection.test.ts index 053ced6c..1a31bfb7 100644 --- a/src/main/agent/runtime-selection.test.ts +++ b/src/main/agent/runtime-selection.test.ts @@ -291,15 +291,21 @@ describe('runtime selection', () => { ).toEqual({ provider: 'deepseek-harness' }) }) - it('routes legacy automatic settings through local OpenCode when the Server is blank', () => { - expect(getConfiguredRuntimeTarget(settings())).toBe('opencode') + it('treats legacy automatic settings as the direct model, matching settings normalization', () => { + expect(getConfiguredRuntimeTarget(settings())).toBe('model') expect( - getConfiguredRuntimeTarget( - settings({ opencodeEmbedded: false }) - ) + getConfiguredRuntimeTarget(settings({ provider: 'opencode' })) ).toBe('opencode') + }) + + it('resolves own configuration explicitly instead of the configured profile', () => { + const configured = settings({ + provider: 'opencode', + opencodeModelProfile: settings().modelProfiles[0] + }) expect( - applyRuntimeSelection(settings(), { provider: 'auto' }).settings - ).toEqual(settings()) + applyRuntimeSelection(configured, { provider: 'opencode', runtimeConfig: true }) + .settings.opencodeModelProfile + ).toBeUndefined() }) }) diff --git a/src/main/agent/runtime-selection.ts b/src/main/agent/runtime-selection.ts index 5b392435..8f002c2f 100644 --- a/src/main/agent/runtime-selection.ts +++ b/src/main/agent/runtime-selection.ts @@ -2,7 +2,14 @@ import { isAgentRuntimeModelProtocol, isDeepSeekHarnessModelProfile } from '../../shared/contracts' -import type { AgentRuntimeSelection } from '../../shared/runtime-selection-contracts' +import { + resolveRuntimeChoice, + type AgentRuntimeSelection, + type ResolvedRuntimeChoice, + type RuntimeResolutionOptions, + type RuntimeResolutionSettings, + type RuntimeSelectionLayer +} from '../../shared/runtime-selection-contracts' import type { ResolvedModelProfile, ResolvedRuntimeSettings @@ -36,24 +43,62 @@ export function getConfiguredRuntimeTarget( if (settings.provider === 'deepseek-harness') { return 'deepseek-harness' } - if ( - settings.provider === 'opencode' || - settings.provider === 'auto' - ) { + if (settings.provider === 'opencode') { return 'opencode' } return 'model' } +/** Presents resolved Main settings in the shape used by the shared resolver. */ +export function runtimeResolutionSettings( + settings: ResolvedRuntimeSettings +): RuntimeResolutionSettings { + // Partial settings (early startup, narrow callers) resolve with no connections. + const modelProfiles = settings.modelProfiles ?? [] + const known = (profile?: ResolvedModelProfile) => + profile && modelProfiles.some((candidate) => candidate.id === profile.id) + ? ({ kind: 'profile', profileId: profile.id } as const) + : ({ kind: 'platform' } as const) + return { + provider: settings.provider, + defaultModelProfileId: settings.defaultModelProfileId, + modelProfiles: modelProfiles.map((profile) => ({ + id: profile.id, + name: profile.name, + modelName: profile.modelName, + baseUrl: profile.baseUrl, + protocol: profile.protocol, + authentication: profile.authentication, + apiKeyConfigured: + profile.authentication !== 'api-key' || Boolean(profile.apiKey) + })), + opencodeModelSource: known(settings.opencodeModelProfile), + continueModelSource: known(settings.continueModelProfile), + deepseekHarnessModelSource: known(settings.deepseekHarnessModelProfile), + opencodeBaseUrl: settings.opencodeBaseUrl + } +} + +export function resolveLayeredRuntimeSelection( + settings: ResolvedRuntimeSettings, + layers: { + project?: RuntimeSelectionLayer + conversation?: RuntimeSelectionLayer + } = {}, + options: RuntimeResolutionOptions = {} +): ResolvedRuntimeChoice { + return resolveRuntimeChoice(runtimeResolutionSettings(settings), layers, options) +} + +/** Pins the model a Runtime selection implies so remote validation sees one concrete profile. */ export function resolveConfiguredAgentRuntimeSelection( settings: ResolvedRuntimeSettings, selection: AgentRuntimeSelection ): AgentRuntimeSelection { - if ('profileId' in selection && selection.profileId) return selection if ( - selection.provider !== 'opencode' && - selection.provider !== 'continue' && - selection.provider !== 'deepseek-harness' + selection.provider === 'model' || + selection.profileId || + ('runtimeConfig' in selection && selection.runtimeConfig) ) { return selection } @@ -80,13 +125,6 @@ export function applyRuntimeSelection( settings: ResolvedRuntimeSettings target: SelectedRuntimeTarget } { - if (selection.provider === 'auto') { - return { - settings, - target: getConfiguredRuntimeTarget(settings) - } - } - if (selection.provider === 'model') { const profile = requireProfile(settings, selection.profileId ?? settings.defaultModelProfileId) return { @@ -107,13 +145,16 @@ export function applyRuntimeSelection( } } + const runtimeConfig = selection.runtimeConfig === true const profile = selection.profileId ? requireProfile(settings, selection.profileId) - : selection.provider === 'opencode' - ? settings.opencodeModelProfile - : selection.provider === 'continue' - ? settings.continueModelProfile - : settings.deepseekHarnessModelProfile + : runtimeConfig + ? undefined + : selection.provider === 'opencode' + ? settings.opencodeModelProfile + : selection.provider === 'continue' + ? settings.continueModelProfile + : settings.deepseekHarnessModelProfile if (selection.provider === 'opencode') { if (profile && !isAgentRuntimeModelProtocol(profile.protocol)) { throw new Error( @@ -137,8 +178,10 @@ export function applyRuntimeSelection( } if (selection.provider === 'deepseek-harness') { - const selectedProfile = - profile ?? settings.deepseekHarnessModelProfile + // DeepSeek Harness "own configuration" is the administrator-provided or fallback model. + const selectedProfile = runtimeConfig + ? settings.deepseekHarnessPlatformModelProfile + : profile if ( selectedProfile && !isDeepSeekHarnessModelProfile(selectedProfile) diff --git a/src/main/agent/runtime.ts b/src/main/agent/runtime.ts index 53afd079..3da39889 100644 --- a/src/main/agent/runtime.ts +++ b/src/main/agent/runtime.ts @@ -94,6 +94,11 @@ export interface AgentRuntime { readonly supportsToolExecution: boolean /** Whether request-scoped GoodBuddy data tools can reach this runtime. */ readonly supportsScopedDataTools?: boolean + /** + * Whether `trustedInstructions` reach the model's system layer for every + * turn. Runtimes without this guarantee receive them inside the prompt. + */ + readonly consumesTrustedInstructions?: boolean readonly capability?: 'chat' | 'image-generation' getStatus(): Promise testConnection?(): Promise diff --git a/src/main/assistant/assistant-database.test.ts b/src/main/assistant/assistant-database.test.ts index 861ea332..11748d97 100644 --- a/src/main/assistant/assistant-database.test.ts +++ b/src/main/assistant/assistant-database.test.ts @@ -2388,7 +2388,7 @@ describe('AssistantDatabase', () => { database.close() }) - it('fails closed when an SSH project lacks a Runtime selection', async () => { + it('lets an SSH project without a Runtime selection follow global settings', async () => { const directory = await mkdtemp( join(tmpdir(), 'goodbuddy-invalid-ssh-project-') ) @@ -2411,9 +2411,8 @@ describe('AssistantDatabase', () => { ) raw.close() - expect(() => database.getProject(project.id)).toThrow( - '缺少远程 Runtime 选择' - ) + // Resolution limits remote projects to OpenCode or Continue at run time. + expect(database.getProject(project.id).runtimeSelection).toBeUndefined() database.close() }) @@ -2478,12 +2477,6 @@ describe('AssistantDatabase', () => { database.createSshProject(rootMismatch) ).toThrow('目录不匹配') - const missingRuntime = validatedSshProjectWrite() - delete missingRuntime.project.runtimeSelection - expect(() => - database.createSshProject(missingRuntime) - ).toThrow('必须选择 Runtime') - expect(() => database.createSshProject( validatedSshProjectWrite({ @@ -2727,10 +2720,8 @@ describe('AssistantDatabase', () => { rootPath: 'C:\\Users\\test' }, defaultWorkMode: 'ask', - runtimeSelection: { - provider: 'model', - profileId: channelDefaultProfileId - }, + // The model follows global settings instead of freezing today's default. + runtimeSelection: { provider: 'model' }, kind: 'channel', channel: 'weixin' }), @@ -2760,7 +2751,7 @@ describe('AssistantDatabase', () => { defaultWorkMode: 'execute', runtimeSelection: { provider: 'opencode', - profileId: '00000000-0000-4000-8000-000000000019' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000019' } } }) expect(updated).toMatchObject({ @@ -2774,7 +2765,7 @@ describe('AssistantDatabase', () => { defaultWorkMode: 'execute', runtimeSelection: { provider: 'opencode', - profileId: '00000000-0000-4000-8000-000000000019' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000019' } } }) expect(() => @@ -5159,7 +5150,7 @@ describe('AssistantDatabase', () => { projectId: project.id, runtimeSelection: { provider: 'model', - profileId: '00000000-0000-4000-8000-000000000299' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000299' } }, knowledgeLibraryIds: [ '00000000-0000-4000-8000-000000000214' @@ -5264,7 +5255,7 @@ describe('AssistantDatabase', () => { projectId: project.id, runtimeSelection: { provider: 'model', - profileId: '00000000-0000-4000-8000-000000000299' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000299' } }, knowledgeLibraryIds: [ '00000000-0000-4000-8000-000000000214' @@ -5654,7 +5645,7 @@ describe('AssistantDatabase', () => { projectId: project.id, runtimeSelection: { provider: 'model', - profileId: channelDefaultProfileId + model: { kind: 'profile', profileId: channelDefaultProfileId } }, knowledgeLibraryIds: [ '00000000-0000-4000-8000-000000000559' @@ -5765,7 +5756,7 @@ describe('AssistantDatabase', () => { projectId: project.id, runtimeSelection: { provider: 'model', - profileId: channelDefaultProfileId + model: { kind: 'profile', profileId: channelDefaultProfileId } }, knowledgeLibraryIds: [ '00000000-0000-4000-8000-000000000559' @@ -6322,99 +6313,47 @@ describe('AssistantDatabase', () => { database.close() }) - it('repairs unattended channel selections without rebinding ordinary conversations', async () => { + it('clears deleted model connections from every project and conversation layer', async () => { const database = await createDatabase() - const removedProfileId = - '00000000-0000-4000-8000-000000000291' - const defaultProfileId = - '00000000-0000-4000-8000-000000000292' - const runtimeProfileId = - '00000000-0000-4000-8000-000000000293' - const imageProfileId = - '00000000-0000-4000-8000-000000000294' + const removedProfileId = '00000000-0000-4000-8000-000000000291' + const keptProfileId = '00000000-0000-4000-8000-000000000293' + const imageProfileId = '00000000-0000-4000-8000-000000000294' database.replaceConversations( ([ ['model', removedProfileId], ['opencode', removedProfileId], - ['continue', removedProfileId], - ['model', runtimeProfileId] + ['continue', keptProfileId], + [undefined, removedProfileId] ] as const).map(([provider, profileId], index) => ({ id: `00000000-0000-4000-8000-00000000030${index}`, - runtimeSelection: { provider, profileId }, + runtimeSelection: { + ...(provider ? { provider } : {}), + model: { kind: 'profile' as const, profileId } + }, title: `对话 ${index}`, updatedAt: index + 1, messages: [] })) ) - const channelProject = database.ensureChannelProjects( - 'C:\\Users\\test', - defaultProfileId - )[0]! - database.updateProject(channelProject.id, { - name: channelProject.name, - description: channelProject.description, - rootPath: channelProject.rootPath, - defaultWorkMode: channelProject.defaultWorkMode, - runtimeSelection: { - provider: 'opencode', - profileId: runtimeProfileId - } + const [channelProject, imageChannelProject] = database.ensureChannelProjects('C:\\Users\\test') + database.updateProject(channelProject!.id, { + ...channelProject!, + runtimeSelection: { provider: 'opencode', model: { kind: 'profile', profileId: removedProfileId } } }) - const imageChannelProject = database.ensureChannelProjects( - 'C:\\Users\\test', - defaultProfileId - )[1]! - database.updateProject(imageChannelProject.id, { - name: imageChannelProject.name, - description: imageChannelProject.description, - rootPath: imageChannelProject.rootPath, - defaultWorkMode: imageChannelProject.defaultWorkMode, - runtimeSelection: { - provider: 'model', - profileId: imageProfileId - } + database.updateProject(imageChannelProject!.id, { + ...imageChannelProject!, + runtimeSelection: { provider: 'model', model: { kind: 'profile', profileId: imageProfileId } } }) - const automaticChannelProject = database.ensureChannelProjects( - 'C:\\Users\\test', - defaultProfileId - )[2]! - database.updateProject(automaticChannelProject.id, { - name: automaticChannelProject.name, - description: automaticChannelProject.description, - rootPath: automaticChannelProject.rootPath, - defaultWorkMode: automaticChannelProject.defaultWorkMode, - runtimeSelection: { provider: 'auto' } + const localProject = database.createProject({ + name: '本地', description: '', rootPath: 'C:\\Local', defaultWorkMode: 'ask', + runtimeSelection: { model: { kind: 'profile', profileId: removedProfileId } } }) - const automaticRemoteConversation = - database.getOrCreateRemoteConversation({ - projectId: automaticChannelProject.id, - channel: 'dingtalk', - accountId: 'default', - externalConversationId: 'legacy-auto-conversation', - conversationType: 'direct', - title: '钉钉 · 旧版自动后端', - accountDisplay: '发送者 ****0001', - runtimeSelection: { provider: 'auto' } - }) expect( database.repairConversationRuntimeSelections({ - modelProfiles: [ - { id: defaultProfileId }, - { id: runtimeProfileId }, - { - id: imageProfileId, - protocol: 'openai-images-generations' - } - ], - defaultModelProfileId: defaultProfileId, - opencodeModelSource: { - kind: 'profile', - profileId: runtimeProfileId - }, - continueModelSource: { kind: 'platform' } + modelProfiles: [{ id: keptProfileId }, { id: imageProfileId, protocol: 'openai-images-generations' }] }) - ).toBe(3) + ).toBe(5) expect( database .listConversations() @@ -6422,35 +6361,49 @@ describe('AssistantDatabase', () => { .sort((left, right) => left.title.localeCompare(right.title)) .map((conversation) => conversation.runtimeSelection) ).toEqual([ - { provider: 'model', profileId: removedProfileId }, - { provider: 'opencode', profileId: removedProfileId }, - { provider: 'continue', profileId: removedProfileId }, - { provider: 'model', profileId: runtimeProfileId } + { provider: 'model' }, + { provider: 'opencode' }, + { provider: 'continue', model: { kind: 'profile', profileId: keptProfileId } }, + undefined ]) - expect(database.getProject(channelProject.id).runtimeSelection).toEqual({ - provider: 'opencode', - profileId: runtimeProfileId - }) - expect( - database.getProject(imageChannelProject.id).runtimeSelection - ).toEqual({ - provider: 'model' - }) - expect( - database.getProject(automaticChannelProject.id).runtimeSelection - ).toEqual({ - provider: 'model' - }) - expect( - database.getConversation( - automaticRemoteConversation.id - ).runtimeSelection - ).toEqual({ - provider: 'model' + expect(database.getProject(channelProject!.id).runtimeSelection).toEqual({ provider: 'opencode' }) + // An existing but incompatible model is kept so the UI can explain the fallback. + expect(database.getProject(imageChannelProject!.id).runtimeSelection).toEqual({ + provider: 'model', model: { kind: 'profile', profileId: imageProfileId } }) + expect(database.getProject(localProject.id).runtimeSelection).toBeUndefined() database.close() }) + it('migrates legacy stored selections to layers', async () => { + const directory = await mkdtemp(join(tmpdir(), 'goodbuddy-runtime-layer-migration-')) + temporaryDirectories.push(directory) + const databasePath = join(directory, 'assistant.sqlite') + const database = new AssistantDatabase(databasePath) + database.initialize('C:\\Workspace') + const project = database.listProjects()[0]! + database.close() + const raw = new DatabaseSync(databasePath) + raw.prepare('UPDATE projects SET runtime_selection_json = ? WHERE id = ?') + .run(JSON.stringify({ provider: 'continue', profileId: '00000000-0000-4000-8000-000000000301' }), project.id) + raw.prepare( + `INSERT INTO conversations (id, project_id, runtime_selection_json, work_mode, title, status, created_at, updated_at) + VALUES (?, ?, ?, 'ask', 'legacy', 'active', ?, ?)` + ).run('00000000-0000-4000-8000-000000000302', project.id, JSON.stringify({ provider: 'auto' }), '2026-01-01', '2026-01-01') + raw.exec('PRAGMA user_version = 48') + raw.close() + + const reopened = new AssistantDatabase(databasePath) + reopened.initialize('C:\\Workspace') + const check = new DatabaseSync(databasePath) + expect(check.prepare('SELECT runtime_selection_json AS value FROM projects WHERE id = ?').get(project.id)) + .toEqual({ value: JSON.stringify({ provider: 'continue', model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000301' } }) }) + expect(check.prepare('SELECT runtime_selection_json AS value FROM conversations WHERE id = ?').get('00000000-0000-4000-8000-000000000302')) + .toEqual({ value: null }) + check.close() + reopened.close() + }) + it('durably interrupts active tool and subagent metadata during startup recovery', async () => { const directory = await mkdtemp( join(tmpdir(), 'goodbuddy-conversation-recovery-') diff --git a/src/main/assistant/assistant-database.ts b/src/main/assistant/assistant-database.ts index eae6f2c8..570b781c 100644 --- a/src/main/assistant/assistant-database.ts +++ b/src/main/assistant/assistant-database.ts @@ -83,10 +83,14 @@ import { } from '../../shared/channel-contracts' import { agentRuntimeSelectionKey, - agentRuntimeSelectionSchema, - repairChannelRuntimeSelection, + compactRuntimeSelectionLayer, + optionalAgentRuntimeSelectionSchema, + repairRuntimeSelectionLayer, + runtimeSelectionLayerSchema, + withoutLegacyAutoSelection, type AgentRuntimeSelection, - type RuntimeSelectionRepairSettings + type RuntimeResolutionSettings, + type RuntimeSelectionLayer } from '../../shared/runtime-selection-contracts' import { MAGIC_NOTE_MAX_NOTE_EMBED_BYTES, @@ -126,7 +130,7 @@ import { SUBAGENT_PROGRESS_STORAGE_SCHEMA_VERSION } from './subagent-progress-storage' -export const ASSISTANT_DATABASE_SCHEMA_VERSION = 48 +export const ASSISTANT_DATABASE_SCHEMA_VERSION = 49 export type RemoteTaskEventInput = { taskId: string @@ -318,22 +322,69 @@ type MessageMetadata = { const MAX_CHANNEL_OUTBOX_RETRY_BYTES = 20 * 1024 * 1024 const MAX_CHANNEL_OUTBOX_MEDIA_ENTRIES = 8 -function parseRuntimeSelection(value: string | null): - | ConversationSnapshot['runtimeSelection'] - | undefined { +/** Rewrites pre-layer `{ provider, profileId }` and `{ provider: 'auto' }` rows. */ +function migrateRuntimeSelectionLayers(database: DatabaseSync): void { + for (const table of ['projects', 'conversations'] as const) { + const rows = database + .prepare( + `SELECT id, runtime_selection_json FROM ${table} + WHERE runtime_selection_json IS NOT NULL` + ) + .all() as Array<{ id: string; runtime_selection_json: string }> + const update = database.prepare( + `UPDATE ${table} SET runtime_selection_json = ? WHERE id = ?` + ) + for (const row of rows) { + const next = serializeRuntimeSelection( + parseRuntimeSelection(row.runtime_selection_json) + ) + if (next !== row.runtime_selection_json) update.run(next, row.id) + } + } +} + +/** Reads a stored layer; legacy concrete and `auto` selections upgrade on read. */ +function parseRuntimeSelection( + value: string | null +): RuntimeSelectionLayer | undefined { if (!value) { return undefined } try { - const parsed = agentRuntimeSelectionSchema.safeParse( - JSON.parse(value) - ) - return parsed.success ? parsed.data : undefined + const parsed = runtimeSelectionLayerSchema.safeParse(JSON.parse(value)) + return parsed.success ? compactRuntimeSelectionLayer(parsed.data) : undefined } catch { return undefined } } +function serializeRuntimeSelection( + layer: RuntimeSelectionLayer | undefined +): string | null { + // Normalize legacy `{ provider, profileId }` input before storing it. + const parsed = runtimeSelectionLayerSchema.safeParse(layer) + const compact = parsed.success ? compactRuntimeSelectionLayer(parsed.data) : undefined + return compact ? JSON.stringify(compact) : null +} + +/** Remote events record the concrete selection they ran with for context metrics keys. */ +function remoteEventSelectionKey( + requestSelection: AgentRuntimeSelection | undefined, + conversationLayer: RuntimeSelectionLayer | undefined, + projectLayer: RuntimeSelectionLayer | undefined +): string { + if (requestSelection) return agentRuntimeSelectionKey(requestSelection) + const provider = conversationLayer?.provider ?? projectLayer?.provider ?? 'opencode' + const model = conversationLayer?.model ?? projectLayer?.model + return agentRuntimeSelectionKey( + model?.kind === 'profile' + ? { provider, profileId: model.profileId } + : model?.kind === 'runtime-config' && provider !== 'model' + ? { provider, runtimeConfig: true } + : { provider } + ) +} + type ArtifactRow = { id: string project_id: string | null @@ -576,18 +627,7 @@ function toProject(row: ProjectRow): AssistantProject { if (!executionSpace.success) { throw new Error(`项目 ${row.id} 的执行空间配置无效`) } - const runtimeSelection = - row.kind === 'channel' - ? parseRuntimeSelection(row.runtime_selection_json) ?? { - provider: 'auto' as const - } - : parseRuntimeSelection(row.runtime_selection_json) - if ( - executionSpace.data.kind === 'ssh' && - runtimeSelection === undefined - ) { - throw new Error(`项目 ${row.id} 缺少远程 Runtime 选择`) - } + const runtimeSelection = parseRuntimeSelection(row.runtime_selection_json) const rootPath = executionSpace.data.kind === 'local' ? executionSpace.data.rootPath @@ -764,8 +804,8 @@ function toSchedule(row: ScheduleWithTaskRow): AssistantSchedule { workMode: LegacyWorkMode runtimeSelection?: unknown } - const runtimeSelection = agentRuntimeSelectionSchema.safeParse( - template.runtimeSelection + const runtimeSelection = optionalAgentRuntimeSelectionSchema.safeParse( + withoutLegacyAutoSelection(template.runtimeSelection) ) const recurrence = JSON.parse(row.recurrence_json) as { type: AssistantSchedule['recurrence'] @@ -1666,9 +1706,6 @@ function normalizeSshProjectWrite( if (project.rootPath !== executionSpace.remoteRootPath) { throw new Error('项目目录与远程执行空间目录不匹配') } - if (project.runtimeSelection === undefined) { - throw new Error('远程项目必须选择 Runtime') - } if (typeof write.assertCurrent !== 'function') { throw new TypeError('缺少 SSH Host 事务前置校验') } @@ -2334,8 +2371,10 @@ export class AssistantDatabase { ensureChannelProjects( defaultRootPath: string, - defaultModelProfileId: string + _defaultModelProfileId?: string ): AssistantProject[] { + // Kept for callers; channel projects no longer pin the current default model. + void _defaultModelProfileId const database = this.requireDatabase() const definitions: ReadonlyArray<{ channel: ProjectChannel @@ -2387,10 +2426,8 @@ export class AssistantDatabase { definition.name, definition.description, defaultRootPath, - JSON.stringify({ - provider: 'model', - profileId: defaultModelProfileId - }), + // Unattended channels start on the direct model; the model follows global settings. + JSON.stringify({ provider: 'model' }), definition.channel, now, now @@ -2441,9 +2478,7 @@ export class AssistantDatabase { input.description, input.rootPath, input.defaultWorkMode, - input.runtimeSelection - ? JSON.stringify(input.runtimeSelection) - : null, + serializeRuntimeSelection(input.runtimeSelection), builtInDefault ? 1 : 0, now, now @@ -2493,11 +2528,8 @@ export class AssistantDatabase { input.description, input.rootPath, input.defaultWorkMode, - input.runtimeSelection || current.runtimeSelection - ? JSON.stringify( - input.runtimeSelection ?? current.runtimeSelection - ) - : null, + // The settings form always sends the full layer; absent means follow global. + serializeRuntimeSelection(input.runtimeSelection), new Date().toISOString(), projectId ) @@ -2547,9 +2579,7 @@ export class AssistantDatabase { normalized.project.description, normalized.executionSpace.remoteRootPath, normalized.project.defaultWorkMode, - normalized.project.runtimeSelection - ? JSON.stringify(normalized.project.runtimeSelection) - : null, + serializeRuntimeSelection(normalized.project.runtimeSelection), now, now ) @@ -2640,9 +2670,7 @@ export class AssistantDatabase { normalized.project.description, normalized.executionSpace.remoteRootPath, normalized.project.defaultWorkMode, - normalized.project.runtimeSelection - ? JSON.stringify(normalized.project.runtimeSelection) - : null, + serializeRuntimeSelection(normalized.project.runtimeSelection), updatedAt, projectId, expectedUpdatedAt @@ -2988,32 +3016,29 @@ export class AssistantDatabase { } } + /** + * Clears references to deleted model connections in every project and + * conversation so they fall back to the next layer instead of failing. + * Also rewrites legacy stored shapes to the layered form. + */ repairConversationRuntimeSelections( - settings: RuntimeSelectionRepairSettings + settings: Pick ): number { const database = this.requireDatabase() const projects = database .prepare( `SELECT id, runtime_selection_json FROM projects - WHERE kind = 'channel'` + WHERE runtime_selection_json IS NOT NULL` ) - .all() as Array<{ - id: string - runtime_selection_json: string | null - }> + .all() as Array<{ id: string; runtime_selection_json: string }> const conversations = database .prepare( - `SELECT id, runtime_selection_json, channel + `SELECT id, runtime_selection_json FROM conversations - WHERE runtime_selection_json IS NOT NULL - AND channel IS NOT NULL` + WHERE runtime_selection_json IS NOT NULL` ) - .all() as Array<{ - id: string - runtime_selection_json: string - channel: ProjectChannel | null - }> + .all() as Array<{ id: string; runtime_selection_json: string }> const update = database.prepare( `UPDATE conversations SET runtime_selection_json = ? @@ -3024,44 +3049,25 @@ export class AssistantDatabase { SET runtime_selection_json = ?, updated_at = ? WHERE id = ?` ) + const repairedJson = (stored: string): string | null | false => { + const next = serializeRuntimeSelection( + repairRuntimeSelectionLayer(parseRuntimeSelection(stored), settings) + ) + return next === stored ? false : next + } let repaired = 0 database.exec('BEGIN IMMEDIATE') try { for (const project of projects) { - const stored = parseRuntimeSelection( - project.runtime_selection_json - ) - const current = stored ?? { provider: 'auto' as const } - const next = repairChannelRuntimeSelection(current, settings) - if ( - stored && - agentRuntimeSelectionKey(next) === - agentRuntimeSelectionKey(current) - ) { - continue - } - updateProject.run( - JSON.stringify(next), - new Date().toISOString(), - project.id - ) + const next = repairedJson(project.runtime_selection_json) + if (next === false) continue + updateProject.run(next, new Date().toISOString(), project.id) repaired += 1 } for (const conversation of conversations) { - const current = parseRuntimeSelection( - conversation.runtime_selection_json - ) - if (!current) { - continue - } - const next = repairChannelRuntimeSelection(current, settings) - if ( - agentRuntimeSelectionKey(next) === - agentRuntimeSelectionKey(current) - ) { - continue - } - update.run(JSON.stringify(next), conversation.id) + const next = repairedJson(conversation.runtime_selection_json) + if (next === false) continue + update.run(next, conversation.id) repaired += 1 } database.exec('COMMIT') @@ -3107,9 +3113,7 @@ export class AssistantDatabase { insertConversation.run( conversation.id, conversation.projectId ?? null, - conversation.runtimeSelection - ? JSON.stringify(conversation.runtimeSelection) - : null, + serializeRuntimeSelection(conversation.runtimeSelection), conversation.knowledgeRetrievalMode ?? null, serializeConversationContextState(conversation), conversation.title, @@ -3202,9 +3206,7 @@ export class AssistantDatabase { if (existingConversation) { const result = updateConversation.run( header.projectId ?? null, - header.runtimeSelection - ? JSON.stringify(header.runtimeSelection) - : null, + serializeRuntimeSelection(header.runtimeSelection), header.knowledgeRetrievalMode ?? null, serializeConversationContextState(header), header.title, @@ -3220,9 +3222,7 @@ export class AssistantDatabase { insertConversation.run( header.id, header.projectId ?? null, - header.runtimeSelection - ? JSON.stringify(header.runtimeSelection) - : null, + serializeRuntimeSelection(header.runtimeSelection), header.knowledgeRetrievalMode ?? null, serializeConversationContextState(header), header.title, @@ -3525,7 +3525,7 @@ export class AssistantDatabase { conversationType: 'direct' | 'group' title: string accountDisplay: string - runtimeSelection?: AgentRuntimeSelection + runtimeSelection?: RuntimeSelectionLayer }): ConversationSnapshot { const database = this.requireDatabase() const existing = database @@ -3556,9 +3556,7 @@ export class AssistantDatabase { input.title, input.conversationType, input.accountDisplay, - input.runtimeSelection - ? JSON.stringify(input.runtimeSelection) - : null, + serializeRuntimeSelection(input.runtimeSelection), new Date().toISOString(), existing.id ) @@ -3578,9 +3576,7 @@ export class AssistantDatabase { .run( id, input.projectId, - input.runtimeSelection - ? JSON.stringify(input.runtimeSelection) - : null, + serializeRuntimeSelection(input.runtimeSelection), input.title, input.channel, input.accountId, @@ -5873,9 +5869,7 @@ export class AssistantDatabase { input.assistantMessageId ) const requestRuntimeSelection = - input.runtimeSelection === undefined - ? undefined - : agentRuntimeSelectionSchema.parse(input.runtimeSelection) + optionalAgentRuntimeSelectionSchema.parse(input.runtimeSelection) const publicEvent = stripRemoteEventProvenance(input.event) if (publicEvent.requestId !== input.taskId) { throw new Error('远程事件的请求 ID 与任务不匹配') @@ -6012,17 +6006,16 @@ export class AssistantDatabase { let contextState = parseConversationContextState( conversation.context_state_json ) - const runtimeSelection = - requestRuntimeSelection ?? - parseRuntimeSelection(conversation.runtime_selection_json) ?? - parseRuntimeSelection(conversation.project_runtime_selection_json) ?? - { provider: 'auto' as const } + const runtimeSelectionKey = remoteEventSelectionKey( + requestRuntimeSelection, + parseRuntimeSelection(conversation.runtime_selection_json), + parseRuntimeSelection(conversation.project_runtime_selection_json) + ) if (publicEvent.type === 'context-metrics') { contextState = { ...contextState, contextMetrics: { - runtimeSelectionKey: - agentRuntimeSelectionKey(runtimeSelection), + runtimeSelectionKey, contextTokens: publicEvent.contextTokens, source: publicEvent.source, basis: 'model-call' @@ -6046,8 +6039,7 @@ export class AssistantDatabase { estimatedAfterTokens !== undefined ? { contextMetrics: { - runtimeSelectionKey: - agentRuntimeSelectionKey(runtimeSelection), + runtimeSelectionKey, contextTokens: estimatedAfterTokens, source: 'estimated' as const, basis: 'conversation' as const @@ -11569,6 +11561,13 @@ export class AssistantDatabase { database.exec('PRAGMA user_version = 48; COMMIT;') } catch (error) { database.exec('ROLLBACK'); throw error } } + if (version.user_version < 49) { + database.exec('BEGIN IMMEDIATE') + try { + migrateRuntimeSelectionLayers(database) + database.exec('PRAGMA user_version = 49; COMMIT;') + } catch (error) { database.exec('ROLLBACK'); throw error } + } } supervisionReviewStore(): SupervisionReviewStore { diff --git a/src/main/index.ts b/src/main/index.ts index 8b1e6e74..559ed930 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -32,6 +32,7 @@ import { applyRuntimeSelection, getConfiguredRuntimeTarget, resolveConfiguredAgentRuntimeSelection, + resolveLayeredRuntimeSelection, type SelectedRuntimeTarget } from './agent/runtime-selection' import { CapabilityService } from './capabilities/capability-service' @@ -709,11 +710,13 @@ if (hasSingleInstanceLock) { appPath: app.getAppPath(), resourcesPath: process.resourcesPath, packaged: app.isPackaged, - resolveRuntimeSelection: async (selection) => - resolveConfiguredAgentRuntimeSelection( - await settingsStore.getResolvedSettings(), - selection - ), + resolveRuntimeSelection: async (layer) => { + const settings = await settingsStore.getResolvedSettings() + return resolveConfiguredAgentRuntimeSelection( + settings, + resolveLayeredRuntimeSelection(settings, { project: layer }, { remote: true }).selection + ) + }, resolveModelProfile: async (selection) => { const resolved = applyRuntimeSelection( await settingsStore.getResolvedSettings(), diff --git a/src/main/ipc.test.ts b/src/main/ipc.test.ts index 7534495b..b8f4819e 100644 --- a/src/main/ipc.test.ts +++ b/src/main/ipc.test.ts @@ -4559,7 +4559,10 @@ describe('registerIpcHandlers local conversation persistence', () => { const database = { queueDueSchedules: vi.fn(() => []), listConversationQueueItems: vi.fn(() => []), listPendingConversationQueueIds: vi.fn(() => []), - getConversation: vi.fn(() => ({ id: conversationId, runtimeSelection: selection, messages })), + // Stored conversations hold a layer; the renderer sends the resolved selection. + getConversation: vi.fn(() => ({ id: conversationId, runtimeSelection: { + provider: 'model', model: { kind: 'profile', profileId: selection.profileId } + }, messages })), createTask: vi.fn(), updateTaskStatus: vi.fn() } const compactor = { @@ -4714,7 +4717,7 @@ describe('registerIpcHandlers local conversation persistence', () => { JSON.stringify({ input: { conversationId, - runtimeSelection: { provider: 'auto' }, + runtimeSelection: { provider: 'model' }, workMode: 'ask', includeMemoryContext: true, prompt: queuedItem.label, @@ -5229,7 +5232,8 @@ describe('registerIpcHandlers Runtime customization', () => { requestId, conversationId, projectId, - runtimeSelection: { provider: 'opencode' as const }, + // The renderer sends the resolved selection; OpenCode here uses its own configuration. + runtimeSelection: { provider: 'opencode' as const, runtimeConfig: true as const }, history: messages.map(({ role, content }) => ({ role, content @@ -5429,7 +5433,7 @@ describe('registerIpcHandlers agent terminal state', () => { defaultWorkMode: 'ask', runtimeSelection: { provider: 'model', - profileId: '00000000-0000-4000-8000-000000000001' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000001' } }, kind: 'channel', channel: 'wecom', @@ -7316,8 +7320,18 @@ describe('registerIpcHandlers agent terminal state', () => { } } const { harness, projectId } = createManagedSshHarness(selectedRuntime) + harness.getResolvedSettings.mockResolvedValue({ + provider: 'opencode', defaultModelProfileId: selection.profileId, opencodeBaseUrl: '', + modelProfiles: [{ + id: selection.profileId, name: 'Remote', modelName: 'remote', baseUrl: 'https://models.example/v1', + protocol: 'openai-chat-completions', authentication: 'none' + }] + }) const project = harness.assistantDatabase.getProject(projectId) - harness.assistantDatabase.getProject.mockReturnValue({ ...project, runtimeSelection: selection }) + harness.assistantDatabase.getProject.mockReturnValue({ + ...project, + runtimeSelection: { provider: 'opencode', model: { kind: 'profile', profileId: selection.profileId } } + }) harness.assistantDatabase.getConversation.mockReturnValue({ id: conversationId, projectId, messages: [] }) @@ -8395,7 +8409,7 @@ describe('registerIpcHandlers agent terminal state', () => { { requestId: '00000000-0000-4000-8000-000000000728', conversationId, - runtimeSelection: { provider: 'auto' }, + runtimeSelection: { provider: 'model' }, prompt: '等待 Runtime', workMode: 'ask', knowledgeLibraryIds: [] @@ -8409,7 +8423,7 @@ describe('registerIpcHandlers agent terminal state', () => { harness.handler?.(trustedEvent(harness.webContents), { requestId: '00000000-0000-4000-8000-000000000729', conversationId, - runtimeSelection: { provider: 'auto' }, + runtimeSelection: { provider: 'model' }, prompt: '不能并发', workMode: 'ask', knowledgeLibraryIds: [] @@ -8468,7 +8482,7 @@ describe('registerIpcHandlers agent terminal state', () => { } const input = { conversationId, - runtimeSelection: { provider: 'auto' as const }, + runtimeSelection: { provider: 'model' as const }, workMode: 'ask' as const, includeMemoryContext: true, prompt: item.label, @@ -8521,7 +8535,7 @@ describe('registerIpcHandlers agent terminal state', () => { try { await expect(electronMocks.handlers.get(ipcChannels.conversationQueueEnqueueUser)?.(trustedEvent(harness.webContents), { conversationId: '00000000-0000-4000-8000-000000000731', - runtimeSelection: { provider: 'auto' }, workMode: 'ask', prompt: 'Read the picture', + workMode: 'ask', prompt: 'Read the picture', attachments: [{ id: '00000000-0000-4000-8000-000000000734', name: 'image.png', size: 10, preview: '', kind: 'image' }], knowledgeLibraryIds: [], knowledgeRetrievalMode: 'auto' })).rejects.toThrow('图片输入') @@ -8550,7 +8564,7 @@ describe('registerIpcHandlers agent terminal state', () => { '00000000-0000-4000-8000-000000000734' const input = { conversationId, - runtimeSelection: { provider: 'auto' as const }, + runtimeSelection: { provider: 'model' as const }, workMode: 'ask' as const, includeMemoryContext: true, prompt: '排队发送', @@ -8655,7 +8669,7 @@ describe('registerIpcHandlers agent terminal state', () => { const itemId = '00000000-0000-4000-8000-000000000746' const input = { conversationId, - runtimeSelection: { provider: 'auto' as const }, + runtimeSelection: { provider: 'model' as const }, workMode: 'ask' as const, includeMemoryContext: true, prompt: '需要重新排队', @@ -8721,7 +8735,7 @@ describe('registerIpcHandlers agent terminal state', () => { await harness.handler?.(trustedEvent(harness.webContents), { requestId: '00000000-0000-4000-8000-000000000748', conversationId, - runtimeSelection: { provider: 'auto' }, + runtimeSelection: { provider: 'model' }, prompt: '失败后的新消息', workMode: 'ask', knowledgeLibraryIds: [] @@ -8750,7 +8764,7 @@ describe('registerIpcHandlers agent terminal state', () => { const createItem = (id: string, prompt: string) => { const input = { conversationId, - runtimeSelection: { provider: 'auto' as const }, + runtimeSelection: { provider: 'model' as const }, workMode: 'ask' as const, includeMemoryContext: true, prompt, @@ -9095,7 +9109,7 @@ describe('registerIpcHandlers agent terminal state', () => { defaultModelProfileId: profileId, deepseekHarnessModelSource: { kind: 'profile', profileId } })) const project = database.createProject({ name: 'Native UI', description: '', rootPath: root, - defaultWorkMode: 'ask', runtimeSelection: { provider: 'deepseek-harness', profileId } }) + defaultWorkMode: 'ask', runtimeSelection: { provider: 'deepseek-harness', model: { kind: 'profile', profileId } } }) const conversationId = '00000000-0000-4000-8000-000000000222' const now = Date.now() const save = async (): Promise => { @@ -9183,7 +9197,7 @@ describe('registerIpcHandlers agent terminal state', () => { [`${provider}ModelSource`]: { kind: 'profile', profileId } })) } - database.updateProject(project.id, { ...project, runtimeSelection: { provider, profileId } }) + database.updateProject(project.id, { ...project, runtimeSelection: { provider, model: { kind: 'profile', profileId } } }) const onTerminal = vi.fn<(value: import('../shared/terminal-contracts').TerminalSnapshot) => void>() notify.mockClear() view.rerender(createElement(RuntimeNativeClientActions, { browser: false, contextKey: `${project.id}:${provider}`, @@ -10661,8 +10675,10 @@ describe('registerIpcHandlers agent terminal state', () => { ).resolves.toEqual( expect.objectContaining({ label: 'model-two' }) ) + // Resolved selections name the model source explicitly. expect(selectedRuntimes.getStatus).toHaveBeenLastCalledWith({ - provider: 'opencode' + provider: 'opencode', + runtimeConfig: true }) expect(fallbackRuntime.getStatus).not.toHaveBeenCalled() @@ -10726,21 +10742,36 @@ describe('registerIpcHandlers agent terminal state', () => { } const harness = createHarness(requestRuntime, undefined, 'always', undefined, false, selectedRuntimes) const projectId = '00000000-0000-4000-8000-000000000101' - const fixed = { provider: 'continue', profileId: '00000000-0000-4000-8000-000000000042' } + const fixedProfileId = '00000000-0000-4000-8000-000000000042' const project = { id: projectId, rootPath: 'C:\\ProjectWorkspace' } + harness.getResolvedSettings.mockResolvedValue({ + provider: 'model', defaultModelProfileId: fixedProfileId, opencodeBaseUrl: '', + modelProfiles: [{ + id: fixedProfileId, name: 'Fixed', modelName: 'fixed', baseUrl: 'https://models.example/v1', + protocol: 'openai-chat-completions', authentication: 'none' + }] + }) harness.assistantDatabase.getProject.mockReturnValue({ ...project, runtimeSelection: { provider: 'opencode' } }) const event = trustedEvent(harness.webContents) await harness.handler?.(event, { projectId, conversationId: 'project-rule-one', requestId: '00000000-0000-4000-8000-000000000011', prompt: 'one', workMode: 'ask' }) - expect(selectedRuntimes.getRuntime).toHaveBeenLastCalledWith({ provider: 'opencode' }, expect.anything()) - harness.assistantDatabase.getProject.mockReturnValue({ ...project, runtimeSelection: fixed }) + // No project model: OpenCode uses its global default (own configuration here). + expect(selectedRuntimes.getRuntime).toHaveBeenLastCalledWith( + { provider: 'opencode', runtimeConfig: true }, expect.anything() + ) + harness.assistantDatabase.getProject.mockReturnValue({ + ...project, + runtimeSelection: { provider: 'continue', model: { kind: 'profile', profileId: fixedProfileId } } + }) await harness.handler?.(event, { projectId, conversationId: 'project-rule-two', requestId: '00000000-0000-4000-8000-000000000012', prompt: 'two', workMode: 'ask' }) - expect(selectedRuntimes.getRuntime).toHaveBeenLastCalledWith(fixed, expect.anything()) + expect(selectedRuntimes.getRuntime).toHaveBeenLastCalledWith( + { provider: 'continue', profileId: fixedProfileId }, expect.anything() + ) await harness.handler?.(event, { projectId, conversationId: 'project-rule-three', runtimeSelection: { provider: 'model' }, requestId: '00000000-0000-4000-8000-000000000013', prompt: 'three', workMode: 'ask' @@ -11803,7 +11834,7 @@ describe('registerIpcHandlers agent terminal state', () => { defaultWorkMode: 'ask', runtimeSelection: { provider: 'model', - profileId: '00000000-0000-4000-8000-000000000001' + model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000001' } }, kind: 'channel', channel, @@ -12231,15 +12262,11 @@ describe('registerIpcHandlers agent terminal state', () => { expect.any(String), 'waiting_approval' ) + // Channel conversations inherit the project's choice instead of copying it. expect( harness.assistantDatabase.getOrCreateRemoteConversation ).toHaveBeenCalledWith( - expect.objectContaining({ - runtimeSelection: { - provider: 'model', - profileId: '00000000-0000-4000-8000-000000000001' - } - }) + expect.not.objectContaining({ runtimeSelection: expect.anything() }) ) await harness.dispose() }) @@ -12561,7 +12588,10 @@ describe('registerIpcHandlers agent terminal state', () => { toolApproval: 'always', subagentSmartRoutingEnabled: false, continueModelProfile: { id: configuredProfileId }, - modelProfiles: [{ id: configuredProfileId }] + modelProfiles: [{ + id: configuredProfileId, baseUrl: 'https://models.example/v1', + protocol: 'openai-chat-completions', authentication: 'none' + }] }) vi.mocked( harness.assistantDatabase.listProjects @@ -12617,9 +12647,7 @@ describe('registerIpcHandlers agent terminal state', () => { expect( harness.assistantDatabase.getOrCreateRemoteConversation ).toHaveBeenCalledWith( - expect.objectContaining({ - runtimeSelection: { provider: 'continue' } - }) + expect.not.objectContaining({ runtimeSelection: expect.anything() }) ) expect(receivedAuthorize).toBeUndefined() expect(harness.approvalBroker.request).not.toHaveBeenCalled() diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 1076d4ae..e509db4f 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -121,9 +121,10 @@ import { } from '../shared/document-parsing-contracts' import { agentRuntimeSelectionKey, - agentRuntimeSelectionSchema, - getDefaultRuntimeSelection, - type AgentRuntimeSelection + optionalAgentRuntimeSelectionSchema, + withoutLegacyAutoSelection, + type AgentRuntimeSelection, + type RuntimeSelectionLayer } from '../shared/runtime-selection-contracts' import { registerMagicNotesAnalysisIpcHandlers, registerMagicTodosAnalysisIpcHandlers } from './magic-notes/magic-notes-analysis-ipc' import { registerMagicNotesIpcHandlers, registerMagicTodosIpcHandlers } from './magic-notes/magic-notes-ipc' @@ -146,6 +147,7 @@ import { expertCreateSchema, type AssistantSchedule, type AssistantArtifact, + type AssistantProject, type ConversationAttachment } from '../shared/assistant-contracts' import { @@ -168,7 +170,8 @@ import { } from './agent/create-runtime' import { applyRuntimeSelection, - resolveConfiguredAgentRuntimeSelection + resolveConfiguredAgentRuntimeSelection, + resolveLayeredRuntimeSelection } from './agent/runtime-selection' import { safeToolErrorDetail } from './agent/approval-summary' import { ReasoningTagStreamParser } from './agent/reasoning-stream' @@ -1177,6 +1180,24 @@ export function registerIpcHandlers( ) } }) + /** Resolves stored project and conversation layers against current settings. */ + const resolveStoredRuntimeSelection = async ( + input: { + projectId?: string + /** Callers that already loaded the project pass it to avoid a second read. */ + project?: Pick + conversationLayer?: RuntimeSelectionLayer + } + ): Promise => { + const project = + input.project ?? + (input.projectId ? assistantDatabase.getProject(input.projectId) : undefined) + return resolveLayeredRuntimeSelection( + await settingsStore.getResolvedSettings(), + { project: project?.runtimeSelection, conversation: input.conversationLayer }, + { remote: project?.executionSpace?.kind === 'ssh' } + ).selection + } const resolveRequestRuntime = async ( request: Pick< AgentRequest, @@ -1200,14 +1221,15 @@ export function registerIpcHandlers( if (executionSpace?.kind === 'ssh' && !selectedRuntimes) { throw new Error(REMOTE_EXECUTION_SPACE_UNAVAILABLE) } - let selection = request.runtimeSelection ?? project?.runtimeSelection if ( !selectedRuntimes || - (!selection && !executionSpace) + (!request.runtimeSelection && !project?.runtimeSelection && !executionSpace) ) { return runtime } - selection ??= { provider: 'auto' } + let selection = + request.runtimeSelection ?? + (await resolveStoredRuntimeSelection({ projectId: project?.id })) if (request.followConfiguredAgentRuntime) { selection = resolveConfiguredAgentRuntimeSelection( await settingsStore.getResolvedSettings(), @@ -1221,8 +1243,8 @@ export function registerIpcHandlers( if (selected.capability === 'image-generation') return const target = runtimeTargetFor(selected) const configured = await settingsStore.getResolvedSettings() - const projectSelection = request.projectId ? assistantDatabase.getProject(request.projectId).runtimeSelection : undefined - const selection = request.runtimeSelection ?? projectSelection + const selection = request.runtimeSelection ?? + (request.projectId ? await resolveStoredRuntimeSelection({ projectId: request.projectId }) : undefined) const effective = selection ? applyRuntimeSelection(configured, selection).settings : configured const supported = target === 'model' ? effective.supportsImageInput : target === 'opencode' ? effective.opencodeModelProfile?.supportsImageInput @@ -1695,11 +1717,10 @@ export function registerIpcHandlers( const toolStates = new Map( recoveredTools.map((tool) => [tool.callId, tool]) ) - const project = assistantDatabase.getProject(task.projectId) - const runtimeSelection = - conversation.runtimeSelection ?? - project.runtimeSelection ?? - ({ provider: 'auto' } as const) + const runtimeSelection = await resolveStoredRuntimeSelection({ + projectId: task.projectId, + conversationLayer: conversation.runtimeSelection + }) const controller = new AbortController() const lease = leaseActiveRequest( task.taskId, @@ -2005,7 +2026,7 @@ export function registerIpcHandlers( input: unknown serializedContexts?: unknown } - const input = conversationQueueUserInputSchema.parse(stored.input) + const input = conversationQueueUserInputSchema.parse(withoutLegacyAutoSelection(stored.input)) if ( stored.serializedContexts !== undefined && typeof stored.serializedContexts !== 'string' @@ -2020,7 +2041,7 @@ export function registerIpcHandlers( } return input } - return conversationQueueUserInputSchema.parse(parsed) + return conversationQueueUserInputSchema.parse(withoutLegacyAutoSelection(parsed)) } const pumpingConversationQueues = new Set() @@ -2166,7 +2187,7 @@ export function registerIpcHandlers( projectName: string rootPath: string conversationId: string - runtimeSelection: AgentRuntimeSelection + runtimeSelection?: AgentRuntimeSelection followConfiguredAgentRuntime?: boolean runtime?: AgentRuntime taskId: string @@ -2958,9 +2979,10 @@ export function registerIpcHandlers( } } const channelLabel = projectChannelLabels[channel] - const runtimeSelection = project.runtimeSelection ?? { - provider: 'auto' as const - } + // Without a selected-runtime manager the configured runtime is used directly. + const runtimeSelection = selectedRuntimes + ? await resolveStoredRuntimeSelection({ project }) + : undefined const identitySuffix = message.senderId.slice(-4) const senderDisplay = `发送者 ****${identitySuffix}` const contextIds: string[] = [] @@ -3016,8 +3038,7 @@ export function registerIpcHandlers( externalConversationId: message.conversationId, conversationType: message.conversationType, title: `${channelLabel} · ****${identitySuffix}`, - accountDisplay: senderDisplay, - runtimeSelection + accountDisplay: senderDisplay }) const incomingMessageId = assistantDatabase.appendRemoteConversationMessage({ conversationId: remoteConversation.id, @@ -3329,15 +3350,12 @@ export function registerIpcHandlers( registerHandler(ipcChannels.agentStatus, async (event, input: unknown) => { assertTrustedSender(event, window) - const selection = agentRuntimeSelectionSchema.optional().parse(input) + const selection = optionalAgentRuntimeSelectionSchema.parse(withoutLegacyAutoSelection(input)) if (!selectedRuntimes) { return runtime.getStatus() } const effectiveSelection = - selection ?? - getDefaultRuntimeSelection( - await settingsStore.getResolvedSettings() - ) + selection ?? (await resolveStoredRuntimeSelection({})) return selectedRuntimes.getStatus(effectiveSelection) }) @@ -3629,7 +3647,7 @@ export function registerIpcHandlers( if (executionPaused || shuttingDown) { throw new Error('本地数据维护期间暂不接受新任务') } - const parsedInput = agentRequestSchema.parse(input) + const parsedInput = agentRequestSchema.parse(withoutLegacyAutoSelection(input)) if ( activeRequests.has(parsedInput.requestId) || preparingRequestConversations.has(parsedInput.requestId) @@ -3727,7 +3745,8 @@ export function registerIpcHandlers( assistantDatabase.saveLocalConversations([{ header: { id: conversation.id, projectId: conversation.projectId, title: conversation.title, - updatedAt: now, workMode: normalizedWorkMode, runtimeSelection: parsedRequest.runtimeSelection, + // The renderer owns the conversation layer; never pin the resolved selection here. + updatedAt: now, workMode: normalizedWorkMode, runtimeSelection: conversation.runtimeSelection, knowledgeLibraryIds: conversation.knowledgeLibraryIds, knowledgeRetrievalMode: conversation.knowledgeRetrievalMode, contextMetrics: conversation.contextMetrics, contextCompressionState: conversation.contextCompressionState, @@ -3798,6 +3817,15 @@ export function registerIpcHandlers( const configExecutionSpace = configProject ? spaceResolver.resolveProject(configProject) : undefined + // Remote events key their context metrics by the selection actually used. + const remoteEventSelection = + enrichedRequest.runtimeSelection ?? + (configExecutionSpace?.kind === 'ssh' + ? await resolveStoredRuntimeSelection({ + projectId: configProject?.id, + conversationLayer: assistantDatabase.getConversation(enrichedRequest.conversationId).runtimeSelection + }) + : undefined) const configWorkspacePath = configAccess === 'none' ? undefined @@ -4062,7 +4090,7 @@ export function registerIpcHandlers( ? assistantDatabase.appendRemoteConversationTaskEventOnce({ taskId: request.requestId, conversationId: request.conversationId, - runtimeSelection: request.runtimeSelection ?? configProject?.runtimeSelection, + runtimeSelection: remoteEventSelection, assistantMessageId: remoteConversationRecovery.currentAssistantMessageId, bindingId: provenance.bindingId, @@ -4090,7 +4118,7 @@ export function registerIpcHandlers( ? assistantDatabase.appendRemoteConversationTaskEventOnce({ taskId: request.requestId, conversationId: request.conversationId, - runtimeSelection: request.runtimeSelection ?? configProject?.runtimeSelection, + runtimeSelection: remoteEventSelection, assistantMessageId: remoteConversationRecovery.currentAssistantMessageId, bindingId: provenance.bindingId, @@ -4405,7 +4433,7 @@ export function registerIpcHandlers( const contextMetricsEvent = runtimeUsageContextMetrics( usageEvent as RuntimeModelUsageEvent, runtimeSettings, - request.runtimeSelection + request.runtimeSelection ?? remoteEventSelection )! if (provenance === undefined) { eventBuffer.push(contextMetricsEvent) @@ -4756,12 +4784,10 @@ export function registerIpcHandlers( const project = conversation.projectId ? assistantDatabase.getProject(conversation.projectId) : undefined - const savedRuntimeSelection = - conversation.runtimeSelection ?? project?.runtimeSelection - const persistedRuntimeSelection = - savedRuntimeSelection && savedRuntimeSelection.provider !== 'auto' - ? savedRuntimeSelection - : getDefaultRuntimeSelection(settings) + const persistedRuntimeSelection = await resolveStoredRuntimeSelection({ + projectId: conversation.projectId, + conversationLayer: conversation.runtimeSelection + }) if ( conversation.projectId !== request.projectId || agentRuntimeSelectionKey(persistedRuntimeSelection) !== @@ -5924,7 +5950,7 @@ export function registerIpcHandlers( const attachmentParsing = new Map() registerHandler(ipcChannels.contextImageCapability, async (event, input: unknown) => { assertTrustedSender(event, window) - const { conversationId, runtimeSelection } = z.object({ conversationId: z.string().uuid(), runtimeSelection: agentRuntimeSelectionSchema.optional() }).strict().parse(input) + const { conversationId, runtimeSelection } = z.object({ conversationId: z.string().uuid(), runtimeSelection: optionalAgentRuntimeSelectionSchema }).strict().parse(withoutLegacyAutoSelection(input)) try { const conversation = assistantDatabase.getConversation(conversationId) await assertImageInputSupport({ requestId: randomUUID(), conversationId, projectId: conversation.projectId, runtimeSelection, prompt: '', workMode: 'ask' }) @@ -6502,7 +6528,7 @@ export function registerIpcHandlers( if (executionPaused || shuttingDown) { throw new Error('本地数据维护期间暂不接受新消息') } - const parsed = conversationQueueUserInputSchema.parse(input) + const parsed = conversationQueueUserInputSchema.parse(withoutLegacyAutoSelection(input)) if (contextManager.assets) { parsed.attachments = parsed.attachments.map((attachment) => contextManager.assets!.has(attachment.id) ? contextManager.assets!.get(attachment.id) : attachment) } @@ -7247,7 +7273,7 @@ export function registerIpcHandlers( const queueInput = conversationQueueUserInputSchema.parse({ conversationId: conversation.id, projectId: request.projectId ?? conversation.projectId ?? undefined, - runtimeSelection: request.runtimeSelection ?? conversation.runtimeSelection, + runtimeSelection: request.runtimeSelection, workMode: conversation.workMode ?? 'ask', includeMemoryContext: true, prompt: request.prompt, diff --git a/src/main/remote-agent/managed-remote-execution-services.ts b/src/main/remote-agent/managed-remote-execution-services.ts index b5d6aae7..fa694f7d 100644 --- a/src/main/remote-agent/managed-remote-execution-services.ts +++ b/src/main/remote-agent/managed-remote-execution-services.ts @@ -1,7 +1,10 @@ import { join } from 'node:path' import { SqliteRuntimeSessionBindingStore } from '../agent/runtime-session-binding-store' import type { ResolvedModelProfile } from '../runtime-settings-store' -import type { AgentRuntimeSelection } from '../../shared/runtime-selection-contracts' +import type { + AgentRuntimeSelection, + RuntimeSelectionLayer +} from '../../shared/runtime-selection-contracts' import type { SshHostStore } from '../ssh/ssh-host-store' import { resolveBundledRemoteRuntimeResourcePaths, @@ -44,7 +47,7 @@ export type ManagedRemoteExecutionServicesOptions = { selection: AgentRuntimeSelection ): Promise resolveRuntimeSelection( - selection: AgentRuntimeSelection + layer: RuntimeSelectionLayer | undefined ): Promise } diff --git a/src/main/remote-agent/remote-project-save-service.test.ts b/src/main/remote-agent/remote-project-save-service.test.ts index 39319fd0..e0bd7bb6 100644 --- a/src/main/remote-agent/remote-project-save-service.test.ts +++ b/src/main/remote-agent/remote-project-save-service.test.ts @@ -1,7 +1,10 @@ import { EventEmitter } from 'node:events' import { afterEach, describe, expect, it, vi } from 'vitest' import type { AssistantProject } from '../../shared/assistant-contracts' -import type { AgentRuntimeSelection } from '../../shared/runtime-selection-contracts' +import type { + AgentRuntimeSelection, + RuntimeSelectionLayer +} from '../../shared/runtime-selection-contracts' import type { SshConnectionTarget } from '../ssh/ssh-host-store' import { verifyAgentInstallationId } from '../ssh/ssh-agent-command' import type { AgentInstallationIdentity } from './agent-installation-manager' @@ -110,7 +113,7 @@ type HarnessOptions = { create?: () => AssistantProject update?: () => AssistantProject resolveRuntimeSelection?: ( - selection: AgentRuntimeSelection + layer: RuntimeSelectionLayer | undefined ) => Promise } @@ -262,7 +265,7 @@ function harness(options: HarnessOptions = {}) { }, resolveRuntimeSelection: options.resolveRuntimeSelection ?? - (async (selection) => selection), + (async (layer) => ({ provider: layer?.provider === 'continue' ? 'continue' : 'opencode' }) as AgentRuntimeSelection), runtimeValidator: { validate: vi.fn(async () => { calls.push('runtime') diff --git a/src/main/remote-agent/remote-project-save-service.ts b/src/main/remote-agent/remote-project-save-service.ts index b8923e1c..050a8c1b 100644 --- a/src/main/remote-agent/remote-project-save-service.ts +++ b/src/main/remote-agent/remote-project-save-service.ts @@ -11,7 +11,10 @@ import { remoteWorkspaceValidateResultSchema, type RemoteWorkspaceHandle } from '../../shared/remote-agent-contracts' -import type { AgentRuntimeSelection } from '../../shared/runtime-selection-contracts' +import type { + AgentRuntimeSelection, + RuntimeSelectionLayer +} from '../../shared/runtime-selection-contracts' import type { AssistantDatabase, SshProjectWrite @@ -99,11 +102,11 @@ type ActiveSave = { type RemoteProjectPreparationDraft = Readonly<{ hostId: string remoteRootPath: string - runtimeSelection: AgentRuntimeSelection + runtimeSelection?: RuntimeSelectionLayer }> type PreparedRemoteProject = Readonly<{ - runtimeSelection: AgentRuntimeSelection + runtimeSelection?: RuntimeSelectionLayer target: SshConnectionTarget installation: AgentInstallationIdentity connection: RemoteAgentConnection @@ -125,7 +128,7 @@ export type RemoteProjectSaveServiceOptions = { installationManager: Pick connectionManager: Pick resolveRuntimeSelection( - selection: AgentRuntimeSelection + layer: RuntimeSelectionLayer | undefined ): Promise runtimeValidator?: RemoteProjectRuntimeValidator notify?: ( diff --git a/src/main/runtime-settings-store.ts b/src/main/runtime-settings-store.ts index e5d30b78..b9df2575 100644 --- a/src/main/runtime-settings-store.ts +++ b/src/main/runtime-settings-store.ts @@ -430,6 +430,8 @@ export type ResolvedRuntimeSettings = { opencodeModelProfile?: ResolvedModelProfile continueModelProfile?: ResolvedModelProfile deepseekHarnessModelProfile?: ResolvedModelProfile + /** What DeepSeek Harness uses when its own configuration is selected. */ + deepseekHarnessPlatformModelProfile?: ResolvedModelProfile opencodeBaseUrl: string opencodeEmbedded: boolean opencodeBinaryPath: string @@ -1989,6 +1991,11 @@ export class RuntimeSettingsStore { : undefined const deepseekHarnessModelProfile = this.resolveDeepSeekHarnessModelProfile(settings, modelProfiles) + const deepseekHarnessPlatformModelProfile = + this.resolveDeepSeekHarnessModelProfile( + { ...settings, deepseekHarnessModelSource: { kind: 'platform' } }, + modelProfiles + ) const embeddingConnections = this.resolveEmbeddingConnections(settings) const activeEmbeddingConnection = @@ -2014,6 +2021,7 @@ export class RuntimeSettingsStore { defaultImageModelProfileId: settings.defaultImageModelProfileId, continueModelProfile, deepseekHarnessModelProfile, + deepseekHarnessPlatformModelProfile, ...agent, subagentSmartRoutingEnabled: settings.subagentSmartRoutingEnabled, @@ -2530,7 +2538,7 @@ export class RuntimeSettingsStore { const next: StoredSettings = { ...current, version: CURRENT_SETTINGS_VERSION, - provider: input.provider, + provider: input.provider === 'auto' ? 'model' : input.provider, modelProfiles, defaultModelProfileId, opencodeModelSource, diff --git a/src/renderer/src/App.test.tsx b/src/renderer/src/App.test.tsx index 6ee44e8a..18a8a17f 100644 --- a/src/renderer/src/App.test.tsx +++ b/src/renderer/src/App.test.tsx @@ -36,7 +36,11 @@ import { builtInDefaultProjectSeedDescription, builtInDefaultProjectSeedName, } from "../../shared/assistant-contracts"; -import { agentRuntimeSelectionKey } from "../../shared/runtime-selection-contracts"; +import type { RuntimeSelectionLayer } from "../../shared/runtime-selection-contracts"; + +/** Pre-layer stored selections, which the renderer and Main upgrade on read. */ +const legacySelection = (value: Record): RuntimeSelectionLayer => + value as unknown as RuntimeSelectionLayer; const defaultTestApplicationNavigation: ApplicationSettings["applicationNavigation"] = { ...defaultApplicationNavigation, @@ -1096,6 +1100,33 @@ function selectComposerOption( fireEvent.click(option); } +function runtimeMenuColumns(): { menu: HTMLElement; providers: HTMLElement; models: HTMLElement } { + const menu = screen.getByRole("menu", { name: "执行方式和模型" }); + return { + menu, + providers: within(menu).getByRole("group", { name: "执行方式" }), + models: within(menu).getByRole("group", { name: "模型" }), + }; +} + +/** Opens the composer picker and picks an execution mode, then optionally a model. */ +function pickRuntime( + provider: "直连模型" | "OpenCode" | "Continue" | "DeepSeek Harness", + model?: RegExp, +): void { + if (!screen.queryByRole("menu", { name: "执行方式和模型" })) { + fireEvent.click(document.querySelector(".composer__configuration > .runtime-picker:not(.composer-picker) > button")!); + } + const { providers, models } = runtimeMenuColumns(); + const item = within(providers).getByRole("menuitemradio", { name: provider }); + if (!model) { + fireEvent.click(item); + return; + } + fireEvent.mouseEnter(item); + fireEvent.click(within(models).getByRole("menuitemradio", { name: model })); +} + function selectProjectOption(projectName: string): void { fireEvent.click(screen.getByRole("button", { name: "当前项目" })); const menu = screen.getByRole("menu", { name: "当前项目" }); @@ -4721,8 +4752,10 @@ describe("App", () => { await waitFor(() => expect(run).toHaveBeenCalledOnce()); const request = run.mock.calls[0]?.[0]; expect(request?.prompt).toBe("帮我分析项目"); + // The renderer always sends the concrete model it resolved from the layers. expect(request?.runtimeSelection).toEqual({ provider: "model", + profileId: modelProfileId, }); expect( screen @@ -5901,10 +5934,10 @@ describe("App", () => { { id: conversationId, projectId, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "model", profileId: profile.id, - }, + }), contextMetrics: { runtimeSelectionKey: `model:${profile.id}`, contextTokens: 9_000, @@ -8022,10 +8055,10 @@ describe("App", () => { { id: "00000000-0000-4000-8000-000000000319", projectId: remoteProject.id, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "model", profileId: modelProfileId, - }, + }), title: "旧直连模型会话", updatedAt: 1_775_000_000_000, messages: [], @@ -8033,10 +8066,10 @@ describe("App", () => { { id: "00000000-0000-4000-8000-000000000419", projectId: remoteProject.id, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "continue", profileId: modelProfileId, - }, + }), title: "旧 Continue 会话", updatedAt: 1_774_000_000_000, messages: [], @@ -8053,30 +8086,29 @@ describe("App", () => { ); expect(screen.queryByRole("progressbar")).not.toBeInTheDocument(); + // The saved direct-model conversation choice is ignored for the remote project, not rewritten. const runtimeButton = await screen.findByRole("button", { name: /OpenCode · 默认模型/u, }); fireEvent.click(runtimeButton); const runtimeMenu = screen.getByRole("menu", { - name: "Runtime 和模型", + name: "执行方式和模型", }); + const providers = within(runtimeMenu).getByRole("group", { name: "执行方式" }); expect( - within(runtimeMenu).getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }), - ).toBeInTheDocument(); - expect(within(runtimeMenu).getAllByRole("menuitemradio")).toHaveLength(2); - expect(within(runtimeMenu).queryByText("直连模型")).not.toBeInTheDocument(); + within(providers).getAllByRole("menuitemradio").map((item) => item.textContent), + ).toEqual(["OpenCode", "Continue"]); + const models = within(runtimeMenu).getByRole("group", { name: "模型" }); expect( - within(runtimeMenu).queryByText("Continue Runtime"), - ).toBeInTheDocument(); + // The conversation's saved model still applies to OpenCode; only its mode is ignored. + within(models).getByRole("menuitemradio", { name: /^默认模型 · sonnet-5/u }), + ).toHaveAttribute("aria-checked", "true"); + expect(within(models).queryByText(/自有配置/u)).not.toBeInTheDocument(); + expect(within(runtimeMenu).getByRole("status")).toHaveTextContent( + "远程项目仅支持 OpenCode 和 Continue", + ); expect( - within(runtimeMenu).queryByText(/DeepSeek Harness/u), - ).not.toBeInTheDocument(); - expect( - within(runtimeMenu).getByRole("menuitem", { - name: "管理 Runtime 和模型连接", - }), + within(runtimeMenu).getByRole("menuitem", { name: "管理模型连接…" }), ).toBeInTheDocument(); fireEvent.keyDown(document, { key: "Escape" }); @@ -8117,7 +8149,7 @@ describe("App", () => { await screen.findByRole("button", { name: "当前项目" }); selectProjectOption(remoteProject.name); await waitFor(() => expect(api.agent.getStatus).toHaveBeenCalledWith( - remoteProject.runtimeSelection, + { provider, profileId: modelProfileId }, )); fireEvent.change(screen.getByLabelText("向 GoodBuddy 提问"), { target: { value: "Verify inherited model" }, @@ -8377,7 +8409,7 @@ describe("App", () => { ): ConversationSnapshot => ({ id: input.conversationId, projectId, - runtimeSelection: { provider: "model", profileId: modelProfileId }, + runtimeSelection: legacySelection({ provider: "model", profileId: modelProfileId }), title: "断网期间继续执行", updatedAt: 1_000, messages: [ @@ -9111,11 +9143,9 @@ describe("App", () => { within(dialog).getByLabelText("微信 ClawBot 项目说明"); expect(dialogDescription).toHaveFocus(); const dialogBackend = - within(dialog).getByLabelText("微信 ClawBot 消息处理后端"); + within(dialog).getByLabelText("微信 ClawBot 执行方式"); expect( - within(dialogBackend).getByRole("option", { - name: "DeepSeek Harness（预览 · OpenAI 兼容）", - }), + within(dialogBackend).getByRole("option", { name: "DeepSeek Harness" }), ).toBeInTheDocument(); fireEvent.change(dialogDescription, { target: { value: "从左上角更新" } }); fireEvent.change( @@ -9124,9 +9154,7 @@ describe("App", () => { ); fireEvent.change(dialogBackend, { target: { - value: agentRuntimeSelectionKey({ - provider: "opencode", - }), + value: "opencode", }, }); fireEvent.click( @@ -9145,8 +9173,8 @@ describe("App", () => { expect(screen.getByLabelText("微信 ClawBot 默认工作目录")).toHaveValue( "C:\\FromSwitcher", ); - expect(screen.getByLabelText("微信 ClawBot 消息处理后端")).toHaveValue( - agentRuntimeSelectionKey({ provider: "opencode" }), + expect(screen.getByLabelText("微信 ClawBot 执行方式")).toHaveValue( + "opencode", ); }); @@ -9156,11 +9184,9 @@ describe("App", () => { fireEvent.change(screen.getByLabelText("微信 ClawBot 默认工作目录"), { target: { value: "C:\\FromChannels" }, }); - fireEvent.change(screen.getByLabelText("微信 ClawBot 消息处理后端"), { + fireEvent.change(screen.getByLabelText("微信 ClawBot 执行方式"), { target: { - value: agentRuntimeSelectionKey({ - provider: "continue", - }), + value: "continue", }, }); fireEvent.click( @@ -9196,8 +9222,8 @@ describe("App", () => { within(dialog).getByLabelText("微信 ClawBot 默认工作目录"), ).toHaveValue("C:\\FromChannels"); expect( - within(dialog).getByLabelText("微信 ClawBot 消息处理后端"), - ).toHaveValue(agentRuntimeSelectionKey({ provider: "continue" })); + within(dialog).getByLabelText("微信 ClawBot 执行方式"), + ).toHaveValue("continue"); expect( within( within(dialog).getByRole("group", { @@ -10046,7 +10072,8 @@ describe("App", () => { requestId: expect.any(String), conversationId, projectId, - runtimeSelection: { provider }, + // Main receives the concrete model the conversation resolves to. + runtimeSelection: { provider, profileId: modelProfileId }, history: messages.map(({ role, content }) => ({ role, content, @@ -10095,7 +10122,7 @@ describe("App", () => { }); vi.mocked(api.conversations.list).mockResolvedValueOnce([{ id: "00000000-0000-4000-8000-000000000738", projectId, - runtimeSelection: { provider: "model", profileId: imageProfile.id }, + runtimeSelection: legacySelection({ provider: "model", profileId: imageProfile.id }), title: "Image conversation", updatedAt: Date.now(), messages: [], }]); render(); @@ -10106,12 +10133,13 @@ describe("App", () => { it("hides direct model manual compaction for remote channel conversations", async () => { vi.mocked(api.conversations.list).mockResolvedValueOnce([{ id: "00000000-0000-4000-8000-000000000740", projectId, - runtimeSelection: { provider: "model", profileId: modelProfileId }, + runtimeSelection: legacySelection({ provider: "model", profileId: modelProfileId }), title: "Remote model conversation", updatedAt: Date.now(), messages: [], remote: { channel: "weixin", accountDisplay: "Remote account", conversationType: "direct" }, }]); render(); - await waitFor(() => expect(api.agent.getStatus).toHaveBeenCalledWith({ provider: "model", profileId: modelProfileId })); + // The resolved selection equals the startup default, so no extra status request is needed. + await screen.findByRole("button", { name: /sonnet-5/u }); expect(screen.queryByRole("button", { name: "压缩上下文" })).not.toBeInTheDocument(); expect(api.agent.compactConversation).not.toHaveBeenCalled(); }); @@ -10148,12 +10176,8 @@ describe("App", () => { selectComposerOption("工作模式", "Execute · 完全权限"); expect(mode).toHaveAccessibleName("工作模式：Execute · 完全权限"); - fireEvent.click(await screen.findByRole("button", { name: /OpenCode/u })); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^默认模型.*sonnet-5$/u, - }), - ); + await screen.findByRole("button", { name: /^OpenCode ·/u }); + pickRuntime("直连模型"); await waitFor(() => { expect(mode).toHaveAccessibleName("工作模式：Ask · 只读问答"); @@ -10357,37 +10381,23 @@ describe("App", () => { render(); const runtimeButton = await screen.findByRole("button", { - name: /sonnet-5/u, + name: "直连模型 · 默认模型(sonnet-5)", }); fireEvent.click(runtimeButton); + const { providers, models } = runtimeMenuColumns(); + expect(screen.queryByText(/自动/u)).not.toBeInTheDocument(); expect( - await screen.findByRole("menu", { name: "Runtime 和模型" }), - ).toBeInTheDocument(); - expect(screen.queryByText("自动选择")).not.toBeInTheDocument(); + within(providers).getAllByRole("menuitemradio").map((item) => item.textContent), + ).toEqual(["直连模型", "OpenCode", "Continue", "DeepSeek Harness"]); expect( - screen.getByRole("menuitemradio", { - name: /^默认模型.*sonnet-5$/u, - }), - ).toBeInTheDocument(); + within(providers).getByRole("menuitemradio", { name: "直连模型" }), + ).toHaveAttribute("aria-checked", "true"); + // With no conversation choice, "Default" is checked and names where it comes from. expect( - screen.getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }), - ).toBeInTheDocument(); - expect( - screen.getByRole("menuitemradio", { - name: /^Continue · 默认模型.*sonnet-5$/u, - }), - ).toBeInTheDocument(); - expect( - screen.getByRole("menuitemradio", { - name: /^DeepSeek Harness · 自身配置/u, - }), - ).toBeInTheDocument(); + within(models).getByRole("menuitemradio", { name: "默认（默认模型） · 全局 · sonnet-5" }), + ).toHaveAttribute("aria-checked", "true"); fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^默认模型.*sonnet-5$/u, - }), + within(models).getByRole("menuitemradio", { name: /^默认模型 · sonnet-5/u }), ); await waitFor(() => @@ -10404,17 +10414,10 @@ describe("App", () => { it("shows Runtime switches globally without replacing composer guidance", async () => { render(); - const runtimeButton = await screen.findByRole("button", { - name: /sonnet-5/u, - }); + await screen.findByRole("button", { name: /sonnet-5/u }); vi.useFakeTimers(); try { - fireEvent.click(runtimeButton); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }), - ); + pickRuntime("OpenCode"); await act(async () => { await Promise.resolve(); }); @@ -10429,16 +10432,7 @@ describe("App", () => { }), ).toBeInTheDocument(); - fireEvent.click( - screen.getByRole("button", { - name: /OpenCode · 默认模型/u, - }), - ); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^Continue · 默认模型.*sonnet-5$/u, - }), - ); + pickRuntime("Continue"); await act(async () => { await Promise.resolve(); }); @@ -10465,7 +10459,7 @@ describe("App", () => { } }); - it("shows one configured choice per Agent Runtime in a flat keyboard menu", async () => { + it("navigates the two-column picker by keyboard and lists models for the focused mode", async () => { const settings = await api.settings.getRuntime(); const secondProfileId = "00000000-0000-4000-8000-000000000002"; vi.mocked(api.settings.getRuntime).mockResolvedValueOnce({ @@ -10492,94 +10486,57 @@ describe("App", () => { name: /sonnet-5/u, }); fireEvent.click(runtimeButton); - const runtimeMenu = screen.getByRole("menu", { - name: "Runtime 和模型", - }); - const directModel = screen.getByRole("menuitemradio", { - name: /^默认模型.*sonnet-5$/u, - }); - const secondDirectModel = screen.getByRole("menuitemradio", { - name: /^第二模型.*qwen3$/u, - }); - const openCodeModel = screen.getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }); - const continueModel = screen.getByRole("menuitemradio", { - name: /^Continue · 默认模型.*sonnet-5$/u, - }); - const deepseekHarness = screen.getByRole("menuitemradio", { - name: /^DeepSeek Harness · 自身配置/u, - }); - expect(directModel).toBeEnabled(); - expect(secondDirectModel).toBeEnabled(); - expect(openCodeModel).toBeEnabled(); - expect(continueModel).toBeEnabled(); - expect(deepseekHarness).toBeEnabled(); - expect(screen.getAllByRole("menuitemradio")).toHaveLength(6); - expect(within(runtimeMenu).getAllByRole("separator")).toHaveLength(4); - expect(within(runtimeMenu).queryByRole("menu")).not.toBeInTheDocument(); - expect( - screen.queryByRole("menuitemradio", { - name: /^OpenCode · 第二模型/u, - }), - ).not.toBeInTheDocument(); - expect( - screen.queryByRole("menuitemradio", { - name: /^Continue · 第二模型/u, - }), - ).not.toBeInTheDocument(); - expect( - screen.queryByRole("menuitem", { name: /Agent Runtime/u }), - ).not.toBeInTheDocument(); + const { providers, models } = runtimeMenuColumns(); + const direct = within(providers).getByRole("menuitemradio", { name: "直连模型" }); + await waitFor(() => expect(direct).toHaveFocus()); + expect(within(models).getAllByRole("menuitemradio")).toHaveLength(3); + expect(within(models).queryByText(/自有配置/u)).not.toBeInTheDocument(); - const defaultDirect = screen.getByRole("menuitemradio", { name: /^直连 · 跟随全局默认模型/u }); - await waitFor(() => expect(defaultDirect).toHaveFocus()); - fireEvent.keyDown(defaultDirect, { key: "ArrowDown" }); - expect(directModel).toHaveAttribute("tabindex", "0"); - expect(secondDirectModel).toHaveAttribute("tabindex", "-1"); - fireEvent.keyDown(directModel, { key: "ArrowDown" }); - expect(secondDirectModel).toHaveFocus(); - expect(directModel).toHaveAttribute("tabindex", "-1"); - expect(secondDirectModel).toHaveAttribute("tabindex", "0"); - fireEvent.keyDown(secondDirectModel, { key: "ArrowDown" }); - expect(openCodeModel).toHaveFocus(); + fireEvent.keyDown(direct, { key: "ArrowDown" }); + const openCode = within(providers).getByRole("menuitemradio", { name: "OpenCode" }); + expect(openCode).toHaveFocus(); + // Focusing a mode previews its models, including its own configuration. + expect( + within(models).getByRole("menuitemradio", { name: "使用 OpenCode 自有配置" }), + ).toBeInTheDocument(); + fireEvent.keyDown(openCode, { key: "ArrowRight" }); + expect( + within(models).getByRole("menuitemradio", { name: /^默认（默认模型）/u }), + ).toHaveFocus(); + fireEvent.keyDown(document.activeElement!, { key: "ArrowDown" }); + expect( + within(models).getByRole("menuitemradio", { name: /^默认模型 · sonnet-5/u }), + ).toHaveFocus(); + fireEvent.keyDown(document.activeElement!, { key: "ArrowLeft" }); + expect(direct).toHaveFocus(); fireEvent.keyDown(document.activeElement!, { key: "Escape" }); expect(runtimeButton).toHaveFocus(); expect( - screen.queryByRole("menu", { name: "Runtime 和模型" }), + screen.queryByRole("menu", { name: "执行方式和模型" }), ).not.toBeInTheDocument(); - fireEvent.click(runtimeButton); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }), - ); + pickRuntime("OpenCode", /^第二模型 · qwen3/u); expect(runtimeButton).toHaveFocus(); await waitFor(() => expect(api.agent.getStatus).toHaveBeenLastCalledWith({ provider: "opencode", + profileId: secondProfileId, }), ); - const selectedRuntimeButton = await screen.findByRole("button", { - name: /OpenCode · 默认模型/u, - }); - fireEvent.click(selectedRuntimeButton); - const selectedOpenCodeModel = screen.getByRole("menuitemradio", { - name: /^OpenCode · 默认模型.*sonnet-5$/u, - }); - await waitFor(() => expect(selectedOpenCodeModel).toHaveFocus()); - expect(selectedOpenCodeModel).toHaveAttribute("aria-checked", "true"); - expect(selectedOpenCodeModel).toHaveAttribute("tabindex", "0"); + fireEvent.click(await screen.findByRole("button", { name: /^OpenCode · 第二模型/u })); + const reopened = runtimeMenuColumns(); + expect( + within(reopened.models).getByRole("menuitemradio", { name: /^第二模型 · qwen3/u }), + ).toHaveAttribute("aria-checked", "true"); + expect(within(reopened.menu).getByText("本会话单独选择")).toBeInTheDocument(); fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^Continue · 默认模型.*sonnet-5$/u, - }), + within(reopened.menu).getByRole("menuitem", { name: "恢复为项目默认" }), ); await waitFor(() => expect(api.agent.getStatus).toHaveBeenLastCalledWith({ - provider: "continue", + provider: "model", + profileId: modelProfileId, }), ); }); @@ -10594,24 +10551,24 @@ describe("App", () => { fireEvent.click(runtimeButton); expect( - screen.getByRole("menu", { name: "Runtime 和模型" }), + screen.getByRole("menu", { name: "执行方式和模型" }), ).toBeInTheDocument(); fireEvent.pointerDown(composer); expect( - screen.queryByRole("menu", { name: "Runtime 和模型" }), + screen.queryByRole("menu", { name: "执行方式和模型" }), ).not.toBeInTheDocument(); fireEvent.click(runtimeButton); - const selectedModel = screen.getByRole("menuitemradio", { - name: /^直连 · 跟随全局默认模型/u, + const selected = within(runtimeMenuColumns().providers).getByRole("menuitemradio", { + name: "直连模型", }); - await waitFor(() => expect(selectedModel).toHaveFocus()); - fireEvent.keyDown(selectedModel, { key: "Tab" }); + await waitFor(() => expect(selected).toHaveFocus()); + fireEvent.keyDown(selected, { key: "Tab" }); composer.focus(); expect(composer).toHaveFocus(); await waitFor(() => expect( - screen.queryByRole("menu", { name: "Runtime 和模型" }), + screen.queryByRole("menu", { name: "执行方式和模型" }), ).not.toBeInTheDocument(), ); }); @@ -10626,21 +10583,25 @@ describe("App", () => { }); render(); - fireEvent.click(await screen.findByRole("button", { name: /sonnet-5/u })); + await screen.findByRole("button", { name: /sonnet-5/u }); + fireEvent.click(screen.getByRole("button", { name: /sonnet-5/u })); + const { providers, models } = runtimeMenuColumns(); + fireEvent.mouseEnter(within(providers).getByRole("menuitemradio", { name: "Continue" })); expect( - screen.getByRole("menuitemradio", { - name: /^OpenCode · 自身配置.*使用 OpenCode 自身配置$/u, + within(models).getByRole("menuitemradio", { + name: "默认（自有配置） · 全局 · 使用 Continue 自有配置", }), ).toBeInTheDocument(); - const continueChoice = screen.getByRole("menuitemradio", { - name: /^Continue · 自身配置.*使用 Continue 自身配置$/u, - }); - fireEvent.click(continueChoice); + fireEvent.click(within(providers).getByRole("menuitemradio", { name: "Continue" })); await waitFor(() => expect(api.agent.getStatus).toHaveBeenLastCalledWith({ provider: "continue", + runtimeConfig: true, }), ); + expect( + await screen.findByRole("button", { name: /^Continue · 自有配置/u }), + ).toBeInTheDocument(); }); it("persists metadata-only retrieval and Runtime changes without rewriting messages", async () => { @@ -10690,10 +10651,10 @@ describe("App", () => { { id: conversationId, projectId, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "model", profileId: modelProfileId, - }, + }), knowledgeLibraryIds: [libraryId], knowledgeRetrievalMode: "auto", title: "元数据会话", @@ -10749,21 +10710,16 @@ describe("App", () => { ); vi.mocked(api.conversations.saveLocal).mockClear(); - fireEvent.click(screen.getByRole("button", { name: /sonnet-5/u })); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^仅元数据模型.*qwen3$/u, - }), - ); + pickRuntime("直连模型", /^仅元数据模型 · qwen3/u); await waitFor( () => expect(api.conversations.saveLocal).toHaveBeenCalledWith([ { header: expect.objectContaining({ id: conversationId, + // The execution mode stays inherited; only the model is chosen here. runtimeSelection: { - provider: "model", - profileId: secondProfileId, + model: { kind: "profile", profileId: secondProfileId }, }, knowledgeRetrievalMode: "always", }), @@ -10920,7 +10876,7 @@ describe("App", () => { { id: "00000000-0000-4000-8000-000000000020", projectId, - runtimeSelection: { provider: "auto" }, + runtimeSelection: legacySelection({ provider: "auto" }), contextMetrics: { runtimeSelectionKey: "auto:default", contextTokens: 9_000, @@ -10943,7 +10899,8 @@ describe("App", () => { render(); expect( - await screen.findByRole("button", { name: /自动.*sonnet-5/u }), + // Legacy Auto now reads as "follow the project" and resolves to the direct model. + await screen.findByRole("button", { name: /^直连模型 · 默认模型/u }), ).toBeInTheDocument(); expect(screen.queryByText(/本次调用 9\.0K/u)).not.toBeInTheDocument(); expect(screen.queryByText(/压缩线/u)).not.toBeInTheDocument(); @@ -10971,10 +10928,7 @@ describe("App", () => { }); expect(screen.getByText(/本次调用 9\.0K/u)).toBeInTheDocument(); expect(screen.queryByText(/压缩线/u)).not.toBeInTheDocument(); - const currentRuntimeSelectionKey = - settings.opencodeModelSource.kind === "profile" - ? `opencode:${settings.opencodeModelSource.profileId}` - : "opencode:platform"; + const currentRuntimeSelectionKey = `model:${modelProfileId}`; await waitFor(() => expect(api.conversations.saveLocal).toHaveBeenCalledWith([ expect.objectContaining({ @@ -10994,10 +10948,10 @@ describe("App", () => { { id: "00000000-0000-4000-8000-000000000022", projectId, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "model", profileId: removedProfileId, - }, + }), title: "旧模型对话", updatedAt: 1, messages: [ @@ -11014,9 +10968,11 @@ describe("App", () => { render(); expect(await screen.findByText("旧消息")).toBeInTheDocument(); - expect( - screen.getByRole("button", { name: /模型配置不可用/u }), - ).toBeInTheDocument(); + // The deleted model falls back visibly; the saved choice is kept until the user replaces it. + fireEvent.click(await screen.findByRole("button", { name: /^直连模型 · 默认模型/u })); + expect(within(runtimeMenuColumns().menu).getByRole("status")).toHaveTextContent( + "所选模型连接已删除，已回退到 默认模型", + ); expect(api.conversations.replace).not.toHaveBeenCalled(); expect(api.conversations.saveLocal).not.toHaveBeenCalled(); }); @@ -11054,19 +11010,12 @@ describe("App", () => { })); render(); - fireEvent.click(await screen.findByRole("button", { name: /sonnet-5/u })); - fireEvent.click( - screen.getByRole("menuitemradio", { - name: /^第二模型.*qwen3$/u, - }), - ); + await screen.findByRole("button", { name: /sonnet-5/u }); + pickRuntime("直连模型", /^第二模型 · qwen3/u); expect( await screen.findByRole("button", { name: /第二模型/u }), ).toBeInTheDocument(); - fireEvent.click(screen.getByRole("button", { name: /新建对话/u })); - expect(screen.getByRole("button", { name: /第二模型/u })).toBeInTheDocument(); - fireEvent.change(screen.getByLabelText("向 GoodBuddy 提问"), { target: { value: "第二模型对话" }, }); @@ -11115,8 +11064,7 @@ describe("App", () => { header: expect.objectContaining({ title: "第二模型对话", runtimeSelection: { - provider: "model", - profileId: secondProfileId, + model: { kind: "profile", profileId: secondProfileId }, }, }), messages: expect.any(Array), @@ -11401,19 +11349,14 @@ describe("App", () => { expect(within(dialog).getByLabelText("根目录")).toHaveValue( project.rootPath, ); - expect(within(dialog).getByLabelText("新对话默认 Runtime")).toHaveValue( - agentRuntimeSelectionKey({ - provider: "model", - }), - ); + // Projects always show a concrete execution mode (older rows show what they resolve to). + expect(within(dialog).getByLabelText("执行方式")).toHaveValue("model"); fireEvent.change(within(dialog).getByLabelText("说明"), { target: { value: "更新后的说明" }, }); - fireEvent.change(within(dialog).getByLabelText("新对话默认 Runtime"), { + fireEvent.change(within(dialog).getByLabelText("执行方式"), { target: { - value: agentRuntimeSelectionKey({ - provider: "continue", - }), + value: "continue", }, }); fireEvent.click(within(dialog).getByRole("button", { name: "保存项目" })); @@ -11465,20 +11408,20 @@ describe("App", () => { vi.mocked(api.projects.list).mockResolvedValueOnce([ { ...project, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "opencode", profileId: modelProfileId, - }, + }), }, ]); vi.mocked(api.conversations.list).mockResolvedValueOnce([ { id: "00000000-0000-4000-8000-000000000220", projectId, - runtimeSelection: { + runtimeSelection: legacySelection({ provider: "model", profileId: modelProfileId, - }, + }), title: "已有对话", updatedAt: 1, messages: [], @@ -11489,8 +11432,9 @@ describe("App", () => { await screen.findAllByText("已有对话"); fireEvent.click(screen.getByRole("button", { name: /新建对话/u })); + // The legacy project pin is read as a layer; the new conversation follows it. await waitFor(() => - expect(api.agent.getStatus).toHaveBeenLastCalledWith({ + expect(api.agent.getStatus).toHaveBeenCalledWith({ provider: "opencode", profileId: modelProfileId, }), @@ -11651,13 +11595,13 @@ describe("App", () => { ]); expect(run).not.toHaveBeenCalled(); fireEvent.click(screen.getByRole('button', { name: '继续修改' })); - fireEvent.click(screen.getByRole('button', { name: /sonnet-5/u })); - fireEvent.click(screen.getByRole('menuitemradio', { name: /^OpenCode · 默认模型/u })); - await waitFor(() => expect(api.agent.getStatus).toHaveBeenLastCalledWith({ provider: 'opencode' })); + pickRuntime('OpenCode'); + const openCodeSelection = { provider: 'opencode', profileId: modelProfileId }; + await waitFor(() => expect(api.agent.getStatus).toHaveBeenLastCalledWith(openCodeSelection)); fireEvent.change(screen.getByLabelText('向 GoodBuddy 提问'), { target: { value: 'Turn the circle red' } }); fireEvent.click(screen.getByLabelText('发送')); await waitFor(() => expect(run).toHaveBeenCalledOnce()); - expect(run.mock.calls[0]![0]).toMatchObject({ runtimeSelection: { provider: 'opencode' }, imageContextArtifactIds: [artifact.id] }); + expect(run.mock.calls[0]![0]).toMatchObject({ runtimeSelection: openCodeSelection, imageContextArtifactIds: [artifact.id] }); expect(api.conversationQueue.enqueueUser).toHaveBeenCalledWith(expect.objectContaining({ imageContextArtifactIds: [artifact.id] })); expect(api.context.addPastedImage).not.toHaveBeenCalled(); }); diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 6ff87949..437c8fa7 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -119,14 +119,18 @@ import { } from "../../shared/context-window"; import { agentRuntimeSelectionKey, - agentRuntimeSelectionSchema, - getRuntimeSelectionProfileId, - type AgentRuntimeSelection, + compactRuntimeSelectionLayer, + resolveRuntimeChoice, + runtimeSelectionLayerSchema, + type ResolvedRuntimeChoice, + type RuntimeSelectionLayer, } from "../../shared/runtime-selection-contracts"; import { - getDefaultRuntimeSelection, - getRuntimeSelectionForProvider, + runtimeModelDetail, + runtimeModelLabel, + runtimeProviderLabel, } from "./runtime-selection"; +import { RuntimeModelPicker } from "./RuntimeModelPicker"; import { mergeMessageImageState } from "./message-image-state"; import type { ActivityHistorySnapshot, @@ -756,7 +760,7 @@ function isErrorRepresentedByFailedTool( function createConversation( projectId?: string, - runtimeSelection?: AgentRuntimeSelection, + runtimeSelection?: RuntimeSelectionLayer, greeting = "你好，我是 GoodBuddy。你可以直接向我提问、添加本地文件，或使用知识库整理和检索信息。需要我操作文件或调用工具时，请选择合适的 Agent Runtime 和工作模式。", ): Conversation { const now = Date.now(); @@ -912,7 +916,7 @@ function isConversation(value: unknown): value is Conversation { return ( typeof item.id === "string" && (item.runtimeSelection === undefined || - agentRuntimeSelectionSchema.safeParse(item.runtimeSelection).success) && + runtimeSelectionLayerSchema.safeParse(item.runtimeSelection).success) && (item.knowledgeLibraryIds === undefined || (Array.isArray(item.knowledgeLibraryIds) && item.knowledgeLibraryIds.length <= 20 && @@ -1239,18 +1243,17 @@ function mergePersistedConversations( return sortConversationsForDisplay(merged); } -function getProjectDefaultRuntimeSelection( +/** Resolves global → project → conversation layers into the selection a run uses. */ +function resolveConversationRuntime( project: AssistantProject | undefined, + conversationLayer: RuntimeSelectionLayer | undefined, settings: RuntimeSettings, -): AgentRuntimeSelection { - if (isManagedSshProject(project)) { - return project.runtimeSelection?.provider === "opencode" || project.runtimeSelection?.provider === "continue" - ? project.runtimeSelection : getRuntimeSelectionForProvider("opencode", settings); - } - const selection = project?.runtimeSelection; - return !selection || selection.provider === "auto" - ? getDefaultRuntimeSelection(settings) - : selection; +): ResolvedRuntimeChoice { + return resolveRuntimeChoice( + settings, + { project: project?.runtimeSelection, conversation: conversationLayer }, + { remote: isManagedSshProject(project) }, + ); } type ManagedSshProject = AssistantProject & { @@ -1292,109 +1295,22 @@ function isOrdinaryLocalProject(project: AssistantProject): boolean { return project.kind === "user" && project.executionSpace.kind === "local"; } -function resolveContextMetricsRuntimeSelection( - selection: AgentRuntimeSelection, - settings: RuntimeSettings, -): AgentRuntimeSelection { - const effective = selection.provider !== "auto" ? selection : getRuntimeSelectionForProvider( - settings.provider === "auto" ? "opencode" : settings.provider, - settings, - ); - const profileId = getRuntimeSelectionProfileId(effective, settings); - return profileId && effective.provider !== "auto" ? { ...effective, profileId } : effective; -} - -function getRuntimeSelectionLabel( - selection: AgentRuntimeSelection | undefined, +/** The button label: "Execution mode · Model". */ +function runtimeChoiceLabel( + resolved: ResolvedRuntimeChoice | undefined, settings: RuntimeSettings | undefined, status: AgentRuntimeStatus | undefined, - labels: { - directModel: string; - automatic: string; - automaticSelection: string; - modelUnavailable: string; - }, + t: TFunction<"app">, ): string { - if (!selection || !settings) { + if (!resolved || !settings) { return status?.label ?? "Runtime"; } - const profileId = getRuntimeSelectionProfileId(selection, settings); - const profile = - profileId - ? settings.modelProfiles.find( - (candidate) => candidate.id === profileId, - ) - : undefined; - const requestedProfileMissing = - "profileId" in selection && - Boolean(selection.profileId) && - profile === undefined; - if (selection.provider === "model") { - return profile - ? `${profile.name} · ${profile.modelName}` - : requestedProfileMissing - ? labels.modelUnavailable - : (status?.label ?? labels.directModel); - } - if (selection.provider === "opencode") { - return profile - ? `OpenCode · ${profile.name}` - : requestedProfileMissing - ? `OpenCode · ${labels.modelUnavailable}` - : "OpenCode"; - } - if (selection.provider === "continue") { - return profile - ? `Continue · ${profile.name}` - : requestedProfileMissing - ? `Continue · ${labels.modelUnavailable}` - : "Continue"; - } - if (selection.provider === "deepseek-harness") { - return profile - ? `DeepSeek Harness · ${profile.name}` - : requestedProfileMissing - ? `DeepSeek Harness · ${labels.modelUnavailable}` - : "DeepSeek Harness"; - } - return status - ? `${labels.automatic} · ${status.label}` - : labels.automaticSelection; -} - -function getConfiguredAgentRuntimeSource( - settings: RuntimeSettings, - provider: "opencode" | "continue" | "deepseek-harness", - labels: { - modelUnavailable: string; - selectModel: string; - ownConfiguration: string; - useOwnConfiguration: (runtime: string) => string; - }, -): { label: string; detail: string } { - const profileId = getRuntimeSelectionProfileId({ provider }, settings); - const profile = - profileId - ? settings.modelProfiles.find( - (candidate) => candidate.id === profileId, - ) - : undefined; - const runtimeLabel = - provider === "opencode" - ? "OpenCode" - : provider === "continue" - ? "Continue" - : "DeepSeek Harness"; - if (profileId) { - return { - label: `${runtimeLabel} · ${profile?.name ?? labels.modelUnavailable}`, - detail: profile?.modelName ?? labels.selectModel, - }; - } - return { - label: `${runtimeLabel} · ${labels.ownConfiguration}`, - detail: labels.useOwnConfiguration(runtimeLabel), - }; + return `${runtimeProviderLabel(resolved.provider, t)} · ${runtimeModelLabel( + resolved.provider, + resolved.model, + settings, + t, + )}`; } function formatAttachmentSize(size: number): string { @@ -3197,14 +3113,19 @@ function App(): React.JSX.Element { }); }, [activeId, cachedConversationViews, conversations]); - const activeRuntimeSelection = useMemo( + const activeRuntimeResolution = useMemo( () => - activeConversation?.runtimeSelection ?? - (runtimeSettings - ? getProjectDefaultRuntimeSelection(activeProject, runtimeSettings) - : undefined), + runtimeSettings + ? resolveConversationRuntime( + activeProject, + activeConversation?.runtimeSelection, + runtimeSettings, + ) + : undefined, [activeConversation?.runtimeSelection, activeProject, runtimeSettings], ); + // Resolved selections are always concrete, so their key already reflects the model in effect. + const activeRuntimeSelection = activeRuntimeResolution?.selection; const activeRuntimeSelectionKey = activeRuntimeSelection ? agentRuntimeSelectionKey(activeRuntimeSelection) : ""; @@ -3212,61 +3133,22 @@ function App(): React.JSX.Element { useEffect(() => { activeRuntimeSelectionRef.current = activeRuntimeSelection; }, [activeRuntimeSelection]); - const runtimeLabels = useMemo( - () => ({ - directModel: t("runtime.directModel"), - automatic: t("runtime.automatic"), - automaticSelection: t("runtime.automaticSelection"), - modelUnavailable: t("runtime.modelUnavailable"), - }), - [t], - ); - const configuredRuntimeLabels = useMemo( - () => ({ - modelUnavailable: t("runtime.modelUnavailable"), - selectModel: t("runtime.selectModel"), - ownConfiguration: t("runtime.ownConfiguration"), - useOwnConfiguration: (runtimeLabel: string) => - t("runtime.useOwnConfiguration", { runtime: runtimeLabel }), - }), - [t], - ); - const activeRuntimeLabel = getRuntimeSelectionLabel( - activeRuntimeSelection, + const activeRuntimeLabel = runtimeChoiceLabel( + activeRuntimeResolution, runtimeSettings, runtime, - runtimeLabels, + t, ); - const openCodeMenuSelection = runtimeSettings - ? getRuntimeSelectionForProvider("opencode", runtimeSettings) - : undefined; - const continueMenuSelection = runtimeSettings - ? getRuntimeSelectionForProvider("continue", runtimeSettings) - : undefined; - const deepseekHarnessMenuSelection = runtimeSettings - ? getRuntimeSelectionForProvider("deepseek-harness", runtimeSettings) - : undefined; - const openCodeMenuSource = runtimeSettings - ? getConfiguredAgentRuntimeSource( - runtimeSettings, - "opencode", - configuredRuntimeLabels, - ) - : undefined; - const continueMenuSource = runtimeSettings - ? getConfiguredAgentRuntimeSource( - runtimeSettings, - "continue", - configuredRuntimeLabels, - ) - : undefined; - const deepseekHarnessMenuSource = runtimeSettings - ? getConfiguredAgentRuntimeSource( - runtimeSettings, - "deepseek-harness", - configuredRuntimeLabels, - ) - : undefined; + // The model ID stays in the accessible name and tooltip; the visible label stays short. + const activeRuntimeModelDetail = + activeRuntimeResolution && runtimeSettings + ? runtimeModelDetail( + activeRuntimeResolution.provider, + activeRuntimeResolution.model, + runtimeSettings, + t, + ) + : undefined; // Conversation refreshes replace the conversation object, so the runtime // selection identity changes without the selection itself changing. Keying @@ -4058,16 +3940,19 @@ function App(): React.JSX.Element { } }, [refreshKnowledge]); + /** Writes the conversation layer (undefined = follow the project) and refreshes status. */ const switchRuntime = useCallback( - async (selection: AgentRuntimeSelection): Promise => { - if ( - !runtimeSettings || - !activeConversation || - runtimeSwitching || - (activeProjectUsesManagedSsh && selection.provider !== "opencode" && selection.provider !== "continue") - ) { + async (layer: RuntimeSelectionLayer | undefined): Promise => { + if (!runtimeSettings || !activeConversation || runtimeSwitching) { return; } + const nextLayer = compactRuntimeSelectionLayer(layer); + const resolved = resolveConversationRuntime( + activeProject, + nextLayer, + runtimeSettings, + ); + const selection = resolved.selection; runtimeMenuButtonRef.current?.focus(); setRuntimeSwitching(true); setRuntimeMenuOpen(false); @@ -4087,18 +3972,18 @@ function App(): React.JSX.Element { key: selectionKey, settings: runtimeSettings, }; - const label = getRuntimeSelectionLabel( - selection, + const label = runtimeChoiceLabel( + resolved, runtimeSettings, status, - runtimeLabels, + tRef.current, ); setConversations((current) => current.map((conversation) => conversation.id === activeConversation.id ? { ...conversation, - runtimeSelection: selection, + runtimeSelection: nextLayer, updatedAt: Date.now(), } : conversation, @@ -4145,8 +4030,7 @@ function App(): React.JSX.Element { }, [ activeConversation, - activeProjectUsesManagedSsh, - runtimeLabels, + activeProject, runtimeSettings, runtimeSwitching, ], @@ -6211,7 +6095,7 @@ function App(): React.JSX.Element { ]) .then(([settings, status]) => { const selectionKey = agentRuntimeSelectionKey( - getDefaultRuntimeSelection(settings), + resolveRuntimeChoice(settings).selection, ); runtimeStatusCacheRef.current = { key: selectionKey, @@ -6344,25 +6228,8 @@ function App(): React.JSX.Element { (selected.kind !== "channel" || candidate.remote !== undefined), ); if (conversation) { - if (isManagedSshProject(selected)) { - const runtimeSelection = runtimeSettings - ? getProjectDefaultRuntimeSelection(selected, runtimeSettings) - : ({ provider: "opencode" } as const); - setConversations((current) => - current.map((candidate) => - candidate.projectId === selected.id && - candidate.runtimeSelection !== undefined && - candidate.runtimeSelection?.provider !== "opencode" && - candidate.runtimeSelection?.provider !== "continue" - ? { - ...candidate, - runtimeSelection, - updatedAt: Date.now(), - } - : candidate, - ), - ); - } + // Remote projects ignore incompatible conversation choices at resolution time + // and say so in the picker, instead of silently rewriting saved conversations. setActiveId(conversation.id); } else if (selected.kind === "channel") { setActiveId(""); @@ -7095,8 +6962,9 @@ function App(): React.JSX.Element { const project = projectsRef.current.find( (candidate) => candidate.id === conversation?.projectId, ); - const selection = conversation?.runtimeSelection ?? - (runtimeSettings ? getProjectDefaultRuntimeSelection(project, runtimeSettings) : undefined); + const selection = runtimeSettings && conversation + ? resolveConversationRuntime(project, conversation.runtimeSelection, runtimeSettings).selection + : undefined; if (!conversation || !selection) { await window.goodbuddy.conversationQueue.releaseUser(queuedDispatch.item.id); return; @@ -7233,15 +7101,27 @@ function App(): React.JSX.Element { queuedInput?.knowledgeRetrievalMode ?? conversationSnapshot.knowledgeRetrievalMode ?? "auto"; - const runtimeSelectionSnapshot = - queuedInput?.runtimeSelection ?? activeRuntimeSelection; + // Queued messages follow the conversation's current choice at dispatch, + // so switching the model while messages wait applies to them too. + const runtimeSelectionSnapshot = queuedInput + ? runtimeSettings + ? resolveConversationRuntime( + projectsRef.current.find((project) => project.id === queuedInput!.projectId), + conversationSnapshot.runtimeSelection, + runtimeSettings, + ).selection + : queuedInput.runtimeSelection + : activeRuntimeSelection; if (!runtimeSelectionSnapshot) { notify({ tone: "info", message: t("runtime.notSelected") }); await releaseQueuedItem(); return; } const runtimeControlSnapshot: RuntimeControl | undefined = queuedInput - ? queuedInput.runtimeControl + ? // A queued agent/command/preset only applies to the Runtime it was chosen for. + queuedInput.runtimeControl?.provider === runtimeSelectionSnapshot.provider + ? queuedInput.runtimeControl + : undefined : runtimeSelectionSnapshot.provider === "opencode" && (selectedRuntimeAgent || command) ? { @@ -7388,14 +7268,7 @@ function App(): React.JSX.Element { messageId: assistantMessage.id, taskId: queuedDispatch?.scheduled ? queuedDispatch.item.taskId : undefined, projectId: projectIdSnapshot, - runtimeSelectionKey: agentRuntimeSelectionKey( - runtimeSettings - ? resolveContextMetricsRuntimeSelection( - runtimeSelectionSnapshot, - runtimeSettings, - ) - : runtimeSelectionSnapshot, - ), + runtimeSelectionKey: agentRuntimeSelectionKey(runtimeSelectionSnapshot), }); preparingConversations.current.delete(conversationId); const startedAt = new Date().toISOString(); @@ -7609,9 +7482,7 @@ function App(): React.JSX.Element { ...conversation, contextCompressionState: state, contextMetrics: { - runtimeSelectionKey: agentRuntimeSelectionKey(runtimeSettings - ? resolveContextMetricsRuntimeSelection(activeRuntimeSelection, runtimeSettings) - : activeRuntimeSelection), + runtimeSelectionKey: agentRuntimeSelectionKey(activeRuntimeSelection), contextTokens: estimatedAfterTokens, source: "estimated", basis: "conversation", @@ -8533,7 +8404,7 @@ function App(): React.JSX.Element { activeProject?.executionSpace.kind !== "ssh" && runtimeSettings?.modelProfiles.some( (profile) => - profile.id === getRuntimeSelectionProfileId(activeRuntimeSelection, runtimeSettings) && + profile.id === activeRuntimeSelection.profileId && profile.protocol !== "openai-images-generations", ) === true : (activeRuntimeSelection?.provider === "opencode" || @@ -8557,7 +8428,7 @@ function App(): React.JSX.Element { setActiveId(conversation.id); } // Save the current selection before Main resolves the launch from its conversation ID. - const header = toLocalConversationHeader({ ...conversation, runtimeSelection: activeRuntimeSelection, workMode }); + const header = toLocalConversationHeader({ ...conversation, workMode }); const operation = conversationPersistenceQueueRef.current.then(() => window.goodbuddy.conversations.saveLocal([{ header, messages: [] }]), ); @@ -8575,10 +8446,7 @@ function App(): React.JSX.Element { ) { return undefined; } - const resolvedRuntimeSelection = resolveContextMetricsRuntimeSelection( - activeRuntimeSelection, - runtimeSettings, - ); + const resolvedRuntimeSelection = activeRuntimeSelection; const activeModelProfile = "profileId" in resolvedRuntimeSelection && resolvedRuntimeSelection.profileId @@ -10316,7 +10184,7 @@ function App(): React.JSX.Element { - {runtimeMenuOpen && ( -
{ - const items = Array.from( - event.currentTarget.querySelectorAll( - '[role="menuitemradio"], [role="menuitem"]', - ), - ).filter((item) => !item.disabled); - const currentIndex = items.indexOf( - document.activeElement as HTMLButtonElement, - ); - let nextIndex: number | undefined; - if (event.key === "ArrowDown") { - nextIndex = - (currentIndex + 1) % items.length; - } else if (event.key === "ArrowUp") { - nextIndex = - (currentIndex - 1 + items.length) % - items.length; - } else if (event.key === "Home") { - nextIndex = 0; - } else if (event.key === "End") { - nextIndex = items.length - 1; - } else if (event.key === "Escape") { - event.preventDefault(); - setRuntimeMenuOpen(false); - runtimeMenuButtonRef.current?.focus(); - } - const nextItem = - nextIndex === undefined - ? undefined - : items.at(nextIndex); - if (nextItem) { - event.preventDefault(); - items.forEach((item) => { - item.tabIndex = - item === nextItem ? 0 : -1; - }); - nextItem.focus(); - } + {runtimeMenuOpen && runtimeSettings && ( + { + setRuntimeMenuOpen(false); + runtimeMenuButtonRef.current?.focus(); }} + onManage={() => { + setRuntimeMenuOpen(false); + setSettingsInitialCategory("model"); + setView("settings"); + }} + onSelect={(layer) => void switchRuntime(layer)} + projectLayer={activeProject?.runtimeSelection} ref={runtimeMenuRef} - role="menu" - > - {!activeProjectUsesManagedSsh && ( - <> - - {t("runtime.directModels")} - - - {runtimeSettings?.modelProfiles.map( - (profile) => ( - - ), - )} -
- - )} - - OpenCode Runtime - - {openCodeMenuSelection && - openCodeMenuSource && ( - - )} - <> -
- - Continue Runtime - - {continueMenuSelection && - continueMenuSource && ( - - )} - - {!activeProjectUsesManagedSsh && ( - <> -
- - {t("runtime.deepseekHarnessGroup")} - - {deepseekHarnessMenuSelection && - deepseekHarnessMenuSource && ( - - )} - - )} -
- -
+ remote={activeProjectUsesManagedSsh} + runtimeSettings={runtimeSettings} + /> )}
{t('channels.project.rootHelp')} @@ -106,7 +107,7 @@ export function ChannelProjectSettingsFields({ } runtimeSettings={runtimeSettings} selection={value.runtimeSelection} - selectionMode="channel" + textOnly />
{t('channels.project.defaultMode')}{t('channels.project.overrideHelp')} diff --git a/src/renderer/src/ChannelSettingsSection.test.tsx b/src/renderer/src/ChannelSettingsSection.test.tsx index ddd8f6d0..5e6ffd0e 100644 --- a/src/renderer/src/ChannelSettingsSection.test.tsx +++ b/src/renderer/src/ChannelSettingsSection.test.tsx @@ -18,7 +18,6 @@ import type { AssistantProject, ProjectCreateInput } from '../../shared/assistant-contracts' -import { agentRuntimeSelectionKey } from '../../shared/runtime-selection-contracts' import { ChannelSettingsSection } from './ChannelSettingsSection' import i18n from './i18n' @@ -114,7 +113,7 @@ const projects: AssistantProject[] = [ rootPath: 'C:\\Users\\tester' }, defaultWorkMode: 'ask', - runtimeSelection: { provider: 'auto' }, + runtimeSelection: { provider: 'model' }, kind: 'channel', channel: channel as 'weixin' | 'wecom' | 'dingtalk', status: 'active', @@ -239,13 +238,8 @@ describe('ChannelSettingsSection', () => { fireEvent.change(screen.getByLabelText('企业微信 默认工作目录'), { target: { value: 'C:\\RemoteWorkspace' } }) - fireEvent.change(screen.getByLabelText('企业微信 消息处理后端'), { - target: { - value: agentRuntimeSelectionKey({ - provider: 'model', - profileId: directProfileId - }) - } + fireEvent.change(screen.getByLabelText('企业微信 模型'), { + target: { value: directProfileId } }) fireEvent.click( within( @@ -265,7 +259,7 @@ describe('ChannelSettingsSection', () => { defaultWorkMode: 'execute', runtimeSelection: { provider: 'model', - profileId: directProfileId + model: { kind: 'profile', profileId: directProfileId } } }) ) @@ -495,56 +489,19 @@ describe('ChannelSettingsSection', () => { }) renderChannelSettings() - const backend = await screen.findByLabelText( - '微信 ClawBot 消息处理后端' - ) - expect(backend).toHaveValue( - agentRuntimeSelectionKey({ - provider: 'model' - }) - ) - expect( - within(backend).queryByRole('option', { - name: /自动/u - }) - ).not.toBeInTheDocument() - expect( - within(backend).getByRole('option', { - name: '默认模型 · text-model' - }) - ).toBeInTheDocument() - expect( - within(backend).queryByRole('option', { - name: '图片模型 · image-model' - }) - ).not.toBeInTheDocument() - expect( - within(backend).queryByRole('option', { - name: '未配置模型 · missing-key-model' - }) - ).not.toBeInTheDocument() - expect( - within(backend).getByRole('option', { name: 'OpenCode' }) - ).toBeInTheDocument() - expect( - within(backend).getByRole('option', { name: 'Continue' }) - ).toBeInTheDocument() - expect( - within(backend).getByRole('option', { - name: 'DeepSeek Harness（预览 · OpenAI 兼容）' - }) - ).toBeInTheDocument() + const backend = await screen.findByLabelText('微信 ClawBot 执行方式') + // Channel projects start on the direct model; the model follows global settings. + expect(backend).toHaveValue('model') + expect(within(backend).queryByRole('option', { name: /自动/u })).not.toBeInTheDocument() + for (const name of ['直连模型', 'OpenCode', 'Continue', 'DeepSeek Harness']) { + expect(within(backend).getByRole('option', { name })).toBeInTheDocument() + } + const model = screen.getByLabelText('微信 ClawBot 模型') + expect(within(model).getByRole('option', { name: '默认模型 · text-model' })).toBeInTheDocument() + expect(within(model).queryByRole('option', { name: /image-model/u })).not.toBeInTheDocument() + expect(within(model).getByRole('option', { name: /missing-key-model.*缺少 API Key/u })).toBeInTheDocument() - fireEvent.change(backend, { - target: { - value: agentRuntimeSelectionKey({ provider: 'opencode' }) - } - }) - expect( - screen.getByText( - '通过 OpenCode Agent Runtime 运行，并跟随“Agent Runtime”设置中的全局 OpenCode 配置。' - ) - ).toBeInTheDocument() + fireEvent.change(backend, { target: { value: 'opencode' } }) fireEvent.click( screen.getByRole('button', { name: '保存通道设置' }) ) diff --git a/src/renderer/src/ProjectRuntimeSelector.test.tsx b/src/renderer/src/ProjectRuntimeSelector.test.tsx index 30ef109b..50c17d65 100644 --- a/src/renderer/src/ProjectRuntimeSelector.test.tsx +++ b/src/renderer/src/ProjectRuntimeSelector.test.tsx @@ -1,51 +1,75 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' -import { afterEach, describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { defaultRuntimeSettings, type RuntimeSettings } from '../../shared/contracts' import { ProjectRuntimeSelector } from './ProjectRuntimeSelector' import i18n from './i18n' afterEach(cleanup) +beforeEach(async () => { await i18n.changeLanguage('zh-CN') }) -describe('ProjectRuntimeSelector saved model references', () => { - it.each(['zh-CN', 'en-US'])('describes fixed selections accurately in %s without restoring duplicate menus', async (language) => { - await i18n.changeLanguage(language) - const profileId = '00000000-0000-4000-8000-000000000011' - const settings = { - ...defaultRuntimeSettings, - defaultModelProfileId: profileId, - modelProfiles: [{ - id: profileId, name: 'Model A', modelName: 'model-a', - baseUrl: 'https://example.com/v1', protocol: 'openai-chat-completions', - authentication: 'api-key', apiKeyConfigured: true - }] - } as RuntimeSettings +const firstId = '00000000-0000-4000-8000-000000000011' +const secondId = '00000000-0000-4000-8000-000000000012' +const settings = { + ...defaultRuntimeSettings, + provider: 'opencode', + defaultModelProfileId: firstId, + opencodeModelSource: { kind: 'profile', profileId: firstId }, + continueModelSource: { kind: 'platform' }, + modelProfiles: [ + { id: firstId, name: 'Model A', modelName: 'model-a', baseUrl: 'https://example.com/v1', + protocol: 'openai-chat-completions', authentication: 'api-key', apiKeyConfigured: true }, + { id: secondId, name: 'Model B', modelName: 'model-b', baseUrl: 'https://example.com/v1', + protocol: 'anthropic-messages', authentication: 'none' } + ] +} as RuntimeSettings + +describe('ProjectRuntimeSelector', () => { + it('shows a concrete execution mode and follows that Runtime’s default model', () => { + render() + const provider = screen.getByLabelText('执行方式') as HTMLSelectElement + expect(provider).toHaveValue('opencode') + // No "follow global" execution mode: projects own it. + expect(Array.from(provider.options).map((option) => option.value)) + .toEqual(['model', 'opencode', 'continue', 'deepseek-harness']) + expect(screen.getByLabelText('模型')).toHaveValue('') + expect(screen.getByRole('option', { name: '跟随 OpenCode 默认（Model A）' })).toBeInTheDocument() + expect(screen.getByText('模型来自全局设置')).toBeInTheDocument() + }) + + it('switches mode and model and returns the model to the Runtime default', () => { const onChange = vi.fn() - for (const provider of ['opencode', 'continue', 'deepseek-harness'] as const) { - const runtime = provider === 'opencode' ? 'OpenCode' - : provider === 'continue' ? 'Continue' : 'DeepSeek Harness' - const props = { - ariaLabel: 'Project Runtime', label: 'Runtime', onChange, - runtimeSettings: settings - } - const view = render() - const select = screen.getByRole('combobox') - expect(select).toHaveValue(`${provider}:${profileId}`) - expect(screen.getByText(language === 'zh-CN' - ? `通过 ${runtime} 运行，固定使用 Model A。` - : `Run through ${runtime} with the fixed model Model A.`)).toBeInTheDocument() - expect(screen.getAllByRole('option').filter((option) => - (option as HTMLOptionElement).value.endsWith(`:${profileId}`))).toHaveLength(2) + const view = render() + fireEvent.change(screen.getByLabelText('执行方式'), { target: { value: 'continue' } }) + expect(onChange).toHaveBeenLastCalledWith({ provider: 'continue' }) + view.rerender() + expect(screen.getByRole('option', { name: '跟随 Continue 默认（自有配置）' })).toBeInTheDocument() + fireEvent.change(screen.getByLabelText('模型'), { target: { value: secondId } }) + expect(onChange).toHaveBeenLastCalledWith({ + provider: 'continue', model: { kind: 'profile', profileId: secondId } + }) + view.rerender() + fireEvent.change(screen.getByLabelText('模型'), { target: { value: '' } }) + expect(onChange).toHaveBeenLastCalledWith({ provider: 'continue' }) + }) - fireEvent.change(select, { target: { value: `${provider}:default` } }) - expect(onChange).toHaveBeenLastCalledWith({ provider }) - view.rerender() - expect(select).toHaveValue(`${provider}:default`) - expect(screen.queryByText(language === 'zh-CN' - ? `通过 ${runtime} 运行，固定使用 Model A。` - : `Run through ${runtime} with the fixed model Model A.`)).not.toBeInTheDocument() - expect(screen.getAllByRole('option').filter((option) => - (option as HTMLOptionElement).value.endsWith(`:${profileId}`))).toHaveLength(1) - view.unmount() - } + it('explains and offers to clear a deleted model', () => { + const onChange = vi.fn() + render() + expect(screen.getByText('所选模型连接已删除，已回退到 Model A')).toBeInTheDocument() + fireEvent.click(screen.getByRole('button', { name: '改为跟随默认模型' })) + expect(onChange).toHaveBeenLastCalledWith({ provider: 'opencode' }) + }) + + it('limits remote projects to OpenCode and Continue without own configuration', () => { + render() + const providers = Array.from((screen.getByLabelText('执行方式') as HTMLSelectElement).options) + .map((option) => option.value) + expect(providers).toEqual(['opencode', 'continue']) + expect(screen.queryByRole('option', { name: /自有配置/u })).not.toBeInTheDocument() }) }) diff --git a/src/renderer/src/ProjectRuntimeSelector.tsx b/src/renderer/src/ProjectRuntimeSelector.tsx index da67aac3..061e0f32 100644 --- a/src/renderer/src/ProjectRuntimeSelector.tsx +++ b/src/renderer/src/ProjectRuntimeSelector.tsx @@ -1,212 +1,217 @@ -import type { TFunction } from 'i18next' +import { useId } from 'react' import { useTranslation } from 'react-i18next' import type { RuntimeSettings } from '../../shared/contracts' import { - agentRuntimeSelectionKey, - getRuntimeSelectionForProvider, - isChannelModelProfileUsable, - repairChannelRuntimeSelection, - type AgentRuntimeSelection + allowedRuntimeProviders, + compactRuntimeSelectionLayer, + globalDefaultModel, + isResolvableStatus, + resolveRuntimeChoice, + runtimeModelChoiceStatus, + selectableModelProfiles, + supportsRuntimeConfig, + type AgentRuntimeProvider, + type RuntimeModelChoice, + type RuntimeSelectionLayer } from '../../shared/runtime-selection-contracts' +import { + ignoredChoiceMessage, + runtimeModelLabel, + runtimeProviderLabel, + sourceLabel +} from './runtime-selection' type ProjectRuntimeSelectorProps = { - ariaLabel: string disabled?: boolean label: string - onChange: (selection: AgentRuntimeSelection) => void + help?: string + onChange: (selection: RuntimeSelectionLayer | undefined) => void runtimeSettings: RuntimeSettings - selection?: AgentRuntimeSelection - selectionMode?: 'configured' | 'channel' + selection?: RuntimeSelectionLayer + /** Managed SSH projects accept only OpenCode and Continue with a GoodBuddy connection. */ + remote?: boolean + /** Prefix for accessible names when several projects are edited on one page. */ + ariaLabelPrefix?: string + /** Unattended channel projects cannot use image-generation connections. */ + textOnly?: boolean } -function runtimeSelectionDescription( - selection: AgentRuntimeSelection, - settings: RuntimeSettings, - t: TFunction<'integrations'> -): string { - if (selection.provider === 'model') { - const profile = settings.modelProfiles.find( - (candidate) => candidate.id === (selection.profileId ?? settings.defaultModelProfileId) - ) - if (!profile) { - return t('channels.project.missingSelection') - } - if (profile.protocol === 'openai-images-generations') { - return t('channels.project.imageOnlySelection') - } - if ( - profile.authentication === 'api-key' && - !profile.apiKeyConfigured - ) { - return t('channels.project.missingCredential') - } - return t('channels.project.directDescription', { - name: profile.name, - modelName: profile.modelName - }) - } - if (selection.provider === 'auto') { - return t('channels.project.automaticDescription') - } - const runtimeLabel = - selection.provider === 'opencode' - ? 'OpenCode' - : selection.provider === 'continue' - ? 'Continue' - : 'DeepSeek Harness' - if (selection.profileId) { - const profile = settings.modelProfiles.find( - (candidate) => candidate.id === selection.profileId - ) - return t('channels.project.fixedRuntimeDescription', { - runtime: runtimeLabel, - name: profile?.name ?? t('channels.project.missingProfile') - }) - } - return t('channels.project.runtimeDescription', { - runtime: runtimeLabel - }) +const INHERIT = '' +const RUNTIME_CONFIG = 'runtime-config' + +function modelValue(model: RuntimeModelChoice | undefined): string { + if (!model) return INHERIT + return model.kind === 'profile' ? model.profileId : RUNTIME_CONFIG } +/** + * Project layer editor: an execution mode and a model, each defaulting to + * "Follow global (current value)". Saving keeps inheritance instead of + * freezing today's global value. + */ export function ProjectRuntimeSelector({ - ariaLabel, disabled = false, label, + help, onChange, runtimeSettings, selection, - selectionMode = 'configured' + remote = false, + ariaLabelPrefix, + textOnly = false }: ProjectRuntimeSelectorProps): React.JSX.Element { - const { t } = useTranslation('integrations') - const initialSelection = - selection ?? { provider: 'auto' as const } - const runtimeSelection = - selectionMode === 'channel' - ? repairChannelRuntimeSelection(initialSelection, runtimeSettings) - : initialSelection - const directProfiles = runtimeSettings.modelProfiles.filter( - isChannelModelProfileUsable - ) - const selectedDirectProfileId = - runtimeSelection.provider === 'model' - ? runtimeSelection.profileId - : undefined - const selectedDirectProfile = runtimeSettings.modelProfiles.find( - (profile) => profile.id === selectedDirectProfileId - ) - const selectedDirectUnavailable = - selectedDirectProfileId !== undefined && - !directProfiles.some( - (profile) => profile.id === selectedDirectProfileId - ) - const runtimeProviders = [ - 'opencode', - 'continue', - 'deepseek-harness' - ] as const - const runtimeSelections = runtimeProviders.map((provider) => { - return selectionMode === 'channel' - ? ({ provider } as AgentRuntimeSelection) - : getRuntimeSelectionForProvider(provider, runtimeSettings) - }) - const directSelections = directProfiles.map((profile) => ({ - provider: 'model' as const, - profileId: profile.id - })) - const inheritedSelections: AgentRuntimeSelection[] = [ - ...(selectionMode === 'configured' ? [{ provider: 'auto' as const }] : []), - { provider: 'model' } - ] - const fixedRuntimeSelection = runtimeSelection.provider !== 'model' && - 'profileId' in runtimeSelection && runtimeSelection.profileId ? runtimeSelection : undefined - const selections = [...inheritedSelections, ...directSelections, ...runtimeSelections, - ...(fixedRuntimeSelection ? [fixedRuntimeSelection] : [])] - const selectionByKey = new Map( - selections.map((candidate) => [ - agentRuntimeSelectionKey(candidate), - candidate - ]) + const { t } = useTranslation('app') + const id = useId() + const options = { remote } + const layer = compactRuntimeSelectionLayer(selection) + const resolved = resolveRuntimeChoice(runtimeSettings, { project: layer }, options) + const provider = resolved.provider + const inheritedModel = globalDefaultModel(provider, runtimeSettings, options) + const profiles = selectableModelProfiles(provider, runtimeSettings).filter( + (profile) => !textOnly || profile.protocol !== 'openai-images-generations' ) + const storedModel = layer?.model + const storedModelStatus = storedModel + ? runtimeModelChoiceStatus(provider, storedModel, runtimeSettings, options) + : 'ok' + const warning = ignoredChoiceMessage(resolved, runtimeSettings, t) + const accessible = (name: string): string => + ariaLabelPrefix ? `${ariaLabelPrefix} ${name}` : name + + const update = (next: RuntimeSelectionLayer): void => { + onChange(compactRuntimeSelectionLayer(next)) + } + + const changeProvider = (value: string): void => { + const nextProvider = value as AgentRuntimeProvider + const effective = nextProvider + // A model chosen for another execution mode rarely applies; keep it only when valid. + const keepModel = + storedModel && + runtimeModelChoiceStatus(effective, storedModel, runtimeSettings, options) === 'ok' + update({ + provider: nextProvider, + ...(keepModel ? { model: storedModel } : {}) + }) + } + + const changeModel = (value: string): void => { + update({ + ...(layer?.provider ? { provider: layer.provider } : {}), + ...(value === INHERIT + ? {} + : value === RUNTIME_CONFIG + ? { model: { kind: 'runtime-config' as const } } + : { model: { kind: 'profile' as const, profileId: value } }) + }) + } + + const providerLabel = t('runtimeSelection.providerLabel') + const modelLabel = t('runtimeSelection.modelLabel') + const effectiveProvider = runtimeProviderLabel(resolved.provider, t) + const effectiveModel = runtimeModelLabel(resolved.provider, resolved.model, runtimeSettings, t) + const overridden = resolved.modelSource !== 'global' return ( - + + {storedModel && !isResolvableStatus(storedModelStatus) && ( + + )} + {supportsRuntimeConfig(provider, options) && ( + + )} + {profiles.map((profile) => { + const status = runtimeModelChoiceStatus( + provider, + { kind: 'profile', profileId: profile.id }, + runtimeSettings, + options + ) + return ( + + ) + })} + + +
+

+ + {t('runtimeSelection.effective', { + provider: effectiveProvider, + model: effectiveModel + })} + + + {t('runtimeSelection.effectiveModelSource', { + model: sourceLabel(resolved.modelSource, t) + })} + +

+ {warning && ( +

+ {warning} + {storedModel && !isResolvableStatus(storedModelStatus) && ( + + )} +

+ )} + {help && {help}} + ) } diff --git a/src/renderer/src/ProjectSwitcher.test.tsx b/src/renderer/src/ProjectSwitcher.test.tsx index 684ef4c2..b92ab5d4 100644 --- a/src/renderer/src/ProjectSwitcher.test.tsx +++ b/src/renderer/src/ProjectSwitcher.test.tsx @@ -13,7 +13,6 @@ import { defaultRuntimeSettings, type RuntimeSettings } from '../../shared/contracts' -import { agentRuntimeSelectionKey } from '../../shared/runtime-selection-contracts' import type { SshDirectoryBrowseResult, SshHost, @@ -66,7 +65,7 @@ const project: AssistantProject = { rootPath: 'C:\\Workspace' }, defaultWorkMode: 'ask', - runtimeSelection: { provider: 'model', profileId }, + runtimeSelection: { provider: 'model', model: { kind: 'profile', profileId } }, kind: 'user', status: 'active', createdAt: '2026-08-04T00:00:00.000Z', @@ -413,21 +412,10 @@ describe('ProjectSwitcher runtime fields', () => { fireEvent.change(within(dialog).getByLabelText('名称'), { target: { value: 'Harness project' } }) - const runtime = within(dialog).getByLabelText( - '新对话默认 Runtime' - ) - expect( - within(runtime).getByRole('option', { - name: 'DeepSeek Harness（预览 · OpenAI 兼容）' - }) - ).toBeInTheDocument() - fireEvent.change(runtime, { - target: { - value: agentRuntimeSelectionKey({ - provider: 'deepseek-harness' - }) - } - }) + const runtime = within(dialog).getByLabelText('执行方式') + // New projects start from a concrete execution mode. + expect(runtime).not.toHaveValue('') + fireEvent.change(runtime, { target: { value: 'deepseek-harness' } }) fireEvent.click( within(dialog).getByRole('button', { name: '创建' }) ) @@ -450,16 +438,9 @@ describe('ProjectSwitcher runtime fields', () => { name: '管理项目 Local project' })) const dialog = screen.getByRole('dialog', { name: '项目设置' }) - fireEvent.change( - within(dialog).getByLabelText('新对话默认 Runtime'), - { - target: { - value: agentRuntimeSelectionKey({ - provider: 'deepseek-harness' - }) - } - } - ) + fireEvent.change(within(dialog).getByLabelText('执行方式'), { + target: { value: 'deepseek-harness' } + }) const modeGroup = within(dialog) .getAllByRole('group', { name: '默认模式' }) .find((candidate) => @@ -494,11 +475,8 @@ describe('ProjectSwitcher runtime fields', () => { fireEvent.click(screen.getByLabelText('New project')) const dialog = screen.getByRole('dialog', { name: 'New project' }) - expect( - within(dialog).getByLabelText( - 'Default Runtime for new conversations' - ) - ).toBeInTheDocument() + expect(within(dialog).getByRole('group', { name: 'Default Runtime for new conversations' })).toBeInTheDocument() + expect(within(dialog).getByLabelText('Execution mode')).not.toHaveValue('') expect( within(dialog) .getAllByRole('group', { name: 'Default mode' }) @@ -506,11 +484,7 @@ describe('ProjectSwitcher runtime fields', () => { candidate.classList.contains('segmented-control') ) ).toBeInTheDocument() - expect( - within(dialog).getByRole('option', { - name: 'DeepSeek Harness (Preview · OpenAI-compatible)' - }) - ).toBeInTheDocument() + expect(within(dialog).getByRole('option', { name: 'DeepSeek Harness' })).toBeInTheDocument() }) }) @@ -1291,7 +1265,7 @@ describe('ProjectSwitcher managed SSH projects', () => { fireEvent.change(within(dialog).getByLabelText('远端工作目录'), { target: { value: '/srv/project' } }) - fireEvent.change(within(dialog).getByRole('combobox', { name: '新对话默认 Runtime' }), { + fireEvent.change(within(dialog).getByRole('combobox', { name: '执行方式' }), { target: { value: provider } }) const modeGroup = within(dialog) diff --git a/src/renderer/src/ProjectSwitcher.tsx b/src/renderer/src/ProjectSwitcher.tsx index cdb5197c..04d09234 100644 --- a/src/renderer/src/ProjectSwitcher.tsx +++ b/src/renderer/src/ProjectSwitcher.tsx @@ -43,8 +43,9 @@ import type { } from '../../shared/remote-project-recovery-contracts' import { activateModalFocus, trapTabFocus } from './dialog-focus' import { - getDefaultRuntimeSelection -} from './runtime-selection' + resolveRuntimeChoice, + type RuntimeSelectionLayer +} from '../../shared/runtime-selection-contracts' import { channelProjectDraft, ChannelProjectSettingsFields @@ -889,6 +890,18 @@ export function ProjectSwitcher({ setSettingsProjectId(undefined) } + // The project form always shows a concrete execution mode, so save exactly that mode. + const withProjectProvider = ( + layer: RuntimeSelectionLayer | undefined, + remote: boolean + ): RuntimeSelectionLayer | undefined => + runtimeSettings + ? { + ...layer, + provider: resolveRuntimeChoice(runtimeSettings, { project: layer }, { remote }).provider + } + : layer + const openProjectSettings = (project: AssistantProject): void => { if ( !remoteProjectsEnabled && @@ -917,11 +930,8 @@ export function ProjectSwitcher({ defaultWorkMode: normalizeInteractiveWorkMode( project.defaultWorkMode ), - runtimeSelection: - project.runtimeSelection ?? - (runtimeSettings - ? getDefaultRuntimeSelection(runtimeSettings) - : undefined) + // Keep "follow global" as absent so saving never freezes today's default. + runtimeSelection: project.runtimeSelection } setDraft( project.kind === 'channel' && runtimeSettings @@ -965,10 +975,7 @@ export function ProjectSwitcher({ const commonDraft = { name: draft.name, description: draft.description, - runtimeSelection: - draft.runtimeSelection?.provider === 'opencode' || draft.runtimeSelection?.provider === 'continue' - ? draft.runtimeSelection - : ({ provider: 'opencode' } as const), + runtimeSelection: withProjectProvider(draft.runtimeSelection, true), hostId: remoteHostId, remoteRootPath } @@ -1010,13 +1017,10 @@ export function ProjectSwitcher({ setSaving(true) setError(undefined) try { - const input = - draft.runtimeSelection || !runtimeSettings - ? draft - : { - ...draft, - runtimeSelection: getDefaultRuntimeSelection(runtimeSettings) - } + const input = { + ...draft, + runtimeSelection: withProjectProvider(draft.runtimeSelection, false) + } if (dialogMode === 'settings' && settingsProject) { await onUpdate(settingsProject.id, input) } else { @@ -1394,10 +1398,7 @@ export function ProjectSwitcher({ name: '', description: '', rootPath: '', - defaultWorkMode: 'ask', - runtimeSelection: runtimeSettings - ? getDefaultRuntimeSelection(runtimeSettings) - : undefined + defaultWorkMode: 'ask' }) restoreFocusTarget.current = 'create' setDialogMode('create') @@ -1597,10 +1598,10 @@ export function ProjectSwitcher({ {runtimeSettings && ( <> - - {t( - 'projectSwitcher.dialog.defaultRuntimeHelp' - )} - )} @@ -1748,27 +1744,24 @@ export function ProjectSwitcher({ {t('projectSwitcher.remote.rootHelp')} - + onChange={(runtimeSelection) => + setDraft((current) => ({ + ...current, + runtimeSelection + })) + } + remote + runtimeSettings={runtimeSettings} + selection={draft.runtimeSelection} + /> + )} void + onManage: () => void + onClose: () => void +} + +const VIEWPORT_MARGIN = 8 + +/** The nearest ancestor that clips overflow, whose edges the menu must stay within. */ +function clippingBounds(element: HTMLElement): { left: number; right: number } { + let bounds = { left: VIEWPORT_MARGIN, right: window.innerWidth - VIEWPORT_MARGIN } + for (let node = element.parentElement; node; node = node.parentElement) { + const style = getComputedStyle(node) + if (/(hidden|clip|auto|scroll)/u.test(style.overflowX + style.overflow)) { + const rect = node.getBoundingClientRect() + bounds = { + left: Math.max(bounds.left, rect.left + VIEWPORT_MARGIN), + right: Math.min(bounds.right, rect.right - VIEWPORT_MARGIN) + } + } + } + return bounds +} + +function sameModel( + left: RuntimeModelChoice | undefined, + right: RuntimeModelChoice | undefined +): boolean { + if (!left || !right) return left === right + if (left.kind !== right.kind) return false + return left.kind === 'runtime-config' || left.profileId === (right as { profileId: string }).profileId +} + +/** + * Two-column composer menu: execution modes on the left, models for the + * highlighted mode on the right. Choices write the conversation layer only. + */ +export const RuntimeModelPicker = forwardRef( + function RuntimeModelPicker( + { + runtimeSettings, + projectLayer, + conversationLayer: rawConversationLayer, + remote, + onSelect, + onManage, + onClose + }, + ref + ) { + const { t } = useTranslation('app') + const menuRef = useRef(null) + const setMenuRef = useCallback( + (node: HTMLDivElement | null) => { + menuRef.current = node + if (typeof ref === 'function') ref(node) + else if (ref) ref.current = node + }, + [ref] + ) + // Keep the wide two-column menu inside the chat pane instead of under the sidebar. + useLayoutEffect(() => { + const menu = menuRef.current + if (!menu) return + const place = (): void => { + menu.style.transform = '' + menu.style.maxWidth = '' + const bounds = clippingBounds(menu) + const available = Math.max(0, bounds.right - bounds.left) + if (menu.offsetWidth > available) menu.style.maxWidth = `${available}px` + const rect = menu.getBoundingClientRect() + const shift = + rect.left < bounds.left + ? bounds.left - rect.left + : rect.right > bounds.right + ? bounds.right - rect.right + : 0 + if (shift) menu.style.transform = `translateX(${Math.round(shift)}px)` + } + place() + window.addEventListener('resize', place) + return () => window.removeEventListener('resize', place) + }, []) + const options = { remote } + // Cached conversations may still hold pre-layer shapes. + const parsedLayer = runtimeSelectionLayerSchema.safeParse(rawConversationLayer) + const conversationLayer = rawConversationLayer === undefined || !parsedLayer.success + ? undefined + : compactRuntimeSelectionLayer(parsedLayer.data) + const current = resolveRuntimeChoice( + runtimeSettings, + { project: projectLayer, conversation: conversationLayer }, + options + ) + const [focusedProvider, setFocusedProvider] = useState( + current.provider + ) + // What this conversation gets for the focused mode if it does not pick a model itself. + const inheritedForFocused = resolveRuntimeChoice( + runtimeSettings, + { project: projectLayer, conversation: { provider: focusedProvider } }, + options + ) + // A conversation model counts as chosen only while it is the one in effect. + const conversationModel = + focusedProvider === current.provider && current.modelSource === 'conversation' + ? current.model + : undefined + const hasOverride = Boolean(conversationLayer?.provider || conversationLayer?.model) + const warning = ignoredChoiceMessage(current, runtimeSettings, t) + + const providerIsInherited = (provider: AgentRuntimeProvider): boolean => + resolveRuntimeChoice(runtimeSettings, { project: projectLayer }, options).provider === provider + + const selectProvider = (provider: AgentRuntimeProvider): void => { + // Switching modes drops the conversation's model so the new mode's default applies. + onSelect( + providerIsInherited(provider) ? undefined : { provider } + ) + } + + const selectModel = (model: RuntimeModelChoice | undefined): void => { + const provider = providerIsInherited(focusedProvider) ? undefined : focusedProvider + onSelect({ ...(provider ? { provider } : {}), ...(model ? { model } : {}) }) + } + + const moveFocus = (event: React.KeyboardEvent): void => { + const container = event.currentTarget + const active = document.activeElement as HTMLElement | null + const column = active?.closest('[data-runtime-column]') + if (event.key === 'Escape') { + event.preventDefault() + onClose() + return + } + const columns = Array.from( + container.querySelectorAll('[data-runtime-column]') + ) + const itemsOf = (element: HTMLElement | null | undefined): HTMLButtonElement[] => + element + ? Array.from( + element.querySelectorAll( + '[role="menuitemradio"], [role="menuitem"]' + ) + ).filter((item) => !item.disabled) + : [] + let target: HTMLButtonElement | undefined + if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') { + const index = column ? columns.indexOf(column) : 0 + const next = columns[index + (event.key === 'ArrowRight' ? 1 : -1)] + const items = itemsOf(next) + target = + items.find((item) => item.getAttribute('aria-checked') === 'true') ?? + items[0] + } else if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) { + const items = itemsOf(column ?? container) + const index = items.indexOf(active as HTMLButtonElement) + target = + event.key === 'Home' + ? items[0] + : event.key === 'End' + ? items.at(-1) + : items.at( + (index + (event.key === 'ArrowDown' ? 1 : -1) + items.length) % + items.length + ) + } + if (target) { + event.preventDefault() + container + .querySelectorAll('[role="menuitemradio"], [role="menuitem"]') + .forEach((item) => { + item.tabIndex = item === target ? 0 : -1 + }) + target.focus() + const provider = target.dataset.provider as AgentRuntimeProvider | undefined + if (provider) setFocusedProvider(provider) + } + } + + const profiles = selectableModelProfiles(focusedProvider, runtimeSettings) + // Reserve room for the longest model list so previewing another mode never + // resizes the menu; a bottom-anchored menu would otherwise jump under the pointer. + const modelRows = Math.max( + ...allowedRuntimeProviders(options).map( + (provider) => + 1 + + selectableModelProfiles(provider, runtimeSettings).length + + (supportsRuntimeConfig(provider, options) ? 1 : 0) + ) + ) + const defaultModel = inheritedForFocused.model ?? + globalDefaultModel(focusedProvider, runtimeSettings, options) + const defaultSource = inheritedForFocused.modelSource + const modelItem = ( + key: string, + model: RuntimeModelChoice | undefined, + label: string, + detail: string | undefined, + badge?: string, + disabled = false + ): React.JSX.Element => { + const checked = + focusedProvider === current.provider && + (model === undefined ? !conversationModel : sameModel(conversationModel, model)) + return ( + + ) + } + + return ( +
+
+ {t('runtimeSelection.providerListLabel')} + {allowedRuntimeProviders(options).map((provider) => ( + + ))} +
+
+ {t('runtimeSelection.modelListLabel')} + {modelItem( + 'default', + undefined, + t('runtimeSelection.defaultModel', { + value: runtimeModelLabel(focusedProvider, defaultModel, runtimeSettings, t) + }), + runtimeModelDetail(focusedProvider, defaultModel, runtimeSettings, t), + sourceLabel(defaultSource, t) + )} + {profiles.map((profile) => { + const model = { kind: 'profile' as const, profileId: profile.id } + const status = runtimeModelChoiceStatus(focusedProvider, model, runtimeSettings, options) + return modelItem( + profile.id, + model, + profile.name ?? profile.id, + status === 'unavailable' + ? `${profile.modelName ?? ''}${t('runtimeSelection.unavailableSuffix')}` + : profile.modelName, + undefined, + !isResolvableStatus(status) + ) + })} + {supportsRuntimeConfig(focusedProvider, options) && + modelItem( + 'runtime-config', + { kind: 'runtime-config' }, + t('runtimeSelection.runtimeConfig', { + runtime: runtimeProviderLabel(focusedProvider, t) + }), + focusedProvider === 'deepseek-harness' + ? runtimeModelLabel(focusedProvider, { kind: 'runtime-config' }, runtimeSettings, t) + : undefined + )} +
+
+ {warning && ( +

+ {warning} +

+ )} +
+ + {hasOverride + ? t('runtimeSelection.conversationOverride') + : t('runtimeSelection.conversationOnly')} + + {hasOverride && ( + + )} +
+ +
+
+ ) + } +) diff --git a/src/renderer/src/SettingsPanel.test.tsx b/src/renderer/src/SettingsPanel.test.tsx index 7bf0d086..21446c96 100644 --- a/src/renderer/src/SettingsPanel.test.tsx +++ b/src/renderer/src/SettingsPanel.test.tsx @@ -57,6 +57,12 @@ import type { BrandingPreferences } from './branding' const modelProfileId = '00000000-0000-4000-8000-000000000001' const nativeImage = globalThis.Image +function harnessModelSourceRadios(): HTMLElement[] { + return screen + .queryAllByRole('radio') + .filter((radio) => radio.getAttribute('name') !== 'runtime-default-provider') +} + function openCapabilitySettingsTab( tab: 'Skills' | 'MCP' | '工具执行环境' ): void { @@ -3064,7 +3070,8 @@ describe('SettingsPanel runtime files', () => { const source = screen.getByLabelText( 'DeepSeek Harness OpenAI 兼容模型连接' ) - expect(screen.queryByRole('radio')).not.toBeInTheDocument() + // Only the global execution-mode choice uses radios; Harness has no model-source radios. + expect(harnessModelSourceRadios()).toHaveLength(0) expect( screen.queryByText('使用管理员预置模型连接') ).not.toBeInTheDocument() @@ -3147,7 +3154,7 @@ describe('SettingsPanel runtime files', () => { name: 'DeepSeek Harness（预览）' }) ) - expect(screen.queryByRole('radio')).not.toBeInTheDocument() + expect(harnessModelSourceRadios()).toHaveLength(0) if (sourceKind === 'environment') { expect(screen.getByText('此选项实际使用管理员预置：actual-administrator-model。')).toBeInTheDocument() expect(screen.queryByText(/已保存配置中的实际回退/)).not.toBeInTheDocument() @@ -4930,7 +4937,8 @@ describe('SettingsPanel runtime files', () => { ) await waitFor(() => expect(testRuntime).toHaveBeenLastCalledWith({ - provider: 'continue' + provider: 'continue', + runtimeConfig: true }) ) expect(testModelConnection).not.toHaveBeenCalled() diff --git a/src/renderer/src/SettingsPanel.tsx b/src/renderer/src/SettingsPanel.tsx index a47f6d65..ee1e930d 100644 --- a/src/renderer/src/SettingsPanel.tsx +++ b/src/renderer/src/SettingsPanel.tsx @@ -1645,7 +1645,9 @@ export function SettingsPanel({ provider: agentRuntimeType, profileId: runtimeSource.profileId } - : { provider: agentRuntimeType } + : runtimeSource.kind === 'platform' + ? { provider: agentRuntimeType, runtimeConfig: true as const } + : { provider: agentRuntimeType } const status = testingModel ? await window.goodbuddy.settings.testModelConnection(profileId) : await window.goodbuddy.settings.testRuntime(runtimeSelection) @@ -3563,10 +3565,10 @@ export function SettingsPanel({ 'openai-images-generations' ? t('model.profile.imageGeneration') : t('model.profile.textChat'), - continueCompatibility: isContinueCompatible(profile) + continueCompatibility: isAgentRuntimeModelProtocol(profile.protocol) ? t('model.profile.compatible') : t('model.profile.incompatible'), - openCodeCompatibility: isOpenCodeCompatible(profile) + openCodeCompatibility: isAgentRuntimeModelProtocol(profile.protocol) ? t('model.profile.compatible') : t('model.profile.incompatibleImageProtocol'), deepseekHarnessCompatibility: diff --git a/src/renderer/src/i18n/locales/en-US/app.ts b/src/renderer/src/i18n/locales/en-US/app.ts index 76d32fc7..55e092ec 100644 --- a/src/renderer/src/i18n/locales/en-US/app.ts +++ b/src/renderer/src/i18n/locales/en-US/app.ts @@ -259,6 +259,47 @@ export const app = { unavailable: 'Unavailable' } }, + runtimeSelection: { + providers: { + model: 'Direct model', + opencode: 'OpenCode', + continue: 'Continue', + 'deepseek-harness': 'DeepSeek Harness' + }, + providerLabel: 'Execution mode', + followRuntimeDefault: 'Follow {{runtime}} default ({{value}})', + effectiveModelSource: 'Model from {{model}} settings', + modelLabel: 'Model', + runtimeConfig: 'Use {{runtime}}’s own configuration', + runtimeConfigShort: 'Own configuration', + followGlobal: 'Follow global ({{value}})', + followProject: 'Follow project ({{value}})', + defaultModel: 'Default ({{value}})', + noModel: 'No model available', + sources: { + global: 'Global', + project: 'Project', + conversation: 'This conversation' + }, + effective: 'In effect: {{provider}} · {{model}}', + effectiveSources: 'Execution mode from {{provider}} settings · model from {{model}} settings', + ignored: { + missing: 'The selected model connection was deleted. Using {{fallback}} instead.', + incompatible: 'The selected model does not work with this execution mode. Using {{fallback}} instead.', + unavailable: 'The selected model has no API key. Using {{fallback}} instead.', + provider: 'Remote projects support only OpenCode and Continue. Using {{fallback}} instead.' + }, + followGlobalAction: 'Use the default model', + missingProfile: 'Deleted model', + unavailableSuffix: ' (no API key)', + conversationOnly: 'Applies to this conversation only', + resetToProject: 'Reset to project default', + manage: 'Manage model connections…', + menuLabel: 'Execution mode and model', + providerListLabel: 'Execution mode', + modelListLabel: 'Model', + conversationOverride: 'Chosen for this conversation' + }, chat: { heading: 'Conversation', user: 'You', diff --git a/src/renderer/src/i18n/locales/zh-CN/app.ts b/src/renderer/src/i18n/locales/zh-CN/app.ts index 3227266c..8bcebb00 100644 --- a/src/renderer/src/i18n/locales/zh-CN/app.ts +++ b/src/renderer/src/i18n/locales/zh-CN/app.ts @@ -246,6 +246,47 @@ export const app = { unavailable: '不可用' } }, + runtimeSelection: { + providers: { + model: '直连模型', + opencode: 'OpenCode', + continue: 'Continue', + 'deepseek-harness': 'DeepSeek Harness' + }, + providerLabel: '执行方式', + followRuntimeDefault: '跟随 {{runtime}} 默认（{{value}}）', + effectiveModelSource: '模型来自{{model}}设置', + modelLabel: '模型', + runtimeConfig: '使用 {{runtime}} 自有配置', + runtimeConfigShort: '自有配置', + followGlobal: '跟随全局（{{value}}）', + followProject: '跟随项目（{{value}}）', + defaultModel: '默认（{{value}}）', + noModel: '无可用模型', + sources: { + global: '全局', + project: '项目', + conversation: '本会话' + }, + effective: '实际生效：{{provider}} · {{model}}', + effectiveSources: '执行方式来自{{provider}}设置 · 模型来自{{model}}设置', + ignored: { + missing: '所选模型连接已删除，已回退到 {{fallback}}', + incompatible: '所选模型与当前执行方式不兼容，已回退到 {{fallback}}', + unavailable: '所选模型缺少 API Key，已回退到 {{fallback}}', + provider: '远程项目仅支持 OpenCode 和 Continue，已回退到 {{fallback}}' + }, + followGlobalAction: '改为跟随默认模型', + missingProfile: '已删除的模型', + unavailableSuffix: '（缺少 API Key）', + conversationOnly: '仅对本会话生效', + resetToProject: '恢复为项目默认', + manage: '管理模型连接…', + menuLabel: '执行方式和模型', + providerListLabel: '执行方式', + modelListLabel: '模型', + conversationOverride: '本会话单独选择' + }, chat: { heading: '对话内容', user: '用户', diff --git a/src/renderer/src/runtime-selection.test.ts b/src/renderer/src/runtime-selection.test.ts index aec1acd7..c2f05c24 100644 --- a/src/renderer/src/runtime-selection.test.ts +++ b/src/renderer/src/runtime-selection.test.ts @@ -1,93 +1,55 @@ import { describe, expect, it } from 'vitest' import type { RuntimeSettings } from '../../shared/contracts' -import { - getDefaultRuntimeSelection, - getRuntimeSelectionProfileId, - repairChannelRuntimeSelection, - getRuntimeSelectionForProvider -} from '../../shared/runtime-selection-contracts' +import { resolveRuntimeChoice } from '../../shared/runtime-selection-contracts' +import i18n from './i18n' +import { ignoredChoiceMessage, runtimeModelLabel } from './runtime-selection' -const harnessProfileId = '00000000-0000-4000-8000-000000000071' +const imageId = '00000000-0000-4000-8000-000000000072' +const anthropicId = '00000000-0000-4000-8000-000000000073' +const openAiId = '00000000-0000-4000-8000-000000000074' -function harnessSettings( - source: { kind: 'platform' } | { kind: 'profile'; profileId: string } -): RuntimeSettings { - return { - provider: 'deepseek-harness', - deepseekHarnessModelSource: source - } as RuntimeSettings -} - -describe('DeepSeek Harness runtime selection', () => { - it.each(['opencode', 'continue', 'deepseek-harness'] as const)( - 'preserves an explicit %s channel profile even when it equals the old default', (provider) => { - const selection = { provider, profileId: harnessProfileId } - const settings = { - defaultModelProfileId: '00000000-0000-4000-8000-000000000072', - modelProfiles: [{ - id: harnessProfileId, - baseUrl: 'https://gateway.example/v1', - protocol: 'openai-chat-completions', - authentication: 'api-key' as const, - apiKeyConfigured: true - }], - opencodeModelSource: { kind: 'default' as const }, - continueModelSource: { kind: 'platform' as const } - } - expect(repairChannelRuntimeSelection(selection, settings)).toEqual(selection) - expect(repairChannelRuntimeSelection({ provider }, settings)).toEqual({ provider }) +const settings = { + provider: 'model', + defaultModelProfileId: imageId, + opencodeBaseUrl: '', + opencodeModelSource: { kind: 'default' }, + continueModelSource: { kind: 'default' }, + deepseekHarnessModelSource: { kind: 'platform' }, + deepseekHarnessPlatformModel: { source: 'environment', name: '管理员预置模型', modelName: 'deepseek-chat' }, + modelProfiles: [ + { id: imageId, name: 'Image', modelName: 'image', protocol: 'openai-images-generations', authentication: 'none' }, + { id: anthropicId, name: 'Claude', modelName: 'claude', protocol: 'anthropic-messages', authentication: 'none' }, + { + id: openAiId, name: 'Gateway', modelName: 'gateway', baseUrl: 'https://gateway.example/v1', + protocol: 'openai-chat-completions', authentication: 'api-key', apiKeyConfigured: true } - ) + ] +} as unknown as RuntimeSettings - it('references the Runtime configuration without copying its profile', () => { - const selection = getRuntimeSelectionForProvider( - 'deepseek-harness', - harnessSettings({ - kind: 'profile', - profileId: harnessProfileId - }) - ) - - expect(selection).toEqual({ - provider: 'deepseek-harness' - } satisfies Record) +describe('renderer runtime labels', () => { + it('resolves "follow recommended" to the first compatible connection per mode', () => { + expect(resolveRuntimeChoice(settings, { project: { provider: 'opencode' } }).selection) + .toEqual({ provider: 'opencode', profileId: anthropicId }) + expect(resolveRuntimeChoice(settings, { project: { provider: 'continue' } }).selection) + .toEqual({ provider: 'continue', profileId: anthropicId }) + // An image-only global default is skipped for the direct model too. + expect(resolveRuntimeChoice(settings).selection) + .toEqual({ provider: 'model', profileId: anthropicId }) }) - it('uses platform settings without a profile id', () => { - const settings = harnessSettings({ kind: 'platform' }) + it('names the model DeepSeek Harness actually uses for its own configuration', async () => { + await i18n.changeLanguage('zh-CN') + const t = i18n.getFixedT('zh-CN', 'app') + expect(runtimeModelLabel('deepseek-harness', { kind: 'runtime-config' }, settings, t)) + .toBe('自有配置 · deepseek-chat') + }) - expect(getDefaultRuntimeSelection(settings)).toEqual({ - provider: 'deepseek-harness' + it('explains why a saved choice was not used', async () => { + const t = i18n.getFixedT('en-US', 'app') + const resolved = resolveRuntimeChoice(settings, { + conversation: { model: { kind: 'profile', profileId: '00000000-0000-4000-8000-000000000099' } } }) - }) - - it('resolves default references to the first Runtime-compatible profile', () => { - const imageId = '00000000-0000-4000-8000-000000000072' - const anthropicId = '00000000-0000-4000-8000-000000000073' - const openAiId = '00000000-0000-4000-8000-000000000074' - const settings = { - provider: 'model' as const, - defaultModelProfileId: imageId, - opencodeBaseUrl: '', - opencodeEmbedded: true, - opencodeModelSource: { kind: 'default' as const }, - continueModelSource: { kind: 'default' as const }, - deepseekHarnessModelSource: { kind: 'default' as const }, - modelProfiles: [ - { id: imageId, protocol: 'openai-images-generations' }, - { id: anthropicId, protocol: 'anthropic-messages' }, - { - id: openAiId, - baseUrl: 'https://gateway.example/v1', - protocol: 'openai-chat-completions', - authentication: 'api-key' as const, - apiKeyConfigured: true - } - ] - } - - expect(getRuntimeSelectionProfileId({ provider: 'opencode' }, settings)).toBe(anthropicId) - expect(getRuntimeSelectionProfileId({ provider: 'continue' }, settings)).toBe(anthropicId) - expect(getRuntimeSelectionProfileId({ provider: 'deepseek-harness' }, settings)).toBe(openAiId) + expect(ignoredChoiceMessage(resolved, settings, t)) + .toBe('The selected model connection was deleted. Using Claude instead.') }) }) diff --git a/src/renderer/src/runtime-selection.ts b/src/renderer/src/runtime-selection.ts index 73f84a3f..a5fd9049 100644 --- a/src/renderer/src/runtime-selection.ts +++ b/src/renderer/src/runtime-selection.ts @@ -1,4 +1,82 @@ -export { - getDefaultRuntimeSelection, - getRuntimeSelectionForProvider +import type { TFunction } from 'i18next' +import type { RuntimeSettings } from '../../shared/contracts' +import type { + AgentRuntimeProvider, + ResolvedRuntimeChoice, + RuntimeModelChoice, + RuntimeSelectionLayerName } from '../../shared/runtime-selection-contracts' + +export type AppTranslate = TFunction<'app'> + +export function runtimeProviderLabel( + provider: AgentRuntimeProvider, + t: AppTranslate +): string { + return t(`runtimeSelection.providers.${provider}`) +} + +function harnessPlatformModelName(settings: RuntimeSettings): string | undefined { + const platform = settings.deepseekHarnessPlatformModel + return platform && platform.source !== 'unavailable' + ? platform.modelName + : undefined +} + +/** A short model label: connection name, or "own configuration" with the resolved model when known. */ +export function runtimeModelLabel( + provider: AgentRuntimeProvider, + model: RuntimeModelChoice | undefined, + settings: RuntimeSettings, + t: AppTranslate +): string { + if (!model) return t('runtimeSelection.noModel') + if (model.kind === 'runtime-config') { + const detail = + provider === 'deepseek-harness' ? harnessPlatformModelName(settings) : undefined + const label = t('runtimeSelection.runtimeConfigShort') + return detail ? `${label} · ${detail}` : label + } + const profile = settings.modelProfiles.find( + (candidate) => candidate.id === model.profileId + ) + return profile?.name ?? t('runtimeSelection.missingProfile') +} + +export function runtimeModelDetail( + provider: AgentRuntimeProvider, + model: RuntimeModelChoice | undefined, + settings: RuntimeSettings, + t: AppTranslate +): string | undefined { + if (model?.kind === 'runtime-config') { + return t('runtimeSelection.runtimeConfig', { + runtime: runtimeProviderLabel(provider, t) + }) + } + if (model?.kind !== 'profile') return undefined + return settings.modelProfiles.find((profile) => profile.id === model.profileId) + ?.modelName +} + +export function sourceLabel( + source: RuntimeSelectionLayerName, + t: AppTranslate +): string { + return t(`runtimeSelection.sources.${source}`) +} + +export function ignoredChoiceMessage( + resolved: ResolvedRuntimeChoice, + settings: RuntimeSettings, + t: AppTranslate +): string | undefined { + if (!resolved.ignored) return undefined + const fallback = + resolved.ignored.kind === 'provider' + ? runtimeProviderLabel(resolved.provider, t) + : runtimeModelLabel(resolved.provider, resolved.model, settings, t) + return resolved.ignored.kind === 'provider' + ? t('runtimeSelection.ignored.provider', { fallback }) + : t(`runtimeSelection.ignored.${resolved.ignored.reason}`, { fallback }) +} diff --git a/src/renderer/src/styles.css b/src/renderer/src/styles.css index eeb4fed5..7c9b195f 100644 --- a/src/renderer/src/styles.css +++ b/src/renderer/src/styles.css @@ -7911,6 +7911,190 @@ button > svg { background: var(--border-subtle); } +.runtime-picker__menu--columns { + display: grid; + width: min(480px, calc(100vw - 32px)); + grid-template-columns: minmax(140px, 0.8fr) minmax(0, 1.2fr); + /* Columns size themselves; the footer sits below instead of overlapping them. */ + max-height: none; + grid-template-rows: auto auto; + overflow: hidden; +} + +.runtime-picker__menu--columns[style*="max-width"] { + grid-template-columns: minmax(110px, 0.7fr) minmax(0, 1.3fr); +} + +.runtime-picker__column { + display: flex; + min-width: 0; + max-height: min(340px, 45vh); + flex-direction: column; + overflow-y: auto; + overscroll-behavior: contain; + gap: var(--space-1); +} + +/* Fixed row height so the reserved space matches every mode's list exactly. */ +.runtime-picker__column--models > button { + height: 52px; + min-height: 52px; + flex: 0 0 52px; +} + +.runtime-picker__column--models { + /* Header (~30px) + rows × (52px + 4px gap); capped and scrollable when long. */ + height: min( + calc(30px + var(--runtime-model-rows, 1) * 56px), + min(340px, 45vh) + ); +} + +/* Rows have a fixed height, so long names truncate instead of wrapping into the detail line. */ +.runtime-picker__column--models > button > span { + overflow: hidden; + white-space: nowrap; +} + +.runtime-picker__column--models > button > span > .runtime-picker__label { + overflow: hidden; + min-width: 0; + text-overflow: ellipsis; +} + +.runtime-picker__column--models > button > span > .runtime-picker__source { + flex: none; +} + +.runtime-picker__column + .runtime-picker__column { + padding-left: var(--space-2); + border-left: 1px solid var(--border-subtle); +} + +.runtime-picker__column > strong { + padding: var(--space-2) var(--space-2) var(--space-1); + color: var(--text-muted); + font-size: var(--font-caption); +} + +.runtime-picker__column > button, +.runtime-picker__footer button { + display: grid; + width: 100%; + height: auto; + min-height: 38px; + align-items: center; + padding: var(--space-2); + border-radius: var(--radius-control); + background: transparent; + color: var(--text-primary); + cursor: pointer; + gap: 2px var(--space-2); + grid-template-columns: minmax(0, 1fr) auto; + text-align: left; +} + +.runtime-picker__column > button:hover, +.runtime-picker__column > button.runtime-picker__focused, +.runtime-picker__footer button:hover { + background: var(--surface-muted); +} + +.runtime-picker__column > button[aria-checked="true"] { + background: var(--accent-subtle); + color: var(--accent); +} + +.runtime-picker__column > button[aria-checked="true"]::after { + content: "✓"; + font-weight: 700; + grid-column: 2; + grid-row: 1 / span 2; +} + +.runtime-picker__column > button:disabled { + color: var(--text-muted); + cursor: not-allowed; + opacity: 0.58; +} + +.runtime-picker__column > button > span { + display: flex; + min-width: 0; + align-items: center; + font-size: var(--font-body); + font-weight: 600; + gap: var(--space-1); +} + +.runtime-picker__column > button > small { + grid-column: 1; + grid-row: 2; + overflow: hidden; + color: var(--text-muted); + font-size: var(--font-caption); + text-overflow: ellipsis; + white-space: nowrap; +} + +.runtime-picker__source { + padding: 0 6px; + border-radius: 999px; + background: var(--surface-muted); + color: var(--text-muted); + font-size: var(--font-caption); + font-weight: 500; +} + +.runtime-picker__footer { + display: flex; + flex-direction: column; + padding-top: var(--space-2); + border-top: 1px solid var(--border-subtle); + margin-top: var(--space-1); + gap: var(--space-1); + grid-column: 1 / -1; +} + +.runtime-picker__footer-row { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 var(--space-2); + gap: var(--space-2); +} + +.runtime-picker__footer-row small { + color: var(--text-muted); + font-size: var(--font-caption); +} + +.runtime-picker__footer-row button { + width: auto; + min-height: 30px; + color: var(--accent); +} + +.runtime-picker__warning { + margin: 0; + padding: var(--space-2); + border-radius: var(--radius-control); + background: color-mix(in srgb, var(--warning, #d97706) 12%, transparent); + color: var(--text-primary); + font-size: var(--font-caption); +} + +.model-button--override .model-button__label::before { + content: ""; + display: inline-block; + width: 6px; + height: 6px; + margin-right: 6px; + border-radius: 50%; + background: var(--accent); + vertical-align: middle; +} + .send-button { display: grid; width: 36px; @@ -10277,6 +10461,67 @@ details.settings-section > :not(summary) + :not(summary) { line-height: 1.45; } +.project-runtime-selector { + display: flex; + flex-direction: column; + gap: var(--space-2); + min-width: 0; + margin: 0; + padding: 0; + border: 0; +} + +.project-runtime-selector > legend { + margin-bottom: var(--space-2); + padding: 0; + color: var(--text-primary); + font-size: var(--font-caption); + font-weight: 650; +} + +.project-runtime-selector__fields { + display: grid; + grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); + gap: var(--space-3); +} + +.project-runtime-selector__summary { + display: flex; + flex-direction: column; + gap: 2px; + margin: 0; + padding: var(--space-2) var(--space-3); + border-radius: 8px; + background: var(--surface-muted); + color: var(--text-muted); + font-size: var(--font-caption); +} + +.project-runtime-selector__summary--override { + background: color-mix(in srgb, var(--accent) 10%, transparent); + color: var(--text-primary); +} + +.project-runtime-selector__summary small { + color: var(--text-muted); +} + +.project-runtime-selector__warning { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: var(--space-2); + margin: 0; + color: var(--warning, var(--text-primary)); + font-size: var(--font-caption); +} + +@media (max-width: 719px) { + .project-runtime-selector__fields { + grid-template-columns: minmax(0, 1fr); + } +} + @media (max-width: 719px) { .project-create-card .segmented-control { width: 100%; diff --git a/src/shared/assistant-contracts.ts b/src/shared/assistant-contracts.ts index 51ca65ed..c9d07d8b 100644 --- a/src/shared/assistant-contracts.ts +++ b/src/shared/assistant-contracts.ts @@ -1,7 +1,10 @@ import { z } from 'zod' import { runtimeChecklistSchema } from './runtime-checklist' import { externalKnowledgeLocatorSchema } from './external-knowledge-contracts' -import { agentRuntimeSelectionSchema } from './runtime-selection-contracts' +import { + runtimeSelectionLayerSchema, + type AgentRuntimeSelection +} from './runtime-selection-contracts' import { sshHostIdSchema } from './ssh-host-contracts' export const assistantIdSchema = z.string().uuid() @@ -143,7 +146,8 @@ export const projectCreateSchema = z description: z.string().trim().max(2_000), rootPath: z.string().trim().max(4_096), defaultWorkMode: workModeSchema, - runtimeSelection: agentRuntimeSelectionSchema.optional() + /** Project layer; absent means follow the global settings. */ + runtimeSelection: runtimeSelectionLayerSchema.optional() }) .strict() @@ -579,7 +583,8 @@ export const conversationSnapshotSchema = z .object({ id: assistantIdSchema, projectId: assistantIdSchema.optional(), - runtimeSelection: agentRuntimeSelectionSchema.optional(), + /** Conversation layer; absent means follow the project. */ + runtimeSelection: runtimeSelectionLayerSchema.optional(), knowledgeLibraryIds: z.array(assistantIdSchema).max(20).optional(), workMode: workModeSchema.optional(), knowledgeRetrievalMode: z.enum(['auto', 'always']).optional(), @@ -895,7 +900,8 @@ export type AssistantSchedule = Omit, 'run id: string taskId: string conversationId: string - runtimeSelection?: ProjectCreateInput['runtimeSelection'] + /** A concrete selection captured by legacy schedule templates. */ + runtimeSelection?: AgentRuntimeSelection enabled: boolean lastRunAt?: string createdAt: string diff --git a/src/shared/contracts.ts b/src/shared/contracts.ts index 4e078bd0..e49d138d 100644 --- a/src/shared/contracts.ts +++ b/src/shared/contracts.ts @@ -228,7 +228,7 @@ import type { SshHostValidationResult } from './ssh-host-contracts' import { - agentRuntimeSelectionSchema, + optionalAgentRuntimeSelectionSchema, type AgentRuntimeSelection } from './runtime-selection-contracts' import { @@ -343,7 +343,7 @@ export const agentRequestSchema = z teamMode: z.boolean().optional(), smartRouting: z.boolean().optional(), queueItemId: z.string().uuid().optional(), - runtimeSelection: agentRuntimeSelectionSchema.optional(), + runtimeSelection: optionalAgentRuntimeSelectionSchema, runtimeControl: runtimeControlSchema.optional(), workMode: legacyWorkModeSchema.optional(), prompt: z.string().trim().min(1).max(100_000), @@ -386,7 +386,8 @@ export const conversationQueueUserInputSchema = z .object({ conversationId: conversationIdSchema, projectId: z.string().uuid().optional(), - runtimeSelection: agentRuntimeSelectionSchema, + /** Informational only; the renderer re-resolves the selection at dispatch. */ + runtimeSelection: optionalAgentRuntimeSelectionSchema, runtimeControl: runtimeControlSchema.optional(), expertId: z.string().uuid().optional(), teamMode: z.boolean().optional(), diff --git a/src/shared/remote-project-candidate-contracts.test.ts b/src/shared/remote-project-candidate-contracts.test.ts index 6651cd34..a91a35fe 100644 --- a/src/shared/remote-project-candidate-contracts.test.ts +++ b/src/shared/remote-project-candidate-contracts.test.ts @@ -14,7 +14,10 @@ const draft = { name: '远程项目', description: 'Awaited save', defaultWorkMode: 'ask' as const, - runtimeSelection: { provider: 'model' as const, profileId }, + runtimeSelection: { + provider: 'opencode' as const, + model: { kind: 'profile' as const, profileId } + }, hostId, remoteRootPath: '/srv/projects/goodbuddy' } @@ -64,11 +67,12 @@ describe('remote project save contracts', () => { ).toThrow() }) - it('requires a Runtime and a bounded absolute remote root', () => { + it('lets the Runtime follow global settings and bounds the absolute remote root', () => { const withoutRuntime: Partial = { ...draft } delete withoutRuntime.runtimeSelection + expect(remoteProjectCreateDraftSchema.parse(withoutRuntime).runtimeSelection).toBeUndefined() expect(() => - remoteProjectCreateDraftSchema.parse(withoutRuntime) + remoteProjectCreateDraftSchema.parse({ ...draft, runtimeSelection: { provider: 'auto-ish' } }) ).toThrow() expect(() => remoteProjectCreateDraftSchema.parse({ diff --git a/src/shared/remote-project-candidate-contracts.ts b/src/shared/remote-project-candidate-contracts.ts index 01182bed..7d5269c7 100644 --- a/src/shared/remote-project-candidate-contracts.ts +++ b/src/shared/remote-project-candidate-contracts.ts @@ -4,7 +4,7 @@ import { REMOTE_WORKSPACE_LIMITS, remoteAbsolutePathSchema } from './remote-agent-contracts' -import { agentRuntimeSelectionSchema } from './runtime-selection-contracts' +import { runtimeSelectionLayerSchema } from './runtime-selection-contracts' import { sshHostIdSchema } from './ssh-host-contracts' export const REMOTE_PROJECT_SAVE_LIMITS = { @@ -30,7 +30,7 @@ const commonDraftFields = { name: projectCreateSchema.shape.name, description: projectCreateSchema.shape.description, defaultWorkMode: projectCreateSchema.shape.defaultWorkMode, - runtimeSelection: agentRuntimeSelectionSchema, + runtimeSelection: runtimeSelectionLayerSchema.optional(), hostId: sshHostIdSchema, remoteRootPath: remoteProjectRootPathSchema } as const diff --git a/src/shared/runtime-selection-contracts.ts b/src/shared/runtime-selection-contracts.ts index 316e6561..244d5409 100644 --- a/src/shared/runtime-selection-contracts.ts +++ b/src/shared/runtime-selection-contracts.ts @@ -1,64 +1,155 @@ import { z } from 'zod' import { isDeepSeekHarnessModelProfile } from './deepseek-harness-compatibility' -const runtimeSelectionProfileIdSchema = z.string().uuid() +/** + * Runtime selection is layered: global settings, then an optional project + * layer, then an optional conversation layer. Each layer may independently + * leave the execution mode (`provider`) or the model unset, which means + * "inherit from the layer above". Only the resolver turns layers into a + * concrete `AgentRuntimeSelection` that a runtime can be created from. + */ -export const agentRuntimeSelectionSchema = z.discriminatedUnion( - 'provider', - [ - z.object({ provider: z.literal('auto') }).strict(), +export const agentRuntimeProviders = [ + 'model', + 'opencode', + 'continue', + 'deepseek-harness' +] as const + +export const agentRuntimeProviderSchema = z.enum(agentRuntimeProviders) +export type AgentRuntimeProvider = z.infer + +const profileIdSchema = z.string().uuid() + +export const runtimeModelChoiceSchema = z.discriminatedUnion('kind', [ + z.object({ kind: z.literal('profile'), profileId: profileIdSchema }).strict(), + z.object({ kind: z.literal('runtime-config') }).strict() +]) +export type RuntimeModelChoice = z.infer + +function isRecord(value: unknown): value is Record { + return typeof value === 'object' && value !== null && !Array.isArray(value) +} + +/** Accepts the pre-layer `{ provider, profileId? }` and `{ provider: 'auto' }` shapes. */ +function upgradeLegacyLayer(value: unknown): unknown { + if (!isRecord(value) || 'model' in value || !('provider' in value)) { + return value + } + if (value.provider === 'auto') return {} + const { profileId, ...rest } = value + return typeof profileId === 'string' + ? { ...rest, model: { kind: 'profile', profileId } } + : rest +} + +export const runtimeSelectionLayerSchema = z.preprocess( + upgradeLegacyLayer, + z + .object({ + provider: agentRuntimeProviderSchema.optional(), + model: runtimeModelChoiceSchema.optional() + }) + .strict() + .refine( + (layer) => + layer.provider !== 'model' || layer.model?.kind !== 'runtime-config', + { message: '直连模型不能使用 Runtime 自有配置', path: ['model'] } + ) +) +export type RuntimeSelectionLayer = z.infer + +export function isEmptyRuntimeSelectionLayer( + layer: RuntimeSelectionLayer | undefined +): boolean { + return !layer || (layer.provider === undefined && layer.model === undefined) +} + +/** Normalizes an empty layer to `undefined` so storage keeps "inherit" as NULL. */ +export function compactRuntimeSelectionLayer( + layer: RuntimeSelectionLayer | undefined +): RuntimeSelectionLayer | undefined { + if (isEmptyRuntimeSelectionLayer(layer)) return undefined + return { + ...(layer!.provider ? { provider: layer!.provider } : {}), + ...(layer!.model ? { model: layer!.model } : {}) + } +} + +const concreteRuntimeSelectionShape = { + profileId: profileIdSchema.optional(), + runtimeConfig: z.literal(true).optional() +} + +/** A fully resolved selection. `profileId` and `runtimeConfig` are exclusive. */ +export const agentRuntimeSelectionSchema = z + .discriminatedUnion('provider', [ z .object({ provider: z.literal('model'), - profileId: runtimeSelectionProfileIdSchema.optional() + profileId: profileIdSchema.optional() }) .strict(), z - .object({ - provider: z.literal('opencode'), - profileId: runtimeSelectionProfileIdSchema.optional() - }) + .object({ provider: z.literal('opencode'), ...concreteRuntimeSelectionShape }) .strict(), z - .object({ - provider: z.literal('continue'), - profileId: runtimeSelectionProfileIdSchema.optional() - }) + .object({ provider: z.literal('continue'), ...concreteRuntimeSelectionShape }) .strict(), z .object({ provider: z.literal('deepseek-harness'), - profileId: runtimeSelectionProfileIdSchema.optional() + ...concreteRuntimeSelectionShape }) .strict() - ] -) + ]) + .refine( + (selection) => + !('runtimeConfig' in selection && selection.runtimeConfig && selection.profileId), + { message: '模型连接与 Runtime 自有配置不能同时选择' } + ) -export type AgentRuntimeSelection = z.infer< - typeof agentRuntimeSelectionSchema -> +export type AgentRuntimeSelection = z.infer -export type RuntimeSelectionRepairSettings = { - modelProfiles: ReadonlyArray<{ - id: string - baseUrl?: string - protocol?: string - authentication?: 'api-key' | 'none' - apiKeyConfigured?: boolean - }> - defaultModelProfileId: string - opencodeModelSource: - | { kind: 'default' } - | { kind: 'platform' } - | { kind: 'profile'; profileId: string } - continueModelSource: - | { kind: 'default' } - | { kind: 'platform' } - | { kind: 'profile'; profileId: string } - deepseekHarnessModelSource?: - | { kind: 'default' } - | { kind: 'platform' } - | { kind: 'profile'; profileId: string } +/** + * Stored queue items, schedules and older renderers may still send + * `{ provider: 'auto' }`. It now means "not specified" so Main resolves + * the layers; any other invalid shape is still rejected. + */ +export const optionalAgentRuntimeSelectionSchema = agentRuntimeSelectionSchema.optional() + +/** Maps legacy `{ provider: 'auto' }` to "not specified"; other values pass through for validation. */ +export function withoutLegacyAutoSelection(value: T): T { + if (!isRecord(value)) return value + if (value.provider === 'auto') return undefined as T + if (isRecord(value.runtimeSelection) && value.runtimeSelection.provider === 'auto') { + const { runtimeSelection: _legacy, ...rest } = value + void _legacy + return rest as T + } + return value +} + +export function agentRuntimeSelectionKey( + selection: AgentRuntimeSelection +): string { + const model = + selection.profileId ?? + ('runtimeConfig' in selection && selection.runtimeConfig + ? 'runtime-config' + : 'default') + return `${selection.provider}:${model}` +} + +export function runtimeSelectionFromChoice( + provider: AgentRuntimeProvider, + model: RuntimeModelChoice | undefined +): AgentRuntimeSelection { + if (model?.kind === 'profile') return { provider, profileId: model.profileId } + if (model?.kind === 'runtime-config' && provider !== 'model') { + return { provider, runtimeConfig: true } + } + return { provider } } type RuntimeModelSource = @@ -66,178 +157,295 @@ type RuntimeModelSource = | { kind: 'platform' } | { kind: 'profile'; profileId: string } -export type RuntimeSelectionDefaultSettings = { - provider: AgentRuntimeSelection['provider'] +export type RuntimeResolutionProfile = { + id: string + name?: string + modelName?: string + baseUrl?: string + protocol?: string + authentication?: 'api-key' | 'none' + apiKeyConfigured?: boolean +} + +export type RuntimeResolutionSettings = { + /** Global default execution mode. Legacy `auto` is treated as the direct model. */ + provider: string defaultModelProfileId: string - modelProfiles?: RuntimeSelectionRepairSettings['modelProfiles'] - opencodeBaseUrl: string - opencodeEmbedded: boolean + modelProfiles: ReadonlyArray opencodeModelSource?: RuntimeModelSource continueModelSource?: RuntimeModelSource deepseekHarnessModelSource?: RuntimeModelSource - opencodeModelProfile?: { id: string } - continueModelProfile?: { id: string } - deepseekHarnessModelProfile?: { id: string } + /** An external OpenCode server can only use its own configuration. */ + opencodeBaseUrl?: string } -type ChannelModelProfile = RuntimeSelectionRepairSettings['modelProfiles'][number] - -export function getRuntimeSelectionForProvider( - provider: Exclude, - _settings: RuntimeSelectionDefaultSettings -): AgentRuntimeSelection { - void _settings - return { provider } +export type RuntimeResolutionOptions = { + /** Managed SSH projects: OpenCode or Continue with a GoodBuddy model connection. */ + remote?: boolean } -export function getDefaultRuntimeSelection( - settings: RuntimeSelectionDefaultSettings -): AgentRuntimeSelection { - const provider = settings.provider - if (provider !== 'auto') { - return getRuntimeSelectionForProvider(provider, settings) +export type RuntimeSelectionLayerName = 'global' | 'project' | 'conversation' + +export type RuntimeModelChoiceStatus = + | 'ok' + | 'missing' + | 'incompatible' + | 'unavailable' + +export type ResolvedRuntimeChoice = { + selection: AgentRuntimeSelection + provider: AgentRuntimeProvider + providerSource: RuntimeSelectionLayerName + model?: RuntimeModelChoice + modelSource: RuntimeSelectionLayerName + /** A project or conversation choice that could not be used. */ + ignored?: { + layer: Exclude + kind: 'provider' | 'model' + reason: Exclude } - return settings.opencodeBaseUrl || settings.opencodeEmbedded - ? getRuntimeSelectionForProvider('opencode', settings) - : getRuntimeSelectionForProvider('model', settings) } -// Resolve only for presentation or request diagnostics, never for persisted defaults. -export function getRuntimeSelectionProfileId( - selection: AgentRuntimeSelection, - settings: RuntimeSelectionDefaultSettings -): string | undefined { - if (selection.provider === 'auto') return undefined - if (selection.profileId) return selection.profileId - if (selection.provider === 'model') return settings.defaultModelProfileId - const source = selection.provider === 'opencode' ? settings.opencodeModelSource - : selection.provider === 'continue' ? settings.continueModelSource : settings.deepseekHarnessModelSource - if (source?.kind === 'profile') return source.profileId - if (source?.kind !== 'default') return undefined - const profiles = settings.modelProfiles ?? [] - const isCompatible = (profile: ChannelModelProfile): boolean => - selection.provider === 'deepseek-harness' - ? profile.protocol === 'openai-chat-completions' && - profile.authentication === 'api-key' && - Boolean(profile.baseUrl) && - isDeepSeekHarnessModelProfile({ - baseUrl: profile.baseUrl!, - protocol: profile.protocol, - authentication: profile.authentication - }) - : Boolean(profile.protocol) && - profile.protocol !== 'openai-images-generations' - return profiles.find( - (profile) => - profile.id === settings.defaultModelProfileId && isCompatible(profile) - )?.id ?? profiles.find(isCompatible)?.id +export function allowedRuntimeProviders( + options: RuntimeResolutionOptions = {} +): readonly AgentRuntimeProvider[] { + return options.remote ? ['opencode', 'continue'] : agentRuntimeProviders +} + +function normalizedGlobalProvider( + settings: RuntimeResolutionSettings, + options: RuntimeResolutionOptions +): AgentRuntimeProvider { + const parsed = agentRuntimeProviderSchema.safeParse(settings.provider) + const provider = parsed.success ? parsed.data : 'model' + return allowedRuntimeProviders(options).includes(provider) + ? provider + : 'opencode' +} + +function isProfileCredentialReady(profile: RuntimeResolutionProfile): boolean { + return !(profile.authentication === 'api-key' && profile.apiKeyConfigured === false) } export function isChannelModelProfileUsable( - profile: ChannelModelProfile + profile: RuntimeResolutionProfile ): boolean { return ( profile.protocol !== 'openai-images-generations' && - !( - profile.authentication === 'api-key' && - profile.apiKeyConfigured === false - ) + isProfileCredentialReady(profile) ) } -function isDeepSeekHarnessRepairProfileUsable( - profile: ChannelModelProfile +export function isProfileCompatibleWithProvider( + provider: AgentRuntimeProvider, + profile: RuntimeResolutionProfile ): boolean { - if ( - profile.protocol !== 'openai-chat-completions' || - profile.authentication !== 'api-key' || - profile.apiKeyConfigured === false || - !profile.baseUrl - ) { - return false - } - return isDeepSeekHarnessModelProfile({ - baseUrl: profile.baseUrl, - protocol: profile.protocol, - authentication: profile.authentication - }) -} - -export function repairChannelRuntimeSelection( - selection: AgentRuntimeSelection, - settings: RuntimeSelectionRepairSettings -): AgentRuntimeSelection { - const defaultDirectProfile = - settings.modelProfiles.find( - (profile) => - profile.id === settings.defaultModelProfileId && - isChannelModelProfileUsable(profile) - ) ?? - settings.modelProfiles.find(isChannelModelProfileUsable) - const defaultDirectSelection: AgentRuntimeSelection = - defaultDirectProfile && - defaultDirectProfile.id !== settings.defaultModelProfileId - ? { provider: 'model', profileId: defaultDirectProfile.id } - : { provider: 'model' } - if (selection.provider === 'auto') { - return defaultDirectSelection - } - if ( - selection.provider === 'opencode' || - selection.provider === 'continue' - ) { - return repairAgentRuntimeSelection(selection, settings) - } - if (selection.provider === 'deepseek-harness') { - const repaired = repairAgentRuntimeSelection(selection, settings) - if ( - repaired.provider === 'deepseek-harness' && - repaired.profileId - ) { - const profile = settings.modelProfiles.find( - (candidate) => candidate.id === repaired.profileId - ) - if (profile && isDeepSeekHarnessRepairProfileUsable(profile)) { - return repaired - } - } - return { provider: 'deepseek-harness' } - } - const repaired = repairAgentRuntimeSelection(selection, settings) - if (repaired.provider !== 'model') { - return repaired - } - const profile = settings.modelProfiles.find( - (candidate) => candidate.id === repaired.profileId + if (!profile.protocol) return false + // The direct model can also run image-generation connections. + if (profile.protocol === 'openai-images-generations') return provider === 'model' + if (provider !== 'deepseek-harness') return true + return ( + Boolean(profile.baseUrl) && + isDeepSeekHarnessModelProfile({ + baseUrl: profile.baseUrl!, + protocol: profile.protocol, + authentication: profile.authentication ?? 'none' + }) ) - return profile && isChannelModelProfileUsable(profile) - ? repaired - : defaultDirectSelection } -export function repairAgentRuntimeSelection( - selection: AgentRuntimeSelection, - settings: RuntimeSelectionRepairSettings -): AgentRuntimeSelection { +export function supportsRuntimeConfig( + provider: AgentRuntimeProvider, + options: RuntimeResolutionOptions = {} +): boolean { + return provider !== 'model' && !options.remote +} + +function supportsProfiles( + provider: AgentRuntimeProvider, + settings: RuntimeResolutionSettings +): boolean { + return !(provider === 'opencode' && settings.opencodeBaseUrl?.trim()) +} + +export function runtimeModelChoiceStatus( + provider: AgentRuntimeProvider, + choice: RuntimeModelChoice, + settings: RuntimeResolutionSettings, + options: RuntimeResolutionOptions = {} +): RuntimeModelChoiceStatus { + if (choice.kind === 'runtime-config') { + return supportsRuntimeConfig(provider, options) ? 'ok' : 'incompatible' + } + const profile = (settings.modelProfiles ?? []).find( + (candidate) => candidate.id === choice.profileId + ) + if (!profile) return 'missing' if ( - !('profileId' in selection) || - !selection.profileId || - settings.modelProfiles.some( - (profile) => profile.id === selection.profileId - ) + !supportsProfiles(provider, settings) || + !isProfileCompatibleWithProvider(provider, profile) ) { - return selection + return 'incompatible' } - if (selection.provider === 'model') { - return { provider: 'model' } - } - return { provider: selection.provider } + return isProfileCredentialReady(profile) ? 'ok' : 'unavailable' } -export function agentRuntimeSelectionKey( - selection: AgentRuntimeSelection +export function isResolvableStatus(status: RuntimeModelChoiceStatus): boolean { + return status === 'ok' || status === 'unavailable' +} + +/** Profiles a user can pick for a provider, in configuration order. */ +export function selectableModelProfiles( + provider: AgentRuntimeProvider, + settings: RuntimeResolutionSettings +): RuntimeResolutionProfile[] { + if (!supportsProfiles(provider, settings)) return [] + return (settings.modelProfiles ?? []).filter((profile) => + isProfileCompatibleWithProvider(provider, profile) + ) +} + +function preferredUsableProfile( + provider: AgentRuntimeProvider, + settings: RuntimeResolutionSettings +): RuntimeResolutionProfile | undefined { + // Fallback defaults are text models; image generation is only chosen explicitly. + const text = selectableModelProfiles(provider, settings).filter( + (profile) => profile.protocol !== 'openai-images-generations' + ) + const ready = text.filter(isProfileCredentialReady) + return ( + ready.find((profile) => profile.id === settings.defaultModelProfileId) ?? + ready[0] ?? + text[0] + ) +} + +/** What the global settings configure for a provider, before any fallback. */ +export function configuredGlobalModel( + provider: AgentRuntimeProvider, + settings: RuntimeResolutionSettings +): RuntimeModelChoice | undefined { + if (provider === 'model') { + // No connections yet (first run, tests): let the runtime use its configured model. + return settings.defaultModelProfileId + ? { kind: 'profile', profileId: settings.defaultModelProfileId } + : undefined + } + const source = + provider === 'opencode' + ? settings.opencodeModelSource + : provider === 'continue' + ? settings.continueModelSource + : settings.deepseekHarnessModelSource + if (!source || source.kind === 'platform') return { kind: 'runtime-config' } + if (source.kind === 'profile') { + return { kind: 'profile', profileId: source.profileId } + } + const preferred = preferredUsableProfile(provider, settings) + return preferred + ? { kind: 'profile', profileId: preferred.id } + : { kind: 'runtime-config' } +} + +/** The global default after skipping unusable connections. */ +export function globalDefaultModel( + provider: AgentRuntimeProvider, + settings: RuntimeResolutionSettings, + options: RuntimeResolutionOptions = {} +): RuntimeModelChoice | undefined { + const configured = configuredGlobalModel(provider, settings) + const configuredProfile = + configured?.kind === 'profile' + ? settings.modelProfiles?.find((profile) => profile.id === configured.profileId) + : undefined + if ( + configured && + configuredProfile?.protocol !== 'openai-images-generations' && + isResolvableStatus(runtimeModelChoiceStatus(provider, configured, settings, options)) + ) { + return configured + } + const preferred = preferredUsableProfile(provider, settings) + if (preferred) return { kind: 'profile', profileId: preferred.id } + if (supportsRuntimeConfig(provider, options)) return { kind: 'runtime-config' } + // Keep the broken choice so the run reports why it cannot start. + return options.remote ? undefined : configured +} + +export function resolveRuntimeChoice( + settings: RuntimeResolutionSettings, + layers: { + project?: RuntimeSelectionLayer + conversation?: RuntimeSelectionLayer + } = {}, + options: RuntimeResolutionOptions = {} +): ResolvedRuntimeChoice { + // Cached renderer state may still hold pre-layer shapes; read them as layers. + const normalize = (layer: unknown): RuntimeSelectionLayer | undefined => { + if (layer === undefined) return undefined + const parsed = runtimeSelectionLayerSchema.safeParse(layer) + return parsed.success ? parsed.data : undefined + } + layers = { project: normalize(layers.project), conversation: normalize(layers.conversation) } + const allowed = allowedRuntimeProviders(options) + let ignored: ResolvedRuntimeChoice['ignored'] + let provider = normalizedGlobalProvider(settings, options) + let providerSource: RuntimeSelectionLayerName = 'global' + for (const layer of ['project', 'conversation'] as const) { + const candidate = layers[layer]?.provider + if (!candidate) continue + if (allowed.includes(candidate)) { + provider = candidate + providerSource = layer + } else { + ignored = { layer, kind: 'provider', reason: 'incompatible' } + } + } + + let model: RuntimeModelChoice | undefined + let modelSource: RuntimeSelectionLayerName = 'global' + for (const layer of ['conversation', 'project'] as const) { + const candidate = layers[layer]?.model + if (!candidate) continue + const status = runtimeModelChoiceStatus(provider, candidate, settings, options) + // A missing key is reported when the run starts; only structural problems fall back. + if (isResolvableStatus(status)) { + model = candidate + modelSource = layer + break + } + ignored ??= { layer, kind: 'model', reason: status as 'missing' | 'incompatible' } + } + model ??= globalDefaultModel(provider, settings, options) + + return { + selection: runtimeSelectionFromChoice(provider, model), + provider, + providerSource, + model, + modelSource, + ...(ignored ? { ignored } : {}) + } +} + +/** Drops references to deleted model connections without touching other choices. */ +export function repairRuntimeSelectionLayer( + layer: RuntimeSelectionLayer | undefined, + settings: Pick +): RuntimeSelectionLayer | undefined { + if ( + layer?.model?.kind !== 'profile' || + (settings.modelProfiles ?? []).some((profile) => profile.id === (layer.model as { profileId: string }).profileId) + ) { + return compactRuntimeSelectionLayer(layer) + } + return compactRuntimeSelectionLayer({ ...layer, model: undefined }) +} + +export function runtimeSelectionLayerKey( + layer: RuntimeSelectionLayer | undefined ): string { - return `${selection.provider}:${'profileId' in selection - ? selection.profileId ?? 'default' - : 'default'}` + const compact = compactRuntimeSelectionLayer(layer) + return compact ? JSON.stringify(compact) : '' }