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(scheduler): validate models at the selected runtime location

davidd442a3220b0b
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
index 4dd93f6d77..88dad740f6 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
@@ -14,6 +14,7 @@ import { Tip } from '@/components/ui/tooltip';
import { Button } from '@/components/ui/button';
import { useAgentCapabilities } from '@/hooks/useAgentCapabilities';
import { useProviders } from '@/hooks/useProviders';
+import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import {
sessionModelSupportsFastMode,
} from '@cindy/model-providers';
@@ -134,8 +135,6 @@ export function ScheduleFormDialog({
const { t } = useTranslation();
const formApi = useScheduleForm(initial);
const { form, setField, selectModelConfiguration, setDestination, setRunMode, selectBoundSession, applyTemplateAgentFields, reset, toInput, validate } = formApi;
- const caps = useAgentCapabilities(form.agentKind);
- const { providers, loading: providersLoading } = useProviders();
// "运行会话"三态(fresh / persistent / bound)与心跳形态派生值。
// hasRealBinding = targetSessionId 为真实会话 id(B 已绑 / C 已选 / MCP 手绑),
// 此时目录 / worktree / fastMode 由绑定会话决定,表单隐藏对应字段。
@@ -151,6 +150,13 @@ export function ScheduleFormDialog({
: undefined;
// 绑定任务的 Agent 所在电脑(null = 本机)。运行位置跟随任务,模型面板只列这一处。
const boundAgentDeviceId = boundSessionReference?.agentDeviceId ?? null;
+ const selectedAgentDeviceId = isBound ? boundAgentDeviceId : form.agentDeviceId || null;
+ const caps = useAgentCapabilities(form.agentKind, selectedAgentDeviceId ?? undefined);
+ const localProviders = useProviders();
+ const deviceProviders = useDeviceProviders(selectedAgentDeviceId ?? undefined);
+ const { providers, loading: providersLoading } = selectedAgentDeviceId ? deviceProviders : localProviders;
+ // Do not calibrate saved choices against a provisional local or loading snapshot.
+ const modelCatalogReady = (!isBound || !!boundSessionReference) && !caps.loading && !providersLoading;
const hideWorkspaceFields = runMode === 'bound' || isBound;
const [submitting, setSubmitting] = useState(false);
const [mode, setMode] = useState<'gallery' | 'form'>('form');
@@ -460,6 +466,8 @@ export function ScheduleFormDialog({
// 显式模型,下次 fire runner setModel 反向改掉绑定会话的模型。
useEffect(() => {
if (form.targetSessionId.trim()) return;
+ // Local recent-model preferences do not describe another computer's catalog.
+ if (selectedAgentDeviceId) return;
if (form.model) return;
// 默认路由限定在表单已选的来源内,模型与来源成对回填(已选来源保持不变)。
const route = getScheduleDefaultRoute(
@@ -470,7 +478,7 @@ export function ScheduleFormDialog({
if (!route.model) return;
setField('model', route.model);
if (route.providerId && !form.providerId.trim()) setField('providerId', route.providerId);
- }, [form.model, form.agentKind, form.targetSessionId, form.providerId, setField, providers, providersLoading]);
+ }, [form.model, form.agentKind, form.targetSessionId, form.providerId, setField, providers, providersLoading, selectedAgentDeviceId]);
// 绑定任务的显式模型属于任务所在电脑的目录。读到任务位置后让表单与之成对,之后切到
// 「每次新建任务」时模型与运行位置仍然一致。
@@ -481,10 +489,10 @@ export function ScheduleFormDialog({
}, [isBound, boundSessionReference, form.model, form.agentDeviceId, setField]);
useEffect(() => {
- if (form.modelAgentKind || !currentModelEfforts || !form.effort) return;
+ if (!modelCatalogReady || form.modelAgentKind || !currentModelEfforts || !form.effort) return;
const allowed = currentModelEfforts as readonly string[];
if (!allowed.includes(form.effort)) setField('effort', '');
- }, [form.modelAgentKind, currentModelEfforts, form.effort, setField]);
+ }, [modelCatalogReady, form.modelAgentKind, currentModelEfforts, form.effort, setField]);
// Fast 模式门控:agent 级 hasFastMode × 该 (生效来源, 模型) 的 supportsFastMode(per-provider,
// 唯一真相)。生效来源按 form.providerId 解析(空则该模型的默认来源)。Claude 当前 hasFastMode
@@ -498,10 +506,10 @@ export function ScheduleFormDialog({
// 切到 Claude / 不支持 fast 的模型时,清掉表单里残留的 fast 态,
// 杜绝脏值经 toInput 流向 createSession(与上面 effort 失配自动清除同思路)。
useEffect(() => {
- if (!form.modelAgentKind && !caps.loading && providers.length > 0 && form.fastMode && !showFastModeToggle) {
+ if (modelCatalogReady && !form.modelAgentKind && providers.length > 0 && form.fastMode && !showFastModeToggle) {
setField('fastMode', false);
}
- }, [form.modelAgentKind, caps.loading, providers.length, form.fastMode, showFastModeToggle, setField]);
+ }, [modelCatalogReady, form.modelAgentKind, providers.length, form.fastMode, showFastModeToggle, setField]);
const handleSubmit = async () => {
const err = validate();
@@ -1396,7 +1404,7 @@ export function ScheduleFormDialog({
fastMode: fast,
});
}}
- agentDeviceId={isBound ? boundAgentDeviceId : form.agentDeviceId || null}
+ agentDeviceId={selectedAgentDeviceId}
remoteLocation={isProjectAutomationMode ? 'none' : isBound ? 'locked' : 'any'}
onFollowSession={() => selectModelConfiguration(null,
boundSessionReference?.agentKind === 'cc' ? 'claude-code' : boundSessionReference?.agentKind)}
diff --git a/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx b/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx
new file mode 100644
index 0000000000..c3d83ef188
--- /dev/null
+++ b/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx
@@ -0,0 +1,126 @@
+// @vitest-environment jsdom
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { ReactNode } from 'react';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import type { Schedule } from '@cindy/maker-scheduler';
+
+// PR #6832: exercise the real form's save/effect path. Pure form-logic tests cannot
+// catch the dialog wiring a remote choice to the local catalog. Minimal inputs:
+// a remote-only model, or same-ID models with conflicting effort/Fast capabilities.
+// Tier: unit/jsdom; separate from hook-only tests because this renders the dialog.
+// Standalone Windows run: 3.14s Vitest / 4.21s process wall time (5 cases).
+const state = vi.hoisted(() => ({
+ warning: vi.fn(),
+ references: new Map<string, unknown>(),
+ loading: false,
+ localModels: [{ id: 'shared', efforts: ['low'], supportsFastMode: false }],
+ remoteModels: [
+ { id: 'shared', efforts: ['ultra'], supportsFastMode: true },
+ { id: 'remote-only', efforts: ['ultra'], supportsFastMode: true },
+ ],
+}));
+vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
+vi.mock('@/lib/toast', () => ({ toast: { warning: state.warning, success: vi.fn(), error: vi.fn() } }));
+vi.mock('@/hooks/useAgentCapabilities', () => ({
+ getCachedCapabilities: () => null,
+ useAgentCapabilities: (_agent: string, device?: string) => ({
+ capabilities: { availableModels: device && !state.loading ? state.remoteModels : state.localModels, hasFastMode: true },
+ loading: !!device && state.loading,
+ }),
+}));
+vi.mock('@/hooks/useProviders', () => ({
+ useProviders: () => ({ providers: [{ id: 'source', connected: true, agents: ['codex'], routing: { codex: {} },
+ models: { codex: state.localModels } }], loading: false }),
+}));
+vi.mock('@/hooks/useDeviceProviders', () => ({
+ useDeviceProviders: () => ({ providers: [{ id: 'source', connected: true, agents: ['codex'], routing: { codex: {} },
+ models: { codex: state.loading ? state.localModels : state.remoteModels } }], loading: state.loading }),
+}));
+vi.mock('@/hooks/useFeishuBot', () => ({ useFeishuBot: () => ({ status: 'disconnected' }) }));
+vi.mock('@/hooks/useWecomGroupNotificationSettings', () => ({ useWecomGroupNotificationSettings: () => ({}) }));
+vi.mock('@/hooks/useProjectPickerOptions', () => ({ useProjectPickerOptions: () => [] }));
+vi.mock('../../hooks/useSessionReferences', () => ({ useSessionReferences: () => state.references }));
+vi.mock('@radix-ui/react-dialog', () => {
+ const Pass = ({ children }: { children?: ReactNode }) => <>{children}</>;
+ return { Root: Pass, Portal: Pass, Overlay: () => null, Content: Pass, Title: Pass, Description: Pass, Close: Pass };
+});
+vi.mock('@/components/ui/tooltip', () => ({ Tip: ({ children }: { children?: ReactNode }) => children }));
+vi.mock('../TemplateGallery', () => ({ TemplateGallery: () => null }));
+vi.mock('../TemplateParamForm', () => ({ TemplateParamForm: () => null }));
+vi.mock('../BoundSessionCard', () => ({ BoundSessionCard: () => null }));
+vi.mock('../ScheduleChips', () => ({
+ ProjectChip: () => null, ScheduleChip: () => null, ScheduleSettingsButton: () => null, ThreadPickerInline: () => null,
+ ModelEffortChip: ({ onSelect }: { onSelect: (choice: unknown) => void }) => (
+ <button onClick={() => onSelect({ engine: 'codex', modelId: 'remote-only', providerId: 'source',
+ effort: 'ultra', fast: true, agentDevice: { deviceId: 'studio' } })}>select remote</button>
+ ),
+}));
+
+import { ScheduleFormDialog } from '../ScheduleFormDialog';
+
+function schedule(patch: Partial<Schedule> = {}): Schedule {
+ return { id: 'schedule', name: 'Test', prompt: 'Check work', agentKind: 'codex',
+ model: 'shared', providerId: 'source', cronExpr: '0 9 * * *', timezone: 'UTC',
+ recurring: true, manual: false, workspaceKind: 'dialogue', useWorktree: false,
+ notify: { desktop: true, feishu: false }, status: 'active', kind: 'cron', source: 'user',
+ jobType: 'prompt', createdAt: 1, updatedAt: 1, ...patch };
+}
+function mount(initial: Schedule) {
+ const onSubmit = vi.fn(async () => {});
+ const element = () => <ScheduleFormDialog open initial={initial} onOpenChange={() => {}} onSubmit={onSubmit} />;
+ const view = render(element());
+ return { onSubmit, refresh: () => view.rerender(element()),
+ save: () => fireEvent.click(screen.getByRole('button', { name: 'scheduler.editor.promptDialog.saveAria' })) };
+}
+beforeEach(() => {
+ vi.clearAllMocks();
+ state.references.clear();
+ state.loading = false;
+ localStorage.clear();
+});
+afterEach(cleanup);
+
+it('saves a selected remote-only model against its own catalog', async () => {
+ const form = mount(schedule());
+ fireEvent.click(screen.getByText('select remote'));
+ form.save();
+ await waitFor(() => expect(form.onSubmit).toHaveBeenCalledWith(expect.objectContaining({
+ agentDeviceId: 'studio', model: 'remote-only', providerId: 'source', effort: 'ultra', fastMode: true,
+ }), true));
+});
+
+it('validates an override at the bound task location even without a saved device', async () => {
+ state.references.set('bound', { id: 'bound', state: 'available', status: 'active', agentKind: 'codex', agentDeviceId: 'studio' });
+ const form = mount(schedule({ targetSessionId: 'bound', model: 'remote-only', modelAgentKind: 'codex' }));
+ form.save();
+ await waitFor(() => expect(form.onSubmit).toHaveBeenCalledWith(expect.objectContaining({
+ targetSessionId: 'bound', model: 'remote-only',
+ }), true));
+});
+
+it('keeps legacy remote effort and Fast when the local same-ID copy differs', async () => {
+ const form = mount(schedule({ agentDeviceId: 'studio', effort: 'ultra', fastMode: true }));
+ form.save();
+ await waitFor(() => expect(form.onSubmit).toHaveBeenCalledWith(expect.objectContaining({
+ effort: 'ultra', fastMode: true,
+ }), true));
+});
+
+it('rejects a model missing from the selected remote catalog', () => {
+ const form = mount(schedule({ agentDeviceId: 'studio', model: 'removed', modelAgentKind: 'codex' }));
+ form.save();
+ expect(form.onSubmit).not.toHaveBeenCalled();
+ expect(state.warning).toHaveBeenCalledWith('scheduler.editor.validation.modelUnavailable');
+});
+
+it('preserves remote preferences while its catalog refresh is still loading', async () => {
+ state.loading = true;
+ const form = mount(schedule({ agentDeviceId: 'studio', effort: 'ultra', fastMode: true }));
+ state.loading = false;
+ form.refresh();
+ form.save();
+ await waitFor(() => expect(form.onSubmit).toHaveBeenCalledWith(expect.objectContaining({
+ effort: 'ultra', fastMode: true,
+ }), true));
+});
diff --git a/docs/product-rules/agent-user-parity.md b/docs/product-rules/agent-user-parity.md
index 7f752a932a..c96948c3de 100644
--- a/docs/product-rules/agent-user-parity.md
+++ b/docs/product-rules/agent-user-parity.md
@@ -74,7 +74,8 @@ Worker 工具省略 working_dir 时保持继承 Lead 任务记录目录,不跟
(`HELPER_CATEGORY_DESCRIPTIONS`)、`cindy_schedulerMcpServer.ts`
(`SCHEDULER_CATEGORY_DESCRIPTIONS`)、`xdt-helper/capabilities.ts` 的 `self-management`。
- 定时任务的 Agent 运行位置:`packages/lizi-mcps/src/scheduler/listModels.ts`(与协同 Worker 的
- `list_available_models` 共用 host 实现)、`create.ts` / `update.ts` 的 `agentDeviceId`;执行见
+ `list_available_models` 共用 host 实现;模型项的 `id` 对应 `model`,`providers[].id` 对应
+ `providerId`)、`create.ts` / `update.ts` 的 `agentDeviceId`;执行见
`apps/desktop/src/main/scheduler-host/runner.ts`(按那台电脑的已授权目录解析,不回落本机同名来源)。
- 跨电脑定时任务:`packages/lizi-mcps/src/scheduler/_devices.ts`、
`apps/desktop/src/main/mcp-integrations/schedulerDevices.ts`。
diff --git a/packages/lizi-mcps/src/scheduler/listModels.ts b/packages/lizi-mcps/src/scheduler/listModels.ts
index b64dcaed06..bc29f8118e 100644
--- a/packages/lizi-mcps/src/scheduler/listModels.ts
+++ b/packages/lizi-mcps/src/scheduler/listModels.ts
@@ -27,7 +27,7 @@ export function registerScheduleListModelsTool(
category: 'scheduler',
description:
'查本机定时任务可用的 Agent 运行位置与模型。不传 agentDeviceId 列本机的模型,并在 locations 里给出同账号其它在线电脑与分享来的供应商;传 locations[].agentDeviceId 列那里的模型。' +
- '要让任务每次新建时在别处运行:schedule_create / schedule_update 传同一个 agentDeviceId,并用这里列出的 model 与 providers[].provider_id。' +
+ '要让任务每次新建时在别处运行:schedule_create / schedule_update 传同一个 agentDeviceId;model 取 codex / claude_code / pi 列表项的 id,providerId 取该模型 providers[].id(名称为 providers[].name,默认来源为 defaultProviderId)。' +
'只用于本机的定时任务;其它电脑上的定时任务不能设运行位置。',
inputShape: {
agent: z.enum(AGENT_KIND).optional().describe('只列某个 agent 的模型;不传列全部'),