From 552675c26dd01d2c9d0de22d6fa1347d6e61bf19 Mon Sep 17 00:00:00 2001
From: crispinhu27 <353173575+crispinhu27@users.noreply.github.com>
Date: Fri, 20 Nov 2026 12:02:47 +0800
Subject: [PATCH] fix(chat): restore composer choices per conversation
---
chatbot/src/App.jsx | 28 ++++---
chatbot/src/PermissionPicker.jsx | 13 +---
chatbot/src/composer-preferences.js | 38 +++++++++-
chatbot/src/useChat.js | 83 ++++++++++++---------
chatbot/src/useLocalConversations.js | 16 +++-
chatbot/tests/app-render.test.jsx | 71 +++++++++++++-----
chatbot/tests/hooks.test.jsx | 44 +++++++++++
chatbot/tests/pickers-and-activity.test.jsx | 25 ++-----
design.md | 2 +-
9 files changed, 216 insertions(+), 104 deletions(-)
diff --git a/chatbot/src/App.jsx b/chatbot/src/App.jsx
index 0c1daf0fe..5fd415318 100644
--- a/chatbot/src/App.jsx
+++ b/chatbot/src/App.jsx
@@ -75,7 +75,8 @@ import { usePanelPresence } from "./usePanelPresence";
import HomeWelcome from "./HomeWelcome";
import ModelPicker from "./ModelPicker";
import ModelProviderIcon, { hasProviderLogo } from "./ModelProviderIcon";
-import PermissionPicker, { rememberApprovalMode, storedApprovalMode } from "./PermissionPicker";
+import PermissionPicker, { normalizeApprovalMode } from "./PermissionPicker";
+import { useComposerOptions } from "./composer-preferences.js";
import { conversationEngine, engineBrand } from "./engines.js";
import { effortOptions } from "./effort.js";
import QuickAccessWizard from "./QuickAccessWizard";
@@ -342,20 +343,11 @@ export default function App() {
[repositorySelections, setRepositorySelections] = useState({}),
[uploading, setUploading] = useState(false),
[runsRefresh, setRunsRefresh] = useState(0),
- [approvalSelection, setApprovalSelection] = useState(null),
[quickAccessOpen, setQuickAccessOpen] = useState(
() => new URLSearchParams(location.search).get("quickAccess") === "1",
),
[theme, setTheme] = useState(() => readThemePreference(localStorage)),
[environmentVisibility, setEnvironmentVisibility] = useState(() => readJSON(environmentVisibilityKey, {}));
- const approvalUserId = realChat.user?.isGuest ? null : realChat.user?.id ?? null;
- const approval = approvalSelection?.userId === approvalUserId
- ? approvalSelection.value
- : storedApprovalMode(approvalUserId);
- function setApproval(value) {
- setApprovalSelection({ userId: approvalUserId, value });
- rememberApprovalMode(approvalUserId, value);
- }
const environmentPreferenceOwner = String(chat.user?.id || "guest");
const showEnvironmentPicker = environmentVisibility[environmentPreferenceOwner] === true;
function changeEnvironmentVisibility(visible) {
@@ -385,6 +377,13 @@ export default function App() {
// project's unsent new-conversation draft and attachments stay untouched.
const newDraftSlot = issueDraft && issueDraft.projectId === chat.projectId ? "issue:" + issueDraft.issueId : "new:" + chat.projectId;
const draftKey = `agentflow.native-chat.draft.${chat.user?.id || "guest"}.${chat.activeId || newDraftSlot}`;
+ const approvalOwner = realChat.user?.isGuest ? "guest" : realChat.user?.id;
+ const { readOptions: readApproval, saveOptions: saveApproval } = useComposerOptions(approvalOwner);
+ const approvalScope = `approval.${chat.activeId ? `session:${chat.activeId}` : newDraftSlot}`;
+ const approval = normalizeApprovalMode(readApproval(approvalScope).mode);
+ function setApproval(value) {
+ saveApproval(approvalScope, { mode: normalizeApprovalMode(value) });
+ }
useEffect(() => {
if (!chat.activeId) return;
setIssueDraft(null);
@@ -466,7 +465,7 @@ export default function App() {
"个人对话";
const selectedModel = chat.models.find((m) => m.id === chat.model) || (!chat.local ? chat.modelDetails : null);
const modelLabel =
- selectedModel?.name?.replace(/^Claude-/, "").replace(/^GPT-/, "") || "模型";
+ (selectedModel?.name || chat.model)?.replace(/^Claude-/, "").replace(/^GPT-/, "") || "模型";
// The CLI switch is only for a conversation that has not started. A reply
// in flight, or one already saved, keeps that CLI; another CLI needs a new chat.
const lockedExecutorId = chat.session
@@ -771,11 +770,16 @@ export default function App() {
async function submit() {
if (uploading) return;
follow.current = true;
+ const onSessionCreated = !chat.activeId && approval !== "confirm" ? (id) => {
+ saveApproval(`approval.session:${id}`, { mode: approval });
+ if (readApproval(approvalScope).mode === approval) saveApproval(approvalScope, null);
+ } : undefined;
const ok = await chat.send({
text,
attachments,
references,
approvalMode: approval,
+ onSessionCreated,
});
if (ok) {
setMention(null);
@@ -2333,7 +2337,7 @@ export default function App() {
);
if (stored) {
closeDialog();
- await chat.regenerate(stored, approval);
+ await chat.regenerate(stored, dialog.fork ? "confirm" : approval);
}
}
}}
diff --git a/chatbot/src/PermissionPicker.jsx b/chatbot/src/PermissionPicker.jsx
index 0a37c8305..2bf3d6a43 100644
--- a/chatbot/src/PermissionPicker.jsx
+++ b/chatbot/src/PermissionPicker.jsx
@@ -1,7 +1,6 @@
import React, { useCallback, useEffect, useId, useLayoutEffect, useRef, useState } from "react";
import { createPortal } from "react-dom";
import HarnessIcon from "./HarnessIcon";
-import { readComposerPreference, writeComposerPreference } from "./composer-preferences.js";
import { usePanelPresence } from "./usePanelPresence";
import "./permission-picker.css";
@@ -11,16 +10,8 @@ const modes = [
{ id: "auto", icon: "priority-bolt", label: "完全权限", tone: "danger", detail: "工作区文件和命令自动执行;平台及外部操作使用当前账号权限直接执行。" },
];
-const validApprovalMode = (value) => modes.some((mode) => mode.id === value);
-
-export function storedApprovalMode(userId) {
- if (!userId) return "confirm";
- const value = readComposerPreference(`approvalMode.${userId}`);
- return validApprovalMode(value) ? value : "confirm";
-}
-
-export function rememberApprovalMode(userId, value) {
- if (userId && validApprovalMode(value)) writeComposerPreference(`approvalMode.${userId}`, value);
+export function normalizeApprovalMode(value) {
+ return modes.some((mode) => mode.id === value) ? value : "confirm";
}
// `glyph` is a rendered brand mark. Options that only set `icon` keep the Harness icon.
diff --git a/chatbot/src/composer-preferences.js b/chatbot/src/composer-preferences.js
index b03aaa091..be363ff74 100644
--- a/chatbot/src/composer-preferences.js
+++ b/chatbot/src/composer-preferences.js
@@ -1,3 +1,5 @@
+import { useRef, useState } from "react";
+
const prefix = "loopforge.assistant.";
export function readComposerPreference(name) {
@@ -10,8 +12,40 @@ export function readComposerPreference(name) {
export function writeComposerPreference(name, value) {
try {
- localStorage.setItem(prefix + name, value);
+ if (value === null) localStorage.removeItem(prefix + name);
+ else localStorage.setItem(prefix + name, value);
+ return true;
} catch {
- // The selection still applies to the current page.
+ return false;
+ }
+}
+
+// Each conversation or draft has its own key. Keep choices in memory when
+// browser storage is unavailable so switching away still preserves them.
+export function useComposerOptions(userId) {
+ const unsaved = useRef(new Map());
+ const [, refresh] = useState(0);
+ const keyFor = (scope) => `conversation.${userId}.${scope}`;
+
+ function readOptions(scope) {
+ if (userId == null) return {};
+ const key = keyFor(scope);
+ try {
+ return JSON.parse(unsaved.current.get(key) ?? readComposerPreference(key)) || {};
+ } catch {
+ return {};
+ }
+ }
+
+ function saveOptions(scope, value) {
+ if (userId == null) return;
+ const key = keyFor(scope);
+ if (writeComposerPreference(key, value === null ? null : JSON.stringify(value)))
+ unsaved.current.delete(key);
+ else
+ unsaved.current.set(key, JSON.stringify(value));
+ refresh((version) => version + 1);
}
+
+ return { readOptions, saveOptions };
}
diff --git a/chatbot/src/useChat.js b/chatbot/src/useChat.js
index bd0f7fd45..610c25fdd 100644
--- a/chatbot/src/useChat.js
+++ b/chatbot/src/useChat.js
@@ -16,8 +16,8 @@ import { cliFailureSettles } from "./cli-install.jsx";
import { useExecutionMachines } from "./useExecutionMachines.js";
import { executionLocked } from "./execution-target.js";
import { modelEffort } from "./effort.js";
-import { concreteModel, conversationEngine, engineModels } from "./engines.js";
-import { readComposerPreference, writeComposerPreference } from "./composer-preferences.js";
+import { concreteModel, conversationEngine, engineModels, engineOfModel } from "./engines.js";
+import { readComposerPreference, useComposerOptions, writeComposerPreference } from "./composer-preferences.js";
import {
enqueue,
holdQueue,
@@ -74,10 +74,9 @@ function effortPreference(executor, model) {
return `effort.${executor}.${unprefixedModel(executor, model)}`;
}
-// A new conversation restores a listed preference or picks the first model.
+// Prefer the remembered model when supplied, then the first available model.
// CodeBuddy also supports a server-configured fallback when the list is empty.
-function preferredModel(list, executor, codeBuddyDefault) {
- const remembered = readComposerPreference(`model.${executor}`);
+function preferredModel(list, executor, codeBuddyDefault, remembered) {
const available = list.filter((model) => !model.disabled && !model.unavailable);
const listed = findExecutorModel(available, executor, remembered);
return (listed && remembered) || available[0]?.id || (executor === "codebuddy" ? codeBuddyDefault : "");
@@ -152,6 +151,7 @@ export function useChat() {
// A queued message sent with "send now": it interrupts the running reply
// and stays on screen until the server's follow-up turn has started.
[steering, setSteering] = useState(null);
+ const { readOptions, saveOptions } = useComposerOptions(user?.isGuest ? "guest" : user?.id);
const executionMachines = useExecutionMachines(
user?.isGuest ? null : user?.id,
submitting || generation?.status === "running",
@@ -230,6 +230,15 @@ export function useChat() {
setDraftIssueId("");
open(null);
}, [open]);
+ function restoreConversationModel(stored) {
+ const picked = readOptions(`model.${stored.id}`);
+ const locked = conversationEngine(stored.messages, models, stored.executor);
+ const engine = knownExecutor(locked || picked.executor || stored.executor || engineOfModel(stored.model, models));
+ const selection = picked.executor === engine ? picked : stored;
+ setExecutorState(engine);
+ setModel(selection.model || null);
+ setEffort(selection.effort ?? "");
+ }
const applyModelCatalog = useCallback((catalog) => {
setModels(catalog.models || []);
setCodeBuddyDefault({ id: catalog.default || "default", name: "默认", efforts: catalog.defaultEfforts });
@@ -319,14 +328,7 @@ export function useChat() {
if (!current || currentId.current !== activeId) return;
setSession(stored);
changeURL(stored.id);
- // A conversation stays on the CLI that answered it. Replies saved before
- // model prefixes keep that CLI on the session executor.
- const locked = conversationEngine(stored.messages, models, stored.executor);
- const storedEngine = knownExecutor(locked || stored.executor);
- setExecutorState(storedEngine);
- // A conversation shows the model it runs on.
- setModel(stored.model || null);
- setEffort(stored.effort || "");
+ restoreConversationModel(stored);
setProjectId(stored.projectId || "");
syncProject(stored.projectId || "");
const recovered = connectionError;
@@ -615,9 +617,13 @@ export function useChat() {
return findExecutorModel(executorModels, executor, id) ??
(codeBuddy && id === codeBuddyDefault.id ? codeBuddyDefault : undefined);
}
- const hasSelectedModel = model !== null &&
- (session || !executorModels.length || findExecutorModel(executorModels, executor, model));
- const selectedModel = hasSelectedModel ? model : preferredModel(executorModels, executor, codeBuddyDefault.id);
+ const listedModel = findExecutorModel(executorModels, executor, model);
+ const hasSelectedModel = model !== null && !listedModel?.disabled && !listedModel?.unavailable &&
+ (session || !executorModels.length || listedModel);
+ const selectedModel = hasSelectedModel ? model : preferredModel(
+ executorModels, executor, codeBuddyDefault.id,
+ activeId ? null : readComposerPreference(`model.${executor}`),
+ );
const availableModel = sponsored ? sharedModelFor(selectedModel) : selectedModel;
const activeModelEntry = modelEntry(availableModel);
const activeModel = activeModelEntry?.id ?? availableModel;
@@ -630,7 +636,7 @@ export function useChat() {
: undefined;
// null follows the browser preference, while "" is the CLI's default level.
const preferredEffort = ((model === null || hasSelectedModel) ? effort : null) ??
- readComposerPreference(effortPreference(executor, availableModel));
+ (activeId ? null : readComposerPreference(effortPreference(executor, availableModel)));
const activeEffort = modelEffort(activeModelEntry, preferredEffort || legacyEffort);
useEffect(() => {
const key = agyAccountKey || executor;
@@ -662,24 +668,25 @@ export function useChat() {
current = false;
};
}, [agyAccountKey, codeBuddy, executor, listedForEngine.length, personalMachineId, providerCatalogs]);
- const chooseExecutor = useCallback(
- (id) => {
- if (id === "claude") id = "claude-code";
- if (!EXECUTORS.some((item) => item.id === id) || id === executor) return;
- const locked = conversationEngine(sessionRef.current?.messages, models, sessionRef.current?.executor);
- writeComposerPreference("executor", id);
- if (locked && locked !== id) open(null);
- setExecutorState(id);
- setModel(null);
- setEffort(null);
- },
- [executor, models, open],
- );
+ function chooseExecutor(id) {
+ if (id === "claude") id = "claude-code";
+ if (!EXECUTORS.some((item) => item.id === id) || id === executor) return;
+ const current = sessionRef.current;
+ const locked = conversationEngine(current?.messages, models, current?.executor);
+ writeComposerPreference("executor", id);
+ if (locked && locked !== id) open(null);
+ else if (current?.id === activeId) saveOptions(`model.${activeId}`, { executor: id });
+ setExecutorState(id);
+ setModel(null);
+ setEffort(null);
+ }
function rememberModelChoice(id, level) {
writeComposerPreference("executor", executor);
writeComposerPreference(`model.${executor}`, id);
writeComposerPreference(effortPreference(executor, id), level);
+ if (sessionRef.current?.id === activeId)
+ saveOptions(`model.${activeId}`, { executor, model: id, effort: level });
}
function chooseModel(id) {
@@ -896,6 +903,7 @@ export function useChat() {
references = [],
approvalMode = "confirm",
approvalUserId,
+ onSessionCreated,
messagesOverride = null,
fromQueue = false,
}) {
@@ -991,7 +999,10 @@ export function useChat() {
},
"PUT",
);
+ onSessionCreated?.(s.id);
setSession(s);
+ setModel(activeModel);
+ setEffort(activeEffort);
currentId.current = id;
setActiveId(id);
changeURL(id);
@@ -1110,6 +1121,7 @@ export function useChat() {
async function remove(id) {
try {
await api(sessionPath(id), { method: "DELETE" });
+ saveOptions(`model.${id}`, null);
if (id === currentId.current) newChat();
await refreshSessions();
} catch (e) {
@@ -1124,8 +1136,7 @@ export function useChat() {
);
open(stored.id);
setSession(stored);
- setModel(stored.model || null);
- setEffort(stored.effort || "");
+ restoreConversationModel(stored);
await refreshSessions();
return stored;
} catch (e) {
@@ -1141,16 +1152,18 @@ export function useChat() {
setSubmitting(true);
open(stored.id);
setSession(stored);
- const chosen = sponsored ? sharedModelFor(stored.model || activeModel) : stored.model || activeModel;
+ const savedModel = sponsored ? sharedModelFor(stored.model || activeModel) : stored.model || activeModel;
+ const chosen = stored.id === activeId ? activeModel : modelEntry(savedModel)?.id || savedModel;
+ const level = stored.id === activeId ? activeEffort : modelEffort(modelEntry(chosen), stored.effort || "");
setModel(chosen);
- setEffort(stored.effort || "");
+ setEffort(level);
const g = await write("/api/assistant/generations", {
sessionId: stored.id,
projectId: stored.projectId || "",
runId: stored.runId || "",
executor,
model: chosen,
- effort: modelEffort(modelEntry(chosen), stored.effort || ""),
+ effort: level,
messages: stored.messages,
approvalMode: ["confirm", "assisted", "auto"].includes(approvalMode) ? approvalMode : "confirm",
approvalUserId: user?.id,
diff --git a/chatbot/src/useLocalConversations.js b/chatbot/src/useLocalConversations.js
index 39968bf5b..9ce3da567 100644
--- a/chatbot/src/useLocalConversations.js
+++ b/chatbot/src/useLocalConversations.js
@@ -1,4 +1,5 @@
import { useCallback, useEffect, useRef, useState } from "react";
+import { modelEffort } from "./effort.js";
import { createLocalConversations } from "./local-conversation-fixtures.js";
import { localId as newLocalId } from "./local-id.js";
@@ -123,6 +124,7 @@ export function useLocalConversations(real) {
const rows = store.key === key ? store.sessions : [];
const session = available ? rows.find((row) => row.id === localId) : null;
const local = !!session;
+ const localModel = session?.model || real.model;
const selected = () => availableRef.current && storeRef.current.sessions.find((row) => row.id === localIdRef.current);
const setGeneration = (id, value) => {
const next = { ...generationsRef.current, [id]: value };
@@ -188,7 +190,8 @@ export function useLocalConversations(real) {
session,
projectId: session.projectId || "",
issueId: session.issueId || "",
- model: session.model || real.model,
+ model: localModel,
+ effort: modelEffort(real.models?.find((item) => item.id === localModel), session.effort),
generation: generations[session.id] || null,
live: emptyLive,
busy: generations[session.id]?.status === "running",
@@ -210,8 +213,15 @@ export function useLocalConversations(real) {
},
setModel(value) {
const current = selected();
- if (current) update(current.id, (row) => ({ ...row, model: value }));
- else if (!isLocalConversation(localIdRef.current)) real.setModel(value);
+ if (current) {
+ const model = real.models?.find((item) => item.id === value);
+ update(current.id, (row) => ({ ...row, model: value, effort: modelEffort(model, row.effort) }));
+ } else if (!isLocalConversation(localIdRef.current)) real.setModel(value);
+ },
+ setEffort(value) {
+ const current = selected();
+ if (current) update(current.id, (row) => ({ ...row, effort: value }));
+ else if (!isLocalConversation(localIdRef.current)) real.setEffort(value);
},
setSession(value) {
const current = selected();
diff --git a/chatbot/tests/app-render.test.jsx b/chatbot/tests/app-render.test.jsx
index 6861c8e42..0965b4fb9 100644
--- a/chatbot/tests/app-render.test.jsx
+++ b/chatbot/tests/app-render.test.jsx
@@ -92,34 +92,55 @@ describe("App", () => {
Object.assign(chat, previous);
}
});
- test("keeps the picked approval mode after a reload", async () => {
+ test("keeps draft approval across a reload and moves it to the saved conversation", async () => {
+ const original = { activeId: chat.activeId, session: chat.session };
const user = userEvent.setup();
const first = render();
await user.click(screen.getByRole("button", { name: "操作确认方式" }));
await user.click(screen.getByRole("menuitemradio", { name: "帮我批准" }));
expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("帮我批准");
first.unmount();
- render();
- expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("帮我批准");
- await user.type(screen.getByRole("textbox", { name: /消息|输入/ }), "你好");
- await user.click(screen.getByRole("button", { name: "发送消息" }));
- expect(chat.send).toHaveBeenLastCalledWith(expect.objectContaining({ approvalMode: "assisted" }));
+ const reloaded = render();
+ try {
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("帮我批准");
+ chat.send.mockImplementationOnce(async ({ onSessionCreated }) => {
+ onSessionCreated("new-session");
+ return true;
+ });
+ await user.type(screen.getByRole("textbox", { name: /消息|输入/ }), "你好");
+ await user.click(screen.getByRole("button", { name: "发送消息" }));
+ expect(chat.send).toHaveBeenLastCalledWith(expect.objectContaining({ approvalMode: "assisted" }));
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("请求批准");
+ Object.assign(chat, { activeId: "new-session", session: { id: "new-session", messages: [] } });
+ reloaded.rerender();
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("帮我批准");
+ } finally {
+ Object.assign(chat, original);
+ }
});
- test("restores full permission after a reload and resets it for another account", async () => {
+ test("restores full permission only for the conversation and account that picked it", async () => {
+ const original = { activeId: chat.activeId, session: chat.session, user: chat.user };
const user = userEvent.setup();
- const first = render();
- await user.click(screen.getByRole("button", { name: "操作确认方式" }));
- await user.click(screen.getByRole("menuitemradio", { name: "完全权限" }));
- first.unmount();
- const reloaded = render();
- fireEvent.keyDown(window, { key: "O", ctrlKey: true, shiftKey: true });
- expect(chat.newChat).toHaveBeenCalled();
- expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("完全权限");
- await user.type(screen.getByRole("textbox", { name: /消息|输入/ }), "你好");
- await user.click(screen.getByRole("button", { name: "发送消息" }));
- expect(chat.send).toHaveBeenLastCalledWith(expect.objectContaining({ approvalMode: "auto" }));
- const originalUser = chat.user;
+ const open = (id) => Object.assign(chat, { activeId: id, session: id && { id, messages: [] } });
try {
+ open("s1");
+ const first = render();
+ await user.click(screen.getByRole("button", { name: "操作确认方式" }));
+ await user.click(screen.getByRole("menuitemradio", { name: "完全权限" }));
+ open("s2");
+ first.rerender();
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("请求批准");
+ open(null);
+ first.rerender();
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("请求批准");
+ first.unmount();
+
+ open("s1");
+ const reloaded = render();
+ expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("完全权限");
+ await user.type(screen.getByRole("textbox", { name: "消息" }), "你好");
+ await user.click(screen.getByRole("button", { name: "发送消息" }));
+ expect(chat.send).toHaveBeenLastCalledWith(expect.objectContaining({ approvalMode: "auto" }));
chat.user = { id: "u2", loginName: "another-user" };
reloaded.rerender();
expect(screen.getByRole("button", { name: "操作确认方式" })).toHaveTextContent("请求批准");
@@ -127,7 +148,17 @@ describe("App", () => {
await user.click(screen.getByRole("button", { name: "发送消息" }));
expect(chat.send).toHaveBeenLastCalledWith(expect.objectContaining({ approvalMode: "confirm" }));
} finally {
- chat.user = originalUser;
+ Object.assign(chat, original);
+ }
+ });
+ test("labels a historical model by its ID when it has no catalog entry", () => {
+ const original = chat.model;
+ try {
+ chat.model = "codex:retired-model";
+ render();
+ expect(screen.getByRole("button", { name: "选择模型" })).toHaveTextContent("codex:retired-model");
+ } finally {
+ chat.model = original;
}
});
test("does not ask for per-command native approval in a working conversation", () => {
diff --git a/chatbot/tests/hooks.test.jsx b/chatbot/tests/hooks.test.jsx
index 518ee1a6f..9b4f4fb68 100644
--- a/chatbot/tests/hooks.test.jsx
+++ b/chatbot/tests/hooks.test.jsx
@@ -107,6 +107,50 @@ describe("conversation hooks", () => {
await waitFor(() => expect(result.current.model).toBe("gpt-5"));
});
+ test("restores the conversation's unsent choices even after choosing a stronger model elsewhere", async () => {
+ const original = apiMock.getMockImplementation();
+ apiMock.mockImplementation(async (path, options) => {
+ if (path === "/api/assistant/models") return {
+ default: "m1",
+ models: [{ id: "m1" }, { id: "m2", efforts: ["high"] }, { id: "m3", efforts: ["max"] }],
+ };
+ if (path === "/api/assistant/sessions/s2") return { id: "s2", model: "m1", messages: [] };
+ return original(path, options);
+ });
+ try {
+ const first = renderHook(useChat);
+ await waitFor(() => expect(first.result.current.ready).toBe(true));
+ act(() => first.result.current.open("s1"));
+ await waitFor(() => expect(first.result.current.session?.id).toBe("s1"));
+ act(() => first.result.current.setModel("m2"));
+ act(() => first.result.current.setEffort("high"));
+
+ act(() => first.result.current.open("s2"));
+ await waitFor(() => expect(first.result.current.session?.id).toBe("s2"));
+ expect(first.result.current).toMatchObject({ model: "m1", effort: "" });
+ act(() => first.result.current.setModel("m3"));
+ act(() => first.result.current.setEffort("max"));
+
+ act(() => first.result.current.newChat());
+ expect(first.result.current).toMatchObject({ model: "m3", effort: "max" });
+ act(() => first.result.current.open("s1"));
+ await waitFor(() => expect(first.result.current.session?.id).toBe("s1"));
+ expect(first.result.current).toMatchObject({ model: "m2", effort: "high" });
+ expect(writeMock).not.toHaveBeenCalled();
+
+ first.unmount();
+ const reloaded = renderHook(useChat);
+ await waitFor(() => expect(reloaded.result.current.session?.id).toBe("s1"));
+ expect(reloaded.result.current).toMatchObject({ model: "m2", effort: "high" });
+ await act(() => reloaded.result.current.send({ text: "继续原会话" }));
+ expect(writeMock).toHaveBeenCalledWith("/api/assistant/generations", expect.objectContaining({
+ sessionId: "s1", model: "m2", effort: "high",
+ }));
+ } finally {
+ apiMock.mockImplementation(original);
+ }
+ });
+
test("does not create a chat without a concrete model on Pi", async () => {
const view = renderHook(() => useChat());
try {
diff --git a/chatbot/tests/pickers-and-activity.test.jsx b/chatbot/tests/pickers-and-activity.test.jsx
index a27fbdc36..41adf6bc2 100644
--- a/chatbot/tests/pickers-and-activity.test.jsx
+++ b/chatbot/tests/pickers-and-activity.test.jsx
@@ -21,7 +21,7 @@ import ActivityTrace from "../src/ActivityTrace.jsx";
import MentionPicker from "../src/MentionPicker.jsx";
import ModelPicker from "../src/ModelPicker.jsx";
import Participants, { Avatar, authorFor, peopleFor } from "../src/Participants.jsx";
-import PermissionPicker, { rememberApprovalMode, storedApprovalMode } from "../src/PermissionPicker.jsx";
+import PermissionPicker, { normalizeApprovalMode } from "../src/PermissionPicker.jsx";
import { SidebarSection } from "../src/SidebarPreview.jsx";
describe("pickers and activity", () => {
@@ -81,25 +81,10 @@ describe("pickers and activity", () => {
expect(selectPermission).toHaveBeenCalledWith("auto");
});
- test("remembers the approval mode and ignores unknown values", () => {
- expect(storedApprovalMode(1)).toBe("confirm");
- rememberApprovalMode(1, "assisted");
- expect(storedApprovalMode(1)).toBe("assisted");
- rememberApprovalMode(1, "bogus");
- expect(storedApprovalMode(1)).toBe("assisted");
- localStorage.setItem("loopforge.assistant.approvalMode.1", "bogus");
- expect(storedApprovalMode(1)).toBe("confirm");
- });
-
- test("only restores full permissions for the account that selected them", () => {
- localStorage.setItem("loopforge.assistant.approvalMode", "auto");
- expect(storedApprovalMode(1)).toBe("confirm");
- rememberApprovalMode(1, "auto");
- expect(storedApprovalMode(1)).toBe("auto");
- expect(storedApprovalMode(2)).toBe("confirm");
- expect(storedApprovalMode(null)).toBe("confirm");
- rememberApprovalMode(1, "confirm");
- expect(storedApprovalMode(1)).toBe("confirm");
+ test("uses request approval for an unknown mode", () => {
+ expect(normalizeApprovalMode("auto")).toBe("auto");
+ expect(normalizeApprovalMode("bogus")).toBe("confirm");
+ expect(normalizeApprovalMode(undefined)).toBe("confirm");
});
test("expands detailed activity including failures", async () => {
diff --git a/design.md b/design.md
index 0461ff6ff..89bfc8248 100644
--- a/design.md
+++ b/design.md
@@ -89,7 +89,7 @@
- 模型触发器和选项显示品牌图标;未知品牌使用通用图标,不影响模型可选性。
- 品牌图标保留原始颜色及明暗主题变体,悬停时只在图形内部播放短暂光效。
- 模型列表保留服务端顺序、真实模型 ID、名称、系列及倍率信息,品牌推断只用于展示。
-- 对话输入区在当前浏览器记住最近选用的 CLI、每个 CLI 的模型和每个模型的思考强度。操作确认方式在同一浏览器内按登录账号保存,新账号默认使用「请求批准」。模型菜单只列出具体模型。刷新或开始新对话时优先恢复上次选用的可用模型,其次选择列表第一项。打开已有对话时模型和强度以会话记录为准。
+- 对话输入区在当前浏览器记住最近选用的 CLI、每个 CLI 的模型和每个模型的思考强度。模型菜单只列出具体模型。新对话优先选用该 CLI 最近选择的可用模型,其次选择列表第一项。已有对话优先恢复当前账号在该会话选过的模型和思考强度,包括尚未发送的选择,其次使用会话记录。操作确认方式按账号和会话记忆,首次选择前使用「请求批准」。新对话草稿的审批选择随首条消息移入该会话。
- Antigravity 使用账号登录的执行机器时,优先使用已保存的目录,目录为空时查询该机器的可用模型。同一模型的强度变体合并为一个模型,思考强度菜单只显示目录提供的档位,执行时使用对应的模型 ID。Gemini API Key 使用 Gemini 模型目录,自定义网关使用该服务的目录。CLI 选择显示 Antigravity 标识,Gemini 和 Claude 模型显示各自标识。
- 发送消息时校验审批选择对应的账号与当前登录账号。切换账号后,从旧标签页发送会提示刷新。
- 保存 CLI 凭据后自动更新对话输入区的模型和强度。Cursor 后台探测完成时更新账号模型目录。