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(mobile): require explicit reselection for closed models

Chrisb90eaa3e6cd4
diff --git a/apps/desktop/src/main/device-link/__tests__/providerListProjection.test.ts b/apps/desktop/src/main/device-link/__tests__/providerListProjection.test.ts
index 3b844c69d9..05d92323b6 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerListProjection.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerListProjection.test.ts
@@ -120,7 +120,10 @@ describe('projectInvokeResultForTunnel — maker:provider:list 投影', () => {
expect(output.providers[1].models).toEqual({ codex: [models[0], models[2], models[4]], pi: [models[0], models[2], models[4]] });
for (const field of ['imageModels', 'videoModels', 'audioModels', 'embeddingModels']) expect(a[field]).toEqual(expected);
expect(output.providerOrder).toEqual(['b', 'a']);
- expect(output.modelVisibilityOverrides).toEqual(input.modelVisibilityOverrides);
+ expect(output.modelVisibilityOverrides).toMatchObject({
+ ...input.modelVisibilityOverrides, 'codex:a:default-off': false, 'pi:b:default-on': true,
+ });
+ expect(input.modelVisibilityOverrides).not.toHaveProperty('codex:a:default-off');
expect(input.providers[0].models.codex).toHaveLength(5);
expect(project({ ...input, modelVisibilityOverrides: { 'codex:a:manual-on': false } }).providers[0].models)
.toEqual({ codex: [models[0], models[2], models[4]], pi: [models[0], models[2], models[4]] });
diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.ts
index 0832038d3e..a4cd9f41e4 100644
--- a/apps/desktop/src/main/device-link/dispatch.ts
+++ b/apps/desktop/src/main/device-link/dispatch.ts
@@ -545,6 +545,7 @@ function projectVisibleModelList(
visibility[`${agent}:${providerId}:${legacyModel.id}`],
typeof legacyModel.defaultEnabled === 'boolean' ? legacyModel.defaultEnabled : undefined,
);
+ visibility[`${agent}:${providerId}:${legacyModel.id}`] = visible;
return availability === 'requires_payment' || !visible ? [] : [legacyModel];
});
}
@@ -630,7 +631,7 @@ function projectInvokeResultForTunnel(
Object.entries(r.modelVisibilityOverrides)
.filter((entry): entry is [string, boolean] => typeof entry[1] === 'boolean'),
)
- : undefined;
+ : {};
const providers = (r.providers as Record<string, unknown>[]).map((p) => {
const rest = { ...p };
const logoKind = typeof p.id === 'string'
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 9f71085e38..2c8d6d3b97 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -1,3 +1,5 @@
+import { modelNeedsReselection } from '@/session/modelReselection';
+import { getCachedDeviceProviders } from '@/device-link/deviceProvidersCache';
import { MountOnFirstOpen } from '@/session/MountOnFirstOpen';
import { RunningTokenRatePopover } from '@/session/RunningTokenRatePopover';
import { companionConversationItems } from '@/session/companionConversationPresentation';
@@ -6039,6 +6041,20 @@ export default function SessionScreen() {
&& pendingSkillAtSend.name === parsedDesktopCommandAtSend.name
? null
: parsedDesktopCommandAtSend;
+ // A known hidden model requires an explicit choice before consuming the draft or enqueueing.
+ const selectionAtSend = readSessionRowNow() ?? currentSession;
+ if (!earlyLocalCommand && !earlyDesktopCommand && modelNeedsReselection(
+ getCachedDeviceProviders(deviceId)?.modelVisibilityOverrides,
+ resolveSessionAgentKind(selectionAtSend), selectionAtSend.model, selectionAtSend.providerId,
+ )) {
+ setError(t('session.common.modelHiddenReselect', { model: selectionAtSend.model }));
+ setModelSheetOpen(true);
+ sendInFlightRef.current = false;
+ setSending(false);
+ if (options.documentOverride) applyComposerDocument(options.documentOverride);
+ else if (options.draftOverride !== undefined) setComposerDraft(options.draftOverride);
+ return;
+ }
// 需要远端会话的命令在会话建成前必须挡住(review P1)。
//
// 命令走的是下方「豁免 outbox」的原路径:/context 直接向被控端取用量、/learn 直接
diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsx
index 285b4ce859..5d490c3061 100644
--- a/apps/mobile/app/sessions/new.tsx
+++ b/apps/mobile/app/sessions/new.tsx
@@ -1,3 +1,4 @@
+import { modelNeedsReselection } from '@/session/modelReselection';
import { isRemoteTaskSuggestionId } from '@/session/remoteTaskSuggestionsModel';
import { mobileDurableOutbox, holdDurableOutboxCreation, getCurrentMobileOutboxRecords } from '@/session/mobileDurableOutbox';
import { retainOutboxFile, durableOutboxUploadUri, removeRetainedOutboxFiles, outboxAttachmentNeedsLocalBytes } from '@/session/durableOutboxFiles';
@@ -1196,6 +1197,7 @@ export default function NewRemoteSessionScreen() {
modelRows: rowsNow,
currentEffort,
catalogReady: catalogReadyRef.current,
+ visibilityOverrides: deviceProvidersRef.current.modelVisibilityOverrides,
});
return {
model: next.model,
@@ -1300,6 +1302,7 @@ export default function NewRemoteSessionScreen() {
// modelRows 按当前 draft.agentKind 构建;最近会话若是另一个 agent,纯函数内不做来源校验。
rowsAgentKind: draft.agentKind,
catalogReady: deviceProviders.ready,
+ visibilityOverrides: deviceProviders.modelVisibilityOverrides,
providersUnsupported: deviceProviders.unsupported,
// provider-aware 模式只用经过可见性过滤的 rows;目录确实不可用时才回退
// capabilities(上游 main 移植,merge 2026-08-07)。
@@ -1350,7 +1353,7 @@ export default function NewRemoteSessionScreen() {
return () => {
cancelled = true;
};
- }, [capabilities?.availableModels, deviceProviders.loading, draft.effort, draft.permissionMode, draft.agentKind, modelRows, deviceProviders.ready, deviceProviders.unsupported, modelSections.connected.length, newSessionPreferences, newSessionPreferencesLoaded, selectedDeviceId, sessions]);
+ }, [capabilities?.availableModels, deviceProviders.loading, draft.effort, draft.permissionMode, draft.agentKind, modelRows, deviceProviders.ready, deviceProviders.modelVisibilityOverrides, deviceProviders.unsupported, modelSections.connected.length, newSessionPreferences, newSessionPreferencesLoaded, selectedDeviceId, sessions]);
// 目录就绪后的来源终检(codex review P1):自动默认/恢复在目录加载期信任的来源可能已失效
// (provider 被删/断开/模型下架),就绪后必须复核——联合回退整对 (model, providerId)
@@ -1365,6 +1368,7 @@ export default function NewRemoteSessionScreen() {
{ model: current.model, providerId: current.providerId },
current.agentKind,
true,
+ deviceProviders.modelVisibilityOverrides,
);
const pairChanged = resolved.model !== current.model || resolved.providerId !== current.providerId;
if (!pairChanged) return current;
@@ -1377,7 +1381,7 @@ export default function NewRemoteSessionScreen() {
...(current.fastMode ? { fastMode: false } : {}),
};
});
- }, [deviceProviders.ready, modelRows]);
+ }, [deviceProviders.ready, deviceProviders.modelVisibilityOverrides, modelRows]);
const draftContent = useMemo(
// pending(乐观上传中)也算数:拍完照立刻点创建是常见路径,create() 里会等它们落定。
() => ({ attachmentCount: attachments.length + pendingUploads.length }),
@@ -3999,6 +4003,7 @@ export default function NewRemoteSessionScreen() {
modelRows: rowsNow,
currentEffort: current.effort,
catalogReady: catalogReadyRef.current,
+ visibilityOverrides: deviceProvidersRef.current.modelVisibilityOverrides,
});
return {
...current,
@@ -4330,6 +4335,13 @@ export default function NewRemoteSessionScreen() {
setError(t('session.menu.aiRenameOffline'));
return;
}
+ if (deviceProvidersRef.current.ready && modelNeedsReselection(
+ deviceProvidersRef.current.modelVisibilityOverrides, draft.agentKind, draft.model, draft.providerId,
+ )) {
+ setError(t('session.common.modelHiddenReselect', { model: draft.model }));
+ setModelSheetOpen(true);
+ return;
+ }
const worktreeIntent = captureWorktreeCreateIntent();
if (!isWorktreeCreateIntentCurrent(worktreeIntent)) {
setError(t(resolveWorktreeCreateErrorKey()));
@@ -4723,7 +4735,10 @@ export default function NewRemoteSessionScreen() {
selectedProviderId: effectiveDraft.providerId,
}).sections),
});
- const applyGuard = (g: { rows: readonly ProviderModelRow[]; catalogKnown: boolean }): void => {
+ const applyGuard = (g: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; visibilityOverrides?: Record<string, boolean> }): void => {
+ if (g.catalogKnown && modelNeedsReselection(g.visibilityOverrides, effectiveDraft.agentKind, effectiveDraft.model, effectiveDraft.providerId)) {
+ throw new Error(t('session.common.modelHiddenReselect', { model: effectiveDraft.model }));
+ }
const resolved = resolveRecentModelAndProvider(
g.rows,
guardSelected(),
@@ -4759,7 +4774,7 @@ export default function NewRemoteSessionScreen() {
};
// 有界稳定循环:每轮 await 返回后同步核对 genAt,稳定才退出(≤3)。
// 哨兵初值必被首轮循环覆盖(for 循环体至少执行一次),消除 null 收窄。
- let guardResult: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number } = {
+ let guardResult: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number; visibilityOverrides?: Record<string, boolean> } = {
rows: [], catalogKnown: false, genAt: getDeviceProvidersGen(guardDeviceId),
};
for (let pass = 0; pass < 3; pass += 1) {
@@ -4808,6 +4823,9 @@ export default function NewRemoteSessionScreen() {
// 鉴权 fresh 之后联合校验 (model, providerId)(codex review P2):建链/鉴权
// 期间工作站可能已替换 provider——patch 覆盖本次创建,不再向已删除来源发。
revalidateDraftAfterAuth: async (fresh) => {
+ if (modelNeedsReselection(fresh.modelVisibilityOverrides, effectiveDraft.agentKind, effectiveDraft.model, effectiveDraft.providerId)) {
+ throw new Error(t('session.common.modelHiddenReselect', { model: effectiveDraft.model }));
+ }
const rows = flattenProviderSections(buildMobileModelSections({
providers: fresh.providers,
agentKind: effectiveDraft.agentKind,
@@ -4950,6 +4968,13 @@ export default function NewRemoteSessionScreen() {
setGoalError(t('session.new.enterModel'));
return;
}
+ if (deviceProvidersRef.current.ready && modelNeedsReselection(
+ deviceProvidersRef.current.modelVisibilityOverrides, draft.agentKind, draft.model, draft.providerId,
+ )) {
+ setGoalError(t('session.common.modelHiddenReselect', { model: draft.model }));
+ setModelSheetOpen(true);
+ return;
+ }
const worktreeIntent = captureWorktreeCreateIntent();
if (!isWorktreeCreateIntentCurrent(worktreeIntent)) {
setGoalError(t(resolveWorktreeCreateErrorKey()));
@@ -5235,7 +5260,10 @@ export default function NewRemoteSessionScreen() {
selectedProviderId: effectiveDraft.providerId,
}).sections),
});
- const applyGuard = (g: { rows: readonly ProviderModelRow[]; catalogKnown: boolean }): void => {
+ const applyGuard = (g: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; visibilityOverrides?: Record<string, boolean> }): void => {
+ if (g.catalogKnown && modelNeedsReselection(g.visibilityOverrides, effectiveDraft.agentKind, effectiveDraft.model, effectiveDraft.providerId)) {
+ throw new Error(t('session.common.modelHiddenReselect', { model: effectiveDraft.model }));
+ }
const resolved = resolveRecentModelAndProvider(
g.rows,
guardSelected(),
@@ -5281,7 +5309,7 @@ export default function NewRemoteSessionScreen() {
// 有界稳定循环(独立 review round-21 Spec P1):每轮 await 返回后**同步**核对
// genAt,稳定才退出(≤3)。
// 哨兵初值必被首轮循环覆盖(for 循环体至少执行一次),消除 null 收窄。
- let guardResult: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number } = {
+ let guardResult: { rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number; visibilityOverrides?: Record<string, boolean> } = {
rows: [], catalogKnown: false, genAt: getDeviceProvidersGen(guardDeviceId),
};
for (let pass = 0; pass < 3; pass += 1) {
diff --git a/apps/mobile/docs/navigation-and-composer.md b/apps/mobile/docs/navigation-and-composer.md
index 2a7542a95b..b7b1f1784d 100644
--- a/apps/mobile/docs/navigation-and-composer.md
+++ b/apps/mobile/docs/navigation-and-composer.md
@@ -15,6 +15,7 @@
(均在 `ComposerDockKeyboardFollow.tsx`:新建页 `DockKeyboardBottomSpacer`,已有任务 `DockKeyboardLift` / `DockKeyboardViewportSpacer`)。
- 新建页输入卡固定在页面滚动区之外;已有任务输入卡仅正文与附件可滚动,发送、语音与拖拽把手保留在滚动视口之外。长文本、附件及键盘改变可用高度时仍能直接发送,收起再展开不重挂编辑器。
- 新建任务输入卡内的 `/` 命令和 `@` 资源候选面板使用可收缩的独立滚动视口;键盘弹出时保留输入与发送区域,候选项可在面板内滚动选择。
+- 已有任务或恢复草稿的模型后来被关闭时,保留原模型身份与输入内容;模型面板说明需要重选,发送前要求明确选择开启模型,不自动换模型。远程目录仍只传开启模型的详情。
- 减弱动态效果:不播形变与拉开,直接到位。
- 伙伴对话:左上角为返回(回到伙伴列表);Duo 系统栏已有返回时保留侧栏按钮,不出现两个返回。
- 设置等整页滚动的二级页:顶栏透明、系统柔和边缘,内容滚到顶栏和底部指示条下面,无硬分界(设置、语音词典、账号注销、伙伴私聊、共享任务管理、资源列表);设备详情只去掉底部色带。
diff --git a/apps/mobile/src/__tests__/modelReselection.test.ts b/apps/mobile/src/__tests__/modelReselection.test.ts
new file mode 100644
index 0000000000..88b77186d9
--- /dev/null
+++ b/apps/mobile/src/__tests__/modelReselection.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest';
+import { modelNeedsReselection } from '@/session/modelReselection';
+
+describe('model reselection after hiding', () => {
+ const visibility = { 'codex:a:model': false, 'codex:b:model': true, 'pi:a:model': true };
+ it('requires an explicit replacement for the exact hidden source, even if another offers the model', () => {
+ expect(modelNeedsReselection(visibility, 'codex', 'model', 'a')).toBe(true);
+ expect(modelNeedsReselection(visibility, 'codex', 'model', 'b')).toBe(false);
+ expect(modelNeedsReselection(visibility, 'pi', 'model', 'a')).toBe(false);
+ });
+ it('does not infer hidden state from a failed or old-host catalog read', () => {
+ expect(modelNeedsReselection(undefined, 'codex', 'model', 'a')).toBe(false);
+ expect(modelNeedsReselection({}, 'codex', 'model', 'a')).toBe(false);
+ });
+ it('handles default source and model IDs with colons without falling back to another model', () => {
+ expect(modelNeedsReselection(visibility, 'codex', 'model', null)).toBe(false);
+ expect(modelNeedsReselection({ 'pi:a:org/model:free': false }, 'pi', 'org/model:free', null)).toBe(true);
+ expect(modelNeedsReselection({ 'pi:a:org/model:free': false }, 'pi', 'model:free', null)).toBe(false);
+ });
+});
diff --git a/apps/mobile/src/__tests__/newSession.test.ts b/apps/mobile/src/__tests__/newSession.test.ts
index 6c353944d6..2f3a0f0673 100644
--- a/apps/mobile/src/__tests__/newSession.test.ts
+++ b/apps/mobile/src/__tests__/newSession.test.ts
@@ -2867,3 +2867,23 @@ describe('new.tsx worktree 探测 effect 的离线起始态(#4046,源码契约)'
}
});
});
+
+describe('closed saved model requires reselection', () => {
+ const selected = { model: 'closed', providerId: 'prov-closed' };
+ const visibilityOverrides = { 'codex:prov-closed:closed': false };
+ const rows = [modelRow('replacement', ['medium'], 'medium')];
+ const sessions = [remoteSession('saved', { ...selected, agentKind: 'codex', effort: 'high', deviceLinkDeviceId: 'devA' })];
+ it('preserves the hidden pair during catalog reconciliation and remembered-agent restoration', () => {
+ expect(resolveRecentModelAndProvider(rows, selected, 'codex', true, visibilityOverrides)).toEqual(selected);
+ expect(pickAgentDefaultRuntime({ agentKind: 'codex', sessions, modelRows: rows,
+ currentEffort: 'medium', catalogReady: true, visibilityOverrides })).toMatchObject({ ...selected, effort: 'high' });
+ expect(resolveNewSessionAutoDefault({ userTouched: false, appliedDeviceId: null, selectedDeviceId: 'devA',
+ sessions, modelRows: rows, rowsAgentKind: 'codex', catalogReady: true, visibilityOverrides,
+ currentEffort: 'medium' })?.patch).toMatchObject(selected);
+ });
+ it('carries fresh visibility with its rows through the submit guard', async () => {
+ const result = await resolveSubmitGuardCatalog({ cached: () => undefined, gen: () => 0,
+ fetch: async () => ({ providers: [], modelVisibilityOverrides: visibilityOverrides }), buildRows: () => rows });
+ expect(result).toMatchObject({ catalogKnown: true, rows, visibilityOverrides });
+ });
+});
diff --git a/apps/mobile/src/__tests__/unifiedMobilePicker.test.tsx b/apps/mobile/src/__tests__/unifiedMobilePicker.test.tsx
index e969167875..307c21578b 100644
--- a/apps/mobile/src/__tests__/unifiedMobilePicker.test.tsx
+++ b/apps/mobile/src/__tests__/unifiedMobilePicker.test.tsx
@@ -527,3 +527,15 @@ it('does not start preference writes after selection completes for a closed pane
expect(test.view.options).toBeUndefined();
expect(test.view.error).toBeNull();
});
+
+it('explains a closed current model without changing it and still allows choosing a replacement', async () => {
+ const { onSelect } = await mount(undefined, {
+ providersReady: true,
+ modelVisibilityOverrides: { 'codex:account:codex/model': false },
+ });
+ expect(test.view.error).toBe('session.common.modelHiddenReselect');
+ expect(onSelect).not.toHaveBeenCalled();
+ expect(test.view.busy).toBe(false);
+ await act(async () => test.view.onSelect(test.view.groups[0].rows[0]));
+ expect(onSelect).toHaveBeenCalledOnce();
+});
diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.json
index c6f293d7cc..1c3c59695c 100644
--- a/apps/mobile/src/i18n/locales/en/session.json
+++ b/apps/mobile/src/i18n/locales/en/session.json
@@ -6,6 +6,7 @@
"dismissTitle": "Dismiss past failure notice"
},
"common": {
+ "modelHiddenReselect": "{{model}} is turned off. Choose an enabled model before sending.",
"cancel": "Cancel",
"dismissRecommendation": "Dismiss recommendation",
"delete": "Delete",
diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.json
index e162163817..9db654fb44 100644
--- a/apps/mobile/src/i18n/locales/ja/session.json
+++ b/apps/mobile/src/i18n/locales/ja/session.json
@@ -6,6 +6,7 @@
"dismissTitle": "過去の失敗通知を閉じる"
},
"common": {
+ "modelHiddenReselect": "{{model}} はオフになっています。送信する前に、有効なモデルを選んでください。",
"cancel": "キャンセル",
"dismissRecommendation": "おすすめを閉じる",
"delete": "削除",
diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.json
index 7f327e83c2..cc033728cf 100644
--- a/apps/mobile/src/i18n/locales/ko/session.json
+++ b/apps/mobile/src/i18n/locales/ko/session.json
@@ -6,6 +6,7 @@
"dismissTitle": "이전 실패 알림 닫기"
},
"common": {
+ "modelHiddenReselect": "{{model}} 모델이 꺼져 있습니다. 보내기 전에 켜져 있는 모델을 선택하세요.",
"cancel": "취소",
"dismissRecommendation": "추천 닫기",
"delete": "삭제",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.json
index e0fae9c1e4..5554c5cf83 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/session.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json
@@ -6,6 +6,7 @@
"dismissTitle": "关闭历史失败提示"
},
"common": {
+ "modelHiddenReselect": "{{model}} 已关闭,请选择已开启的模型后再发送。",
"cancel": "取消",
"dismissRecommendation": "关闭推荐",
"delete": "删除",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.json
index f0f0bab3e2..cbed3efa6b 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/session.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json
@@ -6,6 +6,7 @@
"dismissTitle": "關閉歷史失敗提示"
},
"common": {
+ "modelHiddenReselect": "{{model}} 已關閉,請選擇已開啟的模型後再傳送。",
"cancel": "取消",
"dismissRecommendation": "關閉推薦",
"delete": "刪除",
diff --git a/apps/mobile/src/session/ModelPickerSheet.tsx b/apps/mobile/src/session/ModelPickerSheet.tsx
index 0054b5aead..134665f070 100644
--- a/apps/mobile/src/session/ModelPickerSheet.tsx
+++ b/apps/mobile/src/session/ModelPickerSheet.tsx
@@ -1,3 +1,4 @@
+import { modelNeedsReselection } from './modelReselection';
/**
* Shared model and permission selection for new and existing tasks.
* iOS presents native Form pages inside one system sheet; options and permissions
@@ -377,7 +378,13 @@ function LegacyModelPickerSheet({
</View>
);
- const agentContent = (agentSwitch ? (
+ const agentContent = (<>
+ {providersReady && modelNeedsReselection(modelVisibilityOverrides, agentKind, activeModelId, selectedProviderId) ? (
+ <Text style={styles.modelHiddenHint} testID={`${testID}.modelHiddenHint`}>
+ {t('session.common.modelHiddenReselect', { model: activeModelId })}
+ </Text>
+ ) : null}
+ {agentSwitch ? (
<>
<MobileAgentSwitcher
disabled={disabled || agentSwitch.disabled}
@@ -396,7 +403,8 @@ function LegacyModelPickerSheet({
</Text>
) : null}
</>
- ) : null);
+ ) : null}
+ </>);
const primaryPinnedTop = (
<View style={styles.pinnedTop}>
@@ -631,6 +639,13 @@ function makeStyles(colors: ThemeColors) {
pinnedTop: {
gap: spacing.sm,
},
+ modelHiddenHint: {
+ color: colors.textSecondary,
+ fontSize: typeScale.footnote,
+ lineHeight: lineHeight.caption,
+ fontWeight: fontWeight.regular,
+ paddingHorizontal: spacing.xs,
+ },
agentSwitchHint: {
color: colors.textTertiary,
fontSize: typeScale.footnote,
diff --git a/apps/mobile/src/session/UnifiedModelPickerSheet.tsx b/apps/mobile/src/session/UnifiedModelPickerSheet.tsx
index 54d50351bb..d0a25fcccc 100644
--- a/apps/mobile/src/session/UnifiedModelPickerSheet.tsx
+++ b/apps/mobile/src/session/UnifiedModelPickerSheet.tsx
@@ -1,3 +1,4 @@
+import { modelNeedsReselection } from './modelReselection';
import { mobileProviderAccountTitle } from "./mobileModelRowPresentation";
import { mobileCostMarks, quotaCountdown } from "./mobileModelRowPresentation";
import { useMobileModelQuotas } from "./useMobileModelQuotas";
@@ -637,7 +638,8 @@ export function UnifiedModelPickerSheet(
]}
groups={groups}
busy={busy || !!p.disabled || !prefs.ready}
- error={error}
+ error={error ?? (p.providersReady && modelNeedsReselection(p.modelVisibilityOverrides, p.agentKind, p.activeModelId, p.selectedProviderId)
+ ? t('session.common.modelHiddenReselect', { model: p.activeModelId }) : null)}
loading={!!p.loading}
emptyHint={p.emptyHint ?? t("models.picker.noResults")}
onSelect={select}
diff --git a/apps/mobile/src/session/modelReselection.ts b/apps/mobile/src/session/modelReselection.ts
new file mode 100644
index 0000000000..4ab333e007
--- /dev/null
+++ b/apps/mobile/src/session/modelReselection.ts
@@ -0,0 +1,14 @@
+/** A hidden saved selection needs an explicit replacement; never silently reroute it. */
+export function modelNeedsReselection(
+ visibility: Readonly<Record<string, boolean>> | null | undefined,
+ agent: string,
+ model: string,
+ providerId: string | null | undefined,
+): boolean {
+ if (!visibility || !model) return false;
+ if (providerId) return visibility[`${agent}:${providerId}:${model}`] === false;
+ // A default-source selection is usable while at least one source still exposes it.
+ const offerings = Object.entries(visibility).filter(([key]) =>
+ key.startsWith(`${agent}:`) && key.endsWith(`:${model}`));
+ return offerings.length > 0 && offerings.every(([, visible]) => !visible);
+}
diff --git a/apps/mobile/src/session/newSession.ts b/apps/mobile/src/session/newSession.ts
index d9af748b63..e179102c76 100644
--- a/apps/mobile/src/session/newSession.ts
+++ b/apps/mobile/src/session/newSession.ts
@@ -1,3 +1,4 @@
+import { modelNeedsReselection } from './modelReselection';
import { stripTrailingPathSeparators } from '@cindy/maker-shared/path-text';
import { collapseWorktreeDirForGrouping } from '@cindy/maker-shared/worktree-paths';
import {
@@ -433,8 +434,11 @@ export function resolveRecentModelAndProvider(
recent: { model: string; providerId: string | null },
agentKind: NewSessionAgentKind,
catalogReady: boolean,
+ visibilityOverrides?: Record<string, boolean> | null,
): { model: string; providerId: string | null } {
- if (!catalogReady) return { model: recent.model, providerId: recent.providerId };
+ if (!catalogReady || modelNeedsReselection(visibilityOverrides, agentKind, recent.model, recent.providerId)) {
+ return { model: recent.model, providerId: recent.providerId };
+ }
// providerId 为 null 分两种:①该会话本来就走被控端默认路由(合法来源);
// ②历史版本遗留的「自定义供应商模型 + providerId=NULL」坏数据(#1898 典型
// 现场)——目录就绪且 modelRows 存在同名模型行时补全为该行 provider,让自动
@@ -507,7 +511,7 @@ export async function resolveSubmitGuardCatalog(args: {
fetch: () => Promise<DeviceProvidersPayload>;
/** 把 payload 重建为守卫 rows(含 keepSelected 豁免)。 */
buildRows: (payload: DeviceProvidersPayload) => readonly ProviderModelRow[];
-}): Promise<{ rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number }> {
+}): Promise<{ rows: readonly ProviderModelRow[]; catalogKnown: boolean; genAt: number; visibilityOverrides?: Record<string, boolean> }> {
const { cached, gen, fetch, buildRows } = args;
if (args.deferRefreshToCreation) {
// 旧缓存可能缺少刚连接的来源,不能先把用户选择回退、再让 fresh 校验这个回退值。
@@ -525,10 +529,14 @@ export async function resolveSubmitGuardCatalog(args: {
try {
const fresh = await fetch();
if (gen() !== genAt) continue; // 拉取期间换代 → join 新代
- return { rows: buildRows(fresh), catalogKnown: true, genAt };
+ return { rows: buildRows(fresh), catalogKnown: true, genAt,
+ ...(fresh.modelVisibilityOverrides ? { visibilityOverrides: fresh.modelVisibilityOverrides } : {}),
+ };
} catch {
if (gen() !== genAt) continue;
- return { rows: buildRows(hit), catalogKnown: true, genAt };
+ return { rows: buildRows(hit), catalogKnown: true, genAt,
+ ...(hit.modelVisibilityOverrides ? { visibilityOverrides: hit.modelVisibilityOverrides } : {}),
+ };
}
}
if (genAt === 0) {
@@ -539,7 +547,9 @@ export async function resolveSubmitGuardCatalog(args: {
try {
const fresh = await fetch();
if (gen() !== genAt) continue; // 拉取期间换代 → join 新代
- return { rows: buildRows(fresh), catalogKnown: true, genAt };
+ return { rows: buildRows(fresh), catalogKnown: true, genAt,
+ ...(fresh.modelVisibilityOverrides ? { visibilityOverrides: fresh.modelVisibilityOverrides } : {}),
+ };
} catch {
if (gen() !== genAt) continue;
return { rows: [], catalogKnown: false, genAt };
@@ -550,7 +560,9 @@ export async function resolveSubmitGuardCatalog(args: {
// await 期间换代 → 旧 promise 返回值已过期(缓存层只拒绝回写、仍 resolve),
// 弃用并 join 新代(下一轮循环重读缓存/新 inflight)。
if (gen() !== genAt) continue;
- return { rows: buildRows(fresh), catalogKnown: true, genAt };
+ return { rows: buildRows(fresh), catalogKnown: true, genAt,
+ ...(fresh.modelVisibilityOverrides ? { visibilityOverrides: fresh.modelVisibilityOverrides } : {}),
+ };
} catch {
if (gen() !== genAt) continue;
return { rows: [], catalogKnown: false, genAt };
@@ -717,6 +729,7 @@ export function pickAgentDefaultRuntime(args: {
deviceId?: string;
/** 供应商目录是否已就绪(加载完成);未就绪时来源校验信任最近会话(见 validateModelProviderId)。 */
catalogReady: boolean;
+ visibilityOverrides?: Record<string, boolean> | null;
}): NewSessionRuntime {
const { agentKind, sessions, modelRows, currentEffort, deviceId, catalogReady } = args;
const recent = pickMostRecentSessionRuntime(sessions, { deviceId, agentKind });
@@ -731,6 +744,7 @@ export function pickAgentDefaultRuntime(args: {
{ model: recent.model, providerId: recent.providerId },
agentKind,
catalogReady,
+ args.visibilityOverrides,
));
} else if (catalogReady && modelRows[0]) {
// 首项分支只在目录就绪时取——切到未缓存设备瞬间旧设备目录会短暂残留
@@ -757,7 +771,7 @@ export function pickAgentDefaultRuntime(args: {
const sectionModel = catalogReady ? findSectionModelRow(modelRows, model, providerId)?.model : undefined;
const effort = sectionModel
? reconcileEffortForModel(sectionModel, baseEffort)
- : catalogReady ? '' : baseEffort;
+ : catalogReady && !modelNeedsReselection(args.visibilityOverrides, agentKind, model, providerId) ? '' : baseEffort;
return { agentKind, model, effort, providerId };
}
@@ -849,6 +863,7 @@ export function resolveNewSessionAutoDefault(input: {
rowsAgentKind: NewSessionAgentKind;
/** 供应商目录是否已就绪;未就绪时来源校验信任最近会话(见 validateModelProviderId)。 */
catalogReady: boolean;
+ visibilityOverrides?: Record<string, boolean> | null;
/** Only an explicitly unsupported provider:list channel permits capabilities fallback. */
providersUnsupported?: boolean;
/** 仅在 provider-aware 列表不可用时传入,避免绕过被控端的模型可见性设置(上游 main 移植)。 */
@@ -879,6 +894,7 @@ export function resolveNewSessionAutoDefault(input: {
{ model: recent.model, providerId: recent.providerId },
recent.agentKind,
catalogReady && recent.agentKind === rowsAgentKind,
+ input.visibilityOverrides,
);
// 跨 agent 跟随时 modelRows 按当前 agent 构建,其档位表对目标 agent 无权威——
// 命中同名模型行会把 recent.effort 错 reconcile 成当前 agent 的默认档(独立
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 371d67dcb3..2b1c42c56c 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -642,7 +642,11 @@ SSH 继续沿用现有伙伴远端技能限制,不读取控制端本机资料
`modelVisibilityOverrides` 与模型 `defaultEnabled` 过滤,再通过原有响应格式传输。
判定复用共享 `isModelVisible`:用户显式开关优先,否则跟随目录默认;不限制已开启模型的
数量、不修改用户偏好。聊天模型按 agent/provider/model 区分,媒体模型沿用主机的显示设置键。
-未开启模型不再传给控制端;供应商结构、连接状态、顺序及开启模型的能力配置保留。
+未开启模型的详情不再传给控制端;供应商结构、连接状态、顺序及开启模型的能力配置保留。
+投影中的既有 `modelVisibilityOverrides` 补齐有效开关布尔值(含默认关闭项),不回写偏好。
+Mobile 据此区分已关闭与已删除的旧选择:保留任务或草稿原模型身份,发送前提示重选,
+不自动替换模型、不清空草稿,也不为旧选择重新传输关闭模型的详情。
这是执行主机的投影修复,旧 Mobile 和远控 Desktop 无需新增能力协商即可接收。
不增加分页、客户端重组或重试,不提高传输大小上限;本机 Desktop 设置仍读取完整目录。
+“关闭后必须重选”的提示与发送前检查随 Mobile 更新;旧版控制端仍沿用各自既有选择处理。