dsh-config-manager 0.1.0 → 0.1.2

package/README.md

@@ -43,13 +43,13 @@ This plugin is a standard **DSH bundle plugin** (mirrors the dsh-ssh engineering
 Two install options (choose one):
 
 ```bash
-# ① Install from a local tgz / directory (recommended, after build)
+# ① Recommended — install from the npm registry
+dsh plugin --profile web add dsh-config-manager --config.auto-install-peers=false
+
+# ② Alternative — local tgz / directory (development & testing)
 npm run build
 npm pack                       # produces dsh-config-manager-0.1.0.tgz
 dsh plugin --profile web add file:/absolute/path/to/dsh-config-manager-0.1.0.tgz
-
-# ② Install from a registry after publishing
-dsh plugin --profile web add dsh-config-manager
 ```
 
 > **`--legacy-peer-deps` note**: some DSH core packages in peerDependencies (e.g.
@@ -157,6 +157,40 @@ npm test                         # node --test "src/**/*.test.ts" "tests/**/*.te
 
 Architecture: the core engine (`src/core`) depends only on the `ConfigAdapter` / `HostContext` interfaces (decoupled from the DSH runtime, testable with in-memory mocks); `src/adapters` implements each config category; `src/security` provides secret scanning / encryption / integrity / ZIP safety / redaction; `src/migrations` centralizes schema migration.
 
+## Publishing (GitHub Actions · npm trusted publishing / OIDC)
+
+Pushing a version tag triggers the CI pipeline in `.github/workflows/publish.yml`, which typechecks, runs the tests, builds, and publishes the package to npm. Publishing uses **npm trusted publishing (OIDC)** — no long-lived token is stored in the repository; the npm CLI exchanges a short-lived identity with the registry via GitHub Actions.
+
+```bash
+npm version patch          # 0.1.0 → 0.1.1 (also creates the tag)
+git push origin main --tags
+```
+
+One-time setup on npmjs.com (required before the first OIDC publish):
+
+**Option A — website** (scoped packages / where the UI is available):
+1. Open the package page: https://www.npmjs.com/package/dsh-config-manager → **Settings → Publishing access**.
+2. **Add trusted publisher**: Provider **GitHub Actions** · owner `xiajiajun516` · repository `dsh-config-manager` · workflow filename `publish.yml`.
+
+**Option B — CLI** (recommended; works for unscoped packages where the UI section is missing):
+```bash
+npm logout
+npm login                                    # web OAuth + 2FA code
+npm trust github dsh-config-manager \
+  --file publish.yml \
+  --repo xiajiajun516/dsh-config-manager \
+  --allow-publish                            # first run asks for a 2FA code
+npm trust list dsh-config-manager            # verify
+```
+
+No `NPM_TOKEN` repository secret is needed — a previously configured token can be revoked (npm is deprecating bypass-2FA tokens anyway).
+
+Notes:
+
+- The version in `package.json` must match the tag (`npm version` keeps them in sync automatically).
+- The workflow upgrades npm (`npm install -g npm@latest`) because OIDC publishing requires npm ≥ 11.5.1.
+- The workflow can also be triggered manually via **Run workflow** on the Actions page.
+
 ## Testing
 
 Test framework: **node:test (Node built-in, zero dependency)**, following the choice made in the core module (no vitest). Tests live in `src/**/*.test.ts` and `tests/**/*.test.ts`.

package/README.zh-CN.md

@@ -45,13 +45,13 @@ Analyze → Preview → Snapshot → Apply → Validate → Rollback(if needed)
 两种安装方式（二选一）：
 
 ```bash
-# ① 从本地 tgz / 目录安装（推荐，构建后）
+# ① 推荐 —— 从 npm registry 安装
+dsh plugin --profile web add dsh-config-manager --config.auto-install-peers=false
+
+# ② 备选 —— 本地 tgz / 目录安装（开发与测试）
 npm run build
 npm pack                       # 产出 dsh-config-manager-0.1.0.tgz
 dsh plugin --profile web add file:/absolute/path/to/dsh-config-manager-0.1.0.tgz
-
-# ② 发布后从 registry 安装
-dsh plugin --profile web add dsh-config-manager
 ```
 
 > **`--legacy-peer-deps` 说明**：peerDependencies 中的部分 DSH 核心包（如
@@ -159,6 +159,40 @@ npm test                         # node --test "src/**/*.test.ts" "tests/**/*.te
 
 架构：核心引擎（`src/core`）只依赖 `ConfigAdapter` / `HostContext` 接口（与 DSH 运行时解耦，可用内存 mock 测试）；`src/adapters` 实现各配置类别；`src/security` 提供秘密扫描 / 加密 / 完整性 / ZIP 安全 / redaction；`src/migrations` 集中 schema 迁移。
 
+## Publishing（GitHub Actions · npm Trusted Publishing / OIDC）
+
+推送版本标签会触发 `.github/workflows/publish.yml` 的 CI 流水线：typecheck → 测试 → 构建 → 自动发布到 npm。发布使用 **npm Trusted Publishing（OIDC）**——仓库不存储任何长期令牌，npm CLI 通过 GitHub Actions 的 OIDC 与 registry 交换短期身份。
+
+```bash
+npm version patch          # 0.1.0 → 0.1.1（同时创建 tag）
+git push origin main --tags
+```
+
+npmjs.com 一次性配置（首次 OIDC 发布前必须完成）：
+
+**方案 A — 网页**（有 scope 包或 UI 入口可用时）：
+1. 打开包页面：https://www.npmjs.com/package/dsh-config-manager → **Settings → Publishing access**。
+2. **Add trusted publisher**：Provider **GitHub Actions** · owner `xiajiajun516` · repository `dsh-config-manager` · workflow filename `publish.yml`。
+
+**方案 B — CLI（推荐；无 scope 包 UI 无入口时用这个）**：
+```bash
+npm logout
+npm login                                    # 网页 OAuth + 2FA 验证码
+npm trust github dsh-config-manager \
+  --file publish.yml \
+  --repo xiajiajun516/dsh-config-manager \
+  --allow-publish                            # 首次会要求输入 2FA 验证码
+npm trust list dsh-config-manager            # 验证
+```
+
+无需 `NPM_TOKEN` 仓库密钥——之前配置的令牌可以撤销（npm 也正在逐步废弃 bypass-2FA 令牌）。
+
+说明：
+
+- `package.json` 中的版本须与 tag 一致（`npm version` 会自动同步）。
+- 流水线会先升级 npm（`npm install -g npm@latest`），因为 OIDC 发布要求 npm ≥ 11.5.1。
+- 也可在 Actions 页面点 **Run workflow** 手动触发。
+
 ## Testing
 
 测试框架为 **node:test（Node 内置，零依赖）**，沿用核心模块的既有选择（不引入 vitest）。测试位于 `src/**/*.test.ts` 与 `tests/**/*.test.ts`。

package/lib/client.js

@@ -548,8 +548,8 @@ var ExportFlow = class {
 	}
 };
 //#endregion
-//#region \0config-manager-css:C:\Repository\DSH Config Manager\src\client\config-manager.module.css.js
-const css = ".fjdJpq_section{height:100%;min-height:0;color:var(--dsw-alias-label-primary);font-family:var(--dsw-font-family);flex-direction:column;gap:10px;font-size:13px;display:flex}.fjdJpq_sectionHeader{flex:none;align-items:center;gap:10px;display:flex}.fjdJpq_viewTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:1;gap:2px;display:flex}.fjdJpq_viewTab{color:var(--dsw-alias-label-secondary);cursor:pointer;white-space:nowrap;background:0 0;border:none;border-bottom:2px solid #0000;border-radius:6px 6px 0 0;padding:7px 14px;font-size:13px}.fjdJpq_viewTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}.fjdJpq_viewTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}.fjdJpq_sectionBody{flex-direction:column;flex:1;min-height:0;display:flex;overflow-y:auto}.fjdJpq_viewBody{flex-direction:column;gap:12px;padding:4px 2px 16px;display:flex}.fjdJpq_iconButton{width:26px;height:26px;color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:6px;justify-content:center;align-items:center;padding:0;font-size:15px;display:inline-flex}.fjdJpq_iconButton:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.fjdJpq_sectionTitleBlock{flex-direction:column;gap:2px;display:flex}.fjdJpq_sectionTitle{color:var(--dsw-alias-label-primary);margin:0;font-size:15px;font-weight:700}.fjdJpq_sectionSubtitle{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:1.5}.fjdJpq_primaryButton{color:var(--dsw-alias-label-primary-foreground);background:var(--dsw-alias-button-info-fill);cursor:pointer;white-space:nowrap;border:none;border-radius:8px;align-items:center;gap:6px;padding:6px 14px;font-size:13px;font-weight:600;display:inline-flex}.fjdJpq_primaryButton:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}.fjdJpq_primaryButton:disabled{opacity:.5;cursor:default}.fjdJpq_ghostButton{color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;align-items:center;gap:6px;padding:5px 12px;font-size:12px;display:inline-flex}.fjdJpq_ghostButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.fjdJpq_ghostButton:disabled{opacity:.45;cursor:default}.fjdJpq_dangerButton{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;padding:5px 12px;font-size:12px}.fjdJpq_dangerButton:hover:not(:disabled){background:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary-foreground)}.fjdJpq_dangerButton:disabled{opacity:.45;cursor:default}.fjdJpq_badge{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);white-space:nowrap;border-radius:999px;padding:1px 8px;font-size:11px;line-height:1.6;display:inline-block}.fjdJpq_badgeInfo{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}.fjdJpq_badgeOk{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}.fjdJpq_badgeWarn{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}.fjdJpq_badgeError{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}.fjdJpq_banner{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere;border-radius:8px;padding:8px 12px;font-size:12.5px;line-height:1.5}.fjdJpq_banner[data-kind=ok]{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}.fjdJpq_banner[data-kind=error]{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}.fjdJpq_banner[data-kind=info]{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}.fjdJpq_banner[data-kind=warn]{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}.fjdJpq_card{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;flex-direction:column;flex:none;gap:10px;padding:12px;display:flex}.fjdJpq_field{flex-direction:column;gap:5px;display:flex}.fjdJpq_fieldLabel{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:600}.fjdJpq_input{color:var(--dsw-alias-label-primary);background:var(--dsw-specific-input-major);border:1px solid var(--dsw-alias-border-l2);resize:vertical;border-radius:8px;outline:none;padding:7px 10px;font-family:inherit;font-size:13px}.fjdJpq_input:focus{border-color:var(--dsw-alias-state-business-primary)}.fjdJpq_input::placeholder{color:var(--dsw-alias-label-tertiary)}.fjdJpq_input:disabled{opacity:.55}.fjdJpq_hint{color:var(--dsw-alias-label-tertiary);font-size:11.5px;line-height:1.5}.fjdJpq_formError{color:var(--dsw-alias-state-error-primary);margin:0;font-size:12px}.fjdJpq_checkboxRow{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:flex-start;gap:8px;font-size:13px;display:flex}.fjdJpq_checkboxRow input{flex:none;margin-top:2px}.fjdJpq_radioLabel{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:center;gap:6px;font-size:13px;display:inline-flex}.fjdJpq_secretFields{grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:10px 12px;padding-top:4px;display:grid}.fjdJpq_hiddenFile{display:none}.fjdJpq_modeTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;gap:2px;display:flex}.fjdJpq_modeTab{color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-bottom:2px solid #0000;padding:6px 12px;font-size:12.5px}.fjdJpq_modeTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}.fjdJpq_modeTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}.fjdJpq_modeHint{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5}.fjdJpq_groupList{flex-direction:column;gap:10px;display:flex}.fjdJpq_groupCard{gap:8px}.fjdJpq_groupHeader{flex-wrap:wrap;align-items:baseline;gap:8px;display:flex}.fjdJpq_groupLabel{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:700}.fjdJpq_groupNote{color:var(--dsw-alias-label-tertiary);font-size:11.5px}.fjdJpq_groupItems{flex-direction:column;gap:6px;display:flex}.fjdJpq_categoryItem{flex-wrap:wrap;align-items:center;gap:8px;display:inline-flex}.fjdJpq_categoryName{font-weight:500}.fjdJpq_categoryDesc{color:var(--dsw-alias-label-tertiary);font-size:11.5px}.fjdJpq_optionsCard{gap:8px}.fjdJpq_warnList{margin:4px 0 0;padding-left:18px}.fjdJpq_actionRow{flex-wrap:wrap;align-items:center;gap:10px;display:flex}.fjdJpq_progressBlock{flex-direction:column;flex:none;gap:6px;display:flex}.fjdJpq_progressMeta{color:var(--dsw-alias-label-secondary);flex-wrap:wrap;gap:12px;font-size:12px;display:flex}.fjdJpq_progressLabel{font-weight:600}.fjdJpq_progressDetail{color:var(--dsw-alias-label-tertiary)}.fjdJpq_progressPercent{font-variant-numeric:tabular-nums;margin-left:auto}.fjdJpq_progressTrack{background:var(--dsw-alias-interactive-bg-hover);border-radius:999px;height:8px;overflow:hidden}.fjdJpq_progressBar{background:var(--dsw-alias-state-business-primary);border-radius:999px;height:100%;transition:width .12s linear}.fjdJpq_progressBarDone{background:var(--dsw-alias-state-success-primary)}.fjdJpq_progressIndeterminate{width:40%;animation:1s ease-in-out infinite fjdJpq_dshCmIndeterminate}@keyframes fjdJpq_dshCmIndeterminate{0%{margin-left:-40%}to{margin-left:100%}}.fjdJpq_reportView{flex-direction:column;gap:10px;display:flex}.fjdJpq_statRow{flex-wrap:wrap;align-items:center;gap:6px;display:flex}.fjdJpq_reportText{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:260px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:10px 12px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}.fjdJpq_reportFooter{justify-content:flex-end;gap:8px;display:flex}.fjdJpq_rollbackBox{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}.fjdJpq_rollbackBox .fjdJpq_reportText{border-color:var(--dsw-alias-border-l2)}.fjdJpq_errorBanner{border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}.fjdJpq_errorTitle{color:var(--dsw-alias-state-error-primary);font-size:13px;font-weight:700}.fjdJpq_errorReason{white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}.fjdJpq_errorAction{color:var(--dsw-alias-label-secondary);font-size:12.5px}.fjdJpq_errorActionLabel{color:var(--dsw-alias-state-business-primary)}.fjdJpq_errorItem{color:var(--dsw-alias-label-tertiary);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}.fjdJpq_errorFooter{justify-content:flex-end;display:flex}.fjdJpq_errorList{flex-direction:column;gap:4px;display:flex}.fjdJpq_errorLine{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-state-error-primary);border-radius:6px;margin:0;padding:6px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}.fjdJpq_conflictList{flex-direction:column;gap:10px;display:flex}.fjdJpq_conflictItem{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}.fjdJpq_conflictHead{flex-wrap:wrap;align-items:center;gap:8px;display:flex}.fjdJpq_conflictId{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:600}.fjdJpq_severityError{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);border-radius:999px;padding:0 6px;font-size:10.5px}.fjdJpq_conflictDetail{background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);border-radius:6px;margin:0;padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}.fjdJpq_conflictOptions{flex-wrap:wrap;gap:14px;display:flex}.fjdJpq_pathMappingList{flex-direction:column;gap:8px;display:flex}.fjdJpq_pathRow{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;padding:10px 12px;display:grid}.fjdJpq_pathOld,.fjdJpq_pathNew{flex-direction:column;gap:4px;min-width:0;display:flex}.fjdJpq_pathValue{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}.fjdJpq_pathIssueKind{color:var(--dsw-alias-state-warn-primary);font-size:10.5px}.fjdJpq_secretsList{flex-direction:column;gap:10px;display:flex}.fjdJpq_empty{text-align:center;color:var(--dsw-alias-label-tertiary);padding:22px 12px;font-size:12.5px}.fjdJpq_spinnerWrap{align-items:center;gap:6px;display:inline-flex}.fjdJpq_spinner{border:2px solid var(--dsw-alias-state-business-primary);vertical-align:-1px;border-top-color:#0000;border-radius:50%;flex:none;width:11px;height:11px;animation:.8s linear infinite fjdJpq_dshCmSpin;display:inline-block}.fjdJpq_spinnerLabel{color:var(--dsw-alias-label-secondary);font-size:12px}@keyframes fjdJpq_dshCmSpin{to{transform:rotate(360deg)}}";
+//#region \0config-manager-css:/home/runner/work/dsh-config-manager/dsh-config-manager/src/client/config-manager.module.css.js
+const css = "._367UGW_section{height:100%;min-height:0;color:var(--dsw-alias-label-primary);font-family:var(--dsw-font-family);flex-direction:column;gap:10px;font-size:13px;display:flex}._367UGW_sectionHeader{flex:none;align-items:center;gap:10px;display:flex}._367UGW_viewTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:1;gap:2px;display:flex}._367UGW_viewTab{color:var(--dsw-alias-label-secondary);cursor:pointer;white-space:nowrap;background:0 0;border:none;border-bottom:2px solid #0000;border-radius:6px 6px 0 0;padding:7px 14px;font-size:13px}._367UGW_viewTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_viewTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_sectionBody{flex-direction:column;flex:1;min-height:0;display:flex;overflow-y:auto}._367UGW_viewBody{flex-direction:column;gap:12px;padding:4px 2px 16px;display:flex}._367UGW_iconButton{width:26px;height:26px;color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:6px;justify-content:center;align-items:center;padding:0;font-size:15px;display:inline-flex}._367UGW_iconButton:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}._367UGW_sectionTitleBlock{flex-direction:column;gap:2px;display:flex}._367UGW_sectionTitle{color:var(--dsw-alias-label-primary);margin:0;font-size:15px;font-weight:700}._367UGW_sectionSubtitle{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:1.5}._367UGW_primaryButton{color:var(--dsw-alias-label-primary-foreground);background:var(--dsw-alias-button-info-fill);cursor:pointer;white-space:nowrap;border:none;border-radius:8px;align-items:center;gap:6px;padding:6px 14px;font-size:13px;font-weight:600;display:inline-flex}._367UGW_primaryButton:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}._367UGW_primaryButton:disabled{opacity:.5;cursor:default}._367UGW_ghostButton{color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;align-items:center;gap:6px;padding:5px 12px;font-size:12px;display:inline-flex}._367UGW_ghostButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}._367UGW_ghostButton:disabled{opacity:.45;cursor:default}._367UGW_dangerButton{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;padding:5px 12px;font-size:12px}._367UGW_dangerButton:hover:not(:disabled){background:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary-foreground)}._367UGW_dangerButton:disabled{opacity:.45;cursor:default}._367UGW_badge{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);white-space:nowrap;border-radius:999px;padding:1px 8px;font-size:11px;line-height:1.6;display:inline-block}._367UGW_badgeInfo{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_badgeOk{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_badgeWarn{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_badgeError{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere;border-radius:8px;padding:8px 12px;font-size:12.5px;line-height:1.5}._367UGW_banner[data-kind=ok]{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_banner[data-kind=error]{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner[data-kind=info]{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_banner[data-kind=warn]{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_card{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;flex-direction:column;flex:none;gap:10px;padding:12px;display:flex}._367UGW_field{flex-direction:column;gap:5px;display:flex}._367UGW_fieldLabel{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:600}._367UGW_input{color:var(--dsw-alias-label-primary);background:var(--dsw-specific-input-major);border:1px solid var(--dsw-alias-border-l2);resize:vertical;border-radius:8px;outline:none;padding:7px 10px;font-family:inherit;font-size:13px}._367UGW_input:focus{border-color:var(--dsw-alias-state-business-primary)}._367UGW_input::placeholder{color:var(--dsw-alias-label-tertiary)}._367UGW_input:disabled{opacity:.55}._367UGW_hint{color:var(--dsw-alias-label-tertiary);font-size:11.5px;line-height:1.5}._367UGW_formError{color:var(--dsw-alias-state-error-primary);margin:0;font-size:12px}._367UGW_checkboxRow{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:flex-start;gap:8px;font-size:13px;display:flex}._367UGW_checkboxRow input{flex:none;margin-top:2px}._367UGW_radioLabel{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:center;gap:6px;font-size:13px;display:inline-flex}._367UGW_secretFields{grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:10px 12px;padding-top:4px;display:grid}._367UGW_hiddenFile{display:none}._367UGW_modeTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;gap:2px;display:flex}._367UGW_modeTab{color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-bottom:2px solid #0000;padding:6px 12px;font-size:12.5px}._367UGW_modeTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_modeTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_modeHint{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5}._367UGW_groupList{flex-direction:column;gap:10px;display:flex}._367UGW_groupCard{gap:8px}._367UGW_groupHeader{flex-wrap:wrap;align-items:baseline;gap:8px;display:flex}._367UGW_groupLabel{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:700}._367UGW_groupNote{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_groupItems{flex-direction:column;gap:6px;display:flex}._367UGW_categoryItem{flex-wrap:wrap;align-items:center;gap:8px;display:inline-flex}._367UGW_categoryName{font-weight:500}._367UGW_categoryDesc{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_optionsCard{gap:8px}._367UGW_warnList{margin:4px 0 0;padding-left:18px}._367UGW_actionRow{flex-wrap:wrap;align-items:center;gap:10px;display:flex}._367UGW_progressBlock{flex-direction:column;flex:none;gap:6px;display:flex}._367UGW_progressMeta{color:var(--dsw-alias-label-secondary);flex-wrap:wrap;gap:12px;font-size:12px;display:flex}._367UGW_progressLabel{font-weight:600}._367UGW_progressDetail{color:var(--dsw-alias-label-tertiary)}._367UGW_progressPercent{font-variant-numeric:tabular-nums;margin-left:auto}._367UGW_progressTrack{background:var(--dsw-alias-interactive-bg-hover);border-radius:999px;height:8px;overflow:hidden}._367UGW_progressBar{background:var(--dsw-alias-state-business-primary);border-radius:999px;height:100%;transition:width .12s linear}._367UGW_progressBarDone{background:var(--dsw-alias-state-success-primary)}._367UGW_progressIndeterminate{width:40%;animation:1s ease-in-out infinite _367UGW_dshCmIndeterminate}@keyframes _367UGW_dshCmIndeterminate{0%{margin-left:-40%}to{margin-left:100%}}._367UGW_reportView{flex-direction:column;gap:10px;display:flex}._367UGW_statRow{flex-wrap:wrap;align-items:center;gap:6px;display:flex}._367UGW_reportText{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:260px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:10px 12px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}._367UGW_reportFooter{justify-content:flex-end;gap:8px;display:flex}._367UGW_rollbackBox{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_rollbackBox ._367UGW_reportText{border-color:var(--dsw-alias-border-l2)}._367UGW_errorBanner{border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_errorTitle{color:var(--dsw-alias-state-error-primary);font-size:13px;font-weight:700}._367UGW_errorReason{white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorAction{color:var(--dsw-alias-label-secondary);font-size:12.5px}._367UGW_errorActionLabel{color:var(--dsw-alias-state-business-primary)}._367UGW_errorItem{color:var(--dsw-alias-label-tertiary);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorFooter{justify-content:flex-end;display:flex}._367UGW_errorList{flex-direction:column;gap:4px;display:flex}._367UGW_errorLine{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-state-error-primary);border-radius:6px;margin:0;padding:6px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictList{flex-direction:column;gap:10px;display:flex}._367UGW_conflictItem{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_conflictHead{flex-wrap:wrap;align-items:center;gap:8px;display:flex}._367UGW_conflictId{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:600}._367UGW_severityError{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);border-radius:999px;padding:0 6px;font-size:10.5px}._367UGW_conflictDetail{background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);border-radius:6px;margin:0;padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictOptions{flex-wrap:wrap;gap:14px;display:flex}._367UGW_pathMappingList{flex-direction:column;gap:8px;display:flex}._367UGW_pathRow{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;padding:10px 12px;display:grid}._367UGW_pathOld,._367UGW_pathNew{flex-direction:column;gap:4px;min-width:0;display:flex}._367UGW_pathValue{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}._367UGW_pathIssueKind{color:var(--dsw-alias-state-warn-primary);font-size:10.5px}._367UGW_secretsList{flex-direction:column;gap:10px;display:flex}._367UGW_empty{text-align:center;color:var(--dsw-alias-label-tertiary);padding:22px 12px;font-size:12.5px}._367UGW_spinnerWrap{align-items:center;gap:6px;display:inline-flex}._367UGW_spinner{border:2px solid var(--dsw-alias-state-business-primary);vertical-align:-1px;border-top-color:#0000;border-radius:50%;flex:none;width:11px;height:11px;animation:.8s linear infinite _367UGW_dshCmSpin;display:inline-block}._367UGW_spinnerLabel{color:var(--dsw-alias-label-secondary);font-size:12px}@keyframes _367UGW_dshCmSpin{to{transform:rotate(360deg)}}";
 const tagId = "dsh-config-manager/config-manager.module.css";
 if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"dsh-config-manager/config-manager.module.css\"]") === null) {
 	const tag = document.createElement("style");
@@ -559,93 +559,93 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"reportText": "fjdJpq_reportText",
-	"empty": "fjdJpq_empty",
-	"dshCmSpin": "fjdJpq_dshCmSpin",
-	"radioLabel": "fjdJpq_radioLabel",
-	"progressIndeterminate": "fjdJpq_progressIndeterminate",
-	"progressBar": "fjdJpq_progressBar",
-	"secretsList": "fjdJpq_secretsList",
-	"progressLabel": "fjdJpq_progressLabel",
-	"spinnerWrap": "fjdJpq_spinnerWrap",
-	"warnList": "fjdJpq_warnList",
-	"conflictId": "fjdJpq_conflictId",
-	"card": "fjdJpq_card",
-	"categoryItem": "fjdJpq_categoryItem",
-	"checkboxRow": "fjdJpq_checkboxRow",
-	"hint": "fjdJpq_hint",
-	"sectionTitle": "fjdJpq_sectionTitle",
-	"reportFooter": "fjdJpq_reportFooter",
-	"errorReason": "fjdJpq_errorReason",
-	"errorAction": "fjdJpq_errorAction",
-	"errorBanner": "fjdJpq_errorBanner",
-	"pathNew": "fjdJpq_pathNew",
-	"errorLine": "fjdJpq_errorLine",
-	"sectionHeader": "fjdJpq_sectionHeader",
-	"errorFooter": "fjdJpq_errorFooter",
-	"statRow": "fjdJpq_statRow",
-	"conflictDetail": "fjdJpq_conflictDetail",
-	"input": "fjdJpq_input",
-	"progressTrack": "fjdJpq_progressTrack",
-	"primaryButton": "fjdJpq_primaryButton",
-	"badgeError": "fjdJpq_badgeError",
-	"viewTabs": "fjdJpq_viewTabs",
-	"groupList": "fjdJpq_groupList",
-	"section": "fjdJpq_section",
-	"groupHeader": "fjdJpq_groupHeader",
-	"reportView": "fjdJpq_reportView",
-	"pathIssueKind": "fjdJpq_pathIssueKind",
-	"categoryDesc": "fjdJpq_categoryDesc",
-	"rollbackBox": "fjdJpq_rollbackBox",
-	"conflictList": "fjdJpq_conflictList",
-	"pathValue": "fjdJpq_pathValue",
-	"badgeOk": "fjdJpq_badgeOk",
-	"formError": "fjdJpq_formError",
-	"conflictHead": "fjdJpq_conflictHead",
-	"groupLabel": "fjdJpq_groupLabel",
-	"banner": "fjdJpq_banner",
-	"severityError": "fjdJpq_severityError",
-	"conflictOptions": "fjdJpq_conflictOptions",
-	"ghostButton": "fjdJpq_ghostButton",
-	"actionRow": "fjdJpq_actionRow",
-	"spinnerLabel": "fjdJpq_spinnerLabel",
-	"field": "fjdJpq_field",
-	"badgeWarn": "fjdJpq_badgeWarn",
-	"secretFields": "fjdJpq_secretFields",
-	"groupCard": "fjdJpq_groupCard",
-	"badgeInfo": "fjdJpq_badgeInfo",
-	"pathMappingList": "fjdJpq_pathMappingList",
-	"viewBody": "fjdJpq_viewBody",
-	"progressBlock": "fjdJpq_progressBlock",
-	"dshCmIndeterminate": "fjdJpq_dshCmIndeterminate",
-	"sectionBody": "fjdJpq_sectionBody",
-	"sectionTitleBlock": "fjdJpq_sectionTitleBlock",
-	"hiddenFile": "fjdJpq_hiddenFile",
-	"modeTabs": "fjdJpq_modeTabs",
-	"fieldLabel": "fjdJpq_fieldLabel",
-	"categoryName": "fjdJpq_categoryName",
-	"optionsCard": "fjdJpq_optionsCard",
-	"progressDetail": "fjdJpq_progressDetail",
-	"progressPercent": "fjdJpq_progressPercent",
-	"spinner": "fjdJpq_spinner",
-	"groupItems": "fjdJpq_groupItems",
-	"progressMeta": "fjdJpq_progressMeta",
-	"iconButton": "fjdJpq_iconButton",
-	"badge": "fjdJpq_badge",
-	"viewTab": "fjdJpq_viewTab",
-	"modeHint": "fjdJpq_modeHint",
-	"groupNote": "fjdJpq_groupNote",
-	"pathRow": "fjdJpq_pathRow",
-	"errorActionLabel": "fjdJpq_errorActionLabel",
-	"errorTitle": "fjdJpq_errorTitle",
-	"conflictItem": "fjdJpq_conflictItem",
-	"errorList": "fjdJpq_errorList",
-	"dangerButton": "fjdJpq_dangerButton",
-	"modeTab": "fjdJpq_modeTab",
-	"progressBarDone": "fjdJpq_progressBarDone",
-	"sectionSubtitle": "fjdJpq_sectionSubtitle",
-	"errorItem": "fjdJpq_errorItem",
-	"pathOld": "fjdJpq_pathOld"
+	"input": "_367UGW_input",
+	"dangerButton": "_367UGW_dangerButton",
+	"badgeInfo": "_367UGW_badgeInfo",
+	"errorReason": "_367UGW_errorReason",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
+	"radioLabel": "_367UGW_radioLabel",
+	"modeTab": "_367UGW_modeTab",
+	"groupLabel": "_367UGW_groupLabel",
+	"actionRow": "_367UGW_actionRow",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"groupNote": "_367UGW_groupNote",
+	"dshCmSpin": "_367UGW_dshCmSpin",
+	"progressMeta": "_367UGW_progressMeta",
+	"groupItems": "_367UGW_groupItems",
+	"categoryName": "_367UGW_categoryName",
+	"section": "_367UGW_section",
+	"badgeOk": "_367UGW_badgeOk",
+	"errorList": "_367UGW_errorList",
+	"progressBarDone": "_367UGW_progressBarDone",
+	"conflictItem": "_367UGW_conflictItem",
+	"errorItem": "_367UGW_errorItem",
+	"sectionTitle": "_367UGW_sectionTitle",
+	"sectionBody": "_367UGW_sectionBody",
+	"progressBlock": "_367UGW_progressBlock",
+	"hint": "_367UGW_hint",
+	"hiddenFile": "_367UGW_hiddenFile",
+	"groupList": "_367UGW_groupList",
+	"progressDetail": "_367UGW_progressDetail",
+	"conflictHead": "_367UGW_conflictHead",
+	"errorLine": "_367UGW_errorLine",
+	"optionsCard": "_367UGW_optionsCard",
+	"groupCard": "_367UGW_groupCard",
+	"card": "_367UGW_card",
+	"warnList": "_367UGW_warnList",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"reportFooter": "_367UGW_reportFooter",
+	"errorFooter": "_367UGW_errorFooter",
+	"errorBanner": "_367UGW_errorBanner",
+	"groupHeader": "_367UGW_groupHeader",
+	"categoryItem": "_367UGW_categoryItem",
+	"errorAction": "_367UGW_errorAction",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"secretsList": "_367UGW_secretsList",
+	"viewTab": "_367UGW_viewTab",
+	"progressPercent": "_367UGW_progressPercent",
+	"reportView": "_367UGW_reportView",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"ghostButton": "_367UGW_ghostButton",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"iconButton": "_367UGW_iconButton",
+	"primaryButton": "_367UGW_primaryButton",
+	"errorTitle": "_367UGW_errorTitle",
+	"conflictOptions": "_367UGW_conflictOptions",
+	"sectionHeader": "_367UGW_sectionHeader",
+	"progressTrack": "_367UGW_progressTrack",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"formError": "_367UGW_formError",
+	"empty": "_367UGW_empty",
+	"spinner": "_367UGW_spinner",
+	"pathRow": "_367UGW_pathRow",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"sectionSubtitle": "_367UGW_sectionSubtitle",
+	"badgeError": "_367UGW_badgeError",
+	"conflictId": "_367UGW_conflictId",
+	"viewTabs": "_367UGW_viewTabs",
+	"modeHint": "_367UGW_modeHint",
+	"pathOld": "_367UGW_pathOld",
+	"field": "_367UGW_field",
+	"statRow": "_367UGW_statRow",
+	"banner": "_367UGW_banner",
+	"fieldLabel": "_367UGW_fieldLabel",
+	"modeTabs": "_367UGW_modeTabs",
+	"progressBar": "_367UGW_progressBar",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"pathNew": "_367UGW_pathNew",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"reportText": "_367UGW_reportText",
+	"viewBody": "_367UGW_viewBody",
+	"severityError": "_367UGW_severityError",
+	"conflictList": "_367UGW_conflictList",
+	"badgeWarn": "_367UGW_badgeWarn",
+	"progressLabel": "_367UGW_progressLabel",
+	"secretFields": "_367UGW_secretFields",
+	"pathValue": "_367UGW_pathValue",
+	"badge": "_367UGW_badge"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -1633,6 +1633,19 @@ var ConflictCollector = class {
 	}
 };
 //#endregion
+//#region src/ui/flow.ts
+/**
+* 计算下一阶段：在 `list`（适用阶段的有序列表）中取 `from` 的下一项。
+* - `from` 不在列表中（如来自 preview 页）→ 取第一项；
+* - `from` 已是最后一项（confirm）→ 原地返回；
+* - 绝不回退：已完成阶段不会因仍适用而被再次命中。
+*/
+function nextFlowPhase(list, from) {
+	if (list.length === 0) return "confirm";
+	const idx = list.indexOf(from);
+	return list[Math.min(idx + 1, list.length - 1)] ?? "confirm";
+}
+//#endregion
 //#region src/client/import/ConflictList.tsx
 /**
 * 冲突决策列表（规范 §11，绑 src/ui/conflict-view.ts 的 ConflictCollector）。
@@ -1820,6 +1833,7 @@ function PathMappingForm({ issues, initial, t, onChange }) {
 * 中间阶段（conflicts/path-mapping/secrets）是 UI 层流程页，wizard 的 decisions 由
 * 对应组件收集后写入。
 */
+/** 中间流程阶段（wizard.step 之外的 UI 层页面）——定义见 src/ui/flow.ts */
 const SCORE_LABEL = {
 	excellent: "Excellent",
 	good: "Good",
@@ -1896,13 +1910,22 @@ function ImportWizardView({ api, t }) {
 	const hasConflicts = (snapshot.plan?.items ?? []).some((i) => i.kind === "Conflict");
 	const hasPathIssues = (snapshot.analysis?.pathIssues.length ?? 0) > 0;
 	const hasSecrets = (snapshot.plan?.missingSecrets.length ?? 0) > 0;
-	/** 从某阶段完成后进入的下一个阶段（跳过空阶段；from 之前的阶段不再进入） */
-	const nextPhase = (from) => {
-		if (from !== "conflicts" && hasConflicts) return "conflicts";
-		if (from !== "path-mapping" && hasPathIssues) return "path-mapping";
-		if (from !== "secrets" && hasSecrets) return "secrets";
-		return "confirm";
+	/**
+	* 适用阶段的有序列表（仅含需要用户处理 + 确认页）。
+	* hasConflicts/hasPathIssues/hasSecrets 基于原始 analysis/plan（Dry Run 产物），
+	* 在流程中不会因已解决而重算——所以导航必须只前进（见 nextFlowPhase），
+	* 而不是靠"当前阶段 != X"判定（那会让已完成阶段被重新命中、跳回上一步）。
+	*/
+	const applicablePhases = () => {
+		const list = [];
+		if (hasConflicts) list.push("conflicts");
+		if (hasPathIssues) list.push("path-mapping");
+		if (hasSecrets) list.push("secrets");
+		list.push("confirm");
+		return list;
 	};
+	/** 从某阶段完成后进入的下一个阶段：只前进（from 不在列表时取第一项） */
+	const nextPhase = (from) => nextFlowPhase(applicablePhases(), from);
 	/** 选择并上传 ZIP → wizard.selectZip（analyzing → compatibility） */
 	const onPickFile = async (file) => {
 		if (file === void 0) return;