@zhin.js/scaffold-wizard 0.2.6 → 1.1.1

package/src/project-deps.ts

@@ -88,7 +88,7 @@ function packagesForSdkIds(sdkIds: Iterable<string>): Record<string, string> {
 
 function collectSdkPackagesFromSetup(ai: AISetupConfig): Record<string, string> {
   const sdkIds = new Set<string>();
-  const agentProvider = ai.agentProvider ?? ai.defaultProvider;
+  const agentProvider = ai.agentProvider;
   if (agentProvider) {
     const id = inferSdkId(agentProvider, ai.providers?.[agentProvider] as { sdk?: string });
     if (id) sdkIds.add(id);
@@ -124,7 +124,7 @@ function collectSdkPackagesFromConfig(config: { ai?: unknown }): Record<string,
   }
 
   if (sdkIds.size === 0) {
-    const alias = resolveDefaultProviderFromConfig(config);
+    const alias = resolveAgentProviderFromConfig(config);
     if (alias) {
       const id = inferSdkId(alias, providers?.[alias]);
       if (id) sdkIds.add(id);
@@ -249,7 +249,7 @@ export function isAiEnabledInConfig(config: { ai?: unknown }): boolean {
   return false;
 }
 
-export function resolveDefaultProviderFromConfig(config: { ai?: unknown }): string | undefined {
+export function resolveAgentProviderFromConfig(config: { ai?: unknown }): string | undefined {
   const ai = config.ai;
   if (!ai || typeof ai !== 'object' || Array.isArray(ai)) return undefined;
   const rec = ai as Record<string, unknown>;
@@ -265,7 +265,6 @@ export function resolveDefaultProviderFromConfig(config: { ai?: unknown }): stri
     const first = Object.keys(providers as Record<string, unknown>)[0];
     if (first) return first;
   }
-  if (rec.defaultProvider != null) return String(rec.defaultProvider);
   return undefined;
 }
 
@@ -281,7 +280,7 @@ export function getRequiredAIDependenciesForConfig(config: { ai?: unknown }): Re
   const ai = config.ai as Record<string, unknown>;
   const setup: AISetupConfig = {
     enabled: true,
-    agentProvider: resolveDefaultProviderFromConfig(config),
+    agentProvider: resolveAgentProviderFromConfig(config),
     providers: ai.providers as AISetupConfig['providers'],
     memoryMcp: aiConfigNeedsMcp(ai),
   };
@@ -365,7 +364,7 @@ export function diagnoseAIDependencies(
   const notInstalled = findUnresolvedPackageInstalls(cwd, declared);
   return {
     enabled: true,
-    provider: resolveDefaultProviderFromConfig(config),
+    provider: resolveAgentProviderFromConfig(config),
     required,
     missingFromPackageJson,
     outdatedInPackageJson,

package/src/types.ts

@@ -7,7 +7,7 @@ export type { AdapterSetupResult } from './adapter.js';
 export interface InitOptions {
   name?: string;
   template?: 'default' | 'life-assistant';
-  config?: 'json' | 'yaml' | 'toml';
+  config?: 'json' | 'yaml';
   runtime?: 'node' | 'bun';
   yes?: boolean;
   httpToken?: string;
@@ -30,4 +30,4 @@ export const DATABASE_PACKAGES: Record<DatabaseConfig['dialect'], string | undef
   pg: 'pg',
   mongodb: 'mongodb',
   redis: 'redis'
-};
+};

package/src/zhin-stack-deps.ts

@@ -23,6 +23,7 @@ export const ZHIN_STACK_VERSIONS = {
   '@zhin.js/layout': 'latest',
   '@zhin.js/page': 'latest',
   '@zhin.js/prompt-section': 'latest',
+  '@zhin.js/skill': 'latest',
   '@zhin.js/tool': 'latest',
   '@zhin.js/client': 'latest',
   '@zhin.js/contract': 'latest',
@@ -61,6 +62,12 @@ function parseMajor(versionSpec: string | undefined): number | undefined {
   return match ? Number(match[1]) : undefined;
 }
 
+function parseMajorMinor(versionSpec: string | undefined): [number, number] | undefined {
+  if (!versionSpec?.trim()) return undefined;
+  const match = versionSpec.trim().replace(/^[\^~>=<]+/, '').match(/^(\d+)\.(\d+)/);
+  return match ? [Number(match[1]), Number(match[2])] : undefined;
+}
+
 function getDeclaredPackageVersion(pkg: PackageJsonLike, name: string): string | undefined {
   return pkg.dependencies?.[name] ?? pkg.devDependencies?.[name];
 }
@@ -77,26 +84,31 @@ function readInstalledMajor(cwd: string, packageName: string): number | undefine
   }
 }
 
+function readInstalledVersion(cwd: string, packageName: string): string | undefined {
+  const pkgJson = path.join(cwd, 'package.json');
+  if (!fs.existsSync(pkgJson)) return undefined;
+  try {
+    const req = createRequire(pkgJson);
+    const installed = req(`${packageName}/package.json`) as { version?: string };
+    return installed.version;
+  } catch {
+    return undefined;
+  }
+}
+
 function resolvePackageMajor(cwd: string, pkg: PackageJsonLike, packageName: string): number | undefined {
   return readInstalledMajor(cwd, packageName) ?? parseMajor(getDeclaredPackageVersion(pkg, packageName));
 }
 
-function resolveStackVersion(packageName: string): string {
-  return ZHIN_STACK_VERSIONS[packageName as ZhinStackPackage] ?? 'latest';
+function supportsSplitAiInstallation(versionSpec: string | undefined): boolean | undefined {
+  const version = parseMajorMinor(versionSpec);
+  if (!version) return undefined;
+  const [major, minor] = version;
+  return major >= 4 || (major === 1 && minor >= 1);
 }
 
-function collectZhinPluginsFromConfig(config: Record<string, unknown>): string[] {
-  // 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 [];
+function resolveStackVersion(packageName: string): string {
+  return ZHIN_STACK_VERSIONS[packageName as ZhinStackPackage] ?? 'latest';
 }
 
 /** create-zhin / minimal-bot 默认 Host 端口（避免与常见 8086 占用冲突） */
@@ -119,6 +131,7 @@ export function getCreateBotPnpmConfig(_aiEnabled?: boolean): Record<string, unk
 export function getCreateBotBaseDependencies(): Record<string, string> {
   return {
     'zhin.js': ZHIN_STACK_VERSIONS['zhin.js'],
+    '@zhin.js/skill': ZHIN_STACK_VERSIONS['@zhin.js/skill'],
   };
 }
 
@@ -128,10 +141,6 @@ export function getRequiredZhinDependenciesForConfig(config: Record<string, unkn
     'zhin.js': ZHIN_STACK_VERSIONS['zhin.js'],
   };
 
-  for (const plugin of collectZhinPluginsFromConfig(config)) {
-    deps[plugin] = resolveStackVersion(plugin);
-  }
-
   const database = config.database;
   if (database && typeof database === 'object' && !Array.isArray(database)) {
     deps['@zhin.js/database'] = ZHIN_STACK_VERSIONS['@zhin.js/database'];
@@ -173,14 +182,14 @@ export function findInstalledZhinStackIncompatibilities(
   config: Record<string, unknown>,
 ): ZhinStackIncompatibility[] {
   const issues: ZhinStackIncompatibility[] = [];
-  const zhinMajor = resolvePackageMajor(cwd, pkg, 'zhin.js');
+  const zhinVersion = readInstalledVersion(cwd, 'zhin.js') ?? getDeclaredPackageVersion(pkg, 'zhin.js');
   const agentDeclared = getDeclaredPackageVersion(pkg, '@zhin.js/agent');
   const aiEnabled = isAiEnabledInConfig(config);
 
-  if (zhinMajor != null && zhinMajor < 4 && (aiEnabled || agentDeclared)) {
+  if (supportsSplitAiInstallation(zhinVersion) === false && (aiEnabled || agentDeclared)) {
     issues.push({
       package: 'zhin.js',
-      reason: 'zhin.js 4.x 才支持 @zhin.js/agent 与 AI 安装分层（ADR 0019），请升级 zhin.js',
+      reason: 'zhin.js 1.1.x 稳定线才支持当前 @zhin.js/agent 与 AI 安装分层，请升级 zhin.js',
     });
   }
 
@@ -192,7 +201,7 @@ export function findInstalledZhinStackIncompatibilities(
   if (agentMajor != null && agentMajor < 1 && aiEnabled) {
     issues.push({
       package: '@zhin.js/agent',
-      reason: '@zhin.js/agent 1.x 与 zhin.js 4.x / AI SDK 7 配套，请升级 @zhin.js/agent',
+      reason: '@zhin.js/agent 1.x 与 zhin.js 1.1.x 稳定线 / AI SDK 7 配套，请升级 @zhin.js/agent',
     });
   }