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): 发送时因模型已关闭打开模型列表,也显示重选提示 (#5850)

FicoWangc6682dc941b6
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 7ec6707822..3903cfc817 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -6307,6 +6307,9 @@ export default function SessionScreen() {
selectionAtSend.agentKind, selectionAtSend.model, selectionAtSend.providerId,
)) {
setError(t('session.common.modelHiddenReselect', { model: selectionAtSend.model }));
+ // 与手动打开入口一致:面板按「待切换目标 / 当前任务引擎」浏览,才能把已关闭的
+ // 原选模型认作当前选择并显示重选提示(#5580)。
+ setModelSheetAgentKind(selectionAtSend.agentKind);
setModelSheetOpen(true);
sendInFlightRef.current = false;
setSending(false);
diff --git a/apps/mobile/src/__tests__/sessionSendHiddenModelSheet.test.ts b/apps/mobile/src/__tests__/sessionSendHiddenModelSheet.test.ts
new file mode 100644
index 0000000000..194ca73450
--- /dev/null
+++ b/apps/mobile/src/__tests__/sessionSendHiddenModelSheet.test.ts
@@ -0,0 +1,37 @@
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+// #5580:已有任务当前模型被电脑端关闭后,直接点发送会被拦截并自动打开模型面板。
+// 面板只在「浏览引擎 = 当前选择所在引擎」时把原选模型认作当前选择并显示重选提示;
+// 发送入口必须像手动打开入口一样先初始化浏览引擎,否则首次直接发送看不到提示。
+const readTextLf = (path: string): string =>
+ String(readFileSync(resolve(process.cwd(), path), "utf8")).replace(/\r\n/g, "\n");
+
+const screen = readTextLf("app/sessions/[sessionId].tsx");
+
+function hiddenModelSendBlock(): string {
+ const start = screen.indexOf("modelNeedsReselection(\n getCachedDeviceProviders(deviceId)?.modelVisibilityOverrides,");
+ expect(start).toBeGreaterThan(0);
+ const end = screen.indexOf("return;\n }", start);
+ expect(end).toBeGreaterThan(start);
+ return screen.slice(start, end);
+}
+
+describe("session send blocked by a hidden model", () => {
+ it("points the model sheet at the selection being validated before opening it", () => {
+ const block = hiddenModelSendBlock();
+ const init = block.indexOf("setModelSheetAgentKind(selectionAtSend.agentKind);");
+ const open = block.indexOf("setModelSheetOpen(true);");
+ expect(init).toBeGreaterThan(0);
+ expect(open).toBeGreaterThan(init);
+ });
+
+ it("validates the pending cross-agent target, matching the manual picker entry", () => {
+ expect(screen).toContain(
+ "? { agentKind: intentAtSend.targetAgentKind, model: intentAtSend.model, providerId: intentAtSend.providerId }",
+ );
+ expect(screen).toContain("setModelSheetAgentKind(agentSwitchIntent?.targetAgentKind ?? sessionAgentKind);");
+ });
+});