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(model-picker): 恢复的远程选择按可选条目判断,桌面收藏缓存随归属清理

Dash165f5e6a9fb2
diff --git a/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts b/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts
index 5ca292f51a..b4d5d3ce5e 100644
--- a/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts
+++ b/apps/desktop/src/renderer/state/useRemoteModelFavorites.ts
@@ -19,8 +19,18 @@ export interface FavoriteStore {
// 上次从那台电脑读到的收藏(按数据归属代次 + 电脑):面板每次打开先显示它,再在后台读最新的。
// 写入仍带 expected 交给那台电脑核对,旧快照改不坏真相。
const lastFavorites = new Map<string, ModelFavoriteItem[]>();
+let lastFavoritesOwner = '';
+/** 数据归属换了(切换 / 退出账号)就丢掉上一个账号的快照,缓存里只留当前归属的。 */
+function rememberFavorites(owner: string, key: string, items: ModelFavoriteItem[]): void {
+ if (owner !== lastFavoritesOwner) {
+ lastFavorites.clear();
+ lastFavoritesOwner = owner;
+ }
+ lastFavorites.set(key, items);
+}
export function __resetRemoteModelFavoritesCacheForTest(): void {
lastFavorites.clear();
+ lastFavoritesOwner = '';
}
/** Remote views already hold the device's sessions topic. Only invalidate this
@@ -49,7 +59,7 @@ export function useRemoteModelFavorites(deviceId?: string) {
)
return;
const next = parseModelFavorites(value) as ModelFavoriteItem[];
- lastFavorites.set(key, next);
+ rememberFavorites(JSON.stringify(owner), key, next);
setState({ key, items: next });
setError(false);
setErrorCode(null);
diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsx
index c30783b552..468c194bfc 100644
--- a/apps/mobile/app/sessions/new.tsx
+++ b/apps/mobile/app/sessions/new.tsx
@@ -401,7 +401,8 @@ import { mobileAgentLabel, mobileAgentVendor } from '@/session/sessionAgentSwitc
import { MobileModelIconMark } from '@/session/MobileProviderMark';
import { draftModelMemoryFor, hydrateDraftModelMemory } from '@/session/draftModelMemory';
import { effortLabelFromRuntime, rowFastEditable } from '@/session/modelPickerRows';
-import { useRemoteAgentCatalogs } from '@/session/useRemoteAgentCatalogs';
+import { useRemoteAgentCatalogs, useRemoteAgentCatalogsWithStatus } from '@/session/useRemoteAgentCatalogs';
+import { restoredRemoteAgentUnusable as restoredRemoteAgentUnusableCheck } from '@/session/remoteAgentCatalogs';
import { useTheme, useThemedStyles, type ThemeColors } from '@/theme';
import { fontWeight, iconSize, iconStroke, lineHeight, navigationChrome, radius, spacing, typeScale } from '@/theme/tokens';
@@ -1162,7 +1163,7 @@ export default function NewRemoteSessionScreen() {
() => (remoteAgentPick ? [remoteAgentPick.deviceId] : []),
[remoteAgentPick],
);
- const remoteAgentCatalogs = useRemoteAgentCatalogs({
+ const { catalogs: remoteAgentCatalogs, settled: remoteAgentCatalogsSettled } = useRemoteAgentCatalogsWithStatus({
// 选择器打开时读其他电脑与分享;已选远程模型时还要按那份目录显示模型药丸。
enabled: remoteAgentSupported && (modelSheetOpen || remoteAgentPick !== null),
controlledDeviceId: selectedDeviceId,
@@ -1211,12 +1212,9 @@ export default function NewRemoteSessionScreen() {
// → 退回被控电脑的默认;记忆保留,那台恢复后下次打开照样选回。
const restoredRemoteAgentUnusable = !!remoteAgentChoice?.restored && !!remoteAgentPick && (
(deviceProviders.ready && !remoteAgentSupported)
- || (!!remoteAgentCatalog && (
- remoteAgentCatalog.status === 'error'
- || !!remoteAgentCatalog.offline
- || (remoteAgentCatalog.status === 'ready'
- && !(remoteAgentPillProvider && getModel(remoteAgentPillProvider, remoteAgentPick.model, remoteAgentPick.agentKind)))
- ))
+ || (remoteAgentSupported && restoredRemoteAgentUnusableCheck({
+ pick: remoteAgentPick, catalog: remoteAgentCatalog ?? undefined, settled: remoteAgentCatalogsSettled,
+ }))
);
useEffect(() => {
if (restoredRemoteAgentUnusable) setRemoteAgentChoice(null);
diff --git a/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts b/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
index 69f1ee0bd2..7ff07a5f48 100644
--- a/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
+++ b/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
@@ -1,9 +1,10 @@
import type { DeviceView } from '@cindy/device-link';
import type { ProviderView } from '@cindy/model-providers/registry';
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
import type { ProviderShareCatalogEntry } from '@/device-link/providerShareCatalogCache';
import {
+ restoredRemoteAgentUnusable,
isProviderShareAgentDeviceId,
providerShareRemoteCatalogs,
remoteAgentProviders,
@@ -11,6 +12,12 @@ import {
} from '@/session/remoteAgentCatalogs';
import { groupSourceFilters, remoteFilterId } from '@/session/remoteSourceFilters';
+const catalogEntries = vi.hoisted(() => ({ value: [] as unknown[] }));
+vi.mock('@/session/unifiedMobileModels', async (importOriginal) => ({
+ ...(await importOriginal<object>()),
+ mobileUnifiedEntries: () => catalogEntries.value,
+}));
+
const device = (deviceId: string, patch: Partial<DeviceView> = {}): DeviceView => ({
deviceId,
name: deviceId,
@@ -175,3 +182,25 @@ describe('provider shares in the remote Agent catalogs', () => {
expect(build({ shares: [closed] })[0].providers).toEqual([]);
});
});
+
+// 回归(#6415 review):按记忆恢复的远程选择只检查模型 id 存在、或没读到目录就保留,创建时才失败。
+describe('restoredRemoteAgentUnusable', () => {
+ const pick = { deviceId: 'studio', agentKind: 'codex' as const, model: 'gpt-x', providerId: 'openai', effort: '', fastMode: false };
+ const ready = { deviceId: 'studio', name: 'Studio', status: 'ready' as const, providers: [] };
+ const entry = (providerId: string) => ({ providerId, modelId: 'gpt-x', capabilities: {} });
+ it('keeps the pick while loading, falls back once the list is settled without it, or it is offline / unreadable', () => {
+ expect(restoredRemoteAgentUnusable({ pick, catalog: undefined, settled: false })).toBe(false);
+ expect(restoredRemoteAgentUnusable({ pick, catalog: undefined, settled: true })).toBe(true);
+ expect(restoredRemoteAgentUnusable({ pick, catalog: { ...ready, status: 'loading' }, settled: true })).toBe(false);
+ expect(restoredRemoteAgentUnusable({ pick, catalog: { ...ready, status: 'error' }, settled: true })).toBe(true);
+ expect(restoredRemoteAgentUnusable({ pick, catalog: { ...ready, offline: true }, settled: true })).toBe(true);
+ });
+ it('requires a selectable entry from the remembered source, not just a known model id', () => {
+ catalogEntries.value = [entry('openai')];
+ expect(restoredRemoteAgentUnusable({ pick, catalog: ready, settled: true })).toBe(false);
+ catalogEntries.value = [entry('other')];
+ expect(restoredRemoteAgentUnusable({ pick, catalog: ready, settled: true })).toBe(true);
+ catalogEntries.value = [];
+ expect(restoredRemoteAgentUnusable({ pick, catalog: ready, settled: true })).toBe(true);
+ });
+});
diff --git a/apps/mobile/src/session/remoteAgentCatalogs.ts b/apps/mobile/src/session/remoteAgentCatalogs.ts
index 1d6e847ba9..486a2976dc 100644
--- a/apps/mobile/src/session/remoteAgentCatalogs.ts
+++ b/apps/mobile/src/session/remoteAgentCatalogs.ts
@@ -7,6 +7,8 @@
*/
import type { DeviceView } from '@cindy/device-link';
import type { ProviderView } from '@cindy/model-providers/registry';
+import type { NewSessionRemoteAgentPick } from './newSession';
+import { matchesEntry, mobileUnifiedEntries } from './unifiedMobileModels';
import { toDeviceListItems } from '@/device-link/devices';
import type { ProviderShareCatalogEntry } from '@/device-link/providerShareCatalogCache';
@@ -108,3 +110,21 @@ export function providerShareRemoteCatalogs(input: {
}
return catalogs;
}
+
+/**
+ * 按记忆恢复的远程选择此刻还能不能用:清单读完后那台电脑 / 分享不在了、读不到、离线,或模型已不在
+ * 那份目录里「可选」的条目(供应商断开 / 停用、模型被隐藏)都算不能用。清单没读完先不下结论。
+ */
+export function restoredRemoteAgentUnusable(input: {
+ pick: NewSessionRemoteAgentPick;
+ catalog: RemoteAgentCatalog | undefined;
+ settled: boolean;
+}): boolean {
+ const { pick, catalog } = input;
+ if (!catalog) return input.settled;
+ if (catalog.status === 'loading') return false;
+ if (catalog.status === 'error' || catalog.offline) return true;
+ return !mobileUnifiedEntries(catalog.providers, [pick.agentKind], catalog.modelVisibilityOverrides, false)
+ .some((entry) => (pick.providerId === null || entry.providerId === pick.providerId)
+ && matchesEntry(entry, pick.model));
+}
diff --git a/apps/mobile/src/session/useRemoteAgentCatalogs.ts b/apps/mobile/src/session/useRemoteAgentCatalogs.ts
index 452de06921..b1746096d4 100644
--- a/apps/mobile/src/session/useRemoteAgentCatalogs.ts
+++ b/apps/mobile/src/session/useRemoteAgentCatalogs.ts
@@ -54,7 +54,11 @@ function cachedShareState(controlledDeviceId: string): ShareState {
return { controlledDeviceId, shares: cached ?? [], loaded: !!cached };
}
-export function useRemoteAgentCatalogs(input: {
+export function useRemoteAgentCatalogs(input: RemoteAgentCatalogsInput): RemoteAgentCatalog[] {
+ return useRemoteAgentCatalogsWithStatus(input).catalogs;
+}
+
+export interface RemoteAgentCatalogsInput {
/** 只在需要时读(选择器打开,或任务的 Agent 在另一台电脑)。 */
enabled: boolean;
controlledDeviceId: string;
@@ -62,7 +66,13 @@ export function useRemoteAgentCatalogs(input: {
keepDeviceIds: readonly string[];
/** 只读 keepDeviceIds 里的电脑(选择器没打开、只为模型药丸取 Agent 所在那台的目录时)。 */
keepOnly?: boolean;
-}): RemoteAgentCatalog[] {
+}
+
+/** settled = 电脑清单(和分享清单)已读到过一次:此后清单里没有的电脑 / 分享才算真的不在了。 */
+export function useRemoteAgentCatalogsWithStatus(input: RemoteAgentCatalogsInput): {
+ catalogs: RemoteAgentCatalog[];
+ settled: boolean;
+} {
const { readDeviceList, invoke, openLink, connectionEpoch, status, presenceVersion, getPresenceAvailability } =
useDeviceLink();
const { accountGeneration } = useAuth();
@@ -70,6 +80,7 @@ export function useRemoteAgentCatalogs(input: {
const revoked = useRevokedDevices();
const [devices, setDevices] = useState<{ deviceId: string; name: string; canOpen: boolean }[]>([]);
const [catalogs, setCatalogs] = useState<ReadonlyMap<string, CatalogState>>(new Map());
+ const [devicesLoaded, setDevicesLoaded] = useState(false);
const [shareState, setShareState] = useState<ShareState>(() => cachedShareState(input.controlledDeviceId));
const ownerRef = useRef({ accountGeneration, controlledDeviceId: input.controlledDeviceId });
const keepKey = input.keepDeviceIds.join('\n');
@@ -84,6 +95,7 @@ export function useRemoteAgentCatalogs(input: {
&& owner.controlledDeviceId === input.controlledDeviceId) return;
ownerRef.current = { accountGeneration, controlledDeviceId: input.controlledDeviceId };
setDevices([]);
+ setDevicesLoaded(false);
setCatalogs(new Map());
setShareState(cachedShareState(input.controlledDeviceId));
}, [accountGeneration, input.controlledDeviceId]);
@@ -135,6 +147,7 @@ export function useRemoteAgentCatalogs(input: {
revokedDeviceIds: revoked,
}).filter((device) => !keepOnly || keepDeviceIds.includes(device.deviceId));
setDevices(selected);
+ setDevicesLoaded(true);
for (const device of selected) {
const cached = getCachedDeviceProviders(device.deviceId);
patch(device.deviceId, cached
@@ -209,7 +222,7 @@ export function useRemoteAgentCatalogs(input: {
});
}, [input.controlledDeviceId, input.enabled, keepKey, keepOnly, readShares, shareState, t]);
- return useMemo(() => {
+ const result = useMemo(() => {
if (devices.length === 0 && shareCatalogs.length === 0) return NO_CATALOGS;
void presenceVersion;
const deviceCatalogs = devices.map((device): RemoteAgentCatalog => {
@@ -231,4 +244,7 @@ export function useRemoteAgentCatalogs(input: {
});
return shareCatalogs.length === 0 ? deviceCatalogs : [...deviceCatalogs, ...shareCatalogs];
}, [catalogs, devices, shareCatalogs, presenceVersion, getPresenceAvailability]);
+ const settled = input.enabled && devicesLoaded
+ && (!readShares || shareState.controlledDeviceId !== input.controlledDeviceId || shareState.loaded);
+ return { catalogs: result, settled };
}