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(hook): 来源清理覆盖重连镜像,残留判定只认来源未提供该模型

Dash47b4b610b095
diff --git a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
index 11b6567bde..331911272b 100644
--- a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
@@ -265,7 +265,7 @@ function makeDispatcher(overrides?: {
describe('任务失败原因进主日志(issue #5912)', () => {
it('runner 抛出路由不可用: 主日志记 requestId / 渠道 / 原因, turn.end 带同一 errorMessage', async () => {
const message =
- 'hook session route unavailable: selected provider "openai" cannot serve model "claude-test"。请在 设置 → 远程连接 中为这个渠道重新选择模型。';
+ 'hook session route unavailable: selected provider "openai" cannot serve model "claude-test"。请在 设置 → IM 机器人 中为这个渠道的工作目录重新选择模型。';
const runner: HookSessionRunner = {
isBusy: () => false,
inspect: async () => null,
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.ts
index a2a7e073db..983d8291de 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
@@ -3255,6 +3255,19 @@ describe('providerId(来源/供应商)贯通 —— issue #854 回归', () => {
expect(fakeMaker.createSession).not.toHaveBeenCalled();
});
+ it('残留来源提供该模型但已停用时不换账号, 仍拒绝', async () => {
+ h.getWorkspaceProviderSource.mockReturnValue('sub');
+ h.getWorkspacePref.mockReturnValue(inheritedPref);
+ h.listProviders.mockResolvedValueOnce([
+ connectedProvider('xd', [catalogModel('test-model')]),
+ connectedProvider('sub', [{ ...catalogModel('test-model'), disabled: true }]),
+ ]);
+ const runner = createMakerHookSessionRunner({ log });
+
+ await expect(runner.run(xChatReq())).rejects.toThrow('selected provider "sub"');
+ expect(fakeMaker.createSession).not.toHaveBeenCalled();
+ });
+
it('残留来源账号已断开时不换账号, 仍拒绝', async () => {
h.getWorkspaceProviderSource.mockReturnValue('openai');
h.getWorkspacePref.mockReturnValue(inheritedPref);
diff --git a/apps/desktop/src/main/hook-control/__tests__/workspacePrefsStore.test.ts b/apps/desktop/src/main/hook-control/__tests__/workspacePrefsStore.test.ts
index 5a270a8554..9a8e2d6884 100644
--- a/apps/desktop/src/main/hook-control/__tests__/workspacePrefsStore.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/workspacePrefsStore.test.ts
@@ -26,6 +26,10 @@ import {
resolveWorkspacePrefOverrides,
setWorkspacePref,
} from '../workspacePrefsStore';
+import {
+ getWorkspaceProviderSource,
+ setWorkspaceProviderSource,
+} from '../workspaceProviderSourceStore';
describe('workspacePrefsStore', () => {
beforeEach(() => {
@@ -666,3 +670,63 @@ describe('resolveWorkspacePrefOverrides', () => {
expect(resolveWorkspacePrefOverrides(null, dispatched, false)).toEqual(dispatched);
});
});
+
+describe('server 快照改模型时清理配对来源(issue #5912)', () => {
+ beforeEach(() => {
+ tmp.dir = fs.mkdtempSync(path.join(os.tmpdir(), 'wprefs-src-'));
+ });
+ afterEach(() => {
+ fs.rmSync(tmp.dir, { recursive: true, force: true });
+ });
+
+ const row = (workspace: string, model: string | null) => ({
+ workspace,
+ model,
+ effort: null,
+ agentKind: model === null ? null : 'claude-code',
+ permissionMode: null,
+ });
+ const syncedPref = (workspace: string, model: string) => {
+ const saved = setWorkspacePref('x', null, workspace, { model, agentKind: 'codex' });
+ markWorkspacePrefMirrored('x', null, workspace, saved.rev);
+ };
+
+ it('主动推送清空 / 改掉已同步的目录模型: 同键来源清除, 模型未变的目录来源保留', () => {
+ syncedPref('chat', 'gpt-test');
+ syncedPref('repo', 'gpt-test');
+ syncedPref('same', 'gpt-test');
+ setWorkspaceProviderSource('x', null, 'chat', 'openai');
+ setWorkspaceProviderSource('x', null, 'repo', 'openai');
+ setWorkspaceProviderSource('x', null, 'same', 'openai');
+
+ applyIncomingServerWorkspacePrefs('x', [
+ row('repo', 'claude-test'),
+ { ...row('same', 'gpt-test'), agentKind: 'codex' },
+ ]);
+
+ expect(getWorkspaceProviderSource('x', null, 'chat')).toBeNull();
+ expect(getWorkspaceProviderSource('x', null, 'repo')).toBeNull();
+ expect(getWorkspaceProviderSource('x', null, 'same')).toBe('openai');
+ });
+
+ it('重连镜像(reconcile)落快照同样清理: 离线期间 /model 改了模型', () => {
+ reconcileWorkspacePrefsForMirror('x', []);
+ syncedPref('chat', 'gpt-test');
+ setWorkspaceProviderSource('x', null, 'chat', 'openai');
+
+ reconcileWorkspacePrefsForMirror('x', [row('chat', 'claude-test')]);
+
+ expect(getWorkspacePref('x', null, 'chat').model).toBe('claude-test');
+ expect(getWorkspaceProviderSource('x', null, 'chat')).toBeNull();
+ });
+
+ it('本机尚未镜像的写入优先, 快照不改模型, 刚选的来源不被清', () => {
+ setWorkspacePref('x', null, 'chat', { model: 'gpt-test', agentKind: 'codex' });
+ setWorkspaceProviderSource('x', null, 'chat', 'openai');
+
+ applyIncomingServerWorkspacePrefs('x', [row('chat', 'claude-test')]);
+
+ expect(getWorkspacePref('x', null, 'chat').model).toBe('gpt-test');
+ expect(getWorkspaceProviderSource('x', null, 'chat')).toBe('openai');
+ });
+});
diff --git a/apps/desktop/src/main/hook-control/ipc.ts b/apps/desktop/src/main/hook-control/ipc.ts
index 8f2cdbc265..c68c27663f 100644
--- a/apps/desktop/src/main/hook-control/ipc.ts
+++ b/apps/desktop/src/main/hook-control/ipc.ts
@@ -44,7 +44,6 @@ import {
requireString,
} from '../utils/ipcValidate.js';
import {
- clearWorkspaceProviderSourcesForRemoteModelChanges,
listWorkspaceProviderSources,
setWorkspaceProviderSource,
} from './workspaceProviderSourceStore.js';
@@ -319,29 +318,36 @@ function broadcastWorkspaceProviderSources(entries: ReturnType<typeof listWorksp
}
}
-/** 远端快照改了目录模型时, 同键来源随之作废(issue #5912); 失败只记日志, 不挡快照落地。 */
-function clearProviderSourcesAfterRemoteModelChange(
- channel: HookPrefsChannel,
- before: HookWorkspacePrefs[],
- after: HookWorkspacePrefs[],
-): void {
+/**
+ * server 快照落地可能清掉配对来源(applyIncomingServerWorkspacePrefs, issue #5912),
+ * 落地后把现有条目推给设置页; 给了落地前快照时只在有变化时推。
+ */
+function rebroadcastWorkspaceProviderSources(before?: string): void {
try {
- const entries = clearWorkspaceProviderSourcesForRemoteModelChanges(channel, before, after);
- if (entries === null) return;
- log.info(`workspace provider source cleared after remote model change (${channel})`);
- broadcastWorkspaceProviderSources(entries);
+ const entries = listWorkspaceProviderSources();
+ if (before === undefined || JSON.stringify(entries) !== before) {
+ broadcastWorkspaceProviderSources(entries);
+ }
} catch (err) {
log.warn(
- `workspace provider source cleanup (${channel}) failed: ${err instanceof Error ? err.message : String(err)}`,
+ `workspace provider source broadcast failed: ${err instanceof Error ? err.message : String(err)}`,
);
}
}
+function snapshotWorkspaceProviderSources(): string {
+ try {
+ return JSON.stringify(listWorkspaceProviderSources());
+ } catch {
+ return '';
+ }
+}
+
function persistUnsolicitedServerPrefs(channel: HookPrefsChannel, prefs: HookWorkspacePrefs[]): void {
try {
- const before = listWorkspacePrefs(channel);
- const after = applyIncomingServerWorkspacePrefs(channel, prefs);
- clearProviderSourcesAfterRemoteModelChange(channel, before, after);
+ const sourcesBefore = snapshotWorkspaceProviderSources();
+ applyIncomingServerWorkspacePrefs(channel, prefs);
+ rebroadcastWorkspaceProviderSources(sourcesBefore);
remotePrefsSnapshotGenerations.set(
channel,
(remotePrefsSnapshotGenerations.get(channel) ?? 0) + 1,
@@ -401,6 +407,8 @@ const mirrorWorkspacePrefs = createWorkspacePrefsMirror({
onLocalPrefsChanged: (channel) => {
if (channel === 'slack') broadcastPrefs(slackLocalPrefsView());
else broadcastProviderPrefs(providerLocalPrefsView(channel));
+ // 重连镜像同样经 applyIncomingServerWorkspacePrefs 落快照, 可能清掉配对来源(issue #5912)。
+ rebroadcastWorkspaceProviderSources();
},
onError: (channel, err) => {
log.warn(
diff --git a/apps/desktop/src/main/hook-control/session-runner.ts b/apps/desktop/src/main/hook-control/session-runner.ts
index c5a7b34af0..b4d1c8f587 100644
--- a/apps/desktop/src/main/hook-control/session-runner.ts
+++ b/apps/desktop/src/main/hook-control/session-runner.ts
@@ -46,6 +46,7 @@ import type {
} from '@cindy/maker-core';
import {
effectiveSourceIdForModel,
+ providerOffersModel,
type ProviderView,
visibleModelUnion,
} from '@cindy/model-providers';
@@ -160,7 +161,7 @@ function mainOwnedChannelOrigin(value: string | undefined): TurnPermissionOrigin
}
/** 路由不可用时附在错误后的恢复指引(渠道回帖与 request ledger 都看得到)。 */
-const ROUTE_RESELECT_HINT = '。请在 设置 → 远程连接 中为这个渠道重新选择模型。';
+const ROUTE_RESELECT_HINT = '。请在 设置 → IM 机器人 中为这个渠道的工作目录重新选择模型。';
/**
* 新会话 agent/model/effort/permissionMode/providerId 合成: IM provider 按目录偏好
@@ -240,15 +241,19 @@ async function resolveNewSessionConfig(
? getWorkspaceProviderSource(channel, workspaceCtx.teamId, workspaceCtx.alias)
: null;
// 目录来源是和目录模型一起选的(issue #5912)。目录模型为空、改为继承 IM 默认时,
- // 残留来源若账号仍可用、只是不提供这个继承来的模型,它已不再描述用户可见的选择 ——
- // 设置页显示的就是继承模型 —— 按 IM 默认自己的来源路由。来源账号本身断开 / 停用
- // 时不在此放行,仍走下方「显式来源失效不换账号」。
+ // 残留来源若账号仍可用、只是目录里根本没有这个继承来的模型,它已不再描述用户可见的
+ // 选择 —— 设置页显示的就是继承模型 —— 按 IM 默认自己的来源路由。来源账号断开 /
+ // 停用,或它提供该模型但模型 / 运行路径被停用、退役时不在此放行,仍走下方「显式来源
+ // 失效不换账号」。
+ const workdirSource =
+ providers !== null && workdirProviderId !== null && mergedOverrides.model === null
+ ? providers.find((p) => p.id === workdirProviderId)
+ : undefined;
const staleWorkdirSource =
- providers !== null &&
- workdirProviderId !== null &&
- mergedOverrides.model === null &&
- providers.some((p) => p.id === workdirProviderId && p.connected && !p.suspended) &&
- effectiveSourceIdForModel(providers, workdirProviderId, resolved.model, resolved.agentKind) === null;
+ workdirSource !== undefined &&
+ workdirSource.connected === true &&
+ !workdirSource.suspended &&
+ !providerOffersModel(workdirSource, resolved.model, resolved.agentKind);
if (staleWorkdirSource) {
log.warn(
`hook workspace provider source ignored: provider=${workdirProviderId} cannot serve inherited model=${resolved.model} channel=${channel}`,
diff --git a/apps/desktop/src/main/hook-control/workspacePrefsStore.ts b/apps/desktop/src/main/hook-control/workspacePrefsStore.ts
index b7965d3bb5..7b0021d7ea 100644
--- a/apps/desktop/src/main/hook-control/workspacePrefsStore.ts
+++ b/apps/desktop/src/main/hook-control/workspacePrefsStore.ts
@@ -20,6 +20,10 @@ import {
type HookWorkspacePrefs,
} from '../../shared/hookControlIpc.js';
import { ownerScopedImUserDataPath } from '../im/ownerScopedStorage.js';
+import { createLogger } from '../logger.js';
+import { clearWorkspaceProviderSourcesForRemoteModelChanges } from './workspaceProviderSourceStore.js';
+
+const log = createLogger('hook-control');
export type HookPrefsChannel = 'slack' | 'telegram' | 'x';
@@ -519,7 +523,20 @@ export function applyIncomingServerWorkspacePrefs(
throw new Error('too many workspace prefs entries');
}
writeStore(fp, { ...store, entries });
- return prunedChannel.map(toHookPrefs);
+ const next = prunedChannel.map(toHookPrefs);
+ // 主动推送与重连镜像都经这里落 server 快照: 快照改掉的目录模型, 其配对来源
+ // 随之作废(issue #5912)。偏好已落盘, 来源清理失败只记日志, 不让调用方当作
+ // 快照失败重试 —— 重试时模型已无变化, 清理也不会再触发。
+ try {
+ if (clearWorkspaceProviderSourcesForRemoteModelChanges(channel, local.map(toHookPrefs), next)) {
+ log.info(`workspace provider source cleared after remote model change (${channel})`);
+ }
+ } catch (err) {
+ log.warn(
+ `workspace provider source cleanup (${channel}) failed: ${err instanceof Error ? err.message : String(err)}`,
+ );
+ }
+ return next;
}
export interface WorkspacePrefsMirrorCandidate {