Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote): use host defaults for new SSH Codex tasks
DavidShen8f35b4402b10
diff --git a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsxindex 262fea322f..4cbdf3bd65 100644--- a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx+++ b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx@@ -156,17 +156,18 @@ describe('settings remote Codex creation', () => {});});- it('keeps valid saved preferences', async () => {- publish([sshModel('first'), sshModel('chosen', { supportsFastMode: true })]);+ it('uses remote defaults even when the local native preference is available remotely', async () => {+ publish([sshModel('first', { supportsFastMode: true }), sshModel('chosen', { supportsFastMode: true })]);mocks.prefs.mockReturnValue({ model: 'chosen', providerId: 'openai', effort: 'low' });start();await waitFor(() => expect(mocks.create).toHaveBeenCalled());expect(mocks.create.mock.calls[0][0]).toMatchObject({- model: 'chosen',+ model: 'first',providerId: 'openai',- effort: 'low',- fastMode: true,+ effort: 'high',+ fastMode: false,});+ expect(mocks.prefs).not.toHaveBeenCalled();});it.each(['failed', 'empty', 'bridge'] as const)(diff --git a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.tsindex a16191adaf..d6c9f0ab9e 100644--- a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts@@ -18,7 +18,7 @@ describe('remote Orca Worker creation context', () => {expect(selection).toContain('if (!selection.ok)');// Behavioral filtering and source pinning are covered in sshSessionModelSelection.test.ts.expect(selection).toContain('target.hostId');- expect(read('components/settings/RemoteHostDetail.tsx')).toContain('loadSshSessionModelSelection(hostId,');+ expect(read('components/settings/RemoteHostDetail.tsx')).toContain('loadSshSessionModelSelection(hostId)');});it('scopes capabilities, providers, and the nested model selector to the controlled device', () => {const popover = read('features/cc-agent/CreateWorkerPopover.tsx');diff --git a/apps/desktop/src/renderer/__tests__/sshCodexModels.test.tsx b/apps/desktop/src/renderer/__tests__/sshCodexModels.test.tsxindex 35b8f4693d..69b8407285 100644--- a/apps/desktop/src/renderer/__tests__/sshCodexModels.test.tsx+++ b/apps/desktop/src/renderer/__tests__/sshCodexModels.test.tsx@@ -89,6 +89,27 @@ describe('SSH Codex model discovery', () => {expect(list).toHaveBeenCalledWith('builder');expect(selection).toEqual({ ok: true, model: 'remote-native', providerId: 'openai', effort: 'high', fastMode: false });});+ it.each([+ [null, 'remote-default'], [null, 'also-available'],+ ['openai', 'remote-default'], ['openai', 'also-available'],+ ] as const)('ignores controller preferences for native source %s and model %s', async (providerId, model) => {+ list.mockResolvedValue([sshNativeCodexProvider([+ sshModel('remote-default', { supportsFastMode: true }),+ sshModel('also-available', { supportsFastMode: true }),+ ])]);+ const getPresetEffort = vi.fn(() => 'low' as const);+ const getPresetFast = vi.fn(() => true);+ const selection = await loadSshSessionModelSelection('builder', {+ providers: [], loading: false, loadFailed: false, agentKind: 'codex',+ preferred: { model, providerId, effort: 'low', fastMode: true },+ getPresetEffort, getPresetFast,+ });+ expect(selection).toEqual({+ ok: true, model: 'remote-default', providerId: 'openai', effort: 'high', fastMode: false,+ });+ expect(getPresetEffort).not.toHaveBeenCalled();+ expect(getPresetFast).not.toHaveBeenCalled();+ });it('fails creation without falling back to local models', async () => {list.mockRejectedValue(new Error('remote unavailable'));expect(await loadSshSessionModelSelection('builder', {diff --git a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsxindex fe9128520c..11d0b7dbcc 100644--- a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx+++ b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx@@ -27,12 +27,6 @@ import { Spinner } from '@/components/ui/spinner';import * as sessionService from '@/lib/sessionService';import { buildCodexSyncWarning } from '@/utils/codexAuthSync';import { remoteSshHostsStore } from '@/lib/remoteSshHostsStore';-import {- getCachedProvidersSnapshot,- hasProvidersSnapshotLoadFailed,-} from '@/lib/providersSnapshotStore';-import { getDraft, getFastModeForModel } from '@/state/newMakerDraft';-import { getProviderModelEffort, getProviderModelFast } from '@/state/providerModelMemory';import {loadSshSessionModelSelection,sshModelSelectionErrorKeys,@@ -393,19 +387,7 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelPropssetBusy(true);try {const owner = getDataOwnerGeneration();- const resolveSelection = () => {- const snapshot = getCachedProvidersSnapshot();- const prefs = getDraft().lastByVendor.codex;- return loadSshSessionModelSelection(hostId, {- providers: snapshot?.providers ?? [],- loading: !snapshot,- loadFailed: hasProvidersSnapshotLoadFailed(),- agentKind: 'codex',- preferred: { ...prefs, fastMode: getFastModeForModel(prefs.model) },- getPresetEffort: getProviderModelEffort,- getPresetFast: getProviderModelFast,- });- };+ const resolveSelection = () => loadSshSessionModelSelection(hostId);const initialSelection = await resolveSelection();if (!isDataOwnerGenerationCurrent(owner)) return;if (!initialSelection.ok) {@@ -446,7 +428,7 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps// IPC fires on first user prompt, threading// remoteHostId + workingDir into agent.startSession.// Directory validation/confirmation may take time. Re-read the catalog and- // preferences before inserting; never persist a stale or another owner's route.+ // remote defaults before inserting; never persist a stale or another owner's route.if (!isDataOwnerGenerationCurrent(owner)) return;const selection = await resolveSelection();if (!isDataOwnerGenerationCurrent(owner)) return;diff --git a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.tsindex 4c2a52654f..fbcfa52a8f 100644--- a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts+++ b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts@@ -28,15 +28,18 @@ export class SshModelSelectionError extends Error {/** Resolve new SSH Codex tasks from the execution host, never the controller login. */export async function loadSshSessionModelSelection(- hostId: string, args: Parameters<typeof resolveSshSessionModelSelection>[0],+ hostId: string, args: Parameters<typeof resolveSshSessionModelSelection>[0] = {+ agentKind: 'codex', providers: [], loading: false, loadFailed: false,+ },): Promise<ReturnType<typeof resolveSshSessionModelSelection>> {if (args.agentKind !== 'codex') return resolveSshSessionModelSelection(args);try {const providers = await window.electronAPI.remoteSsh.listCodexModels(hostId);- const nativePreference = !args.preferred.providerId || args.preferred.providerId === 'openai';return resolveSshSessionModelSelection({...args, providers, loading: false, loadFailed: false,- preferred: { ...args.preferred, providerId: 'openai', model: nativePreference ? args.preferred.model : '' },+ // Callers carry controller draft preferences, not a choice for this host.+ // The remote projection puts its default first and supplies its own effort.+ preferred: undefined,getPresetEffort: undefined, getPresetFast: undefined,});} catch {@@ -53,7 +56,7 @@ export function resolveSshSessionModelSelection(args: {loading: boolean;loadFailed: boolean;agentKind: AgentKind;- preferred: { model: string; providerId?: string | null; effort: Effort; fastMode: boolean };+ preferred?: { model: string; providerId?: string | null; effort: Effort; fastMode: boolean };getPresetEffort?: (agent: AgentKind, providerId: string, model: string) => Effort | undefined;getPresetFast?: (agent: AgentKind, providerId: string, model: string) => boolean | undefined;}):@@ -63,7 +66,7 @@ export function resolveSshSessionModelSelection(args: {if (args.loading) return { ok: false, reason: 'catalog-loading' };const { agentKind, preferred } = args;// Do not silently move an explicitly selected connection to another account.- if (agentKind === 'codex' && preferred.providerId && preferred.providerId !== 'openai') {+ if (agentKind === 'codex' && preferred?.providerId && preferred.providerId !== 'openai') {return { ok: false, reason: 'unsupported-codex-source' };}const routeProviders =@@ -83,7 +86,7 @@ export function resolveSshSessionModelSelection(args: {const models = deriveModelsFromProviders(providers, agentKind, {admissionFiltered: true,}).filter((model) => !isSubscriptionDirectModel(model.id));- const model = models.some((candidate) => candidate.id === preferred.model)+ const model = preferred && models.some((candidate) => candidate.id === preferred.model)? preferred.model: models[0]?.id;if (!model) return { ok: false, reason: 'no-route' };@@ -91,7 +94,7 @@ export function resolveSshSessionModelSelection(args: {// A stale preference may be replaced only while creating a new task. Pin the// selected source so runtime defaults cannot return to a local-only account.const providerId =- effectiveSourceIdForModel(providers, preferred.providerId, model, agentKind) ??+ effectiveSourceIdForModel(providers, preferred?.providerId, model, agentKind) ??effectiveSourceIdForModel(providers, null, model, agentKind);const provider = providers.find((candidate) => candidate.id === providerId);const descriptor = provider && getModel(provider, model, agentKind);@@ -101,13 +104,13 @@ export function resolveSshSessionModelSelection(args: {model,providerId,effort: resolveNewMakerDraftEffort({- currentEffort: preferred.effort,+ currentEffort: preferred?.effort ?? descriptor.defaultEffort ?? descriptor.efforts[0] ?? 'medium',presetEffort: args.getPresetEffort?.(agentKind, providerId, model),efforts: descriptor.efforts,defaultEffort: descriptor.defaultEffort,}),fastMode:descriptor.supportsFastMode === true &&- (args.getPresetFast?.(agentKind, providerId, model) ?? preferred.fastMode),+ (args.getPresetFast?.(agentKind, providerId, model) ?? preferred?.fastMode ?? false),};}diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex ae42091d1b..b6fd0f3e81 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -112,6 +112,8 @@ app-server 的完整 `model/list`,不使用控制端 OpenAI 登录或网关目结果只用于该主机,断连、换主机或换账号后的迟到结果丢弃,不发布到本机公共目录。新任务从远端清单解析默认模型及推理强度/Fast;已有任务保留原模型和历史,由用户改选。+设置页及普通 SSH 创建入口不继承控制端草稿的模型、推理强度或 Fast 记忆,即使型号同名;+采用远端默认模型及推荐推理强度,Fast 初始关闭,创建后可在任务内手动改选。原样恢复只有在持久化的主机、原生线程、引擎、模型及来源均匹配时才豁免新建目录校验,允许恢复后来被隐藏的原模型;模型是否仍可推理由远端 Codex 决定。SSH 模型及档位选择不写入控制端本地模型偏好。首次连接成功会补偿挂载时因尚未就绪而失败的目录读取;重复 ready 快照不清空已成功读取的目录。