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): allow existing SSH Codex routes to send hidden models

DavidShen8be4e8e79098
diff --git a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
index f67c3980f9..f11985db82 100644
--- a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
@@ -112,10 +112,11 @@ describe('CCAgentSessionView 接线不变式', () => {
/if \(optimisticallyClearRemoteComposer\) \{\s*\/\/[^\n]*\n(?:\s*\/\/[^\n]*\n){2}\s*optimisticComposerRestored = false;\s*clearSentComposer\(\{ preserveNewerContent: true \}\);\s*\} else \{[\s\S]*?clearSentComposer\(\{ preserveNewerContent: true \}\);\s*\}/,
);
});
- it('已有远程 session 断线时跳过来源门禁,远程草稿与本地任务仍保留门禁', () => {
+ it('已有设备互联任务与保留原路由的 SSH 任务跳过来源门禁,草稿与本地任务仍保留门禁', () => {
expect(chatInputSrc).toContain(
- 'const enforceConnectedSourceGate = !sessionId || !deviceLinkDeviceId;',
+ 'const enforceConnectedSourceGate = (!sessionId || !deviceLinkDeviceId) && !preserveSshCodexRoute;',
);
+ expect(chatInputSrc).toContain('const preserveSshCodexRoute = !!sessionId && !!sshCodexHostId &&');
expect(chatInputSrc).toMatch(
/const noConnectedSource =\s*enforceConnectedSourceGate &&\s*!!currentModelAgentKind/,
);
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index 9528afd6da..733dd89b6a 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -1949,7 +1949,13 @@ export function ChatInput({
// 已有 device-link 任务在断链时仍有 pinned deviceId + renderer outbox 可接住发送,
// 不能因为被控端 provider 目录暂时拉不到就禁用 composer。远程草稿没有既有 session
// 可以排队,仍与本地任务一样保留来源门禁。
- const enforceConnectedSourceGate = !sessionId || !deviceLinkDeviceId;
+ // model/list only advertises selectable models. An unchanged native SSH route
+ // may resume a hidden model; main verifies the persisted host/thread/route.
+ const preserveSshCodexRoute = !!sessionId && !!sshCodexHostId &&
+ !!activeModel && activeModel === (runtimeEffective?.model ?? initialModel) &&
+ (activeProviderId ?? null) === (runtimeEffective ? runtimeEffective.providerId ?? null : initialProviderId ?? null) &&
+ (!activeProviderId || activeProviderId === 'openai');
+ const enforceConnectedSourceGate = (!sessionId || !deviceLinkDeviceId) && !preserveSshCodexRoute;
const remoteModelListBlocked =
(!!deviceLinkDeviceId && enforceConnectedSourceGate && remoteModelListStatus !== 'ready') ||
(!!sshCodexHostId && sshCodexProviders.status !== 'ready');
@@ -1984,6 +1990,7 @@ export function ChatInput({
const selectedSourceDisconnected =
!!sessionId &&
!deviceLinkDeviceId &&
+ !preserveSshCodexRoute &&
isSelectedSourceDisconnected({
providers,
agent: currentModelAgentKind,
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 f4676a946b..6a2d8f4436 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
@@ -11,6 +11,7 @@ import * as draftMemory from '@/state/newMakerDraft';
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[],
+ remoteStatus: 'ready' as 'ready' | 'loading' | 'error',
}));
vi.mock('react-i18next', async (original) => ({ ...await original<typeof import('react-i18next')>(), useTranslation: () => ({ t: h.t }) }));
vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));
@@ -19,7 +20,7 @@ vi.mock('../ModelSelector', async (original) => ({ ...await original<typeof impo
h.selectModel = onModelChange;
return <span data-testid="model-selector">{modelId}</span>;
} }));
-vi.mock('@/hooks/useSshCodexProviders', () => ({ useSshCodexProviders: () => ({ providers: h.remoteProviders, status: 'ready', refresh: () => {} }) }));
+vi.mock('@/hooks/useSshCodexProviders', () => ({ useSshCodexProviders: () => ({ providers: h.remoteProviders, status: h.remoteStatus, refresh: () => {} }) }));
vi.mock('../ExtraDirsButton', () => ({ ExtraDirsButton: () => null }));
vi.mock('../PermissionSelector', () => ({ PermissionSelector: () => <span data-testid="permission-selector" /> }));
vi.mock('../NewGoalDialog', () => ({ NewGoalDialog: () => null }));
@@ -66,7 +67,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(); h.remoteProviders = []; h.setModel.mockReset(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });
+afterEach(() => { cleanup(); h.remoteProviders = []; h.remoteStatus = 'ready'; h.setModel.mockReset(); h.confirm.mockReset(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });
const props = {
sessionId: 'loading-test', initialWorkingDir: '/workspace', runtimeAgentKind: 'codex' as const,
@@ -111,6 +112,56 @@ it('sends a remote-only Codex model when the controller has no connected provide
expect(onSend.mock.calls[0][6]).toEqual(expect.objectContaining({ providerId: 'openai' }));
});
+it.each([
+ ['button', 'openai'], ['Enter', 'openai'], ['button', null], ['Enter', null],
+] as const)('sends a hidden existing SSH model through %s with provider %s', async (entry, providerId) => {
+ h.remoteProviders = [sshNativeCodexProvider([sshModel('remote-new')])];
+ const onSend = vi.fn().mockResolvedValue(true);
+ const view = render(<ChatInput {...props} sessionId="ssh-hidden" deviceLinkDeviceId={null} remoteHostId="builder"
+ initialModel="remote-old" initialProviderId={providerId} initialEffort="low" onSend={onSend} />);
+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());
+ await act(async () => { h.editor!.commands.setContent('<p>Continue old task</p>'); });
+ const send = screen.getByRole('button', { name: 'newChat.sendButton.send' }) as HTMLButtonElement;
+ expect(send.disabled).toBe(false);
+ await act(async () => {
+ if (entry === 'button') fireEvent.click(send);
+ else fireEvent.keyDown(view.container.querySelector('[contenteditable]')!, { key: 'Enter', code: 'Enter' });
+ });
+ await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+ expect(onSend.mock.calls[0][1]).toBe('remote-old');
+ expect(onSend.mock.calls[0][6]).toEqual(expect.objectContaining({ providerId }));
+ expect(h.confirm).not.toHaveBeenCalled();
+});
+
+it.each(['loading', 'error'] as const)('keeps SSH catalog %s blocked for an existing hidden model', async (status) => {
+ h.remoteStatus = status;
+ const onSend = vi.fn();
+ const view = render(<ChatInput {...props} sessionId="ssh-hidden" deviceLinkDeviceId={null} remoteHostId="builder"
+ initialModel="remote-old" initialProviderId="openai" initialEffort="low" onSend={onSend} />);
+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());
+ await act(async () => { h.editor!.commands.setContent('<p>Continue old task</p>'); });
+ expect((screen.getByRole('button', { name: 'newChat.sendButton.send' }) as HTMLButtonElement).disabled).toBe(true);
+ await act(async () => {
+ fireEvent.keyDown(view.container.querySelector('[contenteditable]')!, { key: 'Enter', code: 'Enter' });
+ });
+ expect(onSend).not.toHaveBeenCalled();
+});
+
+it.each(['draft', 'other-provider'] as const)('does not exempt a hidden SSH model for %s', async (kind) => {
+ h.remoteProviders = [sshNativeCodexProvider([sshModel('remote-new')])];
+ const onSend = vi.fn();
+ const view = render(<ChatInput {...props} sessionId={kind === 'draft' ? undefined : 'ssh-hidden'}
+ deviceLinkDeviceId={null} remoteHostId="builder" initialModel="remote-old"
+ initialProviderId={kind === 'draft' ? 'openai' : 'custom'} initialEffort="low" onSend={onSend} />);
+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());
+ await act(async () => { h.editor!.commands.setContent('<p>New route</p>'); });
+ expect((screen.getByRole('button', { name: 'newChat.sendButton.send' }) as HTMLButtonElement).disabled).toBe(true);
+ await act(async () => {
+ fireEvent.keyDown(view.container.querySelector('[contenteditable]')!, { key: 'Enter', code: 'Enter' });
+ });
+ expect(onSend).not.toHaveBeenCalled();
+});
+
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);