diff --git a/README.md b/README.md
index e19047b2..53eff0b6 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ docker start iris
| `PUT /settings/models/{chat\|embedding}` | 保存模型；api_key 省略保留，空字符串清除，enabled=false 停用 |
| `POST /settings/models/{chat\|embedding}/test` | 空 JSON 测已保存配置，模型 JSON 测草稿 |
| `POST /settings/models/{chat\|embedding}/retry` | 对暂时不可用／账户问题请求重试 |
-| `PATCH /settings/limits` | daily_token_limit（null 不限）、learning_concurrency、learning_image_limit、native_image_learning、media_retention_days（默认 7，整数 1—36500） |
+| `PATCH /settings/limits` | daily_token_limit（null 不限）、learning_concurrency、learning_image_limit、native_image_learning、media_retention_days（默认 7，整数 1—36500）；所有字段省略即保留现值，daily_token_limit 显式 null 才表示不限；操作记录只包含实际提交的字段 |
## 中文试用与管理界面
diff --git a/frontend/src/Access.test.tsx b/frontend/src/Access.test.tsx
index 38b5dcb3..5ff9cc7f 100644
--- a/frontend/src/Access.test.tsx
+++ b/frontend/src/Access.test.tsx
@@ -160,6 +160,8 @@ test.each(["high", "medium"])(
await user.click(screen.getByRole("button", { name: "测试对话模型连接" }));
expect(await screen.findByText(/密钥无效.*12/)).toBeInTheDocument();
await user.click(screen.getByRole("button", { name: "保存对话模型" }));
+ await user.clear(screen.getByLabelText("学习并发"));
+ await user.type(screen.getByLabelText("学习并发"), "3");
await user.click(screen.getByRole("button", { name: "保存用量与学习" }));
const saved = calls.find(
(c) =>
diff --git a/frontend/src/ConsolidationReport.tsx b/frontend/src/ConsolidationReport.tsx
index e8d79877..f5e6fdfc 100644
--- a/frontend/src/ConsolidationReport.tsx
+++ b/frontend/src/ConsolidationReport.tsx
@@ -9,6 +9,8 @@ import { Badge, Pagination, RoleTime, seconds } from "./ui";
import { PersonaChecks } from "./PersonaDetails";
import { personaDegrees } from "./persona-labels";
import {
+ consolidationBudgets,
+ consolidationSteps,
consolidationReason,
consolidationSwitches,
suggestionKinds,
@@ -334,6 +336,80 @@ function PersonSummaryReport({ data }: { data: MaintenanceReport }) {
);
}
+function StepBudgetReport({ data }: { data: MaintenanceReport }) {
+ const budgets = data.items.filter(
+ (item) => item.outcome === "model_step_budget",
+ );
+ const trimmed = data.items.filter(
+ (item) => item.outcome === "backlog_trimmed",
+ );
+ const expiry = data.question_expiry;
+ return (
+ <>
+ {(data.consolidation || budgets.length > 0) && (
+
+ 各步骤模型调用上限与用量
+
+ 每一步独立计数，包含重试和修正；上限沿用本次运行接受时的设置。未到期、关闭或没有任务的步骤可能没有记录。
+
+ {!budgets.length && 本次未记录步骤用量。
}
+ {budgets.map((item) => (
+
+
+ {consolidationSteps[item.details.step || ""] ||
+ item.details.step ||
+ "未知步骤"}
+
+
+ 本轮上限：{item.details.max_calls ?? "未记录"} 次 · 已用：
+ {item.details.calls_used ?? "未记录"} 次
+
+
+ 停止原因：
+ {item.reason ? consolidationReason(item.reason) : "未记录"}
+
+
+ ))}
+
+ )}
+ {!!trimmed.length && (
+
+ 配对积压修剪
+ {trimmed.map((item) => (
+
+ 配对积压修剪：{item.details.count ?? "未记录"} 项 ·
+ 待处理配对上限：{item.details.limit ?? "未记录"} 项
+
+ ))}
+
+ 仅修剪待处理配对，不改变记忆；相关记忆发生变化后可重新规划。
+
+
+ )}
+ {expiry && (
+
+ 询问到期结束
+ 到期自动结束的询问：{expiry.count} 条
+
+ 仅学习产生且超过保留天数仍未结束的询问；宿主或管理员创建的询问和普通目标不受影响。
+
+
+ )}
+
+ );
+}
+
export function ConsolidationReportSections({
data,
openMemory,
@@ -362,17 +438,18 @@ export function ConsolidationReportSections({
{calls.unknown_usage_calls ?? 0}{" "}
- 次调用用量未知；用量为已知合计，包含实际重试、persona
+ 次调用用量未知；用量为四步骤已知合计，包含实际重试、入口画像、persona
及人物摘要调用。
)}
本次接受任务时的整理设置
-
- 模型调用次数预算：
- {data.consolidation.settings.max_calls ?? "未记录"}
-
+ {consolidationBudgets.map(([key, label]) => (
+
+ {label}：{data.consolidation?.settings[key] ?? "未记录"}
+
+ ))}
{consolidationSwitches.map(([key, label]) => (
{label}：
@@ -387,6 +464,7 @@ export function ConsolidationReportSections({
)}
+
{(data.consolidation ||
data.items.some((i) => i.phase === "consolidation")) && (
<>
diff --git a/frontend/src/ConsolidationSettings.test.tsx b/frontend/src/ConsolidationSettings.test.tsx
index 3a7dc09b..556b77ba 100644
--- a/frontend/src/ConsolidationSettings.test.tsx
+++ b/frontend/src/ConsolidationSettings.test.tsx
@@ -78,7 +78,8 @@ beforeEach(() => {
);
if (url.endsWith("/consolidation")) {
settings.consolidation = { ...settings.consolidation, ...body };
- settings.lifecycle.maintenance_time = body.maintenance_time;
+ if ("maintenance_time" in body)
+ settings.lifecycle.maintenance_time = body.maintenance_time;
}
if (url.endsWith("/goal-dedup-judge")) settings.goal_dedup_judge = body;
settings.operations = [
@@ -107,7 +108,7 @@ test("整理设置保存时间、调用预算与所有开关，并显示操作
target: { value: "04:15" },
});
fireEvent.change(
- within(section).getByLabelText("每次整理的模型调用次数预算"),
+ within(section).getByLabelText("记忆整理（合并／矛盾／依赖）每轮调用上限"),
{ target: { value: "0" } },
);
await userEvent.click(within(section).getByLabelText("矛盾检查与建议"));
@@ -122,12 +123,8 @@ test("整理设置保存时间、调用预算与所有开关，并显示操作
expect(request.body).toEqual({
maintenance_time: "04:15",
max_calls: 0,
- merge_enabled: true,
conflict_enabled: false,
- dependency_enabled: true,
- persona_enabled: true,
person_summary_enabled: false,
- goal_review_enabled: true,
});
expect((request.init?.headers as any)["X-Iris-CSRF"]).toBe(
"consolidation-settings-test",
@@ -136,19 +133,19 @@ test("整理设置保存时间、调用预算与所有开关，并显示操作
expect(within(section).getByText(/只影响之后接受的新运行/)).toBeVisible();
});
-test.each(["", "51", "1.5"])(
+test.each(["", "-1", "1001", "1.5"])(
"整理预算 %s 被阻止，未发送请求",
async (input) => {
render();
fireEvent.change(
- await screen.findByLabelText("每次整理的模型调用次数预算"),
+ await screen.findByLabelText("记忆整理（合并／矛盾／依赖）每轮调用上限"),
{ target: { value: input } },
);
await userEvent.click(
screen.getByRole("button", { name: "保存梦境整理设置" }),
);
expect(
- await screen.findByText(/模型调用次数预算须为 0—50 的整数/),
+ await screen.findByText(/每轮调用上限须为 0—1000 的整数/),
).toBeVisible();
expect(requests.some((r) => r.init?.method === "PATCH")).toBe(false);
},
diff --git a/frontend/src/ConsolidationSettings.tsx b/frontend/src/ConsolidationSettings.tsx
index 02cbd093..cfcd99dd 100644
--- a/frontend/src/ConsolidationSettings.tsx
+++ b/frontend/src/ConsolidationSettings.tsx
@@ -1,46 +1,48 @@
import { useEffect, useRef, useState, type FormEvent } from "react";
import { Notice } from "./ui";
-import { consolidationSwitches } from "./consolidation-labels";
+import {
+ consolidationBudgets,
+ consolidationSwitches,
+} from "./consolidation-labels";
+import { changedSettings, useSettingsDraft } from "./settings-draft";
import type {
ConsolidationConfig,
GoalDedupConfig,
} from "./consolidation-types";
+const configOf = (value: ConsolidationConfig) => ({
+ ...value,
+ person_summary_enabled: value.person_summary_enabled ?? true,
+ entry_profile_max_calls: value.entry_profile_max_calls ?? 60,
+ person_summary_max_calls: value.person_summary_max_calls ?? 40,
+ persona_max_calls: value.persona_max_calls ?? 30,
+});
+
export function ConsolidationSettings({
value,
timezone,
busy,
+ saveError,
save,
}: {
value: ConsolidationConfig;
timezone: string | null;
busy: boolean;
- save: (value: ConsolidationConfig) => Promise;
+ saveError?: string;
+ save: (
+ value: Partial,
+ ) => Promise;
}) {
- const [draft, setDraft] = useState(() => ({
- ...value,
- person_summary_enabled: value.person_summary_enabled ?? true,
- max_calls: String(value.max_calls),
- }));
- const dirty = useRef(false);
+ const current = configOf(value);
+ const { draft, change, reset } = useSettingsDraft({
+ ...current,
+ max_calls: String(current.max_calls),
+ entry_profile_max_calls: String(current.entry_profile_max_calls),
+ person_summary_max_calls: String(current.person_summary_max_calls),
+ persona_max_calls: String(current.persona_max_calls),
+ });
const [error, setError] = useState(""),
[saved, setSaved] = useState(false);
- useEffect(() => {
- if (!dirty.current)
- setDraft({
- ...value,
- person_summary_enabled: value.person_summary_enabled ?? true,
- max_calls: String(value.max_calls),
- });
- }, [value]);
- function change(
- key: K,
- next: (typeof draft)[K],
- ) {
- dirty.current = true;
- setSaved(false);
- setDraft((d) => ({ ...d, [key]: next }));
- }
async function submit(e: FormEvent) {
e.preventDefault();
if (busy) return;
@@ -50,24 +52,28 @@ export function ConsolidationSettings({
setError("整理运行时间须为 HH:MM，范围 00:00—23:59");
return;
}
- const calls = Number(draft.max_calls);
- if (
- !draft.max_calls.trim() ||
- !Number.isInteger(calls) ||
- calls < 0 ||
- calls > 50
- ) {
- setError("模型调用次数预算须为 0—50 的整数");
- return;
+ for (const [key, label] of consolidationBudgets) {
+ const calls = Number(draft[key]);
+ if (
+ !draft[key].trim() ||
+ !Number.isInteger(calls) ||
+ calls < 0 ||
+ calls > 1000
+ ) {
+ setError(`${label}须为 0—1000 的整数`);
+ return;
+ }
}
- const result = await save({ ...draft, max_calls: calls });
- if (result) {
- dirty.current = false;
- setDraft({
- ...result,
- person_summary_enabled: result.person_summary_enabled ?? true,
- max_calls: String(result.max_calls),
- });
+ const changes = changedSettings(current, {
+ ...draft,
+ max_calls: Number(draft.max_calls),
+ entry_profile_max_calls: Number(draft.entry_profile_max_calls),
+ person_summary_max_calls: Number(draft.person_summary_max_calls),
+ persona_max_calls: Number(draft.persona_max_calls),
+ });
+ if (!Object.keys(changes).length) return;
+ if (await save(changes)) {
+ reset();
setSaved(true);
}
}
@@ -81,42 +87,46 @@ export function ConsolidationSettings({
整理不中断接收和学习。修改只影响之后接受的新运行，已接受的运行与续跑沿用其设置快照。
-