fix(build-run): 统一命令对话框的继承与校验逻辑

将 Build/Run 命令对话框的草稿处理抽离为独立辅助模块，
统一默认值、配置克隆、命令有效性判断与持久化前的标准化逻辑。
子 worktree 在“覆盖当前节点”和“继承父项目”之间切换时，
会同步对齐草稿内容；保存到父项目时会清理当前节点的覆盖配置，
从而真正恢复对父项目命令的继承行为。

同时将执行失败和保存失败从原生 alert 改为应用内提示弹窗，
避免打断当前弹窗的焦点与交互流程，并补充对应单元测试。

补充修复：
- 将 hasBuildRunCommand 声明为类型守卫，修复
  resolveEffectiveBuildRunCommand 无法通过 web 类型检查的问题。

产品层面：
- Build/Run 配置面板在 worktree/父项目之间切换时行为更一致；
- 恢复继承与错误提示更稳定，减少误保存和交互中断。

Signed-off-by: Lulu <58587930+lulu-sk@users.noreply.github.com>

Author: lulu-sk

web/src/App.tsx

@@ -105,6 +105,14 @@ import {
 import { getCachedThemeSetting, useThemeController, writeThemeSettingCache, type ThemeMode, type ThemeSetting } from "@/lib/theme";
 import { loadHiddenProjectIds, loadShowHiddenProjects, saveHiddenProjectIds, saveShowHiddenProjects } from "@/lib/projects-hidden";
 import { loadConsoleSession, saveConsoleSession, type PersistedConsoleTab } from "@/lib/console-session";
+import {
+  cloneBuildRunCommandConfig,
+  createEmptyBuildRunCommandConfig,
+  hasBuildRunCommand,
+  normalizeBuildRunCommandDraft,
+  removeBuildRunCommandConfig,
+  upsertBuildRunCommandConfig,
+} from "@/lib/build-run-config";
 import {
   clearWorktreeCreateTransientPrefs,
   loadWorktreeCreatePrefs,
@@ -558,15 +566,15 @@ export default function CodexFlowManagerUI() {
   const [buildRunCfgByDirKey, setBuildRunCfgByDirKey] = useState<Record<string, DirBuildRunConfig | null>>({});
   const buildRunCfgByDirKeyRef = useRef<Record<string, DirBuildRunConfig | null>>({});
   const [dirDrag, setDirDrag] = useState<{ draggingId: string; overId?: string; position?: "before" | "after" | "asChild" | "root-end" } | null>(null);
-  const [buildRunDialog, setBuildRunDialog] = useState<BuildRunDialogState>(() => ({
-    open: false,
-    action: "build",
-    projectId: "",
-    saveScope: "self",
-    parentProjectId: undefined,
-    draft: { mode: "simple", commandText: "", cwd: "", env: [], backend: { kind: "system" } } as any,
-    advanced: false,
-  }));
+  const [buildRunDialog, setBuildRunDialog] = useState<BuildRunDialogState>(() => ({
+    open: false,
+    action: "build",
+    projectId: "",
+    saveScope: "self",
+    parentProjectId: undefined,
+    draft: createEmptyBuildRunCommandConfig(),
+    advanced: false,
+  }));
   const [dirLabelDialog, setDirLabelDialog] = useState<DirLabelDialogState>(() => ({ open: false, projectId: "", draft: "" }));
   const [gitWorktreeAutoCommitEnabled, setGitWorktreeAutoCommitEnabled] = useState<boolean>(true);
   const [gitWorktreeCopyRulesOnCreate, setGitWorktreeCopyRulesOnCreate] = useState<boolean>(true);
@@ -4752,31 +4760,98 @@ export default function CodexFlowManagerUI() {
    * - 先读自身配置
    * - 若自身无配置且为子节点，则继承父节点配置
    */
-  const resolveEffectiveBuildRunCommand = useCallback(async (project: Project, action: BuildRunAction): Promise<{
-    effective: BuildRunCommandConfig | null;
+  const resolveEffectiveBuildRunCommand = useCallback(async (project: Project, action: BuildRunAction): Promise<{
+    effective: BuildRunCommandConfig | null;
     inherited: boolean;
     parentProjectId?: string;
     defaultSaveScope: "self" | "parent";
-  }> => {
-    const selfCfg = await ensureBuildRunConfigLoaded(project.winPath);
-    const selfCmd = (selfCfg as any)?.[action] as BuildRunCommandConfig | undefined;
-    if (selfCmd) return { effective: selfCmd, inherited: false, defaultSaveScope: "self" };
-
-    const parentId = String(dirTreeStore.parentById[project.id] || "").trim();
-    if (parentId) {
-      const parent = projectsRef.current.find((x) => x.id === parentId) || null;
-      if (parent) {
-        const parentCfg = await ensureBuildRunConfigLoaded(parent.winPath);
-        const parentCmd = (parentCfg as any)?.[action] as BuildRunCommandConfig | undefined;
-        if (parentCmd) return { effective: parentCmd, inherited: true, parentProjectId: parentId, defaultSaveScope: "parent" };
-        return { effective: null, inherited: false, parentProjectId: parentId, defaultSaveScope: "parent" };
-      }
-    }
-    return { effective: null, inherited: false, defaultSaveScope: "self" };
-  }, [dirTreeStore.parentById, ensureBuildRunConfigLoaded]);
-
-  /**
-   * 触发 Build/Run：
+  }> => {
+    const selfCfg = await ensureBuildRunConfigLoaded(project.winPath);
+    const selfCmd = (selfCfg as any)?.[action] as BuildRunCommandConfig | undefined;
+    if (hasBuildRunCommand(selfCmd)) return { effective: selfCmd, inherited: false, defaultSaveScope: "self" };
+
+    const parentId = String(dirTreeStore.parentById[project.id] || "").trim();
+    if (parentId) {
+      const parent = projectsRef.current.find((x) => x.id === parentId) || null;
+      if (parent) {
+        const parentCfg = await ensureBuildRunConfigLoaded(parent.winPath);
+        const parentCmd = (parentCfg as any)?.[action] as BuildRunCommandConfig | undefined;
+        if (hasBuildRunCommand(parentCmd)) return { effective: parentCmd, inherited: true, parentProjectId: parentId, defaultSaveScope: "parent" };
+        return { effective: null, inherited: false, parentProjectId: parentId, defaultSaveScope: "parent" };
+      }
+    }
+    return { effective: null, inherited: false, defaultSaveScope: "self" };
+  }, [dirTreeStore.parentById, ensureBuildRunConfigLoaded]);
+
+  /**
+   * 中文说明：统一使用应用内提示弹窗展示 Build/Run 相关错误，避免原生 alert 破坏弹窗交互与焦点状态。
+   */
+  const showBuildRunNotice = useCallback((action: BuildRunAction, message: string) => {
+    const text = String(message || "").trim();
+    if (!text) return;
+    setNoticeDialog({
+      open: true,
+      title: action === "build"
+        ? (t("projects:buildCommandTitle", "配置 Build 命令") as string)
+        : (t("projects:runCommandTitle", "配置 Run 命令") as string),
+      message: text,
+    });
+  }, [t]);
+
+  /**
+   * 中文说明：切换 Build/Run 配置保存范围，并在切回“继承父项目”时同步对齐草稿内容。
+   */
+  const switchBuildRunDialogSaveScope = useCallback(async (nextScope: "self" | "parent") => {
+    const snapshot = buildRunDialog;
+    if (!snapshot.open) return;
+    if (snapshot.saveScope === nextScope) return;
+
+    const target = projectsRef.current.find((item) => item.id === snapshot.projectId) || null;
+    if (!target) return;
+
+    const parentIdFromTree = String(dirTreeStore.parentById[target.id] || "").trim();
+    const parentId = String(snapshot.parentProjectId || parentIdFromTree || "").trim();
+    const parent = parentId ? (projectsRef.current.find((item) => item.id === parentId) || null) : null;
+
+    if (nextScope === "parent") {
+      if (!parentId || !parent) return;
+      const parentCfg = await ensureBuildRunConfigLoaded(parent.winPath);
+      const parentCmd = (parentCfg as any)?.[snapshot.action] as BuildRunCommandConfig | undefined;
+      const nextDraft = hasBuildRunCommand(parentCmd)
+        ? cloneBuildRunCommandConfig(parentCmd)
+        : createEmptyBuildRunCommandConfig();
+      setBuildRunDialog((prev) => {
+        if (!prev.open || prev.projectId !== snapshot.projectId || prev.action !== snapshot.action)
+          return prev;
+        return {
+          ...prev,
+          saveScope: "parent",
+          parentProjectId: parentId,
+          draft: nextDraft,
+          advanced: nextDraft.mode === "advanced",
+        };
+      });
+      return;
+    }
+
+    const selfCfg = await ensureBuildRunConfigLoaded(target.winPath);
+    const selfCmd = (selfCfg as any)?.[snapshot.action] as BuildRunCommandConfig | undefined;
+    setBuildRunDialog((prev) => {
+      if (!prev.open || prev.projectId !== snapshot.projectId || prev.action !== snapshot.action)
+        return prev;
+      const nextDraft = hasBuildRunCommand(selfCmd) ? cloneBuildRunCommandConfig(selfCmd) : prev.draft;
+      return {
+        ...prev,
+        saveScope: "self",
+        parentProjectId: parentId || prev.parentProjectId,
+        draft: nextDraft,
+        advanced: hasBuildRunCommand(selfCmd) ? nextDraft.mode === "advanced" : prev.advanced,
+      };
+    });
+  }, [buildRunDialog, dirTreeStore.parentById, ensureBuildRunConfigLoaded]);
+
+  /**
+   * 触发 Build/Run：
    * - 若无配置：打开配置对话框
    * - 否则：直接外部终端执行
    * - edit=true：强制进入“编辑命令”
@@ -4785,14 +4860,12 @@ export default function CodexFlowManagerUI() {
     const p = project;
     if (!p?.id || !p?.winPath) return;
     const resolved = await resolveEffectiveBuildRunCommand(p, action);
-    const effective = resolved.effective;
-    if (edit || !effective) {
-      const draft = effective
-        ? ({ ...effective, env: Array.isArray(effective.env) ? effective.env : [] } as BuildRunCommandConfig)
-        : ({ mode: "simple", commandText: "", cwd: "", env: [], backend: { kind: "system" } } as BuildRunCommandConfig);
-      const advanced = draft.mode === "advanced";
-      setBuildRunDialog({
-        open: true,
+    const effective = resolved.effective;
+    if (edit || !effective) {
+      const draft = effective ? cloneBuildRunCommandConfig(effective) : createEmptyBuildRunCommandConfig();
+      const advanced = draft.mode === "advanced";
+      setBuildRunDialog({
+        open: true,
         action,
         projectId: p.id,
         saveScope: resolved.defaultSaveScope,
@@ -4805,16 +4878,19 @@ export default function CodexFlowManagerUI() {
 
     const cwd = String(effective.cwd || "").trim() || p.winPath;
     const title = `${getDirNodeLabel(p)} ${action === "build" ? "Build" : "Run"}`;
-    try {
-      const res: any = await (window as any).host?.buildRun?.exec?.({ dir: p.winPath, cwd, title, command: effective });
-      if (!(res && res.ok)) throw new Error(res?.error || "failed");
-    } catch (e: any) {
-      alert(String((t("projects:buildRunFailed", "执行失败：{{error}}") as any) || "").replace("{{error}}", String(e?.message || e)));
-    }
-  }, [getDirNodeLabel, resolveEffectiveBuildRunCommand, t]);
-
-  /**
-   * 保存 Build/Run 配置对话框的草稿到本地持久化存储。
+    try {
+      const res: any = await (window as any).host?.buildRun?.exec?.({ dir: p.winPath, cwd, title, command: effective });
+      if (!(res && res.ok)) throw new Error(res?.error || "failed");
+    } catch (e: any) {
+      showBuildRunNotice(
+        action,
+        String((t("projects:buildRunFailed", "执行失败：{{error}}") as any) || "").replace("{{error}}", String(e?.message || e)),
+      );
+    }
+  }, [createEmptyBuildRunCommandConfig, getDirNodeLabel, resolveEffectiveBuildRunCommand, showBuildRunNotice]);
+
+  /**
+   * 保存 Build/Run 配置对话框的草稿到本地持久化存储。
    */
   const saveBuildRunDialog = useCallback(async () => {
     const dlg = buildRunDialog;
@@ -4826,50 +4902,56 @@ export default function CodexFlowManagerUI() {
     const parentIdFromTree = String(dirTreeStore.parentById[target.id] || "").trim();
     const parentId = String(dlg.parentProjectId || parentIdFromTree || "").trim();
 
-    const saveProject = (() => {
-      if (dlg.saveScope !== "parent") return target;
-      if (!parentId) return target;
-      return projectsRef.current.find((x) => x.id === parentId) || target;
-    })();
-
-    const draft = dlg.draft || ({} as any);
-    const nextCmd: BuildRunCommandConfig = { ...draft } as any;
-    nextCmd.cwd = String(draft.cwd || "").trim();
-    nextCmd.backend = (draft.backend && typeof draft.backend === "object") ? draft.backend : { kind: "system" };
-    nextCmd.env = Array.isArray(draft.env)
-      ? draft.env.map((r: any) => ({ key: String(r?.key || ""), value: String(r?.value ?? "") }))
-      : [];
-
-    if (dlg.advanced) {
-      nextCmd.mode = "advanced";
-      nextCmd.commandText = undefined;
-      nextCmd.cmd = String(draft.cmd || "").trim();
-      nextCmd.args = Array.isArray(draft.args) ? draft.args.map((x: any) => String(x ?? "")).filter((x: string) => x.trim().length > 0) : [];
-      if (!nextCmd.cmd) {
-        alert(t("projects:buildRunMissingCmd", "请输入命令") as string);
-        return;
-      }
-    } else {
-      nextCmd.mode = "simple";
-      nextCmd.cmd = undefined;
-      nextCmd.args = undefined;
-      nextCmd.commandText = String(draft.commandText || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n").trim();
-      if (!nextCmd.commandText) {
-        alert(t("projects:buildRunMissingCmd", "请输入命令") as string);
-        return;
-      }
-    }
-
-    const existing = (await ensureBuildRunConfigLoaded(saveProject.winPath)) || {};
-    const nextCfg: DirBuildRunConfig = { ...(existing as any), [dlg.action]: nextCmd } as any;
-    const ok = await persistBuildRunConfig(saveProject.winPath, nextCfg);
-    if (!ok) {
-      alert(t("projects:buildRunSaveFailed", "保存失败") as string);
-      return;
-    }
-
-    setBuildRunDialog((prev) => ({ ...prev, open: false }));
-  }, [buildRunDialog, dirTreeStore.parentById, ensureBuildRunConfigLoaded, persistBuildRunConfig, t]);
+    const saveProject = (() => {
+      if (dlg.saveScope !== "parent") return target;
+      if (!parentId) return target;
+      return projectsRef.current.find((x) => x.id === parentId) || target;
+    })();
+
+    const nextCmd = normalizeBuildRunCommandDraft(dlg.draft, dlg.advanced);
+    const hasCommand = hasBuildRunCommand(nextCmd);
+    const selfExisting = (await ensureBuildRunConfigLoaded(target.winPath)) || {};
+    const parentExisting = saveProject.id === target.id
+      ? selfExisting
+      : ((await ensureBuildRunConfigLoaded(saveProject.winPath)) || {});
+    const parentCurrentCmd = (parentExisting as any)?.[dlg.action] as BuildRunCommandConfig | undefined;
+
+    if (dlg.saveScope === "self" && !hasCommand) {
+      showBuildRunNotice(dlg.action, t("projects:buildRunMissingCmd", "请输入命令") as string);
+      return;
+    }
+
+    if (dlg.saveScope === "parent" && saveProject.id !== target.id && !hasCommand && hasBuildRunCommand(parentCurrentCmd)) {
+      showBuildRunNotice(dlg.action, t("projects:buildRunMissingCmd", "请输入命令") as string);
+      return;
+    }
+
+    if (dlg.saveScope === "self") {
+      const nextCfg = upsertBuildRunCommandConfig(selfExisting, dlg.action, nextCmd);
+      const ok = await persistBuildRunConfig(target.winPath, nextCfg);
+      if (!ok) {
+        showBuildRunNotice(dlg.action, t("projects:buildRunSaveFailed", "保存失败") as string);
+        return;
+      }
+    } else {
+      let parentOk = true;
+      let selfOk = true;
+      if (saveProject.id !== target.id && hasCommand) {
+        const nextParentCfg = upsertBuildRunCommandConfig(parentExisting, dlg.action, nextCmd);
+        parentOk = await persistBuildRunConfig(saveProject.winPath, nextParentCfg);
+      }
+      if (saveProject.id !== target.id && parentOk) {
+        const nextSelfCfg = removeBuildRunCommandConfig(selfExisting, dlg.action);
+        selfOk = await persistBuildRunConfig(target.winPath, nextSelfCfg);
+      }
+      if (!(parentOk && selfOk)) {
+        showBuildRunNotice(dlg.action, t("projects:buildRunSaveFailed", "保存失败") as string);
+        return;
+      }
+    }
+
+    setBuildRunDialog((prev) => ({ ...prev, open: false }));
+  }, [buildRunDialog, dirTreeStore.parentById, ensureBuildRunConfigLoaded, persistBuildRunConfig, showBuildRunNotice, t]);
 
   /**
    * 关闭 Build/Run 配置对话框（不保存）。
@@ -8812,14 +8894,10 @@ export default function CodexFlowManagerUI() {
                             ? "border-[var(--cf-accent)]/30 bg-[var(--cf-accent)]/5 dark:border-[var(--cf-accent)]/40 dark:bg-[var(--cf-accent)]/10"
                             : "border-slate-200/70 bg-white/60 dark:border-[var(--cf-border)] dark:bg-[var(--cf-surface-muted)]"
                         }`}
-                        onClick={() => {
-                            setBuildRunDialog((prev) => ({
-                              ...prev,
-                              saveScope: override ? "parent" : "self",
-                              parentProjectId: parentId || prev.parentProjectId,
-                            }));
-                        }}
-                      >
+                        onClick={() => {
+                            void switchBuildRunDialogSaveScope(override ? "parent" : "self");
+                        }}
+                      >
                         <div className="pt-0.5 shrink-0">
                            <div className={`h-3.5 w-3.5 rounded-full border flex items-center justify-center transition-colors ${
                               override ? "border-[var(--cf-accent)] bg-[var(--cf-accent)]" : "border-slate-400 bg-transparent"