@zhin.js/scaffold-wizard 1.1.5 → 1.1.7
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 -1
- package/lib/adapter.d.ts +2 -2
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +1 -1
- package/lib/apply.d.ts +6 -6
- package/lib/apply.d.ts.map +1 -1
- package/lib/apply.js +29 -41
- package/lib/apply.js.map +1 -1
- package/lib/database-definitions.js +1 -1
- package/lib/decisions.d.ts.map +1 -1
- package/lib/decisions.js +10 -17
- package/lib/decisions.js.map +1 -1
- package/lib/index.d.ts +3 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/project-config-plan.d.ts +3 -0
- package/lib/project-config-plan.d.ts.map +1 -1
- package/lib/project-config-plan.js +38 -12
- package/lib/project-config-plan.js.map +1 -1
- package/lib/project-deps.d.ts +3 -1
- package/lib/project-deps.d.ts.map +1 -1
- package/lib/project-deps.js +3 -1
- package/lib/project-deps.js.map +1 -1
- package/lib/stack-version-ranges.d.ts +35 -0
- package/lib/stack-version-ranges.d.ts.map +1 -0
- package/lib/stack-version-ranges.js +144 -0
- package/lib/stack-version-ranges.js.map +1 -0
- package/lib/stack-version-ranges.json +112 -0
- package/lib/zhin-stack-deps.d.ts +4 -2
- package/lib/zhin-stack-deps.d.ts.map +1 -1
- package/lib/zhin-stack-deps.js +4 -2
- package/lib/zhin-stack-deps.js.map +1 -1
- package/package.json +4 -2
- package/src/adapter.ts +2 -2
- package/src/apply.ts +34 -46
- package/src/database-definitions.ts +1 -1
- package/src/decisions.ts +9 -17
- package/src/index.ts +7 -1
- package/src/project-config-plan.ts +39 -11
- package/src/project-deps.ts +3 -1
- package/src/stack-version-ranges.ts +160 -0
- package/src/zhin-stack-deps.ts +4 -2
- package/src/stack-versions.generated.json +0 -45
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Zhin 项目脚手架的**共享交互向导**库。适配器、AI、数据库的分步引导与配置合并逻辑集中在此，供 `create-zhin-app` 与 `@zhin.js/cli` 的 `zhin setup` 共用，避免两套实现漂移。
|
|
4
4
|
|
|
5
5
|
::: warning 依赖版本策略
|
|
6
|
-
脚手架写入的 `@zhin.js/*` / `zhin.js`
|
|
6
|
+
脚手架写入的 `@zhin.js/*` / `zhin.js` 版本是与本包同一次发布的真实版本范围（如 `^1.1.11`），AI 栈的第三方包（`ai`、`zod`、`@ai-sdk/*`、`@modelcontextprotocol/sdk`）使用 Zhin 自身 `peerDependencies` 声明的范围，不再写 `latest`。范围在打包时由 `prepack` 写入 `lib/stack-version-ranges.json`；在 zhin 仓库内运行时直接读取工作区版本；只有拿不到版本的包（如第三方适配器依赖）才保留 `latest`（见 `stack-version-ranges.ts` 与 `check:dependency-policy`）。`zhin doctor --fix` 补写依赖与 `~/.zhin` 全局实例初始化也使用同一套范围。doctor / config check 的诊断基线仍接受任意已声明的版本。生产环境请提交 lockfile。
|
|
7
7
|
:::
|
|
8
8
|
|
|
9
9
|
## 消费者
|
package/lib/adapter.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/** 一个待挂载的子插件实例（主配置 plugins 包映射 + 顶层同名业务配置） */
|
|
2
2
|
export interface AdapterPluginInstance {
|
|
3
3
|
/** 适配器/插件包名，如 @zhin.js/adapter-sandbox */
|
|
4
4
|
package: string;
|
|
@@ -67,7 +67,7 @@ export declare function generateAdapterEnvVars(result: AdapterSetupResult): stri
|
|
|
67
67
|
*/
|
|
68
68
|
export declare function collectAdapterPluginConfigs(result: AdapterSetupResult): Record<string, Record<string, unknown>>;
|
|
69
69
|
/**
|
|
70
|
-
*
|
|
70
|
+
* 汇总适配器实例的包引用与实例身份（供预览和依赖诊断）
|
|
71
71
|
*/
|
|
72
72
|
export declare function collectAdapterPluginManifest(result: AdapterSetupResult): Array<{
|
|
73
73
|
package: string;
|
package/lib/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAqBA,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAqBA,8CAA8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,6CAA6C;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,qBAAqB,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,+CAA+C;IAC/C,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAGD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,0BAA0B,EAAE,wBAAwB,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnH,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,yDAAyD;IACzD,KAAK,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;CAC/B;AAED,eAAO,MAAM,QAAQ,EAAE,iBAAiB,EA8QvC,CAAC;AAEF;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAmJrE;AAED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2C9H;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CASzE;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAM/G;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,kBAAkB,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CAKxH;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAwCzE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAyBzF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAEvF"}
|
package/lib/adapter.js
CHANGED
|
@@ -488,7 +488,7 @@ export function collectAdapterPluginConfigs(result) {
|
|
|
488
488
|
return plugins;
|
|
489
489
|
}
|
|
490
490
|
/**
|
|
491
|
-
*
|
|
491
|
+
* 汇总适配器实例的包引用与实例身份（供预览和依赖诊断）
|
|
492
492
|
*/
|
|
493
493
|
export function collectAdapterPluginManifest(result) {
|
|
494
494
|
return result.instances.map((instance) => ({
|
package/lib/apply.d.ts
CHANGED
|
@@ -3,12 +3,12 @@ export declare function applyDatabaseToConfig(config: Record<string, unknown>, d
|
|
|
3
3
|
/** Returns a mutable copy of the canonical Plugin instance configuration map. */
|
|
4
4
|
export declare function clonePluginConfigurationMap(config: Readonly<Record<string, unknown>>): Record<string, unknown>;
|
|
5
5
|
export declare function applyAdaptersToConfig(config: Record<string, unknown>, result: AdapterSetupResult): void;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
export declare function mergePluginManifestIntoPackageJson(projectDir: string, entries: Array<{
|
|
9
|
-
package: string;
|
|
6
|
+
/** Writes one instance using the document's explicitly selected protocol. */
|
|
7
|
+
export declare function setPluginInstanceConfig(config: Record<string, unknown>, instance: {
|
|
10
8
|
instanceKey: string;
|
|
11
|
-
|
|
9
|
+
package: string;
|
|
10
|
+
}, value: Record<string, unknown>): void;
|
|
11
|
+
export declare function applyAIToConfig(config: Record<string, unknown>, ai: AISetupConfig): void;
|
|
12
12
|
export declare function appendWizardEnvVars(projectDir: string, adapters?: AdapterSetupResult, ai?: AISetupConfig, database?: DatabaseConfig): Promise<void>;
|
|
13
13
|
export declare function collectWizardDependencies(options: Pick<InitOptions, 'adapters' | 'ai' | 'database'>): Record<string, string>;
|
|
14
14
|
/** 向导结果需要合并进 package.json zhin.features 的条目（与 create-zhin 路径对齐） */
|
|
@@ -31,7 +31,7 @@ export declare function applyWizardOptionsToConfig(config: Record<string, unknow
|
|
|
31
31
|
*/
|
|
32
32
|
export declare function materializeDatabaseConfig(config: DatabaseConfig): Record<string, unknown>;
|
|
33
33
|
/**
|
|
34
|
-
*
|
|
34
|
+
* 构建 v2 扁平主配置（plugins 包映射 + 顶层实例业务配置）。
|
|
35
35
|
* 顶层键与 packages/im/runtime/src/config-composer.ts 的 effectiveSchema 对齐。
|
|
36
36
|
*/
|
|
37
37
|
export declare function buildRuntimeConfigDocument(options: InitOptions): Record<string, unknown>;
|
package/lib/apply.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAajG,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAGrG;AAED,iFAAiF;AACjF,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAQvG;AAED,6EAA6E;AAC7E,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,QAAQ,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAClD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,IAAI,CAcN;AAgDD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,aAAa,GAAG,IAAI,CAExF;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,EAAE,CAAC,EAAE,aAAa,EAClB,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,IAAI,GAAG,UAAU,CAAC,GACzD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcxB;AAED,mEAAmE;AACnE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAC/B,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAKzC;AAED,uEAAuE;AACvE,wBAAsB,4BAA4B,CAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,GAC/C,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,wBAAsB,gCAAgC,CACpD,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAED,8CAA8C;AAC9C,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAGhE;AAED,gDAAgD;AAChD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAItG;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuCzF;AAmBD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxF;AAED,oEAAoE;AACpE,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,MAAM,CAGR"}
|
package/lib/apply.js
CHANGED
|
@@ -2,12 +2,14 @@ import fs from 'fs-extra';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import yaml from 'yaml';
|
|
4
4
|
import { readPluginConfigurationMap } from '@zhin.js/plugin-runtime';
|
|
5
|
-
import {
|
|
5
|
+
import { readApplicationPluginDeclaration } from '@zhin.js/runtime';
|
|
6
|
+
import { generateAdapterEnvVars, getAdapterDependencies, } from './adapter.js';
|
|
6
7
|
import { generateAIEnvVars, materializeAIConfig } from './ai.js';
|
|
7
8
|
import { generateDatabaseEnvVars, mergeEnvText } from './env.js';
|
|
8
9
|
import { getDatabaseDialectDefinition } from './database-definitions.js';
|
|
9
10
|
import { ensureDatabaseForAdapters, ensureDatabaseForAI, getAIDependencies } from './project-deps.js';
|
|
10
11
|
import { DEFAULT_CREATE_BOT_HTTP_PORT, ZHIN_STACK_VERSIONS } from './zhin-stack-deps.js';
|
|
12
|
+
import { withScaffoldVersionRanges } from './stack-version-ranges.js';
|
|
11
13
|
export function applyDatabaseToConfig(config, database) {
|
|
12
14
|
// 物化为可落盘对象：非 SQLite 连接参数引用 .env（${VAR}），明文密码不进配置文件
|
|
13
15
|
config.database = materializeDatabaseConfig(database);
|
|
@@ -17,11 +19,28 @@ export function clonePluginConfigurationMap(config) {
|
|
|
17
19
|
return { ...readPluginConfigurationMap(config) };
|
|
18
20
|
}
|
|
19
21
|
export function applyAdaptersToConfig(config, result) {
|
|
20
|
-
const plugins = clonePluginConfigurationMap(config);
|
|
21
22
|
for (const instance of result.instances) {
|
|
22
|
-
plugins
|
|
23
|
+
const plugins = clonePluginConfigurationMap(config);
|
|
24
|
+
setPluginInstanceConfig(config, instance, mergeAdapterInstanceConfig(instance.instanceKey, plugins[instance.instanceKey], instance.config));
|
|
23
25
|
}
|
|
24
|
-
|
|
26
|
+
if (result.instances.length === 0)
|
|
27
|
+
clonePluginConfigurationMap(config);
|
|
28
|
+
}
|
|
29
|
+
/** Writes one instance using the document's explicitly selected protocol. */
|
|
30
|
+
export function setPluginInstanceConfig(config, instance, value) {
|
|
31
|
+
const declaration = readApplicationPluginDeclaration(config);
|
|
32
|
+
const existing = declaration.instances.find(item => item.instanceKey === instance.instanceKey);
|
|
33
|
+
if (existing && existing.package !== instance.package) {
|
|
34
|
+
throw new Error(`Plugin instance ${instance.instanceKey} already belongs to ${existing.package}`);
|
|
35
|
+
}
|
|
36
|
+
const next = {
|
|
37
|
+
...config,
|
|
38
|
+
plugins: { ...config.plugins, [instance.instanceKey]: instance.package },
|
|
39
|
+
[instance.instanceKey]: value,
|
|
40
|
+
};
|
|
41
|
+
readApplicationPluginDeclaration(next);
|
|
42
|
+
config.plugins = next.plugins;
|
|
43
|
+
config[instance.instanceKey] = value;
|
|
25
44
|
}
|
|
26
45
|
function endpointId(endpoint) {
|
|
27
46
|
if (!endpoint || typeof endpoint !== 'object' || Array.isArray(endpoint))
|
|
@@ -65,34 +84,6 @@ function mergeAdapterInstanceConfig(instanceKey, existing, next) {
|
|
|
65
84
|
export function applyAIToConfig(config, ai) {
|
|
66
85
|
config.ai = materializeAIConfig(ai);
|
|
67
86
|
}
|
|
68
|
-
/** 把 zhin.plugins 清单条目合并进项目 package.json（zhin setup 路径） */
|
|
69
|
-
export async function mergePluginManifestIntoPackageJson(projectDir, entries) {
|
|
70
|
-
if (entries.length === 0)
|
|
71
|
-
return false;
|
|
72
|
-
const pkgPath = path.join(projectDir, 'package.json');
|
|
73
|
-
if (!(await fs.pathExists(pkgPath)))
|
|
74
|
-
return false;
|
|
75
|
-
const pkg = await fs.readJson(pkgPath);
|
|
76
|
-
const zhin = pkg.zhin && typeof pkg.zhin === 'object' && !Array.isArray(pkg.zhin)
|
|
77
|
-
? pkg.zhin
|
|
78
|
-
: { protocol: 1, type: 'plugin', entry: './plugin.ts' };
|
|
79
|
-
const manifest = Array.isArray(zhin.plugins)
|
|
80
|
-
? [...zhin.plugins]
|
|
81
|
-
: [];
|
|
82
|
-
let changed = false;
|
|
83
|
-
for (const entry of entries) {
|
|
84
|
-
if (manifest.some((item) => item?.instanceKey === entry.instanceKey))
|
|
85
|
-
continue;
|
|
86
|
-
manifest.push({ package: entry.package, instanceKey: entry.instanceKey });
|
|
87
|
-
changed = true;
|
|
88
|
-
}
|
|
89
|
-
if (!changed && pkg.zhin)
|
|
90
|
-
return false;
|
|
91
|
-
zhin.plugins = manifest;
|
|
92
|
-
pkg.zhin = zhin;
|
|
93
|
-
await fs.writeJson(pkgPath, pkg, { spaces: 2 });
|
|
94
|
-
return true;
|
|
95
|
-
}
|
|
96
87
|
export async function appendWizardEnvVars(projectDir, adapters, ai, database) {
|
|
97
88
|
const extra = (database ? generateDatabaseEnvVars(database) : '') +
|
|
98
89
|
(adapters ? generateAdapterEnvVars(adapters) : '') +
|
|
@@ -103,16 +94,12 @@ export async function appendWizardEnvVars(projectDir, adapters, ai, database) {
|
|
|
103
94
|
// 按 KEY 覆盖而非追加：重复运行向导幂等，不产生重复行
|
|
104
95
|
await fs.writeFile(envPath, mergeEnvText(existing, extra));
|
|
105
96
|
}
|
|
106
|
-
// 新 Plugin Runtime 通过 package.json zhin.plugins 清单挂载子插件，与依赖一起落盘
|
|
107
|
-
if (adapters) {
|
|
108
|
-
await mergePluginManifestIntoPackageJson(projectDir, collectAdapterPluginManifest(adapters));
|
|
109
|
-
}
|
|
110
97
|
}
|
|
111
98
|
export function collectWizardDependencies(options) {
|
|
112
99
|
const databaseDriver = options.database
|
|
113
100
|
? getDatabaseDialectDefinition(options.database.dialect)?.driver
|
|
114
101
|
: undefined;
|
|
115
|
-
return {
|
|
102
|
+
return withScaffoldVersionRanges({
|
|
116
103
|
...(options.adapters ? getAdapterDependencies(options.adapters) : {}),
|
|
117
104
|
...(databaseDriver ? { [databaseDriver.package]: databaseDriver.version } : {}),
|
|
118
105
|
...getAIDependencies(options.ai),
|
|
@@ -121,7 +108,7 @@ export function collectWizardDependencies(options) {
|
|
|
121
108
|
'@zhin.js/tool': ZHIN_STACK_VERSIONS['@zhin.js/tool'],
|
|
122
109
|
'@zhin.js/prompt-section': ZHIN_STACK_VERSIONS['@zhin.js/prompt-section'],
|
|
123
110
|
} : {}),
|
|
124
|
-
};
|
|
111
|
+
});
|
|
125
112
|
}
|
|
126
113
|
/** 向导结果需要合并进 package.json zhin.features 的条目（与 create-zhin 路径对齐） */
|
|
127
114
|
export function collectWizardFeatures(options) {
|
|
@@ -254,11 +241,11 @@ function applyLifeAssistantAiExtras(ai) {
|
|
|
254
241
|
};
|
|
255
242
|
}
|
|
256
243
|
/**
|
|
257
|
-
*
|
|
244
|
+
* 构建 v2 扁平主配置（plugins 包映射 + 顶层实例业务配置）。
|
|
258
245
|
* 顶层键与 packages/im/runtime/src/config-composer.ts 的 effectiveSchema 对齐。
|
|
259
246
|
*/
|
|
260
247
|
export function buildRuntimeConfigDocument(options) {
|
|
261
|
-
const doc = {};
|
|
248
|
+
const doc = { configVersion: 2, plugins: {} };
|
|
262
249
|
if (options.database) {
|
|
263
250
|
doc.database = materializeDatabaseConfig(options.database);
|
|
264
251
|
}
|
|
@@ -272,7 +259,8 @@ export function buildRuntimeConfigDocument(options) {
|
|
|
272
259
|
const ai = materializeAIConfig(options.ai);
|
|
273
260
|
doc.ai = options.template === 'life-assistant' ? applyLifeAssistantAiExtras(ai) : ai;
|
|
274
261
|
}
|
|
275
|
-
|
|
262
|
+
if (options.adapters)
|
|
263
|
+
applyAdaptersToConfig(doc, options.adapters);
|
|
276
264
|
return doc;
|
|
277
265
|
}
|
|
278
266
|
/** Serialize a Root Runtime YAML or JSON configuration document. */
|
package/lib/apply.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAEL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtG,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,MAAM,UAAU,qBAAqB,CAAC,MAA+B,EAAE,QAAwB;IAC7F,mDAAmD;IACnD,MAAM,CAAC,QAAQ,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,2BAA2B,CACzC,MAAyC;IAEzC,OAAO,EAAE,GAAG,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAA+B,EAAE,MAA0B;IAC/F,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;QACpD,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,0BAA0B,CAClE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,MAAM,CACrE,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC;AACzE,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,uBAAuB,CACrC,MAA+B,EAC/B,QAAkD,EAClD,KAA8B;IAE9B,MAAM,WAAW,GAAG,gCAAgC,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/F,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,CAAC,WAAW,uBAAuB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,MAAM,IAAI,GAAG;QACX,GAAG,MAAM;QACT,OAAO,EAAE,EAAE,GAAI,MAAM,CAAC,OAA8C,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE;QAChH,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK;KAC9B,CAAC;IACF,gCAAgC,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,QAAiB;IACnC,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3F,MAAM,EAAE,GAAI,QAAoC,CAAC,EAAE,CAAC;IACpD,OAAO,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAS,0BAA0B,CACjC,WAAmB,EACnB,QAAiB,EACjB,IAA6B;IAE7B,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACtF,MAAM,OAAO,GAAG,QAAmC,CAAC;IACpD,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,MAAM,MAAM,GAA4B,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAEhE,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,IAAI,IAAI,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,IAAI,OAAO;YAAE,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,wBAAwB,WAAW,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAA+B,EAAE,EAAiB;IAChF,MAAM,CAAC,EAAE,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,UAAkB,EAClB,QAA6B,EAC7B,EAAkB,EAClB,QAAyB;IAEzB,MAAM,KAAK,GACT,CAAC,QAAQ,CAAC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,+BAA+B;QAC/B,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;AAGH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAA0D;IAE1D,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ;QACrC,CAAC,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM;QAChE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,yBAAyB,CAAC;QAC/B,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,+CAA+C;QAC/C,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACxB,eAAe,EAAE,mBAAmB,CAAC,eAAe,CAAC;YACrD,yBAAyB,EAAE,mBAAmB,CAAC,yBAAyB,CAAC;SAC1E,CAAC,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,qBAAqB,CACnC,OAAgC;IAEhC,OAAO,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3B,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,QAAQ,EAAE;QAC3C,EAAE,OAAO,EAAE,yBAAyB,EAAE,GAAG,EAAE,QAAQ,EAAE;KACtD,CAAC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,UAAkB,EAClB,OAAgD;IAEhD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAElD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAC/E,CAAC,CAAC,GAAG,CAAC,IAAI;QACV,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAC1D,MAAM,QAAQ,GAA6C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrF,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACpB,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC;YAAE,SAAS;QACvE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,UAAkB,EAClB,IAA4B;IAE5B,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAElD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;IAC1C,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,IAAI,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,OAAO;YAAE,SAAS;QACjD,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QACjC,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,qBAAqB,CAAC,OAAoB;IACxD,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,yBAAyB,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,0BAA0B,CAAC,MAA+B,EAAE,OAAoB;IAC9F,IAAI,OAAO,CAAC,QAAQ;QAAE,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtE,IAAI,OAAO,CAAC,QAAQ;QAAE,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtE,IAAI,OAAO,CAAC,EAAE,EAAE,OAAO;QAAE,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAsB;IAC9D,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,OAAO;YACV,OAAO;gBACL,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,KAAK,IAAI;YACP,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;QACxE,KAAK,OAAO;YACV,OAAO;gBACL,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE;gBACxD,QAAQ,EAAE,mBAAmB;gBAC7B,QAAQ,EAAE,aAAa;aACxB,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QAC/B,KAAK,QAAQ,CAAC;QACd,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,MAAM,GAA4B,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;YAC9D,IAAI,MAAM,CAAC,QAAQ;gBAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACvD,IAAI,MAAM,CAAC,IAAI;gBAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YAC3C,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;AACH,CAAC;AAED,+CAA+C;AAC/C,SAAS,0BAA0B,CAAC,EAA2B;IAC7D,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC;QAChF,CAAC,CAAC,EAAE,GAAI,EAAE,CAAC,KAAiC,EAAE;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,OAAO;QACL,GAAG,EAAE;QACL,SAAS,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;QACnC,KAAK,EAAE;YACL,GAAG,KAAK;YACR,YAAY,EAAE,WAAW;YACzB,gBAAgB,EAAE,KAAK;YACvB,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE;SACnE;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAAoB;IAC7D,MAAM,GAAG,GAA4B,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAEvE,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,GAAG,CAAC,QAAQ,GAAG,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,GAAG,CAAC,IAAI,GAAG;QACT,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,4BAA4B;QAClC,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC1C,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3C,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,KAAK,gBAAgB,CAAC,CAAC,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvF,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ;QAAE,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,sBAAsB,CACpC,GAA4B,EAC5B,MAAuB;IAEvB,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IAClE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -71,7 +71,7 @@ export const DATABASE_DIALECT_DEFINITIONS = Object.freeze([
|
|
|
71
71
|
dialect: 'mongodb',
|
|
72
72
|
name: 'MongoDB',
|
|
73
73
|
description: '文档数据库',
|
|
74
|
-
verifiedServer: 'MongoDB
|
|
74
|
+
verifiedServer: 'MongoDB 7',
|
|
75
75
|
driver: { package: 'mongodb', version: '^7.5.0' },
|
|
76
76
|
schema: {
|
|
77
77
|
type: 'object',
|
package/lib/decisions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decisions.d.ts","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,yBAAyB,8BAA8B,CAAC;AACrE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAWD,4FAA4F;AAC5F,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAaxH;AAWD,2FAA2F;AAC3F,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"decisions.d.ts","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,yBAAyB,8BAA8B,CAAC;AACrE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAWD,4FAA4F;AAC5F,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAaxH;AAWD,2FAA2F;AAC3F,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAiBhH;AAED,wBAAsB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUjH;AAED,sFAAsF;AACtF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,EAAE,CAuChH"}
|
package/lib/decisions.js
CHANGED
|
@@ -3,7 +3,7 @@ import chalk from 'chalk';
|
|
|
3
3
|
import fs from 'fs-extra';
|
|
4
4
|
import path from 'node:path';
|
|
5
5
|
import { formatEnvValue, mergeEnvText } from './env.js';
|
|
6
|
-
import { clonePluginConfigurationMap, mergeDependenciesIntoPackageJson,
|
|
6
|
+
import { clonePluginConfigurationMap, mergeDependenciesIntoPackageJson, setPluginInstanceConfig } from './apply.js';
|
|
7
7
|
import { isAiEnabledInConfig } from './project-deps.js';
|
|
8
8
|
export const TYPESAFE_DECISION_PACKAGE = '@zhin.js/service-typesafe';
|
|
9
9
|
function hasChatAgent(config) {
|
|
@@ -28,7 +28,7 @@ export async function configureTypeSafeDecisions(config) {
|
|
|
28
28
|
{ type: 'input', name: 'model', message: 'Jev 模型（生产校准后建议固定版本）', default: 'jev-latest', validate: (value) => value.trim().length > 0 || '请输入模型名称' },
|
|
29
29
|
{ type: 'select', name: 'mode', message: 'Skill / Tool 推荐运行方式', default: 'shadow', choices: [{ name: 'shadow：观察建议，评估后再启用', value: 'shadow' }, { name: 'active：启用推荐，权限仍由 Zhin 校验', value: 'active' }] },
|
|
30
30
|
]);
|
|
31
|
-
const reference = record(
|
|
31
|
+
const reference = record(clonePluginConfigurationMap(config)[answers.instanceKey]).apiKey;
|
|
32
32
|
const existingVariable = typeof reference === 'string' ? /^\$\{([A-Za-z_][A-Za-z0-9_]*)\}$/.exec(reference)?.[1] : undefined;
|
|
33
33
|
return { ...answers, envVar: existingVariable ?? decisionKeyVariable(answers.instanceKey) };
|
|
34
34
|
}
|
|
@@ -49,8 +49,7 @@ export function applyTypeSafeDecisionsToConfig(config, setup) {
|
|
|
49
49
|
throw new Error('Invalid TypeSafe setup configuration.');
|
|
50
50
|
const plugins = clonePluginConfigurationMap(config);
|
|
51
51
|
const existing = record(plugins[setup.instanceKey]);
|
|
52
|
-
|
|
53
|
-
config.plugins = plugins;
|
|
52
|
+
setPluginInstanceConfig(config, { instanceKey: setup.instanceKey, package: TYPESAFE_DECISION_PACKAGE }, { ...existing, apiKey: '${' + envVariable(setup) + '}', model: setup.model.trim(), timeoutMs: 10000, maxRetries: 2, enabled: true });
|
|
54
53
|
const ai = record(config.ai);
|
|
55
54
|
const previousDecisions = record(ai.decisions);
|
|
56
55
|
config.ai = { ...ai, decisions: {
|
|
@@ -65,13 +64,6 @@ export function applyTypeSafeDecisionsToConfig(config, setup) {
|
|
|
65
64
|
}
|
|
66
65
|
export async function saveTypeSafeSetupDependencies(projectDir, setup) {
|
|
67
66
|
const variable = envVariable(setup);
|
|
68
|
-
const pkgPath = path.join(projectDir, 'package.json');
|
|
69
|
-
const pkg = await fs.readJson(pkgPath);
|
|
70
|
-
const existingManifest = record(pkg.zhin).plugins;
|
|
71
|
-
if (Array.isArray(existingManifest) && existingManifest.some(entry => record(entry).instanceKey === setup.instanceKey && record(entry).package !== TYPESAFE_DECISION_PACKAGE)) {
|
|
72
|
-
throw new Error('Decision plugin instance already belongs to another package; choose a different instanceKey.');
|
|
73
|
-
}
|
|
74
|
-
await mergePluginManifestIntoPackageJson(projectDir, [{ package: TYPESAFE_DECISION_PACKAGE, instanceKey: setup.instanceKey }]);
|
|
75
67
|
await mergeDependenciesIntoPackageJson(projectDir, { [TYPESAFE_DECISION_PACKAGE]: '^1.0.0' });
|
|
76
68
|
const envPath = path.join(projectDir, '.env');
|
|
77
69
|
const envExists = await fs.pathExists(envPath);
|
|
@@ -120,14 +112,15 @@ export function diagnoseDecisionConfig(config, packageJson) {
|
|
|
120
112
|
if (key.includes('/'))
|
|
121
113
|
return issues;
|
|
122
114
|
const pkg = record(packageJson);
|
|
123
|
-
const
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
issues.push('决策插件实例未在 package.json#zhin.plugins 唯一声明。');
|
|
115
|
+
const declared = record(config.plugins);
|
|
116
|
+
if (typeof declared[key] !== 'string') {
|
|
117
|
+
issues.push('决策插件实例未在主配置 plugins 中声明。');
|
|
127
118
|
return issues;
|
|
128
119
|
}
|
|
129
|
-
if (
|
|
130
|
-
|
|
120
|
+
if (Array.isArray(config.disable_plugins) && config.disable_plugins.includes(key))
|
|
121
|
+
issues.push('绑定的决策插件已停用。');
|
|
122
|
+
if (declared[key] === TYPESAFE_DECISION_PACKAGE) {
|
|
123
|
+
const configForProvider = record(config[key]);
|
|
131
124
|
if (configForProvider.enabled === false)
|
|
132
125
|
issues.push('绑定的 TypeSafe 插件已禁用。');
|
|
133
126
|
if (typeof configForProvider.apiKey !== 'string' || !configForProvider.apiKey.trim())
|
package/lib/decisions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decisions.js","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,
|
|
1
|
+
{"version":3,"file":"decisions.js","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -11,6 +11,8 @@ export { configureDatabaseOptions } from './database.js';
|
|
|
11
11
|
export { formatEnvValue, mergeEnvText, generateDatabaseEnvExample, generateDatabaseEnvVars, } from './env.js';
|
|
12
12
|
export { AI_STACK_VERSIONS, MCP_SDK_VERSION, getAIDependencies, listAIDependencyNames, formatAIDependencyHint, isAiEnabledInConfig, resolveAgentProviderFromConfig, getRequiredAIDependenciesForConfig, diagnoseAIDependencies, formatAIDependencyFixCommand, packagesNeedingAiStackFix, findOutdatedAiStackInPackageJson, findInstalledAiStackIncompatibilities, ensureDatabaseForAI, ensureDatabaseForAdapters, } from './project-deps.js';
|
|
13
13
|
export type { AiStackIncompatibility } from './project-deps.js';
|
|
14
|
+
export { FALLBACK_DEPENDENCY_RANGE, scaffoldDependencyRange, withScaffoldVersionRanges, } from './stack-version-ranges.js';
|
|
15
|
+
export type { StackVersionRanges } from './stack-version-ranges.js';
|
|
14
16
|
export { ZHIN_STACK_VERSIONS, DEFAULT_CREATE_BOT_HTTP_PORT, CREATE_BOT_PACKAGE_MANAGER, getCreateBotBaseDependencies, getCreateBotPnpmWorkspaceConfig, getRequiredZhinDependenciesForConfig, diagnoseZhinStackDependencies, formatZhinStackFixCommand, packagesNeedingZhinStackFix, findOutdatedZhinStackInPackageJson, findInstalledZhinStackIncompatibilities, } from './zhin-stack-deps.js';
|
|
15
17
|
export type { ZhinStackDiagnosis, ZhinStackIncompatibility } from './zhin-stack-deps.js';
|
|
16
18
|
export { SPEECH_PACKAGE, HTML_RENDERER_PACKAGE, ADAPTERS_PREFER_HTML_IMAGE, diagnoseOptionalPeers, formatOptionalPeerFixCommand, getOptionalPeerDependencies, } from './optional-peers.js';
|
|
@@ -19,7 +21,7 @@ export { diagnoseUpgradeToL4, getUpgradeToL4Dependencies, } from './upgrade-l4.j
|
|
|
19
21
|
export type { UpgradeToL4Diagnosis } from './upgrade-l4.js';
|
|
20
22
|
export { loadProjectConfig, createProjectConfigPlan, renderProjectConfigPatch, applyProjectConfigPlan, migrateAiLegacyConfig, diagnoseConsoleConfig, applyConsoleConfigFixes, packageToInstanceKey, } from './project-config-plan.js';
|
|
21
23
|
export type { LoadedProjectConfig, ProjectConfigFormat, ProjectConfigPlan, ProjectConfigPlanOptions, ConsoleConfigDiagnosis, } from './project-config-plan.js';
|
|
22
|
-
export { applyDatabaseToConfig, applyAdaptersToConfig, applyAIToConfig, appendWizardEnvVars, collectWizardDependencies, collectWizardFeatures, mergeDependenciesIntoPackageJson, mergeFeaturesIntoPackageJson,
|
|
24
|
+
export { applyDatabaseToConfig, applyAdaptersToConfig, applyAIToConfig, appendWizardEnvVars, collectWizardDependencies, collectWizardFeatures, mergeDependenciesIntoPackageJson, mergeFeaturesIntoPackageJson, finalizeWizardOptions, applyWizardOptionsToConfig, clonePluginConfigurationMap, materializeDatabaseConfig, buildRuntimeConfigDocument, serializeRuntimeConfig, } from './apply.js';
|
|
23
25
|
export { TYPESAFE_DECISION_PACKAGE, configureTypeSafeDecisions, applyTypeSafeDecisionsToConfig, saveTypeSafeSetupDependencies, diagnoseDecisionConfig, } from './decisions.js';
|
|
24
26
|
export type { TypeSafeSetupConfig } from './decisions.js';
|
|
25
27
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,eAAe,EACf,yBAAyB,EACzB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjG,OAAO,EACL,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,6BAA6B,EAC7B,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,8BAA8B,EAC9B,kCAAkC,EAClC,sBAAsB,EACtB,4BAA4B,EAC5B,yBAAyB,EACzB,gCAAgC,EAChC,qCAAqC,EACrC,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EACL,mBAAmB,EACnB,4BAA4B,EAC5B,0BAA0B,EAC1B,4BAA4B,EAC5B,+BAA+B,EAC/B,oCAAoC,EACpC,6BAA6B,EAC7B,yBAAyB,EACzB,2BAA2B,EAC3B,kCAAkC,EAClC,uCAAuC,GACxC,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EACL,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EACV,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,qBAAqB,EACrB,gCAAgC,EAChC,4BAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -6,10 +6,11 @@ export { configureAI, generateAIEnvVars, generateAIConfigYaml, generateAIConfigJ
|
|
|
6
6
|
export { configureDatabaseOptions } from './database.js';
|
|
7
7
|
export { formatEnvValue, mergeEnvText, generateDatabaseEnvExample, generateDatabaseEnvVars, } from './env.js';
|
|
8
8
|
export { AI_STACK_VERSIONS, MCP_SDK_VERSION, getAIDependencies, listAIDependencyNames, formatAIDependencyHint, isAiEnabledInConfig, resolveAgentProviderFromConfig, getRequiredAIDependenciesForConfig, diagnoseAIDependencies, formatAIDependencyFixCommand, packagesNeedingAiStackFix, findOutdatedAiStackInPackageJson, findInstalledAiStackIncompatibilities, ensureDatabaseForAI, ensureDatabaseForAdapters, } from './project-deps.js';
|
|
9
|
+
export { FALLBACK_DEPENDENCY_RANGE, scaffoldDependencyRange, withScaffoldVersionRanges, } from './stack-version-ranges.js';
|
|
9
10
|
export { ZHIN_STACK_VERSIONS, DEFAULT_CREATE_BOT_HTTP_PORT, CREATE_BOT_PACKAGE_MANAGER, getCreateBotBaseDependencies, getCreateBotPnpmWorkspaceConfig, getRequiredZhinDependenciesForConfig, diagnoseZhinStackDependencies, formatZhinStackFixCommand, packagesNeedingZhinStackFix, findOutdatedZhinStackInPackageJson, findInstalledZhinStackIncompatibilities, } from './zhin-stack-deps.js';
|
|
10
11
|
export { SPEECH_PACKAGE, HTML_RENDERER_PACKAGE, ADAPTERS_PREFER_HTML_IMAGE, diagnoseOptionalPeers, formatOptionalPeerFixCommand, getOptionalPeerDependencies, } from './optional-peers.js';
|
|
11
12
|
export { diagnoseUpgradeToL4, getUpgradeToL4Dependencies, } from './upgrade-l4.js';
|
|
12
13
|
export { loadProjectConfig, createProjectConfigPlan, renderProjectConfigPatch, applyProjectConfigPlan, migrateAiLegacyConfig, diagnoseConsoleConfig, applyConsoleConfigFixes, packageToInstanceKey, } from './project-config-plan.js';
|
|
13
|
-
export { applyDatabaseToConfig, applyAdaptersToConfig, applyAIToConfig, appendWizardEnvVars, collectWizardDependencies, collectWizardFeatures, mergeDependenciesIntoPackageJson, mergeFeaturesIntoPackageJson,
|
|
14
|
+
export { applyDatabaseToConfig, applyAdaptersToConfig, applyAIToConfig, appendWizardEnvVars, collectWizardDependencies, collectWizardFeatures, mergeDependenciesIntoPackageJson, mergeFeaturesIntoPackageJson, finalizeWizardOptions, applyWizardOptionsToConfig, clonePluginConfigurationMap, materializeDatabaseConfig, buildRuntimeConfigDocument, serializeRuntimeConfig, } from './apply.js';
|
|
14
15
|
export { TYPESAFE_DECISION_PACKAGE, configureTypeSafeDecisions, applyTypeSafeDecisionsToConfig, saveTypeSafeSetupDependencies, diagnoseDecisionConfig, } from './decisions.js';
|
|
15
16
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AASnC,OAAO,EACL,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,6BAA6B,EAC7B,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,8BAA8B,EAC9B,kCAAkC,EAClC,sBAAsB,EACtB,4BAA4B,EAC5B,yBAAyB,EACzB,gCAAgC,EAChC,qCAAqC,EACrC,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,mBAAmB,EACnB,4BAA4B,EAC5B,0BAA0B,EAC1B,4BAA4B,EAC5B,+BAA+B,EAC/B,oCAAoC,EACpC,6BAA6B,EAC7B,yBAAyB,EACzB,2BAA2B,EAC3B,kCAAkC,EAClC,uCAAuC,GACxC,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AASlC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,qBAAqB,EACrB,gCAAgC,EAChC,4BAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AASnC,OAAO,EACL,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,6BAA6B,EAC7B,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,8BAA8B,EAC9B,kCAAkC,EAClC,sBAAsB,EACtB,4BAA4B,EAC5B,yBAAyB,EACzB,gCAAgC,EAChC,qCAAqC,EACrC,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,mBAAmB,EACnB,4BAA4B,EAC5B,0BAA0B,EAC1B,4BAA4B,EAC5B,+BAA+B,EAC/B,oCAAoC,EACpC,6BAA6B,EAC7B,yBAAyB,EACzB,2BAA2B,EAC3B,kCAAkC,EAClC,uCAAuC,GACxC,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AASlC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,qBAAqB,EACrB,gCAAgC,EAChC,4BAA4B,EAC5B,qBAAqB,EACrB,0BAA0B,EAC1B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,yBAAyB,EAAE,0BAA0B,EAAE,8BAA8B,EACrF,6BAA6B,EAAE,sBAAsB,GACtD,MAAM,gBAAgB,CAAC"}
|
|
@@ -10,6 +10,8 @@ export interface LoadedProjectConfig {
|
|
|
10
10
|
format?: ProjectConfigFormat;
|
|
11
11
|
config: Record<string, unknown>;
|
|
12
12
|
writable: boolean;
|
|
13
|
+
/** Exact preview source: comments and declaration order are concurrency inputs. */
|
|
14
|
+
source?: string;
|
|
13
15
|
message?: string;
|
|
14
16
|
}
|
|
15
17
|
export interface ProjectConfigPlanOptions {
|
|
@@ -31,6 +33,7 @@ export interface ProjectConfigPlan {
|
|
|
31
33
|
relativePath?: string;
|
|
32
34
|
format?: ProjectConfigFormat;
|
|
33
35
|
writable: boolean;
|
|
36
|
+
expectedSource?: string;
|
|
34
37
|
before: Record<string, unknown>;
|
|
35
38
|
after: Record<string, unknown>;
|
|
36
39
|
mutations: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config-plan.d.ts","sourceRoot":"","sources":["../src/project-config-plan.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project-config-plan.d.ts","sourceRoot":"","sources":["../src/project-config-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import yaml from 'yaml';
|
|
4
|
+
import { createConfigDocument, readSourcePluginOrder } from '@zhin.js/config-file';
|
|
5
|
+
import { readApplicationPluginDeclaration } from '@zhin.js/runtime';
|
|
6
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
4
7
|
import { readPluginConfigurationMap, ROOT_CONFIG_FILE_NAMES, rootConfigFormat, selectRootConfigFile, } from '@zhin.js/plugin-runtime';
|
|
5
8
|
import { providerSdkFor } from './ai.js';
|
|
6
9
|
const CONSOLE_URL = 'https://console.zhin.dev';
|
|
@@ -67,9 +70,10 @@ export function loadProjectConfig(cwd = process.cwd(), configPath) {
|
|
|
67
70
|
};
|
|
68
71
|
}
|
|
69
72
|
const content = fs.readFileSync(resolvedPath, 'utf8');
|
|
73
|
+
readSourcePluginOrder(content, format === 'json' ? 'JSON' : 'YAML');
|
|
70
74
|
const config = parseConfig(content, format);
|
|
71
75
|
try {
|
|
72
|
-
|
|
76
|
+
readApplicationPluginDeclaration(config, relativePath);
|
|
73
77
|
}
|
|
74
78
|
catch (error) {
|
|
75
79
|
return {
|
|
@@ -90,23 +94,25 @@ export function loadProjectConfig(cwd = process.cwd(), configPath) {
|
|
|
90
94
|
relativePath,
|
|
91
95
|
format,
|
|
92
96
|
config,
|
|
97
|
+
source: content,
|
|
93
98
|
writable: true,
|
|
94
99
|
};
|
|
95
100
|
}
|
|
96
101
|
function ensurePlugins(config, pluginsToAdd, mutations) {
|
|
97
|
-
const
|
|
98
|
-
|
|
102
|
+
const declaration = readApplicationPluginDeclaration(config);
|
|
103
|
+
const plugins = { ...config.plugins };
|
|
99
104
|
for (const pkg of pluginsToAdd) {
|
|
100
105
|
const instanceKey = packageToInstanceKey(pkg);
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
config.plugins = plugins;
|
|
106
|
+
const existing = declaration.instances.find(item => item.instanceKey === instanceKey);
|
|
107
|
+
if (existing && existing.package !== pkg)
|
|
108
|
+
throw new Error(`Plugin instance ${instanceKey} already belongs to ${existing.package}`);
|
|
109
|
+
if (!existing) {
|
|
110
|
+
plugins[instanceKey] = pkg;
|
|
111
|
+
mutations.push(`added ${instanceKey} (${pkg}) to plugins`);
|
|
112
|
+
}
|
|
109
113
|
}
|
|
114
|
+
config.plugins = plugins;
|
|
115
|
+
readApplicationPluginDeclaration(config);
|
|
110
116
|
}
|
|
111
117
|
function ensureHttp(config, mutations) {
|
|
112
118
|
const http = config.http && typeof config.http === 'object' && !Array.isArray(config.http)
|
|
@@ -260,6 +266,7 @@ export function createProjectConfigPlan(options) {
|
|
|
260
266
|
relativePath: loaded.relativePath,
|
|
261
267
|
format: loaded.format,
|
|
262
268
|
writable: loaded.writable,
|
|
269
|
+
expectedSource: 'source' in loaded ? loaded.source : (loaded.configPath && fs.existsSync(loaded.configPath) ? fs.readFileSync(loaded.configPath, 'utf8') : undefined),
|
|
263
270
|
before,
|
|
264
271
|
after,
|
|
265
272
|
mutations,
|
|
@@ -283,7 +290,26 @@ export async function applyProjectConfigPlan(plan) {
|
|
|
283
290
|
return false;
|
|
284
291
|
if (!plan.writable || !plan.configPath || !plan.format)
|
|
285
292
|
return false;
|
|
286
|
-
|
|
293
|
+
const document = createConfigDocument(plan.configPath);
|
|
294
|
+
const snapshot = await document.readSource();
|
|
295
|
+
if ((plan.expectedSource !== undefined && snapshot.source !== plan.expectedSource) || !isDeepStrictEqual(snapshot.document, plan.before))
|
|
296
|
+
throw new Error('配置已在预览后发生变更，请重新生成配置计划。');
|
|
297
|
+
const keys = new Set([...Object.keys(plan.before), ...Object.keys(plan.after)]);
|
|
298
|
+
const patches = [...keys].filter(key => !isDeepStrictEqual(plan.before[key], plan.after[key])).flatMap(key => {
|
|
299
|
+
if (key === 'plugins') {
|
|
300
|
+
const before = plan.before.plugins;
|
|
301
|
+
const after = plan.after.plugins;
|
|
302
|
+
return [...new Set([...Object.keys(before ?? {}), ...Object.keys(after ?? {})])]
|
|
303
|
+
.filter(alias => before?.[alias] !== after?.[alias])
|
|
304
|
+
.map(alias => Object.hasOwn(after ?? {}, alias)
|
|
305
|
+
? { op: 'set', path: ['plugins', alias], value: after[alias] }
|
|
306
|
+
: { op: 'remove', path: ['plugins', alias] });
|
|
307
|
+
}
|
|
308
|
+
return [Object.hasOwn(plan.after, key)
|
|
309
|
+
? { op: 'set', path: [key], value: plan.after[key] }
|
|
310
|
+
: { op: 'remove', path: [key] }];
|
|
311
|
+
});
|
|
312
|
+
await (await document.prepare(snapshot, patches)).commit();
|
|
287
313
|
return true;
|
|
288
314
|
}
|
|
289
315
|
export function diagnoseConsoleConfig(config) {
|