From 6a733bb77988d0b600ddf47a532b2b98a4e84506 Mon Sep 17 00:00:00 2001 From: esengine <359807859@qq.com> Date: Thu, 5 Nov 2026 04:55:48 +0000 Subject: [PATCH] feat(desktop): the Data settings page is the board's three cards of single rows Set-data draws memory and usage, session storage and backup with one short row per setting: memory (with its count), usage, upload volume, storage and the two backups sit behind a pill, while currency, auto-archive, session location and 1.x sessions act on the row. The board's upload switch is not drawn: the kernel has no upload setting, only a report of request sizes, so that row opens the report. Opening settings at 'memory' still lands on the memory page. --- desktop/frontend-next/src/design/settings.css | 2 + desktop/frontend-next/src/i18n/msg/data.ts | 6 --- desktop/frontend-next/src/i18n/msg/session.ts | 1 - .../frontend-next/src/i18n/msg/settings.ts | 14 ++++++ desktop/frontend-next/src/i18n/msg/usage.ts | 3 -- desktop/frontend-next/src/ui/AutoArchive.tsx | 46 +++++-------------- .../src/ui/DataSettings.test.tsx | 45 ++++++++++++++++++ desktop/frontend-next/src/ui/DataSettings.tsx | 13 +++--- .../ui/DisplayCurrency.interaction.test.tsx | 18 ++++---- .../frontend-next/src/ui/DisplayCurrency.tsx | 43 ++++++----------- .../src/ui/LegacySessionsSection.tsx | 12 ++--- .../src/ui/SessionDirSettings.tsx | 34 +++++++------- desktop/frontend-next/src/ui/Settings.tsx | 5 +- desktop/frontend-next/src/ui/UploadUsage.tsx | 5 +- .../frontend-next/src/ui/UsageSettings.tsx | 6 +-- .../legacy-sessions-hide.interaction.test.tsx | 6 +-- desktop/frontend-next/src/ui/prefsnav.tsx | 6 +-- .../settings-host-owner.interaction.test.tsx | 3 ++ 18 files changed, 141 insertions(+), 127 deletions(-) create mode 100644 desktop/frontend-next/src/ui/DataSettings.test.tsx diff --git a/desktop/frontend-next/src/design/settings.css b/desktop/frontend-next/src/design/settings.css index 4f25c24ff0..e50690d83c 100644 --- a/desktop/frontend-next/src/design/settings.css +++ b/desktop/frontend-next/src/design/settings.css @@ -328,3 +328,5 @@ .prefs { padding: 24px; } .prefs-sheet:not([data-wide]) { width: 100%; height: 100%; } .srow-ctl .unit-field input { width: 72px; } +.srow-val { color: var(--muted); font: var(--w-reg) var(--fs-meta) var(--ui); max-width: 260px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.srow-val > * { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } diff --git a/desktop/frontend-next/src/i18n/msg/data.ts b/desktop/frontend-next/src/i18n/msg/data.ts index 84163f62fa..ae391684f1 100644 --- a/desktop/frontend-next/src/i18n/msg/data.ts +++ b/desktop/frontend-next/src/i18n/msg/data.ts @@ -5,7 +5,6 @@ export const DATA: Messages = { "data.a_save_applies_to_sessions": { zh: "保存后只对之后新开的会话生效，已开的会话沿用旧设置。这些设置写在用户配置文件里：", en: "A save applies to sessions opened afterwards; open ones keep the old setting. These settings live in your user config file:" }, "data.api_keys": { zh: "API 密钥", en: "API keys" }, "data.archive_conversations_left_idle": { zh: "自动归档长时间未活动的对话", en: "Archive conversations left idle" }, - "data.archived_only_once_it_has": { zh: "距上次活动超过这个天数才会归档。默认 {n} 天。", en: "Archived only once it has been idle longer than this. Default {n} days." }, "data.archiving_only_moves_a_conversation": { zh: "归档只是把对话移出常用列表，内容不动，随时可在“已归档”里恢复。置顶的、正在运行的、等待你回答或批准的对话不会被归档。只处理已打开会话窗格的文件夹；导入的旧会话按原有的最后活动时间计算，开启后可能一次归档较多。", en: "Archiving only moves a conversation out of the everyday list; nothing is deleted and you can restore it from Archived at any time. Pinned conversations, running ones and ones waiting for your answer or approval are never archived. Only folders with an open session pane are swept, and imported older conversations count from their original last activity, so enabling this can archive many at once." }, "data.assistant": { zh: "助手", en: "Assistant" }, "data.auth_header_name": { zh: "认证请求头名称", en: "Auth header name" }, @@ -35,7 +34,6 @@ export const DATA: Messages = { "data.differs_from_this_machine": { zh: "与本机不同", en: "Differs from this machine" }, "data.drive_free_free_of_total": { zh: "{drive} 剩余 {free} / {total}", en: "{drive} — {free} free of {total}" }, "data.e_g_work_laptop": { zh: "例如：公司笔记本", en: "e.g. work laptop" }, - "data.encrypt_this_machines_models_extensions": { zh: "把本机的模型、扩展、记忆等配置加密保存到账号，换机器或重装后按项恢复。", en: "Encrypt this machine's models, extensions, memory and other setup into your account, and restore it item by item on a new machine or after a reinstall." }, "data.encrypting": { zh: "正在加密…", en: "Encrypting…" }, "data.encrypting_and_uploading": { zh: "正在加密上传…", en: "Encrypting and uploading…" }, "data.enter_the_passphrase_for_name": { zh: "输入备份「{name}」的加密口令，先预览它和本机的差异，不会立即写入。", en: "Enter the passphrase for “{name}” to preview how it differs from this machine. Nothing is written yet." }, @@ -88,13 +86,11 @@ export const DATA: Messages = { "data.n_of_max_used": { zh: "已用 {n}/{max} 份", en: "{n} of {max} used" }, "data.needs_install": { zh: "需安装", en: "Needs install" }, "data.no_abnormal_exit_record_has": { zh: "没有留下异常退出的记录。", en: "No abnormal-exit record has been left." }, - "data.no_account_needed_export_this": { zh: "不用账号：把本机的模型、扩展、记忆等配置加密导出成一个文件，换机器时再导入。", en: "No account needed: export this machine's models, extensions, memory and other setup as one encrypted file, and import it on another machine." }, "data.no_backups_in_this_account": { zh: "账号里还没有备份。", en: "No backups in this account yet." }, "data.no_older_sessions_were_found": { zh: "这个文件夹里没有找到旧版会话。请选择 Reasonix 的数据文件夹（里面有 sessions、projects 或 desktop-sessions-v5）。", en: "No older sessions were found in this folder. Pick the Reasonix data folder (the one holding sessions, projects or desktop-sessions-v5)." }, "data.not_on_this_machine": { zh: "本机没有", en: "Not on this machine" }, "data.nothing_new_to_import": { zh: "没有发现尚未导入的旧会话。", en: "Nothing new to import." }, "data.off_by_default_if_ticked": { zh: "默认不导出。勾选后密钥会随文件一起加密，拿到文件和口令的人就能使用它们", en: "Off by default. If ticked, keys are encrypted into the file, and anyone with the file and the passphrase can use them" }, - "data.off_by_default_when_on": { zh: "默认关闭。开启后，超过下面天数没有活动的对话会在后台被归档。", en: "Off by default. When on, a conversation with no activity for longer than the number of days below is archived in the background." }, "data.off_by_default_when_ticked": { zh: "默认不备份。勾选后密钥会随备份一起加密上传", en: "Off by default. When ticked, keys are encrypted and uploaded with the backup" }, "data.off_now_nothing_is_sent": { zh: "现在是关闭的：开启并填写收集器地址后才会发送。", en: "Off now: nothing is sent until it is on and has a collector address." }, "data.older_data_folder_path": { zh: "旧版数据目录路径", en: "Older data folder path" }, @@ -158,10 +154,8 @@ export const DATA: Messages = { "data.user_level_instruction_files_and": { zh: "用户级指令文件与全局记忆", en: "User-level instruction files and global memory" }, "data.verifying": { zh: "正在校验", en: "Verifying" }, "data.what_the_agent_remembers_and": { zh: "agent 记住了什么、花了多少", en: "What the agent remembers and what it costs" }, - "data.what_the_agent_wrote_down": { zh: "agent 自动记录的内容：未经配置，但会据此执行。可以按类型和星系查找，刚记住的在「新的」里等你确认。", en: "What the agent wrote down on its own: nobody configured it, yet it acts on it. Find facts by type or galaxy; ones it just learned wait under New for you to confirm." }, "data.what_to_back_up": { zh: "备份内容", en: "What to back up" }, "data.what_to_export": { zh: "导出内容", en: "What to export" }, "data.where_sessions_and_indexes_live": { zh: "会话和索引放在哪里、占多少空间", en: "Where sessions and indexes live and how much space they take" }, - "data.where_the_data_is_written": { zh: "数据的存储位置与占用空间。会话和索引会持续增长，配置和凭据不会，因此只有前者可以迁移。迁移在重启后生效。", en: "Where the data is written and how much space it uses. Sessions and indexes keep growing while configuration and credentials do not, so only the former can be moved. A move takes effect after a restart." }, "data.whether_sessions_migrated_from_reasonix": { zh: "从 Reasonix 1.x 迁移过来的会话是否出现在侧栏列表里。隐藏后不会删除它们，搜索时仍能找到，正在打开的旧会话也照常显示。默认显示。", en: "Whether sessions migrated from Reasonix 1.x appear in the sidebar lists. Hiding does not delete them; search still finds them and an open one stays visible. Shown by default." }, }; diff --git a/desktop/frontend-next/src/i18n/msg/session.ts b/desktop/frontend-next/src/i18n/msg/session.ts index b6275769e6..a39e597cab 100644 --- a/desktop/frontend-next/src/i18n/msg/session.ts +++ b/desktop/frontend-next/src/i18n/msg/session.ts @@ -218,7 +218,6 @@ export const SESSION: Messages = { "session.work_in_a_separate_git": { zh: "在 Git worktree 中创建独立副本，修改不会影响当前分支", en: "Work in a separate Git worktree so changes do not land on the current branch" }, "session.work_on_an_isolated_copy": { zh: "创建隔离副本", en: "Work on an isolated copy" }, "session.work_time": { zh: "工作时长", en: "Work time" }, - "session.working_directory": { zh: "工作目录", en: "Working directory" }, "session.workspace_bound": { zh: "工作目录已绑定", en: "Workspace bound" }, "session.workspace_path": { zh: "工作区路径", en: "Workspace path" }, "session.workspace_ready": { zh: "工作目录已就绪", en: "Workspace ready" }, diff --git a/desktop/frontend-next/src/i18n/msg/settings.ts b/desktop/frontend-next/src/i18n/msg/settings.ts index 086173886d..8cb028aa6a 100644 --- a/desktop/frontend-next/src/i18n/msg/settings.ts +++ b/desktop/frontend-next/src/i18n/msg/settings.ts @@ -227,4 +227,18 @@ export const SETTINGS: Messages = { "settings.sessions_send_each_other": { zh: "让一个会话给另一个会话发消息（实验）", en: "Let one session send another a message (experimental)" }, "settings.persona_and_presets": { zh: "人设与预设", en: "Persona and presets" }, "settings.manage_presets": { zh: "管理预设", en: "Manage presets" }, + "settings.which_currency_costs_show": { zh: "费用用什么币种显示", en: "Which currency costs are shown in" }, + "settings.days_before_archiving": { zh: "多少天没动的会话自动归档", en: "How many idle days before a conversation is archived" }, + "settings.migrated_sessions_in_the_sidebar": { zh: "旧版迁移过来的会话是否出现在侧栏", en: "Whether sessions migrated from 1.x show in the sidebar" }, + "settings.where_session_records_go": { zh: "会话记录写到哪里", en: "Where session records are written" }, + "settings.open_memory": { zh: "打开记忆", en: "Open memory" }, + "settings.what_it_remembers": { zh: "它记住的东西：星系、遗忘、整理", en: "What it remembers: constellations, forgetting, tidying" }, + "settings.view_usage": { zh: "查看用量", en: "View usage" }, + "settings.usage_hint": { zh: "输入、输出、费用，按天和按模型看", en: "Input, output and cost, by day and by model" }, + "settings.manage_storage": { zh: "管理", en: "Manage" }, + "settings.storage_hint": { zh: "会话、索引、缓存占了多少空间", en: "How much space sessions, indexes and caches take" }, + "settings.export_and_import": { zh: "导出与导入…", en: "Export and import…" }, + "settings.config_in_one_file": { zh: "把模型、扩展、记忆等配置加密导出成一个文件", en: "Export models, extensions and memory to one encrypted file" }, + "settings.back_up_to_the_cloud": { zh: "登录后把配置备份到云端", en: "Back up your configuration to the cloud once signed in" }, + "settings.size_of_requests_sent": { zh: "发给模型服务商的请求有多大", en: "How large the requests sent to model providers are" }, }; diff --git a/desktop/frontend-next/src/i18n/msg/usage.ts b/desktop/frontend-next/src/i18n/msg/usage.ts index d0301bc6f3..10ba8d2c44 100644 --- a/desktop/frontend-next/src/i18n/msg/usage.ts +++ b/desktop/frontend-next/src/i18n/msg/usage.ts @@ -90,7 +90,6 @@ export const USAGE: Messages = { "usage.not_applicable": { zh: "不适用", en: "Not applicable" }, "usage.nothing_recorded_yet_counting_starts": { zh: "还没有记录：从这个版本起开始统计。", en: "Nothing recorded yet: counting starts with this version." }, "usage.of_the_tok_input_tokens": { zh: "该时间段送入的 {tok} 输入 tokens 中，{rate}% 命中前缀缓存 —— 命中部分按缓存价计费，较未命中低一个数量级。", en: "Of the {tok} input tokens sent in this span, {rate}% hit the prefix cache — a hit bills at the cache rate, an order of magnitude under a miss." }, - "usage.only_decides_which_currency_costs": { zh: "只决定费用以哪种货币显示，不改动各来源的价目表。「自动」跟随账户余额的币种，没有余额信息时按价目表的币种显示。", en: "Only decides which currency costs are shown in; each source's price list is untouched. Auto follows the account balance's currency, and falls back to the price list's currency when there is no balance." }, "usage.open_the_price_source_of": { zh: "{model} 打开价格来源", en: "Open the price source of {model}" }, "usage.openrouter_format": { zh: "OpenRouter 格式", en: "OpenRouter format" }, "usage.paid": { zh: "实付", en: "Paid" }, @@ -127,7 +126,6 @@ export const USAGE: Messages = { "usage.the_search_models_connection_has": { zh: "搜索模型所在的连接已被移出", en: "The search model's connection has been removed" }, "usage.the_search_models_connection_has_2": { zh: "搜索模型所在的连接没有凭据", en: "The search model's connection has no credentials" }, "usage.the_search_models_protocol_has": { zh: "搜索模型的协议不支持原生搜索，或已关闭搜索", en: "The search model's protocol has no native search, or search is turned off for it" }, - "usage.the_sessions_cost_the_balance": { zh: "当前会话的费用、余额与用量页立即按所选币种显示，无需重启。", en: "The session's cost, the balance and the usage page switch to the chosen currency at once, no restart." }, "usage.the_size_of_the_request": { zh: "发给模型服务商的请求内容大小（不含连接本身的开销，也不含下载）。每次请求都会带上完整的对话，所以它取决于上下文有多长、请求有多少次，缓存命中只省费用、不省流量。", en: "The size of the request bodies sent to model providers (without the connection's own overhead, and without downloads). Every request carries the whole conversation, so it depends on how long the context is and how many requests are made; cache hits save cost, not bandwidth." }, "usage.the_source_must_be_an": { zh: "来源必须是 http 或 https 链接，不能带用户名密码。", en: "The source must be an http or https link without a username or password." }, "usage.these_models_prices_are_not": { zh: "这些模型的价格不在官方价目表里，无法换算成所选币种，费用只能按原币种显示：{models}。到「服务商」编辑该模型，点「恢复官方价」即可。", en: "These models' prices are not in the vendor's price list, so they cannot be converted to the chosen currency and cost shows in the original one: {models}. Edit the model under Providers and choose Restore official price." }, @@ -137,7 +135,6 @@ export const USAGE: Messages = { "usage.time": { zh: "时间", en: "Time" }, "usage.time_range": { zh: "时间范围", en: "Time range" }, "usage.today": { zh: "今日", en: "Today" }, - "usage.token_usage_and_cost_recorded": { zh: "本机记录的 token 用量与花费，仅保存在这台机器上，不会上传。命中缓存的输入按缓存价计费，因此命中率直接影响费用。", en: "Token usage and cost recorded on this machine only; nothing is uploaded. Input that hits the cache is billed at the cache rate, so the hit rate drives the bill." }, "usage.tokens_per_round": { zh: "每回合用量", en: "Tokens per round" }, "usage.two_currencies_not_summed": { zh: "两种币种不合计", en: "Two currencies, not summed" }, "usage.two_settlement_currencies_do_not": { zh: "两种结算币种不予合并 —— 合成单一总额需要虚构一个汇率。", en: "Two settlement currencies do not add up — one total would mean inventing a rate." }, diff --git a/desktop/frontend-next/src/ui/AutoArchive.tsx b/desktop/frontend-next/src/ui/AutoArchive.tsx index 222436d750..3dee463e92 100644 --- a/desktop/frontend-next/src/ui/AutoArchive.tsx +++ b/desktop/frontend-next/src/ui/AutoArchive.tsx @@ -3,7 +3,7 @@ import { t } from "../i18n"; import { reason } from "../i18n/kernel"; import type { AgentPort } from "../port/port"; import type { AutoArchiveSettings } from "../port/boundary"; -import { Group } from "./Group"; +import { SettingRow } from "./SettingRow"; import { Switch } from "./Switch"; const LIMIT = 3650; @@ -44,30 +44,12 @@ export function AutoArchive({ port }: { port: AgentPort }) { if (n !== state.days) void save({ enabled: state.enabled, days: n }); }; - const body = !state ? ( -
{t("data.could_not_read_the_auto")}
- ) : ( -
-
- - {t("data.archive_conversations_left_idle")} - {t("data.off_by_default_when_on")} - - void save({ enabled: !state.enabled, days: state.days })} - /> -
-
- - {t("data.idle_days")} - {t("data.archived_only_once_it_has", { n: state.defaultDays })} - -
- + if (!state) return
{t("data.could_not_read_the_auto")}
; + return ( + <> + + setDays(e.target.value.replace(/\D/g, ""))} @@ -75,17 +57,11 @@ export function AutoArchive({ port }: { port: AgentPort }) { onKeyDown={blurOnEnter} /> {t("data.days")} -
-
+ void save({ enabled: !state.enabled, days: state.days })} /> + {error &&
{error}
} -
- ); - - return ( - - {body} - + ); } diff --git a/desktop/frontend-next/src/ui/DataSettings.test.tsx b/desktop/frontend-next/src/ui/DataSettings.test.tsx new file mode 100644 index 0000000000..9871cc34e5 --- /dev/null +++ b/desktop/frontend-next/src/ui/DataSettings.test.tsx @@ -0,0 +1,45 @@ +// @vitest-environment jsdom +import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react"; +import { afterEach, expect, it, vi } from "vitest"; +import "./testkit"; +import { MockHub } from "../port/mock_hub"; +import { MockPort } from "../port/mock"; +import type { AgentPort } from "../port/port"; +import { DataSettings } from "./DataSettings"; +import { SettingDeepContext } from "./SettingDeep"; + +afterEach(cleanup); + +function draw(signedIn = false) { + const go = vi.fn(); + const port = new MockPort() as unknown as AgentPort; + render( + + {}} onChanged={() => {}} onRecovered={() => {}} /> + , + ); + return go; +} + +it("is three cards: memory and usage, session storage, backup, each setting one row", async () => { + draw(); + expect([...document.querySelectorAll(".prefs-card > header h3")].map((h) => h.textContent)).toEqual(["记忆与用量", "会话存储", "备份"]); + for (const id of ["memory", "usage", "upload-usage", "currency", "storage", "auto-archive", "session-dir", "legacy-sessions", "backup-file"]) { + await waitFor(() => expect(document.querySelector(`[data-setting="${id}"]`), id).toBeTruthy()); + } + expect(document.querySelector('[data-setting="backup"]')).toBeNull(); +}); + +it("opens the memory, usage and storage pages from pills, with the memory count", () => { + const go = draw(); + for (const [name, id] of [["打开记忆（7）", "memory"], ["查看用量", "usage"], ["管理", "storage"], ["导出与导入…", "backup-file"]] as const) { + fireEvent.click(screen.getByRole("button", { name })); + expect(go).toHaveBeenLastCalledWith(id); + } +}); + +it("offers the cloud backup only when signed in", () => { + draw(true); + expect(document.querySelector('[data-setting="backup"]')).toBeTruthy(); +}); diff --git a/desktop/frontend-next/src/ui/DataSettings.tsx b/desktop/frontend-next/src/ui/DataSettings.tsx index 6781e53bfb..c05168dcf1 100644 --- a/desktop/frontend-next/src/ui/DataSettings.tsx +++ b/desktop/frontend-next/src/ui/DataSettings.tsx @@ -21,33 +21,34 @@ interface Props { cwd?: string; busy: string; signedIn: boolean; + memories?: number; onIsolate: () => void; onChanged: () => void; onRecovered: () => void; } -export function DataSettings({ port, homePort, localPort, hub, workspace, cwd, busy, signedIn, onIsolate, onChanged, onRecovered }: Props) { +export function DataSettings({ port, homePort, localPort, hub, workspace, cwd, busy, signedIn, memories, onIsolate, onChanged, onRecovered }: Props) { return ( <> - - + - + {signedIn && ( - + )} diff --git a/desktop/frontend-next/src/ui/DisplayCurrency.interaction.test.tsx b/desktop/frontend-next/src/ui/DisplayCurrency.interaction.test.tsx index 2d5f044a78..1dc1ebbebc 100644 --- a/desktop/frontend-next/src/ui/DisplayCurrency.interaction.test.tsx +++ b/desktop/frontend-next/src/ui/DisplayCurrency.interaction.test.tsx @@ -20,21 +20,21 @@ describe("the display currency setting", () => { const port = portWith(async (mode) => ({ ...base, mode })); const changed = vi.fn(); render(); - const auto = await screen.findByRole("button", { name: "自动" }); - expect(auto.getAttribute("aria-pressed")).toBe("true"); - const usd = screen.getByRole("button", { name: "美元 USD" }); + const auto = await screen.findByRole("radio", { name: "自动" }); + expect(auto.getAttribute("aria-checked")).toBe("true"); + const usd = screen.getByRole("radio", { name: "美元 USD" }); await userEvent.click(usd); expect(port.saveDisplayCurrency).toHaveBeenCalledTimes(1); expect(port.saveDisplayCurrency).toHaveBeenCalledWith("USD"); - await waitFor(() => expect(usd.getAttribute("aria-pressed")).toBe("true")); - expect(auto.getAttribute("aria-pressed")).toBe("false"); + await waitFor(() => expect(usd.getAttribute("aria-checked")).toBe("true")); + expect(auto.getAttribute("aria-checked")).toBe("false"); expect(changed).toHaveBeenCalledTimes(1); }); it("does not write when the chosen mode is already stored", async () => { const port = portWith(async (mode) => ({ ...base, mode })); render( {}} />); - await userEvent.click(await screen.findByRole("button", { name: "自动" })); + await userEvent.click(await screen.findByRole("radio", { name: "自动" })); expect(port.saveDisplayCurrency).not.toHaveBeenCalled(); }); @@ -44,9 +44,9 @@ describe("the display currency setting", () => { }); const changed = vi.fn(); render(); - await userEvent.click(await screen.findByRole("button", { name: "人民币 CNY" })); + await userEvent.click(await screen.findByRole("radio", { name: "人民币 CNY" })); await waitFor(() => expect(document.querySelector(".why")).toBeTruthy()); - const pressed = screen.getAllByRole("button").filter((b) => b.getAttribute("aria-pressed") === "true"); + const pressed = screen.getAllByRole("radio").filter((b) => b.getAttribute("aria-checked") === "true"); expect(pressed.map((b) => b.textContent)).toEqual(["自动"]); expect(changed).not.toHaveBeenCalled(); }); @@ -62,7 +62,7 @@ describe("a price the pinned currency cannot be shown for", () => { cleanup(); const fine = { displayCurrency: vi.fn(async () => ({ ...base, mode: "CNY" as const })), saveDisplayCurrency: vi.fn() } as unknown as AgentPort; render( {}} />); - await screen.findByRole("button", { name: "自动" }); + await screen.findByRole("radio", { name: "自动" }); expect(screen.queryByText(/恢复官方价/)).toBeNull(); }); }); diff --git a/desktop/frontend-next/src/ui/DisplayCurrency.tsx b/desktop/frontend-next/src/ui/DisplayCurrency.tsx index 0d106f4eb5..1423db25a7 100644 --- a/desktop/frontend-next/src/ui/DisplayCurrency.tsx +++ b/desktop/frontend-next/src/ui/DisplayCurrency.tsx @@ -3,7 +3,7 @@ import { t } from "../i18n"; import { reason } from "../i18n/kernel"; import type { AgentPort } from "../port/port"; import type { DisplayCurrencyMode, DisplayCurrencySettings } from "../port/boundary"; -import { Group } from "./Group"; +import { SegChoice, SettingRow } from "./SettingRow"; const MODES: [DisplayCurrencyMode, string][] = [ ["auto", "common.auto"], @@ -34,36 +34,21 @@ export function DisplayCurrency({ port, onChanged }: { port: AgentPort; onChange } }; + if (!state) return
{t("usage.could_not_read_the_currency")}
; return ( - - {!state ? ( -
{t("usage.could_not_read_the_currency")}
- ) : ( -
-
- - {t("usage.display_currency")} - {t("usage.the_sessions_cost_the_balance")} - -
- {MODES.map(([m, label]) => ( - - ))} -
-
- {state.mode !== "auto" && state.unconverted.length > 0 && ( -
- {t("usage.these_models_prices_are_not", { - models: state.unconverted.map((u) => t("{model}（{currency}）", { model: u.model, currency: u.currency })).join(t("、")), - })} -
- )} - {error &&
{error}
} + <> + + label={t("usage.display_currency")} value={state.mode} action="currency.mode" disabled={busy} + onPick={(m) => void pick(m)} options={MODES.map(([m, label]) => [m, t(label)] as const)} /> + + {state.mode !== "auto" && state.unconverted.length > 0 && ( +
+ {t("usage.these_models_prices_are_not", { + models: state.unconverted.map((u) => t("{model}（{currency}）", { model: u.model, currency: u.currency })).join(t("、")), + })}
)} - + {error &&
{error}
} + ); } diff --git a/desktop/frontend-next/src/ui/LegacySessionsSection.tsx b/desktop/frontend-next/src/ui/LegacySessionsSection.tsx index c462945277..24bc8b090b 100644 --- a/desktop/frontend-next/src/ui/LegacySessionsSection.tsx +++ b/desktop/frontend-next/src/ui/LegacySessionsSection.tsx @@ -1,16 +1,14 @@ import { useSyncExternalStore } from "react"; import { t } from "../i18n"; import { hidesLegacySessions, onHidesLegacySessionsChange, setHidesLegacySessions } from "../state/prefs"; -import { Group } from "./Group"; +import { SegChoice, SettingRow } from "./SettingRow"; export function LegacySessionsSection() { const hidden = useSyncExternalStore(onHidesLegacySessionsChange, hidesLegacySessions, hidesLegacySessions); return ( - -
- - -
- + + setHidesLegacySessions(v === "hide")} options={[["show", t("common.show")], ["hide", t("data.hide")]]} /> + ); } diff --git a/desktop/frontend-next/src/ui/SessionDirSettings.tsx b/desktop/frontend-next/src/ui/SessionDirSettings.tsx index 92a8e70c4c..74b7f472ae 100644 --- a/desktop/frontend-next/src/ui/SessionDirSettings.tsx +++ b/desktop/frontend-next/src/ui/SessionDirSettings.tsx @@ -1,26 +1,24 @@ import { t } from "../i18n"; -import { Group } from "./Group"; +import { SettingRow } from "./SettingRow"; import { Path } from "./Path"; export function SessionDirSettings({ cwd, busy, onIsolate }: { cwd?: string; busy: string; onIsolate: () => void }) { return ( - -
- {t("session.working_directory")} - + <> + + + +
+
+ + {t("session.work_on_an_isolated_copy")} + {t("session.work_in_a_separate_git")} + + +
-

- {t("session.folders_are_managed_in_the")} -

-
- - {t("session.work_on_an_isolated_copy")} - {t("session.work_in_a_separate_git")} - - -
- + ); } diff --git a/desktop/frontend-next/src/ui/Settings.tsx b/desktop/frontend-next/src/ui/Settings.tsx index e8a31f91f9..4913e33f21 100644 --- a/desktop/frontend-next/src/ui/Settings.tsx +++ b/desktop/frontend-next/src/ui/Settings.tsx @@ -87,7 +87,8 @@ export function Settings({ hub, onError, port, networkPort, localWorkspacePort, const wide = useSyncExternalStore(onSettingsWideChange, settingsWide, settingsWide); const homePort = networkPort ?? port; const localPort = localWorkspacePort ?? homePort; - const [openedName, openedAnchor = ""] = (opened ?? "").split(":", 2); + const [openedName, namedAnchor = ""] = (opened ?? "").split(":", 2); + const openedAnchor = namedAnchor || (openedName === "memory" ? "memory" : ""); // Destinations of their own: one section drawn as a page, without the rest. const soloSection = SOLO[openedName]; const solo = !!soloSection; @@ -623,7 +624,7 @@ export function Settings({ hub, onError, port, networkPort, localWorkspacePort, {at === "account" && } {at === "storage" && ( run("isolate", () => port.isolateWorkspace())} onChanged={onChanged} onRecovered={() => { onChanged(); onSessionsRecovered?.(); }} /> + signedIn={!!acct?.signedIn && !!acct.user} memories={memCount} onIsolate={() => run("isolate", () => port.isolateWorkspace())} onChanged={onChanged} onRecovered={() => { onChanged(); onSessionsRecovered?.(); }} /> )} {at === "common" && } diff --git a/desktop/frontend-next/src/ui/UploadUsage.tsx b/desktop/frontend-next/src/ui/UploadUsage.tsx index a59811420e..5a6f0a0e9d 100644 --- a/desktop/frontend-next/src/ui/UploadUsage.tsx +++ b/desktop/frontend-next/src/ui/UploadUsage.tsx @@ -21,10 +21,11 @@ export function UploadUsage({ port }: { port: Pick }) }, [port]); const today = report?.daily[report.daily.length - 1]?.bytes ?? 0; return ( - +

{t("usage.the_size_of_the_request")}

{failed &&

{failed}

} {report && report.requests === 0 &&

{t("usage.nothing_recorded_yet_counting_starts")}

} {report && report.requests > 0 && ( diff --git a/desktop/frontend-next/src/ui/UsageSettings.tsx b/desktop/frontend-next/src/ui/UsageSettings.tsx index 3a9b35203a..5757bc4377 100644 --- a/desktop/frontend-next/src/ui/UsageSettings.tsx +++ b/desktop/frontend-next/src/ui/UsageSettings.tsx @@ -12,14 +12,14 @@ export function UsageSettings({ port, onChanged }: { port: AgentPort; onChanged: const [rev, setRev] = useState(0); return ( <> - { setRev((n) => n + 1); onChanged(); }} /> - + { setRev((n) => n + 1); onChanged(); }} /> ); } diff --git a/desktop/frontend-next/src/ui/legacy-sessions-hide.interaction.test.tsx b/desktop/frontend-next/src/ui/legacy-sessions-hide.interaction.test.tsx index 7881227940..cc4cac0677 100644 --- a/desktop/frontend-next/src/ui/legacy-sessions-hide.interaction.test.tsx +++ b/desktop/frontend-next/src/ui/legacy-sessions-hide.interaction.test.tsx @@ -53,8 +53,8 @@ it("still shows one that is running", () => { it("is a choice the settings section makes and remembers", async () => { render(); - expect(screen.getByRole("button", { name: "显示" }).getAttribute("aria-pressed")).toBe("true"); - await userEvent.click(screen.getByRole("button", { name: "隐藏" })); - expect(screen.getByRole("button", { name: "隐藏" }).getAttribute("aria-pressed")).toBe("true"); + expect(screen.getByRole("radio", { name: "显示" }).getAttribute("aria-checked")).toBe("true"); + await userEvent.click(screen.getByRole("radio", { name: "隐藏" })); + expect(screen.getByRole("radio", { name: "隐藏" }).getAttribute("aria-checked")).toBe("true"); expect(localStorage.getItem("rx-hide-legacy-sessions")).toBe("on"); }); diff --git a/desktop/frontend-next/src/ui/prefsnav.tsx b/desktop/frontend-next/src/ui/prefsnav.tsx index d2f1d2e657..25036d8c0b 100644 --- a/desktop/frontend-next/src/ui/prefsnav.tsx +++ b/desktop/frontend-next/src/ui/prefsnav.tsx @@ -259,15 +259,15 @@ export const SETTINGS: SettingEntry[] = [ { section: "account", anchor: "account", title: "settings.account", scope: "account", apply: "immediate", keywords: ["登录", "社区"] }, // Shown only while signed in; restoring writes through the ordinary config paths and reloads the runtime. { section: "storage", anchor: "backup-file", page: true, title: "data.export_and_import_config", scope: "machine", apply: "immediate", keywords: ["备份", "导出", "导入", "换机", "迁移", "文件"] }, - { section: "storage", anchor: "backup", title: "data.cloud_backup", scope: "account", apply: "immediate", keywords: ["备份", "恢复", "换机", "同步", "导出"] }, + { section: "storage", anchor: "backup", page: true, title: "data.cloud_backup", scope: "account", apply: "immediate", keywords: ["备份", "恢复", "换机", "同步", "导出"] }, { section: "versions", anchor: "versions", page: true, title: "common.version", scope: "machine", apply: "immediate", keywords: ["更新", "升级"] }, { section: "common", anchor: "update-mode", title: "about.update_mode", scope: "machine", apply: "immediate", keywords: ["自动更新", "检查更新", "更新提醒", "后台", "update", "auto update", "notify", "自动下载", "download"] }, { section: "versions", anchor: "logs", title: "about.logs_and_abnormal_exit_records", scope: "machine", apply: "none", keywords: ["日志", "崩溃", "闪退", "异常退出", "log", "logs", "crash", "路径"] }, { section: "versions", anchor: "community", title: "common.community_and_contributors", scope: "machine", apply: "none", keywords: ["社区", "交流群", "QQ", "加群", "二维码", "discord", "贡献者", "contributors", "community"] }, { section: "versions", anchor: "sponsor", title: "about.support_the_project", scope: "machine", apply: "none", keywords: ["捐助", "支付宝", "微信支付", "收款码", "paypal", "donate", "sponsor", "support", "alipay", "wechat"] }, - { section: "memory", anchor: "memory", title: "data.memory", scope: "chosen", apply: "immediate", keywords: ["记住", "忘记", "事实"] }, + { section: "memory", anchor: "memory", page: true, title: "data.memory", scope: "chosen", apply: "immediate", keywords: ["记住", "忘记", "事实"] }, { section: "usage", anchor: "currency", title: "usage.cost_display_currency", scope: "machine", apply: "immediate", keywords: ["币种", "货币", "人民币", "美元", "currency", "CNY", "USD", "汇率"] }, - { section: "usage", anchor: "upload-usage", title: "usage.upload_volume", scope: "machine", apply: "none", keywords: ["流量", "上传", "带宽", "请求", "upload", "traffic", "bandwidth"] }, + { section: "usage", anchor: "upload-usage", page: true, title: "usage.upload_volume", scope: "machine", apply: "none", keywords: ["流量", "上传", "带宽", "请求", "upload", "traffic", "bandwidth"] }, { section: "usage", anchor: "usage", page: true, title: "usage.usage_cost", scope: "machine", apply: "none", keywords: ["token", "花费", "缓存命中"] }, { section: "storage", anchor: "storage", page: true, title: "common.storage", scope: "machine", apply: "restart", keywords: ["搬家", "迁移", "磁盘", "位置"] }, { section: "advanced", anchor: "elsewhere", title: "settings.not_in_this_version_yet", scope: "machine", apply: "none", keywords: ["配置文件"] }, diff --git a/desktop/frontend-next/src/ui/settings-host-owner.interaction.test.tsx b/desktop/frontend-next/src/ui/settings-host-owner.interaction.test.tsx index 4a33384b2e..c375ccb8ef 100644 --- a/desktop/frontend-next/src/ui/settings-host-owner.interaction.test.tsx +++ b/desktop/frontend-next/src/ui/settings-host-owner.interaction.test.tsx @@ -31,6 +31,7 @@ it("keeps machine reads separate from active-pane account operations", async () render(); await userEvent.click(await screen.findByRole("button", { name: "设置" })); await userEvent.click(await screen.findByRole("tab", { name: /^数据/ }, { timeout: 10000 })); + await userEvent.click(await screen.findByRole("button", { name: /^打开记忆/ })); await screen.findAllByText("This machine fact"); expect(remoteMemories).not.toHaveBeenCalled(); expect(localAccount).not.toHaveBeenCalled(); @@ -72,6 +73,7 @@ it.each(["second", "remote"])("uses the active local workspace, or first local f render(); await userEvent.click(await screen.findByRole("button", { name: "设置" })); await userEvent.click(await screen.findByRole("tab", { name: /^数据/ })); + await userEvent.click(await screen.findByRole("button", { name: /^打开记忆/ })); await screen.findAllByText(`${expected} fact`); await userEvent.click(document.querySelector('.memdetail [data-action="memory.forget"]')!); expect(forgot).toHaveBeenCalledWith(expected); @@ -89,6 +91,7 @@ it.each(["second", "remote"])("uses the active local workspace, or first local f await userEvent.click(tabs[0]); await userEvent.click(screen.getByRole("button", { name: "设置" })); await userEvent.click(await screen.findByRole("tab", { name: /^数据/ })); + await userEvent.click(await screen.findByRole("button", { name: /^打开记忆/ })); await screen.findAllByText("first fact"); expect(screen.queryByText("second fact")).toBeNull(); }