@h-ai/cli 1.0.0-beta.17 → 1.0.0-beta.18

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

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

package/dist/{cli-config-templates-MKVYSK3E.js.map → cli-config-templates-QG5HOYR5.js.map}

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

package/dist/{cli-skill-templates-M64VPXZ4.js → cli-skill-templates-W4I6ZKYW.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-export { generateModuleSkillFile, generateProjectAiSupport, generateSkillFiles, resolveCompatibleSkillNames, resolveSkillNamesForPackages } from './chunk-EWTIVFHN.js';
+export { generateModuleSkillFile, generateProjectAiSupport, generateSkillFiles, resolveCompatibleSkillNames, resolveSkillNamesForPackages } from './chunk-6YZBC5MO.js';
 import './chunk-ZSDEVXZ7.js';
-//# sourceMappingURL=cli-skill-templates-M64VPXZ4.js.map
-//# sourceMappingURL=cli-skill-templates-M64VPXZ4.js.map
+//# sourceMappingURL=cli-skill-templates-W4I6ZKYW.js.map
+//# sourceMappingURL=cli-skill-templates-W4I6ZKYW.js.map

package/dist/{cli-skill-templates-M64VPXZ4.js.map → cli-skill-templates-W4I6ZKYW.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"cli-skill-templates-M64VPXZ4.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"cli-skill-templates-W4I6ZKYW.js"}

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { generateConfigFile, runtimeEnvironmentVariables, renderEnvironment, generateProductionEnvironment, moduleEnvironmentVariables, documentConfig, parameterizeConfig } from './chunk-S2ZP7BHG.js';
-import { cliM } from './chunk-EWTIVFHN.js';
+import { generateConfigFile, runtimeEnvironmentVariables, renderEnvironment, generateProductionEnvironment, moduleEnvironmentVariables, documentConfig, parameterizeConfig } from './chunk-7NVRYYHN.js';
+import { cliM } from './chunk-6YZBC5MO.js';
 import { __commonJS, __export, __toESM } from './chunk-ZSDEVXZ7.js';
 import process14 from 'process';
 import { cac } from 'cac';
@@ -4133,7 +4133,7 @@ async function createProject(options) {
     });
     await generateFromTemplates(projectPath, context);
     {
-      const { generateConfigFile: generateConfigFile2, generateEnvExample, generateProductionEnvironment: generateProductionEnvironment2 } = await import('./cli-config-templates-MKVYSK3E.js');
+      const { generateConfigFile: generateConfigFile2, generateEnvExample, generateProductionEnvironment: generateProductionEnvironment2 } = await import('./cli-config-templates-QG5HOYR5.js');
       const configs = resolvedOptions.moduleConfigs;
       const isApiWorkspace = resolvedOptions.appType === "api";
       const isFullstack = resolvedOptions.appType === "fullstack";
@@ -4218,7 +4218,7 @@ HAI_CRYPTO_TRANSPORT_SERVERKEYRING='${JSON.stringify(ring)}'
       }
       await fse.writeFile(path2.join(envDirectory, ".env.local"), "# \u672C\u673A\u901A\u7528\u79C1\u6709\u8986\u76D6\uFF0C\u4E0D\u63D0\u4EA4 Git\uFF1B\u521D\u59CB\u5BC6\u7801\u548C\u4F20\u8F93\u5BC6\u94A5\u73AF\u5206\u522B\u4F4D\u4E8E .env.dev.local / .env.test.local / .env.prod.local\u3002\n", { mode: 384 });
     }
-    const { generateSkillFiles } = await import('./cli-skill-templates-M64VPXZ4.js');
+    const { generateSkillFiles } = await import('./cli-skill-templates-W4I6ZKYW.js');
     await generateSkillFiles(
       projectPath,
       resolvedOptions.features,
@@ -5199,7 +5199,7 @@ async function addModule(options) {
     }
     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-M64VPXZ4.js');
+    const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-W4I6ZKYW.js');
     const allPackages = new Set(moduleDef.packages);
     for (const dep of moduleDef.deps) {
       for (const name of MODULE_MAP[dep]?.packages ?? [])
@@ -25004,6 +25004,13 @@ external_exports.object({
   appVersion: external_exports.string().max(80).regex(/^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[0-9a-z-]+(?:\.[0-9a-z-]+)*)?(?:\+[0-9a-z-]+(?:\.[0-9a-z-]+)*)?$/i),
   /** 本次构建标识；同一应用版本允许重复构建。 */
   buildId: external_exports.string().max(128).regex(/^[a-z0-9][\w.+-]*$/i),
+  /** 构建启动时观察到的 Git 来源；历史清单可以省略。 */
+  source: external_exports.object({
+    /** 工程 package.json 所在仓库的提交 SHA；无法确定时为 unknown。 */
+    commit: external_exports.string().regex(/^(?:[a-f0-9]{40}|[a-f0-9]{64}|unknown)$/),
+    /** 工程目录有未提交改动时为 true；无法检查时为 null。 */
+    dirty: external_exports.boolean().nullable()
+  }).optional(),
   /** 只包含所选镜像的构建不能用于首次安装。 */
   partial: external_exports.boolean().default(false),
   /** 是否包含浏览器端；仅构建 serv 时也保留完整工程的 Web 拓扑。 */
@@ -25024,6 +25031,8 @@ external_exports.object({
     imageRef: external_exports.string().regex(/^[a-z0-9][a-z0-9./:_-]*:[a-z0-9_][a-z0-9_.-]*$/).refine((value) => !value.endsWith(":latest")),
     /** tar 内容的 SHA-256，用于部署前校验。 */
     sha256: external_exports.string().regex(/^[a-f0-9]{64}$/),
+    /** 引擎实际构建的镜像 OS/架构；历史清单可以省略。 */
+    platform: external_exports.string().regex(/^[a-z0-9][a-z0-9_.-]*\/[a-z0-9][a-z0-9_.-]*$/).optional(),
     /** 容器内部监听端口；服务器公开端口由部署选择。 */
     containerPort: external_exports.number().int().min(1).max(65535).optional()
   })).min(1).max(2).refine((images) => new Set(images.map((image) => image.name)).size === images.length)
@@ -26956,7 +26965,7 @@ function buildProxyArguments(proxy, runtime, network) {
   }
   return Object.entries(environment).flatMap(([key, value]) => ["--build-arg", `${key}=${value}`]);
 }
-async function preflightDownloadProxy(runtime, proxy) {
+async function preflightDownloadProxy(runtime, proxy, report = writeCliMessage) {
   const environment = resolveDownloadProxy(proxy);
   for (const value of new Set([environment.HTTP_PROXY, environment.HTTPS_PROXY].filter(Boolean))) {
     const url2 = new URL(value);
@@ -26980,12 +26989,12 @@ async function preflightDownloadProxy(runtime, proxy) {
   for (const candidate of runtime === "auto" ? ["podman", "docker"] : [runtime]) {
     try {
       const data = JSON.parse(execFileSync(candidate, ["info", "--format", "{{json .}}"], { encoding: "utf8", windowsHide: true, timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }));
-      writeCliMessage(cliM(candidate === "docker" && (data.HTTPProxy || data.HTTPSProxy) ? "cli_download_engine_proxy_configured" : candidate === "podman" && !data.host?.serviceIsRemote ? "cli_download_engine_proxy_local" : "cli_download_engine_proxy_hint", { params: { runtime: candidate } }));
+      report(cliM(candidate === "docker" && (data.HTTPProxy || data.HTTPSProxy) ? "cli_download_engine_proxy_configured" : candidate === "podman" && !data.host?.serviceIsRemote ? "cli_download_engine_proxy_local" : "cli_download_engine_proxy_hint", { params: { runtime: candidate } }));
       return;
     } catch {
     }
   }
-  writeCliMessage(cliM("cli_download_engine_proxy_hint", { params: { runtime } }));
+  report(cliM("cli_download_engine_proxy_hint", { params: { runtime } }));
 }
 function validateDownloadDockerfile(file2, downloads) {
   const content = readFileSync(file2, "utf8");
@@ -27389,7 +27398,7 @@ async function forwardWindowsBuildOutput(source, destination) {
 }
 
 // src/commands/cli-build.ts
-async function run(command, args, cwd, quiet = false, identity, compileEnvironment) {
+async function run(command, args, cwd, quiet = false, identity, compileEnvironment, progressOnStderr = false) {
   await new Promise((resolve16, reject) => {
     const env = Object.fromEntries(Object.entries(process14.env).filter(([key]) => !/^(?:HAI_|PUBLIC_|VITE_)/.test(key)));
     Object.assign(env, compileEnvironment);
@@ -27406,11 +27415,12 @@ async function run(command, args, cwd, quiet = false, identity, compileEnvironme
     if (env.CI === "1" || env.CI === "0")
       env.CI = env.CI === "1" ? "true" : "false";
     const windowsOutput = !quiet && process14.platform === "win32";
-    const child = spawn(command, args, { cwd, env, windowsHide: true, stdio: quiet ? "ignore" : windowsOutput ? ["inherit", "pipe", "pipe"] : "inherit", shell: false });
+    const stdio = quiet ? "ignore" : windowsOutput ? ["inherit", "pipe", "pipe"] : progressOnStderr ? ["inherit", process14.stderr, "inherit"] : "inherit";
+    const child = spawn(command, args, { cwd, env, windowsHide: true, stdio, shell: false });
     let output2 = Promise.resolve();
     if (windowsOutput && child.stdout && child.stderr) {
       output2 = Promise.all([
-        forwardWindowsBuildOutput(child.stdout, process14.stdout),
+        forwardWindowsBuildOutput(child.stdout, progressOnStderr ? process14.stderr : process14.stdout),
         forwardWindowsBuildOutput(child.stderr, process14.stderr)
       ]).then(() => void 0);
       void output2.catch(() => child.kill());
@@ -27460,11 +27470,44 @@ function sourceCommit(cwd) {
     const options = { cwd, encoding: "utf8", stdio: "pipe", windowsHide: true };
     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";
+    return /^(?:[a-f\d]{40}|[a-f\d]{64})$/i.test(commit) ? commit.toLowerCase() : "unknown";
   } catch {
     return "unknown";
   }
 }
+function sourceDirty(cwd, commit) {
+  if (commit === "unknown")
+    return null;
+  try {
+    const status = execFileSync("git", ["--no-optional-locks", "-c", "core.fsmonitor=false", "status", "--porcelain=v2", "--branch", "--untracked-files=normal", "--", "."], {
+      cwd,
+      encoding: "utf8",
+      stdio: "pipe",
+      windowsHide: true,
+      timeout: 15e3
+    }).trim().split(/\r?\n/);
+    if (status[0] !== `# branch.oid ${commit}`)
+      return null;
+    return status.some((line) => !line.startsWith("# "));
+  } catch {
+    return null;
+  }
+}
+function imagePlatform(runtime, image, cwd) {
+  try {
+    const platform = execFileSync(runtime, ["image", "inspect", "--format", "{{.Os}}/{{.Architecture}}", image], {
+      cwd,
+      encoding: "utf8",
+      stdio: "pipe",
+      windowsHide: true,
+      timeout: 15e3
+    }).trim();
+    if (/^[a-z0-9][a-z0-9_.-]*\/[a-z0-9][a-z0-9_.-]*$/.test(platform))
+      return platform;
+  } catch {
+  }
+  throw new Error(cliM("cli_build_image_platform_invalid"));
+}
 async function buildRuntime(cwd, choice) {
   const candidates = choice && choice !== "auto" ? [choice] : ["podman", "docker"];
   if (candidates.every((candidate) => candidate === "podman" || candidate === "docker")) {
@@ -27491,7 +27534,7 @@ async function buildCommand(options) {
   const containerAndroid = target === "app" && options.platform === "android" && options.runtime !== void 0;
   if (target === "app" && options.platform === "ios" && options.runtime !== void 0)
     throw new Error(cliM("cli_build_ios_runtime"));
-  if (target !== "image" && (options.images !== void 0 || options.concurrency !== void 0 || options.sqlitePrebuildMirror !== void 0) || target !== "image" && !containerAndroid && (options.runtime !== void 0 || options.network !== void 0 || options.httpProxy === false || options.imageSource !== void 0 || options.imageMirrors !== void 0 || options.npmSource !== void 0 || options.npmRegistry !== void 0 || options.proxyMode !== void 0 || options.proxyUrl !== void 0 || options.proxyBypass !== void 0) || !["desktop", "app"].includes(target) && (options.platform !== void 0 || options.debug !== void 0) || target !== "desktop" && options.arch !== void 0) {
+  if (target !== "image" && (options.images !== void 0 || options.concurrency !== void 0 || options.sqlitePrebuildMirror !== void 0 || options.json) || target !== "image" && !containerAndroid && (options.runtime !== void 0 || options.network !== void 0 || options.httpProxy === false || options.imageSource !== void 0 || options.imageMirrors !== void 0 || options.npmSource !== void 0 || options.npmRegistry !== void 0 || options.proxyMode !== void 0 || options.proxyUrl !== void 0 || options.proxyBypass !== void 0) || !["desktop", "app"].includes(target) && (options.platform !== void 0 || options.debug !== void 0) || target !== "desktop" && options.arch !== void 0) {
     throw new Error(cliM("cli_build_options_invalid"));
   }
   if (target === "compile") {
@@ -27581,17 +27624,18 @@ async function buildCommand(options) {
     if (!existsSync(resolve(cwd, image.dockerfile)))
       throw new Error(cliM("cli_build_dockerfile_missing", { params: { path: image.dockerfile } }));
   }
-  const downloads = await resolveBuildDownloads(cwd, options);
+  const { buildId, commit } = identity;
+  const artifact = { version: 4, primaryService: config2.images.some((image) => image.name === "serv") ? "serv" : "web", appVersion, buildId, source: { commit, dirty: sourceDirty(cwd, commit) }, partial: images.length !== config2.images.length, hasWeb: config2.images.some((image) => image.name === "web"), images: [] };
+  const downloads = await resolveBuildDownloads(cwd, options.json ? { ...options, yes: true } : options);
   for (const image of images) validateDownloadDockerfile(resolve(cwd, image.dockerfile), downloads);
   const runtime = await buildRuntime(cwd, options.runtime);
-  await preflightDownloadProxy(runtime, downloads.proxy);
+  await preflightDownloadProxy(runtime, downloads.proxy, options.json ? (message) => process14.stderr.write(`${message}
+`) : void 0);
   if (options.sqlitePrebuildMirror) {
     const url2 = new URL(options.sqlitePrebuildMirror);
     if (!["http:", "https:"].includes(url2.protocol) || url2.username || url2.password || url2.search || url2.hash)
       throw new Error(cliM("cli_build_mirror_invalid"));
   }
-  const { buildId, commit } = identity;
-  const artifact = { version: 4, primaryService: config2.images.some((image) => image.name === "serv") ? "serv" : "web", appVersion, buildId, partial: images.length !== config2.images.length, hasWeb: config2.images.some((image) => image.name === "web"), images: [] };
   if (webBasePath) {
     artifact.version = 5;
     artifact.webBasePath = webBasePath;
@@ -27604,6 +27648,7 @@ async function buildCommand(options) {
   mkdirSync(parent, { recursive: true });
   const staging = mkdtempSync(join(parent, ".building-"));
   const built = [];
+  const runImage = (args) => run(runtime, args, cwd, false, void 0, void 0, options.json);
   try {
     for (const context of new Set(images.map((image) => resolve(cwd, image.context ?? "."))))
       prepareDependencyInputs(context);
@@ -27643,13 +27688,14 @@ async function buildCommand(options) {
       if (image.name === "web" && compileEnvironment.PUBLIC_BASE_PATH)
         args.push("--build-arg", `PUBLIC_BASE_PATH=${compileEnvironment.PUBLIC_BASE_PATH}`);
       built.push(imageRef);
-      await run(runtime, [...args, context], cwd);
+      await runImage([...args, context]);
+      const platform = imagePlatform(runtime, imageRef, cwd);
       const file2 = `${image.name}-${appVersion}.tar`;
-      await run(runtime, ["save", ...runtime === "podman" ? ["--format", "docker-archive"] : [], "-o", join(staging, file2), imageRef], cwd);
+      await runImage(["save", ...runtime === "podman" ? ["--format", "docker-archive"] : [], "-o", join(staging, file2), imageRef]);
       const hash2 = createHash("sha256");
       for await (const chunk of createReadStream(join(staging, file2)))
         hash2.update(chunk);
-      return { name: image.name, file: file2, imageRef, sha256: hash2.digest("hex"), ...image.containerPort ? { containerPort: image.containerPort } : {} };
+      return { name: image.name, file: file2, imageRef, sha256: hash2.digest("hex"), platform, ...image.containerPort ? { containerPort: image.containerPort } : {} };
     };
     for (let offset = 0; offset < images.length; offset += concurrency) {
       const results = await Promise.allSettled(images.slice(offset, offset + concurrency).map(buildImage));
@@ -27667,7 +27713,12 @@ async function buildCommand(options) {
     writeFileSync(join(parent, `latest-${buildId}`), `${batch}
 `);
     renameSync(join(parent, `latest-${buildId}`), join(parent, "latest"));
-    writeCliMessage(cliM("cli_build_ready", { params: { path: output2, runtime } }));
+    if (options.json) {
+      process14.stdout.write(`${JSON.stringify({ schemaVersion: 1, artifactDir: output2, manifestPath: join(output2, "manifest.json"), manifest: artifact })}
+`);
+    } else {
+      writeCliMessage(cliM("cli_build_ready", { params: { path: output2, runtime } }));
+    }
   } catch (error62) {
     for (const imageRef of built) {
       try {
@@ -29860,7 +29911,7 @@ async function initProject(options) {
     const { project, existing, missing } = result;
     spinner.succeed(cliM("cli_initDetected", { params: { name: chalk.cyan(project.name) } }));
     if (project.isHaiProject) {
-      const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-M64VPXZ4.js');
+      const { generateProjectAiSupport, resolveSkillNamesForPackages } = await import('./cli-skill-templates-W4I6ZKYW.js');
       const generatedFiles = await generateProjectAiSupport(cwd, resolveSkillNamesForPackages(project.haiPackages), {
         overwriteSkills: false,
         overwriteBridgeFiles: false
@@ -30167,11 +30218,15 @@ cli.command("generate [type] [name]", cliM("cli_help_generate")).option("-w, --w
     process14.exit(1);
   }
 });
-cli.command("build", cliM("cli_help_build")).option("--target <target>", cliM("cli_help_target")).option("--images <names>", cliM("cli_help_images")).option("--concurrency <count>", cliM("cli_help_buildConcurrency")).option("--runtime <runtime>", cliM("cli_help_buildRuntime")).option("--network <network>", cliM("cli_help_buildNetwork")).option("--platform <platform>", cliM("cli_help_platform")).option("--arch <arch>", cliM("cli_help_arch")).option("--debug", cliM("cli_help_buildDebug")).option("--sqlite-prebuild-mirror <url>", cliM("cli_help_sqliteMirror")).option("--no-http-proxy", cliM("cli_help_noHttpProxy")).option("-y, --yes", cliM("cli_help_deployYes")).option("--image-source <source>", cliM("cli_help_imageSource")).option("--image-mirrors <mappings>", cliM("cli_help_imageMirrors")).option("--npm-source <source>", cliM("cli_help_npmSource")).option("--npm-registry <url>", cliM("cli_help_npmRegistry")).option("--proxy-mode <mode>", cliM("cli_help_proxyMode")).option("--proxy-url <url>", cliM("cli_help_proxyUrl")).option("--proxy-bypass <hosts>", cliM("cli_help_proxyBypass")).action(async (options) => {
+cli.command("build", cliM("cli_help_build")).option("--target <target>", cliM("cli_help_target")).option("--json", cliM("cli_help_buildJson")).option("--images <names>", cliM("cli_help_images")).option("--concurrency <count>", cliM("cli_help_buildConcurrency")).option("--runtime <runtime>", cliM("cli_help_buildRuntime")).option("--network <network>", cliM("cli_help_buildNetwork")).option("--platform <platform>", cliM("cli_help_platform")).option("--arch <arch>", cliM("cli_help_arch")).option("--debug", cliM("cli_help_buildDebug")).option("--sqlite-prebuild-mirror <url>", cliM("cli_help_sqliteMirror")).option("--no-http-proxy", cliM("cli_help_noHttpProxy")).option("-y, --yes", cliM("cli_help_deployYes")).option("--image-source <source>", cliM("cli_help_imageSource")).option("--image-mirrors <mappings>", cliM("cli_help_imageMirrors")).option("--npm-source <source>", cliM("cli_help_npmSource")).option("--npm-registry <url>", cliM("cli_help_npmRegistry")).option("--proxy-mode <mode>", cliM("cli_help_proxyMode")).option("--proxy-url <url>", cliM("cli_help_proxyUrl")).option("--proxy-bypass <hosts>", cliM("cli_help_proxyBypass")).action(async (options) => {
   try {
     await buildCommand(options);
   } catch (error62) {
-    writeCliMessage(error62 instanceof Error ? error62.message : String(error62));
+    const message = error62 instanceof Error ? error62.message : String(error62);
+    if (options.json)
+      writeCliError(message);
+    else
+      writeCliMessage(message);
     process14.exitCode = 1;
   }
 });