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): 没指定模型的定时任务跟随新建任务默认,不再写死 Sonnet 4.6 (#5824)

Dash28afb1e98a01
diff --git a/apps/desktop/src/main/im/shared/__tests__/cardActionAskMulti.test.ts b/apps/desktop/src/main/im/shared/__tests__/cardActionAskMulti.test.ts
index 0b1b1040b8..afe19fa97d 100644
--- a/apps/desktop/src/main/im/shared/__tests__/cardActionAskMulti.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/cardActionAskMulti.test.ts
@@ -17,6 +17,8 @@ const mocks = vi.hoisted(() => ({
getMaker: vi.fn(),
getDesktopCcPrefs: vi.fn<() => DesktopCcPrefs | null>(() => null),
resolveLenientSessionRoute: vi.fn(),
+ // 桌面偏好缺省时 control:new 按新建任务口径解析默认模型;本 harness 不搭目录,固定返回。
+ resolveNewTaskDefaultModelRoute: vi.fn(async () => ({ model: 'claude-sonnet-4-6', providerId: null })),
// 禁止回落 cwd:TEMP 是 Windows 独有变量,macOS 上回落 cwd 会让传递 import 的
// 写盘副作用落进仓库工作区(见 authAdaptersImportPurity.test.ts 记录的事故)。
userDataDir: process.env.TMPDIR ?? process.env.TEMP ?? '/tmp',
@@ -34,6 +36,7 @@ vi.mock('../../../logger', () => ({ createLogger: () => mocks.logger }));
vi.mock('../../../maker-host', () => ({ getMaker: mocks.getMaker }));
vi.mock('../../../maker-host/model-route-guard-live', () => ({
resolveLenientSessionRoute: mocks.resolveLenientSessionRoute,
+ resolveNewTaskDefaultModelRoute: mocks.resolveNewTaskDefaultModelRoute,
}));
vi.mock('../../index', () => ({ getDesktopCcPrefs: mocks.getDesktopCcPrefs }));
vi.mock('../controlProjects', () => ({
diff --git a/apps/desktop/src/main/im/shared/__tests__/cardActionGroupLaneGuard.test.ts b/apps/desktop/src/main/im/shared/__tests__/cardActionGroupLaneGuard.test.ts
index a306905847..b8fd774a15 100644
--- a/apps/desktop/src/main/im/shared/__tests__/cardActionGroupLaneGuard.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/cardActionGroupLaneGuard.test.ts
@@ -25,6 +25,11 @@ const mocks = vi.hoisted(() => ({
getMaker: vi.fn(),
createSession: vi.fn(async () => ({ id: 'sess-new', model: 'm', agentKind: 'claude-code' })),
resolveLenientSessionRoute: vi.fn(),
+ // 桌面偏好缺省时 control:new 按新建任务口径解析默认模型;本 harness 不搭目录,固定返回。
+ resolveNewTaskDefaultModelRoute: vi.fn(async () => ({
+ model: 'claude-sonnet-4-6',
+ providerId: null,
+ })),
getDesktopCcPrefs: vi.fn(() => null),
userDataDir: process.env.TMPDIR ?? process.env.TEMP ?? '/tmp',
}));
@@ -42,6 +47,7 @@ vi.mock('../../../logger', () => ({ createLogger: () => mocks.logger }));
vi.mock('../../../maker-host', () => ({ getMaker: mocks.getMaker }));
vi.mock('../../../maker-host/model-route-guard-live', () => ({
resolveLenientSessionRoute: mocks.resolveLenientSessionRoute,
+ resolveNewTaskDefaultModelRoute: mocks.resolveNewTaskDefaultModelRoute,
}));
vi.mock('../../index', () => ({ getDesktopCcPrefs: mocks.getDesktopCcPrefs }));
vi.mock('../controlProjects', () => ({
diff --git a/apps/desktop/src/main/im/shared/__tests__/cardActionTakeoverReplace.test.ts b/apps/desktop/src/main/im/shared/__tests__/cardActionTakeoverReplace.test.ts
index bbeed81f2e..a7994bd87a 100644
--- a/apps/desktop/src/main/im/shared/__tests__/cardActionTakeoverReplace.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/cardActionTakeoverReplace.test.ts
@@ -21,6 +21,8 @@ const mocks = vi.hoisted(() => ({
closeSession: vi.fn(async () => {}),
getDesktopCcPrefs: vi.fn<() => DesktopCcPrefs | null>(() => null),
resolveLenientSessionRoute: vi.fn(),
+ // 桌面偏好缺省时 control:new 按新建任务口径解析默认模型;本 harness 不搭目录,固定返回。
+ resolveNewTaskDefaultModelRoute: vi.fn(async () => ({ model: 'claude-sonnet-4-6', providerId: null })),
applyRuntimeSetModelChange:
vi.fn<(input: unknown) => Promise<{ status: 'applied' | 'deferred' }>>(),
applyPiImModelSelectionUnderLock: vi.fn(async (): Promise<{
@@ -61,6 +63,7 @@ vi.mock('../../../logger', () => ({ createLogger: () => mocks.logger }));
vi.mock('../../../maker-host', () => ({ getMaker: mocks.getMaker }));
vi.mock('../../../maker-host/model-route-guard-live', () => ({
resolveLenientSessionRoute: mocks.resolveLenientSessionRoute,
+ resolveNewTaskDefaultModelRoute: mocks.resolveNewTaskDefaultModelRoute,
}));
vi.mock('../../index', () => ({ getDesktopCcPrefs: mocks.getDesktopCcPrefs }));
vi.mock('../controlProjects', () => ({
diff --git a/apps/desktop/src/main/im/shared/cardActionHandler.ts b/apps/desktop/src/main/im/shared/cardActionHandler.ts
index 9f0105467f..e101ee8620 100644
--- a/apps/desktop/src/main/im/shared/cardActionHandler.ts
+++ b/apps/desktop/src/main/im/shared/cardActionHandler.ts
@@ -27,7 +27,10 @@ import {
import { createLogger } from '../../logger';
import { getMaker } from '../../maker-host';
-import { resolveLenientSessionRoute } from '../../maker-host/model-route-guard-live';
+import {
+ resolveLenientSessionRoute,
+ resolveNewTaskDefaultModelRoute,
+} from '../../maker-host/model-route-guard-live';
import {
getSessionProvider,
normalizeSessionProviderId,
@@ -102,9 +105,8 @@ function pickRandom<T>(arr: readonly T[]): T {
return arr[Math.floor(Math.random() * arr.length)];
}
-const DESKTOP_CC_DEFAULTS: DesktopCcPrefs = {
- model: 'claude-sonnet-4-6',
- providerId: null,
+/** 桌面偏好还没推过来时的兜底;模型不写死,按新建任务口径实时解析。 */
+const DESKTOP_CC_DEFAULTS: Omit<DesktopCcPrefs, 'model' | 'providerId'> = {
effort: 'medium',
permissionMode: 'acceptEdits',
fastMode: false,
@@ -947,8 +949,8 @@ export function createCardActionHandler(
// 然后 attach binding 把后续渠道消息路由到这个新 session。
// session 创建参数:
// - agentKind = 'claude-code' (跟 desktop 默认一致)
- // - model/effort/fastMode 用 desktop 当前偏好(含 providerId, 缺省走
- // DESKTOP_CC_DEFAULTS) — 这是"用 desktop 默认"的承诺
+ // - model/effort/fastMode 用 desktop 当前偏好(含 providerId; 偏好缺省时
+ // 模型按新建任务口径解析, 其余走 DESKTOP_CC_DEFAULTS) — 这是"用 desktop 默认"的承诺
// - permissionMode 例外: 飞书群 /ctr 用渠道设置「群聊新建任务权限档」
// (默认 auto), 私聊/其它渠道保持 desktop 偏好 — 两个创建分支必须一致,
// 非 thread 分支才是 feishu(非 threadScoped 渠道)实际走的路径
@@ -970,7 +972,12 @@ export function createCardActionHandler(
`control:new workingDir=${workingDir} displayName=${displayName} sender=...${event.senderId.slice(-8)}`,
);
- const desktopPrefs = getDesktopCcPrefs() ?? DESKTOP_CC_DEFAULTS;
+ const newTaskDefault = await resolveNewTaskDefaultModelRoute('claude-code').catch(() => null);
+ const desktopPrefs: DesktopCcPrefs = getDesktopCcPrefs() ?? {
+ ...DESKTOP_CC_DEFAULTS,
+ model: newTaskDefault?.model ?? '',
+ providerId: newTaskDefault?.providerId ?? null,
+ };
// 飞书群/话题里的 /ctr 新建: 权限档用渠道设置「群聊新建任务权限档」
// (默认 auto 自动审批, 与群里 @bot 开话题建会话同一个设置项 —— 见
// feishu adapter 的 sessions.permissionModeFor); 私聊保持 desktop 偏好不变。
@@ -1000,7 +1007,7 @@ export function createCardActionHandler(
// (PR #744 review 第六轮);desiredEffort 让换模型时的 effort 按解析出的
// 模型条目 reconcile(第十一轮)。
{
- fallbackModel: DESKTOP_CC_DEFAULTS.model,
+ fallbackModel: newTaskDefault?.model,
desiredEffort: desktopPrefs.effort,
desiredFastMode: desktopPrefs.fastMode === true,
},
diff --git a/apps/desktop/src/main/learn-host/index.ts b/apps/desktop/src/main/learn-host/index.ts
index 55d0209494..6888b30db3 100644
--- a/apps/desktop/src/main/learn-host/index.ts
+++ b/apps/desktop/src/main/learn-host/index.ts
@@ -25,13 +25,15 @@ import { getDbClient } from '../localDb/client/current';
import { and, desc, eq, isNull, inArray } from 'drizzle-orm';
import { messages as messagesTable, sessions as sessionsTable } from '../localDb/schema';
import { getSessionProvider, setSessionProvider } from '../maker-host/session-provider-store.js';
-import { resolveLenientSessionRoute } from '../maker-host/model-route-guard-live.js';
+import {
+ resolveLenientSessionRoute,
+ resolveNewTaskDefaultModelRoute,
+} from '../maker-host/model-route-guard-live.js';
import { agentHandoffPending } from '../maker-ipc/agentHandoffPendingSingleton.js';
import { readMemorySettings } from '../maker-host/memory-settings-store.js';
import { visibleMessageTextForConversationSearch } from '../localDb/conversationSearch.pure';
import { searchChatHistoryHybrid } from '../localDb/chatHistorySearch';
import { backfillSessionMeta } from '../scheduler-host/runners/_shared';
-import { defaultModelFor } from '../scheduler-host/model-defaults';
import { computeTwoDirDiff } from '../skillhub/snapshot';
import type { LearnEventPayload } from '../../shared/learnTypes';
import { LearnController, type LearnSessionLike } from './controller';
@@ -91,7 +93,7 @@ export function startLearnHost(deps: StartLearnHostDeps): LearnController {
createSession: async (opts): Promise<LearnSessionLike> => {
// 蒸馏用什么模型由用户决定:继承触发会话的 agentKind/model/effort
// (用户在输入框发 /learn 前可随意切模型)。无触发会话(理论上仅
- // 编程调用)才落到保守兜底。
+ // 编程调用)才按新建任务口径取默认模型。
const originMeta = opts.originSessionId
? await deps.maker.getSessionMeta(opts.originSessionId).catch(() => null)
: null;
@@ -121,16 +123,17 @@ export function startLearnHost(deps: StartLearnHostDeps): LearnController {
// model/provider 可能已被用户停用 —— 宽松降级(丢弃被停用的来源/模型,
// 退回默认路由),不让 /learn 因停用整体失败。
const agentKind = originMeta?.agentKind ?? 'claude-code';
- const desiredModel = originMeta?.model ?? defaultModelFor(agentKind);
+ const newTaskDefault = await resolveNewTaskDefaultModelRoute(agentKind).catch(() => null);
+ const desiredModel = originMeta?.model ?? newTaskDefault?.model;
const route = await resolveLenientSessionRoute(
agentKind,
desiredModel,
- inheritedProviderId,
- // 保守默认模型同走裁决阶梯:它自己也可能被停用,不能作为未经裁决的兜底
+ originMeta?.model ? inheritedProviderId : (newTaskDefault?.providerId ?? null),
+ // 新建任务默认模型同走裁决阶梯:它自己也可能被停用,不能作为未经裁决的兜底
// (PR #744 review 第六轮);desiredEffort 让换模型时的 effort 按解析出的
// 模型条目 reconcile(第十一轮)。
{
- fallbackModel: defaultModelFor(agentKind),
+ fallbackModel: newTaskDefault?.model,
desiredEffort: originMeta?.effort,
desiredFastMode: originMeta?.fastMode === true,
},
diff --git a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
index b2dc84388b..0bfe06efef 100644
--- a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
@@ -1,6 +1,7 @@
import { beforeEach, describe, expect, it } from 'vitest';
import {
+ getNewTaskDraftSelection,
getSelectedNewMakerRoute,
getRemoteNewMakerDefaults,
getRemoteNewMakerDefaultsByVendor,
@@ -170,6 +171,19 @@ it('does not reuse the selected default route across owners or older snapshots',
expect(getSelectedNewMakerRoute('owner-a')).toBeUndefined();
});
+it('scopes the headless new-task draft selection to the owner that pushed it', () => {
+ setNewMakerDraftCache({
+ lastByVendor: { cc: { model: 'claude-opus-5-5', providerId: 'anthropic' } },
+ modelChosenByVendor: { cc: true },
+ effortByModel: {},
+ fastModeByModel: {},
+ }, 'owner-a');
+ expect(getNewTaskDraftSelection('owner-a', 'claude-code')).toEqual({
+ model: 'claude-opus-5-5', providerId: 'anthropic', chosenByUser: true,
+ });
+ // 切账号后新 renderer 还没推快照的窗口:不拿上一个账号的偏好。
+ expect(getNewTaskDraftSelection('owner-b', 'claude-code')).toBeNull();
+});
describe('owner-fenced new task and Bot default mirror', () => {
const owner = { dataOwnerId: 'B', ownerGeneration: 3 };
diff --git a/apps/desktop/src/main/maker-host/model-route-guard-live.ts b/apps/desktop/src/main/maker-host/model-route-guard-live.ts
index c1248c7c05..57168beaa6 100644
--- a/apps/desktop/src/main/maker-host/model-route-guard-live.ts
+++ b/apps/desktop/src/main/maker-host/model-route-guard-live.ts
@@ -13,9 +13,7 @@
import {
getModel,
- connectedProvidersForAgent,
effectiveSourceIdForModel,
- isModelSelectableForNewRoute,
isModelDisabled,
isProviderDisabled,
modelSupportsFastMode,
@@ -26,6 +24,8 @@ import {
type ProviderView,
} from '@cindy/model-providers';
+import { resolveNewTaskDefaultRoute } from '../../shared/draftModelCalibration.js';
+import { activeOwnerScopeKey } from '../appSessionState.js';
import { resolveScheduledModelSelection, type ScheduledModelSelection } from '../maker-ipc/scheduledModelSelection';
import { getDesktopProviderService } from './createDesktopProviderService.js';
import {
@@ -33,6 +33,7 @@ import {
isXdGatewayPaymentRequiredRoute,
} from './active-catalog.js';
import { readModelDisableOverrides } from './model-disable-store.js';
+import { getNewTaskDraftSelection } from './newMakerDefaultsCache.js';
import {
isRegistryTombstoneForConsumer,
MODEL_PLANE_POLICIES,
@@ -73,10 +74,24 @@ function tombstoneGuardOptions(
};
}
+/**
+ * Headless defaults are trusted main-process operations, not untrusted status projections.
+ * Allow the provider service to claim an existing native subscription before materializing
+ * the route; otherwise legacy/local owners can look disconnected until another UI read heals it.
+ */
+function listTrustedDefaultRouteProviders(): Promise<ProviderView[]> {
+ return getDesktopProviderService().listProviders({
+ allowSideEffects: true,
+ waitForDiscovery: true,
+ getCatalog: getActiveCatalog,
+ });
+}
+
/**
* Headless 调度的实时来源快照:
* - 给定 modelId 时按模型选择器同一 rail 物化实际 provider;
- * - 未给 modelId 时为 Pi 取首个可聊天模型,并把 providerId/model 成对返回。
+ * - 未给 modelId 时按新建任务口径(resolveNewTaskDefaultRoute)挑默认模型,并把
+ * providerId/model 成对返回;一个可用来源都没有 → null。
* 这样 spawn 凭证、proxy endpoint 与会话持久化不会各自重新猜一次默认来源。
*/
export async function resolveDefaultScheduleRoute(
@@ -84,14 +99,7 @@ export async function resolveDefaultScheduleRoute(
preferredProviderId?: string | null,
modelId?: string,
): Promise<{ model: string; providerId: string | null; catalogKnown?: boolean } | null> {
- // Scheduler fire is a trusted main-process operation, not an untrusted status projection.
- // Allow the provider service to claim an existing native subscription before materializing
- // the route; otherwise legacy/local owners can look disconnected until another UI read heals it.
- const views = await getDesktopProviderService().listProviders({
- allowSideEffects: true,
- waitForDiscovery: true,
- getCatalog: getActiveCatalog,
- });
+ const views = await listTrustedDefaultRouteProviders();
const preferredModelId = modelId?.trim();
if (preferredModelId) {
const providerId = effectiveSourceIdForModel(
@@ -113,17 +121,28 @@ export async function resolveDefaultScheduleRoute(
}
return null;
}
- const connected = connectedProvidersForAgent(views, agent);
- const candidates = preferredProviderId
- ? connected.filter((provider) => provider.id === preferredProviderId)
- : connected;
- for (const provider of candidates) {
- for (const model of provider.models[agent] ?? []) {
- if (!isModelSelectableForNewRoute(model, { userProvider: provider.source === 'user' })) continue;
- return { model: model.id, providerId: provider.id };
- }
- }
- return null;
+ return resolveNewTaskDefaultRoute({
+ providers: views,
+ agent,
+ draft: getNewTaskDraftSelection(activeOwnerScopeKey(), agent),
+ requiredProviderId: preferredProviderId,
+ });
+}
+
+/**
+ * 没指定模型的无人值守入口(/learn、IM 新建任务等)按新建任务口径解析 (模型, 来源);
+ * 一个可用来源都没有 → null,调用方明确失败。
+ */
+export async function resolveNewTaskDefaultModelRoute(
+ agent: AgentKind,
+ requiredProviderId?: string | null,
+): Promise<{ model: string; providerId: string } | null> {
+ return resolveNewTaskDefaultRoute({
+ providers: await listTrustedDefaultRouteProviders(),
+ agent,
+ draft: getNewTaskDraftSelection(activeOwnerScopeKey(), agent),
+ requiredProviderId,
+ });
}
/** 该 agent 的静态原生默认来源偏好(nativeDefaultSourceId 的无 rail 近似)。 */
diff --git a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
index 9c1c81266a..fa69b92144 100644
--- a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
+++ b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
@@ -174,6 +174,26 @@ export function getWorkerDefaultsFromNewMaker(
return { model, effort, fastMode, providerId: prefs.providerId };
}
+/**
+ * 新建任务草稿里该 Harness 的模型与来源,以及是否由用户显式选过(无人值守入口按新建任务
+ * 口径解析默认模型用,见 shared/draftModelCalibration resolveNewTaskDefaultRoute)。
+ * 与 getSelectedNewMakerRoute 同样按账号隔离:缓存未就绪或仍是上一个账号推来的 → null,
+ * 切账号窗口内不拿上一个账号的模型 / 来源偏好去跑。
+ */
+export function getNewTaskDraftSelection(
+ ownerScope: string,
+ agent: 'claude-code' | 'codex' | 'pi',
+): { model?: string; providerId?: string | null; chosenByUser: boolean } | null {
+ if (!cache || selectedRouteOwner !== ownerScope) return null;
+ const vendor: VendorKey = agent === 'claude-code' ? 'cc' : agent;
+ const prefs = cache.lastByVendor[vendor];
+ return {
+ model: prefs?.model,
+ providerId: prefs?.providerId,
+ chosenByUser: cache.modelChosenByVendor?.[vendor] === true,
+ };
+}
+
/**
* device-link 远程草稿镜像用:取某 vendor 在 New Maker 草稿里的**当前完整选择**
* (model/effort/fast/permission/source)+ **整张 per-model 记忆表**。与
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index 7fda5588ab..fa2fb623ec 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -489,15 +489,18 @@ function selectWorkerModel(params: {
defaults: OrcaWorkerDefaultsSnapshot;
/** Worker 那一处的目录里有 Lead 的模型(或与 Lead 同一处)时才沿用它;缺省沿用。 */
inheritLeadModel?: boolean;
+ availableModels: readonly OrcaWorkerModelCapabilities[];
+ providers: readonly OrcaWorkerProviderSnapshot[];
}): string {
const { input, lead, defaults, inheritLeadModel = true } = params;
return input.model
?? defaults.model
- // pi 显式列出(与 model-defaults.ts 对齐,避免将来改 cc 默认时 pi 静默跟随)。
- ?? (input.agent === lead.agentKind && inheritLeadModel ? lead.model
- : input.agent === 'codex' ? 'gpt-5.5'
- : input.agent === 'pi' ? 'claude-sonnet-4-6'
- : 'claude-sonnet-4-6');
+ ?? (input.agent === lead.agentKind && inheritLeadModel ? lead.model : undefined)
+ // 新建任务草稿还没推过来时不写死型号:取目录里排第一、且有已连接来源提供的模型;
+ // 一个都没有则留空,由后续模型解析明确报错。
+ ?? params.availableModels.find((model) =>
+ params.providers.some((provider) => provider.models.includes(model.id)))?.id
+ ?? '';
}
/**
@@ -1203,6 +1206,8 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
lead,
defaults,
inheritLeadModel: sameLocationAsLead || availableModels.some((model) => model.id === lead.model),
+ availableModels,
+ providers: agentProviders,
});
const leadProviderId =
params.agent === routeLead.agentKind && typeof routeLead.providerId === 'string' && routeLead.providerId.trim()
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerAgentMeta.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerAgentMeta.test.ts
index 73ad09b52a..9672447a15 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerAgentMeta.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerAgentMeta.test.ts
@@ -113,6 +113,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'codex',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'gpt-6-astra',
workspaceKind: 'project',
workingDir: '/repo/project',
useWorktree: false,
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerBackgroundTasks.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerBackgroundTasks.test.ts
index ac84cfb749..e4a8dc4eb4 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerBackgroundTasks.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerBackgroundTasks.test.ts
@@ -159,6 +159,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'claude-code',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'claude-opus-5-5',
workspaceKind: 'project',
workingDir: '/repo/project',
useWorktree: false,
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerDefer.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerDefer.test.ts
index f4513e78a8..3ca2d4646d 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerDefer.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerDefer.test.ts
@@ -283,6 +283,7 @@ describe('MakerScheduleRunner 顺延 / 礼让', () => {
heartbeatSchedule({
targetSessionId: undefined,
workingDir: 'F:\\X',
+ model: 'gpt-6-astra',
}),
createFireContext(),
);
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerModelSelection.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerModelSelection.test.ts
index 2784ef674b..db26ae2717 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerModelSelection.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerModelSelection.test.ts
@@ -581,18 +581,31 @@ describe('MakerScheduleRunner model selection', () => {
});
describe('non-heartbeat (每次新建 session)', () => {
- it('schedule.model 留空时 Claude 兜底 claude-sonnet-4-6(成本保守,与 UI 空值回退一致)', async () => {
+ it('schedule.model 留空时 Claude 按新建任务默认实时解析 model + 来源,不写死型号', async () => {
const h = createSessionHarness();
- const harness = createRunnerHarness(h);
+ const resolveDefaultModelRoute = vi.fn(async () => ({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ }));
+ const harness = createRunnerHarness(h, null, { resolveDefaultModelRoute });
const opts = await fireToCompletion(harness, h, baseSchedule({ model: undefined }));
- expect(opts.model).toBe('claude-sonnet-4-6');
+ expect(resolveDefaultModelRoute).toHaveBeenCalledWith('claude-code', null);
+ expect(opts.model).toBe('claude-opus-5-5');
+ expect(harness.createSession).toHaveBeenCalledWith(
+ expect.objectContaining({ providerId: 'anthropic' }),
+ );
+ expect(mocks.setSessionProvider).toHaveBeenCalledWith('scheduler-session', 'anthropic');
});
- it('schedule.model 留空时 Codex 兜底 gpt-5.5', async () => {
+ it('schedule.model 留空时 Codex 按新建任务默认实时解析,并把来源写入会话', async () => {
const h = createSessionHarness();
- const harness = createRunnerHarness(h);
+ const resolveDefaultModelRoute = vi.fn(async () => ({
+ model: 'gpt-6-astra',
+ providerId: 'openai',
+ }));
+ const harness = createRunnerHarness(h, null, { resolveDefaultModelRoute });
const opts = await fireToCompletion(
harness,
@@ -600,7 +613,25 @@ describe('MakerScheduleRunner model selection', () => {
baseSchedule({ model: undefined, agentKind: 'codex' }),
);
- expect(opts.model).toBe('gpt-5.5');
+ expect(resolveDefaultModelRoute).toHaveBeenCalledWith('codex', null);
+ expect(opts.model).toBe('gpt-6-astra');
+ expect(harness.createSession).toHaveBeenCalledWith(
+ expect.objectContaining({ providerId: 'openai' }),
+ );
+ expect(mocks.setSessionProvider).toHaveBeenCalledWith('scheduler-session', 'openai');
+ });
+
+ it('schedule.model 留空且没有可用来源时在创建会话前明确失败,不落到写死的型号', async () => {
+ const h = createSessionHarness();
+ const harness = createRunnerHarness(h, null, {
+ resolveDefaultModelRoute: vi.fn(async () => null),
+ });
+
+ await expect(
+ harness.runner.fire(baseSchedule({ model: undefined }), createFireContext()),
+ ).rejects.toThrow('claude-code has no connected model source');
+ expect(harness.createSession).not.toHaveBeenCalled();
+ expect(h.send).not.toHaveBeenCalled();
});
it('Pi 空模型按同一已连接来源解析 model + providerId,不能落到 Cindy 的 Sonnet 路由', async () => {
@@ -669,7 +700,7 @@ describe('MakerScheduleRunner model selection', () => {
baseSchedule({ agentKind: 'pi', model: undefined, providerId: undefined }),
createFireContext(),
),
- ).rejects.toThrow('Pi has no connected model source');
+ ).rejects.toThrow('pi has no connected model source');
expect(harness.createSession).not.toHaveBeenCalled();
expect(h.send).not.toHaveBeenCalled();
});
@@ -1215,13 +1246,19 @@ describe('MakerScheduleRunner model selection', () => {
);
});
- it('legacy session meta 无 model 时落兜底 Sonnet 并 setModel + 落库(显式锁定静默升级契约)', async () => {
- // 历史持续会话可能从未存过 model(meta.model undefined)。此时:
- // rawModel=undefined → defaultModelFor='claude-sonnet-4-6',
- // heartbeatModelChanged=true → setModel + backfill 落库。
- // 这是有意行为(兜底必须与 UI 空值回退一致),本用例防止未来误改。
+ it('legacy session meta 无 model 时按新建任务默认解析并 setModel + 落库', async () => {
+ // 历史持续会话可能从未存过 model(meta.model undefined)。此时 rawModel=undefined →
+ // 按新建任务口径实时解析默认模型,heartbeatModelChanged=true → setModel + backfill 落库。
const h = createSessionHarness();
- const harness = createRunnerHarness(h, { workDir: '/work', sdkSessionId: 'sdk-1' });
+ const resolveDefaultModelRoute = vi.fn(async () => ({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ }));
+ const harness = createRunnerHarness(
+ h,
+ { workDir: '/work', sdkSessionId: 'sdk-1' },
+ { resolveDefaultModelRoute },
+ );
const opts = await fireToCompletion(
harness,
@@ -1229,12 +1266,14 @@ describe('MakerScheduleRunner model selection', () => {
baseSchedule({ model: undefined, targetSessionId: 'scheduler-session' }),
);
- expect(opts.model).toBe('claude-sonnet-4-6');
- expect(h.setModel).toHaveBeenCalledWith('claude-sonnet-4-6');
+ expect(opts.model).toBe('claude-opus-5-5');
+ expect(h.setModel).toHaveBeenCalledWith('claude-opus-5-5');
+ // 解析出的来源与模型成对写入会话,重启后的下一次运行不会退回隐式来源。
+ expect(mocks.setSessionProvider).toHaveBeenCalledWith('scheduler-session', 'anthropic');
expect(mocks.backfillSessionMeta).toHaveBeenCalledWith(
expect.anything(),
'scheduler-session',
- expect.objectContaining({ model: 'claude-sonnet-4-6' }),
+ expect.objectContaining({ model: 'claude-opus-5-5', providerId: 'anthropic' }),
expect.anything(),
);
});
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerQueuedDispatch.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerQueuedDispatch.test.ts
index d69a00c539..267e9a6ec2 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerQueuedDispatch.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerQueuedDispatch.test.ts
@@ -1977,7 +1977,12 @@ describe('MakerScheduleRunner queued dispatch (busy bound session)', () => {
const queue = createQueueHarness({ busy: false });
const { runner, notifier } = createRunnerHarness(harness.session, queue.deps);
const fire = runner.fire(
- heartbeatSchedule({ targetSessionId: fresh ? undefined : SESSION_ID, workingDir: '/work' }),
+ heartbeatSchedule({
+ targetSessionId: fresh ? undefined : SESSION_ID,
+ workingDir: '/work',
+ // 新建会话的任务没接默认模型解析;显式给模型,本用例只关心 Stop 收口。
+ ...(fresh ? { model: 'claude-opus-5-5' } : {}),
+ }),
createFireContext(),
);
await vi.waitFor(() => expect(queue.enqueueCalls).toHaveLength(1));
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerSendOutcome.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerSendOutcome.test.ts
index 4d7d7eb432..beedafa26a 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerSendOutcome.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerSendOutcome.test.ts
@@ -129,6 +129,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'codex',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'gpt-6-astra',
workspaceKind: 'project',
workingDir: 'F:\\XDMaker',
useWorktree: false,
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerSessionClose.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerSessionClose.test.ts
index 1340084577..49f119e880 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerSessionClose.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerSessionClose.test.ts
@@ -135,6 +135,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'codex',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'gpt-6-astra',
workspaceKind: 'dialogue',
useWorktree: false,
notify: { desktop: true, feishu: false },
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerSilentNotify.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerSilentNotify.test.ts
index 49ae075702..fb2e789136 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerSilentNotify.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerSilentNotify.test.ts
@@ -112,6 +112,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'codex',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'gpt-6-astra',
workspaceKind: 'project',
workingDir: '/repo/project',
useWorktree: false,
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/runnerWorkingDirFallback.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/runnerWorkingDirFallback.test.ts
index feb247a74c..4de79c27b6 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/runnerWorkingDirFallback.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/runnerWorkingDirFallback.test.ts
@@ -105,6 +105,8 @@ function baseSchedule(overrides: Partial<Schedule> = {}): Schedule {
recurring: true,
manual: false,
agentKind: 'codex',
+ // 留空模型要靠默认解析(本 harness 未接),这里显式给模型。
+ model: 'gpt-6-astra',
workspaceKind: 'project',
useWorktree: false,
notify: { desktop: true, feishu: false },
diff --git a/apps/desktop/src/main/scheduler-host/__tests__/scriptCapabilityBroker.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/scriptCapabilityBroker.test.ts
index f0c8a33618..de00e85aa3 100644
--- a/apps/desktop/src/main/scheduler-host/__tests__/scriptCapabilityBroker.test.ts
+++ b/apps/desktop/src/main/scheduler-host/__tests__/scriptCapabilityBroker.test.ts
@@ -473,6 +473,22 @@ describe('SchedulerScriptCapabilityBroker', () => {
}));
});
+ it('does not resolve or require a default route when dispatching to an existing task', async () => {
+ sendToSessionMock.mockResolvedValue({ ok: true, targetSessionId: 'owner', agentKind: 'codex', wakeKind: 'queued' });
+ const resolveDefaultModelRoute = vi.fn(async () => null);
+ const broker = new SchedulerScriptCapabilityBroker({ resolveDefaultModelRoute });
+
+ await broker.call(
+ { method: 'sessions.dispatch', params: { message: 'update' } },
+ new Set(['sessions.dispatch']),
+ { schedule: schedule({ agentKind: 'claude-code', model: undefined, targetSessionId: 'owner' }) },
+ );
+
+ expect(resolveDefaultModelRoute).not.toHaveBeenCalled();
+ expect(sendToSessionMock).toHaveBeenCalledWith(expect.objectContaining({ targetSessionId: 'owner' }));
+ expect(sendToSessionMock.mock.calls[0]?.[0]).not.toHaveProperty('createDefaults');
+ });
+
it('rejects blank Pi script-dispatch defaults before opening a session when no source is connected', async () => {
const broker = new SchedulerScriptCapabilityBroker({
resolveDefaultModelRoute: vi.fn(async () => null),
diff --git a/apps/desktop/src/main/scheduler-host/model-defaults.ts b/apps/desktop/src/main/scheduler-host/model-defaults.ts
deleted file mode 100644
index eaa3fcc4f2..0000000000
--- a/apps/desktop/src/main/scheduler-host/model-defaults.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * model-defaults — 调度域"留空走默认"的 model 兜底(单一来源)
- * ---------------------------------------------------------------------------
- * 与 renderer useScheduleForm.ts `schedulerFallbackModel` 同步:cc →
- * claude-sonnet-4-6,codex → gpt-5.5。**故意不跟对话的 Opus 默认**——自动化
- * 无人值守反复执行,冷启动兜底走成本保守路线,要 Opus 的用户会显式选。
- * ⚠️ 必须与 UI 空值回退(ModelEffortChip / getScheduleDefaultModel)一致,
- * 否则"UI 显示 X 实跑 Y"(2026-06 实踩:显示 Opus 4.8、跑的 4.7)。消费方:
- * runner(agent 任务 fire)与 script-capability-broker(sessions.dispatch 的
- * createDefaults)——先前各持一份拷贝,review 后收敛到本文件。
- */
-import type { AgentKind } from '@cindy/maker-scheduler';
-
-export function defaultModelFor(agentKind: AgentKind): string {
- if (agentKind === 'codex') return 'gpt-5.5';
- // Pi 没有跨来源合法的静态默认。runner 会用实时连接目录解析
- // {model,providerId};空字符串可阻止其它调用方制造“看似可用”的 Claude 假路由。
- if (agentKind === 'pi') return '';
- return 'claude-sonnet-4-6';
-}
diff --git a/apps/desktop/src/main/scheduler-host/runner.ts b/apps/desktop/src/main/scheduler-host/runner.ts
index 48897348d3..81a6c4b88e 100644
--- a/apps/desktop/src/main/scheduler-host/runner.ts
+++ b/apps/desktop/src/main/scheduler-host/runner.ts
@@ -117,7 +117,6 @@ import { WorktreePool } from '../worktree';
import type { SchedulerDrizzleDb } from './storage';
import { backfillSessionMeta } from './runners/_shared';
import { buildSkipResultText, executePreRunHook, formatPreRunHookFailure } from './pre-run-hook';
-import { defaultModelFor } from './model-defaults';
import { beginHeadlessGhostSetupTurn } from '../mcp-integrations/ghostSetupInteractionSurface.js';
import { terminalErrorText } from '../im/shared/turnRetryNotice.js';
@@ -193,14 +192,10 @@ const INTERRUPTED_ERROR_DONE_FALLBACK_MS = 250;
* model picker 显示 placeholder + permission 模式在 headless 跑时会卡所有需 approval
* 的 tool 调用(没人在线点同意)。
*
- * model 兜底已抽到 ./model-defaults.ts(defaultModelFor,broker 也复用);同步约束见彼处:
- * cc → claude-sonnet-4-6,codex → gpt-5.5。**故意不跟对话的 Opus 默认**
- * (modelDefinitions.ts getDefaultModelForVendor):自动化无人值守反复执行,
- * 冷启动兜底走成本保守路线,要 Opus 的用户会在任务里显式选。
- * 三级回退(任务上次选择 → 对话上次选择 → 这里的兜底)在 renderer 表单层完成
- * 且保存时落显式值,runner 这条只兜 MCP 创建的 / 历史遗留的空 model 任务。
- * ⚠️ 必须与 UI 显示的空值回退一致(ModelEffortChip 也走 getScheduleDefaultModel),
- * 否则用户看到"已选 X"实际跑的却是 Y(2026-06 实际踩坑:UI 显示 Opus 4.8、跑的 4.7)。
+ * model 留空不写死型号:fire 时经 resolveDefaultModelRoute 按新建任务口径实时解析
+ * (shared/draftModelCalibration resolveNewTaskDefaultRoute,renderer 表单的空值回退同源),
+ * 一个可用来源都没有就让本次运行明确失败。表单层的回退(任务上次选择 → 对话上次选择 →
+ * 新建任务默认)保存时落显式值,runner 这条兜 MCP 创建的 / 历史遗留的空 model 任务。
*
* 普通 schedule 的 permissionMode 两个 agent 都用 'bypassPermissions'(types/common.ts:23 注释确认
* codex 支持子集 ask/auto/bypassPermissions)—— 调度本质是 unattended,bypass 是
@@ -1038,8 +1033,8 @@ export class MakerScheduleRunner implements ScheduleRunner {
// model: schedule.model 显式设置时永远优先(任务编辑器里选的模型必须生效,
// 含 heartbeat —— 否则用户在任务里改模型被静默忽略,只能去会话里改);
// heartbeat 且 schedule.model 留空才沿用绑定 session 的 meta.model;
- // 都空时按 agentKind 兜底 (与 renderer schedulerFallbackModel 同源),
- // 不留空字符串 — UI picker 显示 placeholder。
+ // 都空时按新建任务口径实时解析默认模型(resolveDefaultModelRoute 不带模型),
+ // 不写死型号;一个可用来源都没有就让本次运行明确失败。
// 普通 schedule 沿用既有默认权限;伙伴例行任务继承当前伙伴的权限和计划模式。
const effectiveAgentKind =
resolvedSelection?.agentKind ??
@@ -1053,7 +1048,7 @@ export class MakerScheduleRunner implements ScheduleRunner {
: undefined;
const explicitProviderId = schedule.providerId?.trim() ? schedule.providerId.trim() : null;
const defaultRouteProviderId = explicitProviderId ?? (isHeartbeat ? heartbeatProviderId : null);
- const modelHint = rawModel?.trim() ? rawModel : defaultModelFor(effectiveAgentKind);
+ const followsNewTaskDefault = !rawModel?.trim();
// Fresh Claude schedules must freeze the same provider rail the UI would use for this model.
// Leaving providerId null delegates credential selection to the legacy auth fallback, which can
// silently choose the Cindy gateway even when the only usable source is an Anthropic subscription.
@@ -1064,7 +1059,7 @@ export class MakerScheduleRunner implements ScheduleRunner {
providerId: string | null;
catalogKnown?: boolean;
} | null = null;
- if (!modelHint && effectiveAgentKind === 'pi') {
+ if (followsNewTaskDefault) {
dynamicDefaultRoute =
(await this.deps.resolveDefaultModelRoute?.(effectiveAgentKind, defaultRouteProviderId)) ??
null;
@@ -1073,14 +1068,14 @@ export class MakerScheduleRunner implements ScheduleRunner {
(await this.deps.resolveDefaultModelRoute?.(
effectiveAgentKind,
defaultRouteProviderId,
- modelHint,
+ rawModel,
)) ?? null;
}
- const model = rawModel?.trim()
- ? rawModel
- : (dynamicDefaultRoute?.model ?? defaultModelFor(effectiveAgentKind));
+ const model = followsNewTaskDefault ? (dynamicDefaultRoute?.model ?? '') : rawModel!;
if (!model) {
- throw new Error('schedule route unavailable: Pi has no connected model source');
+ throw new Error(
+ `schedule route unavailable: ${effectiveAgentKind} has no connected model source`,
+ );
}
if (
shouldMaterializeFreshClaudeProvider &&
@@ -1092,9 +1087,13 @@ export class MakerScheduleRunner implements ScheduleRunner {
`schedule route unavailable: Claude Code has no connected source for model "${model}"`,
);
}
- const materializedDefaultProviderId = shouldMaterializeFreshClaudeProvider
- ? (dynamicDefaultRoute?.providerId ?? null)
- : null;
+ // 实时解析出的默认来源要与模型成对写入会话(含心跳绑定会话首次解析默认时;Pi 由自己的
+ // 模型选择链路落来源),否则 spawn 凭证、聊天选择器、落库与下一次运行会各自重新猜一次默认来源。
+ const materializedDefaultProviderId =
+ shouldMaterializeFreshClaudeProvider ||
+ (followsNewTaskDefault && !explicitProviderId && effectiveAgentKind !== 'pi')
+ ? (dynamicDefaultRoute?.providerId ?? null)
+ : null;
let routinePermissions =
schedule.source === 'bot' ? await this.readRoutinePermissions(sessionId) : null;
if (schedule.source === 'bot' && !routinePermissions)
@@ -1520,8 +1519,9 @@ export class MakerScheduleRunner implements ScheduleRunner {
// - heartbeat 且留空 → 沿用绑定会话的来源:hydrate 只在内存无条目时写,**不覆盖**
// 用户在聊天里刚切的更新值(runner 绕过了 register 的 hydrate funnel,冷 resume
// 时内存为空,这一步把 DB 里的 provider_id 补回来 → honor 聊天所选来源)。
- // - 非 heartbeat Claude 且留空 → 把实时解析出的默认来源显式写入,确保 spawn
- // credential mode、proxy 路由、coordinator baseline 与落库使用同一个 provider。
+ // - 非 heartbeat Claude 留空,或本轮按新建任务口径解析了默认模型(含心跳)→ 把实时
+ // 解析出的默认来源显式写入,确保 spawn credential mode、proxy 路由、coordinator
+ // baseline 与落库使用同一个 provider。
// - fresh 显式模型选择 → 同步本轮解析来源,避免入队后把新 handle 的已选路由
// 误判成凭证切换;不把本轮默认来源回写到自动化偏好。
// - 其它非 heartbeat 且留空 → 保持既有默认路由语义。
@@ -1582,10 +1582,15 @@ export class MakerScheduleRunner implements ScheduleRunner {
// 下次 fire 读到的 meta.model 必须跟实际运行一致(4.4.1 已 setModel)。
// 同 effort: 复用路径 setModel 失败时跳过, 留给下次 fire 重试。
model: heartbeatModelChanged && modelSwitchApplied ? model : undefined,
- // 显式来源或 fresh Claude 物化出的默认来源都要落 sessions.provider_id ——
- // 聊天 picker、下次 heartbeat / 冷 resume 与本轮真实凭证/endpoint 才不会漂移。
- // heartbeat 留空时仍不写,保留绑定会话自己的 provider_id。
- providerId: explicitProviderId ?? materializedDefaultProviderId ?? undefined,
+ // 显式来源或物化出的默认来源都要落 sessions.provider_id —— 聊天 picker、下次
+ // heartbeat / 冷 resume 与本轮真实凭证/endpoint 才不会漂移。心跳只在默认模型
+ // 同轮落库成功时写(模型与来源成对);其余心跳留空不写,保留绑定会话自己的 provider_id。
+ providerId:
+ explicitProviderId ??
+ (!isHeartbeat || (heartbeatModelChanged && modelSwitchApplied)
+ ? materializedDefaultProviderId
+ : null) ??
+ undefined,
// 回退分配了对话工作区的会话按 'dialogue' 落库 —— 侧边栏才会归入
// "对话"分组(覆盖存量 workspaceKind='project' 但无目录的旧任务)。
workspaceKind: !isHeartbeat
@@ -2738,8 +2743,7 @@ export class MakerScheduleRunner implements ScheduleRunner {
providerId: string | null;
},
): Promise<{ model: string; providerId: string | null }> {
- const model = schedule.model?.trim() || baseline.model?.trim() || live?.model ||
- defaultModelFor('pi');
+ const model = schedule.model?.trim() || baseline.model?.trim() || live?.model || '';
const currentProviderId = getSessionProvider(sessionId) ?? baseline.providerId;
const explicitProviderId = schedule.providerId?.trim() || null;
const routeProviderId = explicitProviderId ?? currentProviderId;
@@ -2790,7 +2794,7 @@ export class MakerScheduleRunner implements ScheduleRunner {
const targetModel =
explicitModel ??
(baseline.model?.trim() ? baseline.model : undefined) ??
- (live.model?.trim() ? live.model : defaultModelFor(schedule.agentKind));
+ live.model;
const explicitProviderId = schedule.providerId?.trim() ? schedule.providerId.trim() : null;
const currentProviderId = getSessionProvider(live.id) ?? baseline.providerId;
// 停用轴准入(PR #744 review 第五、六轮):排队分支在 fire 主路径的准入点之前
diff --git a/apps/desktop/src/main/scheduler-host/script-capability-broker.ts b/apps/desktop/src/main/scheduler-host/script-capability-broker.ts
index 21eaa08052..a7a5c37aef 100644
--- a/apps/desktop/src/main/scheduler-host/script-capability-broker.ts
+++ b/apps/desktop/src/main/scheduler-host/script-capability-broker.ts
@@ -9,7 +9,6 @@ import { validateFsRelPath } from '../cindy-brain/fsSlot.js';
import { tryGetOrcaCollabService } from '../maker-ipc/register.js';
import type { ScriptCapabilityBroker, ScriptCapabilityCall } from './script-runner';
// model 兜底与 runner 同源(2026-06 曾因多份拷贝不同步导致 UI 显示与实跑模型不一致)
-import { defaultModelFor } from './model-defaults.js';
type DispatchEffort = 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max' | 'ultra';
@@ -202,6 +201,26 @@ export class SchedulerScriptCapabilityBroker implements ScriptCapabilityBroker {
) => Promise<{ model: string; providerId: string | null; catalogKnown?: boolean } | null>;
} = {}) {}
+ /** 新建任务的配置:模型留空时按新建任务口径实时解析,不写死型号。 */
+ private async createDefaultsFor(schedule: Schedule) {
+ const explicitProviderId = schedule.providerId?.trim() || null;
+ const dynamicDefaultRoute = !schedule.model?.trim()
+ ? await this.deps.resolveDefaultModelRoute?.(schedule.agentKind, explicitProviderId) ?? null
+ : null;
+ const model = schedule.model?.trim() || dynamicDefaultRoute?.model;
+ if (!model) fail('PRECONDITION_FAILED', `${schedule.agentKind} has no connected model source`);
+ return {
+ agentKind: schedule.agentKind,
+ model,
+ providerId: explicitProviderId ?? dynamicDefaultRoute?.providerId ?? null,
+ effort: schedule.effort as DispatchEffort | undefined,
+ fastMode: !!schedule.fastMode,
+ workingDir: schedule.workingDir ?? '',
+ workspaceKind: 'project' as const,
+ permissionMode: 'bypassPermissions' as const,
+ };
+ }
+
/**
* runner 判定本轮 fire 终结(drain 截止/abort/超时放弃等待在途调用)时调用:
* 让**本 run** 的残留脚本通道 callId 立即失去写盘授权,不等 pipeDispatcher
@@ -361,32 +380,14 @@ export class SchedulerScriptCapabilityBroker implements ScriptCapabilityBroker {
if (schedule.targetSessionId && requestedTarget && requestedTarget !== schedule.targetSessionId) {
fail('INVALID_ARGS', 'bound scripts can only dispatch to their target session');
}
- const explicitProviderId = schedule.providerId?.trim() || null;
- const dynamicDefaultRoute = !schedule.model?.trim() && schedule.agentKind === 'pi'
- ? await this.deps.resolveDefaultModelRoute?.(
- schedule.agentKind,
- explicitProviderId,
- ) ?? null
- : null;
- const model = schedule.model?.trim()
- || dynamicDefaultRoute?.model
- || defaultModelFor(schedule.agentKind);
- if (!model) fail('PRECONDITION_FAILED', 'Pi has no connected model source');
+ const targetSessionId = schedule.targetSessionId ?? requestedTarget;
const result = await service.sendToSession({
- targetSessionId: schedule.targetSessionId ?? requestedTarget,
+ targetSessionId,
message: requireString(params, 'message'),
title: typeof params.title === 'string' ? params.title : undefined,
useWorktree: false,
- createDefaults: {
- agentKind: schedule.agentKind,
- model,
- providerId: explicitProviderId ?? dynamicDefaultRoute?.providerId ?? null,
- effort: schedule.effort as DispatchEffort | undefined,
- fastMode: !!schedule.fastMode,
- workingDir: schedule.workingDir ?? '',
- workspaceKind: 'project',
- permissionMode: 'bypassPermissions',
- },
+ // 投递到已有任务时沿用该任务自己的配置,只有新建任务才需要默认路由。
+ ...(targetSessionId ? {} : { createDefaults: await this.createDefaultsFor(schedule) }),
});
if (!result.ok) fail(result.errorCode, result.message);
return {
diff --git a/apps/desktop/src/main/session-share/__tests__/sessionShareImport.test.ts b/apps/desktop/src/main/session-share/__tests__/sessionShareImport.test.ts
index 82b6980cb0..43541ebe49 100644
--- a/apps/desktop/src/main/session-share/__tests__/sessionShareImport.test.ts
+++ b/apps/desktop/src/main/session-share/__tests__/sessionShareImport.test.ts
@@ -61,6 +61,15 @@ const legacyImageMock = vi.hoisted(() => ({
}));
const closeSharedTaskForTask = vi.hoisted(() => vi.fn());
vi.mock('../../device-link/sharedTaskRuntime.js', () => ({ closeSharedTaskForTask }));
+// 没有草稿偏好时按新建任务口径解析默认模型;本 harness 不搭供应商目录,按 agent 固定返回。
+const resolveNewTaskDefaultModelRoute = vi.hoisted(() =>
+ vi.fn(async (agent: string) =>
+ agent === 'codex'
+ ? { model: 'gpt-6-astra', providerId: 'openai' }
+ : { model: 'claude-opus-5-5', providerId: 'anthropic' },
+ ),
+);
+vi.mock('../../maker-host/model-route-guard-live.js', () => ({ resolveNewTaskDefaultModelRoute }));
vi.mock('electron', () => ({
app: { getPath: () => tmpRoot, getVersion: () => '9.9.9' },
@@ -1309,7 +1318,7 @@ describe('sessionShareImport', () => {
expect(session.userSendAt).toBe(1700000000100);
});
- it('missing draftPrefs falls back to built-in defaults, still ignoring snapshot', async () => {
+ it('missing draftPrefs falls back to the new-task default route, still ignoring snapshot', async () => {
const filePath = await writeBundleFile(await buildBundle({ session: exporterSessionConfig }));
const inspect = await inspectShareFile(filePath);
if (inspect.encrypted) return;
@@ -1320,15 +1329,16 @@ describe('sessionShareImport', () => {
sharedMediaRootOverride: sharedMediaRoot,
});
const session = (dbMock.txCalls[0].args as { session: Record<string, unknown> }).session;
- expect(session.model).toBe('claude-sonnet-4-6');
+ expect(resolveNewTaskDefaultModelRoute).toHaveBeenCalledWith('claude-code');
+ expect(session.model).toBe('claude-opus-5-5');
expect(session.effort).toBe('high');
expect(session.permissionMode).toBe('auto');
- expect(session.providerId).toBeNull();
+ expect(session.providerId).toBe('anthropic');
expect(session.fastMode).toBe(false);
expect(session.planModeEnabled).toBe(false);
});
- it('codex bundle without draftPrefs falls back to codex default model', async () => {
+ it('codex bundle without draftPrefs falls back to the codex new-task default', async () => {
const filePath = await writeBundleFile(
await buildBundle({
agentKind: 'codex',
@@ -1344,7 +1354,8 @@ describe('sessionShareImport', () => {
sharedMediaRootOverride: sharedMediaRoot,
});
const session = (dbMock.txCalls[0].args as { session: Record<string, unknown> }).session;
- expect(session.model).toBe('gpt-5.4');
+ expect(session.model).toBe('gpt-6-astra');
+ expect(session.providerId).toBe('openai');
expect(session.codexHistoryHasProductPrompt).toBe(false);
});
diff --git a/apps/desktop/src/main/session-share/sessionShareImport.ts b/apps/desktop/src/main/session-share/sessionShareImport.ts
index 021dc69e9d..48e674c670 100644
--- a/apps/desktop/src/main/session-share/sessionShareImport.ts
+++ b/apps/desktop/src/main/session-share/sessionShareImport.ts
@@ -34,6 +34,7 @@ import type {
} from '../localDb/client/tx/types.js';
import { ensureDialogueWorkspaceDir } from '../localDb/dialogueWorkspace.js';
import { createLogger } from '../logger.js';
+import { resolveNewTaskDefaultModelRoute } from '../maker-host/model-route-guard-live.js';
import {
importSharedCodexThread,
removeSharedCodexThread,
@@ -975,6 +976,18 @@ export async function commitShareImport(
}));
const dbMessages = toDbMessages(messages, manifest.agentKind);
const draftPrefs = opts.draftPrefs ?? null;
+ // 只为真正拿不到草稿模型的会话解析默认(解析要读实时供应商目录)。
+ const hasDraftModel = (prefs: ShareImportDraftPrefs | null | undefined, apply: boolean) =>
+ apply && typeof prefs?.model === 'string' && prefs.model.length > 0;
+ const fallbackRoutes = await resolveImportFallbackRoutes([
+ ...(hasDraftModel(draftPrefs, true) ? [] : [manifest.agentKind]),
+ ...workerPlans
+ .filter((plan) => !hasDraftModel(
+ runtimeScope.migration?.agentPrefs?.[plan.manifest.agentKind] ?? draftPrefs,
+ !!runtimeScope.migration || plan.manifest.agentKind === manifest.agentKind,
+ ))
+ .map((plan) => plan.manifest.agentKind),
+ ]);
const teamId = randomUUID();
// 恶意/损坏包可能带多个 focused=true(源库有 partial unique 保证唯一);
// 归一为只保留第一个,避免整包因索引冲突白白失败。
@@ -1021,9 +1034,10 @@ export async function commitShareImport(
snapshot: plan.snapshot,
draftPrefs:
runtimeScope.migration?.agentPrefs?.[plan.manifest.agentKind] ?? draftPrefs,
- // 导入端草稿偏好按 vendor 存,跨 vendor 的 Worker 用内置兜底模型。
+ // 导入端草稿偏好按 vendor 存,跨 vendor 的 Worker 用新建任务默认模型。
applyDraftPrefs:
!!runtimeScope.migration || plan.manifest.agentKind === manifest.agentKind,
+ fallbackRoute: fallbackRoutes.get(plan.manifest.agentKind) ?? null,
// 普通分享沿用 auto;迁移不继承源机器的权限授权。
permissionModeOverride: runtimeScope.migration
? plan.manifest.agentKind === 'cc'
@@ -1064,6 +1078,7 @@ export async function commitShareImport(
snapshot: sessionSnapshot,
draftPrefs,
applyDraftPrefs: true,
+ fallbackRoute: fallbackRoutes.get(manifest.agentKind) ?? null,
workingDir,
worktreePath,
activeSdkSessionId,
@@ -1444,22 +1459,34 @@ const PERMISSION_MODES = new Set([
'bypassPermissions',
]);
-/** draftPrefs 缺省(旧调用方 / 测试)时按 agentKind 兜底的模型。 */
-const FALLBACK_MODEL_BY_AGENT: Record<'cc' | 'codex' | 'pi', string> = {
- cc: 'claude-sonnet-4-6',
- codex: 'gpt-5.4',
- pi: 'gpt-5.4',
-};
+type ImportFallbackRoute = { model: string; providerId: string } | null;
+
+/**
+ * 没有可用草稿偏好(旧调用方、跨 vendor 的 Worker)时的模型:按新建任务口径实时解析,
+ * 不写死型号;解析不到则留空,由用户在任务里选。
+ */
+async function resolveImportFallbackRoutes(
+ agentKinds: Iterable<'cc' | 'codex' | 'pi'>,
+): Promise<Map<'cc' | 'codex' | 'pi', ImportFallbackRoute>> {
+ const routes = new Map<'cc' | 'codex' | 'pi', ImportFallbackRoute>();
+ for (const kind of new Set(agentKinds)) {
+ routes.set(
+ kind,
+ await resolveNewTaskDefaultModelRoute(kind === 'cc' ? 'claude-code' : kind).catch(() => null),
+ );
+ }
+ return routes;
+}
/**
* 组装 tx session.importShare 的 session 行(lead 与协同 Worker 共用)。
*
* 字段来源分两类(导入语义 = 用本地草稿默认值新建会话,只有 agent 跟随分享包):
* - 会话配置(model/effort/permissionMode/planMode/fastMode/providerId)→ 导入端
- * draftPrefs(白名单校验,非法/缺省落内置兜底),**不读** snapshot——导出方的
+ * draftPrefs(白名单校验,非法/缺省落兜底;模型兜底按新建任务口径解析),**不读** snapshot——导出方的
* 模型/供应商在导入端不一定存在,照搬会产出本机不可用的脏 model(选择器显示
* 不出、发消息才暴露)。draftPrefs 按包顶层 vendor 采集,跨 vendor 的 Worker
- * 经 applyDraftPrefs=false 落内置兜底;Worker 的 permissionMode 固定 auto
+ * 经 applyDraftPrefs=false 落兜底;Worker 的 permissionMode 固定 auto
* (与 OrcaWorkerCreationService 同口径)。
* - 历史事实(token 统计 / contextTokens / clearedAt / 时间戳等)→ snapshot 照搬。
* contextWindow 也照搬:仅是展示缓存,renderer 按 session.model 重新计算。
@@ -1473,6 +1500,7 @@ function buildSessionRow(params: {
snapshot: Record<string, unknown>;
draftPrefs: ShareImportDraftPrefs | null;
applyDraftPrefs: boolean;
+ fallbackRoute: ImportFallbackRoute;
permissionModeOverride?: string;
status?: 'active' | 'archived';
workingDir: string;
@@ -1504,13 +1532,15 @@ function buildSessionRow(params: {
workingDir,
workspaceKind,
worktreePath,
- model: str(draftPrefs?.model, FALLBACK_MODEL_BY_AGENT[agentKind]),
+ model: str(draftPrefs?.model, params.fallbackRoute?.model ?? ''),
effort: EFFORTS.has(effort) ? effort : 'high',
permissionMode: PERMISSION_MODES.has(permissionMode) ? permissionMode : 'auto',
providerId:
typeof draftPrefs?.providerId === 'string' && draftPrefs.providerId.length > 0
? draftPrefs.providerId
- : null,
+ : typeof draftPrefs?.model === 'string' && draftPrefs.model
+ ? null
+ : (params.fallbackRoute?.providerId ?? null),
status: params.status ?? 'active',
sdkSessionId: activeSdkSessionId,
totalTokenUsage: num(snapshot.totalTokenUsage, 0),
diff --git a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
index b67f79b1b3..3f6abb9744 100644
--- a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
+++ b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
@@ -14,6 +14,7 @@ import {
pickConnectedModelForAgent,
pickFirstConnectedModelForAgent,
resolveDraftSessionProviderId,
+ resolveNewTaskDefaultRoute,
type DraftModelCalibrationInput,
} from '../lib/draftModelCalibration';
@@ -797,3 +798,86 @@ describe('resolveDraftSessionProviderId', () => {
})).toBe('account-a');
});
});
+
+describe('resolveNewTaskDefaultRoute(无人值守入口的新建任务默认)', () => {
+ const subscription = provider(
+ 'anthropic',
+ true,
+ { 'claude-code': [model('claude-opus-5-5')] },
+ 'subscription',
+ );
+ const providers = [gatewayWithoutOpus, subscription];
+
+ it('用户没选过模型:与新建任务同口径,订阅优先', () => {
+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'claude-code' })).toEqual({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ });
+ });
+
+ it('用户显式选过且仍可用的模型优先,来源跟着草稿记的来源', () => {
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers,
+ agent: 'claude-code',
+ draft: { model: 'claude-haiku-4-5', providerId: 'xd', chosenByUser: true },
+ }),
+ ).toEqual({ model: 'claude-haiku-4-5', providerId: 'xd' });
+ });
+
+ it('显式选过的模型已没有可用来源时,退回新建任务默认而不是落空', () => {
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers,
+ agent: 'claude-code',
+ draft: { model: 'claude-opus-4-8', providerId: null, chosenByUser: true },
+ }),
+ ).toEqual({ model: 'claude-opus-5-5', providerId: 'anthropic' });
+ });
+
+ it('指定来源时只在该来源内挑', () => {
+ expect(
+ resolveNewTaskDefaultRoute({ providers, agent: 'claude-code', requiredProviderId: 'xd' }),
+ ).toEqual({ model: 'claude-sonnet-5', providerId: 'xd' });
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers,
+ agent: 'claude-code',
+ requiredProviderId: 'not-connected',
+ }),
+ ).toBeNull();
+ });
+
+ it('草稿记的来源挑不出模型时换别的来源', () => {
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers: [gatewayWithoutOpus, connectedButEmpty],
+ agent: 'claude-code',
+ draft: { model: '', providerId: 'anthropic', chosenByUser: false },
+ }),
+ ).toEqual({ model: 'claude-sonnet-5', providerId: 'xd' });
+ });
+
+ it('清单发现失败的来源:没有偏好时跳过,草稿记着该来源时保留', () => {
+ const failing = {
+ ...provider('anthropic', true, { 'claude-code': [model('claude-opus-5-5')] }, 'subscription'),
+ modelDiscoveryFailure: { kind: 'unauthorized' },
+ } as unknown as ProviderView;
+ expect(
+ resolveNewTaskDefaultRoute({ providers: [gatewayWithoutOpus, failing], agent: 'claude-code' }),
+ ).toEqual({ model: 'claude-sonnet-5', providerId: 'xd' });
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers: [gatewayWithoutOpus, failing],
+ agent: 'claude-code',
+ draft: { providerId: 'anthropic', chosenByUser: false },
+ }),
+ ).toEqual({ model: 'claude-opus-5-5', providerId: 'anthropic' });
+ });
+
+ it('一个可用来源都没有 → null,不编造型号', () => {
+ expect(
+ resolveNewTaskDefaultRoute({ providers: [disconnectedAnthropic], agent: 'claude-code' }),
+ ).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/__tests__/scheduleDefaultModel.test.ts b/apps/desktop/src/renderer/__tests__/scheduleDefaultModel.test.ts
index d5ec93feae..fa194be1e0 100644
--- a/apps/desktop/src/renderer/__tests__/scheduleDefaultModel.test.ts
+++ b/apps/desktop/src/renderer/__tests__/scheduleDefaultModel.test.ts
@@ -5,9 +5,8 @@
* 1. 上次建自动化任务时选的模型(scheduleFormPrefs.lastByAgent)优先
* 2. 没有 → 跟随对话上次选择(newMakerDraft localStorage **真实持久化值**,
* 不吃 sanitize 的默认回填 —— 全新用户不能被对话侧的 Opus 默认顶掉)
- * 3. 都没有 → 成本保守冷启动兜底:cc → claude-sonnet-4-6, codex → gpt-5.5
- * (与 scheduler-host/runner.ts defaultModelFor 同步,两边漂移会复现
- * "UI 显示 X 实际跑 Y" 的 2026-06 事故)
+ * 3. 都没有 → 新建任务默认(resolveNewTaskDefaultRoute,与 runner 对空 model 任务的
+ * 实时解析同源);不写死型号,供应商清单未到位或无可用来源时为 ''
*
* 项目 vitest env=node,无 window。与 newMakerDraft.test.ts 同款:
* vi.stubGlobal 注入最小 localStorage,避免新增 jsdom 依赖。
@@ -15,6 +14,8 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
+import type { CatalogModel, ProviderView } from '@cindy/model-providers';
+
class MemLocalStorage {
private store = new Map<string, string>();
getItem(k: string): string | null {
@@ -31,6 +32,49 @@ class MemLocalStorage {
}
}
+function model(id: string, sortOrder = 0): CatalogModel {
+ return {
+ id,
+ name: id,
+ group: 'test',
+ sortOrder,
+ contextWindow: 200_000,
+ efforts: [],
+ defaultEffort: null,
+ supportsFastMode: false,
+ status: 'active',
+ } as CatalogModel;
+}
+
+function provider(
+ id: string,
+ models: Record<string, CatalogModel[]>,
+ access: 'subscription' | 'managed' = 'managed',
+): ProviderView {
+ const agents = Object.keys(models);
+ return {
+ id,
+ name: id,
+ source: 'builtin',
+ agents,
+ models,
+ routing: Object.fromEntries(
+ agents.map((agent) => [agent, { upstream: 'https://provider.test', authStrategy: 'none' }]),
+ ),
+ auth: { method: 'oauth' },
+ access: access === 'subscription' ? { kind: 'subscription', product: id } : { kind: access },
+ connected: true,
+ } as unknown as ProviderView;
+}
+
+const PROVIDERS: ProviderView[] = [
+ provider('xd', {
+ 'claude-code': [model('claude-sonnet-5', 0), model('claude-haiku-4-5', 1)],
+ codex: [model('gpt-6-luna', 0)],
+ }),
+ provider('anthropic', { 'claude-code': [model('claude-opus-5-5', 0)] }, 'subscription'),
+];
+
const SCHEDULE_PREFS_KEY = 'xdt:scheduleFormPrefs:v1';
const CHAT_DRAFT_KEY = 'xdt:newMakerDraft:v1';
@@ -94,34 +138,90 @@ describe('getScheduleDefaultModel 三级回退', () => {
expect(getScheduleDefaultModel('claude-code')).toBe('claude-opus-4-8');
});
- it('三级:全新用户(无任何持久化)冷启动兜底 Sonnet,不被对话侧 Opus 默认顶掉', async () => {
+ it('三级:全新用户按新建任务口径取已连接来源里的默认(订阅优先),不写死型号', async () => {
const { getScheduleDefaultModel } = await loadModule();
- expect(getScheduleDefaultModel('claude-code')).toBe('claude-sonnet-4-6');
+ expect(getScheduleDefaultModel('claude-code', PROVIDERS)).toBe('claude-opus-5-5');
+ expect(getScheduleDefaultModel('codex', PROVIDERS)).toBe('gpt-6-luna');
+ });
+
+ it('三级:默认模型与来源成对返回;一级没记来源时为 null', async () => {
+ const { getScheduleDefaultRoute } = await loadModule();
+ expect(getScheduleDefaultRoute('claude-code', PROVIDERS)).toEqual({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ });
+ seedSchedulePrefs('claude-haiku-4-5');
+ expect(getScheduleDefaultRoute('claude-code', PROVIDERS)).toEqual({
+ model: 'claude-haiku-4-5',
+ providerId: null,
+ });
+ });
+
+ it('二级:对话里显式选过的模型带上它记着的来源', async () => {
+ const draft = await import('@/state/newMakerDraft');
+ draft.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'anthropic' });
+ const { getScheduleDefaultRoute } = await loadModule();
+ expect(getScheduleDefaultRoute('claude-code', PROVIDERS)).toEqual({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ });
});
- it('三级:对话 draft 存在但 model 字段缺失(老 schema)→ 仍走 Sonnet 兜底', async () => {
- seedChatDraft(undefined);
+ it('表单初始化一次性应用二级回退的模型与来源', async () => {
+ const draft = await import('@/state/newMakerDraft');
+ draft.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'anthropic' });
+ const { makeFormFromSchedule } = await loadModule();
+ expect(makeFormFromSchedule(null)).toMatchObject({
+ agentKind: 'claude-code',
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ });
+ });
+
+ it('只记了来源时,默认模型限定在该来源内,且与它整对返回', async () => {
+ memStorage.setItem(
+ SCHEDULE_PREFS_KEY,
+ JSON.stringify({
+ agentKind: 'claude-code', workspaceKind: 'dialogue', workingDir: '', useWorktree: false,
+ lastByAgent: { 'claude-code': { model: '', providerId: 'xd', effort: '', fastMode: false } },
+ }),
+ );
+ const { getScheduleDefaultRoute, makeFormFromSchedule } = await loadModule();
+ expect(getScheduleDefaultRoute('claude-code', PROVIDERS, 'xd')).toEqual({
+ model: 'claude-sonnet-5',
+ providerId: 'xd',
+ });
+ // 清单未到位:先保留记着的来源,等清单到位在该来源内回填模型。
+ expect(makeFormFromSchedule(null)).toMatchObject({ model: '', providerId: 'xd' });
+ });
+
+ it('三级:供应商清单未到位时留空,等清单到位再回填', async () => {
const { getScheduleDefaultModel } = await loadModule();
- expect(getScheduleDefaultModel('claude-code')).toBe('claude-sonnet-4-6');
+ expect(getScheduleDefaultModel('claude-code')).toBe('');
});
- it('三级:对话 draft 持久化了种子默认 model 但用户从未显式选过(无 modelChosenByVendor 标记)→ 不算上次选择,落 Sonnet', async () => {
+ it('三级:一个可用来源都没有时留空,不编造型号', async () => {
+ const { getScheduleDefaultModel } = await loadModule();
+ expect(getScheduleDefaultModel('claude-code', [])).toBe('');
+ });
+
+ it('三级:对话 draft 持久化了种子默认 model 但用户从未显式选过 → 不算上次选择,按清单校准', async () => {
// lastByVendor 整个快照随任意 draft 写入落盘:只改过 workingDir / 只用过
- // Codex 的用户,持久化里也躺着 cc 的种子默认(Opus)。没有显式选择标记时
- // 必须忽略,否则成本保守兜底被对话侧 Opus 默认顶掉。
+ // Codex 的用户,持久化里也躺着 cc 的种子默认。没有显式选择标记时不能当成
+ // 用户选择,必须按供应商清单校准(这里种子没有已连接来源)。
seedChatDraft('claude-opus-4-8', { chosen: false });
const { getScheduleDefaultModel } = await loadModule();
- expect(getScheduleDefaultModel('claude-code')).toBe('claude-sonnet-4-6');
+ expect(getScheduleDefaultModel('claude-code', PROVIDERS)).toBe('claude-opus-5-5');
});
- it('三级:已有任务只改思考档不打显式选择标记 → 调度仍走 Sonnet 兜底', async () => {
+ it('三级:已有任务只改思考档不打显式选择标记 → 调度按新建任务默认', async () => {
const draft = await import('@/state/newMakerDraft');
draft.patchVendorPrefsPreservingModelChoice('cc', {
effort: 'high',
});
const { getScheduleDefaultModel } = await loadModule();
expect(draft.getPersistedVendorModel('cc')).toBe('');
- expect(getScheduleDefaultModel('claude-code')).toBe('claude-sonnet-4-6');
+ expect(getScheduleDefaultModel('claude-code', PROVIDERS)).toBe('claude-opus-5-5');
});
it('三级:已有任务换模后调度跟随这次选择', async () => {
@@ -154,23 +254,10 @@ describe('getScheduleDefaultModel 三级回退', () => {
expect(getScheduleDefaultModel('claude-code')).toBe('claude-opus-4-8');
});
- it('codex 冷启动兜底 gpt-5.5', async () => {
- const { getScheduleDefaultModel } = await loadModule();
- expect(getScheduleDefaultModel('codex')).toBe('gpt-5.5');
- });
-
- it('损坏的 localStorage JSON → 静默回退兜底,不抛错', async () => {
+ it('损坏的 localStorage JSON → 静默回退新建任务默认,不抛错', async () => {
memStorage.setItem(CHAT_DRAFT_KEY, '{not json');
memStorage.setItem(SCHEDULE_PREFS_KEY, '{not json');
const { getScheduleDefaultModel } = await loadModule();
- expect(getScheduleDefaultModel('claude-code')).toBe('claude-sonnet-4-6');
- });
-
- it('schedulerFallbackModel 与 runner defaultModelFor 的约定值一致(防漂移锚点)', async () => {
- const { schedulerFallbackModel } = await loadModule();
- // scheduler-host/runner.ts defaultModelFor 必须返回同样的值;
- // runner 侧的等价断言见 runnerModelSelection.test.ts。
- expect(schedulerFallbackModel('claude-code')).toBe('claude-sonnet-4-6');
- expect(schedulerFallbackModel('codex')).toBe('gpt-5.5');
+ expect(getScheduleDefaultModel('claude-code', PROVIDERS)).toBe('claude-opus-5-5');
});
});
diff --git a/apps/desktop/src/renderer/__tests__/schedulerTemplateEntry.test.ts b/apps/desktop/src/renderer/__tests__/schedulerTemplateEntry.test.ts
index fbc8de679f..750f5f14e0 100644
--- a/apps/desktop/src/renderer/__tests__/schedulerTemplateEntry.test.ts
+++ b/apps/desktop/src/renderer/__tests__/schedulerTemplateEntry.test.ts
@@ -178,8 +178,20 @@ vi.mock('@/hooks/useProviders', () => ({
vi.mock('@/state/newMakerDraft', () => ({
getPersistedVendorModel: () => '',
+ getDraft: () => ({ lastByVendor: {}, modelChosenByVendor: {} }),
}));
+/** 新建任务默认(第三级回退)从这份已连接来源里挑:唯一可用的 claude-code 模型。 */
+const DEFAULT_CLAUDE_PROVIDER = {
+ id: 'xd', name: 'Cindy', source: 'builtin', connected: true, agents: ['claude-code'],
+ auth: { method: 'oauth' }, access: { kind: 'managed' },
+ routing: { 'claude-code': { upstream: 'https://gateway.example', authStrategy: 'none' } },
+ models: { 'claude-code': [{
+ id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6', contextWindow: 200_000, sortOrder: 0,
+ efforts: ['medium', 'high'], defaultEffort: 'medium', supportsFastMode: false, status: 'active',
+ }] },
+} as unknown as ProviderView;
+
vi.mock('@/features/scheduler/components/ScheduleChips', async () => {
const React = await import('react');
return {
@@ -202,7 +214,7 @@ vi.mock('@/features/scheduler/components/ScheduleChips', async () => {
});
beforeEach(() => {
- modelFixtures.providers = [];
+ modelFixtures.providers = [DEFAULT_CLAUDE_PROVIDER];
modelFixtures.sessionReferences.clear();
createSchedule.mockImplementation(async (input) => ({ id: 'created-schedule', ...input }));
routerMocks.location.pathname = '/cc-agent/scheduled';
@@ -278,6 +290,8 @@ describe('Scheduler template entry', () => {
recurring: true,
agentKind: 'claude-code',
model: 'claude-sonnet-4-6',
+ // 新建任务默认的来源与模型成对落库,runner 不再把空来源重新解析成别的来源。
+ providerId: 'xd',
notify: { desktop: true, feishu: false, wecomGroup: false },
}),
);
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
index d5414cdea1..7769823b68 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
@@ -44,7 +44,7 @@ import {
SUPPORTED_INTERVAL_MINUTES,
type CodexScheduleConfig,
} from '../lib/cronCodexPreset';
-import { getScheduleDefaultModel, type EffortValue } from '../hooks/useScheduleForm';
+import { getScheduleDefaultRoute, type EffortValue } from '../hooks/useScheduleForm';
import {
isFollowingSessionSelection,
PENDING_SESSION_ID,
@@ -1114,7 +1114,7 @@ export function ModelEffortChip({
// 触发器(trigger)展示用:仍按 openai-codex/ 与 codex/ 折扣模型的 XD 网关来源可见性过滤,算出当前
// 选中模型名。下拉内容本体改用聊天的 ModelSelectorContent(它内部按来源/api-key 自行
// 过滤 + 分组),这里只为 trigger 文案保留最小化 model 解析。
- const { providers } = useProviders();
+ const { providers, loading: providersLoading } = useProviders();
const xdConnected = providers.some((p) => p.id === 'xd' && p.connected);
const availableModels = caps.capabilities?.availableModels;
const models = useMemo(
@@ -1134,9 +1134,15 @@ export function ModelEffortChip({
effort: effortValue,
});
const followsSessionModel = usesBoundSessionModel({ followSession, model: modelValue });
- const effectiveId = followsSessionModel ? '' : modelValue || getScheduleDefaultModel(agentKind);
+ // 模型留空时显示与表单回填同源的默认路由(模型与来源成对)。
+ const defaultRoute =
+ followsSessionModel || modelValue
+ ? null
+ : getScheduleDefaultRoute(agentKind, providersLoading ? undefined : providers, providerId);
+ const effectiveId = followsSessionModel ? '' : modelValue || defaultRoute?.model || '';
+ const effectiveProviderId = providerId || defaultRoute?.providerId || null;
const current = models.find((m) => m.id === effectiveId);
- const sourceId = effectiveSourceIdForModel(providers, providerId || null, effectiveId, agentKind);
+ const sourceId = effectiveSourceIdForModel(providers, effectiveProviderId, effectiveId, agentKind);
const source = providers.find((provider) => provider.id === sourceId);
const catalogModel = source ? getModel(source, effectiveId, agentKind) : undefined;
const effectiveEffort = effortValue || catalogModel?.defaultEffort || current?.defaultEffort || '';
@@ -1162,9 +1168,9 @@ export function ModelEffortChip({
const activeSourceId = useMemo(
() =>
effectiveId
- ? effectiveSourceIdForModel(providers, providerId || null, effectiveId, agentKind)
+ ? effectiveSourceIdForModel(providers, effectiveProviderId, effectiveId, agentKind)
: null,
- [providers, providerId, effectiveId, agentKind],
+ [providers, effectiveProviderId, effectiveId, agentKind],
);
const activeProvider = providers.find((p) => p.id === activeSourceId);
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
index a49addbe31..04419a0c44 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
@@ -25,7 +25,7 @@ import { applyTemplateParams } from '@cindy/maker-scheduler/template-engine';
import { ScriptCapabilityMultiSelect } from './ScriptCapabilityMultiSelect';
import {
- getScheduleDefaultModel,
+ getScheduleDefaultRoute,
rememberScheduleFormPrefs,
useScheduleForm,
deriveRunMode,
@@ -134,7 +134,7 @@ export function ScheduleFormDialog({
const formApi = useScheduleForm(initial);
const { form, setField, selectModelConfiguration, setDestination, setRunMode, selectBoundSession, applyTemplateAgentFields, reset, toInput, validate } = formApi;
const caps = useAgentCapabilities(form.agentKind);
- const { providers } = useProviders();
+ const { providers, loading: providersLoading } = useProviders();
// "运行会话"三态(fresh / persistent / bound)与心跳形态派生值。
// hasRealBinding = targetSessionId 为真实会话 id(B 已绑 / C 已选 / MCP 手绑),
// 此时目录 / worktree / fastMode 由绑定会话决定,表单隐藏对应字段。
@@ -443,16 +443,24 @@ export function ScheduleFormDialog({
}, [currentModel, form.agentKind, form.model, form.providerId, providers]);
// form.model 为空时回填默认模型(三级回退,所见即所存)。
- // 覆盖历史遗留的空 model 任务(编辑打开时回填);若不回填,提交后落库是
- // 空字符串,runner 走自己 hardcode 的兜底 —— 两边一旦漂移就会出现
- // "任务里看着选了 Opus 4.8、实际每次跑 4.7"(2026-06 实际踩坑)。
+ // 覆盖历史遗留的空 model 任务(编辑打开时回填);第三级(新建任务默认)要等供应商
+ // 清单到位才能算出,算不出时保持留空,runner 按同一口径实时解析。
// ⚠️ heartbeat 形态(targetSessionId 非空,含 '__pending__')必须跳过:
// 空 model = "跟随会话"是有效语义,回填会把 MCP 建的跟随任务静默落成
// 显式模型,下次 fire runner setModel 反向改掉绑定会话的模型。
useEffect(() => {
if (form.targetSessionId.trim()) return;
- if (!form.model) setField('model', getScheduleDefaultModel(form.agentKind));
- }, [form.model, form.agentKind, form.targetSessionId, setField]);
+ if (form.model) return;
+ // 默认路由限定在表单已选的来源内,模型与来源成对回填(已选来源保持不变)。
+ const route = getScheduleDefaultRoute(
+ form.agentKind,
+ providersLoading ? undefined : providers,
+ form.providerId,
+ );
+ 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]);
useEffect(() => {
if (form.modelAgentKind || !currentModelEfforts || !form.effort) return;
diff --git a/apps/desktop/src/renderer/features/scheduler/hooks/useScheduleForm.ts b/apps/desktop/src/renderer/features/scheduler/hooks/useScheduleForm.ts
index 7ec19024bd..9152501102 100644
--- a/apps/desktop/src/renderer/features/scheduler/hooks/useScheduleForm.ts
+++ b/apps/desktop/src/renderer/features/scheduler/hooks/useScheduleForm.ts
@@ -10,7 +10,9 @@
import { useCallback, useRef, useState } from 'react';
import type { CreateScheduleInput, Schedule, ScheduleTemplate, ScheduleWorkspaceKind } from '@cindy/maker-scheduler';
-import { getPersistedVendorModel } from '@/state/newMakerDraft';
+import type { ProviderView } from '@cindy/model-providers';
+import { getDraft, getPersistedVendorModel } from '@/state/newMakerDraft';
+import { resolveNewTaskDefaultRoute } from '@/lib/draftModelCalibration';
import type { Session } from '@/lib/ccAgent.types';
import {
EFFORT_VALUES,
@@ -146,31 +148,58 @@ export function getScheduleAgentPrefs(agentKind: ScheduleFormState['agentKind'])
}
/**
- * 调度任务的冷启动兜底模型 —— 故意**不**跟对话的 Opus 默认
- * (modelDefinitions.ts getDefaultModelForVendor):自动化是无人值守反复执行的
- * 场景,默认不该是最贵的模型,要 Opus 的用户会显式选。
- * ⚠️ 必须与 scheduler-host/runner.ts defaultModelFor 保持一致
- * (runner 对 MCP 建的 / 历史遗留空 model 任务兜同一个值,UI 显示 ≠ 实际运行
- * 的事故见 2026-06 踩坑:任务里看着选了 Opus 4.8,实际每次跑 4.7)。
- */
-export function schedulerFallbackModel(agentKind: ScheduleFormState['agentKind']): string {
- // Pi 的来源/模型来自动态连接目录;没有能与 providerId 解耦的静态默认。
- return agentKind === 'codex' ? 'gpt-5.5' : agentKind === 'pi' ? '' : 'claude-sonnet-4-6';
-}
-
-/**
- * 新任务的默认模型,三级回退:
+ * 新任务的默认模型(及第三级回退时与之成对的来源),三级回退:
* 1. 上次建自动化任务时选的模型(scheduleFormPrefs,任务维度记忆)
* 2. 对话上次选择的模型(newMakerDraft 真实持久化值 —— 与新建对话同源,
* 跟着用户实际在用的模型走)
- * 3. 成本保守冷启动兜底(schedulerFallbackModel)
+ * 3. 新建任务默认(shared/draftModelCalibration resolveNewTaskDefaultRoute,与 runner
+ * 对空 model 任务的实时解析同源)。不写死型号:供应商清单未到位(`providers` 缺省)
+ * 或一个可用来源都没有时返回 '',由表单在清单到位后回填。第三级返回的来源必须与模型
+ * 一起落到表单:只存模型会让 runner 把空来源重新解析成原生默认(可能是网关)。
+ * 不变量:返回值是原子的 (模型, 来源) 对,调用方整对应用,不拿别处的来源去拼模型。
+ * 三级都返回与模型成对的来源(一级取任务记忆的来源,二级取对话草稿记着的来源),
+ * 没有记来源时为 null(跟随原生默认)。`preferredProviderId` 是表单 / 模板已定下的来源:
+ * 给定时只接受同一来源的一、二级结果,第三级只在该来源内挑,保证模型一定由这个来源提供。
*/
-export function getScheduleDefaultModel(agentKind: ScheduleFormState['agentKind']): string {
+export function getScheduleDefaultRoute(
+ agentKind: ScheduleFormState['agentKind'],
+ providers?: readonly ProviderView[],
+ preferredProviderId?: string | null,
+): { model: string; providerId: string | null } {
+ const preferred = preferredProviderId?.trim() || null;
+ const compatible = (providerId: string | null) => !preferred || providerId === preferred;
const prefs = getScheduleAgentPrefs(agentKind);
- if (prefs.model.trim()) return prefs.model;
- const chatLast = getPersistedVendorModel(agentKind === 'codex' ? 'codex' : agentKind === 'pi' ? 'pi' : 'cc');
- if (chatLast.trim()) return chatLast;
- return schedulerFallbackModel(agentKind);
+ const prefsProviderId = prefs.providerId || null;
+ if (prefs.model.trim() && compatible(prefsProviderId)) {
+ return { model: prefs.model, providerId: prefsProviderId };
+ }
+ const vendor = agentKind === 'codex' ? 'codex' : agentKind === 'pi' ? 'pi' : 'cc';
+ const draft = getDraft();
+ const chatLast = getPersistedVendorModel(vendor);
+ const chatProviderId = draft.lastByVendor[vendor]?.providerId || null;
+ if (chatLast.trim() && compatible(chatProviderId)) {
+ return { model: chatLast, providerId: chatProviderId };
+ }
+ if (!providers) return { model: '', providerId: preferred };
+ return (
+ resolveNewTaskDefaultRoute({
+ providers,
+ agent: agentKind,
+ requiredProviderId: preferred,
+ draft: {
+ model: draft.lastByVendor[vendor]?.model,
+ providerId: draft.lastByVendor[vendor]?.providerId,
+ chosenByUser: draft.modelChosenByVendor[vendor] === true,
+ },
+ }) ?? { model: '', providerId: preferred }
+ );
+}
+
+export function getScheduleDefaultModel(
+ agentKind: ScheduleFormState['agentKind'],
+ providers?: readonly ProviderView[],
+): string {
+ return getScheduleDefaultRoute(agentKind, providers).model;
}
export function rememberScheduleFormPrefs(form: ScheduleFormState): void {
@@ -196,15 +225,16 @@ export function rememberScheduleFormPrefs(form: ScheduleFormState): void {
function makeDefaultForm(): ScheduleFormState {
const prefs = loadScheduleFormPrefs();
const agentPrefs = prefs.lastByAgent[prefs.agentKind] ?? EMPTY_AGENT_PREFS;
+ // 三级回退:任务上次选择 → 对话上次选择 → 新建任务默认;清单未到位时先留空,
+ // 由 ScheduleFormDialog 在清单到位后回填显式值(所见即所存)。模型与来源成对应用。
+ const defaultRoute = getScheduleDefaultRoute(prefs.agentKind, undefined, agentPrefs.providerId);
return {
...DEFAULT_FORM,
agentKind: prefs.agentKind,
- // 三级回退:任务上次选择 → 对话上次选择 → 成本保守兜底,保证新任务
- // 表单的 model 永远是显式值(所见即所存,不再依赖 chip 的显示回退)。
- model: getScheduleDefaultModel(prefs.agentKind),
- // providerId 空 = 跟随原生默认来源(no-break)。沿用任务维度记忆;UI 显示时
- // 用 form.providerId || nativeDefaultSourceId(agentKind) 算高亮来源。
- providerId: agentPrefs.providerId,
+ model: defaultRoute.model,
+ // providerId 空 = 跟随原生默认来源(no-break)。默认路由已限定在任务记忆的来源内,
+ // 整对应用;UI 显示时用 form.providerId || nativeDefaultSourceId(agentKind) 算高亮来源。
+ providerId: defaultRoute.providerId ?? '',
effort: agentPrefs.effort,
fastMode: agentPrefs.fastMode,
workspaceKind: prefs.workspaceKind,
@@ -337,7 +367,8 @@ export function useScheduleForm(initial: Schedule | null = null): UseScheduleFor
const applyTemplateAgentFields = useCallback((template: ScheduleTemplate) => {
setForm((f) => {
const selection = resolveTemplateAgentFields(f, template, {
- getDefaultModel: getScheduleDefaultModel,
+ getDefaultRoute: (agentKind, preferredProviderId) =>
+ getScheduleDefaultRoute(agentKind, undefined, preferredProviderId),
getAgentPrefs: getScheduleAgentPrefs,
});
// A template that supplies a model is an explicit selection, even while following a bound task.
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
index e4e2b53808..24f18b1962 100644
--- a/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
+++ b/apps/desktop/src/renderer/features/scheduler/lib/__tests__/scheduleFormLogic.test.ts
@@ -16,7 +16,7 @@
* @vitest-environment node
*/
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
import type { Schedule, ScheduleTemplate } from '@cindy/maker-scheduler';
import type { ProviderView } from '@cindy/model-providers';
@@ -651,8 +651,11 @@ describe('hasRealBinding / agentKind 映射', () => {
describe('resolveTemplateAgentFields', () => {
const defaults = {
- getDefaultModel: (agentKind: ScheduleFormState['agentKind']) =>
- agentKind === 'codex' ? 'gpt-5.5' : 'claude-sonnet-4-6',
+ // 与真实实现同口径:默认路由限定在给定来源内并整对返回。
+ getDefaultRoute: (agentKind: ScheduleFormState['agentKind'], preferred?: string | null) => ({
+ model: agentKind === 'codex' ? 'gpt-5.5' : 'claude-sonnet-4-6',
+ providerId: preferred ?? null,
+ }),
getAgentPrefs: (agentKind: ScheduleFormState['agentKind']) =>
agentKind === 'codex'
? { providerId: 'openai', effort: 'high' as const, fastMode: true }
@@ -681,6 +684,26 @@ describe('resolveTemplateAgentFields', () => {
});
});
+ it('跨 agent 用默认路由时整对应用,并限定在任务记忆 / 模板的来源内', () => {
+ const getDefaultRoute = vi.fn((_agent: string, preferred?: string | null) =>
+ preferred === 'xd'
+ ? { model: 'claude-sonnet-5', providerId: 'xd' }
+ : { model: 'claude-opus-5-5', providerId: 'anthropic' });
+ const withRoute = {
+ getDefaultRoute,
+ getAgentPrefs: () => ({ providerId: '', effort: '' as const, fastMode: false }),
+ };
+ const form = makeForm({ agentKind: 'codex', model: 'gpt-5.5', providerId: 'openai' });
+ expect(resolveTemplateAgentFields(form, makeTemplate({ agentKind: 'claude-code' }), withRoute))
+ .toMatchObject({ model: 'claude-opus-5-5', providerId: 'anthropic' });
+ // 任务只记了来源(没记模型):默认模型必须由这个来源提供。
+ expect(resolveTemplateAgentFields(form, makeTemplate({ agentKind: 'claude-code' }), {
+ ...withRoute,
+ getAgentPrefs: () => ({ providerId: 'xd', effort: '' as const, fastMode: false }),
+ })).toMatchObject({ model: 'claude-sonnet-5', providerId: 'xd' });
+ expect(getDefaultRoute).toHaveBeenLastCalledWith('claude-code', 'xd');
+ });
+
it('模板显式给 model/provider/effort/fast 时优先使用模板值', () => {
const fields = resolveTemplateAgentFields(
makeForm({ agentKind: 'codex', model: 'gpt-5.5', providerId: 'openai', effort: 'high', fastMode: true }),
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/pluginScheduleCreateIntent.ts b/apps/desktop/src/renderer/features/scheduler/lib/pluginScheduleCreateIntent.ts
index 7369e62883..31435b4926 100644
--- a/apps/desktop/src/renderer/features/scheduler/lib/pluginScheduleCreateIntent.ts
+++ b/apps/desktop/src/renderer/features/scheduler/lib/pluginScheduleCreateIntent.ts
@@ -92,7 +92,7 @@ function systemTimeZone(): string {
*
* ⚠️ 留空**不会**让"显示的模型"与"实际执行的模型"漂移(review #1715 曾按此判为
* 缺陷,实测不成立):ScheduleFormDialog 有一个专门的 effect —— `form.model` 为空
- * 且非 heartbeat 形态时,立即回填 `getScheduleDefaultModel(agentKind)` 的三级回退
+ * 且非 heartbeat 形态时,供应商清单到位即回填 `getScheduleDefaultModel` 的三级回退
* 显式值(见该文件"form.model 为空时回填默认模型"那段,它正是为 2026-06 那次
* "看着选了 Opus 4.8、实际每次跑 4.7"加的)。本 intent 的 `targetSessionId: ''`
* 满足回填条件,所以表单打开那一刻 model 就已是显式值,保存时不会被省略。
diff --git a/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts b/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
index 84a7c50270..7291957ae9 100644
--- a/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
+++ b/apps/desktop/src/renderer/features/scheduler/lib/scheduleFormLogic.ts
@@ -386,7 +386,11 @@ export function sessionAgentKindToScheduleAgentKind(
}
interface TemplateAgentDefaults {
- getDefaultModel: (agentKind: ScheduleFormState['agentKind']) => string;
+ /** 目标 agent 在给定来源内的默认模型及与之成对的来源(null = 跟随原生默认)。 */
+ getDefaultRoute: (
+ agentKind: ScheduleFormState['agentKind'],
+ preferredProviderId?: string | null,
+ ) => { model: string; providerId: string | null };
getAgentPrefs: (
agentKind: ScheduleFormState['agentKind'],
) => Pick<ScheduleFormState, 'providerId' | 'effort' | 'fastMode'>;
@@ -403,11 +407,22 @@ export function resolveTemplateAgentFields(
const templateModel = typeof template.model === 'string' ? template.model.trim() : '';
const templateProviderId = typeof template.providerId === 'string' ? template.providerId.trim() : undefined;
const templateEffort = template.effort && isEffortValue(template.effort) ? template.effort : undefined;
+ // 模板没给模型、换了 agent 时用默认路由:限定在模板 / 任务记忆的来源内,模型与来源整对应用。
+ const defaultRoute =
+ agentChanged && !templateModel
+ ? defaults.getDefaultRoute(agentKind, templateProviderId ?? (agentPrefs?.providerId || null))
+ : null;
return {
agentKind,
- model: templateModel || (agentChanged ? defaults.getDefaultModel(agentKind) : form.model),
- providerId: templateProviderId ?? (agentChanged ? (agentPrefs?.providerId ?? '') : form.providerId),
+ model: templateModel || (agentChanged ? (defaultRoute?.model ?? '') : form.model),
+ providerId:
+ templateProviderId ??
+ (agentChanged
+ ? defaultRoute
+ ? (defaultRoute.providerId ?? '')
+ : (agentPrefs?.providerId ?? '')
+ : form.providerId),
effort: templateEffort ?? (agentChanged ? (agentPrefs?.effort ?? '') : form.effort),
fastMode: template.fastMode ?? (agentChanged ? (agentPrefs?.fastMode ?? false) : form.fastMode),
};
diff --git a/apps/desktop/src/renderer/lib/draftModelCalibration.ts b/apps/desktop/src/renderer/lib/draftModelCalibration.ts
index cf8491d270..e2d3824492 100644
--- a/apps/desktop/src/renderer/lib/draftModelCalibration.ts
+++ b/apps/desktop/src/renderer/lib/draftModelCalibration.ts
@@ -1,307 +1 @@
-/**
- * 草稿默认模型的可用性校准。
- *
- * 新建草稿的种子模型只是**目录排序给出的起点**(见 modelDefinitions getDefaultModelForVendor),
- * 与「这台机器上到底连了哪些来源」无关。全新用户的可连来源未必提供那个 id —— 于是首屏就落在
- * 一个没有任何已连接来源的模型上,Send 被禁用、只能弹「当前模型没有已连接的来源」,用户还没
- * 开始用就先撞墙。这里负责把默认落到**真正可用**的模型上。
- *
- * 这里只校准**用户从没显式选过模型**的默认值(`modelChosenByVendor` 区分「真选过」与
- * 「默认回填」)。已有来源偏好时,校准候选收窄到该来源,保证模型与来源成对变化;用户自己
- * 选过模型则一律不动。静默改写比撞墙更糟——那会让「我明明选了 Anthropic」变成无法自查。
- */
-
-import {
- connectedProvidersForAgent,
- effectiveSourceIdForModel,
- isCustomRoutedProvider,
- isModelSelectableForNewRoute,
- nativeDefaultSourceId,
- type AgentKind,
- type CatalogModel,
- type ProviderView,
-} from '@cindy/model-providers';
-
-/**
- * 挑选顺序(2026-07-30 产品定稿):**可用的里面选第一个 —— 供应商优先订阅的,
- * 再取该供应商模型里排序第一个**。
- *
- * 分两级而不是把所有模型拍平排序,是因为「优先订阅」必须赢过「排序更靠前」:网关的折扣路由
- * (`codex/` 前缀)在目录里排得比官方原版靠前,拍平排序会让默认模型变成折扣路由 —— 那要网关
- * 已连接才可用、计费也走网关而非用户已经付过钱的订阅额度。多个订阅供应商时按目录序
- * (anthropic → openai → xai),于是 Claude 订阅在场时 cc tab 自然落到 Claude 系。
- */
-function providersByPreference(
- providers: readonly ProviderView[],
- agent: AgentKind,
-): ProviderView[] {
- const connected = connectedProvidersForAgent([...providers], agent);
- const subscription = connected.filter((p) => p.access?.kind === 'subscription');
- const rest = connected.filter((p) => p.access?.kind !== 'subscription');
- // 两组内部都保持目录序(connectedProvidersForAgent 的输出序),结果完全确定。
- return [...subscription, ...rest];
-}
-
-/**
- * 该供应商在这个 agent 下排序第一的**默认可见的聊天**模型。
- *
- * 默认收起的模型不参与:它们在选择器里根本不显示,选中了等于让用户面对一个自己找不到的默认
- * 模型。整组都收起时退回纯排序第一 —— 有个能用的默认,好过让这个供应商整体落空。
- *
- * 新路由准入(isModelSelectableForNewRoute)是硬门槛,不参与"整组收起退回"的放宽:挑到的模型直接被
- * 当成会话默认模型使用,非聊天模型(图像/向量/TTS 等,issue #882 第 3 点)漏进来就是"草稿
- * 默认模型选中一个不能聊天的模型"。用 provider-aware 谓词而非裸 isChatEligible:用户自定义
- * 供应商显式配置的模型(未知 group)是合法聊天模型,id 撞上能力启发式(如 flux-image-x)
- * 不该被误杀(2026-07 review 第 25 轮)。
- */
-function firstModelByOrder(provider: ProviderView, agent: AgentKind): CatalogModel | undefined {
- const userProvider = provider.source === 'user';
- const chatModels = (provider.models[agent] ?? []).filter((m) =>
- isModelSelectableForNewRoute(m, { userProvider }),
- );
- if (chatModels.length === 0) return undefined;
- const visible = chatModels.filter((m) => m.defaultEnabled !== false);
- const pool = visible.length > 0 ? visible : chatModels;
- // slice() 再 sort:sort 原地改数组,直接排会打乱传入的 ProviderView 的清单顺序。
- return pool
- .slice()
- .sort(
- (a, b) => (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER),
- )[0];
-}
-
-/** 校准挑中的 (模型, 来源)。`providerId` 是按订阅优先顺序命中的那家。 */
-export interface PickedConnectedModel {
- model: string;
- /**
- * 挑中它的那家供应商。
- *
- * **必须一路带到来源解析**,不能只返回 model id:`nativeDefaultSourceId` 对
- * claude-code 无条件优先 XD 网关(registry.ts)。于是「校准按订阅优先挑了 anthropic 的
- * claude-opus-5」但只交出模型 id 时,下游解析又把它指回 XD —— 计费走网关,而不是用户
- * 已经付过钱的订阅额度,本模块承诺的「订阅优先」在最后一步被推翻(PR #1076 review)。
- */
- providerId: string;
-}
-
-/**
- * 在当前已连接来源中挑真正可新建路由的第一项。
- *
- * 「第一项」沿用新对话既有口径:供应商先按订阅优先,再取该供应商目录排序第一的
- * 默认可见聊天模型。这里不处理 preferred / newSessionDefault;调用方明确要求纯 fallback
- * 时用它,避免服务端 marker 把“第一项”改写成另一项。
- */
-export function pickFirstConnectedModelForAgent(
- providers: readonly ProviderView[],
- agent: AgentKind,
-): PickedConnectedModel | null {
- for (const provider of providersByPreference(providers, agent)) {
- const first = firstModelByOrder(provider, agent);
- if (first) return { model: first.id, providerId: provider.id };
- }
- return null;
-}
-
-/** 按正常来源优先级找出区域 / 目录明确标记的新对话默认模型。 */
-function markedDefaultModelIdForAgent(
- providers: readonly ProviderView[],
- agent: AgentKind,
-): string | null {
- for (const provider of providersByPreference(providers, agent)) {
- const userProvider = provider.source === 'user';
- const flagged = (provider.models[agent] ?? [])
- .filter(
- (model) =>
- model.defaultEnabled !== false &&
- (model.newSessionDefault?.includes(agent) ?? false) &&
- isModelSelectableForNewRoute(model, { userProvider }),
- )
- .slice()
- .sort(
- (a, b) =>
- (a.sortOrder ?? Number.POSITIVE_INFINITY) - (b.sortOrder ?? Number.POSITIVE_INFINITY),
- )[0];
- if (flagged) return flagged.id;
- }
- return null;
-}
-
-/**
- * 在该 agent 的已连接来源里挑 (模型, 来源):
- * 0. 目录/服务端**显式标记**为新对话默认(`newSessionDefault`)、且可用且默认可见的模型
- * 优先 —— 未显式选过模型的用户应跟随它,即便种子恰好是另一个可用模型(种子是
- * capabilities 未到位时算的冷启动值,不反映标记)。按订阅优先取第一家提供它的来源,
- * 同一来源多个被标记时按 sortOrder 决胜。每个 Agent 只接受自己的标记,不跨 Agent
- * 借用默认策略。**没有任何模型被标记时这步为空转,行为回到 1/2**(非破坏性)。
- * 1. `preferredModelId` 本身可用**且默认可见** —— 默认值能用就绝不动它,避免首屏莫名换
- * 模型;来源仍按订阅优先顺序取「第一家提供它的」,让默认值也享受订阅优先;
- * 2. 否则按「订阅优先」的供应商序取第一家,返回它排序第一的默认可见模型
- * (见 providersByPreference / firstModelByOrder);
- * 3. 一个已连接来源都没有(或都没有模型)→ null,交给既有的「零来源」空态引导去连接供应商。
- *
- * 第 1 步为什么要卡「默认可见」:存量用户的草稿里持久化着**旧代码写死的**种子默认
- * (`gpt-5.4` / `gpt-5.5`),而这两个 id 在目录里都是 `defaultEnabled: false`。它们的
- * `modelChosenByVendor` 仍是 false —— 正是这套校准要迁移的那批草稿。只判「某个已连接来源
- * 提供它」会把它们原样留下,用户继续用一个在默认选择器里根本看不到的模型
- * (PR #1076 review 第三轮)。真正被用户选过的模型不受影响:那由 `chosenByUser` 在
- * `calibrateDraftModel` 里更早短路,压根走不到这里。
- *
- * 第 1 步同样卡聊天准入(issue #882 第 3 点):`preferredModelId` 在该来源的拷贝若是
- * 非聊天类型(mode/分类为图像等),不能因"id 存在且默认可见"就保留 —— 挑到的模型直接
- * 被当成会话默认模型使用。用 provider-aware 谓词,理由见 firstModelByOrder。
- */
-export function pickConnectedModelForAgent(
- providers: readonly ProviderView[],
- agent: AgentKind,
- preferredModelId: string,
-): PickedConnectedModel | null {
- const ranked = providersByPreference(providers, agent);
- if (ranked.length === 0) return null;
- // 0. 目录/服务端显式标记的新对话默认(newSessionDefault)优先;每个 Agent 只认自己的标记。
- const flaggedModelId = markedDefaultModelIdForAgent(ranked, agent);
- if (flaggedModelId !== null) {
- // 标记只存在于区域门控后的 XD 条目;来源选择仍必须独立遵守 ranked 的订阅优先。
- // 同 ID 的订阅副本不会重复携带标记,但只要它可选且默认可见,就应先消耗用户已付费额度。
- for (const provider of ranked) {
- const matching = (provider.models[agent] ?? []).find(
- (m) =>
- m.id === flaggedModelId &&
- m.defaultEnabled !== false &&
- isModelSelectableForNewRoute(m, { userProvider: provider.source === 'user' }),
- );
- if (matching) return { model: flaggedModelId, providerId: provider.id };
- }
- }
- for (const provider of ranked) {
- const preferred = (provider.models[agent] ?? []).find((m) => m.id === preferredModelId);
- if (
- preferred &&
- preferred.defaultEnabled !== false &&
- isModelSelectableForNewRoute(preferred, { userProvider: provider.source === 'user' })
- ) {
- return { model: preferredModelId, providerId: provider.id };
- }
- }
- return pickFirstConnectedModelForAgent(ranked, agent);
-}
-
-export interface DraftModelCalibrationInput {
- /**
- * 候选来源。调用方必须**预先过滤好**:既剔除不可路由的来源(SSH 下仅本地可桥接的
- * Codex 供应商),也剔除各来源里不该被选中的模型条目(用户隐藏 / 默认收起、SSH 下的
- * 订阅直连)。过滤放在候选上而不是这里,是因为同一份候选还要喂给来源解析
- * (`effectiveSourceIdForModel`)——只在挑模型时过滤,会让来源解析仍看见被剔除的条目,
- * 从而选中一个用户已经排除掉该模型的来源。
- */
- providers: readonly ProviderView[];
- agent: AgentKind;
- /** 草稿当前的模型(种子默认或用户选择)。 */
- model: string;
- /** 用户是否在选择器里显式选过该 vendor 的模型。 */
- chosenByUser: boolean;
- /** 当前来源偏好;仍是有效连接来源时把自动模型候选限制在它内部,避免校准后静默丢来源。 */
- preferredProviderId?: string | null;
- /** 供应商清单是否仍在加载:加载期不校准,避免首帧把默认模型闪成别的。 */
- providersLoading: boolean;
-}
-
-/** 校准结果:草稿应当展示 / 发送的模型,以及(若校准出了结论)它该走哪家来源。 */
-export interface DraftModelCalibrationResult {
- /** 草稿应当展示 / 发送的模型 id(不可校准时原样返回,绝不为空)。 */
- model: string;
- /**
- * 建议来源。`null` = 本次没给出结论(用户已显式选过 / 清单还在加载 / 一个来源都没有),
- * 调用方应回落既有的来源解析。给出时调用方要把它喂给 `effectiveSourceIdForModel`,
- * 优先级排在**用户显式选的来源之后**(他选的必须赢),见 PickedConnectedModel.providerId。
- */
- providerId: string | null;
-}
-
-export function calibrateDraftModel({
- providers,
- agent,
- model,
- chosenByUser,
- preferredProviderId,
- providersLoading,
-}: DraftModelCalibrationInput): DraftModelCalibrationResult {
- if (chosenByUser || providersLoading) return { model, providerId: null };
- const connectedPreferred = preferredProviderId
- ? connectedProvidersForAgent([...providers], agent).find(
- (provider) => provider.id === preferredProviderId,
- )
- : undefined;
- if (connectedPreferred) {
- // marker 只需由策略来源声明一次(当前为 XD),用户选定的来源若也提供同一 ID,仍应由
- // 该来源承接;不能因它自己的目录副本没重复 marker 就退回旧模型或偷偷改走 XD。
- const markedModelId = markedDefaultModelIdForAgent(providers, agent);
- const matchingMarkedModel = markedModelId
- ? (connectedPreferred.models[agent] ?? []).find(
- (candidate) =>
- candidate.id === markedModelId &&
- candidate.defaultEnabled !== false &&
- isModelSelectableForNewRoute(candidate, {
- userProvider: connectedPreferred.source === 'user',
- }),
- )
- : undefined;
- if (matchingMarkedModel) {
- return { model: matchingMarkedModel.id, providerId: connectedPreferred.id };
- }
- }
- const candidates = connectedPreferred ? [connectedPreferred] : providers;
- const picked = pickConnectedModelForAgent(candidates, agent, model);
- return picked ?? { model, providerId: null };
-}
-
-export interface DraftSessionProviderResolutionInput {
- /** main 进程用于默认路由的完整本机来源目录。 */
- providers: readonly ProviderView[];
- agent: AgentKind;
- model: string;
- /** 用户在草稿里显式选择的来源。 */
- explicitProviderId: string | null | undefined;
- /** renderer 已按当前模型与校准结果解析出的生效来源。 */
- effectiveProviderId: string | null;
-}
-
-/**
- * 决定新建会话是否必须把 renderer 的生效来源显式带给 main。
- *
- * 只有在省略 providerId 后 main 会解析到同一个来源时才允许返回 null;否则必须把来源
- * 固化在会话上,避免 UI 所见与首条请求的实际路由分叉。
- */
-export function resolveDraftSessionProviderId({
- providers,
- agent,
- model,
- explicitProviderId,
- effectiveProviderId,
-}: DraftSessionProviderResolutionInput): string | null {
- if (explicitProviderId) {
- return explicitProviderId;
- }
- if (!effectiveProviderId) return null;
- // 预设通过「添加供应商」落地后同样属于 user provider。即使它是当前模型唯一的
- // 已连接来源,也不能省略 providerId:main / maker-core 的 null 语义是沿用各 harness
- // 的原生认证 fallback(Claude → Cindy gateway / Claude OAuth),不会反查目录里唯一的
- // BYOM 来源。省略后 UI 虽显示该来源,首轮 auth gate 却会去读 gateway key,最终报
- // `not authenticated: no_key`。用户来源必须始终显式钉住,保证其代理路由与密钥生效。
- const effectiveProvider = providers.find((provider) => provider.id === effectiveProviderId);
- if (isCustomRoutedProvider(effectiveProvider)) return effectiveProviderId;
- const modelDefaultProviderId = effectiveSourceIdForModel([...providers], null, model, agent);
- // main 收到 providerId=null 后按 agent 的原生来源选择启动链路,而不是只在“提供当前
- // 模型”的来源里重算。典型分叉:XD 与 Anthropic 都已连接,只有 Anthropic 目录含
- // claude-opus-5。modelDefault 是 anthropic,但 agentDefault 仍是 xd;若只比较前者
- // 就会错误地省略 providerId,main 随后拿 gateway key 启动 XD 路由(issue #1196)。
- const agentDefaultProviderId = nativeDefaultSourceId(
- // main 的 spawn 默认不读取用户的 suspended 开关;这里必须保留 suspended 来源,
- // 否则 UI 停用 XD 后会把 agentDefault 错算成 Anthropic,再次把必需的来源省略掉。
- connectedProvidersForAgent([...providers], agent, { includeSuspended: true }),
- agent,
- );
- return modelDefaultProviderId === effectiveProviderId &&
- agentDefaultProviderId === effectiveProviderId
- ? null
- : effectiveProviderId;
-}
+export * from '../../shared/draftModelCalibration';
diff --git a/apps/desktop/src/renderer/lib/modelDefinitions.ts b/apps/desktop/src/renderer/lib/modelDefinitions.ts
index c2ee6ae8f1..e74d211799 100644
--- a/apps/desktop/src/renderer/lib/modelDefinitions.ts
+++ b/apps/desktop/src/renderer/lib/modelDefinitions.ts
@@ -173,8 +173,8 @@ export function newSessionDefaultModelId(
* 逐字节一致**(非破坏性)。这里刻意不写死 id。
*
* 注意它只是**种子**:真正落点由 `calibrateDraftModel` 在供应商清单到位后决定(「可用的里面
- * 选,供应商优先订阅」,见 draftModelCalibration)。自动化任务(scheduler)默认故意不同,走
- * useScheduleForm.ts getScheduleDefaultModel,不要把这里的默认接到 scheduler 上。
+ * 选,供应商优先订阅」,见 draftModelCalibration)。自动化任务(scheduler)与其它无人值守
+ * 入口复用校准后的结果(resolveNewTaskDefaultRoute),不直接读这里的种子。
*/
export function getDefaultModelForVendor(
vendorKey: 'cc' | 'codex' | 'pi',
diff --git a/apps/desktop/src/renderer/state/newMakerDraft.ts b/apps/desktop/src/renderer/state/newMakerDraft.ts
index cf2e208ef6..ea852f9790 100644
--- a/apps/desktop/src/renderer/state/newMakerDraft.ts
+++ b/apps/desktop/src/renderer/state/newMakerDraft.ts
@@ -175,8 +175,8 @@ export interface NewMakerDraft {
* lastByVendor 整个快照随任意 draft 写入落盘,model 即使从没被用户碰过也会带上
* sanitize 的种子默认值 —— 仅凭 lastByVendor 无法区分"真选过"和"默认回填"。
* 调度任务默认模型的三级回退(getPersistedVendorModel 消费)只认这里标记过的
- * vendor,否则全新 / 没用过该 vendor 的用户会被对话侧 Opus 种子默认顶掉
- * 成本保守兜底。patchVendorPrefs 收到显式 model 时置 true;只改思考档 / Fast
+ * vendor,否则全新 / 没用过该 vendor 的用户会拿到未经供应商清单校准的种子默认。
+ * patchVendorPrefs 收到显式 model 时置 true;只改思考档 / Fast
* 的会话回写走 patchVendorPrefsPreservingModelChoice:不得打标、不得清标,
* 也不得在已打标后改写 lastByVendor.model / providerId / effort。
*/
@@ -386,7 +386,7 @@ function sanitize(raw: unknown): NewMakerDraft {
};
};
// modelChosenByVendor: 老版本 localStorage 没有这个字段 → 空对象兜底
- //(语义上等于"全部 vendor 都没显式选过",调度三级回退会落到成本保守兜底)。
+ //(语义上等于"全部 vendor 都没显式选过",调度三级回退会落到新建任务默认)。
const modelChosenRaw =
r.modelChosenByVendor && typeof r.modelChosenByVendor === 'object'
? (r.modelChosenByVendor as Record<string, unknown>)
@@ -1256,8 +1256,8 @@ export function getCurrentVendorPrefs(): VendorPrefs {
* 所以这里要求 modelChosenByVendor[vendor] === true(新建页 picker 或已有
* 任务换模经 patchVendorPrefs 打的标)才返回,否则一律 ''。
* 调度任务的默认模型三级回退(useScheduleForm getScheduleDefaultModel)依赖这个
- * 区分:没显式选过的用户应落到调度自己的成本保守兜底(Sonnet),而不是被
- * 对话侧的 Opus 种子默认顶掉。读 raw localStorage 而非 getDraft(),解析失败 → ''。
+ * 区分:没显式选过的用户应落到按供应商清单校准后的新建任务默认,而不是未经校准的
+ * 种子默认。读 raw localStorage 而非 getDraft(),解析失败 → ''。
*/
export function getPersistedVendorModel(vendor: MakerVendor): string {
if (typeof window === 'undefined') return '';
diff --git a/apps/desktop/src/shared/draftModelCalibration.ts b/apps/desktop/src/shared/draftModelCalibration.ts
new file mode 100644
index 0000000000..7201e51c3b
--- /dev/null
+++ b/apps/desktop/src/shared/draftModelCalibration.ts
@@ -0,0 +1,368 @@
+/**
+ * 草稿默认模型的可用性校准。
+ *
+ * 新建草稿的种子模型只是**目录排序给出的起点**(见 modelDefinitions getDefaultModelForVendor),
+ * 与「这台机器上到底连了哪些来源」无关。全新用户的可连来源未必提供那个 id —— 于是首屏就落在
+ * 一个没有任何已连接来源的模型上,Send 被禁用、只能弹「当前模型没有已连接的来源」,用户还没
+ * 开始用就先撞墙。这里负责把默认落到**真正可用**的模型上。
+ *
+ * 这里只校准**用户从没显式选过模型**的默认值(`modelChosenByVendor` 区分「真选过」与
+ * 「默认回填」)。已有来源偏好时,校准候选收窄到该来源,保证模型与来源成对变化;用户自己
+ * 选过模型则一律不动。静默改写比撞墙更糟——那会让「我明明选了 Anthropic」变成无法自查。
+ */
+
+import {
+ connectedProvidersForAgent,
+ effectiveSourceIdForModel,
+ isCustomRoutedProvider,
+ isModelSelectableForNewRoute,
+ nativeDefaultSourceId,
+ type AgentKind,
+ type CatalogModel,
+ type ProviderView,
+} from '@cindy/model-providers';
+
+/**
+ * 挑选顺序(2026-07-30 产品定稿):**可用的里面选第一个 —— 供应商优先订阅的,
+ * 再取该供应商模型里排序第一个**。
+ *
+ * 分两级而不是把所有模型拍平排序,是因为「优先订阅」必须赢过「排序更靠前」:网关的折扣路由
+ * (`codex/` 前缀)在目录里排得比官方原版靠前,拍平排序会让默认模型变成折扣路由 —— 那要网关
+ * 已连接才可用、计费也走网关而非用户已经付过钱的订阅额度。多个订阅供应商时按目录序
+ * (anthropic → openai → xai),于是 Claude 订阅在场时 cc tab 自然落到 Claude 系。
+ */
+function providersByPreference(
+ providers: readonly ProviderView[],
+ agent: AgentKind,
+): ProviderView[] {
+ const connected = connectedProvidersForAgent([...providers], agent);
+ const subscription = connected.filter((p) => p.access?.kind === 'subscription');
+ const rest = connected.filter((p) => p.access?.kind !== 'subscription');
+ // 两组内部都保持目录序(connectedProvidersForAgent 的输出序),结果完全确定。
+ return [...subscription, ...rest];
+}
+
+/**
+ * 该供应商在这个 agent 下排序第一的**默认可见的聊天**模型。
+ *
+ * 默认收起的模型不参与:它们在选择器里根本不显示,选中了等于让用户面对一个自己找不到的默认
+ * 模型。整组都收起时退回纯排序第一 —— 有个能用的默认,好过让这个供应商整体落空。
+ *
+ * 新路由准入(isModelSelectableForNewRoute)是硬门槛,不参与"整组收起退回"的放宽:挑到的模型直接被
+ * 当成会话默认模型使用,非聊天模型(图像/向量/TTS 等,issue #882 第 3 点)漏进来就是"草稿
+ * 默认模型选中一个不能聊天的模型"。用 provider-aware 谓词而非裸 isChatEligible:用户自定义
+ * 供应商显式配置的模型(未知 group)是合法聊天模型,id 撞上能力启发式(如 flux-image-x)
+ * 不该被误杀(2026-07 review 第 25 轮)。
+ */
+function firstModelByOrder(provider: ProviderView, agent: AgentKind): CatalogModel | undefined {
+ const userProvider = provider.source === 'user';
+ const chatModels = (provider.models[agent] ?? []).filter((m) =>
+ isModelSelectableForNewRoute(m, { userProvider }),
+ );
+ if (chatModels.length === 0) return undefined;
+ const visible = chatModels.filter((m) => m.defaultEnabled !== false);
+ const pool = visible.length > 0 ? visible : chatModels;
+ // slice() 再 sort:sort 原地改数组,直接排会打乱传入的 ProviderView 的清单顺序。
+ return pool
+ .slice()
+ .sort(
+ (a, b) => (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER),
+ )[0];
+}
+
+/** 校准挑中的 (模型, 来源)。`providerId` 是按订阅优先顺序命中的那家。 */
+export interface PickedConnectedModel {
+ model: string;
+ /**
+ * 挑中它的那家供应商。
+ *
+ * **必须一路带到来源解析**,不能只返回 model id:`nativeDefaultSourceId` 对
+ * claude-code 无条件优先 XD 网关(registry.ts)。于是「校准按订阅优先挑了 anthropic 的
+ * claude-opus-5」但只交出模型 id 时,下游解析又把它指回 XD —— 计费走网关,而不是用户
+ * 已经付过钱的订阅额度,本模块承诺的「订阅优先」在最后一步被推翻(PR #1076 review)。
+ */
+ providerId: string;
+}
+
+/**
+ * 在当前已连接来源中挑真正可新建路由的第一项。
+ *
+ * 「第一项」沿用新对话既有口径:供应商先按订阅优先,再取该供应商目录排序第一的
+ * 默认可见聊天模型。这里不处理 preferred / newSessionDefault;调用方明确要求纯 fallback
+ * 时用它,避免服务端 marker 把“第一项”改写成另一项。
+ */
+export function pickFirstConnectedModelForAgent(
+ providers: readonly ProviderView[],
+ agent: AgentKind,
+): PickedConnectedModel | null {
+ for (const provider of providersByPreference(providers, agent)) {
+ const first = firstModelByOrder(provider, agent);
+ if (first) return { model: first.id, providerId: provider.id };
+ }
+ return null;
+}
+
+/** 按正常来源优先级找出区域 / 目录明确标记的新对话默认模型。 */
+function markedDefaultModelIdForAgent(
+ providers: readonly ProviderView[],
+ agent: AgentKind,
+): string | null {
+ for (const provider of providersByPreference(providers, agent)) {
+ const userProvider = provider.source === 'user';
+ const flagged = (provider.models[agent] ?? [])
+ .filter(
+ (model) =>
+ model.defaultEnabled !== false &&
+ (model.newSessionDefault?.includes(agent) ?? false) &&
+ isModelSelectableForNewRoute(model, { userProvider }),
+ )
+ .slice()
+ .sort(
+ (a, b) =>
+ (a.sortOrder ?? Number.POSITIVE_INFINITY) - (b.sortOrder ?? Number.POSITIVE_INFINITY),
+ )[0];
+ if (flagged) return flagged.id;
+ }
+ return null;
+}
+
+/**
+ * 在该 agent 的已连接来源里挑 (模型, 来源):
+ * 0. 目录/服务端**显式标记**为新对话默认(`newSessionDefault`)、且可用且默认可见的模型
+ * 优先 —— 未显式选过模型的用户应跟随它,即便种子恰好是另一个可用模型(种子是
+ * capabilities 未到位时算的冷启动值,不反映标记)。按订阅优先取第一家提供它的来源,
+ * 同一来源多个被标记时按 sortOrder 决胜。每个 Agent 只接受自己的标记,不跨 Agent
+ * 借用默认策略。**没有任何模型被标记时这步为空转,行为回到 1/2**(非破坏性)。
+ * 1. `preferredModelId` 本身可用**且默认可见** —— 默认值能用就绝不动它,避免首屏莫名换
+ * 模型;来源仍按订阅优先顺序取「第一家提供它的」,让默认值也享受订阅优先;
+ * 2. 否则按「订阅优先」的供应商序取第一家,返回它排序第一的默认可见模型
+ * (见 providersByPreference / firstModelByOrder);
+ * 3. 一个已连接来源都没有(或都没有模型)→ null,交给既有的「零来源」空态引导去连接供应商。
+ *
+ * 第 1 步为什么要卡「默认可见」:存量用户的草稿里持久化着**旧代码写死的**种子默认
+ * (`gpt-5.4` / `gpt-5.5`),而这两个 id 在目录里都是 `defaultEnabled: false`。它们的
+ * `modelChosenByVendor` 仍是 false —— 正是这套校准要迁移的那批草稿。只判「某个已连接来源
+ * 提供它」会把它们原样留下,用户继续用一个在默认选择器里根本看不到的模型
+ * (PR #1076 review 第三轮)。真正被用户选过的模型不受影响:那由 `chosenByUser` 在
+ * `calibrateDraftModel` 里更早短路,压根走不到这里。
+ *
+ * 第 1 步同样卡聊天准入(issue #882 第 3 点):`preferredModelId` 在该来源的拷贝若是
+ * 非聊天类型(mode/分类为图像等),不能因"id 存在且默认可见"就保留 —— 挑到的模型直接
+ * 被当成会话默认模型使用。用 provider-aware 谓词,理由见 firstModelByOrder。
+ */
+export function pickConnectedModelForAgent(
+ providers: readonly ProviderView[],
+ agent: AgentKind,
+ preferredModelId: string,
+): PickedConnectedModel | null {
+ const ranked = providersByPreference(providers, agent);
+ if (ranked.length === 0) return null;
+ // 0. 目录/服务端显式标记的新对话默认(newSessionDefault)优先;每个 Agent 只认自己的标记。
+ const flaggedModelId = markedDefaultModelIdForAgent(ranked, agent);
+ if (flaggedModelId !== null) {
+ // 标记只存在于区域门控后的 XD 条目;来源选择仍必须独立遵守 ranked 的订阅优先。
+ // 同 ID 的订阅副本不会重复携带标记,但只要它可选且默认可见,就应先消耗用户已付费额度。
+ for (const provider of ranked) {
+ const matching = (provider.models[agent] ?? []).find(
+ (m) =>
+ m.id === flaggedModelId &&
+ m.defaultEnabled !== false &&
+ isModelSelectableForNewRoute(m, { userProvider: provider.source === 'user' }),
+ );
+ if (matching) return { model: flaggedModelId, providerId: provider.id };
+ }
+ }
+ for (const provider of ranked) {
+ const preferred = (provider.models[agent] ?? []).find((m) => m.id === preferredModelId);
+ if (
+ preferred &&
+ preferred.defaultEnabled !== false &&
+ isModelSelectableForNewRoute(preferred, { userProvider: provider.source === 'user' })
+ ) {
+ return { model: preferredModelId, providerId: provider.id };
+ }
+ }
+ return pickFirstConnectedModelForAgent(ranked, agent);
+}
+
+export interface DraftModelCalibrationInput {
+ /**
+ * 候选来源。调用方必须**预先过滤好**:既剔除不可路由的来源(SSH 下仅本地可桥接的
+ * Codex 供应商),也剔除各来源里不该被选中的模型条目(用户隐藏 / 默认收起、SSH 下的
+ * 订阅直连)。过滤放在候选上而不是这里,是因为同一份候选还要喂给来源解析
+ * (`effectiveSourceIdForModel`)——只在挑模型时过滤,会让来源解析仍看见被剔除的条目,
+ * 从而选中一个用户已经排除掉该模型的来源。
+ */
+ providers: readonly ProviderView[];
+ agent: AgentKind;
+ /** 草稿当前的模型(种子默认或用户选择)。 */
+ model: string;
+ /** 用户是否在选择器里显式选过该 vendor 的模型。 */
+ chosenByUser: boolean;
+ /** 当前来源偏好;仍是有效连接来源时把自动模型候选限制在它内部,避免校准后静默丢来源。 */
+ preferredProviderId?: string | null;
+ /** 供应商清单是否仍在加载:加载期不校准,避免首帧把默认模型闪成别的。 */
+ providersLoading: boolean;
+}
+
+/** 校准结果:草稿应当展示 / 发送的模型,以及(若校准出了结论)它该走哪家来源。 */
+export interface DraftModelCalibrationResult {
+ /** 草稿应当展示 / 发送的模型 id(不可校准时原样返回,绝不为空)。 */
+ model: string;
+ /**
+ * 建议来源。`null` = 本次没给出结论(用户已显式选过 / 清单还在加载 / 一个来源都没有),
+ * 调用方应回落既有的来源解析。给出时调用方要把它喂给 `effectiveSourceIdForModel`,
+ * 优先级排在**用户显式选的来源之后**(他选的必须赢),见 PickedConnectedModel.providerId。
+ */
+ providerId: string | null;
+}
+
+export function calibrateDraftModel({
+ providers,
+ agent,
+ model,
+ chosenByUser,
+ preferredProviderId,
+ providersLoading,
+}: DraftModelCalibrationInput): DraftModelCalibrationResult {
+ if (chosenByUser || providersLoading) return { model, providerId: null };
+ const connectedPreferred = preferredProviderId
+ ? connectedProvidersForAgent([...providers], agent).find(
+ (provider) => provider.id === preferredProviderId,
+ )
+ : undefined;
+ if (connectedPreferred) {
+ // marker 只需由策略来源声明一次(当前为 XD),用户选定的来源若也提供同一 ID,仍应由
+ // 该来源承接;不能因它自己的目录副本没重复 marker 就退回旧模型或偷偷改走 XD。
+ const markedModelId = markedDefaultModelIdForAgent(providers, agent);
+ const matchingMarkedModel = markedModelId
+ ? (connectedPreferred.models[agent] ?? []).find(
+ (candidate) =>
+ candidate.id === markedModelId &&
+ candidate.defaultEnabled !== false &&
+ isModelSelectableForNewRoute(candidate, {
+ userProvider: connectedPreferred.source === 'user',
+ }),
+ )
+ : undefined;
+ if (matchingMarkedModel) {
+ return { model: matchingMarkedModel.id, providerId: connectedPreferred.id };
+ }
+ }
+ const candidates = connectedPreferred ? [connectedPreferred] : providers;
+ const picked = pickConnectedModelForAgent(candidates, agent, model);
+ return picked ?? { model, providerId: null };
+}
+
+/** 新建任务里某个 Harness 当前的模型选择(renderer 草稿,或 main 侧的草稿镜像)。 */
+export interface NewTaskDraftSelection {
+ model?: string;
+ providerId?: string | null;
+ /** 用户是否在选择器里显式选过;未知(旧 renderer 未推)按没选过处理。 */
+ chosenByUser?: boolean;
+}
+
+/**
+ * 不由用户当场选模型的入口(定时任务、/learn、IM 新建任务、协同 Worker 兜底等)的默认
+ * (模型, 来源):与新建任务同一口径,不另写一个固定型号。
+ * 1. 用户在新建任务里显式选过、且仍有已连接来源可用的模型 → 用它;
+ * 2. 否则按新建任务「没选过模型」的校准口径挑(区域标记 → 草稿种子 → 订阅优先的第一项);
+ * 3. 一个可用来源都没有 → null,由调用方明确失败,不编造一个看似可用的模型。
+ * `requiredProviderId` 给定时只在该来源内挑(任务显式指定了来源)。
+ */
+export function resolveNewTaskDefaultRoute(args: {
+ providers: readonly ProviderView[];
+ agent: AgentKind;
+ draft?: NewTaskDraftSelection | null;
+ requiredProviderId?: string | null;
+}): PickedConnectedModel | null {
+ const { agent, draft } = args;
+ const required = args.requiredProviderId?.trim() || null;
+ const connected = connectedProvidersForAgent([...args.providers], agent);
+ const scoped = required ? connected.filter((provider) => provider.id === required) : connected;
+ if (scoped.length === 0) return null;
+ const draftModel = draft?.model?.trim() ?? '';
+ if (draftModel && draft?.chosenByUser) {
+ const providerId = effectiveSourceIdForModel(
+ scoped,
+ required ?? draft.providerId ?? null,
+ draftModel,
+ agent,
+ );
+ if (providerId) return { model: draftModel, providerId };
+ }
+ // 与新建任务一致:没有任何模型 / 来源偏好时,清单发现失败的来源不拿来做自动默认
+ // (全部失败时才退回);有偏好时不过滤,暂时的发现失败不能把用户记着的来源换掉。
+ const healthy =
+ required || draft?.providerId || draft?.chosenByUser
+ ? scoped
+ : scoped.filter((provider) => !provider.modelDiscoveryFailure);
+ const candidates = healthy.length > 0 ? healthy : scoped;
+ const calibrate = (preferredProviderId: string | null) =>
+ calibrateDraftModel({
+ providers: candidates,
+ agent,
+ model: draftModel,
+ chosenByUser: false,
+ preferredProviderId,
+ providersLoading: false,
+ });
+ let calibrated = calibrate(required ?? draft?.providerId ?? null);
+ // 草稿记着的来源已经挑不出模型时,换别的来源,而不是让入口整体落空。
+ if (!calibrated.providerId && !required && draft?.providerId) calibrated = calibrate(null);
+ return calibrated.providerId
+ ? { model: calibrated.model, providerId: calibrated.providerId }
+ : null;
+}
+
+export interface DraftSessionProviderResolutionInput {
+ /** main 进程用于默认路由的完整本机来源目录。 */
+ providers: readonly ProviderView[];
+ agent: AgentKind;
+ model: string;
+ /** 用户在草稿里显式选择的来源。 */
+ explicitProviderId: string | null | undefined;
+ /** renderer 已按当前模型与校准结果解析出的生效来源。 */
+ effectiveProviderId: string | null;
+}
+
+/**
+ * 决定新建会话是否必须把 renderer 的生效来源显式带给 main。
+ *
+ * 只有在省略 providerId 后 main 会解析到同一个来源时才允许返回 null;否则必须把来源
+ * 固化在会话上,避免 UI 所见与首条请求的实际路由分叉。
+ */
+export function resolveDraftSessionProviderId({
+ providers,
+ agent,
+ model,
+ explicitProviderId,
+ effectiveProviderId,
+}: DraftSessionProviderResolutionInput): string | null {
+ if (explicitProviderId) {
+ return explicitProviderId;
+ }
+ if (!effectiveProviderId) return null;
+ // 预设通过「添加供应商」落地后同样属于 user provider。即使它是当前模型唯一的
+ // 已连接来源,也不能省略 providerId:main / maker-core 的 null 语义是沿用各 harness
+ // 的原生认证 fallback(Claude → Cindy gateway / Claude OAuth),不会反查目录里唯一的
+ // BYOM 来源。省略后 UI 虽显示该来源,首轮 auth gate 却会去读 gateway key,最终报
+ // `not authenticated: no_key`。用户来源必须始终显式钉住,保证其代理路由与密钥生效。
+ const effectiveProvider = providers.find((provider) => provider.id === effectiveProviderId);
+ if (isCustomRoutedProvider(effectiveProvider)) return effectiveProviderId;
+ const modelDefaultProviderId = effectiveSourceIdForModel([...providers], null, model, agent);
+ // main 收到 providerId=null 后按 agent 的原生来源选择启动链路,而不是只在“提供当前
+ // 模型”的来源里重算。典型分叉:XD 与 Anthropic 都已连接,只有 Anthropic 目录含
+ // claude-opus-5。modelDefault 是 anthropic,但 agentDefault 仍是 xd;若只比较前者
+ // 就会错误地省略 providerId,main 随后拿 gateway key 启动 XD 路由(issue #1196)。
+ const agentDefaultProviderId = nativeDefaultSourceId(
+ // main 的 spawn 默认不读取用户的 suspended 开关;这里必须保留 suspended 来源,
+ // 否则 UI 停用 XD 后会把 agentDefault 错算成 Anthropic,再次把必需的来源省略掉。
+ connectedProvidersForAgent([...providers], agent, { includeSuspended: true }),
+ agent,
+ );
+ return modelDefaultProviderId === effectiveProviderId &&
+ agentDefaultProviderId === effectiveProviderId
+ ? null
+ : effectiveProviderId;
+}
diff --git a/apps/mobile/src/__tests__/scheduleFormModel.test.ts b/apps/mobile/src/__tests__/scheduleFormModel.test.ts
index ad194caa4f..6fcaa4d665 100644
--- a/apps/mobile/src/__tests__/scheduleFormModel.test.ts
+++ b/apps/mobile/src/__tests__/scheduleFormModel.test.ts
@@ -89,8 +89,11 @@ describe('mobile schedule form model', () => {
it('keeps codex fast mode explicit and clears it when switching back to Claude', () => {
const draft = updateDraftAgentKind(createMobileScheduleDraft(null), 'codex');
- expect(buildMobileScheduleInput({ ...draft, name: 'Codex', prompt: 'run', fastMode: true }))
- .toMatchObject({ agentKind: 'codex', model: 'gpt-5.5', fastMode: true });
+ // 不写死默认模型:留空交给运行电脑按新建任务口径解析,序列化时省略。
+ expect(draft.model).toBe('');
+ const input = buildMobileScheduleInput({ ...draft, name: 'Codex', prompt: 'run', fastMode: true });
+ expect(input).toMatchObject({ agentKind: 'codex', fastMode: true });
+ expect(input).not.toHaveProperty('model');
const claude = updateDraftAgentKind({ ...draft, fastMode: true }, 'claude-code');
expect(buildMobileScheduleInput({ ...claude, name: 'Claude', prompt: 'run' })).not.toHaveProperty('fastMode');
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index 96d3926b27..0a233f533d 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -103,6 +103,9 @@ Codex 订阅 Astra(Codex)、Cindy 推荐模型(Pi),最后保留 xAI
策略在 `apps/desktop/src/shared/newMakerDefaultTuple.ts`;连接、型号和对应引擎必须实际可用,
不能为了满足推荐而把 Opus / Astra 放入另一个引擎。用户手动选择及型号开关始终优先,
不修改已有任务的运行配置;伙伴默认复用应用选择,不另造一套来源优先级。
+定时任务、`/learn`、IM 新建任务与分享导入等不由用户当场选模型的入口,
+没指定模型时同样按新建任务口径解析(`apps/desktop/src/shared/draftModelCalibration.ts`
+的 `resolveNewTaskDefaultRoute`),不在代码里写死型号;一个可用来源都没有时明确失败或留空让用户选。
设置页管理列表组内与选择器同序:组内每项都带 `sortOrder` 时按它排;只要有一项缺失,退回
按系列名 A–Z、同系列版本号降序,避免局部权重把新型号压到旧策展位置之后。
diff --git a/packages/maker-shared/src/__tests__/scheduleForm.test.ts b/packages/maker-shared/src/__tests__/scheduleForm.test.ts
index 9614bfcfd9..b03a60bebb 100644
--- a/packages/maker-shared/src/__tests__/scheduleForm.test.ts
+++ b/packages/maker-shared/src/__tests__/scheduleForm.test.ts
@@ -246,8 +246,11 @@ describe('mobile schedule form model', () => {
it('keeps codex fast mode explicit and clears it when switching back to Claude', () => {
const draft = updateDraftAgentKind(createMobileScheduleDraft(null), 'codex');
- expect(buildMobileScheduleInput({ ...draft, name: 'Codex', prompt: 'run', fastMode: true }))
- .toMatchObject({ agentKind: 'codex', model: 'gpt-5.5', fastMode: true });
+ // 不写死默认模型:留空交给运行电脑按新建任务口径解析,序列化时省略。
+ expect(draft.model).toBe('');
+ const input = buildMobileScheduleInput({ ...draft, name: 'Codex', prompt: 'run', fastMode: true });
+ expect(input).toMatchObject({ agentKind: 'codex', fastMode: true });
+ expect(input).not.toHaveProperty('model');
const claude = updateDraftAgentKind({ ...draft, fastMode: true }, 'claude-code');
expect(buildMobileScheduleInput({ ...claude, name: 'Claude', prompt: 'run' })).not.toHaveProperty('fastMode');
@@ -516,11 +519,14 @@ describe('mobile explicit Harness round-trip', () => {
targetSessionId, providerId: 'old-source', effort: 'high', fastMode: true }));
const selected = updateDraftAgentKind(draft, 'codex');
expect(selected.modelAgentKind).toBe('codex');
+ // 换 Harness 不写死模型,由用户在选择器里挑。
+ expect(selected.model).toBe('');
// Complete the pending picker before simulating the device-link JSON boundary.
- const input = JSON.parse(JSON.stringify(buildMobileScheduleInput({ ...selected, targetSessionId: 'bound' })));
+ const input = JSON.parse(JSON.stringify(buildMobileScheduleInput({ ...selected, model: 'gpt-6-astra',
+ targetSessionId: 'bound' })));
expect(input).toMatchObject({ targetSessionId: 'bound',
agentKind: targetSessionId === 'bound' ? 'claude-code' : 'codex', modelAgentKind: 'codex',
- model: 'gpt-5.5', providerId: '', effort: '', fastMode: false });
+ model: 'gpt-6-astra', providerId: '', effort: '', fastMode: false });
expect(draft.modelAgentKind).toBeUndefined();
expect(updateDraftAgentKind(draft, 'claude-code')).toBe(draft);
});
@@ -575,8 +581,9 @@ describe('mobile explicit Harness round-trip', () => {
const draft = createMobileScheduleDraft(schedule({ agentKind: 'codex', modelAgentKind: 'pi',
model: 'pi-model', providerId: 'pi-only', fastMode: true, targetSessionId: 'bound' }));
const selected = updateDraftAgentKind(draft, 'codex');
- const input = JSON.parse(JSON.stringify(buildMobileScheduleInput(selected)));
- expect(input).toMatchObject({ agentKind: 'codex', modelAgentKind: 'codex', model: 'gpt-5.5',
+ expect(selected).toMatchObject({ model: '', providerId: '', effort: '', fastMode: false });
+ const input = JSON.parse(JSON.stringify(buildMobileScheduleInput({ ...selected, model: 'gpt-6-astra' })));
+ expect(input).toMatchObject({ agentKind: 'codex', modelAgentKind: 'codex', model: 'gpt-6-astra',
providerId: '', effort: '', fastMode: false });
});
it('keeps older schedules without an override in follow mode', () => {
diff --git a/packages/maker-shared/src/scheduleForm.ts b/packages/maker-shared/src/scheduleForm.ts
index 3a94f3097a..b6136c8a69 100644
--- a/packages/maker-shared/src/scheduleForm.ts
+++ b/packages/maker-shared/src/scheduleForm.ts
@@ -132,8 +132,6 @@ export function localizeTemplateParamValidation(
const DEFAULT_CRON = '0 9 * * *';
const DEFAULT_TIMEZONE = 'Asia/Shanghai';
-const DEFAULT_CLAUDE_MODEL = 'claude-sonnet-4-6';
-const DEFAULT_CODEX_MODEL = 'gpt-5.5';
export function createMobileScheduleDraft(
schedule?: RemoteSchedule | null,
@@ -150,7 +148,8 @@ export function createMobileScheduleDraft(
timezone: DEFAULT_TIMEZONE,
intervalMinutes: '',
agentKind: 'claude-code',
- model: DEFAULT_CLAUDE_MODEL,
+ // 留空 = 用运行电脑的新建任务默认模型(序列化时省略,由 host 实时解析),不写死型号。
+ model: '',
providerId: '',
effort: '',
fastMode: false,
@@ -179,7 +178,7 @@ export function createMobileScheduleDraft(
modelAgentKind: schedule.modelAgentKind,
boundAgent: schedule.targetSessionId
? { sessionId: schedule.targetSessionId, agentKind: schedule.agentKind ?? 'claude-code' } : undefined,
- model: schedule.model ?? (schedule.targetSessionId ? '' : defaultModelFor(schedule.modelAgentKind ?? schedule.agentKind ?? 'claude-code')),
+ model: schedule.model ?? '',
providerId: schedule.providerId ?? '',
effort: schedule.effort ?? '',
fastMode: !!schedule.fastMode,
@@ -212,7 +211,7 @@ export function applyTemplateToMobileScheduleDraft(
paramValues: Record<string, string> = {},
): MobileScheduleDraft {
const agentKind = template.agentKind ?? draft.agentKind;
- const model = template.model ?? (draft.agentKind === agentKind ? draft.model : defaultModelFor(agentKind));
+ const model = template.model ?? (draft.agentKind === agentKind ? draft.model : '');
return {
...draft,
name: template.name || draft.name,
@@ -525,7 +524,7 @@ export function updateDraftAgentKind(
agentKind,
// Selecting another Harness must leave follow mode even on pre-upgrade bindings.
...(draft.modelAgentKind || draft.targetSessionId.trim() ? { modelAgentKind: agentKind } : {}),
- model: defaultModelFor(agentKind),
+ model: '',
providerId: '',
effort: '',
fastMode: false,
@@ -691,14 +690,6 @@ function hasTemplateParam(params: Record<string, string>, key: string): boolean
return Object.prototype.hasOwnProperty.call(params, key) && params[key] !== '';
}
-function defaultModelFor(agentKind: RemoteScheduleAgentKind): string {
- if (agentKind === 'codex') return DEFAULT_CODEX_MODEL;
- // Pi 模型来自动态 BYOM 供应商目录,没有固定默认 id;留空 → 序列化时省略 → host 解析
- // 该 Pi agent 的当前默认模型(用户仍可在自由文本模型框里显式指定)。
- if (agentKind === 'pi') return '';
- return DEFAULT_CLAUDE_MODEL;
-}
-
function validateIntervalMinutes(
value: string,
localizer?: PresentationLocalizer,