dsh-config-manager 0.1.17 → 0.1.19
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 +1 -0
- package/lib/adapters/credentials.d.ts +2 -1
- package/lib/adapters/credentials.js +10 -9
- package/lib/adapters/credentials.js.map +1 -1
- package/lib/adapters/file-collection.d.ts +2 -1
- package/lib/adapters/file-collection.js +14 -11
- package/lib/adapters/file-collection.js.map +1 -1
- package/lib/adapters/mcp.d.ts +2 -1
- package/lib/adapters/mcp.js +15 -12
- package/lib/adapters/mcp.js.map +1 -1
- package/lib/adapters/plugin-files.d.ts +2 -1
- package/lib/adapters/plugin-files.js +11 -9
- package/lib/adapters/plugin-files.js.map +1 -1
- package/lib/adapters/plugins.d.ts +2 -1
- package/lib/adapters/plugins.js +33 -31
- package/lib/adapters/plugins.js.map +1 -1
- package/lib/adapters/prompts.d.ts +2 -1
- package/lib/adapters/prompts.js +21 -18
- package/lib/adapters/prompts.js.map +1 -1
- package/lib/adapters/providers.d.ts +2 -1
- package/lib/adapters/providers.js +15 -13
- package/lib/adapters/providers.js.map +1 -1
- package/lib/adapters/settings.d.ts +2 -1
- package/lib/adapters/settings.js +17 -15
- package/lib/adapters/settings.js.map +1 -1
- package/lib/adapters/test-helpers.js +2 -0
- package/lib/adapters/test-helpers.js.map +1 -1
- package/lib/adapters/ui.d.ts +2 -1
- package/lib/adapters/ui.js +6 -5
- package/lib/adapters/ui.js.map +1 -1
- package/lib/adapters/workspaces.d.ts +2 -1
- package/lib/adapters/workspaces.js +15 -13
- package/lib/adapters/workspaces.js.map +1 -1
- package/lib/client.d.ts +222 -0
- package/lib/client.js +1010 -318
- package/lib/client.js.map +1 -1
- package/lib/core/analyzer.d.ts +4 -0
- package/lib/core/analyzer.js +34 -26
- package/lib/core/analyzer.js.map +1 -1
- package/lib/core/backup.d.ts +10 -0
- package/lib/core/backup.js +37 -0
- package/lib/core/backup.js.map +1 -1
- package/lib/core/exporter.d.ts +4 -0
- package/lib/core/exporter.js +6 -3
- package/lib/core/exporter.js.map +1 -1
- package/lib/core/importer.d.ts +3 -0
- package/lib/core/importer.js.map +1 -1
- package/lib/core/messages.d.ts +237 -0
- package/lib/core/messages.js +473 -0
- package/lib/core/messages.js.map +1 -0
- package/lib/core/msg-types.d.ts +8 -0
- package/lib/core/msg-types.js +6 -0
- package/lib/core/msg-types.js.map +1 -0
- package/lib/core/restore.d.ts +3 -0
- package/lib/core/restore.js +61 -57
- package/lib/core/restore.js.map +1 -1
- package/lib/core/rollback.js +10 -9
- package/lib/core/rollback.js.map +1 -1
- package/lib/core/run-registry.d.ts +5 -1
- package/lib/core/run-registry.js +7 -4
- package/lib/core/run-registry.js.map +1 -1
- package/lib/core/types.d.ts +10 -2
- package/lib/core/types.js +3 -2
- package/lib/core/types.js.map +1 -1
- package/lib/index.d.ts +21 -1
- package/lib/index.js +178 -23
- package/lib/index.js.map +1 -1
- package/lib/profiles/profile-manager.js +3 -0
- package/lib/profiles/profile-manager.js.map +1 -1
- package/lib/sync/git/git-transport.d.ts +4 -0
- package/lib/sync/git/git-transport.js +13 -10
- package/lib/sync/git/git-transport.js.map +1 -1
- package/lib/sync/github-auth.d.ts +120 -0
- package/lib/sync/github-auth.js +224 -0
- package/lib/sync/github-auth.js.map +1 -0
- package/lib/sync/sync-config.d.ts +2 -1
- package/lib/sync/sync-config.js +5 -4
- package/lib/sync/sync-config.js.map +1 -1
- package/lib/sync/sync-engine.d.ts +4 -0
- package/lib/sync/sync-engine.js +15 -12
- package/lib/sync/sync-engine.js.map +1 -1
- package/lib/sync/sync-state.d.ts +2 -1
- package/lib/sync/sync-state.js +9 -8
- package/lib/sync/sync-state.js.map +1 -1
- package/lib/ui/errors.d.ts +3 -1
- package/lib/ui/errors.js +57 -52
- package/lib/ui/errors.js.map +1 -1
- package/lib/ui/export-flow.d.ts +4 -0
- package/lib/ui/export-flow.js +4 -1
- package/lib/ui/export-flow.js.map +1 -1
- package/lib/ui/i18n.d.ts +175 -0
- package/lib/ui/i18n.js +346 -0
- package/lib/ui/i18n.js.map +1 -0
- package/lib/ui/progress.d.ts +2 -1
- package/lib/ui/progress.js +22 -24
- package/lib/ui/progress.js.map +1 -1
- package/lib/ui/report.d.ts +4 -3
- package/lib/ui/report.js +27 -26
- package/lib/ui/report.js.map +1 -1
- package/package.json +1 -1
- package/src/adapters/credentials.ts +11 -9
- package/src/adapters/file-collection.ts +15 -11
- package/src/adapters/mcp.ts +16 -12
- package/src/adapters/plugin-files.ts +12 -9
- package/src/adapters/plugins.ts +34 -31
- package/src/adapters/prompts.ts +22 -18
- package/src/adapters/providers.ts +16 -13
- package/src/adapters/settings.ts +18 -15
- package/src/adapters/test-helpers.ts +2 -0
- package/src/adapters/ui.ts +7 -5
- package/src/adapters/workspaces.ts +16 -13
- package/src/client/api.ts +22 -16
- package/src/client/common/progress-view.test.ts +7 -1
- package/src/client/common/progress-view.ts +3 -2
- package/src/client/config-manager.module.css +31 -0
- package/src/client/import/ImportWizardView.tsx +55 -6
- package/src/client/import/import-file-select.test.ts +211 -0
- package/src/client/import/import-file-select.ts +55 -0
- package/src/client/index.ts +5 -2
- package/src/client/locales.ts +4 -0
- package/src/client/run-store.ts +7 -0
- package/src/client/snapshots/SnapshotsPanel.tsx +18 -12
- package/src/client/sync/SyncSettingsView.tsx +151 -15
- package/src/client/sync/sync-api.test.ts +62 -0
- package/src/client/sync/sync-api.ts +70 -10
- package/src/client/sync/sync-locales.ts +17 -0
- package/src/client/sync/sync-view.test.ts +72 -6
- package/src/client/sync/sync-view.ts +128 -38
- package/src/core/analyzer.ts +37 -26
- package/src/core/backup.ts +37 -0
- package/src/core/exporter.ts +9 -3
- package/src/core/importer.ts +3 -0
- package/src/core/messages.test.ts +54 -0
- package/src/core/messages.ts +514 -0
- package/src/core/msg-types.ts +10 -0
- package/src/core/restore.ts +64 -57
- package/src/core/rollback.ts +10 -9
- package/src/core/run-registry.ts +10 -4
- package/src/core/types.ts +12 -3
- package/src/index.ts +191 -25
- package/src/profiles/profile-manager.ts +3 -0
- package/src/sync/git/git-transport.ts +16 -10
- package/src/sync/github-auth.test.ts +280 -0
- package/src/sync/github-auth.ts +313 -0
- package/src/sync/sync-config.ts +6 -4
- package/src/sync/sync-engine.ts +18 -12
- package/src/sync/sync-state.ts +10 -8
- package/src/ui/errors.test.ts +6 -3
- package/src/ui/errors.ts +58 -53
- package/src/ui/export-flow.test.ts +4 -1
- package/src/ui/export-flow.ts +6 -1
- package/src/ui/i18n.ts +355 -0
- package/src/ui/progress.test.ts +12 -7
- package/src/ui/progress.ts +22 -24
- package/src/ui/report.test.ts +28 -20
- package/src/ui/report.ts +27 -26
package/README.md
CHANGED
|
@@ -37,6 +37,7 @@ DSH is your AI assistant workbench — it holds your settings: model configs, pl
|
|
|
37
37
|
| 📸 | **Snapshot restore** | Undo an import: whole-file restore + uninstall added plugins (CLI & GUI) |
|
|
38
38
|
| 🔄 | **Remote Sync** | Push/pull portable config via a private Git repo (secrets never sync) |
|
|
39
39
|
| 🗂️ | **Profiles** | Save multiple setups (Work / Personal) and switch anytime |
|
|
40
|
+
| 🌐 | **Bilingual UI** | Interface, reports and error details follow the DSH app language (中文 / English) |
|
|
40
41
|
|
|
41
42
|
---
|
|
42
43
|
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* .credentials.yaml 文件字节交由 m4 加密层处理,本 adapter 不触碰。
|
|
9
9
|
*/
|
|
10
10
|
import type { CredentialsSection } from '../schema/types.ts';
|
|
11
|
+
import type { MsgFunc } from '../core/messages.ts';
|
|
11
12
|
import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
|
|
12
13
|
import { type NamespaceProvider } from './settings.ts';
|
|
13
14
|
export type CredentialRefsProvider = (ctx: HostContext) => Promise<string[]>;
|
|
@@ -32,5 +33,5 @@ export declare class CredentialsAdapter implements ConfigAdapter<CredentialsSect
|
|
|
32
33
|
export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<CredentialsSection>>;
|
|
33
34
|
analyzeImport(_data: CredentialsSection, _ctx: ImportContext): Promise<PlanItem[]>;
|
|
34
35
|
applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
|
|
35
|
-
validate(data: CredentialsSection): Promise<ValidationResult>;
|
|
36
|
+
validate(data: CredentialsSection, msg?: MsgFunc): Promise<ValidationResult>;
|
|
36
37
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { msgOf, zhMsg } from "../core/messages.js";
|
|
1
2
|
import { resolveNamespaces } from "./settings.js";
|
|
2
3
|
/** 缺省 ref 收集:遍历 settings namespace,收集 llm apiKeyEnv / providers[].apiKeyEnv,
|
|
3
4
|
* 以及 secrets 标记中「引用类字段」(apiKeyEnv/tokenEnv…)的字段值。
|
|
@@ -68,7 +69,7 @@ export class CredentialsAdapter {
|
|
|
68
69
|
});
|
|
69
70
|
}
|
|
70
71
|
catch (err) {
|
|
71
|
-
warnings.push(
|
|
72
|
+
warnings.push(msgOf(ctx)('adapter.credStatusReadFailed', { ref, reason: err instanceof Error ? err.message : String(err) }));
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
75
|
return {
|
|
@@ -86,32 +87,32 @@ export class CredentialsAdapter {
|
|
|
86
87
|
async applyItem(item, ctx) {
|
|
87
88
|
const ref = item.target?.ref;
|
|
88
89
|
if (!ref)
|
|
89
|
-
return { ok: false, message: '
|
|
90
|
+
return { ok: false, message: ctx.msg('adapter.missingTargetRef') };
|
|
90
91
|
const value = ctx.secretInputs[ref] ?? ctx.decryptedCredentials?.get(ref);
|
|
91
92
|
if (value === undefined || value === '')
|
|
92
|
-
return { ok: false, message: '
|
|
93
|
+
return { ok: false, message: ctx.msg('adapter.credentialValueMissing') };
|
|
93
94
|
await ctx.target.credentials.set(ref, value);
|
|
94
95
|
return { ok: true };
|
|
95
96
|
}
|
|
96
|
-
async validate(data) {
|
|
97
|
+
async validate(data, msg = zhMsg) {
|
|
97
98
|
const issues = [];
|
|
98
99
|
if (data === null || typeof data !== 'object') {
|
|
99
|
-
return { valid: false, issues: [{ path: '$', message: 'credentials
|
|
100
|
+
return { valid: false, issues: [{ path: '$', message: msg('adapter.validate.object', { subject: 'credentials' }), severity: 'error' }] };
|
|
100
101
|
}
|
|
101
102
|
if (data.version !== 1) {
|
|
102
|
-
issues.push({ path: 'version', message:
|
|
103
|
+
issues.push({ path: 'version', message: msg('adapter.validate.version', { value: String(data.version) }), severity: 'error' });
|
|
103
104
|
}
|
|
104
105
|
if (!Array.isArray(data.credentials)) {
|
|
105
|
-
issues.push({ path: 'credentials', message: 'credentials
|
|
106
|
+
issues.push({ path: 'credentials', message: msg('adapter.validate.array', { subject: 'credentials' }), severity: 'error' });
|
|
106
107
|
}
|
|
107
108
|
else {
|
|
108
109
|
for (const c of data.credentials) {
|
|
109
110
|
if (c === null || typeof c !== 'object' || typeof c.ref !== 'string' || c.ref === '') {
|
|
110
|
-
issues.push({ path: 'credentials[]', message: '
|
|
111
|
+
issues.push({ path: 'credentials[]', message: msg('adapter.validate.credentialRef'), severity: 'error' });
|
|
111
112
|
}
|
|
112
113
|
if (c.hasValue === true) {
|
|
113
114
|
// 安全不变量:普通导出恒不携带值;若备份声称有值,视为结构异常
|
|
114
|
-
issues.push({ path: `credentials.${c.ref}.hasValue`, message: '
|
|
115
|
+
issues.push({ path: `credentials.${c.ref}.hasValue`, message: msg('adapter.validate.hasValueFalse'), severity: 'error' });
|
|
115
116
|
}
|
|
116
117
|
}
|
|
117
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/adapters/credentials.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/adapters/credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MsgFunc } from '../core/messages.ts';
|
|
1
2
|
import type { FilesSection, SectionId } from '../schema/types.ts';
|
|
2
3
|
import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, Portability, ValidationResult } from '../core/types.ts';
|
|
3
4
|
export declare abstract class FileCollectionAdapter implements ConfigAdapter<FilesSection> {
|
|
@@ -10,5 +11,5 @@ export declare abstract class FileCollectionAdapter implements ConfigAdapter<Fil
|
|
|
10
11
|
export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
|
|
11
12
|
analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
|
|
12
13
|
applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
|
|
13
|
-
validate(data: FilesSection): Promise<ValidationResult>;
|
|
14
|
+
validate(data: FilesSection, msg?: MsgFunc): Promise<ValidationResult>;
|
|
14
15
|
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { sha256Hex } from "../utils/hashing.js";
|
|
11
|
+
import { msgOf, zhMsg } from "../core/messages.js";
|
|
11
12
|
export class FileCollectionAdapter {
|
|
12
13
|
async export(ctx, _options) {
|
|
13
14
|
const files = [];
|
|
@@ -25,7 +26,7 @@ export class FileCollectionAdapter {
|
|
|
25
26
|
files.push({ relativePath: relPath, data, contentHash: sha256Hex(data) });
|
|
26
27
|
}
|
|
27
28
|
if (rels.length === 0)
|
|
28
|
-
warnings.push(
|
|
29
|
+
warnings.push(msgOf(ctx)('adapter.dirEmpty', { type: this.displayName }));
|
|
29
30
|
return {
|
|
30
31
|
sectionId: this.id,
|
|
31
32
|
data: { version: 1, files },
|
|
@@ -34,6 +35,7 @@ export class FileCollectionAdapter {
|
|
|
34
35
|
};
|
|
35
36
|
}
|
|
36
37
|
async analyzeImport(data, ctx) {
|
|
38
|
+
const msg = ctx.msg;
|
|
37
39
|
const items = [];
|
|
38
40
|
for (const file of data.files) {
|
|
39
41
|
const id = `${this.id}:${file.relativePath}`;
|
|
@@ -47,17 +49,17 @@ export class FileCollectionAdapter {
|
|
|
47
49
|
if (current === null) {
|
|
48
50
|
items.push({
|
|
49
51
|
id, kind: 'Create', adapter: this.id,
|
|
50
|
-
description:
|
|
52
|
+
description: msg('adapter.fileCreate', { type: this.displayName, path: file.relativePath }), severity: 'info',
|
|
51
53
|
target: { adapter: this.id, ref: file.relativePath },
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
else if (sha256Hex(current) === file.contentHash) {
|
|
55
|
-
items.push({ id, kind: 'Skip', adapter: this.id, description:
|
|
57
|
+
items.push({ id, kind: 'Skip', adapter: this.id, description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
|
|
56
58
|
}
|
|
57
59
|
else {
|
|
58
60
|
items.push({
|
|
59
61
|
id, kind: 'Conflict', adapter: this.id,
|
|
60
|
-
description:
|
|
62
|
+
description: msg('adapter.fileDiff', { path: file.relativePath }), severity: 'warning',
|
|
61
63
|
target: { adapter: this.id, ref: file.relativePath },
|
|
62
64
|
});
|
|
63
65
|
}
|
|
@@ -65,31 +67,32 @@ export class FileCollectionAdapter {
|
|
|
65
67
|
return items;
|
|
66
68
|
}
|
|
67
69
|
async applyItem(item, ctx) {
|
|
70
|
+
const msg = ctx.msg;
|
|
68
71
|
const ref = item.target?.ref;
|
|
69
72
|
if (!ref)
|
|
70
|
-
return { ok: false, message: '
|
|
73
|
+
return { ok: false, message: msg('adapter.missingTargetRef') };
|
|
71
74
|
const data = ctx.sections.get(this.id);
|
|
72
75
|
const file = data?.files.find((f) => f.relativePath === ref);
|
|
73
76
|
if (!file)
|
|
74
|
-
return { ok: false, message:
|
|
77
|
+
return { ok: false, message: msg('adapter.dataMissingFile', { ref }) };
|
|
75
78
|
await ctx.target.fs.writeFile(path.join(this.baseDir, ref), file.data);
|
|
76
79
|
return { ok: true };
|
|
77
80
|
}
|
|
78
|
-
async validate(data) {
|
|
81
|
+
async validate(data, msg = zhMsg) {
|
|
79
82
|
const issues = [];
|
|
80
83
|
if (data === null || typeof data !== 'object') {
|
|
81
|
-
return { valid: false, issues: [{ path: '$', message: '
|
|
84
|
+
return { valid: false, issues: [{ path: '$', message: msg('adapter.validate.fileSection'), severity: 'error' }] };
|
|
82
85
|
}
|
|
83
86
|
if (data.version !== 1) {
|
|
84
|
-
issues.push({ path: 'version', message:
|
|
87
|
+
issues.push({ path: 'version', message: msg('adapter.validate.version', { value: String(data.version) }), severity: 'error' });
|
|
85
88
|
}
|
|
86
89
|
if (!Array.isArray(data.files)) {
|
|
87
|
-
issues.push({ path: 'files', message: 'files
|
|
90
|
+
issues.push({ path: 'files', message: msg('adapter.validate.array', { subject: 'files' }), severity: 'error' });
|
|
88
91
|
}
|
|
89
92
|
else {
|
|
90
93
|
for (const f of data.files) {
|
|
91
94
|
if (f === null || typeof f !== 'object' || typeof f.relativePath !== 'string' || f.relativePath === '') {
|
|
92
|
-
issues.push({ path: 'files[]', message: '
|
|
95
|
+
issues.push({ path: 'files[]', message: msg('adapter.validate.fileRelativePath'), severity: 'error' });
|
|
93
96
|
}
|
|
94
97
|
}
|
|
95
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-collection.js","sourceRoot":"","sources":["../../src/adapters/file-collection.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"file-collection.js","sourceRoot":"","sources":["../../src/adapters/file-collection.ts"],"names":[],"mappings":"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"}
|
package/lib/adapters/mcp.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MsgFunc } from '../core/messages.ts';
|
|
1
2
|
import type { McpServerEntry } from '../schema/types.ts';
|
|
2
3
|
import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
|
|
3
4
|
/** 导出记录:McpServerEntry 之外附加来源 patch 行 id(导入写回定位用) */
|
|
@@ -23,5 +24,5 @@ export declare class McpAdapter implements ConfigAdapter<McpExportSection> {
|
|
|
23
24
|
export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<McpExportSection>>;
|
|
24
25
|
analyzeImport(data: McpExportSection, ctx: ImportContext): Promise<PlanItem[]>;
|
|
25
26
|
applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
|
|
26
|
-
validate(data: McpExportSection): Promise<ValidationResult>;
|
|
27
|
+
validate(data: McpExportSection, msg?: MsgFunc): Promise<ValidationResult>;
|
|
27
28
|
}
|
package/lib/adapters/mcp.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* patch 行 raw 支持两种形态:单行 { id, name, config } 与块 { insert: [{ id, name, config }] }。
|
|
8
8
|
*/
|
|
9
9
|
import { isDeepStrictEqual } from 'node:util';
|
|
10
|
+
import { msgOf, zhMsg } from "../core/messages.js";
|
|
10
11
|
import { USER_PATCH_FILE } from "./plugins.js";
|
|
11
12
|
/** 从 patch 行数组中提取 MCP server 条目(以 config.serverName 存在为判定) */
|
|
12
13
|
export function extractMcpServers(lines) {
|
|
@@ -86,7 +87,7 @@ export class McpAdapter {
|
|
|
86
87
|
lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
|
|
87
88
|
}
|
|
88
89
|
catch (err) {
|
|
89
|
-
warnings.push(
|
|
90
|
+
warnings.push(msgOf(ctx)('adapter.patchReadFailedMCP', { reason: err instanceof Error ? err.message : String(err) }));
|
|
90
91
|
}
|
|
91
92
|
const servers = extractMcpServers(lines);
|
|
92
93
|
return {
|
|
@@ -97,6 +98,7 @@ export class McpAdapter {
|
|
|
97
98
|
};
|
|
98
99
|
}
|
|
99
100
|
async analyzeImport(data, ctx) {
|
|
101
|
+
const msg = ctx.msg;
|
|
100
102
|
const items = [];
|
|
101
103
|
const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
|
|
102
104
|
const targetServers = extractMcpServers(targetLines);
|
|
@@ -111,7 +113,7 @@ export class McpAdapter {
|
|
|
111
113
|
: (server.sourceLineId ?? newLineId(server.serverName));
|
|
112
114
|
items.push({
|
|
113
115
|
id, kind: 'Create', adapter: 'mcp',
|
|
114
|
-
description:
|
|
116
|
+
description: msg('adapter.mcpCreate', { serverName: server.serverName }),
|
|
115
117
|
detail: `${server.type === 'stdio' ? `${server.command} ${(server.args ?? []).join(' ')}` : server.url}`,
|
|
116
118
|
severity: 'info',
|
|
117
119
|
target: { adapter: 'mcp', ref: lineId },
|
|
@@ -121,12 +123,12 @@ export class McpAdapter {
|
|
|
121
123
|
const existingComparable = { ...existing };
|
|
122
124
|
delete existingComparable.sourceLineId;
|
|
123
125
|
if (isDeepStrictEqual(existingComparable, comparable)) {
|
|
124
|
-
items.push({ id, kind: 'Skip', adapter: 'mcp', description:
|
|
126
|
+
items.push({ id, kind: 'Skip', adapter: 'mcp', description: msg('adapter.mcpSame', { serverName: server.serverName }), severity: 'info' });
|
|
125
127
|
}
|
|
126
128
|
else {
|
|
127
129
|
items.push({
|
|
128
130
|
id, kind: 'Conflict', adapter: 'mcp',
|
|
129
|
-
description:
|
|
131
|
+
description: msg('adapter.mcpDiff', { serverName: server.serverName }),
|
|
130
132
|
detail: `current=${JSON.stringify(existingComparable)} imported=${JSON.stringify(comparable)}`.slice(0, 200),
|
|
131
133
|
severity: 'warning',
|
|
132
134
|
target: { adapter: 'mcp', ref: existing.sourceLineId },
|
|
@@ -137,35 +139,36 @@ export class McpAdapter {
|
|
|
137
139
|
return items;
|
|
138
140
|
}
|
|
139
141
|
async applyItem(item, ctx) {
|
|
142
|
+
const msg = ctx.msg;
|
|
140
143
|
const serverName = item.id.replace(/^mcp:/, '');
|
|
141
144
|
const data = ctx.sections.get('mcp');
|
|
142
145
|
const server = data?.servers.find((s) => s.serverName === serverName);
|
|
143
146
|
if (!server)
|
|
144
|
-
return { ok: false, message:
|
|
147
|
+
return { ok: false, message: msg('adapter.mcpMissing', { serverName }) };
|
|
145
148
|
const ref = item.target?.ref;
|
|
146
149
|
if (!ref)
|
|
147
|
-
return { ok: false, message: '
|
|
150
|
+
return { ok: false, message: msg('adapter.missingTargetRef') };
|
|
148
151
|
const raw = buildMcpPatchLine(ref, server);
|
|
149
152
|
await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
|
|
150
153
|
{ lineId: ref, raw, action: item.kind === 'Create' ? 'insert' : 'update' },
|
|
151
154
|
]);
|
|
152
|
-
return { ok: true, needsRestart: true, message:
|
|
155
|
+
return { ok: true, needsRestart: true, message: msg('adapter.mcpWritten', { serverName }) };
|
|
153
156
|
}
|
|
154
|
-
async validate(data) {
|
|
157
|
+
async validate(data, msg = zhMsg) {
|
|
155
158
|
const issues = [];
|
|
156
159
|
if (data === null || typeof data !== 'object') {
|
|
157
|
-
return { valid: false, issues: [{ path: '$', message: 'mcp
|
|
160
|
+
return { valid: false, issues: [{ path: '$', message: msg('adapter.validate.object', { subject: 'mcp' }), severity: 'error' }] };
|
|
158
161
|
}
|
|
159
162
|
if (data.version !== 1) {
|
|
160
|
-
issues.push({ path: 'version', message:
|
|
163
|
+
issues.push({ path: 'version', message: msg('adapter.validate.version', { value: String(data.version) }), severity: 'error' });
|
|
161
164
|
}
|
|
162
165
|
if (!Array.isArray(data.servers)) {
|
|
163
|
-
issues.push({ path: 'servers', message: 'servers
|
|
166
|
+
issues.push({ path: 'servers', message: msg('adapter.validate.array', { subject: 'servers' }), severity: 'error' });
|
|
164
167
|
}
|
|
165
168
|
else {
|
|
166
169
|
for (const s of data.servers) {
|
|
167
170
|
if (s === null || typeof s !== 'object' || typeof s.serverName !== 'string' || s.serverName === '') {
|
|
168
|
-
issues.push({ path: 'servers[]', message: '
|
|
171
|
+
issues.push({ path: 'servers[]', message: msg('adapter.validate.serverName'), severity: 'error' });
|
|
169
172
|
}
|
|
170
173
|
}
|
|
171
174
|
}
|
package/lib/adapters/mcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/adapters/mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/adapters/mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MsgFunc } from '../core/messages.ts';
|
|
1
2
|
import type { FilesSection } from '../schema/types.ts';
|
|
2
3
|
import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
|
|
3
4
|
export declare const DEFAULT_PLUGIN_FILE_WHITELIST: readonly string[];
|
|
@@ -11,5 +12,5 @@ export declare class PluginFilesAdapter implements ConfigAdapter<FilesSection> {
|
|
|
11
12
|
export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<FilesSection>>;
|
|
12
13
|
analyzeImport(data: FilesSection, ctx: ImportContext): Promise<PlanItem[]>;
|
|
13
14
|
applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
|
|
14
|
-
validate(data: FilesSection): Promise<ValidationResult>;
|
|
15
|
+
validate(data: FilesSection, msg?: MsgFunc): Promise<ValidationResult>;
|
|
15
16
|
}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* 白名单机制避免扫描整个主目录;默认关闭(defaultIncluded=false,用户显式勾选才导出)。
|
|
5
5
|
*/
|
|
6
6
|
import { sha256Hex } from "../utils/hashing.js";
|
|
7
|
+
import { zhMsg } from "../core/messages.js";
|
|
7
8
|
export const DEFAULT_PLUGIN_FILE_WHITELIST = ['dsh-ssh.json', 'pet.json'];
|
|
8
9
|
export class PluginFilesAdapter {
|
|
9
10
|
id = 'pluginFiles';
|
|
@@ -33,6 +34,7 @@ export class PluginFilesAdapter {
|
|
|
33
34
|
};
|
|
34
35
|
}
|
|
35
36
|
async analyzeImport(data, ctx) {
|
|
37
|
+
const msg = ctx.msg;
|
|
36
38
|
const items = [];
|
|
37
39
|
for (const file of data.files) {
|
|
38
40
|
const id = `pluginFile:${file.relativePath}`;
|
|
@@ -46,17 +48,17 @@ export class PluginFilesAdapter {
|
|
|
46
48
|
if (current === null) {
|
|
47
49
|
items.push({
|
|
48
50
|
id, kind: 'Create', adapter: 'pluginFiles',
|
|
49
|
-
description:
|
|
51
|
+
description: msg('adapter.pluginFileCreate', { path: file.relativePath }), severity: 'info',
|
|
50
52
|
target: { adapter: 'pluginFiles', ref: file.relativePath },
|
|
51
53
|
});
|
|
52
54
|
}
|
|
53
55
|
else if (sha256Hex(current) === file.contentHash) {
|
|
54
|
-
items.push({ id, kind: 'Skip', adapter: 'pluginFiles', description:
|
|
56
|
+
items.push({ id, kind: 'Skip', adapter: 'pluginFiles', description: msg('adapter.fileSame', { path: file.relativePath }), severity: 'info' });
|
|
55
57
|
}
|
|
56
58
|
else {
|
|
57
59
|
items.push({
|
|
58
60
|
id, kind: 'Conflict', adapter: 'pluginFiles',
|
|
59
|
-
description:
|
|
61
|
+
description: msg('adapter.fileDiff', { path: file.relativePath }), severity: 'warning',
|
|
60
62
|
target: { adapter: 'pluginFiles', ref: file.relativePath },
|
|
61
63
|
});
|
|
62
64
|
}
|
|
@@ -66,24 +68,24 @@ export class PluginFilesAdapter {
|
|
|
66
68
|
async applyItem(item, ctx) {
|
|
67
69
|
const ref = item.target?.ref;
|
|
68
70
|
if (!ref)
|
|
69
|
-
return { ok: false, message: '
|
|
71
|
+
return { ok: false, message: ctx.msg('adapter.missingTargetRef') };
|
|
70
72
|
const data = ctx.sections.get('pluginFiles');
|
|
71
73
|
const file = data?.files.find((f) => f.relativePath === ref);
|
|
72
74
|
if (!file)
|
|
73
|
-
return { ok: false, message:
|
|
75
|
+
return { ok: false, message: ctx.msg('adapter.dataMissingFile', { ref }) };
|
|
74
76
|
await ctx.target.fs.writeFile(ref, file.data);
|
|
75
77
|
return { ok: true };
|
|
76
78
|
}
|
|
77
|
-
async validate(data) {
|
|
79
|
+
async validate(data, msg = zhMsg) {
|
|
78
80
|
const issues = [];
|
|
79
81
|
if (data === null || typeof data !== 'object') {
|
|
80
|
-
return { valid: false, issues: [{ path: '$', message: 'pluginFiles
|
|
82
|
+
return { valid: false, issues: [{ path: '$', message: msg('adapter.validate.object', { subject: 'pluginFiles' }), severity: 'error' }] };
|
|
81
83
|
}
|
|
82
84
|
if (data.version !== 1) {
|
|
83
|
-
issues.push({ path: 'version', message:
|
|
85
|
+
issues.push({ path: 'version', message: msg('adapter.validate.version', { value: String(data.version) }), severity: 'error' });
|
|
84
86
|
}
|
|
85
87
|
if (!Array.isArray(data.files)) {
|
|
86
|
-
issues.push({ path: 'files', message: 'files
|
|
88
|
+
issues.push({ path: 'files', message: msg('adapter.validate.array', { subject: 'files' }), severity: 'error' });
|
|
87
89
|
}
|
|
88
90
|
return { valid: issues.filter((i) => i.severity === 'error').length === 0, issues };
|
|
89
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-files.js","sourceRoot":"","sources":["../../src/adapters/plugin-files.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-files.js","sourceRoot":"","sources":["../../src/adapters/plugin-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MsgFunc } from '../core/messages.ts';
|
|
1
2
|
import type { PluginsSection } from '../schema/types.ts';
|
|
2
3
|
import type { ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext, ImportContext, PlanItem, ValidationResult } from '../core/types.ts';
|
|
3
4
|
export declare const USER_PATCH_FILE = "cordis.patch.yml";
|
|
@@ -11,5 +12,5 @@ export declare class PluginsAdapter implements ConfigAdapter<PluginsSection> {
|
|
|
11
12
|
export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<PluginsSection>>;
|
|
12
13
|
analyzeImport(data: PluginsSection, ctx: ImportContext): Promise<PlanItem[]>;
|
|
13
14
|
applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult>;
|
|
14
|
-
validate(data: PluginsSection): Promise<ValidationResult>;
|
|
15
|
+
validate(data: PluginsSection, msg?: MsgFunc): Promise<ValidationResult>;
|
|
15
16
|
}
|