Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(im): 对齐官方 bot 任务模型选择与默认跟随,简化额度提示
Dashf8ff552f5b91
diff --git a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.tsindex 331911272b..19743c6a64 100644--- a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts+++ b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts@@ -1355,7 +1355,9 @@ describe('dispatcher 核心语义', () => {d.handleDispatch('conn-1', dispatch({ requestId: 'req-2' }), c.send);await tick();expect(c.last('task.ack')!.payload).toMatchObject({ result: 'accepted', sessionId: first });- expect(fr.calls[1]).toMatchObject({ isNew: false, sessionId: first, workingDir: INSIDE });+ expect(fr.calls[1]).toMatchObject({+ isNew: false, sessionId: first, workingDir: INSIDE, workspaceAlias: 'xdmaker',+ });fr.finish({ finalText: '在子目录里跑完了' });await tick();diff --git a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.tsindex b1d3948023..93949fc76f 100644--- a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts+++ b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts@@ -30,6 +30,10 @@ const h = vi.hoisted(() => {const calls: string[] = [];return {calls,+ followPolicy: vi.fn(),+ syncDefaultRoute: vi.fn(async () => false),+ writeDefaultRecord: vi.fn(async () => undefined),+ acquirePendingAgentSwitch: vi.fn(async (_id: string, _sync: () => Promise<boolean>): Promise<() => void> => () => {}),touchUserSendInDb: vi.fn(async (id: string) => {calls.push(`touch:${id}`);}),@@ -144,6 +148,7 @@ vi.mock('../../device-link/broadcast-tap.js', () => ({tapWindowBroadcast: h.tapWindowBroadcast,}));vi.mock('../../maker-ipc/register.js', () => ({+ acquirePendingAgentSwitchForImSend: h.acquirePendingAgentSwitch,beginTurnChangeSetAtDispatch: h.beginTurnChangeSetAtDispatch,prepareUnhealthySessionForSend: vi.fn(async () => undefined),wireSessionToIpc: vi.fn(),@@ -152,6 +157,13 @@ vi.mock('../../maker-ipc/register.js', () => ({noteSilentStopUserSend: vi.fn(),onSilentStopSettled: vi.fn(() => () => {}),}));+vi.mock('../../im/shared/channelDefaultRouteSync.js', () => ({+ createDefaultRouteFollower: (policy: unknown) => { h.followPolicy(policy); return { syncUnderLock: h.syncDefaultRoute }; },+}));+vi.mock('../defaultRouteFollow.js', () => ({+ isHookDefaultRouteRow: vi.fn(),+ writeHookDefaultRouteRecord: h.writeDefaultRecord,+}));vi.mock('../../turn-change-set/store.js', () => ({clearPendingTurnChangeSets: h.clearPendingTurnChangeSets,}));@@ -367,7 +379,7 @@ vi.mock('../../maker-host/index.js', () => ({}));// 供应商显示名按任务实际来源读(查库 + 供应商目录), 这里只验失败说明带上了它。vi.mock('../../im/shared/sessionProviderLabel.js', () => ({- resolveSessionProviderLabel: vi.fn(async () => 'OpenAI'),+ resolveSessionErrorContext: vi.fn(async () => ({ providerLabel: 'OpenAI', modelLabel: 'GPT-6 Astra', taskLabel: '测试任务(sess-new)' })),}));import { createMakerHookSessionRunner, extractToolResultImageUrls } from '../session-runner.js';@@ -437,6 +449,8 @@ function baseReq(beforeEach(() => {vi.clearAllMocks();+ h.acquirePendingAgentSwitch.mockReset();+ h.acquirePendingAgentSwitch.mockResolvedValue(() => {});h.calls.length = 0;h.eventCbs.clear();h.headlessDuringSend.length = 0;@@ -445,6 +459,7 @@ beforeEach(() => {h.listProviders.mockResolvedValue([]);h.getModelVisibilityOverride.mockReset();h.getModelVisibilityOverride.mockReturnValue(undefined);+ h.readImDefaultSettings.mockReturnValue({ agentKind: 'claude-code', agents: {} });h.useActualDefaults = false;h.resolvedConfig.permissionMode = 'bypassPermissions';h.resolvedConfig.providerId = null;@@ -456,6 +471,113 @@ beforeEach(() => {h.listMessagesForAgentHandoff.mockResolvedValue([]);});+describe('hook task model selection on next send', () => {+ it('runs default following under the send lock before reading metadata', async () => {+ const readMeta = fakeMaker.getSessionMeta.getMockImplementation()!;+ h.acquirePendingAgentSwitch.mockImplementationOnce(async (id, sync) => {+ expect(id).toBe('sess-new');+ await sync();+ return () => {};+ });+ fakeMaker.getSessionMeta.mockImplementationOnce(async () => {+ expect(h.syncDefaultRoute).toHaveBeenCalledWith('sess-new');+ return readMeta();+ });+ await createMakerHookSessionRunner({ log }).run(baseReq({ isNew: false }));+ });++ it('uses current local workspace defaults instead of stale dispatch model hints', async () => {+ h.useActualDefaults = true;+ const providers = [connectedProvider('xd', [catalogModel('test-model')])];+ h.getWorkspacePref.mockReturnValue({+ channel: 'telegram', teamId: null, workspace: 'repo',+ agentKind: 'claude-code', model: 'test-model', effort: 'high', permissionMode: null,+ });+ await createMakerHookSessionRunner({ log }).run(baseReq({+ isNew: false, model: 'stale-model', workspaceAlias: 'repo',+ source: { im: 'telegram', userText: 'hello' },+ }));+ const policy = h.followPolicy.mock.calls[0][0];+ const target = await policy.resolveTarget(providers);+ expect(target).toMatchObject({ agentKind: 'claude-code', model: 'test-model', providerId: 'xd' });+ expect(target.fingerprint).toBe(policy.fingerprint());+ expect(h.getWorkspacePref).toHaveBeenCalledWith('telegram', null, 'repo');+ expect(h.readImDefaultSettings).toHaveBeenCalledWith(undefined);+ });++ it.each([false, true])('records new official tasks with their creation defaults (createOnly=%s)', async (createOnly) => {+ const outcome = await createMakerHookSessionRunner({ log }).run(baseReq({+ createOnly, source: { im: 'telegram', userText: 'hello' },+ }));+ expect(outcome.status).toBe('ok');+ expect(h.writeDefaultRecord).toHaveBeenCalledWith('sess-new', expect.stringContaining('hook'));+ expect(h.acquirePendingAgentSwitch).not.toHaveBeenCalled();+ });++ it.each(['claude-code', 'codex'] as const)('applies the selected %s route before reading metadata and sending', async (agentKind) => {+ let applied = false;+ const release = vi.fn();+ h.acquirePendingAgentSwitch.mockImplementationOnce(async () => {+ applied = true;+ return release;+ });+ fakeMaker.getSessionMeta.mockImplementationOnce(async () => {+ expect(applied).toBe(true);+ return { workDir: 'D:/repo', model: 'selected-model', sdkSessionId: 'selected-sdk',+ agentKind, permissionMode: undefined } as never;+ });+ const selected = makeFakeSession('sess-new');+ const send = selected.send.getMockImplementation()!;+ selected.send.mockImplementation(async (...args) => {+ expect(release).not.toHaveBeenCalled();+ return send(...args);+ });+ fakeMaker.createSession.mockImplementationOnce(async (opts) => {+ expect(opts).toMatchObject({ agentKind, model: 'selected-model' });+ return selected;+ });++ const result = await createMakerHookSessionRunner({ log }).run(baseReq({ isNew: false }));+ expect(result.status).toBe('ok');+ expect(selected.send).toHaveBeenCalledOnce();+ expect(release).toHaveBeenCalledOnce();+ });++ it('releases the send lock before waiting for the model to finish', async () => {+ const release = vi.fn();+ h.acquirePendingAgentSwitch.mockResolvedValueOnce(release);+ const session = makeFakeSession('sess-new');+ session.send.mockResolvedValue({ accepted: true });+ fakeMaker.createSession.mockResolvedValueOnce(session);+ const run = createMakerHookSessionRunner({ log }).run(baseReq({ isNew: false }));+ await vi.waitFor(() => expect(release).toHaveBeenCalledOnce());+ h.eventCbs.get('sess-new')!({ type: 'done', data: null });+ expect((await run).status).toBe('ok');+ expect(release).toHaveBeenCalledOnce();+ });++ it.each(['create', 'directory', 'send'] as const)('releases the send lock on %s failure', async (stage) => {+ const release = vi.fn();+ h.acquirePendingAgentSwitch.mockResolvedValueOnce(release);+ const session = makeFakeSession('sess-new');+ if (stage === 'create') fakeMaker.createSession.mockRejectedValueOnce(new Error('create failed'));+ else fakeMaker.createSession.mockResolvedValueOnce(session);+ if (stage === 'send') session.send.mockRejectedValueOnce(new Error('send failed'));+ const result = await createMakerHookSessionRunner({ log }).run(baseReq({+ isNew: false, ...(stage === 'directory' ? { isDirAuthorized: () => false } : {}),+ }));+ expect(result.status).toBe('error');+ expect(release).toHaveBeenCalledOnce();+ });++ it('does not send with the old model when applying the choice fails', async () => {+ h.acquirePendingAgentSwitch.mockRejectedValueOnce(new Error('selection failed'));+ await expect(createMakerHookSessionRunner({ log }).run(baseReq({ isNew: false })))+ .rejects.toThrow('selection failed');+ expect(fakeMaker.createSession).not.toHaveBeenCalled();+ });+});+describe('hook session 精确接管边界', () => {it.each([false, true])('keeps post-terminal recovery bound to the exact Pi instance (replaced=%s)', async (replaced) => {let terminal!: () => void;@@ -2611,10 +2733,11 @@ describe('上游过载自动重试期间的渠道进度(零产出窗口)', () =>const outcome = await p;expect(outcome.status).toBe('error');expect(outcome.errorMessage).toContain('⚠️ 供应商额度不足:「OpenAI」已达到工作区所有者设置的花费上限');- // 官方 bot 的 /model 与官方卡片改的是目录默认: 必须接着 /new, 或在 Cindy 里给任务换模型。- expect(outcome.errorMessage).toContain('官方 bot 卡片的工作目录');- expect(outcome.errorMessage).toContain('/new');- expect(outcome.errorMessage).not.toContain('Telegram 机器人');+ expect(outcome.errorMessage).toContain('Telegram 官方 bot');+ expect(outcome.errorMessage).toContain('GPT-6 Astra');+ expect(outcome.errorMessage).toContain('测试任务(sess-new)');+ expect(outcome.errorMessage).toContain('在 Cindy 里打开这个任务');+ expect(outcome.errorMessage).not.toContain('/new');});it('非过载的终态错误仍原样上报(不误改其它失败的诊断信息)', async () => {diff --git a/apps/desktop/src/main/hook-control/defaultRouteFollow.ts b/apps/desktop/src/main/hook-control/defaultRouteFollow.tsnew file mode 100644index 0000000000..f1d601916a--- /dev/null+++ b/apps/desktop/src/main/hook-control/defaultRouteFollow.ts@@ -0,0 +1,43 @@+import { and, eq, isNull } from 'drizzle-orm';++import { dbToMakerAgentKind } from '../../shared/agentKindConversion.js';+import { getDbClient } from '../localDb/client/current';+import { sessions } from '../localDb/schema';+import { buildImDefaultRouteRecord, parseImDefaultRouteRecord } from '../im/shared/channelDefaultRoute.js';+import type { SessionRouteRow } from '../im/shared/channelDefaultRouteSync.js';++/** 只跟随有创建记录的官方任务;历史任务和被接管的桌面任务不按值猜测。 */+export function isHookDefaultRouteRow(row: SessionRouteRow): boolean {+ const record = parseImDefaultRouteRecord(row.imDefaultRoute);+ return row.status === 'active' && !row.remoteHostId && !row.orcaRole && !!row.model+ && !row.imBotContextId && !row.feishuBotAppId+ && record?.fp.startsWith('["hook",') === true;+}++/** 新任务记录实际落地路由;同值手动选择留下的记录也不能覆盖。 */+export async function writeHookDefaultRouteRecord(sessionId: string, fingerprint: string): Promise<void> {+ const db = getDbClient();+ const [row] = await db.drizzle+ .select({+ agentKind: sessions.agentKind,+ model: sessions.model,+ providerId: sessions.providerId,+ effort: sessions.effort,+ imDefaultRoute: sessions.imDefaultRoute,+ })+ .from(sessions)+ .where(eq(sessions.id, sessionId))+ .limit(1);+ if (!row?.model || row.imDefaultRoute !== null) return;+ await db.drizzle+ .update(sessions)+ .set({+ imDefaultRoute: buildImDefaultRouteRecord(fingerprint, {+ agentKind: dbToMakerAgentKind(row.agentKind),+ model: row.model,+ providerId: row.providerId?.trim() || null,+ effort: row.effort ?? null,+ }),+ })+ .where(and(eq(sessions.id, sessionId), isNull(sessions.imDefaultRoute)));+}diff --git a/apps/desktop/src/main/hook-control/dispatcher.ts b/apps/desktop/src/main/hook-control/dispatcher.tsindex 52526e513c..1618c9477f 100644--- a/apps/desktop/src/main/hook-control/dispatcher.ts+++ b/apps/desktop/src/main/hook-control/dispatcher.ts@@ -221,8 +221,8 @@ export interface HookRunRequest {*/workspaceKind?: 'dialogue';/**- * 本次派发的目录别名(内置「对话」= chat)—— runner 据此查本地的目录模型- * 来源偏好(workspaceProviderSourceStore)。缺省 = 老 server 未带 workspace。+ * 目录别名(内置「对话」= chat),用于读取本地模型与来源偏好。+ * 复用任务时按任务实际目录匹配,不能使用消息里可能过时的目录提示。*/workspaceAlias?: string;title: string | null;@@ -2201,6 +2201,13 @@ export function createHookDispatcher(deps: HookDispatcherDeps): HookDispatcher {const inDialogueRoot = (dir: string | null): boolean =>dir !== null && dialogue !== undefined && (dialogue.rootDirs?.() ?? [dialogue.rootDir()]).some((root) => isPathWithin(root, dir));+ const workspaceAliasFor = (dir: string): { workspaceAlias?: string } => {+ if (inDialogueRoot(dir)) return { workspaceAlias: HOOK_CHAT_WORKSPACE_ALIAS };+ const alias = Object.entries(getConnection(connectionId)?.workspaces ?? config.workspaces)+ .filter(([, root]) => isPathWithin(root, dir))+ .sort(([, left], [, right]) => path.resolve(right).length - path.resolve(left).length)[0]?.[0];+ return alias !== undefined ? { workspaceAlias: alias } : {};+ };// 显式接管的目标失效时会从旧目录 / 本次别名提示里挑一个安全落点, 然后// 复用下方的新建路径。普通派发仍原样使用 payload.workspace。let effectiveWorkspace = payload.workspace;@@ -2247,6 +2254,7 @@ export function createHookDispatcher(deps: HookDispatcherDeps): HookDispatcher {isNew: false,laneKind,workingDir: pendingDir,+ ...workspaceAliasFor(pendingDir),agentKind,model,effort,@@ -2272,6 +2280,7 @@ export function createHookDispatcher(deps: HookDispatcherDeps): HookDispatcher {isNew: false,laneKind,workingDir: info.workingDir as string,+ ...workspaceAliasFor(info.workingDir as string),agentKind,model,effort,@@ -2412,6 +2421,7 @@ export function createHookDispatcher(deps: HookDispatcherDeps): HookDispatcher {laneKind,// 尚未落库, 没有 meta 可查 —— 用建它时那个刚重新过完映射校验的目录workingDir: pendingDir!,+ ...workspaceAliasFor(pendingDir!),agentKind,model,effort,@@ -2451,6 +2461,7 @@ export function createHookDispatcher(deps: HookDispatcherDeps): HookDispatcher {isNew: false,laneKind,workingDir,+ ...workspaceAliasFor(workingDir),agentKind,model,effort,diff --git a/apps/desktop/src/main/hook-control/session-runner.ts b/apps/desktop/src/main/hook-control/session-runner.tsindex 8644daf986..147c71d97c 100644--- a/apps/desktop/src/main/hook-control/session-runner.ts+++ b/apps/desktop/src/main/hook-control/session-runner.ts@@ -57,6 +57,7 @@ import { desktopSessionStorage } from '../maker-host/session-storage.js';import { resolveLenientRoute } from '../maker-host/model-route-guard.js';import { resolveLenientSessionRoute } from '../maker-host/model-route-guard-live.js';import {+ acquirePendingAgentSwitchForImSend,beginTurnChangeSetAtDispatch,prepareUnhealthySessionForSend,wireSessionToIpc,@@ -122,13 +123,17 @@ import {import { describeInteractionSource } from '../im/shared/interactionSource';import { hookAutoReviewReferences } from '../im/shared/autoReviewReferences.js';import { isQuotaExhaustionFailure, terminalErrorText } from '../im/shared/turnRetryNotice.js';-import { resolveSessionProviderLabel } from '../im/shared/sessionProviderLabel.js';+import { resolveSessionErrorContext } from '../im/shared/sessionProviderLabel.js';+import { fingerprintImDefaultSettings } from '../im/shared/channelDefaultRoute.js';+import { createDefaultRouteFollower } from '../im/shared/channelDefaultRouteSync.js';+import { isHookDefaultRouteRow, writeHookDefaultRouteRecord } from './defaultRouteFollow.js';import { groupLaneOf } from './groupWindow';import {HOOK_ROUTE_UNAVAILABLE_PREFIX,type HookContinuationWatchRequest,type HookRunOutcome,+ type HookRunRequest,type HookSessionRunner,} from './dispatcher.js';import { resolveHookSessionConfig, type ResolvedHookSessionConfig } from './defaults.js';@@ -166,6 +171,58 @@ function mainOwnedChannelOrigin(value: string | undefined): TurnPermissionOrigin/** 路由不可用时附在错误后的恢复指引(渠道回帖与 request ledger 都看得到)。 */const ROUTE_RESELECT_HINT = '。请在 设置 → IM 机器人 中为这个渠道的工作目录重新选择模型。';+type HookDispatchOverrides = {+ agentKind: string | null;+ model: string | null;+ effort: string | null;+ permissionMode: string | null;+};+type HookWorkspaceCtx = { alias: string | undefined; teamId: string | null };++/**+ * 新任务路由取值链的全部输入(同步读本机文件, 不碰供应商目录): 目录偏好合并后的+ * 显式值、目录来源偏好、IM 默认设置。resolveNewSessionConfig 与「跟随默认」的指纹+ * 共用这一份, 免得两边对「默认由什么决定」各说各话。+ */+function hookDefaultInputs(+ overrides: HookDispatchOverrides,+ sourceIm: string | null | undefined,+ workspaceCtx: HookWorkspaceCtx | undefined,+) {+ const prefsChannel: HookPrefsChannel | null =+ sourceIm === 'telegram' || sourceIm === 'x' || sourceIm === 'slack' ? sourceIm : null;+ const workspaceAlias = workspaceCtx?.alias;+ const localPref =+ prefsChannel !== null && workspaceAlias+ ? getWorkspacePref(prefsChannel, workspaceCtx.teamId, workspaceAlias)+ : null;+ const mergedOverrides = resolveWorkspacePrefOverrides(+ localPref,+ overrides,+ prefsChannel !== null && workspaceAlias !== undefined && isWorkspacePrefsMigrated(prefsChannel),+ );+ // 目录级来源偏好(纯本地, 用户在工作目录映射行显式选的来源)优先于草稿默认来源。+ const workdirProviderId =+ prefsChannel !== null && workspaceAlias+ ? getWorkspaceProviderSource(prefsChannel, workspaceCtx.teamId, workspaceAlias)+ : null;+ // 官方 Telegram hook 与个人 Bot 是两个独立入口。个人 Bot 使用+ // channel='telegram';官方群继续读取 global,避免任一设置卡静默+ // 改写另一入口的新会话路由。+ const imDefaults = readImDefaultSettings(sourceIm === 'slack' ? 'slack' : undefined);+ return { channel: prefsChannel, mergedOverrides, workdirProviderId, imDefaults };+}++/**+ * 官方 hook 任务的「默认设置指纹」: 取值链输入任一变化(目录偏好、目录来源、IM 默认)+ * 才需要重新解析。权限档不在内 —— 它不跟随(与个人渠道同口径)。+ */+function hookDefaultsFingerprint(inputs: ReturnType<typeof hookDefaultInputs>): string {+ const { channel, mergedOverrides, workdirProviderId, imDefaults } = inputs;+ return JSON.stringify(['hook', channel, mergedOverrides.agentKind, mergedOverrides.model,+ mergedOverrides.effort, workdirProviderId, fingerprintImDefaultSettings(imDefaults)]);+}+/*** 新会话 agent/model/effort/permissionMode/providerId 合成: IM provider 按目录偏好* (dispatch options)优先, 缺省落桌面端 IM 新会话默认值(草稿, 建 session 那@@ -174,45 +231,28 @@ const ROUTE_RESELECT_HINT = '。请在 设置 → IM 机器人 中为这个渠* 数据源, 取代旧版的硬编码兜底模型。*/async function resolveNewSessionConfig(- overrides: {- agentKind: string | null;- model: string | null;- effort: string | null;- permissionMode: string | null;- },+ overrides: HookDispatchOverrides,log: { warn(msg: string): void },sourceIm?: string | null,- workspaceCtx?: { alias: string | undefined; teamId: string | null },-): Promise<ResolvedHookSessionConfig> {+ workspaceCtx?: HookWorkspaceCtx,+ providerSnapshot?: ProviderView[],+): Promise<ResolvedHookSessionConfig & { fingerprint: string }> {+ const inputs = hookDefaultInputs(overrides, sourceIm, workspaceCtx);+ const fingerprint = hookDefaultsFingerprint(inputs);let providers: ProviderView[] | null = null;try {- providers = await getDesktopProviderService().listProviders({ allowSideEffects: true });+ providers = providerSnapshot ?? await getDesktopProviderService().listProviders({ allowSideEffects: true });} catch (err) {log.warn(`hook provider catalog unavailable; falling back to maker capabilities: ${err instanceof Error ? err.message : String(err)}`,);}- const prefsChannel: HookPrefsChannel | null =- sourceIm === 'telegram' || sourceIm === 'x' || sourceIm === 'slack' ? sourceIm : null;- const workspaceAlias = workspaceCtx?.alias;- const localPref =- prefsChannel !== null && workspaceAlias- ? getWorkspacePref(prefsChannel, workspaceCtx.teamId, workspaceAlias)- : null;- const mergedOverrides = resolveWorkspacePrefOverrides(- localPref,- overrides,- prefsChannel !== null && workspaceAlias !== undefined && isWorkspacePrefsMigrated(prefsChannel),- );+ const { channel, mergedOverrides, workdirProviderId, imDefaults } = inputs;const resolved = resolveHookSessionConfig({- readDefaults: () =>- // 官方 Telegram hook 与个人 Bot 是两个独立入口。个人 Bot 使用- // channel='telegram';官方群继续读取 global,避免任一设置卡静默- // 改写另一入口的新会话路由。- readImDefaultSettings(sourceIm === 'slack' ? 'slack' : undefined),+ readDefaults: () => imDefaults,// 可执行清单按**启用**口径,不叠加「显示 / 隐藏」偏好:隐藏只是陈列过滤// (选择器不列),被 IM 显式点名或兜底选中仍然合法;停用的模型与供应商已由// visibleModelUnion 内建的准入过滤(model.disabled / suspended)剔除,点名@@ -230,19 +270,6 @@ async function resolveNewSessionConfig(mergedOverrides,);- // 目录级来源偏好(纯本地, 用户在工作目录映射行显式选的来源)优先于草稿默认来源。- const channel =- sourceIm === 'telegram'- ? ('telegram' as const)- : sourceIm === 'x'- ? ('x' as const)- : sourceIm === 'slack'- ? ('slack' as const)- : null;- const workdirProviderId =- channel !== null && workspaceCtx?.alias- ? getWorkspaceProviderSource(channel, workspaceCtx.teamId, workspaceCtx.alias)- : null;// 目录来源是和目录模型一起选的(issue #5912)。目录模型为空、改为继承 IM 默认时,// 残留来源若账号仍可用、只是目录里根本没有这个继承来的模型,它已不再描述用户可见的// 选择 —— 设置页显示的就是继承模型 —— 按 IM 默认自己的来源路由。来源账号断开 /@@ -299,7 +326,7 @@ async function resolveNewSessionConfig(`hook saved route degraded (disabled in settings): model=${resolved.model} providerId=${providerId ?? 'null'} catalog=${providers ? 'ok' : 'outage'}`,);}- return { ...resolved, model: lenient.model, providerId: lenient.providerId };+ return { ...resolved, model: lenient.model, providerId: lenient.providerId, fingerprint };}/**@@ -535,7 +562,7 @@ export function createMakerHookSessionRunner(deps: {}): HookSessionRunner {const { log } = deps;- return {+ const runner = {isBusy: (sessionId) => isSessionInTurn(sessionId),async inspect(sessionId) {@@ -555,7 +582,7 @@ export function createMakerHookSessionRunner(deps: {return { workingDir, usable };},- async run(req) {+ async run(req: HookRunRequest, releaseSendLock = (): void => {}) {const startedAt = Date.now();const maker = getMaker();// 新任务的账号代次从读取偏好 / 默认配置之前算起(与个人 IM 同一判据): 中途换账号时@@ -585,6 +612,13 @@ export function createMakerHookSessionRunner(deps: {{ alias: req.workspaceAlias, teamId: req.source?.teamId ?? null },): null;+ const recordNewTaskDefaultRoute = async (sessionId: string): Promise<void> => {+ if (!resolved || !['telegram', 'slack', 'x'].includes(req.source?.im ?? '')) return;+ assertAccount?.();+ await writeHookDefaultRouteRecord(sessionId, resolved.fingerprint).catch((err) => {+ log.warn(`hook default route record failed: ${String(err)}`);+ });+ };let workingDir = req.workingDir;let model: string | undefined = resolved?.model;let effort = resolved?.effort;@@ -775,6 +809,8 @@ export function createMakerHookSessionRunner(deps: {await setSessionSourceInDb(req.sessionId, req.source.im);}assertAccount?.();+ await recordNewTaskDefaultRoute(req.sessionId);+ assertAccount?.();await touchUserSendInDb(req.sessionId).catch((err) => {log.warn(`hook create-only touchUserSend failed: ${err instanceof Error ? err.message : String(err)}`,@@ -997,6 +1033,7 @@ export function createMakerHookSessionRunner(deps: {if ((req.source?.im === 'telegram' || req.source?.im === 'x') && accountStillCurrent()) {await setSessionSourceInDb(session.id, req.source.im);}+ if (accountStillCurrent()) await recordNewTaskDefaultRoute(session.id);if (accountStillCurrent()) broadcastSessionCreated(session.id);}// worktree 场景补写 sessions.worktree_path(同 send_to_session 做法):@@ -1456,6 +1493,9 @@ export function createMakerHookSessionRunner(deps: {releaseTelegramGroupTurn();releaseGroupHistory();return fail(err instanceof Error ? err.message : String(err));+ } finally {+ // 与个人 IM 一样,锁只保护切换到 send 完成,不跨整轮等待。+ releaseSendLock();}// turn 不设时长上限(见常量注释): 收口全靠 observer, 兜底在 maker-core@@ -1472,7 +1512,8 @@ export function createMakerHookSessionRunner(deps: {// 额度类失败要说清是哪个供应商: 名字只在这里按需读一次(读不到退回「当前供应商」)。const message = isQuotaExhaustionFailure(observer.errorData)? terminalErrorText(observer.errorData, {- providerLabel: await resolveSessionProviderLabel(session.id),+ ...await resolveSessionErrorContext(session.id),+ botLabel: req.source?.im === 'telegram' ? 'Telegram 官方 bot' : req.origin.connectionName,surface: 'official',}): err instanceof Error ? err.message : String(err);@@ -1530,6 +1571,41 @@ export function createMakerHookSessionRunner(deps: {}return beginContinuationWatch(session, req, log);},+ } satisfies HookSessionRunner;++ return {+ ...runner,+ async run(req) {+ if (req.isNew) return runner.run(req);+ // 切换可能重建引擎,必须先应用选择,再读 meta、建会话和挂观察器。+ const overrides: HookDispatchOverrides = { agentKind: null, model: null, effort: null, permissionMode: null };+ const workspace = { alias: req.workspaceAlias, teamId: req.source?.teamId ?? null };+ const follower = createDefaultRouteFollower({+ label: 'hook',+ ownsRow: isHookDefaultRouteRow,+ fingerprint: () => hookDefaultsFingerprint(hookDefaultInputs(overrides, req.source?.im, workspace)),+ resolveTarget: async (providers) => {+ const resolved = await resolveNewSessionConfig(overrides, log, req.source?.im, workspace, providers);+ return { ...resolved, effort: resolved.effort ?? null };+ },+ // 新任务配置解析已校验来源和模型可用性。+ isRouteUsable: async () => true,+ });+ let release: (() => void) | undefined = await acquirePendingAgentSwitchForImSend(+ req.sessionId, () => follower.syncUnderLock(req.sessionId),+ );+ const releaseOnce = (): void => {+ const unlock = release;+ release = undefined;+ unlock?.();+ };+ try {+ return await runner.run(req, releaseOnce);+ } finally {+ // 建会话、目录检查等在 send 前提前退出时也释放。+ releaseOnce();+ }+ },};}diff --git a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.tsindex ad70ac856f..5562b667c3 100644--- a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts@@ -97,6 +97,7 @@ const {backfillLegacyImDefaultRoutes,backfillLegacyImDefaultRoutesAtStartup,createImChannelDefaultRouteSync,+ createDefaultRouteFollower,resetImSessionToChannelDefaults,} = await import('../channelDefaultRouteSync');const { markImSessionManualRouteOverride } = await import('../manualRouteOverride');@@ -779,3 +780,71 @@ describe('createSession', () => {expect((await rowOf(created.id)).imDefaultRoute).toBe('kept');});});+++describe('official bot follows defaults without an extra control', () => {+ const hookFp = JSON.stringify(['hook', 'telegram', 'old-default']);+ const nextHookFp = JSON.stringify(['hook', 'telegram', 'new-default']);+ beforeEach(() => {+ mocks.fingerprint.mockReturnValue(nextHookFp);+ mocks.resolveDefaults.mockResolvedValue({ ...NEW, fingerprint: nextHookFp });+ });+ const hookRecord = buildImDefaultRouteRecord(hookFp, OLD);+ async function officialFollower() {+ const { isHookDefaultRouteRow } = await import('../../../hook-control/defaultRouteFollow');+ return createDefaultRouteFollower({+ label: 'hook', ownsRow: isHookDefaultRouteRow,+ fingerprint: mocks.fingerprint, resolveTarget: mocks.resolveDefaults,+ isRouteUsable: async () => true,+ });+ }++ it('records a new official task and follows on its next message, preserving Fast and permissions', async () => {+ const { writeHookDefaultRouteRecord } = await import('../../../hook-control/defaultRouteFollow');+ await insertTask('official', OLD, { source: 'telegram', marker: false, record: null, fastMode: true });+ await writeHookDefaultRouteRecord('official', hookFp);+ await (await officialFollower()).syncUnderLock('official');+ expect(mocks.applyRoute).toHaveBeenCalledWith('official', { ...NEW, fastMode: true }, 'claude-code');+ expect((await rowOf('official')).permissionMode).toBe('auto');+ expect(parseImDefaultRouteRecord((await rowOf('official')).imDefaultRoute)?.fp).toBe(nextHookFp);+ mocks.fingerprint.mockReturnValue(hookFp);+ mocks.resolveDefaults.mockResolvedValue({ ...OLD, fingerprint: hookFp });+ await (await officialFollower()).syncUnderLock('official');+ expect((await rowOf('official')).model).toBe(OLD.model);+ });++ it('a same-value manual selection permanently stops following; a new task follows again', async () => {+ const { writeHookDefaultRouteRecord } = await import('../../../hook-control/defaultRouteFollow');+ await insertTask('official', OLD, { source: 'telegram', marker: false, record: hookRecord });+ await markImSessionManualRouteOverride('official');+ await writeHookDefaultRouteRecord('official', hookFp);+ await (await officialFollower()).syncUnderLock('official');+ expect(mocks.applyRoute).not.toHaveBeenCalled();+ expect(parseImDefaultRouteRecord((await rowOf('official')).imDefaultRoute)?.manual).toBe(true);+ await insertTask('new-task', OLD, { source: 'telegram', marker: false, record: null });+ await writeHookDefaultRouteRecord('new-task', hookFp);+ await (await officialFollower()).syncUnderLock('new-task');+ expect(mocks.applyRoute).toHaveBeenCalledTimes(1);+ expect((await rowOf('official')).model).toBe(OLD.model);+ });++ it('does not claim historical official tasks, personal bot tasks, or remote tasks', async () => {+ await insertTask('historical', OLD, { source: 'telegram', marker: false, record: null });+ await insertTask('personal', OLD, { source: 'telegram' });+ await insertTask('remote', OLD, { source: 'telegram', marker: false, remoteHostId: 'other' });+ await insertTask('rotated-personal', OLD, { source: 'telegram', marker: false });+ const follower = await officialFollower();+ for (const id of ['historical', 'personal', 'remote', 'rotated-personal']) await follower.syncUnderLock(id);+ expect(mocks.applyRoute).not.toHaveBeenCalled();+ expect(mocks.resolveDefaults).not.toHaveBeenCalled();+ });++ it('defers a busy follow switch so generic pending application cannot interrupt it', async () => {+ await insertTask('official', OLD, { source: 'telegram', marker: false, record: hookRecord });+ mocks.applyRoute.mockResolvedValue('staged');+ mocks.readPendingRoute.mockReturnValue({ ...NEW, rev: 7 });+ mocks.readPendingRoute.mockReturnValueOnce(undefined);+ expect(await (await officialFollower()).syncUnderLock('official')).toBe(true);+ expect(parseImDefaultRouteRecord((await rowOf('official')).imDefaultRoute)?.pendingRev).toBe(7);+ });+});diff --git a/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts b/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.tsindex da055e105f..c732cf5315 100644--- a/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/sessionProviderLabel.test.ts@@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';import type { ProviderView } from '@cindy/model-providers';const mocks = vi.hoisted(() => ({- row: null as null | { agentKind: string; model: string | null; providerId: string | null },+ row: null as null | { agentKind: string; model: string | null; providerId: string | null; title?: string },providers: [] as unknown[],live: undefined as undefined | string | null,}));@@ -28,7 +28,7 @@ vi.mock('../../../maker-host/session-provider-store', () => ({getSessionProvider: () => mocks.live ?? null,}));-const { resolveSessionProviderLabel } = await import('../sessionProviderLabel');+const { resolveSessionErrorContext } = await import('../sessionProviderLabel');function codexProvider(id: string, name: string, disabled = false): ProviderView {return {@@ -60,30 +60,38 @@ beforeEach(() => {mocks.live = undefined;});-describe('resolveSessionProviderLabel', () => {+describe('resolveSessionErrorContext', () => {it('names the implicit native default source', async () => {- await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');+ await expect(resolveSessionErrorContext('s1')).resolves.toMatchObject({ providerLabel: 'OpenAI', modelLabel: 'GPT-6 Astra' });});it('keeps naming the implicit default when its copy was disabled while the task runs', async () => {// 新路由口径会剔除停用拷贝、落到 Cindy AI —— 说明会把 OpenAI 的花费上限归给别家。mocks.providers = [codexProvider('openai', 'OpenAI', true), codexProvider('xd', 'Cindy AI')];- await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');+ await expect(resolveSessionErrorContext('s1')).resolves.toMatchObject({ providerLabel: 'OpenAI' });});it('keeps naming an explicit source whose model was disabled while the task runs', async () => {mocks.row = { agentKind: 'codex', model: 'gpt-6-astra', providerId: 'openai' };mocks.providers = [codexProvider('openai', 'OpenAI', true), codexProvider('xd', 'Cindy AI')];- await expect(resolveSessionProviderLabel('s1')).resolves.toBe('OpenAI');+ await expect(resolveSessionErrorContext('s1')).resolves.toMatchObject({ providerLabel: 'OpenAI' });});it('prefers the in-memory source over the stored one', async () => {mocks.live = 'xd';- await expect(resolveSessionProviderLabel('s1')).resolves.toBe('Cindy AI');+ await expect(resolveSessionErrorContext('s1')).resolves.toMatchObject({ providerLabel: 'Cindy AI' });});- it('returns null when the task or its model is unknown', async () => {+ it('keeps task identity and the model ID when catalog metadata is missing', async () => {+ mocks.providers = [];+ mocks.row!.title = 'Telegram 测试';+ await expect(resolveSessionErrorContext('12345678-abcd')).resolves.toMatchObject({+ taskLabel: 'Telegram 测试(12345678)', modelLabel: 'gpt-6-astra',+ });+ });++ it('returns no context when the task is unknown', async () => {mocks.row = null;- await expect(resolveSessionProviderLabel('s1')).resolves.toBeNull();+ await expect(resolveSessionErrorContext('s1')).resolves.toEqual({});});});diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRetryNotice.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRetryNotice.test.tsindex aaa6dc68e7..3842be8faa 100644--- a/apps/desktop/src/main/im/shared/__tests__/turnRetryNotice.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/turnRetryNotice.test.ts@@ -298,32 +298,37 @@ describe('额度类终态错误', () => {'You hit your spend cap set by the owner of your workspace. Ask them to raise it to keep using Codex.';const PERSONAL = { surface: 'personal', supportsModelCommand: true } as const;- it('花费上限: 说清哪个供应商、什么原因、怎么处理, 并附上游原文', () => {- const text = terminalErrorText({ message: SPEND_CAP }, { ...PERSONAL, providerLabel: 'OpenAI' });+ it('花费上限: 定位 bot、任务、模型和供应商,只给当前任务的恢复动作', () => {+ const text = terminalErrorText({ message: SPEND_CAP }, { ...PERSONAL, providerLabel: 'OpenAI',+ botLabel: 'Telegram 个人 bot · 测试助手', modelLabel: 'GPT-6 Astra', taskLabel: '我的任务(12345678)' });expect(text.startsWith(QUOTA_FAILURE_NOTICE_PREFIX)).toBe(true);expect(text).toContain('「OpenAI」已达到工作区所有者设置的花费上限');- expect(text).toContain('Cindy 不会自动更换模型或供应商');+ expect(text).toContain('Telegram 个人 bot · 测试助手');+ expect(text).toContain('GPT-6 Astra');+ expect(text).toContain('我的任务(12345678)');+ expect(text).toContain('联系工作区管理员');expect(text).toContain('/model');- expect(text).toContain('设置 → IM 机器人');- expect(text).toContain(`上游原文:${SPEND_CAP}`);+ expect(text).not.toContain('设置 →');+ expect(text).not.toContain(SPEND_CAP);});- it('处理方式按入口指到对的设置: 个人 bot 指自己的卡片, 官方 bot 指工作目录并接 /new', () => {+ it('个人 /model 改当前任务,官方指向 Cindy 当前任务,不指向目录默认', () => {const personal = terminalErrorText({ message: SPEND_CAP }, PERSONAL);- expect(personal).toContain('「Telegram 机器人」');- expect(personal).toContain('新对话配置');+ expect(personal).toContain('个人 bot');+ expect(personal).toContain('/model');+ expect(personal).not.toContain('新对话配置');expect(personal).not.toContain('工作目录');const official = terminalErrorText({ message: SPEND_CAP }, { surface: 'official' });- expect(official).toContain('官方 bot 卡片的工作目录');- expect(official).toContain('已有任务保持原模型');- expect(official).toContain('/new');- expect(official).not.toContain('Telegram 机器人');+ expect(official).toContain('官方 bot');+ expect(official).toContain('在 Cindy 里打开这个任务');+ expect(official).not.toContain('/model');+ expect(official).not.toContain('/new');});it.each([false, undefined])('个人渠道未支持 /model (%s) 时只指向 Cindy 当前任务', (supportsModelCommand) => {const text = terminalErrorText({ message: SPEND_CAP }, { surface: 'personal', supportsModelCommand });expect(text).toContain('在 Cindy 里打开这个任务');- expect(text).toContain('换一个供应商或模型');+ expect(text).toContain('更换供应商或模型');expect(text).toContain('回到这里重发这条消息');expect(text).not.toContain('/model');expect(text).not.toContain('新对话配置');@@ -362,8 +367,9 @@ describe('额度类终态错误', () => {);});- it('上游原文脱敏后再附上', () => {- const text = terminalErrorText({ message: 'insufficient_quota for key sk-abcdefghijklmnop' }, PERSONAL);+ it('不外发上游原文,显示标签中的敏感信息仍脱敏', () => {+ const text = terminalErrorText({ message: 'insufficient_quota for key sk-abcdefghijklmnop' },+ { ...PERSONAL, taskLabel: 'key sk-abcdefghijklmnop' });expect(text).not.toContain('sk-abcdefghijklmnop');});});diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.tsindex 95aef8ed55..5b77fd36f7 100644--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts@@ -3007,7 +3007,7 @@ describe('turnRunner send outcome policy (feishu adapter characterization)', ()expect(text).not.toContain('新对话配置');} else {expect(text).toContain('/model');- expect(text).toContain('新对话配置');+ expect(text).not.toContain('新对话配置');}});} finally {diff --git a/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts b/apps/desktop/src/main/im/shared/channelDefaultRouteSync.tsindex 2bda046835..e5e5317d05 100644--- a/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts+++ b/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts@@ -67,7 +67,7 @@ export interface ImChannelDefaultRouteSync {syncBeforeWiring(sessionId: string): Promise<void>;}-interface SessionRouteRow {+export interface SessionRouteRow {source: string | null;status: string;remoteHostId: string | null;@@ -165,19 +165,37 @@ export function createImChannelDefaultRouteSync(deps: {isRouteUsable: RouteAuthCheck;}): ImChannelDefaultRouteSync {const { source, config } = deps;+ return createDefaultRouteFollower({+ label: source,+ ownsRow: (row) => isChannelOwnedRow(row, source),+ fingerprint: () => readImDefaultSettingsFingerprint(source),+ resolveTarget: (providers) => resolveImSessionDefaults(config, providers, source),+ isRouteUsable: deps.isRouteUsable,+ });+}++/** 两类 bot 共用切换判定、待生效意图与发送锁,只由各入口提供默认配置。 */+export function createDefaultRouteFollower(deps: {+ label: string;+ ownsRow(row: SessionRouteRow): boolean;+ fingerprint(): string;+ resolveTarget(providers: ProviderView[]): Promise<ImDefaultRoute & { fingerprint: string }>;+ isRouteUsable: RouteAuthCheck;+}): ImChannelDefaultRouteSync {+ const source = deps.label;async function evaluate(sessionId: string): Promise<Evaluation | 'defer-unknown' | null> {const row = await readSessionRouteRow(sessionId);- if (!row || !isChannelOwnedRow(row, source)) return null;+ if (!row || !deps.ownsRow(row)) return null;const record = parseImDefaultRouteRecord(row.imDefaultRoute);// 用户单独改过路由(墓碑): 永不跟随, 不必解析新默认。if (record?.manual) return null;- if (!imDefaultRouteMayNeedSync(record, readImDefaultSettingsFingerprint(source))) return null;+ if (!imDefaultRouteMayNeedSync(record, deps.fingerprint())) return null;const providers = await listProviders();// 目录拿不到就无法可靠比对来源, 本条消息先按原路由走 —— 但若记录仍认领着在世// 的系统意图, 调用方必须暂缓通用意图应用(PR #5155 review P2)。if (!providers) return 'defer-unknown';- const defaults = await resolveImSessionDefaults(config, providers, source);+ const defaults = await deps.resolveTarget(providers);const target: ImDefaultRoute = {agentKind: defaults.agentKind,model: defaults.model,@@ -357,7 +375,7 @@ export function createImChannelDefaultRouteSync(deps: {async function followClaimStillPending(sessionId: string): Promise<boolean> {try {const row = await readSessionRouteRow(sessionId);- if (!row || !isChannelOwnedRow(row, source)) return false;+ if (!row || !deps.ownsRow(row)) return false;const pending = readPendingAgentSwitchRoute(sessionId);return recordClaimsPendingIntent(parseImDefaultRouteRecord(row.imDefaultRoute),diff --git a/apps/desktop/src/main/im/shared/manualRouteOverride.ts b/apps/desktop/src/main/im/shared/manualRouteOverride.tsindex 5140e7ef78..06c0109231 100644--- a/apps/desktop/src/main/im/shared/manualRouteOverride.ts+++ b/apps/desktop/src/main/im/shared/manualRouteOverride.ts@@ -20,7 +20,7 @@ import { activeOwnerScopeKey, isAppSessionBoundaryPending } from '../../appSessiimport { getDbClient } from '../../localDb/client/current';import { sessions } from '../../localDb/schema';import { createLogger } from '../../logger';-import { buildImManualRouteOverrideRecord, type ImDefaultRoute } from './channelDefaultRoute';+import { buildImManualRouteOverrideRecord, parseImDefaultRouteRecord, type ImDefaultRoute } from './channelDefaultRoute';const log = createLogger('im:default-route');@@ -44,6 +44,7 @@ export async function markImSessionManualRouteOverride(sessionId: string): Promieffort: sessions.effort,feishuBotAppId: sessions.feishuBotAppId,imBotContextId: sessions.imBotContextId,+ imDefaultRoute: sessions.imDefaultRoute,}).from(sessions).where(eq(sessions.id, sessionId))@@ -51,8 +52,9 @@ export async function markImSessionManualRouteOverride(sessionId: string): Promiif (!row) return;if (row.status !== 'active' || row.remoteHostId || row.orcaRole || !row.model) return;const source = row.source;- if (!source || !IM_DEFAULT_SETTINGS_CHANNELS.includes(source as ImDefaultSettingsChannel)) return;- if (source === 'feishu' ? !row.feishuBotAppId : !row.imBotContextId) return;+ const personal = source && IM_DEFAULT_SETTINGS_CHANNELS.includes(source as ImDefaultSettingsChannel)+ && (source === 'feishu' ? !!row.feishuBotAppId : !!row.imBotContextId);+ if (!personal && !parseImDefaultRouteRecord(row.imDefaultRoute)) return;const route: ImDefaultRoute = {agentKind: dbToMakerAgentKind(row.agentKind),model: row.model,diff --git a/apps/desktop/src/main/im/shared/sessionProviderLabel.ts b/apps/desktop/src/main/im/shared/sessionProviderLabel.tsindex 46cb31c623..5421ea8e4d 100644--- a/apps/desktop/src/main/im/shared/sessionProviderLabel.ts+++ b/apps/desktop/src/main/im/shared/sessionProviderLabel.ts@@ -1,8 +1,5 @@/**- * 某任务此刻实际走的供应商显示名 —— 渠道失败说明(额度不足等)要说清「是哪个供应商」。- *- * 只在需要时(失败收口)读一次, 尽力而为: 读库或供应商目录失败一律返回 null,- * 调用方退回「当前供应商」的说法, 不为一个名字挡住失败消息。+ * 失败时按任务实际路由读取定位信息;目录不可读也保留任务名和模型 ID。*/import { eq } from 'drizzle-orm';import { actualSourceIdForModel } from '@cindy/model-providers';@@ -13,19 +10,31 @@ import { sessions } from '../../localDb/schema';import { getDesktopProviderService } from '../../maker-host/createDesktopProviderService';import { getSessionProvider, hasSessionProvider } from '../../maker-host/session-provider-store';-export async function resolveSessionProviderLabel(sessionId: string): Promise<string | null> {+export async function resolveSessionErrorContext(sessionId: string): Promise<{+ providerLabel?: string;+ modelLabel?: string;+ taskLabel?: string;+}> {try {const [row] = await getDbClient().drizzle.select({agentKind: sessions.agentKind,model: sessions.model,providerId: sessions.providerId,+ title: sessions.title,}).from(sessions).where(eq(sessions.id, sessionId)).limit(1);- if (!row?.model) return null;- const providers = await getDesktopProviderService().listProviders({ allowSideEffects: false });+ if (!row) return {};+ const context = {+ taskLabel: `${row.title || '任务'}(${sessionId.slice(0, 8)})`,+ ...(row.model ? { modelLabel: row.model } : {}),+ };+ if (!row.model) return context;+ const providers = await getDesktopProviderService()+ .listProviders({ allowSideEffects: false })+ .catch(() => []);// 内存里的来源比库里新(本轮刚切过、尚未落库时以运行中的为准)。const selected = hasSessionProvider(sessionId) ? getSessionProvider(sessionId) : row.providerId;// 「运行中会话」口径(与实际路由层 provider-route 一致): 停用 / 退役的拷贝仍算数 ——@@ -37,8 +46,12 @@ export async function resolveSessionProviderLabel(sessionId: string): Promise<strow.model,dbToMakerAgentKind(row.agentKind),);- return providers.find((provider) => provider.id === providerId)?.name ?? null;+ const provider = providers.find((provider) => provider.id === providerId);+ const model = provider?.models[dbToMakerAgentKind(row.agentKind)]?.find(+ (entry) => entry.id === row.model,+ );+ return { ...context, modelLabel: model?.name || row.model, providerLabel: provider?.name };} catch {- return null;+ return {};}}diff --git a/apps/desktop/src/main/im/shared/turnRetryNotice.ts b/apps/desktop/src/main/im/shared/turnRetryNotice.tsindex fc74bcdcb6..99ee7807a6 100644--- a/apps/desktop/src/main/im/shared/turnRetryNotice.ts+++ b/apps/desktop/src/main/im/shared/turnRetryNotice.ts@@ -223,46 +223,21 @@ export function isQuotaExhaustionFailure(data: unknown): boolean {return isQuotaExhaustedErrorMessage(e.message);}-/**- * 额度类终态错误 -> 渠道可读的失败说明; 不是这类错误返回 null。- *- * 说清三件事: 哪个供应商、什么原因、怎么处理(按入口指到对的设置, 见 surface)。**不自动更换模型或供应商**(与 openSession- * 模型准入「不会自动更换模型或供应商」同一口径): 换哪个供应商、花不花钱由用户决定。- * 上游原文(脱敏、截断)附在最后, 用户转给工作区管理员或排查时用得上。- */+/** IM 失败说明只定位当前 bot / 任务 / 路由,并给当前任务的恢复动作。 */export interface QuotaFailureNoticeOptions {providerLabel?: string | null;- /**- * 哪个入口的任务 —— 「怎么处理」要指到对的地方:- * - `personal`: 个人 bot / 个人 IM 渠道, 支持时 `/model` 直接改这个任务, 默认模型在- * 这个 bot 自己的卡片(如「Telegram 机器人」)的「新对话配置」里;- * - `official`: 官方 bot, `/model` 与官方卡片工作目录里的模型改的是**目录默认**,- * 已有任务保持原模型, 所以要接着 `/new` 开新任务, 或在 Cindy 里直接给任务换模型。- */+ modelLabel?: string;+ taskLabel?: string;+ botLabel?: string;surface: 'personal' | 'official';- /** 个人渠道只有富卡输出支持 /model;未声明时指向 Cindy 内的当前任务。 */+ /** 只有个人富卡渠道的 /model 改当前任务;官方的 /model 改目录默认。 */supportsModelCommand?: boolean;}function quotaRecoveryHint(options: QuotaFailureNoticeOptions): string {- if (options.surface === 'official') {- return (- 'Cindy 不会自动更换模型或供应商。可以发 /model,或在 Cindy 的 设置 → IM 机器人 →' +- '「Telegram」等官方 bot 卡片的工作目录里换一个模型(改的是这个目录的默认,已有任务保持原模型),' +- '然后发 /new 开新任务;也可以在 Cindy 里直接给这个任务换模型。额度恢复后也可以直接重发这条消息。'- );- }- if (!options.supportsModelCommand) {- return (- 'Cindy 不会自动更换模型或供应商。可以在 Cindy 里打开这个任务,给它换一个供应商或模型,' +- '然后回到这里重发这条消息。额度恢复后也可以直接重发这条消息。'- );- }- return (- 'Cindy 不会自动更换模型或供应商。可以发 /model 给这个任务换一个供应商或模型;' +- '以后新任务的默认模型在 Cindy 的 设置 → IM 机器人 里这个 bot 自己的卡片' +- '(如「Telegram 机器人」)的「新对话配置」中修改。额度恢复后也可以直接重发这条消息。'- );+ return options.surface === 'personal' && options.supportsModelCommand+ ? '发 /model 为当前任务更换供应商或模型,再重发这条消息。'+ : '在 Cindy 里打开这个任务,更换供应商或模型,再回到这里重发这条消息。';}export function quotaFailureNotice(@@ -276,13 +251,17 @@ export function quotaFailureNotice(: codexErrorInfo === 'usageLimitExceeded' || USAGE_LIMIT_RE.test(message)? '账号用量已达上限': '账号余额或配额不足';- const label = options.providerLabel?.trim();+ const display = (value: string | null | undefined): string =>+ redactSensitiveText(value?.replace(/\s+/g, ' ').trim() ?? '').slice(0, 100);+ const label = display(options.providerLabel);const who = label ? `「${label}」` : '当前供应商';- const upstream = redactSensitiveText(message.replace(/\s+/g, ' ').trim()).slice(0, 300);return [`${QUOTA_FAILURE_NOTICE_PREFIX}:${who}${reason},这个任务暂时无法继续。`,+ `来源:${display(options.botLabel) || (options.surface === 'official' ? '官方 bot' : '个人 bot')}` ++ (options.modelLabel ? ` · 模型:${display(options.modelLabel)}` : ''),+ ...(options.taskLabel ? [`任务:${display(options.taskLabel)}`] : []),+ ...(SPEND_CAP_RE.test(message) ? ['请联系工作区管理员调整花费上限,或更换供应商。'] : []),quotaRecoveryHint(options),- ...(upstream ? [`上游原文:${upstream}`] : []),].join('\n');}diff --git a/apps/desktop/src/main/im/shared/turnRunner.ts b/apps/desktop/src/main/im/shared/turnRunner.tsindex 403ce490c9..c2fdc2deae 100644--- a/apps/desktop/src/main/im/shared/turnRunner.ts+++ b/apps/desktop/src/main/im/shared/turnRunner.ts@@ -167,7 +167,7 @@ import {type TurnActivityState,} from './turnActivity';import { isQuotaExhaustionFailure, terminalErrorText, turnRetryNotice } from './turnRetryNotice';-import { resolveSessionProviderLabel } from './sessionProviderLabel';+import { resolveSessionErrorContext } from './sessionProviderLabel';import { createTurnPresenter, DEFAULT_PRESENTER_POLICY, type TurnPresenter } from './turnPresenter';import {toCoreAgentKind,@@ -3544,7 +3544,6 @@ export function createTurnRunner(// 或内部英文 SDK 串——从本地化文案回归英文实现细节(review #844 codex P1)。// hook runner 与调度转播共用同一个 helper,三条渠道链路口径一致;上游原文留在// 本地日志。- let msg = terminalErrorText(errData);if (turn) clearSilentStopSettleWait(turn);if (turn) clearActivityTicker(turn);if (turn) {@@ -3570,14 +3569,18 @@ export function createTurnRunner(// 建卡失败 → 下面按"没有输出面"处理(另发一条消息)。}}- // 额度类失败要说清是哪个供应商: 名字只在这里按需读一次(尽力而为, 读不到退回「当前供应商」)。- if (isQuotaExhaustionFailure(errData)) {- msg = terminalErrorText(errData, {- providerLabel: await resolveSessionProviderLabel(state.makerSession.id),+ const msg = terminalErrorText(+ errData,+ isQuotaExhaustionFailure(errData) ? {+ ...(await resolveSessionErrorContext(state.makerSession.id)),+ botLabel: [+ channel === 'telegram' ? 'Telegram 个人 bot' : `${channel} 个人 bot`,+ adapter.getBotDisplayName?.(),+ ].filter(Boolean).join(' · '),surface: 'personal',supportsModelCommand: richIm !== null,- });- }+ } : undefined,+ );if (turn?.streamingHandle) {const view = composeStreamingView(turn);const body = view ? `${view}\n\n❌ 错误:${msg}` : `❌ 错误:${msg}`;diff --git a/apps/desktop/src/main/im/shared/types.ts b/apps/desktop/src/main/im/shared/types.tsindex 5e96b5040d..d4ae871f91 100644--- a/apps/desktop/src/main/im/shared/types.ts+++ b/apps/desktop/src/main/im/shared/types.ts@@ -149,6 +149,8 @@ export interface ImChannelAdapter {im: TextChannelIM;/** Stable inbound contextId when connected status.appId is only a display label. */getBotContextId?(): string;+ /** 已连接 bot 的展示名,用于失败时定位当前入口。 */+ getBotDisplayName?(): string;/** Terminal output strategy; existing channels use rich-card. */output: ImOutputDriver;config: ImOrchestratorConfig;diff --git a/apps/desktop/src/main/im/telegram/adapter.ts b/apps/desktop/src/main/im/telegram/adapter.tsindex 109df0bbd9..73e82c524d 100644--- a/apps/desktop/src/main/im/telegram/adapter.ts+++ b/apps/desktop/src/main/im/telegram/adapter.ts@@ -76,6 +76,7 @@ export function buildTelegramAdapter(const ownerGroupTurnPolicies = new WeakSet<object>();return {channel: 'telegram',+ getBotDisplayName: () => telegramIm.botName,im: telegramIm,output: { kind: 'rich-card', im: telegramIm },config,diff --git a/docs/dev-rules/im-turn-flow.md b/docs/dev-rules/im-turn-flow.mdindex df059f3a8b..399bc9d3cc 100644--- a/docs/dev-rules/im-turn-flow.md+++ b/docs/dev-rules/im-turn-flow.md@@ -24,12 +24,12 @@ Telegram / Slack / X)是同一件事的两套实现:把渠道里的一条消| 幂等与重投 | 无(个人连接无重投) | `ackHistory` / `inflightRequests` / `terminalLedger` | 渠道适配(服务端重投是 hook 的传输语义) || 找任务 | `turnRunner.resolveRouteTarget`:通知回复 → `/ctr` 绑定 → 确定性 id 通道行(`sessionRepo.findActiveSession` 复活归档行) | `dispatcher.resolveTarget`:接管 sessionId → 绑定复用(每条消息按工作目录映射现场重算)→ 失效则换任务并交接 | 共用流程的「定位」骨架 + 渠道策略(台账第三节「绑定的任务失效后怎么接续」有意不同) || 建任务 | `sessionRepo.createSession` 确定性 id upsert;`createFreshSession`(`/new` 轮换事务);随后 `maker.createSession` —— 2026-10 起两处建行都经 `openChannelSession` → **`openSession`**(模型准入) | `session-runner` 新任务的 `maker.createSession`、`/new` 的 `desktopSessionStorage.create` —— 同样经 `openChannelSession` → **`openSession`** | **公共入口 `openSession`**(已完成,批次 2);渠道专属建行在 commit 回调里。live session 仍各自 `maker.createSession`,未改用 register 内部的 `bootstrapSession`(会新增项目上下文 / Orca 指令注入等行为,见 §6) |-| 默认配置 | `resolveImSessionDefaults(channel)` + 跟随渠道默认(`channelDefaultRouteSync`) | `resolveNewSessionConfig`(目录偏好 > 全局 IM 默认 > 清单首项;权限档规则见 `defaults.ts`) | 渠道策略(台账第三节「新会话的默认…从哪读」有意不同) |+| 默认配置 | `resolveImSessionDefaults(channel)` + 跟随渠道默认(`channelDefaultRouteSync`) | `resolveNewSessionConfig`(目录偏好 > 全局 IM 默认 > 清单首项;权限档规则见 `defaults.ts`)+ 共用 `createDefaultRouteFollower` 跟随默认 | 渠道策略(台账第三节「新会话的默认…从哪读」有意不同) || 命令 | `messageHandler.processOne` → `slashCommands`(注册表 `botCommands.ts`) | 服务端分发命令,桌面只收 `query.*` | 渠道适配(官方命令分发在服务端) || 排队与插话 | `SessionState.sendQueue`(内存、无上限、重启丢失);无插话 | `dispatcher.queues`(内存、上限 20)+ `drainPolls`;无插话 | **公共入口 `AgentInputCoordinator`**(见 §5 批次 3 与 §6 待决项) || 输入拼装 | `prepareAgentTurnText`(群上下文 / ambient 提示)+ `buildImChannelNote` + `buildImUserMessage`;派发时前置交接 / 计划对账 / Goal 提示 | `buildContextPrefix` + `composeXPrompt` + `buildHookPromptNote`;同样前置交接 / 计划对账(仅 IM 来源)/ Goal 提示 | 共用流程(前置层同一份;渠道说明文案有意不同,见台账「入站上下文」) || 用户消息落库 | 部分渠道提前落库(`persistInboundUserMessageEarly`),`onAccepted` 补 `imSource` | 只在 `onAccepted` 落库,`agentMeta.hookSource` | 共用流程(`onAccepted` 落库;提前落库保留为渠道能力) |-| 发送 | `makerSession.send`,`MAIN_OWNED_SEND_CONTEXT.origin.kind='im'` | `session.send`,origin `hook`(Telegram/X)或 `im`(Slack) | 共用流程;Pi 管理命令授权来源按渠道各自声明(hook 不得伪装成本机命令) |+| 发送 | 发送前应用任务待切换选择,再 `makerSession.send`,`MAIN_OWNED_SEND_CONTEXT.origin.kind='im'` | 复用任务先经 `acquirePendingAgentSwitchForImSend` 跟随默认并应用任务选择,再读 meta、建会话、挂观察器和 `session.send`;发送后释放锁,origin `hook`(Telegram/X)或 `im`(Slack) | 待切换选择共用既有直发流程;Pi 管理命令授权来源按渠道各自声明(hook 不得伪装成本机命令) || 观察事件 | `turnPresenter`(buffer-replace)+ 流式 handle | `turnObserver`(finalized-segments)+ 进度发射器 | 共用流程(presenter 已同源;两个正文累积引擎有意不同) || 后台轮次回传(非 IM 入站) | `orchestrator` 的 `onChannelTurn` → `turnRunner` 转播(Agent 自己唤醒的轮次只同步标记已接线的会话) | `backgroundResults` → `turn.end(background: true)` | 已同源判据:`maker-ipc/channelTurnSignal.ts` 的开始信号与 `isRelayedChannelTurnSource`(其它任务来信、Agent 自己唤醒;scheduler 按 `turnOrigin`);仍属原 IM 轮次的不另发 || 表情 | `TurnState` 的 ack 句柄 | `ackReactions`(msg.op react) | 渠道适配(出站载体不同,档位语义同源) |diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.mdindex c2742102ad..33a64da63e 100644--- a/docs/product-rules/telegram-bot-parity.md+++ b/docs/product-rules/telegram-bot-parity.md@@ -89,7 +89,7 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`| 官方 bot 的**命令菜单**(需双方协商 `telegram-commands-v1`) | `apps/desktop/src/main/im/shared/botCommands.ts` 的 `buildOfficialBotCommandMenus` | 官方菜单的命令集合、顺序、文案都取注册表(与个人菜单同一份 i18n key),desktop 按 en(默认)/ zh / ja / ko 各渲染一份经 `provider.commands.set` 下发,服务端只执行 `setMyCommands`,且只管理默认菜单与 zh / ja / ko(每次全量重写,缺席的语言写空,其它语言码含显式 `en` 一律忽略);菜单只存服务端内存、不落库:desktop 每次握手都重发,服务端重启后到桌面重连前(以及设备离线期间)用服务端默认菜单。**语言口径沿用两侧既有差异**:官方按用户的 Telegram 语言,个人按桌面端语言。**命令分发不在这一行**:官方命令仍由服务端收入站并分发(1c 的别名差异照旧)。未协商时服务端用自己的 `TELEGRAM_COMMANDS` || 渠道 `/stop` 的**明确停止** | `maker-ipc/register.ts` 的 `stopSessionTurnExplicitly` | 个人 IM 的 `/stop` / `!stop`(含微信,`im/shared/turnRunner.ts` 的 `stopActiveTurn`)与官方 hook 的 `task.cancel`(`hook-control/dispatcher.ts`,经 `stopSessionExplicitly` 注入)都走桌面 Stop 同一套清理:撤自动续跑与退避簿记、取消上下文溢出恢复、暂停 Goal、停输入队列并中止当前一轮。2026-10 之前两侧各少几步(个人不暂停 Goal、官方连自动续跑都不撤)。渠道侧只保留各自的排队收口(个人清 `sendQueue`,官方回 `turn.end(cancelled)`)。账号切换时的中止不是用户喊停,仍是普通 abort || 新任务的**模型准入** | `im/shared/openChannelSession.ts` → `localDb/sessionOpening.ts` 的 `openSession` | 两侧(及共用 `sessionRepo` 的全部个人 IM 渠道)新建任务时都经桌面新建任务同一套准入:模型 / 来源 / 推理强度 / Fast 不被支持就拒绝建任务,不自动换模型;准入可能规范化来源与推理强度。**默认配置从哪读仍是有意不同**(第三节),这里只统一「读出来之后怎么校验」;官方 hook 进准入前对残留目录来源的取舍见文首 2026-10-13 条。复用 / 接管 / 复活既有任务不经过准入 |-| **额度类失败说明**(花费上限 / 配额 / 余额 / 套餐用量,2026-10-15) | `im/shared/turnRetryNotice.ts` 的 `quotaFailureNotice`(判据复用 `shared/providerErrors.ts` 的 `isQuotaExhaustedErrorMessage`,与桌面错误横幅同一份) | 两侧终态失败都换成同一段中文说明:哪个供应商(`sessionProviderLabel.ts` 按任务实际来源读名字)、什么原因,并附脱敏后的上游原文;**不自动更换模型或供应商**。只有「怎么处理」按入口分开(`surface`):个人 bot 指向 `/model`(改这个任务)与自己卡片(如「Telegram 机器人」)的「新对话配置」;官方 bot 指向 `/model` 或官方卡片的工作目录模型——两者改的都是目录默认、已有任务保持原模型,所以接着 `/new`,或在 Cindy 里直接给任务换模型。官方 hook 主日志把这类失败记成 `reason=provider-quota-exhausted`,不再是 `unclassified` |+| **额度类失败说明**(花费上限 / 配额 / 余额 / 套餐用量) | `im/shared/turnRetryNotice.ts` 的 `quotaFailureNotice` + `sessionProviderLabel.ts` | 入站消息失败时显示当前 bot(官方 / 个人,个人 Telegram 附 bot 名)、任务名和短 ID、实际模型与供应商。只给当前任务的恢复动作:个人富卡渠道用 `/model`,官方与纯文本渠道在 Cindy 当前任务里换模型后回原渠道重发;花费上限另提示联系工作区管理员。不附上游长原文,不夹带新任务默认设置教程,不自动换供应商。判据仍与桌面错误横幅共用;官方主日志归类 `provider-quota-exhausted` || 群历史**检索实现** | `im/shared/groupHistorySearch.ts` | 真正执行查询的就是这一份:FTS(`hook_group_messages_fts` 的 MATCH)+ 中文 LIKE 兜底,**lane 条件写在 SQL 里**(MATCH 与 LIKE 用完全相同的 lane 条件,调用方没法先全局搜再事后过滤),加上结果映射(snippet / score / source)与上限(默认 8 条、最多 20 条、query 256 字)。两侧共用 || 群历史检索的**逐 turn 授权租约** | `im/shared/groupHistoryAccess.ts` | 租约机制共用:`beginGroupHistoryAccess` 在 provider 真正开始这一轮之前登记作用域,终态 / 重排 / 失败时释放;`sessionInstanceId` 挡住「同一业务 session 重建后,旧 MCP 请求借用新实例权限」。**但产生 scope 的那一步各写各的**——个人是 `im/telegram/adapter.ts` 的 `groupHistoryAccessFor`,官方是 `hook-control/groupHistoryScope.ts` 的 `groupHistoryAccessForExternalKey`;群轮次两侧同为 lane-only,**私聊上给的不一样**,见第四节 2e。完整调用链:MCP 入口 `mcp-integrations/groupHistoryMcpServer.ts` 先 `readGroupHistoryAccess` 拿租约(拿不到直接 `NO_ACTIVE_TELEGRAM_SCOPE` 拒绝),再 `resolveTargetLane(scope, lane)` 定位,最后才调 `searchGroupHistory` || 交互卡的**语义层**(`ask_user_question` / `plan_review` / 权限确认) | `im/shared/interactionCardModel.ts` | 选项集与决策模型两侧真跑同一份:至多 6 个选项(`MAX_OPTIONS`)、multiSelect 降级单选、只渲染第一问、plan 正文截断 1500(`MAX_PLAN_LEN`)、按钮文案的**产品级**上限 30(`BTN_LABEL_MAX`)、无选项降级时唯一按钮「继续」,以及 buttonId → 决策对象的构造与 header/body 拆分。**2026-08-19 起该模块另有一份全量视图**(顶层 `questions` 数组 + `needsAskMultiCard` 判定),只被支持卡片原地更新(`updateInteractiveCard`)的个人 IM 渠道消费——目前**仅飞书个人 bot**(`ui.cards.ask.multi` 打勾卡,多题/真多选,见 `cardBuilders.buildAskMultiCard`);**本表对照的两个 Telegram bot 都不消费它**,上列 v1 规则对两侧与未提供 multi 文案的渠道仍逐字成立,看到飞书行为不同不要当漂移报官方那条链路由 `hook-control/interactions.ts` 直接 import 本模块(对 `@cindy/maker-core` 刻意只做 type-only 依赖,免得 hook 链路在运行期加载整个 barrel)。**渲染不在这里**——按钮文案来源、标题格式、省略号样式、尺寸上限都是各自渲染侧的事,见第三节 |@@ -151,13 +151,18 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`任务列表,随后消息路由到这个新任务;旧任务保留为历史,不得复用原任务 ID、只清 SDK上下文,也不得拖到下一条普通消息才落任务。新任务的 agent、模型、来源、思考强度和权限档均在执行 `/new` 时从各自入口的当前默认配置重新解析;当前项目目录作为 lane 偏好保留。-个人 bot(与飞书等其它个人 IM 渠道同一套)另有「跟随渠道默认」:已有任务只要没被 `/model`、-桌面或手机单独改过路由,渠道默认的 Agent/模型/来源/思考强度一改,就在收到下一条消息时+个人和官方 bot 共用「跟随 bot 默认」:有跟随记录的任务只要没在 Cindy 桌面、手机或个人 bot 的+`/model` 中单独改过路由,渠道默认的 Agent/模型/来源/思考强度一改,就在收到下一条消息时切到新默认(跨引擎带交接,运行中的轮次不被打断),不必 `/new`;权限档不跟随,仍在 `/new`时应用。判定按状态(建任务/`/new`/跟随切换时写入的 `sessions.im_default_route` 记录),见 `im/shared/channelDefaultRoute.ts`。切换只动路由四件套,任务单独开过的 Fast 保持不变;「单独改过」按选择行为判定而非取值相等——单独挑的恰与新默认相同也算改过,此后不再跟随。-官方 bot 不受影响。+官方按工作目录偏好与全局 IM 默认解析,个人按自己的渠道默认解析,两者配置独立。+官方历史任务若没有跟随记录,保留当前路由,不按值猜测;新任务和 `/new` 写入跟随记录。+不新增「跟随默认」开关或恢复入口,手动改过后要重新跟随就用 `/new`。+两侧都应用用户在 Cindy 当前任务里选择的模型和供应商:下一条 IM 消息发送前,复用+`acquirePendingAgentSwitchForImSend` 的切换流程;官方 hook 先应用选择,再读取任务+meta 和绑定观察器,发送完成即释放锁。跟随切换与手动选择共用发送锁;跟随切换保持任务的权限档与 Fast。回归见 `hook-control/__tests__/session-runner.test.ts`。桌面 IM 默认配置与目录偏好统一使用标准模型选择器,一次保存 Harness、来源、模型和思考强度;不额外展示独立 Harness 控件,不展示无法保存的 Fast。两侧的配置归属与权限规则保持各自既有契约。两侧的成功提示、帮助与命令菜单都必须按这个真实结果称为「新任务」,不得沿用旧的「新对话/清掉上下文」说法。