dsh-config-manager 0.1.4 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -0
- package/README.zh-CN.md +6 -0
- package/lib/adapters/providers.js +13 -3
- package/lib/adapters/providers.js.map +1 -1
- package/lib/adapters/settings.d.ts +5 -1
- package/lib/adapters/settings.js +24 -3
- package/lib/adapters/settings.js.map +1 -1
- package/lib/adapters/test-helpers.d.ts +21 -3
- package/lib/adapters/test-helpers.js +29 -4
- package/lib/adapters/test-helpers.js.map +1 -1
- package/lib/adapters/workspaces.js +14 -2
- package/lib/adapters/workspaces.js.map +1 -1
- package/lib/client.d.ts +2 -1
- package/lib/client.js +81 -78
- package/lib/client.js.map +1 -1
- package/lib/core/analyzer.js +9 -2
- package/lib/core/analyzer.js.map +1 -1
- package/lib/core/rollback.js +4 -2
- package/lib/core/rollback.js.map +1 -1
- package/lib/core/types.d.ts +5 -1
- package/lib/core/types.js.map +1 -1
- package/lib/profiles/profile-manager.js +3 -1
- package/lib/profiles/profile-manager.js.map +1 -1
- package/lib/ui/report.js +8 -4
- package/lib/ui/report.js.map +1 -1
- package/lib/ui/types.d.ts +2 -1
- package/lib/ui/types.js.map +1 -1
- package/package.json +1 -1
- package/src/adapters/providers.test.ts +1 -0
- package/src/adapters/providers.ts +12 -3
- package/src/adapters/roundtrip.test.ts +2 -0
- package/src/adapters/settings.test.ts +11 -4
- package/src/adapters/settings.ts +22 -3
- package/src/adapters/test-helpers.ts +27 -3
- package/src/adapters/ui.test.ts +1 -0
- package/src/adapters/workspaces.test.ts +27 -0
- package/src/adapters/workspaces.ts +13 -2
- package/src/client/import/ImportWizardView.tsx +7 -4
- package/src/core/analyzer.ts +11 -2
- package/src/core/rollback.ts +4 -2
- package/src/core/types.ts +5 -2
- package/src/profiles/profile-manager.test.ts +2 -0
- package/src/profiles/profile-manager.ts +3 -1
- package/src/ui/report.ts +6 -4
- package/src/ui/types.ts +2 -1
package/README.md
CHANGED
|
@@ -72,6 +72,12 @@ dsh plugin --profile web add dsh-config-manager@latest --config.auto-install-pee
|
|
|
72
72
|
```
|
|
73
73
|
|
|
74
74
|
> 💡 Just copy-paste the command: `--config.auto-install-peers=false` skips a few DSH core packages that aren't on the public registry yet (the DSH runtime provides them), and `@latest` ensures you get the newest build.
|
|
75
|
+
>
|
|
76
|
+
> 🐛 **`@latest` installed an old version?** That's pnpm 11's `minimumReleaseAge` supply-chain policy, not a cache issue: versions published less than ~30 days ago are excluded from resolution until whitelisted. Install an exact version once (it auto-whitelists, then `@latest` works):
|
|
77
|
+
> ```bash
|
|
78
|
+
> dsh plugin --profile web add dsh-config-manager@0.1.5 --config.auto-install-peers=false
|
|
79
|
+
> ```
|
|
80
|
+
> (Or set `minimumReleaseAge: 0` in the profile's `pnpm-workspace.yaml` to disable the age gate.)
|
|
75
81
|
|
|
76
82
|
---
|
|
77
83
|
|
package/README.zh-CN.md
CHANGED
|
@@ -72,6 +72,12 @@ dsh plugin --profile web add dsh-config-manager@latest --config.auto-install-pee
|
|
|
72
72
|
```
|
|
73
73
|
|
|
74
74
|
> 💡 照着复制就行：`--config.auto-install-peers=false` 跳过几个尚未公开发布的 DSH 核心依赖（运行时由 DSH 自己提供），`@latest` 确保装到最新版。
|
|
75
|
+
>
|
|
76
|
+
> 🐛 **`@latest` 装到了旧版？** 这是 **pnpm 11 的 `minimumReleaseAge` 供应链发布年龄策略**（不是缓存）：发布不足约 30 天的新版本会被排除出版本解析，直到进入白名单。装一次精确版本即可自动白名单，之后 `@latest` 正常：
|
|
77
|
+
> ```bash
|
|
78
|
+
> dsh plugin --profile web add dsh-config-manager@0.1.5 --config.auto-install-peers=false
|
|
79
|
+
> ```
|
|
80
|
+
> （或在 profile 的 `pnpm-workspace.yaml` 加 `minimumReleaseAge: 0` 彻底关闭年龄门槛。）
|
|
75
81
|
|
|
76
82
|
---
|
|
77
83
|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* 每项携带 raw（该 namespace 的完整 redacted 值）用于整体写回，apiKey 值经 credentials 状态占位（不导出值）。
|
|
7
7
|
*/
|
|
8
8
|
import { isDeepStrictEqual } from 'node:util';
|
|
9
|
-
import { resolveNamespaces } from "./settings.js";
|
|
9
|
+
import { resolveNamespaces, isEmptyValue } from "./settings.js";
|
|
10
10
|
export const DEFAULT_PROVIDER_NAMESPACES = ['llm-deepseek', 'llm-pi-ai'];
|
|
11
11
|
/** 无 raw 时的兜底重建：只取 ProviderEntry 已知字段 */
|
|
12
12
|
function stripEntry(entry) {
|
|
@@ -68,13 +68,23 @@ export class ProvidersAdapter {
|
|
|
68
68
|
for (const [route, entry] of Object.entries(data.providers)) {
|
|
69
69
|
const id = `provider:${route}`;
|
|
70
70
|
let current = null;
|
|
71
|
+
let targetUnavailable = false;
|
|
71
72
|
try {
|
|
72
73
|
current = await ctx.target.settings.describe(entry.namespace, { redactSecrets: true });
|
|
73
74
|
}
|
|
74
75
|
catch {
|
|
75
|
-
|
|
76
|
+
// 目标未注册该 namespace（缺少提供它的插件）→ 写入必失败，按依赖缺失处理（§15）
|
|
77
|
+
targetUnavailable = true;
|
|
76
78
|
}
|
|
77
|
-
if (
|
|
79
|
+
if (targetUnavailable) {
|
|
80
|
+
items.push({
|
|
81
|
+
id, kind: 'MissingDependency', adapter: 'providers',
|
|
82
|
+
description: `Provider ${route} 的命名空间 ${entry.namespace} 在目标未注册（可能需要安装对应插件）`,
|
|
83
|
+
severity: 'warning', target: { adapter: 'providers', ref: entry.namespace },
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
else if (current === null || isEmptyValue(current.value)) {
|
|
87
|
+
// 目标已注册但为空 → 初始化（Create）
|
|
78
88
|
items.push({
|
|
79
89
|
id, kind: 'Create', adapter: 'providers',
|
|
80
90
|
description: `创建 Provider ${route}（namespace ${entry.namespace}）`, severity: 'info',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/adapters/providers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAM9C,OAAO,EAAE,iBAAiB,EAA0B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/adapters/providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,11 @@ export type NamespaceProvider = (ctx: HostContext) => Promise<string[]> | string
|
|
|
5
5
|
export declare function resolveNamespaces(namespaces: string[] | NamespaceProvider, ctx: HostContext): Promise<string[]>;
|
|
6
6
|
/** 批量读取 namespace 的 redacted 记录（settings/ui 共用；单项失败跳过并告警） */
|
|
7
7
|
export declare function collectNamespaceRecords(ctx: HostContext, names: string[], warnings: string[]): Promise<Record<string, NamespaceRecord>>;
|
|
8
|
-
/**
|
|
8
|
+
/** 值是否“空”（目标已注册但从未配置 → 视为待初始化，Create 而非 Conflict） */
|
|
9
|
+
export declare function isEmptyValue(v: unknown): boolean;
|
|
10
|
+
/** 对比导入记录与目标当前值：不存在 → Create；一致 → Skip；不同 → Conflict；
|
|
11
|
+
* 目标端 describe 抛错（命名空间未注册：提供它的插件在目标未激活/未安装）→ MissingDependency（§15 依赖检测），
|
|
12
|
+
* 此时 Create/Update 必然失败，标记为“需注意”让导入继续，而不是整体失败。纯计算，零写入。 */
|
|
9
13
|
export declare function planNamespaceItems(data: Record<string, NamespaceRecord>, adapter: 'settings' | 'ui', ctx: ImportContext): Promise<PlanItem[]>;
|
|
10
14
|
/** 写入单个 namespace（settings/ui 共用）：读时锁 + expectedRevision 乐观锁，防覆盖并发修改 */
|
|
11
15
|
export declare function applyNamespaceItem(item: PlanItem, sectionId: 'settings' | 'ui', ctx: ImportContext): Promise<ApplyResult>;
|
package/lib/adapters/settings.js
CHANGED
|
@@ -31,19 +31,40 @@ export async function collectNamespaceRecords(ctx, names, warnings) {
|
|
|
31
31
|
}
|
|
32
32
|
return namespaces;
|
|
33
33
|
}
|
|
34
|
-
/**
|
|
34
|
+
/** 值是否“空”（目标已注册但从未配置 → 视为待初始化，Create 而非 Conflict） */
|
|
35
|
+
export function isEmptyValue(v) {
|
|
36
|
+
if (v === undefined || v === null)
|
|
37
|
+
return true;
|
|
38
|
+
if (typeof v === 'object')
|
|
39
|
+
return Object.keys(v).length === 0;
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
/** 对比导入记录与目标当前值：不存在 → Create；一致 → Skip；不同 → Conflict；
|
|
43
|
+
* 目标端 describe 抛错（命名空间未注册：提供它的插件在目标未激活/未安装）→ MissingDependency（§15 依赖检测），
|
|
44
|
+
* 此时 Create/Update 必然失败，标记为“需注意”让导入继续，而不是整体失败。纯计算，零写入。 */
|
|
35
45
|
export async function planNamespaceItems(data, adapter, ctx) {
|
|
36
46
|
const items = [];
|
|
37
47
|
for (const [name, rec] of Object.entries(data)) {
|
|
38
48
|
let current = null;
|
|
49
|
+
let targetUnavailable = false;
|
|
39
50
|
try {
|
|
40
51
|
current = await ctx.target.settings.describe(name, { redactSecrets: true });
|
|
41
52
|
}
|
|
42
53
|
catch {
|
|
43
|
-
|
|
54
|
+
// 目标连 describe 都失败 → 命名空间未注册（缺少提供插件）或目标不可读：
|
|
55
|
+
// 不能假定“不存在就创建”（replace 会同样失败），按依赖缺失处理。
|
|
56
|
+
targetUnavailable = true;
|
|
44
57
|
}
|
|
45
58
|
const id = `${adapter}:${name}`;
|
|
46
|
-
if (
|
|
59
|
+
if (targetUnavailable) {
|
|
60
|
+
items.push({
|
|
61
|
+
id, kind: 'MissingDependency', adapter,
|
|
62
|
+
description: `设置命名空间 ${name} 在目标未注册（可能需要安装提供它的插件）`,
|
|
63
|
+
severity: 'warning', target: { adapter, ref: name },
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
else if (current === null || isEmptyValue(current.value)) {
|
|
67
|
+
// 目标已注册但从未配置（空值）→ 初始化（Create）
|
|
47
68
|
items.push({
|
|
48
69
|
id, kind: 'Create', adapter, description: `创建设置 ${name}`, severity: 'info',
|
|
49
70
|
target: { adapter, ref: name },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/adapters/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAM9C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKxC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAwC,EACxC,GAAgB;IAEhB,OAAO,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,6DAA6D;AAC7D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAgB,EAChB,KAAe,EACf,QAAkB;IAElB,MAAM,UAAU,GAAoC,EAAE,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,UAAU,CAAC,IAAI,CAAC,GAAG;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,gBAAgB,IAAI,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/adapters/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAM9C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKxC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAwC,EACxC,GAAgB;IAEhB,OAAO,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,6DAA6D;AAC7D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAgB,EAChB,KAAe,EACf,QAAkB;IAElB,MAAM,UAAU,GAAoC,EAAE,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,UAAU,CAAC,IAAI,CAAC,GAAG;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,gBAAgB,IAAI,UAAU,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,YAAY,CAAC,CAAU;IACrC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/C,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,CAA4B,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACzF,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;0DAE0D;AAC1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAqC,EACrC,OAA0B,EAC1B,GAAkB;IAElB,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,IAAI,OAAO,GAAyB,IAAI,CAAC;QACzC,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,CAAC;QAAC,MAAM,CAAC;YACP,4CAA4C;YAC5C,uCAAuC;YACvC,iBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,MAAM,EAAE,GAAG,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC;QAChC,IAAI,iBAAiB,EAAE,CAAC;YACtB,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO;gBACtC,WAAW,EAAE,UAAU,IAAI,uBAAuB;gBAClD,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE;aACpD,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,KAAK,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3D,8BAA8B;YAC9B,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM;gBAC1E,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE;aAC/B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,QAAQ;gBAC9D,MAAM,EAAE,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBACtG,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE;aACpD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,wEAAwE;AACxE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAc,EACd,SAA4B,EAC5B,GAAkB;IAElB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;IAC7B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IACzD,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAiE,CAAC;IACzG,MAAM,GAAG,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,GAAG,EAAE,EAAE,CAAC;IACnE,+DAA+D;IAC/D,IAAI,QAA4B,CAAC;IACjC,IAAI,CAAC;QACH,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IACzF,CAAC;IAAC,MAAM,CAAC;QACP,QAAQ,GAAG,SAAS,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC5D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC;AAED,MAAM,OAAO,eAAe;IACjB,EAAE,GAAG,UAAmB,CAAC;IACzB,WAAW,GAAG,UAAU,CAAC;IACzB,eAAe,GAAG,IAAI,CAAC;IACvB,WAAW,GAAG,UAAmB,CAAC;IAC1B,UAAU,CAA+B;IAE1D,YAAY,aAA2C,EAAE;QACvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAgB,EAAE,QAAuB;QACpD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QACjF,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACvE,OAAO;YACL,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE;YAChC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;YACtD,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAqB,EAAE,GAAkB;QAC3D,OAAO,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAc,EAAE,GAAkB;QAChD,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAqB;QAClC,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QACnG,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YACpE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1D,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;oBAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,IAAI,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC7F,SAAS;gBACX,CAAC;gBACD,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACrC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,IAAI,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;gBACrG,CAAC;gBACD,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;oBACtB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,IAAI,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACtF,CAAC;CACF"}
|
|
@@ -15,8 +15,20 @@ export declare class MemFs implements FileSystemFacade {
|
|
|
15
15
|
listRecursive(dir: string): Promise<string[]>;
|
|
16
16
|
mkdir(): Promise<void>;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
/** ns.set 时自动注册（有值即视为对应插件已激活；对齐真实 dsh-settings 的注册语义） */
|
|
19
|
+
declare class AutoRegisterMap extends Map<string, {
|
|
20
|
+
value: unknown;
|
|
21
|
+
base?: unknown;
|
|
22
|
+
revision: number;
|
|
23
|
+
applies?: string[];
|
|
24
|
+
secrets: {
|
|
25
|
+
path: string[];
|
|
26
|
+
set: boolean;
|
|
27
|
+
}[];
|
|
28
|
+
}> {
|
|
29
|
+
private readonly registered;
|
|
30
|
+
constructor(registered: Set<string>);
|
|
31
|
+
set(key: string, value: {
|
|
20
32
|
value: unknown;
|
|
21
33
|
base?: unknown;
|
|
22
34
|
revision: number;
|
|
@@ -25,7 +37,13 @@ export declare class MemSettings implements SettingsFacade {
|
|
|
25
37
|
path: string[];
|
|
26
38
|
set: boolean;
|
|
27
39
|
}[];
|
|
28
|
-
}
|
|
40
|
+
}): this;
|
|
41
|
+
}
|
|
42
|
+
export declare class MemSettings implements SettingsFacade {
|
|
43
|
+
/** 已注册命名空间（对齐真实 dsh-settings：插件激活时注册；未注册的 describe/replace 抛错） */
|
|
44
|
+
registered: Set<string>;
|
|
45
|
+
/** 有值的命名空间自动视为已注册 */
|
|
46
|
+
ns: AutoRegisterMap;
|
|
29
47
|
describe(namespace: string, _opts?: {
|
|
30
48
|
redactSecrets?: boolean;
|
|
31
49
|
}): Promise<NamespaceInfo>;
|
|
@@ -48,15 +48,38 @@ export class MemFs {
|
|
|
48
48
|
}
|
|
49
49
|
async mkdir() { }
|
|
50
50
|
}
|
|
51
|
+
/** ns.set 时自动注册（有值即视为对应插件已激活；对齐真实 dsh-settings 的注册语义） */
|
|
52
|
+
class AutoRegisterMap extends Map {
|
|
53
|
+
registered;
|
|
54
|
+
constructor(registered) {
|
|
55
|
+
super();
|
|
56
|
+
this.registered = registered;
|
|
57
|
+
}
|
|
58
|
+
set(key, value) {
|
|
59
|
+
this.registered.add(key);
|
|
60
|
+
return super.set(key, value);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
51
63
|
export class MemSettings {
|
|
52
|
-
|
|
64
|
+
/** 已注册命名空间（对齐真实 dsh-settings：插件激活时注册；未注册的 describe/replace 抛错） */
|
|
65
|
+
registered = new Set();
|
|
66
|
+
/** 有值的命名空间自动视为已注册 */
|
|
67
|
+
ns = new AutoRegisterMap(this.registered);
|
|
53
68
|
async describe(namespace, _opts) {
|
|
69
|
+
if (!this.registered.has(namespace))
|
|
70
|
+
throw new Error(`settings namespace "${namespace}" is not registered`);
|
|
54
71
|
const rec = this.ns.get(namespace);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
72
|
+
return {
|
|
73
|
+
value: rec?.value,
|
|
74
|
+
base: rec?.base,
|
|
75
|
+
revision: rec?.revision ?? 0,
|
|
76
|
+
applies: rec?.applies,
|
|
77
|
+
secrets: rec?.secrets ?? [],
|
|
78
|
+
};
|
|
58
79
|
}
|
|
59
80
|
async replace(namespace, value, expectedRevision) {
|
|
81
|
+
if (!this.registered.has(namespace))
|
|
82
|
+
throw new Error(`settings namespace "${namespace}" is not registered`);
|
|
60
83
|
const rec = this.ns.get(namespace);
|
|
61
84
|
if (expectedRevision !== undefined && rec && rec.revision !== expectedRevision) {
|
|
62
85
|
throw new Error(`SETTINGS_CONFLICT: ${namespace} revision ${rec.revision} !== ${expectedRevision}`);
|
|
@@ -66,6 +89,8 @@ export class MemSettings {
|
|
|
66
89
|
});
|
|
67
90
|
}
|
|
68
91
|
async update(namespace, patch, expectedRevision) {
|
|
92
|
+
if (!this.registered.has(namespace))
|
|
93
|
+
throw new Error(`settings namespace "${namespace}" is not registered`);
|
|
69
94
|
const rec = this.ns.get(namespace);
|
|
70
95
|
if (expectedRevision !== undefined && rec && rec.revision !== expectedRevision) {
|
|
71
96
|
throw new Error(`SETTINGS_CONFLICT: ${namespace} revision ${rec.revision} !== ${expectedRevision}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-helpers.js","sourceRoot":"","sources":["../../src/adapters/test-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAQhD,MAAM,OAAO,KAAK;IAChB,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IACrB,OAAO,CAAS;IACjC,YAAY,OAAe;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IACO,GAAG,CAAC,CAAS;QACnB,OAAO,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAAe;QAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;QAC3D,OAAO,CAAC,CAAC;IACX,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,IAAgB;QAC/C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,EAAU;QACjC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,GAAW;QAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClF,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,KAAK,KAAoC,CAAC;CACjD;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"test-helpers.js","sourceRoot":"","sources":["../../src/adapters/test-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAQhD,MAAM,OAAO,KAAK;IAChB,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IACrB,OAAO,CAAS;IACjC,YAAY,OAAe;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IACO,GAAG,CAAC,CAAS;QACnB,OAAO,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAAe;QAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;QAC3D,OAAO,CAAC,CAAC;IACX,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,IAAgB;QAC/C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,EAAU;QACjC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,GAAW;QAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClF,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,KAAK,KAAoC,CAAC;CACjD;AAED,yDAAyD;AACzD,MAAM,eAAgB,SAAQ,GAAkI;IAC7I,UAAU,CAAc;IACzC,YAAY,UAAuB;QACjC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IACQ,GAAG,CAAC,GAAW,EAAE,KAA4H;QACpJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,MAAM,OAAO,WAAW;IACtB,kEAAkE;IAClE,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,qBAAqB;IACrB,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,KAAK,CAAC,QAAQ,CAAC,SAAiB,EAAE,KAAmC;QACnE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,qBAAqB,CAAC,CAAC;QAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO;YACL,KAAK,EAAE,GAAG,EAAE,KAAK;YACjB,IAAI,EAAE,GAAG,EAAE,IAAI;YACf,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,OAAO;YACrB,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE;SAC5B,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,KAAc,EAAE,gBAAyB;QACxE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,qBAAqB,CAAC,CAAC;QAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,gBAAgB,KAAK,SAAS,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,sBAAsB,SAAS,aAAa,GAAG,CAAC,QAAQ,QAAQ,gBAAgB,EAAE,CAAC,CAAC;QACtG,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE;YACrB,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO;SAC/G,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAE,SAAiB,EAAE,KAAc,EAAE,gBAAyB;QACxE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,qBAAqB,CAAC,CAAC;QAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,gBAAgB,KAAK,SAAS,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,sBAAsB,SAAS,aAAa,GAAG,CAAC,QAAQ,QAAQ,gBAAgB,EAAE,CAAC,CAAC;QACtG,CAAC;QACD,MAAM,MAAM,GAAG,EAAE,GAAI,GAAG,EAAE,KAA6C,EAAE,GAAI,KAAiC,EAAE,CAAC;QACjH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7G,CAAC;CACF;AAED,MAAM,OAAO,cAAc;IACzB,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnC,KAAK,CAAC,QAAQ,CAAC,GAAW;QACxB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,EAAE,UAAU,EAAE,CAAC,KAAK,SAAS,EAAE,MAAM,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnG,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAa,IAAmB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACrF,KAAK,CAAC,KAAK,CAAC,GAAW,IAAmB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrE;AAED,MAAM,OAAO,UAAU;IACrB,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC1C,KAAK,CAAC,aAAa;QACjB,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,GAAW;QACvB,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,YAAY;IACvB,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC7C,KAAK,CAAC,WAAW,KAAiC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,CAAC,WAAW,CAAC,CAAkB,IAAmB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,KAAK,CAAC,YAAY,CAAC,EAAU,IAAmB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC3E;AAED,MAAM,OAAO,QAAQ;IACnB,KAAK,GAAG,IAAI,GAAG,EAA4C,CAAC;IAC5D,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,CAAC,iBAAiB,CACrB,KAAa,EACb,OAAmF;QAEnF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ;gBAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;;gBAClD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,gBAAgB;IAC3B,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IACtC,KAAK,CAAC,IAAI,CAAC,QAAkB,EAAE,QAAiC,IAAI,GAAG,EAAE;QACvE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAU;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,EAAU,EAAE,QAAgB;QACzC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAC1B,QAAQ,CAAS;IACjB,IAAI,GAAG,KAAK,CAAC;IACb,OAAO,CAAS;IAChB,UAAU,GAAG,YAAY,CAAC;IAC1B,GAAG,CAAS;IACZ,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;IAC7B,WAAW,GAAG,IAAI,cAAc,EAAE,CAAC;IACnC,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;IAC3B,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IAC/B,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC3B,EAAE,CAAQ;IACV,YAAY,QAAgB,EAAE,OAAe;QAC3C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,EAAE,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,OAAe;IAC3D,OAAO,IAAI,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,YAAY,CAAC,QAAQ,GAAG,OAAO;IAC7C,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,QAAQ,EAAE,EAAE,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,OAAO,EAAE;QAC/D,MAAM,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,QAA0C,EAAE,IAAI,EAAE,KAAK,EAAE;QACvG,UAAU,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,WAAW,EAAE;QAC9D,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK;YACxF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK;YACzE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK;SAC1D;QACD,QAAQ,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;KACzE,CAAC;AACJ,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,iBAAiB,CAC/B,MAAmB,EACnB,QAAsC,EACtC,YAAoC,EAAE;IAEtC,OAAO;QACL,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvC,cAAc,EAAE,MAAM,CAAC,QAAQ;QAC/B,MAAM;QACN,QAAQ,EAAE,QAAmC;QAC7C,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -65,8 +65,20 @@ export class WorkspacesAdapter {
|
|
|
65
65
|
const rec = data?.workspaces.find((r) => r.id === ref);
|
|
66
66
|
if (!rec)
|
|
67
67
|
return { ok: false, message: `导入数据缺少工作区 ${ref}` };
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
try {
|
|
69
|
+
await ctx.target.workspace.writeRecord(rec);
|
|
70
|
+
return { ok: true };
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
// 目标端无法写入（如路径 realpath 失败/目录不存在）→ 非致命警告（§34.17），
|
|
74
|
+
// 不触发整体回滚——否则一个失效路径会拖垮已成功导入的其余配置。
|
|
75
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
76
|
+
return {
|
|
77
|
+
ok: false,
|
|
78
|
+
warning: true,
|
|
79
|
+
message: `工作区 ${ref} 未能写入：${msg}（需映射路径或先在目标创建目录）`,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
70
82
|
}
|
|
71
83
|
async validate(data) {
|
|
72
84
|
const issues = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/adapters/workspaces.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/adapters/workspaces.ts"],"names":[],"mappings":"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"}
|
package/lib/client.d.ts
CHANGED
|
@@ -134,7 +134,8 @@ interface ImportPlan {
|
|
|
134
134
|
}
|
|
135
135
|
interface ExecutedItem {
|
|
136
136
|
itemId: string;
|
|
137
|
-
|
|
137
|
+
/** warning = 未应用但非致命（目标不可达等），不计入失败、不触发回滚 */
|
|
138
|
+
status: 'ok' | 'skipped' | 'warning' | 'failed';
|
|
138
139
|
message?: string;
|
|
139
140
|
}
|
|
140
141
|
interface ImportResult {
|
package/lib/client.js
CHANGED
|
@@ -328,6 +328,7 @@ function importSectionStats(executed) {
|
|
|
328
328
|
section,
|
|
329
329
|
ok: 0,
|
|
330
330
|
skipped: 0,
|
|
331
|
+
warned: 0,
|
|
331
332
|
failed: 0,
|
|
332
333
|
items: []
|
|
333
334
|
};
|
|
@@ -335,6 +336,7 @@ function importSectionStats(executed) {
|
|
|
335
336
|
}
|
|
336
337
|
if (e.status === "ok") stat.ok += 1;
|
|
337
338
|
else if (e.status === "skipped") stat.skipped += 1;
|
|
339
|
+
else if (e.status === "warning") stat.warned += 1;
|
|
338
340
|
else stat.failed += 1;
|
|
339
341
|
stat.items.push(e);
|
|
340
342
|
}
|
|
@@ -348,9 +350,10 @@ function renderImportReport(result) {
|
|
|
348
350
|
const parts = [];
|
|
349
351
|
if (s.ok > 0) parts.push(`✓ ${s.ok} imported/restored`);
|
|
350
352
|
if (s.skipped > 0) parts.push(`- ${s.skipped} skipped`);
|
|
353
|
+
if (s.warned > 0) parts.push(`⚠ ${s.warned} need attention`);
|
|
351
354
|
if (s.failed > 0) parts.push(`✗ ${s.failed} failed`);
|
|
352
355
|
lines.push(`${s.section}: ${parts.join(" ") || "no changes"}`);
|
|
353
|
-
for (const it of s.items) if (it.status === "failed") lines.push(` Reason: ${it.message ?? "未知原因"}`);
|
|
356
|
+
for (const it of s.items) if (it.status === "failed" || it.status === "warning") lines.push(` ${it.status === "failed" ? "Reason" : "Note"}: ${it.message ?? "未知原因"}`);
|
|
354
357
|
}
|
|
355
358
|
if (result.missingSecrets.length > 0) lines.push(`Secrets: ⚠ ${result.missingSecrets.length} credentials need to be entered`);
|
|
356
359
|
if (result.needsRestart) lines.push("Restart required: 插件/MCP 变更将在重启 DSH 后生效");
|
|
@@ -559,93 +562,93 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
|
|
|
559
562
|
document.head.appendChild(tag);
|
|
560
563
|
}
|
|
561
564
|
var config_manager_module_css_default = {
|
|
562
|
-
"
|
|
563
|
-
"formError": "_367UGW_formError",
|
|
564
|
-
"errorItem": "_367UGW_errorItem",
|
|
565
|
-
"secretFields": "_367UGW_secretFields",
|
|
566
|
-
"section": "_367UGW_section",
|
|
567
|
-
"sectionBody": "_367UGW_sectionBody",
|
|
568
|
-
"groupHeader": "_367UGW_groupHeader",
|
|
569
|
-
"fieldLabel": "_367UGW_fieldLabel",
|
|
570
|
-
"input": "_367UGW_input",
|
|
571
|
-
"groupLabel": "_367UGW_groupLabel",
|
|
572
|
-
"radioLabel": "_367UGW_radioLabel",
|
|
573
|
-
"modeTabs": "_367UGW_modeTabs",
|
|
574
|
-
"progressMeta": "_367UGW_progressMeta",
|
|
575
|
-
"conflictHead": "_367UGW_conflictHead",
|
|
576
|
-
"conflictOptions": "_367UGW_conflictOptions",
|
|
577
|
-
"conflictId": "_367UGW_conflictId",
|
|
578
|
-
"pathIssueKind": "_367UGW_pathIssueKind",
|
|
579
|
-
"iconButton": "_367UGW_iconButton",
|
|
580
|
-
"empty": "_367UGW_empty",
|
|
581
|
-
"dshCmSpin": "_367UGW_dshCmSpin",
|
|
565
|
+
"badgeOk": "_367UGW_badgeOk",
|
|
582
566
|
"errorActionLabel": "_367UGW_errorActionLabel",
|
|
583
|
-
"
|
|
584
|
-
"
|
|
567
|
+
"iconButton": "_367UGW_iconButton",
|
|
568
|
+
"errorBanner": "_367UGW_errorBanner",
|
|
569
|
+
"progressPercent": "_367UGW_progressPercent",
|
|
570
|
+
"categoryDesc": "_367UGW_categoryDesc",
|
|
571
|
+
"optionsCard": "_367UGW_optionsCard",
|
|
572
|
+
"categoryItem": "_367UGW_categoryItem",
|
|
573
|
+
"conflictOptions": "_367UGW_conflictOptions",
|
|
574
|
+
"pathOld": "_367UGW_pathOld",
|
|
575
|
+
"dangerButton": "_367UGW_dangerButton",
|
|
576
|
+
"pathNew": "_367UGW_pathNew",
|
|
577
|
+
"checkboxRow": "_367UGW_checkboxRow",
|
|
578
|
+
"secretFields": "_367UGW_secretFields",
|
|
579
|
+
"rollbackBox": "_367UGW_rollbackBox",
|
|
580
|
+
"errorTitle": "_367UGW_errorTitle",
|
|
581
|
+
"errorAction": "_367UGW_errorAction",
|
|
585
582
|
"conflictList": "_367UGW_conflictList",
|
|
586
|
-
"
|
|
587
|
-
"
|
|
588
|
-
"card": "_367UGW_card",
|
|
589
|
-
"pathMappingList": "_367UGW_pathMappingList",
|
|
590
|
-
"spinnerWrap": "_367UGW_spinnerWrap",
|
|
583
|
+
"warnList": "_367UGW_warnList",
|
|
584
|
+
"formError": "_367UGW_formError",
|
|
591
585
|
"badgeInfo": "_367UGW_badgeInfo",
|
|
592
|
-
"
|
|
586
|
+
"groupHeader": "_367UGW_groupHeader",
|
|
587
|
+
"conflictId": "_367UGW_conflictId",
|
|
588
|
+
"secretsList": "_367UGW_secretsList",
|
|
589
|
+
"viewBody": "_367UGW_viewBody",
|
|
590
|
+
"statRow": "_367UGW_statRow",
|
|
593
591
|
"pathRow": "_367UGW_pathRow",
|
|
594
|
-
"
|
|
595
|
-
"
|
|
596
|
-
"errorLine": "_367UGW_errorLine",
|
|
597
|
-
"conflictItem": "_367UGW_conflictItem",
|
|
598
|
-
"progressBarDone": "_367UGW_progressBarDone",
|
|
599
|
-
"sectionTitle": "_367UGW_sectionTitle",
|
|
592
|
+
"modeHint": "_367UGW_modeHint",
|
|
593
|
+
"spinnerWrap": "_367UGW_spinnerWrap",
|
|
600
594
|
"pathValue": "_367UGW_pathValue",
|
|
601
|
-
"
|
|
595
|
+
"sectionHeader": "_367UGW_sectionHeader",
|
|
596
|
+
"ghostButton": "_367UGW_ghostButton",
|
|
597
|
+
"card": "_367UGW_card",
|
|
598
|
+
"errorList": "_367UGW_errorList",
|
|
599
|
+
"viewTab": "_367UGW_viewTab",
|
|
600
|
+
"badgeError": "_367UGW_badgeError",
|
|
601
|
+
"reportText": "_367UGW_reportText",
|
|
602
|
+
"dshCmSpin": "_367UGW_dshCmSpin",
|
|
603
|
+
"categoryName": "_367UGW_categoryName",
|
|
604
|
+
"pathIssueKind": "_367UGW_pathIssueKind",
|
|
605
|
+
"progressMeta": "_367UGW_progressMeta",
|
|
602
606
|
"progressBlock": "_367UGW_progressBlock",
|
|
603
|
-
"
|
|
604
|
-
"badgeWarn": "_367UGW_badgeWarn",
|
|
607
|
+
"hint": "_367UGW_hint",
|
|
605
608
|
"sectionSubtitle": "_367UGW_sectionSubtitle",
|
|
606
|
-
"
|
|
607
|
-
"
|
|
608
|
-
"
|
|
609
|
-
"
|
|
610
|
-
"
|
|
611
|
-
"
|
|
609
|
+
"errorReason": "_367UGW_errorReason",
|
|
610
|
+
"sectionTitle": "_367UGW_sectionTitle",
|
|
611
|
+
"errorLine": "_367UGW_errorLine",
|
|
612
|
+
"conflictItem": "_367UGW_conflictItem",
|
|
613
|
+
"progressDetail": "_367UGW_progressDetail",
|
|
614
|
+
"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
|
|
615
|
+
"progressLabel": "_367UGW_progressLabel",
|
|
616
|
+
"banner": "_367UGW_banner",
|
|
617
|
+
"radioLabel": "_367UGW_radioLabel",
|
|
618
|
+
"groupNote": "_367UGW_groupNote",
|
|
619
|
+
"progressBarDone": "_367UGW_progressBarDone",
|
|
620
|
+
"spinner": "_367UGW_spinner",
|
|
621
|
+
"modeTabs": "_367UGW_modeTabs",
|
|
622
|
+
"empty": "_367UGW_empty",
|
|
623
|
+
"reportView": "_367UGW_reportView",
|
|
624
|
+
"groupLabel": "_367UGW_groupLabel",
|
|
612
625
|
"progressIndeterminate": "_367UGW_progressIndeterminate",
|
|
613
|
-
"
|
|
614
|
-
"
|
|
626
|
+
"sectionBody": "_367UGW_sectionBody",
|
|
627
|
+
"badge": "_367UGW_badge",
|
|
628
|
+
"section": "_367UGW_section",
|
|
615
629
|
"progressBar": "_367UGW_progressBar",
|
|
630
|
+
"errorItem": "_367UGW_errorItem",
|
|
631
|
+
"fieldLabel": "_367UGW_fieldLabel",
|
|
632
|
+
"groupCard": "_367UGW_groupCard",
|
|
633
|
+
"severityError": "_367UGW_severityError",
|
|
634
|
+
"hiddenFile": "_367UGW_hiddenFile",
|
|
616
635
|
"sectionTitleBlock": "_367UGW_sectionTitleBlock",
|
|
636
|
+
"input": "_367UGW_input",
|
|
617
637
|
"groupList": "_367UGW_groupList",
|
|
618
|
-
"progressTrack": "_367UGW_progressTrack",
|
|
619
|
-
"reportText": "_367UGW_reportText",
|
|
620
|
-
"rollbackBox": "_367UGW_rollbackBox",
|
|
621
|
-
"secretsList": "_367UGW_secretsList",
|
|
622
|
-
"warnList": "_367UGW_warnList",
|
|
623
|
-
"pathNew": "_367UGW_pathNew",
|
|
624
|
-
"badgeOk": "_367UGW_badgeOk",
|
|
625
|
-
"statRow": "_367UGW_statRow",
|
|
626
|
-
"errorBanner": "_367UGW_errorBanner",
|
|
627
|
-
"hint": "_367UGW_hint",
|
|
628
|
-
"sectionHeader": "_367UGW_sectionHeader",
|
|
629
|
-
"progressDetail": "_367UGW_progressDetail",
|
|
630
638
|
"reportFooter": "_367UGW_reportFooter",
|
|
631
|
-
"
|
|
632
|
-
"
|
|
633
|
-
"
|
|
634
|
-
"
|
|
635
|
-
"
|
|
636
|
-
"categoryDesc": "_367UGW_categoryDesc",
|
|
637
|
-
"primaryButton": "_367UGW_primaryButton",
|
|
638
|
-
"categoryName": "_367UGW_categoryName",
|
|
639
|
-
"reportView": "_367UGW_reportView",
|
|
639
|
+
"progressTrack": "_367UGW_progressTrack",
|
|
640
|
+
"badgeWarn": "_367UGW_badgeWarn",
|
|
641
|
+
"spinnerLabel": "_367UGW_spinnerLabel",
|
|
642
|
+
"actionRow": "_367UGW_actionRow",
|
|
643
|
+
"groupItems": "_367UGW_groupItems",
|
|
640
644
|
"errorFooter": "_367UGW_errorFooter",
|
|
641
|
-
"
|
|
642
|
-
"
|
|
643
|
-
"badgeError": "_367UGW_badgeError",
|
|
644
|
-
"badge": "_367UGW_badge",
|
|
645
|
-
"errorReason": "_367UGW_errorReason",
|
|
645
|
+
"field": "_367UGW_field",
|
|
646
|
+
"primaryButton": "_367UGW_primaryButton",
|
|
646
647
|
"modeTab": "_367UGW_modeTab",
|
|
647
|
-
"
|
|
648
|
-
"
|
|
648
|
+
"conflictDetail": "_367UGW_conflictDetail",
|
|
649
|
+
"pathMappingList": "_367UGW_pathMappingList",
|
|
650
|
+
"conflictHead": "_367UGW_conflictHead",
|
|
651
|
+
"viewTabs": "_367UGW_viewTabs"
|
|
649
652
|
};
|
|
650
653
|
//#endregion
|
|
651
654
|
//#region src/client/common/ui.tsx
|
|
@@ -2170,7 +2173,7 @@ function ImportWizardView({ api, t }) {
|
|
|
2170
2173
|
]
|
|
2171
2174
|
});
|
|
2172
2175
|
}
|
|
2173
|
-
if (phase === "conflicts") {
|
|
2176
|
+
if (phase === "conflicts" && step === "preview") {
|
|
2174
2177
|
if (conflictCollector === null || snapshot.plan === null) return null;
|
|
2175
2178
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
2176
2179
|
className: config_manager_module_css_default.viewBody,
|
|
@@ -2202,7 +2205,7 @@ function ImportWizardView({ api, t }) {
|
|
|
2202
2205
|
]
|
|
2203
2206
|
});
|
|
2204
2207
|
}
|
|
2205
|
-
if (phase === "path-mapping") {
|
|
2208
|
+
if (phase === "path-mapping" && step === "preview") {
|
|
2206
2209
|
const issues = snapshot.analysis?.pathIssues ?? [];
|
|
2207
2210
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
2208
2211
|
className: config_manager_module_css_default.viewBody,
|
|
@@ -2234,7 +2237,7 @@ function ImportWizardView({ api, t }) {
|
|
|
2234
2237
|
]
|
|
2235
2238
|
});
|
|
2236
2239
|
}
|
|
2237
|
-
if (phase === "secrets") {
|
|
2240
|
+
if (phase === "secrets" && step === "preview") {
|
|
2238
2241
|
const missing = snapshot.plan?.missingSecrets ?? [];
|
|
2239
2242
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
2240
2243
|
className: config_manager_module_css_default.viewBody,
|
|
@@ -2262,7 +2265,7 @@ function ImportWizardView({ api, t }) {
|
|
|
2262
2265
|
]
|
|
2263
2266
|
});
|
|
2264
2267
|
}
|
|
2265
|
-
if (phase === "confirm") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
2268
|
+
if (phase === "confirm" && step === "preview") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
2266
2269
|
className: config_manager_module_css_default.viewBody,
|
|
2267
2270
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, {
|
|
2268
2271
|
className: config_manager_module_css_default.optionsCard,
|