Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(remote): discover SSH Codex models on the execution host

DavidShen340888c77d3a
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.ts
index bf7826b74b..9d0c5eb151 100644
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@ -17,6 +17,7 @@ import { createMediaDownloadContext } from '../cindy-media/mediaDownloadApproval
import { isCodexAccountProvider, codexAccountHome, setCodexAccountRetirement } from './codex-account-auth.js';
import { CodexThreadLocations } from './codex-thread-locations.js';
import { getActiveAppSession } from '../appSessionState.js';
+import { remoteCodexProvider } from './ssh-codex-models.js';
import { getCustomProvider, updateCustomProviderIfUnchanged } from './custom-provider-store.js';
import { refreshCustomProvidersIntoCatalog } from './createDesktopProviderService.js';
import { acquireWorktreeRuntimeLease, releaseWorktreeRuntimeLease, type WorktreeRuntimeLease } from '../worktree/runtimeLeases';
@@ -139,7 +140,7 @@ import { resetProviderModelAutoRefreshCooldowns } from './provider-model-auto-re
import { getThinkingEnabledFromMemory } from './newMakerDefaultsCache.js';
import { getSessionFastMode } from './session-effort-store.js';
import { createSshDaemonTransport } from './codex-remote-transport.js';
-import { getRemoteSshPool, broadcastSilentInstallStatus } from '../remote-ssh/index.js';
+import { getRemoteSshPool, broadcastSilentInstallStatus, ensureRemoteAgentInstalledOrInstall } from '../remote-ssh/index.js';
import {
getRemoteAgentProxyEnv,
reconcileCodexAgentProxyEnv,
@@ -2845,6 +2846,33 @@ export function getMakerIfReady(): Maker | null {
return _maker;
}
+export async function listSshCodexProviders(hostId: string) {
+ const owner = getActiveAppSession().generation;
+ const remote = getRemoteSshPool().get(hostId);
+ if (!remote || remote.getStatus() !== 'ready') throw new Error('SSH host is not connected');
+ let changed = false;
+ const stop = remote.onStatus(() => { changed = true; });
+ const assertCurrent = () => {
+ if (changed || getActiveAppSession().generation !== owner ||
+ getRemoteSshPool().get(hostId) !== remote || remote.getStatus() !== 'ready') {
+ throw new Error('SSH model request is stale');
+ }
+ };
+ try {
+ await ensureRemoteAgentInstalledOrInstall(hostId, 'codex');
+ assertCurrent();
+ getMaker();
+ const agent = _codexAgent;
+ if (!agent) throw new Error('Codex is not ready');
+ const models = await agent.listRemoteModels(hostId);
+ assertCurrent();
+ if (_codexAgent !== agent) throw new Error('Codex runtime changed');
+ return [remoteCodexProvider(models)];
+ } finally {
+ stop();
+ }
+}
+
/** Register Pi after a managed runtime retry and notify local renderers. */
export function registerPiAgentIfAvailable(): boolean {
const register = _registerPiAgent;
diff --git a/apps/desktop/src/main/maker-host/ssh-codex-models.ts b/apps/desktop/src/main/maker-host/ssh-codex-models.ts
new file mode 100644
index 0000000000..d27a7b00bd
--- /dev/null
+++ b/apps/desktop/src/main/maker-host/ssh-codex-models.ts
@@ -0,0 +1,20 @@
+import type { CodexModelListItem } from '@cindy/maker-core';
+import type { ProviderView } from '@cindy/model-providers';
+import { mapCodexAppServerModelsToCatalog } from './codex-model-discovery.js';
+
+/** Remote native identity. `openai` retains the existing SSH session wire contract;
+ * no controller account, override, gateway route or credential enters this view. */
+export function remoteCodexProvider(models: readonly CodexModelListItem[]): ProviderView {
+ const preferred = models.find((model) => model.isDefault && !model.hidden)?.model;
+ const mapped = mapCodexAppServerModelsToCatalog(models).map((model) => ({
+ ...model, defaultEnabled: true,
+ }));
+ mapped.sort((a, b) => Number(b.id === preferred) - Number(a.id === preferred));
+ mapped.forEach((model, index) => { model.sortOrder = index; });
+ return {
+ id: 'openai', name: 'Codex', source: 'builtin', connected: true,
+ agents: ['codex'], auth: { method: 'oauth', native: 'codex' },
+ routing: { codex: { upstream: 'https://chatgpt.com/backend-api/codex', authStrategy: 'oauth-passthrough' } },
+ models: { codex: mapped },
+ };
+}
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index dfb9521b0c..011cdf245e 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -33,6 +33,7 @@ import { projectRemoteBotDelegations } from './remoteBotDelegations.js';
*/
import { readCodexContextWindowInfo } from '../maker-host/codex-context-window.js';
+import { readSshCodexModelList, assertSshCodexModel } from '../remote-ssh/codex-model-list.js';
import { prepareCodexCustomContextCatalog } from '../maker-host/codex-custom-context-catalog.js';
import { inferProviderIdForModel } from '../maker-host/provider-route.js';
import { resolveConfiguredContextWindow, resolveDesktopModelContextProviderId } from '../maker-host/model-context-settings.js';
@@ -460,6 +461,7 @@ import {
ensureCodexMcpBridgeStartedForRemote,
finalizeCodexAfterAuthModeChange,
getMaker,
+ listSshCodexProviders,
getMakerIfReady,
getPluginRegistry,
isBotToolsetAvailable,
@@ -6684,7 +6686,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
agent: AgentKind,
model: string,
providerId: string | null,
+ remoteHostId?: string | null,
): Promise<string | undefined> {
+ if (agent === 'codex' && remoteHostId) {
+ assertSshCodexModel(await readSshCodexModelList({ id: remoteHostId }, listSshCodexProviders), model, providerId);
+ return undefined;
+ }
const verdict = await verdictForModelRoute(agent, model, providerId);
if (verdict.kind === 'reject') {
throwIpcError(
@@ -6780,8 +6787,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
verifiedResume = false;
}
}
- if (!verifiedResume) {
- const reroute = await assertModelRouteUsable(o.agentKind, o.model, o.providerId ?? null);
+ if (!verifiedResume || (o.agentKind === 'codex' && o.remoteHostId)) {
+ const reroute = await assertModelRouteUsable(o.agentKind, o.model, o.providerId ?? null, o.remoteHostId);
if (reroute && shouldApplyExclusiveProviderRerouteLive(o.providerId)) {
o.providerId = reroute;
}
@@ -16018,7 +16025,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
currentProviderId,
);
let effectiveProviderId = requestedProviderId;
- if (routeExplicit) {
+ const sshCodexProviders = runtimeStatus.remoteHostId && runtimeStatus.agentKind === 'codex'
+ ? await readSshCodexModelList({ id: runtimeStatus.remoteHostId }, listSshCodexProviders)
+ : null;
+ if (sshCodexProviders) {
+ assertSshCodexModel(sshCodexProviders, model, guardProviderId);
+ } else if (routeExplicit) {
const dbAgentKind = getSessionDbAgentKind(sessionId);
if (dbAgentKind) {
// 停用轴准入只依赖目标路由(guard = 显式目标 ?? 恢复出的源),与源 provider
@@ -16039,7 +16051,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
}
if (runtimeStatus.remoteHostId) {
const targetId = effectiveProviderId === undefined ? currentProviderId : effectiveProviderId;
- const target = getActiveCatalog().providers.find((provider) => provider.id === targetId);
+ const target = (sshCodexProviders ?? getActiveCatalog().providers).find((provider) => provider.id === targetId);
if (target && isLocalOnlyProviderForAgent(target, dbToMakerAgentKind(runtimeStatus.agentKind))) {
throwIpcError('INVALID_PARAMS', 'This provider requires local execution');
}
@@ -16058,7 +16070,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
effectiveProviderId === null
? null
: (normalizeSessionProviderId(effectiveProviderId) ?? currentProviderId);
- const runtimeProviders = await getDesktopProviderService().listProviders({
+ const runtimeProviders = sshCodexProviders ?? await getDesktopProviderService().listProviders({
allowSideEffects: false,
catalog: getActiveCatalog(),
});
@@ -16350,7 +16362,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
let modelWindowRebuilt = false;
if (runtimeAgentKind && (runtimeRouteChanged || confirmedContextWindow !== undefined)) {
const resolveRouteWindow = (_agentKind: string, modelId: string, pid: string | null) =>
- resolveConfiguredContextWindow(getActiveCatalog(), runtimeAgentKind, pid, modelId);
+ sshCodexProviders
+ ? resolveVerifiedContextWindow({ providers: sshCodexProviders }, runtimeAgentKind, pid ?? 'openai', modelId)
+ : resolveConfiguredContextWindow(getActiveCatalog(), runtimeAgentKind, pid, modelId);
const verifiedTargetWindow = lookupVerifiedContextWindow(
resolveRouteWindow,
model,
diff --git a/apps/desktop/src/main/remote-ssh/__tests__/codex-model-list.test.ts b/apps/desktop/src/main/remote-ssh/__tests__/codex-model-list.test.ts
new file mode 100644
index 0000000000..0f3b6d13c8
--- /dev/null
+++ b/apps/desktop/src/main/remote-ssh/__tests__/codex-model-list.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { CodexModelListItem } from '@cindy/maker-core';
+vi.mock('electron', () => ({ app: {} }));
+import { remoteCodexProvider } from '../../maker-host/ssh-codex-models.js';
+import { readSshCodexModelList, assertSshCodexModel } from '../codex-model-list.js';
+
+describe('SSH Codex model projection and admission', () => {
+ const native = (model: string, patch: Partial<CodexModelListItem> = {}) => ({
+ id: model, model, displayName: model, description: '', hidden: false, isDefault: false,
+ supportedReasoningEfforts: [{ reasoningEffort: 'low', description: '' }],
+ defaultReasoningEffort: 'low', additionalSpeedTiers: [], serviceTiers: [], ...patch,
+ }) as CodexModelListItem;
+ it('uses remote membership, default model, effort and Fast without controller discovery', () => {
+ const provider = remoteCodexProvider([native('other'), native('hidden', { hidden: true }),
+ native('remote-default', { isDefault: true, additionalSpeedTiers: ['fast'] })]);
+ expect(provider.models.codex?.map((model) => model.id)).toEqual(['remote-default', 'other']);
+ expect(provider.models.codex?.[0]).toMatchObject({ efforts: ['low'], defaultEffort: 'low', supportsFastMode: true });
+ expect(provider.connected).toBe(true);
+ expect(provider.models.codex?.[0].contextWindowVerified).not.toBe(true);
+ expect(assertSshCodexModel([provider], 'remote-default', 'openai').id).toBe('remote-default');
+ expect(() => assertSshCodexModel([provider], 'local-only', 'openai')).toThrow('[INVALID_PARAMS]');
+ expect(() => assertSshCodexModel([provider], 'remote-default', 'xd')).toThrow('[INVALID_PARAMS]');
+ });
+ it('validates input before reading and never exposes an RPC secret in an error', async () => {
+ const read = vi.fn().mockRejectedValue(new Error('test-secret-not-for-renderer'));
+ await expect(readSshCodexModelList({ id: 123 }, read)).rejects.toThrow('[INVALID_PARAMS]');
+ await expect(readSshCodexModelList({ id: 'x'.repeat(257) }, read)).rejects.toThrow('[INVALID_PARAMS]');
+ expect(read).not.toHaveBeenCalled();
+ await expect(readSshCodexModelList({ id: 'builder' }, read)).rejects.toThrow('[SSH_EXEC_FAILED] Unable to read remote Codex models; reconnect and retry');
+ });
+ it('treats an empty remote snapshot as a retryable failure rather than a local connection prompt', async () => {
+ await expect(readSshCodexModelList({ id: 'builder' }, async () => [remoteCodexProvider([])]))
+ .rejects.toThrow('[SSH_EXEC_FAILED]');
+ });
+});
diff --git a/apps/desktop/src/main/remote-ssh/__tests__/remoteHostMutationContract.test.ts b/apps/desktop/src/main/remote-ssh/__tests__/remoteHostMutationContract.test.ts
index 5a583fd373..6085415550 100644
--- a/apps/desktop/src/main/remote-ssh/__tests__/remoteHostMutationContract.test.ts
+++ b/apps/desktop/src/main/remote-ssh/__tests__/remoteHostMutationContract.test.ts
@@ -14,6 +14,12 @@ function handlerBody(channel: string, nextChannel: string): string {
}
describe('remote SSH managed-host mutation contract', () => {
+ it('validates the app renderer before remote Codex discovery can start a daemon', () => {
+ const body = handlerBody('LIST_CODEX_MODELS', 'CHECK_CODEX_AUTH');
+ const guard = body.indexOf('assertTrustedAppRendererEvent(event);');
+ expect(guard).toBeGreaterThan(-1);
+ expect(guard).toBeLessThan(body.indexOf('readSshCodexModelList(args, listSshCodexProviders)'));
+ });
it.each([
['LIST', 'RELOAD_CONFIG'],
['RELOAD_CONFIG', 'ADD'],
diff --git a/apps/desktop/src/main/remote-ssh/codex-model-list.ts b/apps/desktop/src/main/remote-ssh/codex-model-list.ts
new file mode 100644
index 0000000000..8c44e3c8d8
--- /dev/null
+++ b/apps/desktop/src/main/remote-ssh/codex-model-list.ts
@@ -0,0 +1,29 @@
+import type { ProviderView } from '@cindy/model-providers';
+import { requireObject, requireString, throwIpcError } from '../utils/ipcValidate.js';
+
+export async function readSshCodexModelList(
+ input: unknown,
+ read: (hostId: string) => Promise<ProviderView[]>,
+): Promise<ProviderView[]> {
+ const id = requireString(requireObject(input).id, 'id');
+ if (id.length > 256) throwIpcError('INVALID_PARAMS', 'SSH host id is too long');
+ try {
+ const providers = await read(id);
+ if (!providers.some((provider) => provider.models.codex?.length)) {
+ throw new Error('Remote Codex returned no selectable models');
+ }
+ return providers;
+ } catch {
+ // RPC failures may contain remote configuration or credentials.
+ throwIpcError('SSH_EXEC_FAILED', 'Unable to read remote Codex models; reconnect and retry');
+ }
+}
+
+export function assertSshCodexModel(providers: ProviderView[], model: string, providerId?: string | null) {
+ if (providerId && providerId !== 'openai') {
+ throwIpcError('INVALID_PARAMS', 'SSH Codex uses the remote native connection');
+ }
+ const descriptor = providers[0]?.models.codex?.find((item) => item.id === model);
+ if (!descriptor) throwIpcError('INVALID_PARAMS', 'Model is unavailable on this SSH host; choose a remote Codex model');
+ return descriptor;
+}
diff --git a/apps/desktop/src/main/remote-ssh/index.ts b/apps/desktop/src/main/remote-ssh/index.ts
index bb4fd56c02..9eedc0dbf3 100644
--- a/apps/desktop/src/main/remote-ssh/index.ts
+++ b/apps/desktop/src/main/remote-ssh/index.ts
@@ -123,7 +123,8 @@ import {
removeRemoteMcpForwardPref,
} from './codex-remote-mcp.js';
import { ensureDaemonRunning } from '../maker-host/cc-manager-client.js';
-import { getMakerIfReady, softCloseCcSessionsForHost } from '../maker-host/index.js';
+import { getMakerIfReady, softCloseCcSessionsForHost, listSshCodexProviders } from '../maker-host/index.js';
+import { readSshCodexModelList } from './codex-model-list.js';
import { withRehydrateCloseSuppressed } from '../maker-host/rehydrateCloseSuppression.js';
import { RemoteHostHydrationQueue } from './hydration-queue.js';
@@ -153,6 +154,7 @@ export const REMOTE_SSH_INVOKE = {
RUN_AGENT_ONE_SHOT: 'maker:remote-ssh:run-agent-one-shot',
// Phase B+ — Codex credential sync
CHECK_CODEX_AUTH: 'maker:remote-ssh:check-codex-auth',
+ LIST_CODEX_MODELS: 'maker:remote-ssh:list-codex-models',
SYNC_CODEX_AUTH: 'maker:remote-ssh:sync-codex-auth',
// Phase B++ — SSH key setup wizard
LIST_LOCAL_KEYS: 'maker:remote-ssh:list-local-keys',
@@ -1703,6 +1705,10 @@ export function registerRemoteSshIpc(): void {
});
// ── Codex auth sync (Phase B+) ───────────────────────────────────────────
+ ipcMain.handle(REMOTE_SSH_INVOKE.LIST_CODEX_MODELS, async (event, args: unknown) => {
+ assertTrustedAppRendererEvent(event);
+ return readSshCodexModelList(args, listSshCodexProviders);
+ });
ipcMain.handle(REMOTE_SSH_INVOKE.CHECK_CODEX_AUTH, async (_event, args: unknown) => {
const obj = requireObject(args);
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index dea3ca8d69..380f075348 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -4764,6 +4764,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
// Two-step UX: check first (so renderer can build the right confirm
// dialog), then sync explicitly after user confirmation. The renderer
// is the trust boundary — sync handler does NOT itself prompt.
+ listCodexModels: (id: string): Promise<import('@cindy/model-providers').ProviderView[]> =>
+ ipcRenderer.invoke('maker:remote-ssh:list-codex-models', { id }),
checkCodexAuth: (
id: string,
): Promise<{
diff --git a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
index 9d04dc7048..cabee862be 100644
--- a/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatInputModelSelectorRouting.test.ts
@@ -187,9 +187,7 @@ describe('ChatInput model source switching wiring', () => {
const catalogTargetResolution = guard.indexOf('const targetRouteProviderId =');
const remoteGuard = guard.indexOf('const hasVerifiedWindows =');
const legacyPiGuard = guard.indexOf('shouldBlockLegacyRemotePiModelWindowSwitch({');
- const remoteUnknownBlock = guard.indexOf(
- 'if (remoteHostId && (!hasVerifiedWindows || !hasVerifiedUsage)) return false;',
- );
+ const sshHostGuard = guard.indexOf("if (remoteHostId && runtimeAgentKind === 'codex' && !requireDestructiveConfirmation) return true;");
const zeroUsagePass = guard.indexOf(
'if (!requireDestructiveConfirmation && (!trustedContextTokens || trustedContextTokens <= 0))',
);
@@ -209,10 +207,13 @@ describe('ChatInput model source switching wiring', () => {
expect(remoteGuard).toBeGreaterThan(catalogTargetResolution);
expect(legacyPiGuard).toBeGreaterThan(remoteGuard);
expect(legacyPiGuard).toBeLessThan(zeroUsagePass);
- expect(guard.slice(legacyPiGuard, remoteUnknownBlock)).toContain('return false;');
+ expect(guard.slice(legacyPiGuard, zeroUsagePass)).toContain('return false;');
+ expect(sshHostGuard).toBeGreaterThan(-1);
+ expect(sshHostGuard).toBeLessThan(catalogTargetResolution);
+ // The Codex delegation runs first; other SSH harnesses keep their old guard.
+ expect(guard).toContain('if (remoteHostId && (!hasVerifiedWindows || !hasVerifiedUsage)) return false;');
expect(remoteGuard).toBeLessThan(remoteBlock);
const shrinkGate = guard.slice(remoteGuard, remoteBlock);
- expect(shrinkGate).toContain('agentStatus.isRunning');
expect(shrinkGate).toContain('targetContextWindow >= currentContextWindow');
expect(shrinkGate).toMatch(/!requireDestructiveConfirmation\s*&&\s*hasVerifiedWindows/);
expect(shrinkGate).toContain(
@@ -220,9 +221,7 @@ describe('ChatInput model source switching wiring', () => {
);
expect(shrinkGate).toContain("typeof contextTokens === 'number'");
expect(shrinkGate).toContain('const hasVerifiedUsage = trustedContextTokens !== undefined;');
- expect(shrinkGate).toContain('!hasVerifiedWindows || !hasVerifiedUsage');
- expect(remoteUnknownBlock).toBeGreaterThan(legacyPiGuard);
- expect(zeroUsagePass).toBeGreaterThan(remoteUnknownBlock);
+ expect(zeroUsagePass).toBeGreaterThan(legacyPiGuard);
expect(shrinkGate).toContain('return true;');
expect(guard).toContain(
"if (!requireDestructiveConfirmation && verdict.level === 'ok') return true;",
diff --git a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx
index e0232b41e2..262fea322f 100644
--- a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx
@@ -1,6 +1,6 @@
// @vitest-environment jsdom
import React from 'react';
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, 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';
@@ -27,6 +27,7 @@ const mocks = vi.hoisted(() => ({
stat: vi.fn(),
mkdir: vi.fn(),
prefs: vi.fn(),
+ listModels: vi.fn(),
devices: [],
sessions: [
{ remoteHostId: 'remote-mac', workspaceKind: 'project', workingDir: '/Users/test/project' },
@@ -51,12 +52,7 @@ vi.mock('@/state/providerModelMemory', () => ({
}));
function publish(models = [sshModel('available-model')]) {
- commitProvidersSnapshot(beginProvidersRefresh(), {
- dataOwnerId: 'owner',
- ownerGeneration: 1,
- providerOrder: ['openai'],
- providers: [sshNativeCodexProvider(models)],
- });
+ mocks.listModels.mockResolvedValue([sshNativeCodexProvider(models)]);
}
function start() {
render(<StartRemoteSessionPanel hostId="remote-mac" />);
@@ -67,6 +63,7 @@ beforeEach(() => {
vi.clearAllMocks();
setDataOwnerGeneration('owner', 1);
invalidateProvidersSnapshot();
+ mocks.listModels.mockReset();
publish();
mocks.prefs.mockReturnValue({ model: 'gpt-5.5-codex', providerId: null, effort: 'medium' });
mocks.create.mockResolvedValue({ id: 'new-task' });
@@ -78,6 +75,7 @@ beforeEach(() => {
configurable: true,
value: {
remoteSsh: {
+ listCodexModels: mocks.listModels,
statRemotePath: mocks.stat,
mkdirPRemote: mocks.mkdir,
list: async () => ({
@@ -118,23 +116,18 @@ afterEach(cleanup);
describe('settings remote Codex creation', () => {
it.each(['xd', 'custom-responses', 'openai-second'])(
- 'rejects the saved %s route before directory or database changes',
+ 'uses the remote default instead of forwarding the saved local %s route',
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();
+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());
+ expect(mocks.listModels).toHaveBeenCalledWith('remote-mac');
+ expect(mocks.create.mock.calls[0][0]).toMatchObject({ model: 'available-model', providerId: 'openai' });
+ expect(mocks.error).not.toHaveBeenCalled();
},
);
- it('does not create a gateway-only task even with no saved provider', async () => {
+ it('uses the remote native catalog even when the controller has only a gateway', async () => {
commitProvidersSnapshot(beginProvidersRefresh(), {
dataOwnerId: 'owner',
ownerGeneration: 1,
@@ -142,13 +135,9 @@ describe('settings remote Codex creation', () => {
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();
+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());
+ expect(mocks.create.mock.calls[0][0]).toMatchObject({ model: 'available-model', providerId: 'openai' });
+ expect(mocks.error).not.toHaveBeenCalled();
});
it('creates with a catalog model, pinned provider and calibrated tuning', async () => {
@@ -180,18 +169,15 @@ describe('settings remote Codex creation', () => {
});
});
- it.each(['loading', 'failed', 'empty', 'bridge'] as const)(
- 'blocks %s catalogs before directory or database changes',
+ it.each(['failed', 'empty', 'bridge'] as const)(
+ 'blocks %s remote catalogs before directory or database changes',
async (state) => {
- if (state === 'loading') invalidateProvidersSnapshot();
- if (state === 'failed') failProvidersRefresh(beginProvidersRefresh());
+ if (state === 'failed') mocks.listModels.mockRejectedValue(new Error('offline'));
if (state === 'empty') publish([]);
if (state === 'bridge') publish([sshModel('chatgpt/local-only')]);
start();
const suffix =
- state === 'loading'
- ? 'modelCatalogLoading'
- : state === 'failed'
+ state === 'failed'
? 'modelCatalogFailed'
: 'noCompatibleModel';
await waitFor(() =>
@@ -204,6 +190,26 @@ describe('settings remote Codex creation', () => {
},
);
+ it.each(['loading', 'failed'] as const)('ignores a %s controller catalog', async (state) => {
+ if (state === 'loading') invalidateProvidersSnapshot();
+ else failProvidersRefresh(beginProvidersRefresh());
+ start();
+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());
+ expect(mocks.create.mock.calls[0][0].model).toBe('available-model');
+ });
+
+ it('waits for remote discovery before touching directories or creating a task', async () => {
+ let finish!: (value: ReturnType<typeof sshNativeCodexProvider>[]) => void;
+ mocks.listModels.mockImplementationOnce(() => new Promise((resolve) => { finish = resolve; }));
+ start();
+ await waitFor(() => expect(mocks.listModels).toHaveBeenCalled());
+ expect(mocks.stat).not.toHaveBeenCalled();
+ expect(mocks.create).not.toHaveBeenCalled();
+ expect((screen.getByRole('button') as HTMLButtonElement).disabled).toBe(true);
+ await act(async () => finish([sshNativeCodexProvider([sshModel('available-model')])]));
+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());
+ });
+
it('rechecks model availability after waiting for the remote directory', async () => {
mocks.stat.mockImplementation(async () => {
publish([]);
diff --git a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
index 5563c42534..b8d101ddd7 100644
--- a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
@@ -9,7 +9,7 @@ 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 selection = resolveSshSessionModelSelection(');
+ const start = draft.indexOf('const selection = await loadSshSessionModelSelection(');
const end = draft.indexOf('const newSession = await createSession(', start);
expect(start).toBeGreaterThan(-1);
const selection = draft.slice(start, end);
@@ -17,7 +17,8 @@ describe('remote Orca Worker creation context', () => {
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(');
+ expect(selection).toContain('target.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.tsx
new file mode 100644
index 0000000000..3d4bc308dc
--- /dev/null
+++ b/apps/desktop/src/renderer/__tests__/sshCodexModels.test.tsx
@@ -0,0 +1,67 @@
+// @vitest-environment jsdom
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useSshCodexProviders } from '@/hooks/useSshCodexProviders';
+import { loadSshSessionModelSelection } from '@/features/cc-agent/sshSessionModelSelection';
+import { sshNativeCodexProvider, sshModel } from '@/features/cc-agent/__tests__/sshModelFixtures';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+
+const list = vi.fn();
+let statusChanged: (snapshot: RemoteHostSnapshot) => void;
+beforeEach(() => {
+ setDataOwnerGeneration('owner', 1);
+ list.mockReset();
+ Object.defineProperty(window, 'electronAPI', { configurable: true, value: { remoteSsh: {
+ listCodexModels: list,
+ onStatusChanged: (callback: typeof statusChanged) => { statusChanged = callback; return vi.fn(); },
+ } } });
+});
+afterEach(cleanup);
+const providers = (model: string) => [sshNativeCodexProvider([sshModel(model)])];
+
+describe('SSH Codex model discovery', () => {
+ it('ignores late results from a previous host and invalidates on disconnect', async () => {
+ let finish!: (value: ReturnType<typeof providers>) => void;
+ list.mockImplementationOnce(() => new Promise((resolve) => { finish = resolve; }))
+ .mockResolvedValue(providers('host-b'));
+ const view = renderHook(({ hostId }) => useSshCodexProviders(hostId), { initialProps: { hostId: 'a' } });
+ view.rerender({ hostId: 'b' });
+ await waitFor(() => expect(view.result.current.providers[0]?.models.codex?.[0].id).toBe('host-b'));
+ await act(async () => { finish(providers('host-a')); });
+ expect(view.result.current.providers[0].models.codex?.[0].id).toBe('host-b');
+ act(() => statusChanged({ config: { id: 'b' }, status: 'disconnected' } as RemoteHostSnapshot));
+ expect(view.result.current.status).toBe('error');
+ expect(view.result.current.providers).toEqual([]);
+ act(() => statusChanged({ config: { id: 'b' }, status: 'ready' } as RemoteHostSnapshot));
+ await waitFor(() => expect(view.result.current.status).toBe('ready'));
+ });
+ it('drops a previous account response and allows explicit retry after a read failure', async () => {
+ let finish!: (value: ReturnType<typeof providers>) => void;
+ list.mockImplementationOnce(() => new Promise((resolve) => { finish = resolve; }))
+ .mockRejectedValueOnce(new Error('offline')).mockResolvedValue(providers('new'));
+ const view = renderHook(() => useSshCodexProviders('a'));
+ setDataOwnerGeneration('other', 2);
+ view.rerender();
+ await waitFor(() => expect(view.result.current.status).toBe('error'));
+ await act(async () => finish(providers('old')));
+ expect(view.result.current.providers).toEqual([]);
+ act(() => view.result.current.refresh());
+ await waitFor(() => expect(view.result.current.providers[0]?.models.codex?.[0].id).toBe('new'));
+ });
+ it('creates with the host default even if the controller has only a gateway or a failed catalog', async () => {
+ list.mockResolvedValue(providers('remote-native'));
+ const selection = await loadSshSessionModelSelection('builder', {
+ providers: [], loading: false, loadFailed: true, agentKind: 'codex',
+ preferred: { model: 'codex/local-model', providerId: 'xd', effort: 'medium', fastMode: true },
+ });
+ expect(list).toHaveBeenCalledWith('builder');
+ expect(selection).toEqual({ ok: true, model: 'remote-native', providerId: 'openai', effort: 'high', fastMode: false });
+ });
+ it('fails creation without falling back to local models', async () => {
+ list.mockRejectedValue(new Error('remote unavailable'));
+ expect(await loadSshSessionModelSelection('builder', {
+ providers: providers('controller-native'), loading: false, loadFailed: false, agentKind: 'codex',
+ preferred: { model: 'controller-native', effort: 'low', fastMode: false },
+ })).toEqual({ ok: false, reason: 'catalog-error' });
+ });
+});
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index 99bb71fa84..47edf44213 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -329,6 +329,7 @@ import { useAgentCapabilities, type AgentKind } from '@/hooks/useAgentCapabiliti
import { useAvailableAgents } from '@/hooks/useAvailableAgents';
import { useConnectedSource } from '@/hooks/useConnectedSource';
import { useProviders } from '@/hooks/useProviders';
+import { useSshCodexProviders } from '@/hooks/useSshCodexProviders';
import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import { chatEligibleSourcesForModel, effectiveSourceIdForModel } from '@cindy/model-providers';
import {
@@ -1892,9 +1893,12 @@ export function ChatInput({
}, [activeModel, agentKind, runtimeEffective, composerSelection.pending, composerSelection.display.agentKind, ccCaps.capabilities, codexCaps.capabilities, piCaps.capabilities]);
// 供应商连接态。effectiveSourceId / sendProviderId / dispatchSend 预检用它。device-link 远程会话 /
// 草稿用**被控端**供应商目录(隧道),否则用本机(两 hook 都无条件调用,按 deviceLinkDeviceId 取)。
+ const sshCodexHostId = currentModelAgentKind === 'codex' && !deviceLinkDeviceId ? remoteHostId : null;
+ const sshCodexProviders = useSshCodexProviders(sshCodexHostId);
const localProviders = useProviders();
const remoteProviders = useDeviceProviders(deviceLinkDeviceId ?? undefined);
- const providers = deviceLinkDeviceId ? remoteProviders.providers : localProviders.providers;
+ const providers = deviceLinkDeviceId ? remoteProviders.providers
+ : sshCodexHostId ? sshCodexProviders.providers : localProviders.providers;
const sendProviders = filterChatBridgedCodexProviders(
providers,
currentModelAgentKind ?? 'codex',
@@ -1918,7 +1922,7 @@ export function ChatInput({
});
const providersLoading = deviceLinkDeviceId
? remoteModelListStatus === 'loading'
- : localProvidersLoading;
+ : sshCodexHostId ? sshCodexProviders.status === 'loading' : localProvidersLoading;
// 统一模型选择器(model-selector-unified M5 / M6)在 composer 上的开关 —— **能力级**那一半
// 下方还会核对任务引擎是否已确认;不再叠加本地样式偏好。
//
@@ -1947,7 +1951,8 @@ export function ChatInput({
// 可以排队,仍与本地任务一样保留来源门禁。
const enforceConnectedSourceGate = !sessionId || !deviceLinkDeviceId;
const remoteModelListBlocked =
- !!deviceLinkDeviceId && enforceConnectedSourceGate && remoteModelListStatus !== 'ready';
+ (!!deviceLinkDeviceId && enforceConnectedSourceGate && remoteModelListStatus !== 'ready') ||
+ (!!sshCodexHostId && sshCodexProviders.status !== 'ready');
// chatEligibleSourcesForModel(不是裸 sourcesForModel):非聊天模型即便"存在于某个
// 已连接来源"也不算有可发送来源(issue #882 第 3 点,2026-07 review)——否则 Send
// 会对着一个 image/embedding 端点放行,而不是显示这里的"去连接"空态。已建会话
@@ -2013,7 +2018,7 @@ export function ChatInput({
const modelMemory = useMemo<ModelMemoryAccessors | undefined>(() => {
// device-link 远程草稿 / 会话:用纯显示镜像 override(读被控端全局预设、写穿被控端)。
if (modelMemoryOverride) return modelMemoryOverride;
- if (deviceLinkDeviceId) return undefined;
+ if (deviceLinkDeviceId || sshCodexHostId) return undefined;
return {
getEffort: getProviderModelEffort,
setEffort: setProviderModelEffort,
@@ -2027,7 +2032,7 @@ export function ChatInput({
clearEffort: clearProviderModelEffort,
clearFast: clearProviderModelFast,
};
- }, [deviceLinkDeviceId, modelMemoryOverride]);
+ }, [deviceLinkDeviceId, modelMemoryOverride, sshCodexHostId]);
// 把「用户在当前来源下选定的 (model, effort)」记进模型全局预设,供其它非活跃行和之后的
// 模型切换恢复。agent / 来源缺失(未知模型 / 0 已连接来源)/ device-link 无镜像时静默跳过。
@@ -5313,7 +5318,7 @@ export function ChatInput({
// device-link 模型清单未结算或真实读取失败时禁止发送。模型选择器会同步显示
// loading / error;这里兜住快捷键、语音等间接派发入口,避免旧快照继续路由。
if (remoteModelListBlocked) {
- if (remoteModelListStatus === 'error') {
+ if (remoteModelListStatus === 'error' || (sshCodexHostId && sshCodexProviders.status === 'error')) {
toast.error(t('newChat.modelSelector.remoteLoadFailed'));
} else {
toast.warning(t('newChat.modelSelector.remoteLoading'));
@@ -5886,6 +5891,8 @@ export function ChatInput({
remoteProviders.unsupported,
remoteModelListBlocked,
remoteModelListStatus,
+ sshCodexHostId,
+ sshCodexProviders.status,
confirmDialog,
navigate,
planModeEntry,
@@ -6076,7 +6083,7 @@ export function ChatInput({
resolveFastSupported({
deviceId: deviceLinkDeviceId ?? undefined,
deviceProviders: remoteProviders.providers,
- localProviders: localProviders.providers,
+ localProviders: providers,
capabilities:
currentModelAgentKind === 'codex'
? codexCaps.capabilities
@@ -6090,7 +6097,7 @@ export function ChatInput({
[
deviceLinkDeviceId,
remoteProviders.providers,
- localProviders.providers,
+ providers,
currentModelAgentKind,
ccCaps.capabilities,
codexCaps.capabilities,
@@ -6272,6 +6279,9 @@ export function ChatInput({
requireDestructiveConfirmation = false,
): Promise<boolean | number> => {
if (!sessionId) return true;
+ // Main owns SSH Codex window protection and deferred application. A new/failed
+ // task has no verified window yet; don't silently swallow its selection.
+ if (remoteHostId && runtimeAgentKind === 'codex' && !requireDestructiveConfirmation) return true;
const agentStatus = makerChatStore.getSnapshot(sessionId).agentStatus;
const contextTokens = requireDestructiveConfirmation
? verifiedContextTokens
@@ -6352,7 +6362,7 @@ export function ChatInput({
) {
return true;
}
- // SSH 不做远端 handoff。缩窗判据的任一事实未知时继续关闭。
+ // Other SSH harnesses retain their existing admission until adapted separately.
if (remoteHostId && (!hasVerifiedWindows || !hasVerifiedUsage)) return false;
if (!requireDestructiveConfirmation && (!trustedContextTokens || trustedContextTokens <= 0)) {
return true;
@@ -6560,7 +6570,7 @@ export function ChatInput({
const fastCapable = resolveFastSupported({
deviceId: deviceLinkDeviceId ?? undefined,
deviceProviders: remoteProviders.providers,
- localProviders: localProviders.providers,
+ localProviders: providers,
capabilities:
targetAgentKind === 'codex'
? codexCaps.capabilities
@@ -6787,7 +6797,7 @@ export function ChatInput({
modelMemory,
deviceLinkDeviceId,
remoteProviders.providers,
- localProviders.providers,
+ providers,
ccCaps.capabilities,
codexCaps.capabilities,
piCaps.capabilities,
@@ -8785,6 +8795,8 @@ export function ChatInput({
: useNarrowToolbar ? 'min-w-0 shrink' : undefined}
>
{!sessionModelLoading && <ModelSelector
+ providersOverride={sshCodexHostId ? sshCodexProviders.providers : undefined}
+ providersOverrideState={sshCodexHostId ? sshCodexProviders : undefined}
// 选中态一律是会话 / 草稿持有的 **wire model id**(sessions.model 或
// lastByVendor.model)。面板行的归一化 id 只活在面板内部 —— 从这里递进去
// 会让"当前选中的那一行"在合并行上错位,也会把归一化 id 顺着
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index 5250cac91b..634e7daf55 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -615,6 +615,7 @@ export function resolveModelSelectorAgentIdentity(
interface ModelSelectorProps {
/** Authoritative surface-specific allowlist (e.g. one-shot or vision routes). */
providersOverride?: ProviderView[];
+ providersOverrideState?: { status: 'loading' | 'error' | 'ready'; refresh: () => void };
currentSelection?: SessionRuntimeProfileProjection;
/** Open recovery for the selected source; generic Add model navigation stays separate. */
onReconnectSource?: () => void;
@@ -806,6 +807,7 @@ interface ModelSelectorProps {
interface ModelSelectorContentProps {
providersOverride?: ProviderView[];
+ providersOverrideState?: ModelSelectorProps['providersOverrideState'];
modelId: string;
effort: Effort;
onModelChange: (modelId: string) => void | boolean | Promise<void | boolean>;
@@ -1053,6 +1055,7 @@ export function ModelSelectorContent(props: ModelSelectorContentProps) {
function ModelSelectorContentView({
providersOverride,
+ providersOverrideState,
modelId,
effort,
onModelChange,
@@ -2749,6 +2752,9 @@ function ModelSelectorContentView({
[cc.capabilities, codex.capabilities, pi.capabilities, onFastModeChange, onUnifiedSelect, fastModeConfigurable],
);
+ if (providersOverrideState && providersOverrideState.status !== 'ready') {
+ return <RemoteModelLoadNotice status={providersOverrideState.status} onRetry={providersOverrideState.refresh} />;
+ }
if (emptyState) return emptyState;
const hasAnyModel = sections ? sections.length > 0 : (flatModels?.length ?? 0) > 0;
@@ -3202,6 +3208,7 @@ function ModelSelectorContentView({
export function ModelSelector({
providersOverride,
+ providersOverrideState,
modelId,
currentSelection,
onReconnectSource,
@@ -3301,7 +3308,9 @@ export function ModelSelector({
const nextOpen = disabled ? false : next;
const wasOpen = openRef.current;
openRef.current = nextOpen;
- if (nextOpen && !wasOpen && !deviceId) {
+ if (nextOpen && !wasOpen && providersOverrideState) {
+ providersOverrideState.refresh();
+ } else if (nextOpen && !wasOpen && !deviceId && !providersOverride) {
discovery.begin(() =>
window.electronAPI.maker.requestProviderModelsAutoRefresh('model-selector-open'),
);
@@ -3312,7 +3321,7 @@ export function ModelSelector({
}
setOpen(nextOpen);
},
- [deviceId, disabled, discovery, resetDiscoveryPresentation],
+ [deviceId, disabled, discovery, resetDiscoveryPresentation, providersOverride, providersOverrideState],
);
// AlertDialog 打开时会被 Popover 视作外部交互并请求关闭。Agent 分段确认期间
@@ -3403,10 +3412,10 @@ export function ModelSelector({
pi,
providers: remoteProviders,
});
- const remoteModelLoading = !!deviceId && remoteModelListStatus === 'loading';
- const remoteModelLoadFailed = !!deviceId && remoteModelListStatus === 'error';
- const localModelLoading = !deviceId && !(!providersOverride && localProviders.loadFailed) && (
- (!providersOverride && localProviders.loading) ||
+ const remoteModelLoading = providersOverrideState?.status === 'loading' || (!!deviceId && remoteModelListStatus === 'loading');
+ const remoteModelLoadFailed = providersOverrideState?.status === 'error' || (!!deviceId && remoteModelListStatus === 'error');
+ const localModelLoading = !deviceId && !providersOverride && !localProviders.loadFailed && (
+ localProviders.loading ||
(agentKind === 'codex' ? codex.loading : agentKind === 'pi' ? pi.loading : cc.loading)
);
const visibleModels = useMemo(
@@ -3543,6 +3552,7 @@ export function ModelSelector({
// 草稿没有已连接来源时显示连接 CTA;已建任务保留保存的模型和恢复入口。
// device-link 远程会话不走此 CTA(控制端无法替被控端连来源;hasConnectedSource 是本机口径)。
const noSource =
+ !providersOverride &&
!actualRoute &&
!!onProviderChange &&
!!onNavigateToProviders &&
@@ -4014,6 +4024,7 @@ export function ModelSelector({
configurationEnabled={configurationEnabled}
fastModeConfigurable={fastModeConfigurable}
providersOverride={providersOverride}
+ providersOverrideState={providersOverrideState}
unifiedPanel={unifiedPanel}
sessionEngineFilter={contentSessionEngineFilter}
unifiedAgents={unifiedAgents}
diff --git a/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx b/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx
index 1a04ff0973..6fe3c8ef53 100644
--- a/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx
@@ -3,13 +3,21 @@ import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-libra
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import type { ComponentProps } from 'react';
import type { Editor } from '@tiptap/react';
+import type { ProviderView } from '@cindy/model-providers';
+import { sshNativeCodexProvider, sshModel } from '@/features/cc-agent/__tests__/sshModelFixtures';
import { ChatInput } from '../ChatInput';
-const h = vi.hoisted(() => ({ t: (key: string) => key, confirm: vi.fn(), editor: null as Editor | null, listening: false, stop: vi.fn().mockResolvedValue(undefined) }));
+const h = vi.hoisted(() => ({ t: (key: string) => key, confirm: vi.fn(), editor: null as Editor | null, listening: false, stop: vi.fn().mockResolvedValue(undefined),
+ setModel: vi.fn(), selectModel: undefined as undefined | ((id: string) => Promise<void | boolean>), remoteProviders: [] as ProviderView[],
+}));
vi.mock('react-i18next', async (original) => ({ ...await original<typeof import('react-i18next')>(), useTranslation: () => ({ t: h.t }) }));
vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));
vi.mock('@/components/ui/confirm-dialog-provider', () => ({ useConfirmDialog: () => ({ confirm: h.confirm }) }));
-vi.mock('../ModelSelector', async (original) => ({ ...await original<typeof import('../ModelSelector')>(), ModelSelector: ({ modelId }: { modelId: string }) => <span data-testid="model-selector">{modelId}</span> }));
+vi.mock('../ModelSelector', async (original) => ({ ...await original<typeof import('../ModelSelector')>(), ModelSelector: ({ modelId, onModelChange }: { modelId: string; onModelChange: typeof h.selectModel }) => {
+ h.selectModel = onModelChange;
+ return <span data-testid="model-selector">{modelId}</span>;
+} }));
+vi.mock('@/hooks/useSshCodexProviders', () => ({ useSshCodexProviders: () => ({ providers: h.remoteProviders, status: 'ready', refresh: () => {} }) }));
vi.mock('../ExtraDirsButton', () => ({ ExtraDirsButton: () => null }));
vi.mock('../PermissionSelector', () => ({ PermissionSelector: () => <span data-testid="permission-selector" /> }));
vi.mock('../NewGoalDialog', () => ({ NewGoalDialog: () => null }));
@@ -39,6 +47,7 @@ vi.mock('@/state/newMakerDraft', async (original) => {
const noOp = () => {};
// External host services are inert; the editor, composer state, and send dispatch run unchanged.
const api: any = new Proxy({}, { get: (_obj, key) => {
+ if (key === 'setModel') return h.setModel;
if (key === 'listSync') return () => ({ ghosts: [] });
if (key === 'getDataSnapshot') return () => { throw new Error('test bridge unavailable'); };
if (key === 'setGlobalShortcut') return () => Promise.resolve({ ok: true });
@@ -55,7 +64,7 @@ const attachments: ComponentProps<typeof ChatInput>['attachmentState'] = {
removeFile: noOp, updateFile: noOp, discardFiles: noOp, clearFiles: noOp, restoreFiles: (files) => [...files],
};
beforeEach(() => { h.listening = false; h.stop.mockClear(); window.electronAPI = api; vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }); });
-afterEach(() => { cleanup(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });
+afterEach(() => { cleanup(); h.remoteProviders = []; h.setModel.mockReset(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });
const props = {
sessionId: 'loading-test', initialWorkingDir: '/workspace', runtimeAgentKind: 'codex' as const,
@@ -63,6 +72,37 @@ const props = {
hideRuntimeControls: true, showFolderPicker: false, disableAutofocus: true,
};
+it('lets a new SSH task with no window report reach main on model selection and retry', async () => {
+ h.remoteProviders = [sshNativeCodexProvider([sshModel('old'), sshModel('remote-new')])];
+ h.setModel.mockRejectedValueOnce(new Error('test host rejected selection')).mockResolvedValue({ deferred: false });
+ render(<ChatInput {...props} sessionId="ssh-empty" deviceLinkDeviceId={null} remoteHostId="builder"
+ initialModel="old" initialProviderId="openai" initialEffort="low" hideRuntimeControls={false} onSend={vi.fn()} />);
+ await waitFor(() => expect(h.selectModel).toBeTypeOf('function'));
+ await act(async () => { await h.selectModel!('remote-new'); });
+ // Failed optimistic selection restores the previous model through the same IPC.
+ expect(h.setModel).toHaveBeenCalledTimes(2);
+ expect(h.setModel.mock.calls[0].slice(0, 2)).toEqual(['ssh-empty', 'remote-new']);
+ expect(h.setModel.mock.calls[1].slice(0, 2)).toEqual(['ssh-empty', 'old']);
+ await act(async () => { await h.selectModel!('remote-new'); });
+ expect(h.setModel).toHaveBeenCalledTimes(3);
+ expect(h.setModel.mock.calls[2].slice(0, 2)).toEqual(['ssh-empty', 'remote-new']);
+});
+
+it('sends a remote-only Codex model when the controller has no connected providers', async () => {
+ h.remoteProviders = [sshNativeCodexProvider([sshModel('remote-only')])];
+ const onSend = vi.fn().mockResolvedValue(true);
+ const view = render(<ChatInput {...props} sessionId="ssh-send" deviceLinkDeviceId={null} remoteHostId="builder"
+ initialModel="remote-only" initialProviderId="openai" initialEffort="low" onSend={onSend} />);
+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());
+ await act(async () => { h.editor!.commands.setContent('<p>Hello remote</p>'); });
+ const send = screen.getByRole('button', { name: 'newChat.sendButton.send' }) as HTMLButtonElement;
+ expect(send.disabled).toBe(false);
+ await act(async () => { fireEvent.click(send); });
+ await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+ expect(onSend.mock.calls[0][1]).toBe('remote-only');
+ expect(onSend.mock.calls[0][6]).toEqual(expect.objectContaining({ providerId: 'openai' }));
+});
+
it.each(['button', 'Enter', 'voice'] as const)(
'blocks %s while metadata is absent, retains input, and sends Astra when metadata arrives', async (entry) => {
const onSend = vi.fn().mockResolvedValue(true);
diff --git a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx
index c3ca1713a2..fe9128520c 100644
--- a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx
+++ b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx
@@ -34,7 +34,7 @@ import {
import { getDraft, getFastModeForModel } from '@/state/newMakerDraft';
import { getProviderModelEffort, getProviderModelFast } from '@/state/providerModelMemory';
import {
- resolveSshSessionModelSelection,
+ loadSshSessionModelSelection,
sshModelSelectionErrorKeys,
} from '@/features/cc-agent/sshSessionModelSelection';
import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
@@ -396,7 +396,7 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps
const resolveSelection = () => {
const snapshot = getCachedProvidersSnapshot();
const prefs = getDraft().lastByVendor.codex;
- return resolveSshSessionModelSelection({
+ return loadSshSessionModelSelection(hostId, {
providers: snapshot?.providers ?? [],
loading: !snapshot,
loadFailed: hasProvidersSnapshotLoadFailed(),
@@ -406,7 +406,8 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps
getPresetFast: getProviderModelFast,
});
};
- const initialSelection = resolveSelection();
+ const initialSelection = await resolveSelection();
+ if (!isDataOwnerGenerationCurrent(owner)) return;
if (!initialSelection.ok) {
toast.error(t(sshModelSelectionErrorKeys[initialSelection.reason]));
return;
@@ -447,7 +448,8 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelProps
// 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();
+ const selection = await resolveSelection();
+ if (!isDataOwnerGenerationCurrent(owner)) return;
if (!selection.ok) {
toast.error(t(sshModelSelectionErrorKeys[selection.reason]));
return;
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index b154d64d7a..e16f75b030 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -282,7 +282,7 @@ import { makeMirrorAccessors, replaceScope, clearScope } from '@/state/deviceLin
import type { ModelMemoryAccessors } from '@/components/new-chat/ModelSelector';
import { resolveNewMakerDraftRightSidebar } from './newMakerDraftRightSidebar';
import { resolveNewMakerDraftEffort } from './newMakerDraftModelPrefs';
-import { resolveSshSessionModelSelection, SshModelSelectionError } from './sshSessionModelSelection';
+import { loadSshSessionModelSelection, 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';
@@ -2379,8 +2379,9 @@ export function NewMakerDraftRoute() {
// 立即建会话记录并 navigate 过去。建会话约定与本文件其它 createSession 路径一致
// (createSession + makerChatStore.setSessionRuntime + navigate)。
//
- // SSH uses the controller catalog; device-link keeps its own discovery path.
- const selection = resolveSshSessionModelSelection({
+ // Codex reads the selected SSH host; other harnesses retain their existing routing.
+ const sshOwner = getDataOwnerGeneration();
+ const selection = await loadSshSessionModelSelection(target.hostId, {
providers: localProviders,
loading: localProvidersLoading,
loadFailed: localProvidersLoadFailed,
@@ -2393,6 +2394,7 @@ export function NewMakerDraftRoute() {
},
getPresetEffort: getProviderModelEffort,
});
+ if (!isDataOwnerGenerationCurrent(sshOwner)) return;
if (!selection.ok) {
throw new SshModelSelectionError(selection.reason);
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts
index 0a254c9724..4c2a52654f 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts
@@ -26,6 +26,24 @@ 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],
+): 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 : '' },
+ getPresetEffort: undefined, getPresetFast: undefined,
+ });
+ } catch {
+ return { ok: false, reason: 'catalog-error' };
+ }
+}
+
/** 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.
diff --git a/apps/desktop/src/renderer/hooks/useSshCodexProviders.ts b/apps/desktop/src/renderer/hooks/useSshCodexProviders.ts
new file mode 100644
index 0000000000..ece7d5a24a
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/useSshCodexProviders.ts
@@ -0,0 +1,46 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import type { ProviderView } from '@cindy/model-providers';
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
+
+const EMPTY: ProviderView[] = [];
+export function useSshCodexProviders(hostId?: string | null) {
+ const owner = getDataOwnerGeneration();
+ const key = JSON.stringify([hostId, owner.dataOwnerId, owner.generation]);
+ const sequence = useRef(0);
+ const [state, setState] = useState<{ key: string; providers: ProviderView[]; status: 'loading' | 'error' | 'ready' }>({
+ key: '', providers: EMPTY, status: 'loading',
+ });
+ const refresh = useCallback(() => {
+ if (!hostId) return;
+ const request = ++sequence.current;
+ const requestOwner = getDataOwnerGeneration();
+ setState({ key, providers: EMPTY, status: 'loading' });
+ void window.electronAPI.remoteSsh.listCodexModels(hostId).then((providers) => {
+ if (sequence.current === request && isDataOwnerGenerationCurrent(requestOwner)) {
+ setState({ key, providers, status: 'ready' });
+ }
+ }).catch(() => {
+ if (sequence.current === request && isDataOwnerGenerationCurrent(requestOwner)) {
+ setState({ key, providers: EMPTY, status: 'error' });
+ }
+ });
+ }, [hostId, key]);
+ useEffect(() => {
+ if (!hostId) return;
+ refresh();
+ const stop = window.electronAPI.remoteSsh.onStatusChanged((snapshot) => {
+ if (snapshot.config.id !== hostId) return;
+ if (snapshot.status === 'ready') refresh();
+ else {
+ ++sequence.current;
+ setState({ key, providers: EMPTY, status: 'error' });
+ }
+ });
+ return () => { ++sequence.current; stop(); };
+ }, [hostId, key, refresh]);
+ return {
+ providers: state.key === key ? state.providers : EMPTY,
+ status: state.key === key ? state.status : 'loading' as const,
+ refresh,
+ };
+}
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 2001486fac..e5b48f4645 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -4124,6 +4124,7 @@ interface ElectronAPI {
}>;
ccMgrDismissPendingUpgrade: (hostId: string, agent?: 'cc' | 'pi') => Promise<{ ok: true }>;
// Codex credential sync
+ listCodexModels: (id: string) => Promise<import('@cindy/model-providers').ProviderView[]>;
checkCodexAuth: (id: string) => Promise<{
localExists: boolean;
remoteExists: boolean;
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index c03ed6bf28..14867f0e7d 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -104,6 +104,22 @@ Pi 上游生成资料统一转换为客户端 `catalog/provider-models.json`,
维护命令、覆盖顺序和验收见 [通用供应商目录](provider-catalog-generation.md)。
渠道多协议与逐模型接口证据见 [供应商接口核查](provider-interface-audit.md)。
+## SSH Codex 模型目录
+
+SSH Codex 的创建入口、任务内选择器与 main 的启动/切换准入读取所选主机
+app-server 的完整 `model/list`,不使用控制端 OpenAI 登录或网关目录作为远端可用性的依据。
+沿用已有远端安装与 daemon 连接流程;分页有界,读取失败或空清单显示重试,不回退到本机。
+结果只用于该主机,断连、换主机或换账号后的迟到结果丢弃,不发布到本机公共目录。
+
+新任务从远端清单解析默认模型及推理强度/Fast;已有任务保留原模型和历史,由用户改选。
+`model/list` 不提供的真实窗口保持未知;普通 SSH Codex 切换交给 main 现有窗口保护和回合中延后规则,
+不能因前端尚无用量报告而静默丢弃点击。目录成员资格不等于认证、网络和实际推理已验证。
+
+实现:`maker-host/ssh-codex-models.ts`、`remote-ssh/codex-model-list.ts`、
+`useSshCodexProviders.ts`;回归:`codex-model-list.test.ts`、`sshCodexModels.test.tsx`、
+`chatInputModelLoading.test.tsx`。新增读取 IPC 属于本机 SSH 管理面,与既有 SSH 管理 channel
+一样不开放 device-link;手机及设备互联的供应商清单协议保持原样,完整远端能力发现仍由 #65 跟进。
+
## 按问题继续阅读
| 按需阅读 | 入口 |
diff --git a/packages/maker-core/src/agents/codex/app-server/list-models.test.ts b/packages/maker-core/src/agents/codex/app-server/list-models.test.ts
new file mode 100644
index 0000000000..d50f35df80
--- /dev/null
+++ b/packages/maker-core/src/agents/codex/app-server/list-models.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it, vi } from 'vitest';
+import { listCodexModels } from './list-models.js';
+
+describe('complete Codex model snapshots', () => {
+ it('reads all pages, including an empty intermediate page', async () => {
+ const read = vi.fn().mockResolvedValueOnce({ data: [{ model: 'one' }], nextCursor: 'two' })
+ .mockResolvedValueOnce({ data: [], nextCursor: 'three' })
+ .mockResolvedValueOnce({ data: [{ model: 'three' }], nextCursor: null });
+ expect(await listCodexModels(read)).toEqual([{ model: 'one' }, { model: 'three' }]);
+ expect(read.mock.calls).toEqual([[null], ['two'], ['three']]);
+ });
+ it('rejects cyclic pagination and does not return a partial catalog', async () => {
+ const read = vi.fn().mockResolvedValue({ data: [{ model: 'partial' }], nextCursor: 'same' });
+ await expect(listCodexModels(read)).rejects.toThrow('cursor');
+ expect(read).toHaveBeenCalledTimes(2);
+ });
+ it('does not hide RPC errors or invalid responses', async () => {
+ await expect(listCodexModels(vi.fn().mockRejectedValue(new Error('offline')))).rejects.toThrow('offline');
+ await expect(listCodexModels(vi.fn().mockResolvedValue({ nextCursor: null }))).rejects.toThrow('Invalid');
+ });
+});
diff --git a/packages/maker-core/src/agents/codex/app-server/list-models.ts b/packages/maker-core/src/agents/codex/app-server/list-models.ts
new file mode 100644
index 0000000000..1a308bd517
--- /dev/null
+++ b/packages/maker-core/src/agents/codex/app-server/list-models.ts
@@ -0,0 +1,21 @@
+import type { CodexModelListItem, CodexModelListResponse } from './protocol.js';
+
+/** A complete, bounded snapshot; never publish a partial page or follow a cursor forever. */
+export async function listCodexModels(
+ readPage: (cursor: string | null) => Promise<CodexModelListResponse>,
+): Promise<CodexModelListItem[]> {
+ const models: CodexModelListItem[] = [];
+ const seen = new Set<string>();
+ let cursor: string | null = null;
+ for (let pageNumber = 0; pageNumber < 100; pageNumber++) {
+ const page = await readPage(cursor);
+ if (!Array.isArray(page.data)) throw new Error('Invalid Codex model list');
+ models.push(...page.data);
+ const next = page.nextCursor;
+ if (next == null || next === '') return models;
+ if (typeof next !== 'string' || seen.has(next)) throw new Error('Invalid Codex model list cursor');
+ seen.add(next);
+ cursor = next;
+ }
+ throw new Error('Codex model list page limit exceeded');
+}
diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.ts
index 01342a446e..be5966fb28 100644
--- a/packages/maker-core/src/agents/codex/index.test.ts
+++ b/packages/maker-core/src/agents/codex/index.test.ts
@@ -4254,6 +4254,31 @@ describe('CodexAgent.listCustomizations', () => {
});
describe('CodexAgent.refreshLocalModels', () => {
+ it('reads SSH models on the named remote host without publishing them to local discovery', async () => {
+ const publish = vi.fn();
+ const agent = new CodexAgent(createDeps({}, { onCodexLocalModelsListed: publish }));
+ const host = installFakeHost(agent, (method, params) => {
+ if (method !== Method.ModelList) return undefined;
+ return (params as { cursor: string | null }).cursor === null
+ ? { data: [{ model: 'remote-a' }], nextCursor: 'last' }
+ : { data: [{ model: 'remote-b' }], nextCursor: null };
+ });
+ expect(await agent.listRemoteModels('builder')).toEqual([{ model: 'remote-a' }, { model: 'remote-b' }]);
+ expect((agent as any).getHost).toHaveBeenCalledWith('builder');
+ expect(host.ensureStartedWithTimeout).toHaveBeenCalled();
+ expect(publish).not.toHaveBeenCalled();
+ expect((agent as any).hosts.has('local')).toBe(false);
+ });
+
+ it('drops remote models when the host is retired during discovery', async () => {
+ const agent = new CodexAgent(createDeps());
+ installFakeHost(agent, (method) => {
+ if (method !== Method.ModelList) return undefined;
+ (agent as any).hosts.delete('remote:builder');
+ return { data: [{ model: 'old-account' }], nextCursor: null };
+ });
+ await expect(agent.listRemoteModels('builder')).rejects.toThrow('connection changed');
+ });
it('uses an isolated OpenAI control-plane host without closing provider-oauth sessions', async () => {
const onCodexLocalModelsListed = vi.fn().mockResolvedValue(undefined);
const prepareCodexLocalCredentialModeSwitch = vi.fn(async () => {});
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.ts
index fd0bdf4fc3..8f58488b60 100644
--- a/packages/maker-core/src/agents/codex/index.ts
+++ b/packages/maker-core/src/agents/codex/index.ts
@@ -123,6 +123,7 @@ import {
parseOverloadError,
} from '../shared/overload-error.js';
import { isRemoteCompactEncryptedContentError } from '../shared/remote-compact-encrypted-error.js';
+import { listCodexModels } from './app-server/list-models.js';
import { buildCodexEnv } from './env-builder.js';
import type { CodexErrorInfo } from './app-server/protocol.js';
import {
@@ -2679,12 +2680,29 @@ export class CodexAgent extends BaseAgent {
});
}
+ /** Read one SSH host's complete native catalog without publishing it as local discovery. */
+ async listRemoteModels(remoteHostId: string): Promise<CodexModelListResponse['data']> {
+ if (!remoteHostId) throw new Error('SSH host is required');
+ return this.withHostOperation(async () => ({
+ key: hostKey(remoteHostId), host: await this.getHost(remoteHostId),
+ }), async (host, key) => {
+ await host.ensureStartedWithTimeout(CODEX_MODEL_REFRESH_DEADLINE_MS, 'remote model list');
+ const deadline = Date.now() + CODEX_MODEL_REFRESH_DEADLINE_MS;
+ const models = await listCodexModels((cursor) => {
+ const remaining = deadline - Date.now();
+ if (remaining <= 0) throw new AppServerRequestTimeoutError('remote model list', CODEX_MODEL_REFRESH_DEADLINE_MS);
+ return host.request<CodexModelListResponse>(Method.ModelList,
+ { cursor, limit: 100, includeHidden: false },
+ { timeoutMs: Math.min(remaining, CODEX_MODEL_LIST_RPC_TIMEOUT_MS) });
+ });
+ if (this.hosts.get(key) !== host) throw new Error('SSH Codex connection changed');
+ return models;
+ });
+ }
+
/**
* 向本地 app-server 实时读取完整模型清单并交给宿主。
- *
- * 不能只读 `models_cache.json`:OAuth 登录前会按账号边界删掉旧 cache,而登录 CLI
- * 成功时未必已经触发模型注册表刷新。`model/list` 是官方 app-server 的权威读取面,
- * 同时也是 cache ready barrier;分页全部读完后才一次性交给宿主,避免 UI 看到半份目录。
+ * 不能只读 models_cache.json:OAuth 登录前会清旧 cache,model/list 也是 cache ready barrier。
*/
override async refreshLocalModels(options?: RefreshLocalModelsOptions): Promise<boolean> {
const credentialMode = options?.credentialMode;