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。

perf(desktop): 远程新建任务回车后更快出现画面变化 (#5469)

Dashd18183ea1032
diff --git a/apps/desktop/src/renderer/__tests__/vendorAuthGateRemoteCache.test.tsx b/apps/desktop/src/renderer/__tests__/vendorAuthGateRemoteCache.test.tsx
new file mode 100644
index 0000000000..ec763b9069
--- /dev/null
+++ b/apps/desktop/src/renderer/__tests__/vendorAuthGateRemoteCache.test.tsx
@@ -0,0 +1,109 @@
+// @vitest-environment jsdom
+/**
+ * device-link 新建任务的就绪门禁复用模型选择器已读到的来源快照:快照显示已就绪时不再经隧道
+ * 重拉 provider:list(实测 1–5 秒,整段挡在远程新建任务第一步);快照缺失或未就绪仍实时探测,
+ * 旧快照只能放行、不能误弹「未连接」。
+ */
+import { renderHook } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { ProviderView } from '@cindy/model-providers';
+
+const confirm = vi.fn(async () => true);
+const cachedProviders = vi.fn<(deviceId: string) => unknown>(() => null);
+
+vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
+vi.mock('@/components/ui/confirm-dialog-provider', () => ({
+ useConfirmDialog: () => ({ confirm }),
+}));
+vi.mock('@/hooks/useVendorReadiness', () => ({
+ useVendorReadiness: () => ({ revalidate: vi.fn() }),
+}));
+vi.mock('@/features/device-link/remoteProjectsStore', () => ({
+ remoteProjectsStore: { getDeviceName: () => 'Mac mini' },
+}));
+vi.mock('@/hooks/useDeviceProviders', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/useDeviceProviders')>()),
+ getCachedDeviceProviders: (deviceId: string) => cachedProviders(deviceId),
+}));
+
+import { useVendorAuthGate } from '@/hooks/useVendorAuthGate';
+
+const provider = (over: Partial<ProviderView>): ProviderView =>
+ ({
+ id: 'p',
+ name: 'P',
+ agents: ['claude-code', 'codex'],
+ routing: { 'claude-code': {}, codex: {} },
+ models: { 'claude-code': [], codex: [] },
+ connected: true,
+ ...over,
+ }) as ProviderView;
+
+const invoke = vi.fn(async (_deviceId: string, channel: string) => {
+ if (channel === 'maker:agent:status') return { binaryReady: true, authReady: true };
+ if (channel === 'maker:provider:list') return { providers: [provider({})] };
+ throw new Error(`unexpected channel ${channel}`);
+});
+
+function channels(): string[] {
+ return invoke.mock.calls.map((call) => call[1]);
+}
+
+beforeEach(() => {
+ vi.stubGlobal('electronAPI', { deviceLink: { invoke } });
+});
+
+afterEach(() => {
+ vi.unstubAllGlobals();
+ invoke.mockClear();
+ confirm.mockClear();
+ cachedProviders.mockReset();
+ cachedProviders.mockReturnValue(null);
+});
+
+describe('useVendorAuthGate device-link 来源快照复用', () => {
+ it('cc:快照已有可用来源时直接放行,不发任何隧道请求', async () => {
+ cachedProviders.mockReturnValue({ providers: [provider({})] });
+ const { result } = renderHook(() => useVendorAuthGate());
+
+ await expect(result.current.checkAndConfirm('cc', { deviceId: 'dev' })).resolves.toEqual({
+ proceed: true,
+ });
+ expect(invoke).not.toHaveBeenCalled();
+ expect(confirm).not.toHaveBeenCalled();
+ });
+
+ it('codex:快照已就绪时只查 agent:status 的二进制轴,缺二进制仍拦下', async () => {
+ cachedProviders.mockReturnValue({ providers: [provider({})] });
+ invoke.mockImplementationOnce(async () => ({ binaryReady: false, authReady: true }));
+ const { result } = renderHook(() => useVendorAuthGate());
+
+ await expect(result.current.checkAndConfirm('codex', { deviceId: 'dev' })).resolves.toEqual({
+ proceed: false,
+ });
+ expect(channels()).toEqual(['maker:agent:status']);
+ expect(confirm).toHaveBeenCalledTimes(1);
+ });
+
+ it('快照显示未就绪时实时探测,被控端刚连上来源不会被旧快照误拦', async () => {
+ cachedProviders.mockReturnValue({ providers: [provider({ connected: false })] });
+ const { result } = renderHook(() => useVendorAuthGate());
+
+ await expect(result.current.checkAndConfirm('cc', { deviceId: 'dev' })).resolves.toEqual({
+ proceed: true,
+ });
+ expect(channels().sort()).toEqual(['maker:agent:status', 'maker:provider:list']);
+ expect(confirm).not.toHaveBeenCalled();
+ });
+
+ it('没有快照时保持原有实时探测', async () => {
+ const { result } = renderHook(() => useVendorAuthGate());
+
+ await expect(result.current.checkAndConfirm('cc', { deviceId: 'dev' })).resolves.toEqual({
+ proceed: true,
+ });
+ expect(channels().sort()).toEqual(['maker:agent:status', 'maker:provider:list']);
+ });
+});
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index cc59f99d10..337d9d1149 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -5404,6 +5404,10 @@ export function NewMakerDraftRoute() {
<div className="w-full">
<ChatInput
onSend={handleSend}
+ // 创建在途期间锁住输入框:handleSend 立刻返回、真正的创建在后台跑,远程要经
+ // 几次隧道往返。锁定态即时告诉用户「已发出、处理中」,也免得这段时间补写的
+ // 内容在交接成功清空草稿时被一并丢掉;失败解锁后原文仍在。
+ disabled={sendInFlight}
onBeforeVoiceInputStart={handleBeforeVoiceInputStart}
externalDragOver={pageDragOver}
visualVariant="create-agent"
diff --git a/apps/desktop/src/renderer/hooks/useVendorAuthGate.ts b/apps/desktop/src/renderer/hooks/useVendorAuthGate.ts
index f6b583e8d5..82c88c0699 100644
--- a/apps/desktop/src/renderer/hooks/useVendorAuthGate.ts
+++ b/apps/desktop/src/renderer/hooks/useVendorAuthGate.ts
@@ -31,6 +31,7 @@ import {
import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';
import { useVendorReadiness, type Readiness } from '@/hooks/useVendorReadiness';
import {
+ getCachedDeviceProviders,
isDeviceProvidersUnsupportedError,
parseDeviceProvidersPayload,
} from '@/hooks/useDeviceProviders';
@@ -273,16 +274,30 @@ export function useVendorAuthGate(): UseVendorAuthGateReturn {
if (deviceId) {
const providerAgent: ProviderAgentKind =
vendor === 'codex' ? 'codex' : vendor === 'pi' ? 'pi' : 'claude-code';
+ const includeSuspended = options?.existingSessionRoute === true;
+ // 模型选择器已读到的来源快照(被控端来源变化推送会令其失效)显示已有可用来源时直接复用:
+ // provider:list 经隧道实测 1–5 秒,重拉一遍会整段挡在远程新建任务的第一步。
+ // 快照缺失或显示未就绪时仍实时探测,旧快照只能放行、不能误弹「未连接」。
+ // cc 不看 binary 轴,有来源结论即可;codex / pi 仍需 agent:status 查二进制。
+ const cachedProviders = getCachedDeviceProviders(deviceId);
+ const cachedSourceReady =
+ cachedProviders !== null &&
+ sourceReadyFromProviderList(cachedProviders, providerAgent, { includeSuspended }) ===
+ true;
const [statusRes, providersRes] = await Promise.allSettled([
- window.electronAPI.deviceLink.invoke(deviceId, 'maker:agent:status', [providerAgent]),
- window.electronAPI.deviceLink.invoke(deviceId, 'maker:provider:list', []),
+ cachedSourceReady && vendor === 'cc'
+ ? Promise.resolve(null)
+ : window.electronAPI.deviceLink.invoke(deviceId, 'maker:agent:status', [providerAgent]),
+ cachedSourceReady
+ ? Promise.resolve(cachedProviders)
+ : window.electronAPI.deviceLink.invoke(deviceId, 'maker:provider:list', []),
]);
const status =
statusRes.status === 'fulfilled'
- ? (statusRes.value as { binaryReady: boolean; authReady: boolean })
+ ? (statusRes.value as { binaryReady: boolean; authReady: boolean } | null)
: null;
const providerProbe = resolveRemoteProviderProbe(providersRes, providerAgent, {
- includeSuspended: options?.existingSessionRoute === true,
+ includeSuspended,
});
const statusUnsupported =
statusRes.status === 'rejected' &&