refactor(profiles): drop manual snapshot update now that switching autosaves

Since switching projects automatically saves the current configuration
back to the project being left, the per-project "update from current"
button is redundant and even harmful: it allowed overwriting another
project's snapshot with the current state, breaking the invariant that
a project holds the state you last left it in.

- Remove the resnapshot button and confirm dialog from the manage
  dialog; drop the now-unused scope prop and PROFILE_SCOPE_LABELS
- Add a footer Close button to the manage dialog (overlay click is
  disabled app-wide, so it previously could only be closed via Esc)
- Update manageDescription in all four locales to describe the
  autosave behavior; remove the two dead i18n keys
- Fix a shadowed `warnings` vec in ProfileService::apply that silently
  dropped autosave-failure warnings before they reached the frontend
- Mention auto-capture on next switch in the "no snapshot for this
  scope yet" warning and doc comments

The backend update command keeps its resnapshot parameter; it is now
only exercised by the pre-switch autosave path.
This commit is contained in:
Jason
2026-07-04 23:50:25 +08:00
parent 22159430c6
commit 9f7642e29c
9 changed files with 29 additions and 73 deletions
+1 -6
View File
@@ -184,12 +184,7 @@ pub fn apply_profile(
log::warn!("切换项目后停止代理服务失败: {e}");
}
if let Some(app_state) = app_handle.try_state::<AppState>() {
emit_profile_apply_events(
&app_handle,
app_state.inner(),
&profile_id,
scope,
);
emit_profile_apply_events(&app_handle, app_state.inner(), &profile_id, scope);
}
});
} else {
+4 -4
View File
@@ -264,7 +264,8 @@ impl ProfileService {
}
/// 更新项目:重命名(作用于共享实体)和/或以当前状态重拍快照
/// resnapshot 只覆盖 scope 分组的槽位,其余分组原样保留
/// resnapshot 只覆盖 scope 分组的槽位,其余分组原样保留
/// 快照重拍仅由 [`Self::apply`] 切换前的自动保存触发,UI 不再暴露手动入口)
pub fn update(
state: &AppState,
id: &str,
@@ -314,7 +315,7 @@ impl ProfileService {
///
/// 只作用于发起页所属分组内的应用,不碰其他分组的配置与 current 标记。
/// 该分组从未拍过快照时不改动任何配置,仅标记 current 并返回提示
/// 用户可先绑定项目、再"以当前状态更新"补拍该侧快照)。
/// 下次从该项目切走时,自动保存会补拍该侧快照)。
///
/// **切换前会自动保存旧项目**:若当前分组已绑定到另一个项目,先把当前
/// 状态写入那个旧项目(仅当前分组槽位),再加载目标项目。这样切走后
@@ -351,10 +352,9 @@ impl ProfileService {
let payload: ProfilePayload = serde_json::from_str(&profile.payload)
.map_err(|e| AppError::Config(format!("解析 profile payload 失败: {e}")))?;
let mut warnings = Vec::new();
if !payload.scope_captured(scope) {
warnings.push(format!(
"no {} configuration captured in this project yet; marked as current without changes",
"no {} configuration captured in this project yet; marked as current without changes (it will be saved automatically when you switch away)",
scope.as_str()
));
}
+20 -43
View File
@@ -1,10 +1,11 @@
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { Check, Pencil, RefreshCw, Trash2, X } from "lucide-react";
import { Check, Pencil, Trash2, X } from "lucide-react";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
@@ -16,17 +17,13 @@ import {
useProfilesQuery,
useUpdateProfileMutation,
} from "@/lib/query/profiles";
import type { ProfileScope } from "@/lib/api/profiles";
import { PROFILE_SCOPE_LABELS } from "./scope";
interface ProfileManageDialogProps {
isOpen: boolean;
scope: ProfileScope;
onClose: () => void;
}
type PendingConfirm = {
type: "resnapshot" | "delete";
id: string;
name: string;
};
@@ -34,12 +31,11 @@ type PendingConfirm = {
/**
* 项目管理对话框(纯快照式)
*
* 项目列表全应用共享,重命名/删除作用于共享实体
* "以当前状态更新快照"只覆盖发起页所属分组(scope)的槽位
* 项目列表全应用共享,重命名/删除作用于共享实体
* 快照内容由切换时的自动保存维护,不提供手动重拍入口
*/
export function ProfileManageDialog({
isOpen,
scope,
onClose,
}: ProfileManageDialogProps) {
const { t } = useTranslation();
@@ -71,11 +67,7 @@ export function ProfileManageDialog({
const handleConfirm = () => {
if (!confirm) return;
if (confirm.type === "delete") {
deleteMutation.mutate(confirm.id);
} else {
updateMutation.mutate({ id: confirm.id, resnapshot: true, scope });
}
deleteMutation.mutate(confirm.id);
setConfirm(null);
};
@@ -154,21 +146,6 @@ export function ProfileManageDialog({
>
<Pencil className="h-3.5 w-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
className="h-7 w-7"
title={t("profiles.updateSnapshot")}
onClick={() =>
setConfirm({
type: "resnapshot",
id: profile.id,
name: profile.name,
})
}
>
<RefreshCw className="h-3.5 w-3.5" />
</Button>
<Button
variant="ghost"
size="icon"
@@ -176,7 +153,6 @@ export function ProfileManageDialog({
title={t("profiles.delete")}
onClick={() =>
setConfirm({
type: "delete",
id: profile.id,
name: profile.name,
})
@@ -189,26 +165,27 @@ export function ProfileManageDialog({
</div>
))}
</div>
<DialogFooter>
<Button
type="button"
variant="outline"
onClick={() => {
cancelRename();
onClose();
}}
>
{t("common.close")}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
{confirm && (
<ConfirmDialog
isOpen
title={
confirm.type === "delete"
? t("profiles.deleteConfirmTitle")
: t("profiles.updateSnapshot")
}
message={
confirm.type === "delete"
? t("profiles.deleteConfirmMessage", { name: confirm.name })
: t("profiles.updateSnapshotConfirm", {
name: confirm.name,
group: PROFILE_SCOPE_LABELS[scope],
})
}
variant={confirm.type === "delete" ? "destructive" : "info"}
title={t("profiles.deleteConfirmTitle")}
message={t("profiles.deleteConfirmMessage", { name: confirm.name })}
variant="destructive"
onConfirm={handleConfirm}
onCancel={() => setConfirm(null)}
/>
@@ -246,7 +246,6 @@ export function ProfileSwitcher({ activeApp }: ProfileSwitcherProps) {
<ProfileManageDialog
isOpen={isManageOpen}
scope={scope}
onClose={() => setIsManageOpen(false)}
/>
</>
-7
View File
@@ -12,13 +12,6 @@ export const APP_PROFILE_SCOPE: Partial<Record<AppId, ProfileScope>> = {
codex: "codex",
};
/** 分组显示名(产品名,不进 i18n;与后端托盘子菜单标签一致) */
export const PROFILE_SCOPE_LABELS: Record<ProfileScope, string> = {
claude: "Claude Code",
"claude-desktop": "Claude Desktop",
codex: "Codex",
};
/** 分组内的 payload 槽位 key(后端 ProfileScope::apps 的前端镜像) */
const SCOPE_SLOT_KEYS: Record<ProfileScope, (keyof PerApp<unknown>)[]> = {
claude: ["claude"],
+1 -3
View File
@@ -1883,11 +1883,9 @@
},
"manage": "Manage projects…",
"manageTitle": "Manage Projects",
"manageDescription": "Projects are configuration snapshots. To change a project, adjust your configuration first, then click \"Update from current\".",
"manageDescription": "Projects are configuration snapshots. When you switch projects, the current configuration is automatically saved back to the project you are leaving.",
"namePlaceholder": "e.g. Development, Drawing",
"rename": "Rename",
"updateSnapshot": "Update from current",
"updateSnapshotConfirm": "Overwrite the {{group}} side of project \"{{name}}\" with the current configuration? Other apps' snapshots are unaffected.",
"noSnapshotForScope": "Not saved for this app yet",
"delete": "Delete",
"deleteConfirmTitle": "Confirm Delete",
+1 -3
View File
@@ -1883,11 +1883,9 @@
},
"manage": "プロジェクトを管理…",
"manageTitle": "プロジェクト管理",
"manageDescription": "プロジェクトは設定のスナップショットです。内容を変更するには、先に設定を調整してから「現在の状態で更新」をクリックしてください。",
"manageDescription": "プロジェクトは設定のスナップショットです。プロジェクトを切り替えると、現在の設定は元のプロジェクトに自動的に保存されます。",
"namePlaceholder": "例:開発、イラスト",
"rename": "名前を変更",
"updateSnapshot": "現在の状態で更新",
"updateSnapshotConfirm": "プロジェクト「{{name}}」の {{group}} 側スナップショットを現在の設定で上書きしますか?他のアプリ側には影響しません。",
"noSnapshotForScope": "このアプリ側は未保存",
"delete": "削除",
"deleteConfirmTitle": "削除の確認",
+1 -3
View File
@@ -1855,11 +1855,9 @@
},
"manage": "管理專案…",
"manageTitle": "管理專案",
"manageDescription": "專案是設定快照。要修改專案內容,先手動調好設定,再點「以目前狀態更新」。",
"manageDescription": "專案是設定快照。切換專案時,目前設定會自動儲存回原專案。",
"namePlaceholder": "例如:開發、繪圖",
"rename": "重新命名",
"updateSnapshot": "以目前狀態更新",
"updateSnapshotConfirm": "用目前設定覆蓋專案 \"{{name}}\" 的 {{group}} 側快照?其他應用側的快照不受影響。",
"noSnapshotForScope": "本側未儲存",
"delete": "刪除",
"deleteConfirmTitle": "確認刪除",
+1 -3
View File
@@ -1883,11 +1883,9 @@
},
"manage": "管理项目…",
"manageTitle": "管理项目",
"manageDescription": "项目是配置快照。要修改项目内容,先手动调好配置,再点\"以当前状态更新\"。",
"manageDescription": "项目是配置快照。切换项目时,当前配置会自动保存回原项目。",
"namePlaceholder": "例如:开发、绘图",
"rename": "重命名",
"updateSnapshot": "以当前状态更新",
"updateSnapshotConfirm": "用当前配置覆盖项目 \"{{name}}\" 的 {{group}} 侧快照?其他应用侧的快照不受影响。",
"noSnapshotForScope": "本侧未保存",
"delete": "删除",
"deleteConfirmTitle": "确认删除",