@h-ai/cli 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/cli-config-templates-SVV3633D.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+export { generateConfigFile, generateEnvExample, generateProductionEnvironment } from './chunk-SGWSVWZ5.js';
+import './chunk-ZSDEVXZ7.js';
+//# sourceMappingURL=cli-config-templates-SVV3633D.js.map
+//# sourceMappingURL=cli-config-templates-SVV3633D.js.map

package/dist/{cli-config-templates-5KS3AE4H.js.map → cli-config-templates-SVV3633D.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"cli-config-templates-5KS3AE4H.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"cli-config-templates-SVV3633D.js"}

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { generateConfigFile, runtimeEnvironmentVariables, renderEnvironment, generateProductionEnvironment, moduleEnvironmentVariables, documentConfig, parameterizeConfig } from './chunk-RT5OZJKM.js';
+import { generateConfigFile, runtimeEnvironmentVariables, renderEnvironment, generateProductionEnvironment, moduleEnvironmentVariables, documentConfig, parameterizeConfig } from './chunk-SGWSVWZ5.js';
 import { cliM } from './chunk-7DNIMG2H.js';
-import { normalizeProjectName, resolveImageReference, resolveDownloadProxy } from './chunk-XI5SKOOR.js';
+import { normalizeProjectName, resolveImageReference, resolveDownloadProxy } from './chunk-MEEFB4BI.js';
 import './chunk-ZSDEVXZ7.js';
 import process5 from 'process';
 import { cac } from 'cac';
@@ -14,7 +14,7 @@ import Handlebars2 from 'handlebars';
 import { parseEnv } from 'util';
 import ora from 'ora';
 import prompts from 'prompts';
-import { parse, stringify, parseAllDocuments } from 'yaml';
+import { parse, stringify, parseDocument, parseAllDocuments } from 'yaml';
 import { Buffer } from 'buffer';
 import { execSync, execFileSync, spawn } from 'child_process';
 import { randomBytes, createECDH, randomUUID, createHash } from 'crypto';
@@ -1281,7 +1281,7 @@ async function createProject(options) {
     });
     await generateFromTemplates(projectPath, context);
     {
-      const { generateConfigFile: generateConfigFile2, generateEnvExample, generateProductionEnvironment: generateProductionEnvironment2 } = await import('./cli-config-templates-5KS3AE4H.js');
+      const { generateConfigFile: generateConfigFile2, generateEnvExample, generateProductionEnvironment: generateProductionEnvironment2 } = await import('./cli-config-templates-SVV3633D.js');
       const configs = resolvedOptions.moduleConfigs;
       const isApiWorkspace = resolvedOptions.appType === "api";
       const isFullstack = resolvedOptions.appType === "fullstack";
@@ -2249,7 +2249,7 @@ async function ensureDeployConfig(cwd) {
 }
 var MODULE_MAP = {
   // iam 依赖 crypto（password hash）/ db（user 存储）/ cache（session 缓存）
-  "iam": { packages: ["@h-ai/iam"], deps: ["crypto", "db", "cache"], configKey: "iam", get description() {
+  "iam": { packages: ["@h-ai/iam"], configKey: "iam", get description() {
     return cliM("cli_featureIamName");
   } },
   // 'db' 和 'reldb' 都映射到 @h-ai/reldb，兼容用户习惯（hai add db 和 hai add reldb 均可）
@@ -2262,13 +2262,13 @@ var MODULE_MAP = {
   "cache": { packages: ["@h-ai/cache"], configKey: "cache", get description() {
     return cliM("cli_featureCacheName");
   } },
-  "ai": { packages: ["@h-ai/ai"], deps: ["db", "vecdb"], configKey: "ai", get description() {
+  "ai": { packages: ["@h-ai/ai"], configKey: "ai", get description() {
     return cliM("cli_featureAiName");
   } },
   "storage": { packages: ["@h-ai/storage"], configKey: "storage", get description() {
     return cliM("cli_featureStorageName");
   } },
-  "crypto": { packages: ["@h-ai/crypto"], deps: ["db"], get description() {
+  "crypto": { packages: ["@h-ai/crypto"], get description() {
     return cliM("cli_featureCryptoName");
   } },
   "kit": { packages: ["@h-ai/kit"], get description() {
@@ -2289,13 +2289,13 @@ var MODULE_MAP = {
   "reach": { packages: ["@h-ai/reach"], configKey: "reach", get description() {
     return cliM("cli_featureReachName");
   } },
-  "feedback": { packages: ["@h-ai/feedback"], deps: ["crypto", "db", "cache", "storage", "iam"], configKey: "feedback", get description() {
+  "feedback": { packages: ["@h-ai/feedback"], configKey: "feedback", get description() {
     return cliM("cli_featureFeedbackName");
   } },
-  "scheduler": { packages: ["@h-ai/scheduler"], deps: ["db"], configKey: "scheduler", get description() {
+  "scheduler": { packages: ["@h-ai/scheduler"], configKey: "scheduler", get description() {
     return cliM("cli_featureSchedulerName");
   } },
-  "audit": { packages: ["@h-ai/audit"], deps: ["db"], configKey: "audit", get description() {
+  "audit": { packages: ["@h-ai/audit"], configKey: "audit", get description() {
     return cliM("cli_featureAuditName");
   } },
   "payment": { packages: ["@h-ai/payment"], configKey: "payment", get description() {
@@ -2328,25 +2328,62 @@ async function addModule(options) {
         writeCliMessage(chalk.green(cliM("cli_addAllInstalled")));
         return;
       }
-      const { selected } = await prompts({
+      const { selected: selected2 } = await prompts({
         type: "select",
         hint: cliM("cli_selectHint"),
         name: "selected",
         message: cliM("cli_addModulePrompt"),
         choices
       });
-      if (!selected)
+      if (!selected2)
         return;
-      moduleName = selected;
+      moduleName = selected2;
     }
-    const moduleDef = MODULE_MAP[moduleName];
-    if (!moduleDef) {
+    const baseDefinition = MODULE_MAP[moduleName];
+    if (!baseDefinition) {
       writeCliError(chalk.red(cliM("cli_addUnknownModule", { params: { module: moduleName } })));
       writeCliMessage(cliM("cli_addAvailableModules", { params: { modules: Object.keys(MODULE_MAP).join(", ") } }));
       return;
     }
+    const selected = baseDefinition.configKey === "db" ? "db" : moduleName;
+    const moduleDef = { ...baseDefinition, deps: resolveFeatureDependencies([selected]).filter((feature) => feature !== selected) };
     const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-S2YH642Z.js');
-    if (moduleDef.packages.every((p) => project.haiPackages.includes(p))) {
+    const allPackages = new Set(moduleDef.packages);
+    for (const dep of moduleDef.deps) {
+      for (const name of MODULE_MAP[dep]?.packages ?? [])
+        allPackages.add(name);
+    }
+    const pkgPath = path2.join(cwd, "package.json");
+    const pkg = await fse.readJson(pkgPath);
+    if (!pkg.dependencies)
+      pkg.dependencies = {};
+    const existingHaiSpecifier = Object.entries(pkg.dependencies).find(([pkgName]) => pkgName.startsWith("@h-ai/"))?.[1];
+    const depVersion = existingHaiSpecifier === "catalog:" ? "catalog:" : getCliVersion();
+    let catalogUpdated = false;
+    if (depVersion === "catalog:") {
+      let workspaceRoot = path2.resolve(cwd);
+      while (!await fileExists(path2.join(workspaceRoot, "pnpm-workspace.yaml"))) {
+        const parent = path2.dirname(workspaceRoot);
+        if (parent === workspaceRoot) {
+          workspaceRoot = path2.resolve(cwd);
+          break;
+        }
+        workspaceRoot = parent;
+      }
+      const workspacePath = path2.join(workspaceRoot, "pnpm-workspace.yaml");
+      const document = parseDocument(await fileExists(workspacePath) ? await fse.readFile(workspacePath, "utf8") : "packages: []\n");
+      const currentVersion = document.getIn(["catalog", "@h-ai/core"]);
+      const version = typeof currentVersion === "string" && /^[~^]?\d+\.\d+\.\d+/.test(currentVersion) ? currentVersion : getCliVersion();
+      const dependencies = { ...pkg.dependencies, ...pkg.devDependencies };
+      const names = [.../* @__PURE__ */ new Set([...allPackages, ...Object.keys(dependencies).filter((name) => name.startsWith("@h-ai/") && dependencies[name] === "catalog:")])].filter((name) => !document.hasIn(["catalog", name]));
+      for (const name of names)
+        document.setIn(["catalog", name], version);
+      if (names.length > 0) {
+        await writeFile(workspacePath, document.toString());
+        catalogUpdated = true;
+      }
+    }
+    if (!catalogUpdated && [...allPackages].every((p) => project.haiPackages.includes(p))) {
       if (moduleName === "deploy")
         await ensureDeployConfig(cwd);
       const generatedFiles2 = await generateProjectAiSupport(
@@ -2367,24 +2404,7 @@ async function addModule(options) {
       }
       return;
     }
-    const allPackages = new Set(moduleDef.packages);
-    if (moduleDef.deps) {
-      for (const dep of moduleDef.deps) {
-        const depDef = MODULE_MAP[dep];
-        if (depDef) {
-          for (const pkg2 of depDef.packages) {
-            allPackages.add(pkg2);
-          }
-        }
-      }
-    }
     spinner.start(cliM("cli_addUpdateManifest"));
-    const pkgPath = path2.join(cwd, "package.json");
-    const pkg = await fse.readJson(pkgPath);
-    if (!pkg.dependencies)
-      pkg.dependencies = {};
-    const existingHaiSpecifier = Object.entries(pkg.dependencies).find(([pkgName]) => pkgName.startsWith("@h-ai/"))?.[1];
-    const depVersion = existingHaiSpecifier === "catalog:" ? "catalog:" : getCliVersion();
     for (const pkgName of allPackages) {
       if (pkgName === "@h-ai/deploy") {
         pkg.devDependencies ??= {};
@@ -2409,16 +2429,14 @@ async function addModule(options) {
         writeCliMessage(chalk.gray(cliM("cli_addConfigExists", { params: { config: moduleDef.configKey } })));
       }
     }
-    if (moduleDef.deps) {
-      for (const dep of moduleDef.deps) {
-        const depDef = MODULE_MAP[dep];
-        if (depDef?.configKey) {
-          const depConfigPath = path2.join(cwd, "config", `_${depDef.configKey}.yml`);
-          if (!await fileExists(depConfigPath)) {
-            const content = generateConfigFile(depDef.configKey);
-            await writeFile(depConfigPath, content);
-            writeCliMessage(chalk.gray(cliM("cli_addDependencyConfig", { params: { config: depDef.configKey } })));
-          }
+    for (const dep of moduleDef.deps) {
+      const depDef = MODULE_MAP[dep];
+      if (depDef?.configKey) {
+        const depConfigPath = path2.join(cwd, "config", `_${depDef.configKey}.yml`);
+        if (!await fileExists(depConfigPath)) {
+          const content = generateConfigFile(depDef.configKey);
+          await writeFile(depConfigPath, content);
+          writeCliMessage(chalk.gray(cliM("cli_addDependencyConfig", { params: { config: depDef.configKey } })));
         }
       }
     }
@@ -2440,7 +2458,7 @@ async function addModule(options) {
     const previousProduction = await fileExists(productionPath) ? await fse.readFile(productionPath, "utf8") : "";
     const configured = new Set([...previousProduction.matchAll(/^([A-Z][A-Z0-9_]*)=/gm)].map((match) => match[1]));
     const previousValues = parseEnv(previousProduction);
-    const production = generateProductionEnvironment([moduleName, ...moduleDef.deps ?? []], previousValues.HAI_DB_TYPE === "mysql" ? { db: { type: "mysql", database: previousValues.HAI_DB_DATABASE } } : void 0).split("\n").filter((line) => !/^[A-Z][A-Z0-9_]*=/.test(line) || !configured.has(line.split("=")[0]));
+    const production = generateProductionEnvironment([selected, ...moduleDef.deps], previousValues.HAI_DB_TYPE === "mysql" ? { db: { type: "mysql", database: previousValues.HAI_DB_DATABASE } } : void 0).split("\n").filter((line) => !/^[A-Z][A-Z0-9_]*=/.test(line) || !configured.has(line.split("=")[0]));
     await writeFile(productionPath, `${previousProduction.trimEnd()}
 
 ${production.join("\n")}`);
@@ -2770,11 +2788,7 @@ function staticCompileEnvironment(target) {
 function sourceCommit(cwd) {
   try {
     const options = { cwd, encoding: "utf8", stdio: "pipe", windowsHide: true };
-    const root = execFileSync("git", ["rev-parse", "--show-toplevel"], options).trim();
-    const manifest = relative(root, join(cwd, "package.json")).replaceAll("\\", "/");
-    if (manifest.startsWith("../"))
-      return "unknown";
-    execFileSync("git", ["ls-files", "--error-unmatch", "--", manifest], { ...options, cwd: root });
+    execFileSync("git", ["--literal-pathspecs", "ls-files", "--error-unmatch", "--", "package.json"], options);
     const commit = execFileSync("git", ["rev-parse", "HEAD"], options).trim();
     return /^(?:[a-f\d]{40}|[a-f\d]{64})$/i.test(commit) ? commit : "unknown";
   } catch {
@@ -3322,7 +3336,7 @@ async function deployCommand(options) {
         localModule = localRequire.resolve("@h-ai/deploy");
       } catch {
       }
-      deployModule = localModule ? await import(pathToFileURL(localModule).href) : await import('./src-CX5IJGYM.js');
+      deployModule = localModule ? await import(pathToFileURL(localModule).href) : await import('./src-IW4CY2IN.js');
     } catch {
       writeCliError(chalk.red(cliM("cli_deploy_module_missing")));
       writeCliMessage(chalk.cyan("  pnpm add -D @h-ai/deploy"));