Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion chatbot/src/engines.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export function engineOfModel(id, models = []) {
}

export const concreteModel = (model, engine = modelEngine(model)) =>
!!model?.id && model.id !== "default" && model.id !== `${engine}:default`;
!!model?.id && model.id !== "default" && model.id !== `${engine}:default` &&
(engine !== "codebuddy" || (model.id !== "default-model" && model.id !== "codebuddy:default-model"));

export const engineModels = (models, engine) =>
(models || []).filter((m) => modelEngine(m) === engine && concreteModel(m, engine));
Expand Down
63 changes: 37 additions & 26 deletions chatbot/src/useChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,15 @@ function effortPreference(executor, model) {
return `effort.${executor}.${unprefixedModel(executor, 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, remembered) {
// Use the first requested preference that is available for this executor.
function preferredModel(list, executor, ...preferences) {
const available = list.filter((model) => !model.disabled && !model.unavailable);
const listed = findExecutorModel(available, executor, remembered);
return (listed && remembered) || available[0]?.id || (executor === "codebuddy" ? codeBuddyDefault : "");
for (const id of preferences) {
if (!concreteModel({ id }, executor)) continue;
const listed = findExecutorModel(available, executor, id);
if (listed) return id;
}
return available[0]?.id || "";
}

// Mirrors errAssistantSponsoredModel in internal/httpapi/assistant_sponsor.go;
Expand Down Expand Up @@ -111,7 +114,8 @@ export function useChat() {
[revealId, setRevealId] = useState(activeId),
[projectId, setProjectId] = useState(initialProject),
[selection, setSelection] = useState(() => ({ executor: storedExecutor(), model: null, effort: null })),
[codeBuddyDefault, setCodeBuddyDefault] = useState({ id: "default", name: "默认" }),
[accountDefaults, setAccountDefaults] = useState(null),
[codeBuddyCatalogDefault, setCodeBuddyCatalogDefault] = useState(""),
[sponsoredModels, setSponsoredModels] = useState([]),
[providerCatalogs, setProviderCatalogs] = useState({}),
[generation, setGeneration] = useState(null),
Expand Down Expand Up @@ -251,7 +255,8 @@ export function useChat() {
}
const applyModelCatalog = useCallback((catalog) => {
setModels(catalog.models || []);
setCodeBuddyDefault({ id: catalog.default || "default", name: "默认", efforts: catalog.defaultEfforts });
setAccountDefaults(catalog.preferences || null);
setCodeBuddyCatalogDefault(catalog.default || "");
setSponsoredModels(sponsoredModelList(catalog));
}, []);
useEffect(() => {
Expand Down Expand Up @@ -653,15 +658,19 @@ export function useChat() {
: listed;
const sponsored = codeBuddy && missingKey && !user.isGuest && !!sponsoredModel;
const listedModel = findExecutorModel(executorModels, executor, model);
const hasSelectedModel = model !== null && !listedModel?.disabled && !listedModel?.unavailable &&
const concrete = concreteModel({ id: model }, executor);
const hasSelectedModel = concrete && !listedModel?.disabled && !listedModel?.unavailable &&
(conversation || !executorModels.length || listedModel);
const inheritsDefault = !!conversation && !concrete;
const personalDefault = inheritsDefault && !sponsored && accountDefaults?.executor === executor ? accountDefaults : null;
const selectedModel = hasSelectedModel ? model : preferredModel(
executorModels, executor, codeBuddyDefault.id,
executorModels, executor,
personalDefault?.model,
inheritsDefault ? (codeBuddy ? codeBuddyCatalogDefault : providerCatalog?.default) : null,
draft ? readComposerPreference(`model.${executor}`) : null,
);
const availableModel = sponsored && !sponsoredModels.includes(selectedModel) ? sponsoredModel : selectedModel;
const catalogEntry = findExecutorModel(executorModels, executor, availableModel) ??
(codeBuddy && availableModel === codeBuddyDefault.id ? codeBuddyDefault : undefined);
const catalogEntry = findExecutorModel(executorModels, executor, availableModel);
const activeModel = catalogEntry?.id ?? availableModel;
const requestedModelId = unprefixedModel(executor, availableModel);
const unavailableAgyVariant = agyAccountKey && providerCatalog && !catalogEntry &&
Expand All @@ -671,7 +680,9 @@ export function useChat() {
? catalogEntry?.efforts?.find((level) => catalogEntry.effortModelIds?.[level] === requestedModelId)
: undefined;
// null follows the browser preference, while "" is the CLI's default level.
const preferredEffort = ((model === null || hasSelectedModel) ? effort : null) ??
const defaultEffort = personalDefault && catalogEntry && catalogEntry === findExecutorModel(executorModels, executor, personalDefault.model)
? personalDefault.effort : null;
const preferredEffort = (inheritsDefault ? defaultEffort : ((model === null || hasSelectedModel) ? effort : null)) ??
(draft ? readComposerPreference(effortPreference(executor, availableModel)) : null);
// Custom models can remain usable without a picker entry. Keep their
// saved effort visible and let the server validate it on send.
Expand Down Expand Up @@ -1024,11 +1035,6 @@ export function useChat() {
setError("会话仍在加载,请稍候再发送。");
return false;
}
const modelError = composerModelError(composerModel);
if (modelError) {
setError(modelError);
return false;
}
const currentProjectId = sessionRef.current?.projectId || "";
const approval = fromQueue
? queuedApproval({ approvalMode, approvalUserId, approvalProjectId }, user?.id, currentProjectId)
Expand All @@ -1038,6 +1044,11 @@ export function useChat() {
generation?.status === "running" ||
steeringRef.current?.sessionId === currentId.current
) {
const modelError = composerModelError(composerModel);
if (modelError) {
setError(modelError);
return false;
}
// Internal follow-ups (confirmed drafts) never queue or interrupt.
if (messagesOverride || fromQueue || !currentId.current) {
setError("当前回复仍在生成,请稍后再试。");
Expand Down Expand Up @@ -1080,20 +1091,20 @@ export function useChat() {
try {
// Recheck credentials before creating the session in case the user
// configured a key elsewhere after this tab loaded.
if (
codeBuddy &&
!sponsoredModel &&
users.find((u) => u.id === user?.id)?.codeBuddyApiKeyConfigured === undefined &&
user &&
!user.isGuest
) {
const account = users.find((u) => u.id === user?.id) ?? user;
if (codeBuddy && user && !user.isGuest && !sponsoredModel && !account?.codeBuddyApiKeyConfigured) {
const rows = await api("/api/users").catch(() => null);
if (rows) setUsers(rows);
const fresh = rows?.find((u) => u.id === user.id);
if (fresh && !fresh.codeBuddyApiKeyConfigured) {
const fresh = rows?.find((u) => u.id === user.id) ?? account;
if (!fresh?.codeBuddyApiKeyConfigured) {
if (viewingTarget()) setError("请先在个人配置中配置自己的 CodeBuddy API Key");
return false;
}
requestModelCatalogRefresh((revision) => revision + 1);
if (!composerModel.activeModel) {
if (viewingTarget()) setError("CodeBuddy 凭证已更新,正在刷新模型列表,请稍后重试。");
return false;
}
}
const chosen = await modelForRequest({ executor, model, effort }, s, composerModel);
if (!s) {
Expand Down
93 changes: 93 additions & 0 deletions chatbot/tests/hooks.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,99 @@ describe("conversation hooks", () => {
}
});

test.each([
[false, "请先在个人配置中配置自己的 CodeBuddy API Key"],
[true, "当前 CLI 暂无可用模型,请在个人配置中获取或添加模型。"],
])("blocks sends without a usable CodeBuddy model (key configured: %s)", async (configured, message) => {
localStorage.removeItem("loopforge.assistant.executor");
const original = apiMock.getMockImplementation();
const user = { id: 1, loginName: "tester", codeBuddyApiKeyConfigured: configured };
apiMock.mockImplementation((path, options) => {
if (path === "/api/auth/current") return Promise.resolve({ user });
if (path === "/api/users") return Promise.resolve([user]);
if (path === "/api/assistant/models") return Promise.resolve({
default: "default", models: [{ id: "default" }, { id: "default-model" }],
});
return original(path, options);
});
try {
const { result } = renderHook(useChat);
await waitFor(() => expect(result.current.ready && result.current.machinesReady).toBe(true));
expect(result.current.models).toEqual([]);
expect(result.current.model).toBe("");
await act(async () => expect(await result.current.send({ text: "草稿" })).toBe(false));
expect(result.current.error).toBe(message);
expect(writeMock).not.toHaveBeenCalled();
} finally {
apiMock.mockImplementation(original);
}
});

test("reloads the model list if a CodeBuddy key was added in another tab", async () => {
localStorage.removeItem("loopforge.assistant.executor");
const original = apiMock.getMockImplementation();
const user = { id: 1, loginName: "tester" };
let configured = false;
apiMock.mockImplementation((path, options) => {
if (path === "/api/auth/current") return Promise.resolve({ user });
if (path === "/api/users") return Promise.resolve([{ ...user, codeBuddyApiKeyConfigured: configured }]);
if (path === "/api/assistant/models") return Promise.resolve({
default: "default", models: configured ? [{ id: "deepseek-v4.1-flash" }] : [],
});
return original(path, options);
});
try {
const { result } = renderHook(useChat);
await waitFor(() => expect(result.current.ready && result.current.machinesReady).toBe(true));
configured = true;
await act(async () => expect(await result.current.send({ text: "草稿" })).toBe(false));
expect(result.current.error).toContain("正在刷新模型列表");
expect(writeMock).not.toHaveBeenCalled();
await waitFor(() => expect(result.current.model).toBe("deepseek-v4.1-flash"));
await act(async () => expect(await result.current.send({ text: "草稿" })).toBe(true));
expect(writeMock).toHaveBeenCalledWith("/api/assistant/generations", expect.objectContaining({
executor: "codebuddy", model: "deepseek-v4.1-flash",
}));
} finally {
apiMock.mockImplementation(original);
}
});

test.each([
["personal default", "codebuddy:default", { executor: "codebuddy", model: "m3", effort: "high" }, "m2", "m3", "high"],
["catalog default for the original CLI", "codebuddy:default", { executor: "codex", model: "gpt-5" }, "m2", "m2", ""],
["first available model", "codebuddy:default", { executor: "codebuddy", model: "retired" }, "default", "m1", ""],
["explicitly selected model", "m1", { executor: "codebuddy", model: "m3" }, "m2", "m1", ""],
])("uses the %s when reopening and regenerating an old conversation", async (_name, savedModel, preferences, catalogDefault, expectedModel, expectedEffort) => {
localStorage.removeItem("loopforge.assistant.executor");
const original = apiMock.getMockImplementation();
const saved = {
id: "s1", projectId: "p1", executor: "codebuddy", model: savedModel,
messages: [{ role: "user", content: "继续" }],
};
apiMock.mockImplementation((path, options) => {
if (path === "/api/assistant/models") return Promise.resolve({
default: catalogDefault, preferences, models: [{ id: "m1" }, { id: "m2" }, { id: "m3", efforts: ["high"] }],
});
if (path === "/api/assistant/sessions/s1") return Promise.resolve(saved);
return original(path, options);
});
try {
const { result } = renderHook(useChat);
await waitFor(() => expect(result.current.ready && result.current.machinesReady).toBe(true));
act(() => result.current.open(saved.id));
await waitFor(() => expect(result.current.session?.id).toBe(saved.id));
expect(result.current.model).toBe(expectedModel);
expect(result.current.effort).toBe(expectedEffort);
await act(() => result.current.regenerate(saved, "confirm"));
expect(writeMock).toHaveBeenCalledWith("/api/assistant/generations", expect.objectContaining({
sessionId: saved.id, executor: "codebuddy", model: expectedModel, effort: expectedEffort,
}));
} finally {
apiMock.mockImplementation(original);
}
});

test("without an own key chat is limited to the administrator's shared models", async () => {
localStorage.removeItem("loopforge.assistant.executor");
const original = apiMock.getMockImplementation();
Expand Down
2 changes: 1 addition & 1 deletion internal/httpapi/assistant.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func (h *assistantHandlers) chat(c *gin.Context) {
return
}
catalogEngine, _ := assistantModelEngine(req.Model)
catalog := assistantChatCatalog(c.Request.Context(), user.CodeBuddyInternetEnvironment, nil)
catalog := loadAssistantModels(user.CodeBuddyInternetEnvironment, user.CodeBuddyAPIKey)
if catalogEngine == assistantEngineCodeBuddy {
catalog = h.turnCatalog(c.Request.Context(), user, req.Model)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/httpapi/assistant_approval_review.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (h *assistantHandlers) approvalReviewer(req assistantRequest, user domain.U
if h.reviewCatalog != nil {
catalog = h.reviewCatalog(user.CodeBuddyInternetEnvironment)
} else {
catalog = h.chatCatalog(context.Background(), user)
catalog = h.chatCatalog(user)
}
models := assistantApprovalReviewModels(catalog)
var modelMu sync.Mutex
Expand Down
4 changes: 2 additions & 2 deletions internal/httpapi/assistant_approval_review_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestAssistantApprovalReviewUsesConfiguredDefaultWithoutPrices(t *testing.T)

func TestAssistantChatCatalogPreselectsSponsoredModelOnlyWithSponsor(t *testing.T) {
t.Setenv("AGENTFLOW_ASSISTANT_MODEL", "team-model")
catalog := assistantChatCatalog(context.Background(), "", nil)
catalog := loadAssistantModels("", "")
if catalog.Default != "team-model" {
t.Fatal("chat default without sponsor", catalog)
}
Expand All @@ -55,7 +55,7 @@ func TestAssistantChatCatalogPreselectsSponsoredModelOnlyWithSponsor(t *testing.
t.Fatal("sponsored model listed without sponsor", catalog)
}
}
catalog = assistantChatCatalog(context.Background(), "", []string{assistantSponsoredModel, "shared-extra"})
catalog = assistantChatCatalog("", "shared-key", []string{assistantSponsoredModel, "shared-extra"})
listed := 0
for _, model := range catalog.Models {
if model.ID == assistantSponsoredModel || model.ID == "shared-extra" {
Expand Down
2 changes: 1 addition & 1 deletion internal/httpapi/assistant_engines.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func assistantEngineBuiltinModels(engine string) []assistantDiscoveredModel {
catalogKey = "claude"
}
var out []assistantDiscoveredModel
for _, model := range executorModelCatalogs("")[catalogKey].Models {
for _, model := range executorModelCatalogs("", assistantFixedCatalog())[catalogKey].Models {
out = append(out, assistantDiscoveredModel{ID: model.ID, Name: model.Name})
}
return out
Expand Down
4 changes: 2 additions & 2 deletions internal/httpapi/assistant_generation.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (h *assistantHandlers) startGeneration(c *gin.Context) {
return
}
catalogEngine, _ := assistantModelEngine(req.Model)
catalog := assistantChatCatalog(c.Request.Context(), user.CodeBuddyInternetEnvironment, nil)
catalog := loadAssistantModels(user.CodeBuddyInternetEnvironment, user.CodeBuddyAPIKey)
if catalogEngine == assistantEngineCodeBuddy {
catalog = h.turnCatalog(c.Request.Context(), user, req.Model)
}
Expand Down Expand Up @@ -577,7 +577,7 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) {
}
// A CodeBuddy model this instance has not listed yet refreshes the list
// first, like a new turn, instead of silently becoming the default.
catalog := assistantChatCatalog(c.Request.Context(), user.CodeBuddyInternetEnvironment, nil)
catalog := loadAssistantModels(user.CodeBuddyInternetEnvironment, user.CodeBuddyAPIKey)
if engine, _ := assistantModelEngine(model); engine == assistantEngineCodeBuddy {
catalog = h.turnCatalog(c.Request.Context(), user, model)
}
Expand Down
Loading
Loading