@zhin.js/scaffold-wizard 0.1.7 → 0.1.9

package/src/project-config-plan.ts

@@ -12,10 +12,19 @@ const CONFIG_CANDIDATES = [
   'zhin.config.toml',
   'zhin.config.ts',
 ] as const;
+/** @deprecated Plugin Runtime 由 CLI 装配 Console Host，无需在配置中声明；仅用于 legacy 数组配置诊断 */
 const CONSOLE_HOST_PLUGINS = ['@zhin.js/host-router', '@zhin.js/host-api'] as const;
 const SANDBOX_PLUGIN = '@zhin.js/adapter-sandbox';
 const LEGACY_AI_PROVIDER_FIELDS = ['driver', 'api', 'preset', 'spec'] as const;
 
+/** 由插件包名推导默认 instanceKey（@zhin.js/adapter-telegram → telegram） */
+export function packageToInstanceKey(packageName: string): string {
+  const name = packageName.includes('/')
+    ? packageName.split('/').pop() ?? packageName
+    : packageName;
+  return name.replace(/^(adapter|plugin|service)-/, '');
+}
+
 export type ProjectConfigFormat = 'yaml' | 'json' | 'toml' | 'ts';
 
 export interface LoadedProjectConfig {
@@ -164,17 +173,34 @@ export function loadProjectConfig(cwd = process.cwd(), configPath?: string): Loa
 }
 
 function ensurePlugins(config: Record<string, unknown>, pluginsToAdd: readonly string[], mutations: string[]): void {
-  const plugins = Array.isArray(config.plugins)
-    ? config.plugins.filter((p): p is string => typeof p === 'string')
-    : [];
+  if (Array.isArray(config.plugins)) {
+    // legacy 数组形式：保持原形态追加，避免改写旧项目结构
+    const plugins = config.plugins.filter((p): p is string => typeof p === 'string');
+    let changed = false;
+    for (const plugin of pluginsToAdd) {
+      if (plugins.includes(plugin)) continue;
+      plugins.push(plugin);
+      mutations.push(`added ${plugin} to plugins`);
+      changed = true;
+    }
+    if (changed) {
+      config.plugins = plugins;
+    }
+    return;
+  }
+  // 新 Plugin Runtime：plugins 为 <instanceKey>: <配置> 映射
+  const plugins = config.plugins && typeof config.plugins === 'object'
+    ? { ...(config.plugins as Record<string, unknown>) }
+    : {};
   let changed = false;
-  for (const plugin of pluginsToAdd) {
-    if (plugins.includes(plugin)) continue;
-    plugins.push(plugin);
-    mutations.push(`added ${plugin} to plugins`);
+  for (const pkg of pluginsToAdd) {
+    const instanceKey = packageToInstanceKey(pkg);
+    if (instanceKey in plugins) continue;
+    plugins[instanceKey] = {};
+    mutations.push(`added ${instanceKey} (${pkg}) to plugins`);
     changed = true;
   }
-  if (changed || !Array.isArray(config.plugins)) {
+  if (changed || !config.plugins || typeof config.plugins !== 'object') {
     config.plugins = plugins;
   }
 }
@@ -188,7 +214,7 @@ function ensureHttp(config: Record<string, unknown>, mutations: string[]): void
     : [];
 
   let changed = false;
-  if (!corsOrigins.includes(CONSOLE_URL)) {
+  if (!hasConsoleOrigin(corsOrigins)) {
     corsOrigins.push(CONSOLE_URL);
     http.corsOrigins = corsOrigins;
     mutations.push(`added ${CONSOLE_URL} to http.corsOrigins`);
@@ -318,7 +344,8 @@ export function createProjectConfigPlan(options: ProjectConfigPlanOptions): Proj
   const mutations: string[] = [];
 
   if (loaded.status === 'loaded' || options.config) {
-    if (options.ensureConsole) {
+    if (options.ensureConsole && Array.isArray(after.plugins)) {
+      // legacy 数组形态：host 插件仍需写入列表（旧项目行为不变）
       ensurePlugins(after, CONSOLE_HOST_PLUGINS, mutations);
     }
     if (options.ensureSandbox) {
@@ -327,7 +354,8 @@ export function createProjectConfigPlan(options: ProjectConfigPlanOptions): Proj
     if (options.enablePlugins?.length) {
       ensurePlugins(after, options.enablePlugins, mutations);
     }
-    if (options.ensureHttp) {
+    if (options.ensureConsole || options.ensureHttp) {
+      // 新形态下 Console Host 由 CLI composition root 装配；Console 可达只需 http.token + corsOrigins
       ensureHttp(after, mutations);
     }
     if (options.migrateAiLegacy) {
@@ -369,22 +397,44 @@ export async function applyProjectConfigPlan(plan: ProjectConfigPlan): Promise<b
 }
 
 export function diagnoseConsoleConfig(config: Record<string, unknown>): ConsoleConfigDiagnosis {
-  const plugins = Array.isArray(config.plugins)
-    ? config.plugins.filter((p): p is string => typeof p === 'string')
-    : [];
   const http = config.http && typeof config.http === 'object' && !Array.isArray(config.http)
     ? config.http as Record<string, unknown>
     : {};
   const corsOrigins = Array.isArray(http.corsOrigins) ? http.corsOrigins : [];
 
+  if (Array.isArray(config.plugins)) {
+    // legacy 数组形式配置
+    const plugins = config.plugins.filter((p): p is string => typeof p === 'string');
+    return {
+      missingHostPlugins: CONSOLE_HOST_PLUGINS.filter((plugin) => !plugins.includes(plugin)),
+      missingSandboxPlugin: !plugins.includes(SANDBOX_PLUGIN),
+      missingConsoleOrigin: !hasConsoleOrigin(corsOrigins.filter((origin): origin is string => typeof origin === 'string')),
+      missingHttpToken: typeof http.token !== 'string' || http.token.trim().length === 0,
+    };
+  }
+
+  // 新 Plugin Runtime：Console Host 由 CLI 装配，无需 host 插件；Sandbox 为 plugins.sandbox 实例
+  const plugins = config.plugins && typeof config.plugins === 'object'
+    ? config.plugins as Record<string, unknown>
+    : {};
   return {
-    missingHostPlugins: CONSOLE_HOST_PLUGINS.filter((plugin) => !plugins.includes(plugin)),
-    missingSandboxPlugin: !plugins.includes(SANDBOX_PLUGIN),
-    missingConsoleOrigin: !corsOrigins.includes(CONSOLE_URL),
+    missingHostPlugins: [],
+    missingSandboxPlugin: !('sandbox' in plugins),
+    missingConsoleOrigin: !hasConsoleOrigin(corsOrigins.filter((origin): origin is string => typeof origin === 'string')),
     missingHttpToken: typeof http.token !== 'string' || http.token.trim().length === 0,
   };
 }
 
+function hasConsoleOrigin(origins: readonly string[]): boolean {
+  return origins.some((origin) => {
+    try {
+      return new URL(origin).origin === CONSOLE_URL;
+    } catch {
+      return false;
+    }
+  });
+}
+
 export function applyConsoleConfigFixes(config: Record<string, unknown>): boolean {
   const plan = createProjectConfigPlan({
     cwd: process.cwd(),

package/src/upgrade-l4.ts

@@ -1,15 +1,7 @@
 import fs from 'fs-extra';
 import path from 'node:path';
-import type { PackageJsonLike } from './project-deps.js';
-import {
-  diagnoseAIDependencies,
-  formatAIDependencyFixCommand,
-  getRequiredAIDependenciesForConfig,
-  isAiEnabledInConfig,
-  findMissingPackageDependencies,
-  findUnresolvedPackageInstalls,
-  packagesNeedingAiStackFix,
-} from './project-deps.js';
+import { diagnoseAIDependencies, formatAIDependencyFixCommand, getRequiredAIDependenciesForConfig, isAiEnabledInConfig, findMissingPackageDependencies, findUnresolvedPackageInstalls, packagesNeedingAiStackFix, type PackageJsonLike } from './project-deps.js';
+
 import { diagnoseOptionalPeers, formatOptionalPeerFixCommand, getOptionalPeerDependencies } from './optional-peers.js';
 
 export interface UpgradeToL4Diagnosis {

package/src/zhin-stack-deps.ts

@@ -2,21 +2,24 @@ import { createRequire } from 'node:module';
 import fs from 'fs-extra';
 import path from 'node:path';
 import { DATABASE_PACKAGES } from './types.js';
-import type { PackageJsonLike } from './project-deps.js';
-import {
-  findMissingPackageDependencies,
-  findUnresolvedPackageInstalls,
-  isAiEnabledInConfig,
-} from './project-deps.js';
+import { findMissingPackageDependencies, findUnresolvedPackageInstalls, isAiEnabledInConfig, type PackageJsonLike } from './project-deps.js';
 
 /**
  * User project dependency policy: scaffolded dependencies intentionally float to latest.
+ * WARNING: this is not reproducible; pin versions for production. See scaffold-wizard README.
  */
 export const ZHIN_STACK_VERSIONS = {
   'zhin.js': 'latest',
   '@zhin.js/cli': 'latest',
   '@zhin.js/agent': 'latest',
   '@zhin.js/database': 'latest',
+  '@zhin.js/plugin-runtime': 'latest',
+  '@zhin.js/runtime': 'latest',
+  '@zhin.js/adapter': 'latest',
+  '@zhin.js/command': 'latest',
+  '@zhin.js/component': 'latest',
+  '@zhin.js/core': 'latest',
+  '@zhin.js/tool': 'latest',
   '@zhin.js/host-router': 'latest',
   '@zhin.js/host-api': 'latest',
   '@zhin.js/client': 'latest',
@@ -86,10 +89,17 @@ function resolveStackVersion(packageName: string): string {
 }
 
 function collectZhinPluginsFromConfig(config: Record<string, unknown>): string[] {
-  const plugins = Array.isArray(config.plugins)
-    ? config.plugins.filter((p): p is string => typeof p === 'string')
-    : [];
-  return [...new Set(plugins.filter((p) => p.startsWith('@zhin.js/')))];
+  // legacy 数组形式：条目即包名
+  if (Array.isArray(config.plugins)) {
+    const plugins = config.plugins.filter((p): p is string => typeof p === 'string');
+    return [...new Set(plugins.filter((p) => p.startsWith('@zhin.js/')))];
+  }
+  // 新 runtime：plugins 为 instanceKey 映射，包名在 package.json zhin.plugins 清单中，
+  // 无法从配置推导；仅收集直接以包名出现的键（防御性）
+  if (config.plugins && typeof config.plugins === 'object') {
+    return Object.keys(config.plugins as Record<string, unknown>).filter((key) => key.startsWith('@zhin.js/'));
+  }
+  return [];
 }
 
 /** create-zhin / minimal-bot 默认 Host 端口（避免与常见 8086 占用冲突） */
@@ -105,15 +115,16 @@ export function getCreateBotPnpmConfig(_aiEnabled?: boolean): Record<string, unk
   };
 }
 
-/** create-zhin-app 默认 bot 骨架依赖（不含适配器 / AI / 数据库驱动） */
+/** create-zhin-app Plugin Runtime 骨架 production 依赖（不含适配器 / AI / 数据库驱动） */
 export function getCreateBotBaseDependencies(): Record<string, string> {
   return {
     'zhin.js': ZHIN_STACK_VERSIONS['zhin.js'],
-    '@zhin.js/cli': ZHIN_STACK_VERSIONS['@zhin.js/cli'],
-    '@zhin.js/host-router': ZHIN_STACK_VERSIONS['@zhin.js/host-router'],
-    '@zhin.js/client': ZHIN_STACK_VERSIONS['@zhin.js/client'],
-    '@zhin.js/host-api': ZHIN_STACK_VERSIONS['@zhin.js/host-api'],
-    '@zhin.js/contract': ZHIN_STACK_VERSIONS['@zhin.js/contract'],
+    '@zhin.js/plugin-runtime': ZHIN_STACK_VERSIONS['@zhin.js/plugin-runtime'],
+    '@zhin.js/runtime': ZHIN_STACK_VERSIONS['@zhin.js/runtime'],
+    '@zhin.js/adapter': ZHIN_STACK_VERSIONS['@zhin.js/adapter'],
+    '@zhin.js/command': ZHIN_STACK_VERSIONS['@zhin.js/command'],
+    '@zhin.js/component': ZHIN_STACK_VERSIONS['@zhin.js/component'],
+    '@zhin.js/core': ZHIN_STACK_VERSIONS['@zhin.js/core'],
     '@zhin.js/satori': ZHIN_STACK_VERSIONS['@zhin.js/satori'],
   };
 }