Skip to content
Open
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
28 changes: 16 additions & 12 deletions chatbot/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -2333,7 +2337,7 @@ export default function App() {
);
if (stored) {
closeDialog();
await chat.regenerate(stored, approval);
await chat.regenerate(stored, dialog.fork ? "confirm" : approval);
}
}
}}
Expand Down
13 changes: 2 additions & 11 deletions chatbot/src/PermissionPicker.jsx
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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.
Expand Down
38 changes: 36 additions & 2 deletions chatbot/src/composer-preferences.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { useRef, useState } from "react";

const prefix = "loopforge.assistant.";

export function readComposerPreference(name) {
Expand All @@ -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 };
}
83 changes: 48 additions & 35 deletions chatbot/src/useChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 : "");
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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 });
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -896,6 +903,7 @@ export function useChat() {
references = [],
approvalMode = "confirm",
approvalUserId,
onSessionCreated,
messagesOverride = null,
fromQueue = false,
}) {
Expand Down Expand Up @@ -991,7 +999,10 @@ export function useChat() {
},
"PUT",
);
onSessionCreated?.(s.id);
setSession(s);
setModel(activeModel);
setEffort(activeEffort);
currentId.current = id;
setActiveId(id);
changeURL(id);
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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,
Expand Down
16 changes: 13 additions & 3 deletions chatbot/src/useLocalConversations.js
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -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 };
Expand Down Expand Up @@ -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",
Expand All @@ -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();
Expand Down
Loading
Loading