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(im): 修复自动选模的远程路由与恢复时序

Dash2b02c4c3ad26
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 8ad81aaa78..80d0ea1e47 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
@@ -77,6 +77,7 @@ const h = vi.hoisted(() => {
getWorkspaceProviderSource: vi.fn((..._args: unknown[]): string | null => null),
agentDeviceId: null as string | null,
readRemoteRoute: vi.fn(),
+ readRemoteAutomaticDefaults: vi.fn(),
readRemotePermissionModes: vi.fn(async () => ['ask', 'bypassPermissions']),
getWorkspacePref: vi.fn((): unknown => null),
isWorkspacePrefsMigrated: vi.fn(() => true),
@@ -277,6 +278,7 @@ vi.mock('../workspaceProviderSourceStore.js', () => ({
}));
vi.mock('../../im/remoteProviderRoute.js', () => ({
readImRemoteProviderRoute: h.readRemoteRoute,
+ readImRemoteAutomaticDefaults: h.readRemoteAutomaticDefaults,
readImRemotePermissionModes: h.readRemotePermissionModes,
}));
vi.mock('../workspacePrefsStore.js', async (importOriginal) => ({
@@ -289,6 +291,7 @@ vi.mock('../../maker-host/createDesktopProviderService.js', () => ({
}));
vi.mock('../../maker-host/model-visibility-mirror.js', () => ({
getModelVisibilityOverride: h.getModelVisibilityOverride,
+ waitForModelVisibilityMirror: vi.fn(async () => {}),
}));
vi.mock('../defaults.js', async (importOriginal) => {
const actual = await importOriginal<typeof import('../defaults.js')>();
@@ -510,6 +513,7 @@ beforeEach(() => {
h.getWorkspaceProviderSource.mockReturnValue(null);
h.agentDeviceId = null;
h.readRemoteRoute.mockReset();
+ h.readRemoteAutomaticDefaults.mockReset();
h.readRemotePermissionModes.mockReset();
h.readRemotePermissionModes.mockResolvedValue(['ask', 'bypassPermissions']);
h.readImDefaultSettings.mockReturnValue({ agentKind: 'claude-code', agents: {
@@ -525,6 +529,48 @@ beforeEach(() => {
});
describe('hook task model selection on next send', () => {
+ // PR #7291 unit: automatic selection must use the execution location and still
+ // reach the existing stale-source rule; previous coverage used pinned defaults.
+ it('creates an automatic remote workspace task and follows its resolved route', async () => {
+ h.useActualDefaults = true;
+ h.readImDefaultSettings.mockReturnValue(IM_DEFAULT_SETTINGS);
+ h.getWorkspaceProviderSource.mockReturnValue('remote-provider');
+ h.agentDeviceId = 'share:owner';
+ const resolved = { ...IM_DEFAULT_SETTINGS, agentKind: 'codex', agents: { ...IM_DEFAULT_SETTINGS.agents,
+ codex: { model: 'remote-model', providerId: 'remote-provider', effort: 'high', agentDeviceId: 'share:owner' },
+ } };
+ h.readRemoteAutomaticDefaults.mockResolvedValue(resolved);
+ h.readRemoteRoute.mockResolvedValue({ model: catalogModel('remote-model') });
+ const req = baseReq({ createOnly: true, workspaceAlias: 'repo', source: { im: 'telegram' } });
+ expect((await createMakerHookSessionRunner({ log }).run(req)).status).toBe('ok');
+ expect(h.readRemoteAutomaticDefaults).toHaveBeenCalledWith(IM_DEFAULT_SETTINGS, {
+ agentDeviceId: 'share:owner', agentKind: undefined, providerId: 'remote-provider',
+ });
+ expect(h.createSessionRow).toHaveBeenCalledWith(expect.objectContaining({ agentKind: 'codex', model: 'remote-model', agentDeviceId: 'share:owner' }));
+ expect(h.writeDefaultRecord.mock.calls[0][1]).toContain('remote-model');
+ h.readRemoteAutomaticDefaults.mockResolvedValue(null);
+ await expect(createMakerHookSessionRunner({ log }).run(req)).rejects.toThrow('no available default model');
+ });
+
+ it.each([true, false])('applies stale workspace source checks after automatic selection (connected=%s)', async (connected) => {
+ h.useActualDefaults = true;
+ h.readImDefaultSettings.mockReturnValue(IM_DEFAULT_SETTINGS);
+ h.getWorkspaceProviderSource.mockReturnValue('old-claude');
+ h.getWorkspacePref.mockReturnValue({ workspace: 'repo', agentKind: 'codex', model: null, effort: null, permissionMode: null });
+ h.listProviders.mockResolvedValue([
+ { ...connectedProvider('old-claude', [catalogModel('old-claude')]), connected },
+ { ...connectedProvider('openai', [catalogModel('gpt-6.1-sol')], 'codex'), access: { kind: 'subscription' } },
+ ]);
+ const run = () => createMakerHookSessionRunner({ log }).run(baseReq({ createOnly: true, workspaceAlias: 'repo', source: { im: 'telegram' } }));
+ if (connected) {
+ expect((await run()).status).toBe('ok');
+ expect(h.createSessionRow).toHaveBeenCalledWith(expect.objectContaining({ agentKind: 'codex', model: 'gpt-6.1-sol' }));
+ expect(h.setSessionProviderIdInDb).toHaveBeenCalledWith('sess-new', 'openai');
+ } else {
+ await expect(run()).rejects.toThrow('selected provider "old-claude"');
+ expect(h.createSessionRow).not.toHaveBeenCalled();
+ }
+ });
// Regression #6493: createSession options do not hydrate Claude's bridge.
// Exercise the production runner + routing transform at provider startup,
// with no profile switch, both after restart and when clearing old axes (unit).
diff --git a/apps/desktop/src/main/hook-control/session-runner.ts b/apps/desktop/src/main/hook-control/session-runner.ts
index 1b838b4d50..837d4a9333 100644
--- a/apps/desktop/src/main/hook-control/session-runner.ts
+++ b/apps/desktop/src/main/hook-control/session-runner.ts
@@ -107,7 +107,8 @@ import { ingestMedia, supportedMime as isCindyMediaMime } from '../cindy-media/i
import { worktreeStore, WorktreeManager } from '../worktree/index.js';
import { readImDefaultSettings } from '../im/defaultSettingsStore.js';
import { isImDefaultPermissionMode } from '../../shared/imDefaultSettings.js';
-import { readImRemotePermissionModes, readImRemoteProviderRoute } from '../im/remoteProviderRoute.js';
+import { readImRemoteAutomaticDefaults, readImRemotePermissionModes, readImRemoteProviderRoute } from '../im/remoteProviderRoute.js';
+import { resolveImAutomaticDefaults } from '../im/defaultSessionSettings.js';
import { getWorkspaceProviderRoute } from './workspaceProviderSourceStore.js';
import {
getWorkspacePref,
@@ -143,7 +144,7 @@ import {
type HookSessionRunner,
} from './dispatcher.js';
import { resolveHookSessionConfig, type ResolvedHookSessionConfig } from './defaults.js';
-import { resolveAutomaticImSettings, resolvedImDefaultFingerprint, usesAutomaticImModel } from '../../shared/imAutomaticModel.js';
+import { resolvedImDefaultFingerprint, usesAutomaticImModel } from '../../shared/imAutomaticModel.js';
import { decodeAttachments, sanitizeAttachmentName } from './attachments.js';
import {
cancelHookInteraction,
@@ -261,12 +262,18 @@ async function resolveNewSessionConfig(
let defaults = imDefaults;
const selectedAgent = mergedOverrides.agentKind;
const selectedDefaultAgent = selectedAgent === 'claude-code' || selectedAgent === 'codex' || selectedAgent === 'pi' ? selectedAgent : imDefaults.agentKind;
- const automatic = usesAutomaticImModel({ ...imDefaults, agentKind: selectedDefaultAgent }) && mergedOverrides.model === null && !workdirRoute?.agentDeviceId;
+ const automatic = usesAutomaticImModel({ ...imDefaults, agentKind: selectedDefaultAgent }) && mergedOverrides.model === null;
if (automatic) {
- const resolved = providers && resolveAutomaticImSettings(imDefaults, providers, {
- agentKind: selectedAgent === 'claude-code' || selectedAgent === 'codex' || selectedAgent === 'pi' ? selectedAgent : undefined,
- providerId: workdirProviderId,
- });
+ const automaticAgent = selectedAgent === 'claude-code' || selectedAgent === 'codex' || selectedAgent === 'pi' ? selectedAgent : undefined;
+ const remoteDeviceId = workdirRoute?.agentDeviceId ?? imDefaults.agents[selectedDefaultAgent].agentDeviceId;
+ const resolved = remoteDeviceId
+ ? await readImRemoteAutomaticDefaults(imDefaults, {
+ agentDeviceId: remoteDeviceId, agentKind: automaticAgent,
+ providerId: workdirRoute?.providerId ?? imDefaults.agents[selectedDefaultAgent].providerId,
+ })
+ // Workspace sources are paired with their former model. Resolve the inherited
+ // model first, then apply the existing stale-source checks below.
+ : await resolveImAutomaticDefaults(imDefaults, undefined, providers, automaticAgent);
if (!resolved) throw new Error(`${HOOK_ROUTE_UNAVAILABLE_PREFIX} no available default model${ROUTE_RESELECT_HINT}`);
defaults = resolved;
}
@@ -295,7 +302,8 @@ async function resolveNewSessionConfig(
getPermissionModes: () => requestedPermissionMode === null ? [] : [requestedPermissionMode],
log,
}, { ...mergedOverrides, agentKind: requestedAgent, model: requestedModel });
- return { ...remote, agentDeviceId, providerId, fingerprint };
+ return { ...remote, agentDeviceId, providerId,
+ fingerprint: automatic ? resolvedImDefaultFingerprint(fingerprint, defaults) : fingerprint };
}
const resolved = resolveHookSessionConfig(
diff --git a/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts b/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts
index 4ee46f229d..e33b70c0ec 100644
--- a/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts
+++ b/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts
@@ -28,6 +28,7 @@ vi.mock('../remoteProviderRoute', () => ({ readImRemoteProviderRoute: mocks.read
import { projectImDefaultSettings, resolveImSessionDefaults } from '../defaultSessionSettings';
import { IM_DEFAULT_SETTINGS } from '../../../shared/imDefaultSettings';
import type { ImOrchestratorConfig } from '../shared/types';
+import { setModelVisibilityMirror } from '../../maker-host/model-visibility-mirror';
const config: ImOrchestratorConfig = {
agentKind: 'claude-code',
@@ -116,6 +117,24 @@ const customCodexModel = {
};
describe('resolveImSessionDefaults', () => {
+ // PR #7291 unit: automatic selection must honor per-source visibility in both
+ // factory recommendations and custom-provider fallback; previous tests had no overrides.
+ it.each([false, true])('excludes hidden automatic models, including fallback (custom=%s)', async (custom) => {
+ mocks.readImDefaultSettings.mockReturnValue(IM_DEFAULT_SETTINGS);
+ const provider = { ...providers[1], id: custom ? 'custom' : 'openai',
+ source: custom ? 'user' : 'builtin', access: { kind: 'subscription' },
+ models: { codex: [
+ { ...openAiCodexModels[0], id: 'gpt-6.1-sol', sortOrder: 1 },
+ { ...openAiCodexModels[0], id: 'shown-model', sortOrder: 2 },
+ ] },
+ };
+ setModelVisibilityMirror({ [`codex:${provider.id}:gpt-6.1-sol`]: false }, { fallback: true });
+ mocks.listProviders.mockResolvedValue([provider]);
+ await expect(resolveImSessionDefaults(config)).resolves.toMatchObject({ model: 'shown-model' });
+ setModelVisibilityMirror({ [`codex:${provider.id}:gpt-6.1-sol`]: false,
+ [`codex:${provider.id}:shown-model`]: false }, { fallback: true });
+ await expect(resolveImSessionDefaults(config)).rejects.toThrow('no available chat model');
+ });
// Unit: old fixed IM defaults ignored catalog updates; exercise the real creation resolver.
it('resolves automatic defaults from the live catalog without persisting a model snapshot', async () => {
mocks.readImDefaultSettings.mockReturnValue(IM_DEFAULT_SETTINGS);
@@ -178,6 +197,7 @@ describe('resolveImSessionDefaults', () => {
});
beforeEach(() => {
vi.clearAllMocks();
+ setModelVisibilityMirror({}, { fallback: true });
mocks.getCapabilities.mockImplementation((agentKind: string) => ({
availableModels: agentKind === 'codex' ? codexModels : claudeModels,
}));
diff --git a/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts b/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts
index 8f9abafba8..f48b132f22 100644
--- a/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts
+++ b/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts
@@ -2,7 +2,8 @@ import { beforeEach, expect, it, vi } from 'vitest';
const invoke = vi.hoisted(() => vi.fn());
vi.mock('../../device-link', () => ({ remoteBackgroundInvoke: invoke }));
-import { readImRemotePermissionModes, readImRemoteProviderRoute } from '../remoteProviderRoute';
+import { readImRemoteAutomaticDefaults, readImRemotePermissionModes, readImRemoteProviderRoute } from '../remoteProviderRoute';
+import { IM_DEFAULT_SETTINGS } from '../../../shared/imDefaultSettings';
const route = { agentDeviceId: 'share:owner', agentKind: 'codex' as const, providerId: 'openai', model: 'shared-model' };
const provider = {
@@ -11,6 +12,23 @@ const provider = {
models: { codex: [{ id: 'shared-model', name: 'Shared model', efforts: ['high'], defaultEffort: 'high' }] },
};
beforeEach(() => invoke.mockReset());
+// PR #7291 unit: remote workspace with no model used to resolve an empty ID locally.
+// Exercise its real authorized catalog read, including visibility and unavailable sharing.
+it('resolves automatic defaults only from visible, authorized remote models', async () => {
+ invoke.mockResolvedValue({ ok: true, result: { providers: [
+ { ...provider, id: 'private', remoteInvocationEnabled: false },
+ { ...provider, auth: { method: 'managed' }, models: { codex: [
+ { id: 'hidden', efforts: ['high'] }, ...provider.models.codex,
+ ] } },
+ ], modelVisibilityOverrides: { 'codex:openai:hidden': false } } });
+ const options = { agentDeviceId: 'share:owner', providerId: 'openai' };
+ await expect(readImRemoteAutomaticDefaults(IM_DEFAULT_SETTINGS, options)).resolves.toMatchObject({
+ agentKind: 'codex', agents: { codex: { agentDeviceId: 'share:owner', providerId: 'openai', model: 'shared-model' } },
+ });
+ await expect(readImRemoteAutomaticDefaults(IM_DEFAULT_SETTINGS, { ...options, providerId: 'private' })).resolves.toBeNull();
+ invoke.mockResolvedValue({ ok: false, error: { message: '[REMOTE_AGENT_SHARE_REMOVED] removed' } });
+ await expect(readImRemoteAutomaticDefaults(IM_DEFAULT_SETTINGS, options)).rejects.toThrow('REMOTE_AGENT_SHARE_REMOVED');
+});
it('reads permission modes from the execution host', async () => {
invoke.mockResolvedValue({ ok: true, result: { permissionModes: [{ id: 'ask' }, { id: 'auto' }] } });
await expect(readImRemotePermissionModes('share:owner', 'pi')).resolves.toEqual(['ask', 'auto']);
diff --git a/apps/desktop/src/main/im/defaultSessionSettings.ts b/apps/desktop/src/main/im/defaultSessionSettings.ts
index b80e028c8d..484098f07b 100644
--- a/apps/desktop/src/main/im/defaultSessionSettings.ts
+++ b/apps/desktop/src/main/im/defaultSessionSettings.ts
@@ -14,6 +14,7 @@ import {
effectiveSourceIdForModel,
getModel,
isModelSelectableForNewRoute,
+ isModelVisible,
movedCindyAutoSourceId,
type ProviderView,
} from '@cindy/model-providers';
@@ -38,6 +39,7 @@ import { getMaker } from '../maker-host';
import { getDesktopProviderService } from '../maker-host/createDesktopProviderService';
import { readImDefaultSettings } from './defaultSettingsStore';
import { readImRemoteProviderRoute } from './remoteProviderRoute';
+import { getModelVisibilityOverride, waitForModelVisibilityMirror } from '../maker-host/model-visibility-mirror';
import { fingerprintImDefaultSettings, type ImDefaultRoute } from './shared/channelDefaultRoute';
import type { ImOrchestratorConfig } from './shared/types';
@@ -52,8 +54,11 @@ export async function resolveImAutomaticDefaults<T extends ImDefaultSettings>(
): Promise<T | null> {
const providers = providerSnapshot === undefined ? await listProvidersForDefaults() : providerSnapshot;
if (!providers) return null;
+ await waitForModelVisibilityMirror();
return resolveAutomaticImSettings(raw, providers, {
agentKind,
+ isModelEnabled: (agent, providerId, model) => isModelVisible(
+ getModelVisibilityOverride(agent, providerId, model.id), model.defaultEnabled),
allowAgent: channel && isUnconditionalTurnPolicyChannel(channel)
? (agent) => getMaker().getCapabilities(agent).turnPermissionPolicy?.supported.supported === true
: undefined,
diff --git a/apps/desktop/src/main/im/remoteProviderRoute.ts b/apps/desktop/src/main/im/remoteProviderRoute.ts
index 3f58b8afdb..7c4c9a1acf 100644
--- a/apps/desktop/src/main/im/remoteProviderRoute.ts
+++ b/apps/desktop/src/main/im/remoteProviderRoute.ts
@@ -1,16 +1,57 @@
import type { AgentKind } from '@cindy/maker-core';
-
+import { resolveAutomaticImSettings } from '../../shared/imAutomaticModel';
+import type { ImDefaultSettings } from '../../shared/imDefaultSettings';
+import { readDeviceProviderViews } from '../remote-agent/controller/deviceCatalog';
export { readRemoteProviderRoute as readImRemoteProviderRoute } from '../remote-agent/controller/deviceCatalog';
+/** Automatic routes are resolved only from the execution host's authorized, visible catalog. */
+export async function readImRemoteAutomaticDefaults<T extends ImDefaultSettings>(
+ settings: T,
+ options: {
+ agentDeviceId: string;
+ agentKind?: AgentKind;
+ providerId?: string | null;
+ },
+): Promise<T | null> {
+ const { remoteBackgroundInvoke } = await import('../device-link');
+ const providers = await readDeviceProviderViews(remoteBackgroundInvoke, options.agentDeviceId, {
+ visibleOnly: true,
+ });
+ const resolved = resolveAutomaticImSettings(settings, providers, options);
+ if (!resolved) return null;
+ return {
+ ...resolved,
+ agents: {
+ ...resolved.agents,
+ [resolved.agentKind]: {
+ ...resolved.agents[resolved.agentKind],
+ agentDeviceId: options.agentDeviceId,
+ },
+ },
+ };
+}
+
/** 权限档也取执行端能力,发起电脑可能没有安装该引擎。 */
-export async function readImRemotePermissionModes(agentDeviceId: string, agentKind: AgentKind): Promise<string[]> {
+export async function readImRemotePermissionModes(
+ agentDeviceId: string,
+ agentKind: AgentKind,
+): Promise<string[]> {
const { remoteBackgroundInvoke } = await import('../device-link');
- const response = await remoteBackgroundInvoke(agentDeviceId, 'maker:get-capabilities', [agentKind]);
- if (!response.ok) throw new Error(response.error?.message ?? 'Remote agent capabilities unavailable');
+ const response = await remoteBackgroundInvoke(agentDeviceId, 'maker:get-capabilities', [
+ agentKind,
+ ]);
+ if (!response.ok)
+ throw new Error(response.error?.message ?? 'Remote agent capabilities unavailable');
const modes = (response.result as { permissionModes?: unknown } | null)?.permissionModes;
- if (!Array.isArray(modes) || !modes.length || !modes.every((mode) =>
- mode && typeof mode === 'object' && typeof mode.id === 'string' && mode.id.length > 0)) {
+ if (
+ !Array.isArray(modes) ||
+ !modes.length ||
+ !modes.every(
+ (mode) =>
+ mode && typeof mode === 'object' && typeof mode.id === 'string' && mode.id.length > 0,
+ )
+ ) {
throw new Error('Invalid remote agent permission modes');
}
return modes.map((mode) => mode.id);
diff --git a/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts b/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
index 4e25221f39..3970c2dfa5 100644
--- a/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
+++ b/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
@@ -8,7 +8,7 @@
* 换模型、协同 Worker、定时任务的默认来源都只能落在这些供应商上。
*/
import { CONTROLLER_CAPABILITY_PROVIDER_LOGO_KINDS_V2 } from '@cindy/device-link';
-import { effectiveSourceIdForModel, getModel, isModelSelectableForNewRoute, remoteInvocationModels, type ProviderView, type AgentKind } from '@cindy/model-providers';
+import { effectiveSourceIdForModel, getModel, isModelSelectableForNewRoute, isModelVisible, remoteInvocationModels, type ProviderView, type AgentKind } from '@cindy/model-providers';
type RemoteInvoke = (
deviceId: string,
@@ -49,14 +49,25 @@ export function parseDeviceProviderViews(value: unknown): ProviderView[] {
}
/** 读那台电脑允许被远程调用的供应商视图。 */
-export async function readDeviceProviderViews(invoke: RemoteInvoke, deviceId: string): Promise<ProviderView[]> {
+export async function readDeviceProviderViews(invoke: RemoteInvoke, deviceId: string, options: { visibleOnly?: boolean } = {}): Promise<ProviderView[]> {
const result = await invoke(deviceId, 'maker:provider:list', [
{ capabilities: [CONTROLLER_CAPABILITY_PROVIDER_LOGO_KINDS_V2] },
]);
if (!result.ok) {
throw Object.assign(new Error(result.error?.message ?? 'provider list unavailable'), { code: result.error?.code });
}
- return parseDeviceProviderViews(result.result).filter((view) => view.remoteInvocationEnabled === true).map(remoteInvocationModels);
+ const providers = parseDeviceProviderViews(result.result).filter((view) => view.remoteInvocationEnabled === true).map(remoteInvocationModels);
+ if (!options.visibleOnly) return providers;
+ const visibility = isRecord(result.result) && isRecord(result.result.modelVisibilityOverrides)
+ ? result.result.modelVisibilityOverrides : {};
+ return providers.map((provider) => ({ ...provider, models: {
+ ...provider.models,
+ ...Object.fromEntries(provider.agents.map((agent) => [agent,
+ (provider.models[agent] ?? []).filter((model) => {
+ const override = visibility[`${agent}:${provider.id}:${model.id}`];
+ return isModelVisible(typeof override === 'boolean' ? override : undefined, model.defaultEnabled);
+ }).map((model) => ({ ...model, defaultEnabled: true }))])),
+ } }));
}
/** 与普通任务共用授权目录;失败不回落到本机的同名供应商。 */
diff --git a/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx b/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx
index 0489e7cc21..2028532586 100644
--- a/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx
@@ -12,7 +12,7 @@ import {
isModelSelectableForNewRoute,
} from '@cindy/model-providers';
import { MessageSquare, AlertTriangle } from 'lucide-react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ModelSelector } from '@/components/new-chat/ModelSelector';
@@ -78,6 +78,7 @@ export function ImDefaultSettingsSection({
const { t } = useTranslation();
const [settings, setSettings] = useState<ImDefaultSettingsState | null>(null);
const [pending, setPending] = useState(false);
+ const settingsRequestVersion = useRef(0);
const agentDeviceId = settings?.agents[settings.agentKind].agentDeviceId ?? null;
const local = useProviders();
const remote = useDeviceProviders(agentDeviceId ?? undefined);
@@ -91,12 +92,13 @@ export function ImDefaultSettingsSection({
useEffect(() => {
let cancelled = false;
+ const version = ++settingsRequestVersion.current;
setSettings(null);
setPending(false);
void window.electronAPI.maker
.imDefaultSettingsGet(channel)
.then((state) => {
- if (!cancelled) setSettings(state);
+ if (!cancelled && version === settingsRequestVersion.current) setSettings(state);
})
.catch((err) => {
if (!cancelled) {
@@ -105,6 +107,7 @@ export function ImDefaultSettingsSection({
});
return () => {
cancelled = true;
+ if (version === settingsRequestVersion.current) settingsRequestVersion.current++;
};
}, [channel, t]);
@@ -179,18 +182,20 @@ export function ImDefaultSettingsSection({
// A displayed automatic route may use a different engine than the stored empty default.
if (patch.agents && !patch.agentKind) patch = { ...patch, agentKind: settings.agentKind };
const previous = settings;
+ const version = ++settingsRequestVersion.current;
setPending(true);
setSettings(mergeSettingsPatch(settings, patch));
try {
const next = await window.electronAPI.maker.imDefaultSettingsSet(patch, channel);
- setSettings(next);
+ if (version === settingsRequestVersion.current) setSettings(next);
return true;
} catch (err) {
+ if (version !== settingsRequestVersion.current) return false;
setSettings(previous);
toast.error(err instanceof Error ? err.message : t('settings.imBot.defaults.saveFailed'));
return false;
} finally {
- setPending(false);
+ if (version === settingsRequestVersion.current) setPending(false);
}
},
[channel, pending, settings, t],
@@ -198,17 +203,39 @@ export function ImDefaultSettingsSection({
const reset = useCallback(async () => {
if (pending) return;
+ const version = ++settingsRequestVersion.current;
setPending(true);
try {
- setSettings(await window.electronAPI.maker.imDefaultSettingsReset(channel));
+ const next = await window.electronAPI.maker.imDefaultSettingsReset(channel);
+ if (version !== settingsRequestVersion.current) return;
+ setSettings(next);
toast.success(t('settings.defaults.restored'));
} catch (err) {
+ if (version !== settingsRequestVersion.current) return;
toast.error(err instanceof Error ? err.message : t('settings.defaults.restoreFailed'));
} finally {
- setPending(false);
+ if (version === settingsRequestVersion.current) setPending(false);
}
}, [channel, pending, t]);
+ const automaticMode =
+ settings?.automaticModel ?? (settings ? !settings.agents[settings.agentKind].model : false);
+ useEffect(() => {
+ if (!automaticMode || pending || local.loading) return;
+ const version = ++settingsRequestVersion.current;
+ void window.electronAPI.maker
+ .imDefaultSettingsGet(channel)
+ .then((next) => {
+ if (version === settingsRequestVersion.current) setSettings(next);
+ })
+ .catch(() => {
+ // Retain the last display snapshot; normal settings writes report their own errors.
+ });
+ return () => {
+ if (version === settingsRequestVersion.current) settingsRequestVersion.current++;
+ };
+ }, [automaticMode, channel, local.loading, local.providers, pending]);
+
if (!settings) {
return (
<div
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx
index df84231b36..0f3cc6a829 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx
@@ -1,11 +1,14 @@
// @vitest-environment jsdom
-import { cleanup, render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { act, cleanup, render, screen, fireEvent, waitFor } from '@testing-library/react';
+import type { ProviderView } from '@cindy/model-providers';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { IM_DEFAULT_SETTINGS, type ImDefaultSettingsState } from '../../../../shared/imDefaultSettings';
import { ImDefaultSettingsSection } from '../ImDefaultSettingsSection';
const capabilityMockState = vi.hoisted(() => ({
+ providers: [] as ProviderView[],
+ providersLoading: false,
loadingAgent: null as string | null,
errorAgent: null as string | null,
piTurnPermissionPolicy: null as {
@@ -57,7 +60,7 @@ vi.mock('@/hooks/useAgentCapabilities', () => {
});
vi.mock('@/hooks/useProviders', () => ({
- useProviders: () => ({ providers: [] }),
+ useProviders: () => ({ providers: capabilityMockState.providers, loading: capabilityMockState.providersLoading }),
}));
vi.mock('@/hooks/useAvailableAgents', () => ({
@@ -103,9 +106,47 @@ function defaults(agentKind: ImDefaultSettingsState['agentKind']): ImDefaultSett
}
describe('ImDefaultSettingsSection Pi channel warning', () => {
+ // PR #7291 unit: real settings component gets a catalog after its initial empty
+ // read, then a late refresh races a manual save. Previously the display never refreshed.
+ it('refreshes automatic models after catalog loading and protects a newer manual selection', async () => {
+ const summary = vi.fn();
+ const automatic = { ...defaults('codex'), automaticModel: true };
+ automatic.agents.codex.model = '';
+ capabilityMockState.providersLoading = true;
+ let displayed = automatic;
+ let pendingRead: Promise<ImDefaultSettingsState> | null = null;
+ const get = vi.fn(() => pendingRead ?? Promise.resolve(displayed));
+ window.electronAPI.maker.imDefaultSettingsGet = get;
+ const saved = { ...defaults('codex'), automaticModel: false };
+ saved.agents.codex.model = 'gpt-5.5';
+ window.electronAPI.maker.imDefaultSettingsSet = vi.fn(async () => saved);
+ const view = render(<ImDefaultSettingsSection channel="feishu" onSummaryChange={summary} />);
+ await screen.findByText('settings.imBot.defaults.automaticUnavailable');
+ displayed = { ...automatic, agents: { ...automatic.agents,
+ codex: { ...automatic.agents.codex, model: 'new-recommendation' },
+ } };
+ capabilityMockState.providersLoading = false;
+ capabilityMockState.providers = [];
+ view.rerender(<ImDefaultSettingsSection channel="feishu" onSummaryChange={summary} />);
+ await waitFor(() => expect(summary).toHaveBeenLastCalledWith({ agentKind: 'codex', model: 'new-recommendation' }));
+ let finishRead!: (state: ImDefaultSettingsState) => void;
+ pendingRead = new Promise((resolve) => { finishRead = resolve; });
+ const priorReads = get.mock.calls.length;
+ capabilityMockState.providers = [];
+ view.rerender(<ImDefaultSettingsSection channel="feishu" onSummaryChange={summary} />);
+ await waitFor(() => expect(get.mock.calls.length).toBeGreaterThan(priorReads));
+ fireEvent.click(screen.getByTestId('select-codex'));
+ await waitFor(() => expect(summary).toHaveBeenLastCalledWith({ agentKind: 'codex', model: 'gpt-5.5' }));
+ await act(async () => { finishRead(displayed); });
+ expect(summary).toHaveBeenLastCalledWith({ agentKind: 'codex', model: 'gpt-5.5' });
+ expect(screen.queryByText('settings.imBot.defaults.automatic')).toBeNull();
+ });
it('restores automatic selection without saving the displayed model or resetting permissions', async () => {
const automatic = { ...defaults('codex'), automaticModel: true };
- const save = vi.fn(async (_patch: unknown) => automatic);
+ const save = vi.fn(async (_patch: unknown) => {
+ window.electronAPI.maker.imDefaultSettingsGet = vi.fn(async () => automatic);
+ return automatic;
+ });
window.electronAPI.maker.imDefaultSettingsSet = save;
render(<ImDefaultSettingsSection channel="feishu" />);
fireEvent.click(await screen.findByText('settings.imBot.defaults.useAutomatic'));
@@ -139,6 +180,8 @@ describe('ImDefaultSettingsSection Pi channel warning', () => {
});
beforeEach(() => {
+ capabilityMockState.providers = [];
+ capabilityMockState.providersLoading = false;
capabilityMockState.loadingAgent = null;
capabilityMockState.errorAgent = null;
capabilityMockState.piTurnPermissionPolicy = null;
diff --git a/apps/desktop/src/shared/imAutomaticModel.ts b/apps/desktop/src/shared/imAutomaticModel.ts
index f4c6555621..a9bc38ba64 100644
--- a/apps/desktop/src/shared/imAutomaticModel.ts
+++ b/apps/desktop/src/shared/imAutomaticModel.ts
@@ -24,20 +24,40 @@ export function resolveAutomaticImSettings<T extends ImDefaultSettings>(
agentKind?: ImDefaultAgentKind;
providerId?: string | null;
allowAgent?: (agent: ImDefaultAgentKind) => boolean;
+ isModelEnabled?: Parameters<typeof resolveNewMakerDefaultTuple>[0]['isModelEnabled'];
} = {},
): T | null {
const agents = (['claude-code', 'codex', 'pi'] as const).filter(
(agent) =>
(!options.agentKind || options.agentKind === agent) && (options.allowAgent?.(agent) ?? true),
);
- const scoped = options.providerId
+ const selectedProviders = options.providerId
? providers.filter((p) => p.id === options.providerId)
: providers;
+ // Filter both recommendation and fallback; the latter permits catalog-hidden models
+ // when an entire provider is hidden, which must not override explicit visibility here.
+ const scoped = options.isModelEnabled
+ ? selectedProviders.map((provider) => ({
+ ...provider,
+ models: {
+ ...provider.models,
+ ...Object.fromEntries(
+ agents.map((agent) => [
+ agent,
+ (provider.models[agent] ?? [])
+ .filter((model) => options.isModelEnabled!(agent, provider.id, model))
+ .map((model) => ({ ...model, defaultEnabled: true })),
+ ]),
+ ),
+ },
+ }))
+ : selectedProviders;
const tuple = resolveNewMakerDefaultTuple({
providers: scoped,
providersLoading: false,
availableAgentsLoaded: true,
availableAgents: new Set(agents.map((agent) => (agent === 'claude-code' ? 'cc' : agent))),
+ isModelEnabled: options.isModelEnabled,
});
let route = tuple
? {
diff --git a/docs/dev-rules/im-turn-flow.md b/docs/dev-rules/im-turn-flow.md
index 7d17c1878e..381d012006 100644
--- a/docs/dev-rules/im-turn-flow.md
+++ b/docs/dev-rules/im-turn-flow.md
@@ -31,6 +31,11 @@ Telegram、Discord、钉钉和官方 hook 共用调度器,Telegram 长轮询
跟随记录同时记下解析结果,下一条消息重新解析目录;结果未变不改任务,任务手动选择仍优先。
无可用来源时明确失败,不把空字符串或历史写死型号交给执行器。已有显式配置保留原值;恢复
自动选择只清模型路由覆盖,保留权限档。
+自动候选同时遵守执行端的模型显示偏好;显式固定模型仍按原路由准入规则校验。官方目录指向
+远程电脑时,只从那台电脑授权远程调用且可见的目录解析,失败不改成本机。继承本机默认时,
+先解析默认模型,再按既有规则判断目录的残留来源;断开或停用的显式来源仍拒绝替换。
+设置页在自动模式下随目录更新重读实际模型,加载、刷新与保存共用请求代次,迟到刷新不得
+覆盖用户刚固定的模型或切换后的渠道。
## 1. 入口账本
diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.md
index 073127ea37..54e237876e 100644
--- a/docs/product-rules/telegram-bot-parity.md
+++ b/docs/product-rules/telegram-bot-parity.md
@@ -179,6 +179,10 @@ meta 和绑定观察器,发送完成即释放锁。跟随切换与手动选择
出的实际模型;手动固定的旧模型继续保留。目录更新后,仍跟随默认的任务在下一条消息重算,
手动改过的任务不受影响。「恢复自动选择」不重置权限。两侧独立的配置归属、目录覆盖与权限
策略保持不变;自动模式没有可用来源时明确失败,不再回落到写死的旧型号。
+自动候选遵守执行电脑的模型显示偏好。官方目录选择远程电脑而未固定模型时,使用那台电脑
+允许远程调用的可见目录;本机继承模型先解析,再判断残留来源。设置页自动模型随目录更新,
+迟到读取不覆盖手动保存。回归见 `remoteProviderRoute.test.ts`、`session-runner.test.ts` 与
+`ImDefaultSettingsSection.test.tsx`。
两侧的成功提示、帮助与命令菜单都必须按这个真实结果称为「新任务」,不得沿用旧的
「新对话/清掉上下文」说法。
官方 bot 通过 `session-new-v1` 双向能力协商执行立即创建,滚动升级时旧 Desktop 才退回旧的
diff --git a/packages/lizi-im/src/feishu/__tests__/wsClientConflict.test.ts b/packages/lizi-im/src/feishu/__tests__/wsClientConflict.test.ts
index 67d7ad4ca9..4d5c6380ee 100644
--- a/packages/lizi-im/src/feishu/__tests__/wsClientConflict.test.ts
+++ b/packages/lizi-im/src/feishu/__tests__/wsClientConflict.test.ts
@@ -152,11 +152,14 @@ describe('Feishu WebSocket conflict handling', () => {
}
});
- it('retries a rejected SDK start without an unhandled rejection', async () => {
+ // PR #7291: SDK can report a generic error after rejecting start or exhausting retries.
+ // Unit: the accepted retry must survive that later error, while stop/ready still cancel it.
+ it('retries a rejected SDK start even after a later ordinary error', async () => {
vi.useFakeTimers();
mocks.start.mockRejectedValueOnce(new Error('network down'));
try {
await expect(wsClient.start(credentials, { announceLifecycle: false })).resolves.toBe('error');
+ latestClient().options.onError?.(new Error('socket closed'));
await vi.advanceTimersByTimeAsync(1_000);
expect(mocks.start).toHaveBeenCalledTimes(2);
latestClient().options.onReady?.();
@@ -175,6 +178,7 @@ describe('Feishu WebSocket conflict handling', () => {
client.options.onError?.(new Error(outcome === 'auth'
? 'pullConnectConfig failed: code=514, msg=invalid credentials'
: 'WebSocket reconnect exhausted after 3 attempts'));
+ if (outcome !== 'auth') client.options.onError?.(new Error('socket closed'));
await connecting;
if (outcome === 'stop') await wsClient.stop({ announceOffline: false });
await vi.advanceTimersByTimeAsync(2_000);
diff --git a/packages/lizi-im/src/feishu/wsClient.ts b/packages/lizi-im/src/feishu/wsClient.ts
index 06d75dbe56..2de77e8df3 100644
--- a/packages/lizi-im/src/feishu/wsClient.ts
+++ b/packages/lizi-im/src/feishu/wsClient.ts
@@ -337,8 +337,6 @@ function handleErrorSignal(
// The SDK owns ordinary reconnects. Only restart when that loop has stopped.
if (/WebSocket reconnect exhausted/i.test(error.message) && S().retryStart) {
S().connectionRetry.schedule(S().retryStart!);
- } else {
- S().connectionRetry.reset();
}
}