Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote): 按有效原生路由创建 SSH Codex 任务 (#4871)
DavidShenXD7edd27be4690
diff --git a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsxnew file mode 100644index 0000000000..e0232b41e2--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx@@ -0,0 +1,252 @@+// @vitest-environment jsdom+import React from 'react';+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { StartRemoteSessionPanel } from '@/components/settings/RemoteHostDetail';+import { AddRemoteProjectDialog } from '@/components/new-chat/AddRemoteProjectDialog';+import { SshModelSelectionError } from '@/features/cc-agent/sshSessionModelSelection';+import {+ sshModel,+ sshProvider,+ sshNativeCodexProvider,+} from '@/features/cc-agent/__tests__/sshModelFixtures';+import {+ beginProvidersRefresh,+ commitProvidersSnapshot,+ failProvidersRefresh,+ invalidateProvidersSnapshot,+} from '@/lib/providersSnapshotStore';+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';++const mocks = vi.hoisted(() => ({+ create: vi.fn(),+ navigate: vi.fn(),+ error: vi.fn(),+ success: vi.fn(),+ confirm: vi.fn(),+ stat: vi.fn(),+ mkdir: vi.fn(),+ prefs: vi.fn(),+ devices: [],+ sessions: [+ { remoteHostId: 'remote-mac', workspaceKind: 'project', workingDir: '/Users/test/project' },+ ],+}));+vi.mock('@/hooks/useControllableDevices', () => ({ useControllableDevices: () => mocks.devices }));+vi.mock('@/hooks/useCCSessions', () => ({ useCCSessions: () => ({ sessions: mocks.sessions }) }));+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));+vi.mock('react-router-dom', () => ({ useNavigate: () => mocks.navigate }));+vi.mock('@/lib/toast', () => ({ toast: { error: mocks.error, success: mocks.success } }));+vi.mock('@/lib/sessionService', () => ({ create: mocks.create }));+vi.mock('@/components/ui/confirm-dialog-provider', () => ({+ useConfirmDialog: () => ({ confirm: mocks.confirm }),+}));+vi.mock('@/state/newMakerDraft', () => ({+ getDraft: () => ({ lastByVendor: { codex: mocks.prefs() } }),+ getFastModeForModel: () => true,+}));+vi.mock('@/state/providerModelMemory', () => ({+ getProviderModelEffort: () => undefined,+ getProviderModelFast: () => undefined,+}));++function publish(models = [sshModel('available-model')]) {+ commitProvidersSnapshot(beginProvidersRefresh(), {+ dataOwnerId: 'owner',+ ownerGeneration: 1,+ providerOrder: ['openai'],+ providers: [sshNativeCodexProvider(models)],+ });+}+function start() {+ render(<StartRemoteSessionPanel hostId="remote-mac" />);+ fireEvent.click(screen.getByRole('button', { name: 'settings.remote.startSession.start' }));+}++beforeEach(() => {+ vi.clearAllMocks();+ setDataOwnerGeneration('owner', 1);+ invalidateProvidersSnapshot();+ publish();+ mocks.prefs.mockReturnValue({ model: 'gpt-5.5-codex', providerId: null, effort: 'medium' });+ mocks.create.mockResolvedValue({ id: 'new-task' });+ // These are remote POSIX paths, independent of the Windows controller.+ mocks.stat.mockResolvedValue({ kind: 'dir', resolvedPath: '/Users/test/project' });+ mocks.mkdir.mockResolvedValue({ resolvedPath: '/Users/test/project' });+ mocks.confirm.mockResolvedValue(true);+ Object.defineProperty(window, 'electronAPI', {+ configurable: true,+ value: {+ remoteSsh: {+ statRemotePath: mocks.stat,+ mkdirPRemote: mocks.mkdir,+ list: async () => ({+ hosts: [+ {+ status: 'ready',+ config: { id: 'remote-mac', user: 'test', hostname: 'example.test' },+ },+ ],+ }),+ },+ },+ });+});++describe('ordinary SSH creation error presentation', () => {+ it.each([+ ['no-route', 'noCompatibleModel'],+ ['unsupported-codex-source', 'unsupportedCodexSource'],+ ['catalog-loading', 'modelCatalogLoading'],+ ['catalog-error', 'modelCatalogFailed'],+ ] as const)('preserves the %s reason through the project dialog', async (reason, key) => {+ const onOpenChange = vi.fn();+ const onProjectAdded = vi.fn().mockRejectedValue(new SshModelSelectionError(reason));+ render(+ <AddRemoteProjectDialog open onOpenChange={onOpenChange} onProjectAdded={onProjectAdded} />,+ );+ fireEvent.doubleClick(await screen.findByTitle('/Users/test/project'));+ await waitFor(() =>+ expect(mocks.error).toHaveBeenCalledWith('settings.remote.startSession.' + key),+ );+ expect(mocks.error).toHaveBeenCalledTimes(1);+ expect(onOpenChange).not.toHaveBeenCalledWith(false);+ expect(mocks.create).not.toHaveBeenCalled();+ });+});+afterEach(cleanup);++describe('settings remote Codex creation', () => {+ it.each(['xd', 'custom-responses', 'openai-second'])(+ 'rejects the saved %s route before directory or database changes',+ async (providerId) => {+ mocks.prefs.mockReturnValue({ model: 'available-model', providerId, effort: 'low' });+ start();+ await waitFor(() =>+ expect(mocks.error).toHaveBeenCalledWith(+ 'settings.remote.startSession.unsupportedCodexSource',+ ),+ );+ expect(mocks.stat).not.toHaveBeenCalled();+ expect(mocks.mkdir).not.toHaveBeenCalled();+ expect(mocks.create).not.toHaveBeenCalled();+ expect(mocks.navigate).not.toHaveBeenCalled();+ },+ );++ it('does not create a gateway-only task even with no saved provider', async () => {+ commitProvidersSnapshot(beginProvidersRefresh(), {+ dataOwnerId: 'owner',+ ownerGeneration: 1,+ providerOrder: ['xd'],+ providers: [sshProvider('xd', [sshModel('codex/gpt-5.6-luna')])],+ });+ start();+ await waitFor(() =>+ expect(mocks.error).toHaveBeenCalledWith(+ 'settings.remote.startSession.unsupportedCodexSource',+ ),+ );+ expect(mocks.stat).not.toHaveBeenCalled();+ expect(mocks.create).not.toHaveBeenCalled();+ });++ it('creates with a catalog model, pinned provider and calibrated tuning', async () => {+ start();+ await waitFor(() => expect(mocks.navigate).toHaveBeenCalledWith('/cc-agent/new-task'));+ expect(mocks.create).toHaveBeenCalledExactlyOnceWith({+ agentKind: 'codex',+ workingDir: '/Users/test/project',+ workspaceKind: 'project',+ permissionMode: 'auto',+ model: 'available-model',+ providerId: 'openai',+ effort: 'high',+ fastMode: false,+ remoteHostId: 'remote-mac',+ });+ });++ it('keeps valid saved preferences', async () => {+ publish([sshModel('first'), 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',+ providerId: 'openai',+ effort: 'low',+ fastMode: true,+ });+ });++ it.each(['loading', 'failed', 'empty', 'bridge'] as const)(+ 'blocks %s catalogs before directory or database changes',+ async (state) => {+ if (state === 'loading') invalidateProvidersSnapshot();+ if (state === 'failed') failProvidersRefresh(beginProvidersRefresh());+ if (state === 'empty') publish([]);+ if (state === 'bridge') publish([sshModel('chatgpt/local-only')]);+ start();+ const suffix =+ state === 'loading'+ ? 'modelCatalogLoading'+ : state === 'failed'+ ? 'modelCatalogFailed'+ : 'noCompatibleModel';+ await waitFor(() =>+ expect(mocks.error).toHaveBeenCalledWith('settings.remote.startSession.' + suffix),+ );+ expect(mocks.stat).not.toHaveBeenCalled();+ expect(mocks.mkdir).not.toHaveBeenCalled();+ expect(mocks.create).not.toHaveBeenCalled();+ expect(mocks.navigate).not.toHaveBeenCalled();+ },+ );++ it('rechecks model availability after waiting for the remote directory', async () => {+ mocks.stat.mockImplementation(async () => {+ publish([]);+ return { kind: 'dir', resolvedPath: '/Users/test/project' };+ });+ start();+ await waitFor(() =>+ expect(mocks.error).toHaveBeenCalledWith('settings.remote.startSession.noCompatibleModel'),+ );+ expect(mocks.create).not.toHaveBeenCalled();+ });++ it('uses a new valid catalog route if the catalog changes during validation', async () => {+ mocks.stat.mockImplementation(async () => {+ publish([sshModel('new-catalog-model')]);+ return { kind: 'dir', resolvedPath: '/Users/test/project' };+ });+ start();+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());+ expect(mocks.create.mock.calls[0][0]).toMatchObject({+ model: 'new-catalog-model',+ providerId: 'openai',+ });+ });++ it('does not create after the account changes during directory validation', async () => {+ mocks.stat.mockImplementation(async () => {+ setDataOwnerGeneration('another-owner', 2);+ return { kind: 'dir', resolvedPath: '/Users/test/project' };+ });+ start();+ await waitFor(() =>+ expect((screen.getByRole('button') as HTMLButtonElement).disabled).toBe(false),+ );+ expect(mocks.create).not.toHaveBeenCalled();+ });++ it('still respects cancellation when the remote directory is missing', async () => {+ mocks.stat.mockResolvedValue({ kind: 'missing', resolvedPath: '/Users/test/project' });+ mocks.confirm.mockResolvedValue(false);+ start();+ await waitFor(() => expect(mocks.confirm).toHaveBeenCalled());+ expect(mocks.mkdir).not.toHaveBeenCalled();+ expect(mocks.create).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.tsindex 72b27f1e24..5563c42534 100644--- a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts@@ -9,13 +9,15 @@ const read = (relativePath: string): string =>describe('remote Orca Worker creation context', () => {it('uses SSH-filtered candidates for remote-project models and provider selection', () => {const draft = read('features/cc-agent/NewMakerDraftRoute.tsx');- const start = draft.indexOf('const sshConnected = filterChatBridgedCodexProviders(');- const end = draft.indexOf('const sshFastMode =', start);+ const start = draft.indexOf('const selection = resolveSshSessionModelSelection(');+ const end = draft.indexOf('const newSession = await createSession(', start);expect(start).toBeGreaterThan(-1);const selection = draft.slice(start, end);- expect(selection).toContain('connectedProvidersForAgent(localProviders, capabilityAgentKind)');- expect(selection).toContain('deriveModelsFromProviders(sshConnected, capabilityAgentKind');- expect(selection).toMatch(/effectiveSourceIdForModel\(\s*sshConnected,/);+ expect(selection).toContain('providers: localProviders');+ expect(selection).toContain('agentKind: capabilityAgentKind');+ expect(selection).toContain('if (!selection.ok)');+ // Behavioral filtering and source pinning are covered in sshSessionModelSelection.test.ts.+ expect(read('components/settings/RemoteHostDetail.tsx')).toContain('resolveSshSessionModelSelection(');});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/components/new-chat/AddRemoteProjectDialog.tsx b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsxindex 4d39713dd3..15efbfcf6f 100644--- a/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx+++ b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx@@ -28,6 +28,10 @@ import { SegmentedControl } from '@/components/ui/segmented-control';import { toast } from '@/lib/toast';import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';import { mapIpcErrorToI18nKey } from '@/utils/ipcError';+import {+ SshModelSelectionError,+ sshModelSelectionErrorKeys,+} from '@/features/cc-agent/sshSessionModelSelection';import { useControllableDevices } from '@/hooks/useControllableDevices';import { useCCSessions } from '@/hooks/useCCSessions';import {@@ -325,7 +329,11 @@ export function AddRemoteProjectDialog({}onOpenChange(false);} catch (err) {- toast.error(t(mapIpcErrorToI18nKey(err, { fallback: 'newChat.addRemoteProject.toast.addFailed' })));+ toast.error(t(+ err instanceof SshModelSelectionError+ ? sshModelSelectionErrorKeys[err.reason]+ : mapIpcErrorToI18nKey(err, { fallback: 'newChat.addRemoteProject.toast.addFailed' }),+ ));} finally {setBusy(false);}diff --git a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsxindex 9ed862f576..bacb7a4e2a 100644--- a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx+++ b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx@@ -26,6 +26,17 @@ 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 {+ resolveSshSessionModelSelection,+ sshModelSelectionErrorKeys,+} from '@/features/cc-agent/sshSessionModelSelection';+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';type AgentKind = RemoteAgentKind;const AGENT_KINDS: ReadonlyArray<AgentKind> = ['claude-code', 'codex', 'pi'];@@ -364,7 +375,7 @@ interface StartRemoteSessionPanelProps {hostId: string;}-function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {+export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {const { t } = useTranslation();const navigate = useNavigate();const { confirm } = useConfirmDialog();@@ -372,6 +383,7 @@ function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {const [busy, setBusy] = useState(false);const handleStart = useCallback(async () => {+ if (busy) return;const dir = workdir.trim();if (!dir) {toast.error(t('settings.remote.startSession.errorWorkdirEmpty'));@@ -379,6 +391,25 @@ function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {}setBusy(true);try {+ const owner = getDataOwnerGeneration();+ const resolveSelection = () => {+ const snapshot = getCachedProvidersSnapshot();+ const prefs = getDraft().lastByVendor.codex;+ return resolveSshSessionModelSelection({+ providers: snapshot?.providers ?? [],+ loading: !snapshot,+ loadFailed: hasProvidersSnapshotLoadFailed(),+ agentKind: 'codex',+ preferred: { ...prefs, fastMode: getFastModeForModel(prefs.model) },+ getPresetEffort: getProviderModelEffort,+ getPresetFast: getProviderModelFast,+ });+ };+ const initialSelection = resolveSelection();+ if (!initialSelection.ok) {+ toast.error(t(sshModelSelectionErrorKeys[initialSelection.reason]));+ return;+ }// Step 1 (validate): probe the remote workdir BEFORE creating the session.// - 'dir' → ok, proceed// - 'file' → reject; can't put a session here@@ -412,12 +443,23 @@ function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {// naming, hosts both vendors now. lazy-create maker// 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.+ if (!isDataOwnerGenerationCurrent(owner)) return;+ const selection = resolveSelection();+ if (!selection.ok) {+ toast.error(t(sshModelSelectionErrorKeys[selection.reason]));+ return;+ }const session = await sessionService.create({agentKind: 'codex',workingDir: resolvedPath,workspaceKind: 'project',permissionMode: 'auto',- model: 'gpt-5.5-codex',+ model: selection.model,+ providerId: selection.providerId,+ effort: selection.effort,+ fastMode: selection.fastMode,remoteHostId: hostId,});toast.success(t('settings.remote.startSession.created', { hostId }));@@ -429,7 +471,7 @@ function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps) {} finally {setBusy(false);}- }, [hostId, workdir, navigate, t, confirm]);+ }, [hostId, workdir, navigate, t, confirm, busy]);return (<divdiff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex 18c8c30b7f..b154d64d7a 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -261,7 +261,6 @@ import {import { useDeviceLinkProjects } from '@/hooks/useDeviceLinkProjects';import {resolveFastSupported,- deriveModelsFromProviders,filterChatBridgedCodexProviders,} from '@/lib/providerModels';import {@@ -269,7 +268,6 @@ import {getModel,isModelSelectableForNewRoute,providerOffersModel,- sessionModelSupportsFastMode,connectedProvidersForAgent,type ProviderView,} from '@cindy/model-providers';@@ -284,6 +282,7 @@ import { makeMirrorAccessors, replaceScope, clearScope } from '@/state/deviceLinimport type { ModelMemoryAccessors } from '@/components/new-chat/ModelSelector';import { resolveNewMakerDraftRightSidebar } from './newMakerDraftRightSidebar';import { resolveNewMakerDraftEffort } from './newMakerDraftModelPrefs';+import { resolveSshSessionModelSelection, SshModelSelectionError } from './sshSessionModelSelection';import { closeAllTabs as closeRightSidebarTabs } from '@/features/right-sidebar/store';import { revealOrcaWorkersTab } from '@/features/right-sidebar/plugins/orca-workers/actions';import { normalizeProjectKey } from './lib/projectGrouping';@@ -1232,7 +1231,11 @@ export function NewMakerDraftRoute() {} = useAgentCapabilities(capabilityAgentKind, effectiveDeviceLinkDeviceId);// device-link「以被控端为准」:远程草稿用被控端经隧道带来的 providers(per-provider,含 fast 能力);// 本地草稿用本机 providers。fast 判定统一交给 resolveFastSupported(不在控制端另写远程逻辑)。- const { providers: localProviders, loading: localProvidersLoading } = useProviders();+ const {+ providers: localProviders,+ loading: localProvidersLoading,+ loadFailed: localProvidersLoadFailed,+ } = useProviders();const modelEnginePrefsVersion = useModelEnginePrefsVersion();const modelPresetVersion = useProviderModelMemoryVersion();const hasLegacyDefaultChoice = useMemo(@@ -2376,65 +2379,26 @@ export function NewMakerDraftRoute() {// 立即建会话记录并 navigate 过去。建会话约定与本文件其它 createSession 路径一致// (createSession + makerChatStore.setSessionRuntime + navigate)。//- // SSH 始终取本地(controller)的 provider/fast/effort 上下文,不复用 device-link 派生值。- // providerId 只保留用户显式选中且仍有效的来源,否则 null(默认路由,不固化默认来源)。- // 使用 draftInitialModel(用户在 composer 里看到的模型),而不是 chatPrefs.model- // (当 device-link 草稿活跃时 chatPrefs.model 是旧的 controller-local 值)。- // bridge 模型(chatgpt/ / xai/)在远程模式不可用(不经本地 compat-proxy),需降级。- // 非 bridge 模型也必须在已连接的本地来源中存在,否则 SSH 会话首消息会被阻塞。- const sshConnected = filterChatBridgedCodexProviders(- connectedProvidersForAgent(localProviders, capabilityAgentKind),- capabilityAgentKind,- true,- );- // admissionFiltered:SSH 候选是「挑一个可路由模型」的清单,停用条目与能力模型- // 不参与(降级兜底也不能落到停用模型上,PR #744 review)。- const sshVisibleModels = deriveModelsFromProviders(sshConnected, capabilityAgentKind, {- admissionFiltered: true,- }).filter((m) => !isSubscriptionDirectModel(m.id));- let sshModel = draftInitialModel;- if (isSubscriptionDirectModel(sshModel) || !sshVisibleModels.some((m) => m.id === sshModel)) {- if (!sshVisibleModels.length) {- throw new Error(t('ccAgent.draft.createSessionFailed'));- }- sshModel = sshVisibleModels[0].id;- }- // 使用 chatInitialProviderId(显示给用户的来源,device-link 活跃时取镜像值)而非- // chatPrefs.providerId(可能是旧的 controller-local 值)。- const rawProviderId = chatInitialProviderId ?? null;- const sshLocalSourceId = effectiveSourceIdForModel(- sshConnected,- rawProviderId,- sshModel,- capabilityAgentKind,- );- // 固定已通过 SSH 筛选的实际来源,避免 null 默认路由重新选回被排除的本机账号。- const sshProviderId = sshLocalSourceId;- // fast mode:来源不支持就关闭;支持时保留用户在 composer 里看到的 effectiveFastMode- // (device-link 草稿活跃时来自 dlSel/deviceLinkInitial,本地草稿来自 per-model 记忆)。- const sshSourceSupportsFast = sessionModelSupportsFastMode(- sshConnected,- sshProviderId,- sshModel,- capabilityAgentKind,- );- const sshFastMode = sshSourceSupportsFast ? effectiveFastMode : false;- // effort: 用 draftInitialEffort(用户在 composer 里看到的值)作 currentEffort,- // 再由 resolveNewMakerDraftEffort 按本地 SSH model 支持的 levels 做 clamp。- const sshLocalProvider = sshLocalSourceId- ? sshConnected.find((p) => p.id === sshLocalSourceId)- : undefined;- const sshLocalModelDesc = sshLocalProvider- ? getModel(sshLocalProvider, sshModel, capabilityAgentKind)- : undefined;- const sshEffort = resolveNewMakerDraftEffort({- currentEffort: draftInitialEffort,- presetEffort: sshLocalSourceId- ? getProviderModelEffort(capabilityAgentKind, sshLocalSourceId, sshModel)- : undefined,- efforts: sshLocalModelDesc?.efforts ?? [],- defaultEffort: sshLocalModelDesc?.defaultEffort ?? null,+ // SSH uses the controller catalog; device-link keeps its own discovery path.+ const selection = resolveSshSessionModelSelection({+ providers: localProviders,+ loading: localProvidersLoading,+ loadFailed: localProvidersLoadFailed,+ agentKind: capabilityAgentKind,+ preferred: {+ model: draftInitialModel,+ providerId: chatInitialProviderId,+ effort: draftInitialEffort,+ fastMode: effectiveFastMode,+ },+ getPresetEffort: getProviderModelEffort,});+ if (!selection.ok) {+ throw new SshModelSelectionError(selection.reason);+ }+ const {+ model: sshModel, providerId: sshProviderId, effort: sshEffort, fastMode: sshFastMode,+ } = selection;try {const newSession = await createSession({agentKind: draftVendor,@@ -2531,6 +2495,7 @@ export function NewMakerDraftRoute() {effectiveDeviceLinkDeviceId,localProviders,localProvidersLoading,+ localProvidersLoadFailed,effectiveCollab,capabilityAgentKind,effectivePlanMode,diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/sshModelFixtures.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshModelFixtures.tsnew file mode 100644index 0000000000..83be6d2e64--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshModelFixtures.ts@@ -0,0 +1,39 @@+import type { AgentKind, CatalogModel, ProviderView } from '@cindy/model-providers';++export function sshModel(id: string, patch: Partial<CatalogModel> = {}): CatalogModel {+ return {+ id,+ name: id,+ contextWindow: 200_000,+ efforts: ['low', 'high'],+ defaultEffort: 'high',+ ...patch,+ };+}++export function sshProvider(+ id: string,+ models = [sshModel('available-model')],+ agent: AgentKind = 'codex',+): ProviderView {+ return {+ id,+ name: id,+ source: 'builtin',+ connected: true,+ agents: [agent],+ auth: { method: 'apiKey' },+ routing: { [agent]: { upstream: 'https://example.test', authStrategy: 'api-key-header' } },+ models: { [agent]: models },+ };+}++export function sshNativeCodexProvider(models = [sshModel('available-model')]): ProviderView {+ const provider = sshProvider('openai', models);+ provider.auth = { method: 'oauth' };+ provider.routing.codex = {+ upstream: 'https://chatgpt.com/backend-api/codex',+ authStrategy: 'oauth-passthrough',+ };+ return provider;+}diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.tsnew file mode 100644index 0000000000..7ec0f8377b--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.ts@@ -0,0 +1,175 @@+import { describe, expect, it, vi } from 'vitest';+import type { CatalogModel, ProviderView } from '@cindy/model-providers';+import { resolveSshSessionModelSelection } from '../sshSessionModelSelection';+import { sshModel, sshProvider, sshNativeCodexProvider } from './sshModelFixtures';++function resolve(+ providers: ProviderView[],+ patch: Partial<Parameters<typeof resolveSshSessionModelSelection>[0]> = {},+) {+ return resolveSshSessionModelSelection({+ providers,+ loading: false,+ loadFailed: false,+ agentKind: 'codex',+ preferred: { model: 'gpt-5.5-codex', effort: 'medium', fastMode: true },+ ...patch,+ });+}++describe('SSH creation model selection', () => {+ it('replaces a removed model with an actual catalog route without naming another default', () => {+ expect(resolve([sshNativeCodexProvider()])).toEqual({+ ok: true,+ model: 'available-model',+ providerId: 'openai',+ effort: 'high',+ fastMode: false,+ });+ });++ it('preserves a native preference and uses its effort and Fast capabilities', () => {+ const preferred = {+ model: 'chosen',+ providerId: 'openai',+ effort: 'low',+ fastMode: true,+ } as const;+ expect(+ resolve(+ [+ sshProvider('xd', [sshModel('chosen')]),+ sshNativeCodexProvider([+ sshModel('chosen', { efforts: ['low'], supportsFastMode: true }),+ ]),+ ],+ { preferred },+ ),+ ).toEqual({ ok: true, ...preferred });+ });++ it.each(['xd', 'custom-responses', 'openai-second', 'removed-account'])(+ 'rejects an explicit %s connection instead of silently switching accounts',+ (providerId) => {+ expect(+ resolve([sshNativeCodexProvider(), sshProvider(providerId)], {+ preferred: { model: 'available-model', providerId, effort: 'high', fastMode: false },+ }),+ ).toEqual({ ok: false, reason: 'unsupported-codex-source' });+ },+ );++ it.each(['xd', 'custom-responses', 'openai-second', 'openai'])(+ 'does not treat the controller-only %s route as a remote default login',+ (id) => {+ const provider = sshProvider(id, [sshModel('codex/gpt-5.6-luna')]);+ provider.routing.codex!.wireProtocol = 'openai-responses';+ if (id === 'openai-second') provider.auth = { method: 'oauth', native: 'codex' };+ expect(resolve([provider])).toEqual({ ok: false, reason: 'unsupported-codex-source' });+ },+ );++ it('ignores gateway aliases when choosing a fallback from a mixed catalog', () => {+ expect(+ resolve([+ sshProvider('xd', [sshModel('codex/gpt-5.6-luna')]),+ sshNativeCodexProvider([sshModel('native-model-from-discovery')]),+ ]),+ ).toMatchObject({ ok: true, providerId: 'openai', model: 'native-model-from-discovery' });+ });++ it.each(['chatgpt/only-local', 'xai/only-local'])(+ 'rejects subscription bridge model %s',+ (id) => {+ expect(resolve([sshNativeCodexProvider([sshModel(id)])])).toEqual({+ ok: false,+ reason: 'no-route',+ });+ },+ );++ it('rejects a catalog containing only local bridges or independent OAuth accounts', () => {+ const bridge = sshProvider('bridge');+ bridge.routing.codex!.wireProtocol = 'openai-chat';+ const account = sshProvider('openai-second');+ account.auth = { method: 'oauth', native: 'codex' };+ expect(resolve([bridge, account])).toEqual({ ok: false, reason: 'unsupported-codex-source' });+ });++ it.each([+ { disabled: true },+ { status: 'retired' },+ { mode: 'image_generation' },+ ] satisfies Partial<CatalogModel>[])('rejects a non-selectable model: %j', (patch) => {+ expect(resolve([sshNativeCodexProvider([sshModel('bad', patch)])])).toEqual({+ ok: false,+ reason: 'no-route',+ });+ });++ it.each(['disconnected', 'suspended', 'failed-discovery', 'disabled'])(+ 'excludes the native login when %s',+ (state) => {+ const provider = sshNativeCodexProvider();+ if (state === 'disconnected') provider.connected = false;+ if (state === 'suspended') provider.suspended = true;+ if (state === 'failed-discovery') {+ provider.modelDiscoveryFailure = { kind: 'upstream', at: '2026-09-22T00:00:00Z' };+ }+ if (state === 'disabled') provider.routing.codex!.disabled = true;+ expect(resolve([provider])).toEqual({ ok: false, reason: 'no-route' });+ },+ );++ it('does not confuse model visibility with route admission', () => {+ expect(+ resolve([sshNativeCodexProvider([sshModel('hidden', { defaultEnabled: false })])]),+ ).toMatchObject({+ ok: true,+ model: 'hidden',+ providerId: 'openai',+ });+ });++ it('applies saved tuning to the resolved model and clamps unsupported effort', () => {+ const getPresetEffort = vi.fn(() => 'max' as const);+ const getPresetFast = vi.fn(() => true);+ expect(+ resolve([sshNativeCodexProvider([sshModel('available-model', { supportsFastMode: true })])], {+ getPresetEffort,+ getPresetFast,+ }),+ ).toMatchObject({ ok: true, effort: 'high', fastMode: true });+ expect(getPresetEffort).toHaveBeenCalledWith('codex', 'openai', 'available-model');+ expect(getPresetFast).toHaveBeenCalledWith('codex', 'openai', 'available-model');+ });++ it('retains the ordinary draft policy when the catalog has no effort levels', () => {+ expect(+ resolve([sshNativeCodexProvider([sshModel('plain', { efforts: [], defaultEffort: null })])]),+ ).toMatchObject({+ ok: true,+ effort: 'medium',+ fastMode: false,+ });+ });++ it.each([+ { loading: true, loadFailed: false, reason: 'catalog-loading' },+ { loading: true, loadFailed: true, reason: 'catalog-error' },+ { loading: false, loadFailed: true, reason: 'catalog-error' },+ ])('never selects from unready/stale data: %j', ({ loading, loadFailed, reason }) => {+ expect(resolve([sshNativeCodexProvider()], { loading, loadFailed })).toEqual({+ ok: false,+ reason,+ });+ });++ it.each(['claude-code', 'pi'] as const)('preserves ordinary SSH creation for %s', (agentKind) => {+ expect(resolve([sshProvider('source', undefined, agentKind)], { agentKind })).toMatchObject({+ ok: true,+ providerId: 'source',+ model: 'available-model',+ });+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.tsnew file mode 100644index 0000000000..0a254c9724--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts@@ -0,0 +1,95 @@+import {+ connectedProvidersForAgent,+ effectiveSourceIdForModel,+ getModel,+ isOpenAiSubscriptionProvider,+ type AgentKind,+ type ProviderView,+} from '@cindy/model-providers';+import { deriveModelsFromProviders, filterChatBridgedCodexProviders } from '@/lib/providerModels';+import type { Effort } from '@/lib/userPreferences.types';+import { isSubscriptionDirectModel } from '../../../shared/subscriptionModels';+import { resolveNewMakerDraftEffort } from './newMakerDraftModelPrefs';++export const sshModelSelectionErrorKeys = {+ 'catalog-loading': 'settings.remote.startSession.modelCatalogLoading',+ 'catalog-error': 'settings.remote.startSession.modelCatalogFailed',+ 'no-route': 'settings.remote.startSession.noCompatibleModel',+ 'unsupported-codex-source': 'settings.remote.startSession.unsupportedCodexSource',+} as const;++/** Preserve a local creation failure across the remote-folder dialog callback. */+export class SshModelSelectionError extends Error {+ constructor(readonly reason: keyof typeof sshModelSelectionErrorKeys) {+ super(reason);+ this.name = 'SshModelSelectionError';+ }+}++/** Resolve catalog models within the SSH adapter's implemented routing boundary.+ * Codex uses the remote default login: controller gateway/custom/account routes+ * are not forwarded by maker-host, and thread/start sends the model unchanged.+ * This does not discover remote credentials or prove remote network connectivity. */+export function resolveSshSessionModelSelection(args: {+ providers: ProviderView[];+ loading: boolean;+ loadFailed: boolean;+ agentKind: AgentKind;+ 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;+}):+ | { ok: false; reason: keyof typeof sshModelSelectionErrorKeys }+ | { ok: true; model: string; providerId: string; effort: Effort; fastMode: boolean } {+ if (args.loadFailed) return { ok: false, reason: 'catalog-error' };+ 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') {+ return { ok: false, reason: 'unsupported-codex-source' };+ }+ const routeProviders =+ agentKind === 'codex'+ ? args.providers.filter(+ (provider) => provider.id === 'openai' && isOpenAiSubscriptionProvider(provider),+ )+ : args.providers;+ if (agentKind === 'codex' && routeProviders.length === 0) {+ return { ok: false, reason: 'unsupported-codex-source' };+ }+ const providers = filterChatBridgedCodexProviders(+ connectedProvidersForAgent(routeProviders, agentKind),+ agentKind,+ true,+ ).filter((provider) => !provider.modelDiscoveryFailure);+ const models = deriveModelsFromProviders(providers, agentKind, {+ admissionFiltered: true,+ }).filter((model) => !isSubscriptionDirectModel(model.id));+ const model = models.some((candidate) => candidate.id === preferred.model)+ ? preferred.model+ : models[0]?.id;+ if (!model) return { ok: false, reason: 'no-route' };++ // 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, null, model, agentKind);+ const provider = providers.find((candidate) => candidate.id === providerId);+ const descriptor = provider && getModel(provider, model, agentKind);+ if (!providerId || !descriptor) return { ok: false, reason: 'no-route' };+ return {+ ok: true,+ model,+ providerId,+ effort: resolveNewMakerDraftEffort({+ currentEffort: preferred.effort,+ presetEffort: args.getPresetEffort?.(agentKind, providerId, model),+ efforts: descriptor.efforts,+ defaultEffort: descriptor.defaultEffort,+ }),+ fastMode:+ descriptor.supportsFastMode === true &&+ (args.getPresetFast?.(agentKind, providerId, model) ?? preferred.fastMode),+ };+}diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 9fc21a1e72..4bba514b9a 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -647,12 +647,16 @@"agentProxyEnvPending": "Waiting to apply env vars → {{url}} (takes effect automatically once the host connects)"},"startSession": {+ "unsupportedCodexSource": "SSH Codex currently supports only default OpenAI subscription models; other local provider settings are not forwarded. Select a model from that source on the new task page and sync the remote login.","title": "Start a remote Codex session","hint": "Create a new Maker pinned to this machine. Codex runs on the remote, you chat from here. Working directory supports ~ expansion; if it doesn't exist you'll be asked to create it.","start": "Start","created": "Remote session created on {{hostId}}","createFailed": "Failed to create remote session","errorWorkdirEmpty": "Please enter a remote working directory",+ "modelCatalogLoading": "The model catalog is not ready yet. Try again shortly.",+ "modelCatalogFailed": "Could not load the model catalog. Refresh it in model settings and try again.",+ "noCompatibleModel": "No model is available for SSH. Connect a compatible provider in model settings first.","errorWorkdirIsFile": "{{path}} exists but is not a directory; pick another path","confirmCreateTitle": "Directory does not exist — create it?","confirmCreateDescription": "{{path}} does not exist on {{hostId}}. Click confirm to run mkdir -p on the remote and then enter the session.",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex a2166eb83a..8a456715f6 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -647,12 +647,16 @@"agentProxyEnvPending": "環境変数の適用待ち → {{url}}(ホスト接続後に自動で反映)"},"startSession": {+ "unsupportedCodexSource": "SSH Codex は現在、デフォルトの OpenAI サブスクリプションモデルのみ対応しており、他のローカルプロバイダー設定は転送されません。新規タスク画面でこの接続のモデルを選択し、リモートのログイン状態を同期してください。","title": "このリモートで Codex セッションを開始","hint": "このマシンに固定された新しい Maker を作成。Codex はリモートで動き、こちらからチャットします。作業ディレクトリは ~ 展開に対応、存在しない場合は確認後に作成します。","start": "開始","created": "{{hostId}} にリモートセッションを作成しました","createFailed": "リモートセッションの作成に失敗","errorWorkdirEmpty": "リモートの作業ディレクトリを入力してください",+ "modelCatalogLoading": "モデル一覧の準備ができていません。しばらくしてから再試行してください",+ "modelCatalogFailed": "モデル一覧を読み込めませんでした。モデル設定で更新してから再試行してください",+ "noCompatibleModel": "SSH で利用できるモデルがありません。モデル設定で対応するプロバイダーに接続してください","errorWorkdirIsFile": "{{path}} は既に存在しますがディレクトリではありません、別のパスを選んでください","confirmCreateTitle": "ディレクトリが存在しません、作成しますか?","confirmCreateDescription": "{{path}} は {{hostId}} に存在しません。確認するとリモートで mkdir -p を実行してからセッションに入ります。",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex d185e21e6c..cd22406958 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -647,12 +647,16 @@"agentProxyEnvPending": "환경 변수 적용 대기 중 → {{url}} (호스트 연결 후 자동 적용)"},"startSession": {+ "unsupportedCodexSource": "SSH Codex는 현재 기본 OpenAI 구독 모델만 지원하며, 다른 로컬 제공자 설정은 전달하지 않습니다. 새 작업 화면에서 해당 연결의 모델을 선택하고 원격 로그인 상태를 동기화하세요.","title": "이 원격에서 Codex 세션 시작","hint": "이 머신에 고정된 새 Maker 를 만듭니다. Codex 는 원격에서 실행되고 여기서 채팅합니다. 작업 디렉토리는 ~ 확장을 지원하며, 없으면 확인 후 생성합니다.","start": "시작","created": "{{hostId}} 에 원격 세션을 만들었습니다","createFailed": "원격 세션 생성 실패","errorWorkdirEmpty": "원격 작업 디렉토리를 입력하세요",+ "modelCatalogLoading": "모델 목록이 아직 준비되지 않았습니다. 잠시 후 다시 시도하세요",+ "modelCatalogFailed": "모델 목록을 불러오지 못했습니다. 모델 설정에서 새로고침한 후 다시 시도하세요",+ "noCompatibleModel": "SSH에서 사용할 수 있는 모델이 없습니다. 먼저 모델 설정에서 호환되는 제공자에 연결하세요","errorWorkdirIsFile": "{{path}} 가 이미 존재하지만 디렉토리가 아닙니다, 다른 경로를 선택하세요","confirmCreateTitle": "디렉토리가 존재하지 않습니다, 만들까요?","confirmCreateDescription": "{{path}} 가 {{hostId}} 에 존재하지 않습니다. 확인을 누르면 원격에서 mkdir -p 를 실행한 다음 세션에 진입합니다.",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex e569b96690..b1875fe27f 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -647,12 +647,16 @@"agentProxyEnvPending": "等待应用环境变量 → {{url}}(主机连接后自动生效)"},"startSession": {+ "unsupportedCodexSource": "SSH Codex 目前仅支持默认 OpenAI 订阅模型,不会转发本机其他供应商的配置。请在新建任务页选择该来源的模型,并同步远端登录态","title": "在这台远端开新 Codex 任务","hint": "新建一个绑定到这台机器的 Maker。Codex 跑在远端,你在这里和它聊。工作目录支持 ~ 展开,不存在会确认后创建。","start": "开始","created": "已在 {{hostId}} 上创建远端任务","createFailed": "创建远端任务失败","errorWorkdirEmpty": "请输入远端工作目录",+ "modelCatalogLoading": "模型目录尚未就绪,请稍后重试",+ "modelCatalogFailed": "模型目录读取失败,请在模型设置中刷新后重试",+ "noCompatibleModel": "没有可用于 SSH 远端的模型,请先在模型设置中连接兼容的供应商","errorWorkdirIsFile": "{{path}} 已存在但不是目录,换一个路径","confirmCreateTitle": "目录不存在,创建吗?","confirmCreateDescription": "{{path}} 在 {{hostId}} 上不存在。点确认会在远端跑 mkdir -p 创建它,然后进入任务。",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex ae6193083b..96d465be9d 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -647,12 +647,16 @@"agentProxyEnvPending": "等待應用環境變數 → {{url}}(主機連線後自動生效)"},"startSession": {+ "unsupportedCodexSource": "SSH Codex 目前僅支援預設 OpenAI 訂閱模型,不會轉送本機其他供應商的設定。請在新增任務頁選擇該來源的模型,並同步遠端登入狀態","title": "在這臺遠端開新 Codex 任務","hint": "新建一個繫結到這臺機器的 Maker。Codex 跑在遠端,你在這裡和它聊。工作目錄支援 ~ 展開,不存在會確認後建立。","start": "開始","created": "已在 {{hostId}} 上建立遠端任務","createFailed": "建立遠端任務失敗","errorWorkdirEmpty": "請輸入遠端工作目錄",+ "modelCatalogLoading": "模型目錄尚未就緒,請稍後重試",+ "modelCatalogFailed": "模型目錄讀取失敗,請在模型設定中重新整理後重試",+ "noCompatibleModel": "沒有可用於 SSH 遠端的模型,請先在模型設定中連接相容的供應商","errorWorkdirIsFile": "{{path}} 已存在但不是目錄,換一個路徑","confirmCreateTitle": "目錄不存在,建立嗎?","confirmCreateDescription": "{{path}} 在 {{hostId}} 上不存在。點確認會在遠端跑 mkdir -p 建立它,然後進入任務。",diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.tsindex a1dc212d1f..01342a446e 100644--- a/packages/maker-core/src/agents/codex/index.test.ts+++ b/packages/maker-core/src/agents/codex/index.test.ts@@ -14886,6 +14886,30 @@ describe('CodexAgent MCP thread context hooks', () => {await handle.close();});+ it.each(['gpt-5.4', 'future-native-catalog-model'])(+ 'sends native SSH model %s unchanged through the remote default provider', async (model) => {+ const agent = new CodexAgent(createDeps());+ const host = installFakeHost(agent, (method) => method === Method.TurnStart+ ? { turn: { id: 'remote-native-turn' } } : undefined);+ const handle = await agent.startSession({+ sessionId: 'session-remote-native-route', model, providerId: 'openai',+ workingDir: '/repo', permissionMode: 'auto', remoteHostId: 'gpu-box',+ });+ try {+ const startParams = host.request.mock.calls.find(([method]) => method === Method.ThreadStart)?.[1];+ expect(startParams).toMatchObject({ model });+ // SSH does not install controller provider configs. Creation must admit+ // only native catalog IDs, not gateway aliases or custom connections.+ expect(startParams).not.toHaveProperty('modelProvider');+ await handle.send({ type: 'user', content: 'hello' });+ const turnParams = host.request.mock.calls.find(([method]) => method === Method.TurnStart)?.[1];+ expect(turnParams).toMatchObject({ model });+ } finally {+ await handle.close();+ }+ },+ );+it('enables the built-in reviewer for remote OAuth-subscription sessions (Auto)', async () => {// 远程 daemon 用的是 auth sync 推过去的同一份订阅凭证, reviewer 调用// 发生在 daemon 本地 — 订阅下与本地同构, 不再一律回退 untrusted。