@lazycatcloud/lzc-cli 1.3.14 → 2.0.0-pre.0

package/README.md

@@ -17,19 +17,44 @@ lzc-cli completion >> ~/.zshrc
 下面开始使用 `lzc-cli` 去创建一个项目吧!
 
 ```bash
+# 在新目录创建项目（交互选择模板）
 lzc-cli project create you_project
 
-# 构建懒猫云平台lpk包
-lzc-cli project build
+# 在当前目录初始化空白项目
+lzc-cli project create --in-place
+
+# 构建 release lpk 包（优先 lzc-build.release.yml，不存在则回退 lzc-build.yml）
+lzc-cli project release
 
 # 将lpk包安装到盒子中去
-lzc-cli app install
+lzc-cli lpk install
+
+# 部署后默认自动启动
+lzc-cli project deploy
 
-# 使用 devshell 可以让你在盒子中开发调试
-lzc-cli project devshell
+# 进入运行容器调试
+lzc-cli project exec /bin/sh
 
 # 经过测试后，将包发布到懒猫云商店中去
 lzc-cli appstore publish
 ```
 
 [changelog](./changelog.md)
+
+#### box add-by-ssh 远端直连模式
+
+当运行环境无法使用 `hclient` 时，可通过 `box add-by-ssh` 配置远端 ssh 目标，由 `lzc-cli` 直连 `lzcos ssh` 并在远端执行 debug bridge 命令。
+
+示例：
+
+```bash
+lzc-cli box add-by-ssh root 192.168.31.13
+```
+
+说明：
+
+1. 参数格式为 `loginUser address`，地址支持 `host` 或 `host:port`
+2. 配置后会自动设为默认盒子，可通过 `box list/switch/default` 管理
+3. `project release/deploy/start/exec/cp/log/info`、`lpk install/uninstall`、`docker/docker-compose` 都会优先使用该远端
+4. `lzc-build.yml` 不再支持 `remote` 字段
+5. 可选基础配置文件为 `lzc-build.base.yml`（与构建配置同目录）

package/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.0-pre.0
+
+1. Add lpkv2 features for internal testing
+
 ## [1.3.14](https://gitee.com/linakesi/lzc-cli/compare/v1.3.13...v1.3.14) (2025-12-17)
 
 

package/lib/app/index.js

@@ -1,7 +1,13 @@
 import path from 'node:path';
-import lpkCreate from './lpk_create.js';
+import lpkCreate, { listProjectTemplateValues, normalizeTemplateType } from './lpk_create.js';
 import { LpkBuild } from './lpk_build.js';
 import { AppDevShell } from './lpk_devshell.js';
+import { projectExecCommand } from './project_exec.js';
+import { projectCpCommand } from './project_cp.js';
+import { projectLogCommand } from './project_log.js';
+import { projectInfoCommand } from './project_info.js';
+import { projectStartCommand } from './project_start.js';
+import { projectDeployCommand } from './project_deploy.js';
 import { LpkInstaller, installConfig } from './lpk_installer.js';
 import logger from 'loglevel';
 import { sleep, checkRsync } from '../utils.js';
@@ -9,28 +15,110 @@ import { DebugBridge } from '../debug_bridge.js';
 import shellApi from '../shellapi.js';
 import { generate } from './lpk_create_generator.js';
 import { t } from '../i18n/index.js';
+import { resolveBuildRemoteFromFile } from '../build_remote.js';
+import { resolveProjectReleaseConfigPath } from './project_runtime.js';
+
+async function installLpk(pkgPath, apk) {
+	if (!resolveBuildRemoteFromFile(process.cwd())) {
+		await shellApi.init();
+	}
+	installConfig.apk = apk == 'y';
+
+	const installPath = pkgPath ?? process.cwd();
+	const installer = new LpkInstaller();
+	await installer.init();
+	await installer.install(installPath);
+}
+
+async function uninstallLpk(pkgId, deleteData) {
+	const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+	if (!buildRemote) {
+		await shellApi.init();
+	}
+
+	const bridge = new DebugBridge(process.cwd(), buildRemote);
+	await bridge.init();
+	await bridge.uninstall(pkgId, deleteData);
+	logger.debug(`default lcmd device: ${bridge.boxname} , uninstall the app ${pkgId} finish`);
+}
+
+function lpkInstallSubCommand({ desc }) {
+	return {
+		command: 'install [pkgPath]',
+		desc,
+		builder: (args) => {
+			args.option('apk', {
+				describe: t('lzc_cli.lib.app.index.lpk_cmd_index_rags_apk_desc', '是否生成APK(y/n)'),
+				type: 'string',
+				default: 'y',
+			});
+		},
+		handler: async ({ pkgPath, apk }) => {
+			await installLpk(pkgPath, apk);
+		},
+	};
+}
+
+function lpkUninstallSubCommand({ desc }) {
+	return {
+		command: 'uninstall <pkgId>',
+		desc,
+		builder: (args) => {
+			args.option('delete-data', {
+				describe: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_rags_delete_data_desc', '删除应用数据 ⚠️ 警告: 应用数据删除后无法恢复'),
+				type: 'boolean',
+				default: false,
+			});
+		},
+		handler: async ({ pkgId, deleteData }) => {
+			await uninstallLpk(pkgId, deleteData);
+		},
+	};
+}
 
 export function lpkProjectCommand(program) {
 	let subCommands = [
 		{
-			command: 'init',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_init_desc', '初始化懒猫云应用(提供最基础的模板)'),
-			handler: async () => {
-				generate('blank', './');
-				logger.info(t('lzc_cli.lib.app.index.lpk_cmd_init_success', '应用初始化完成'));
-			},
-		},
-		{
-			command: 'create <name>',
+			command: 'create [name]',
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_create_desc', '创建懒猫云应用'),
-			handler: async ({ name }) => {
-				name = String(name);
-				await lpkCreate(name);
+			builder: (args) => {
+				args.option('in-place', {
+					describe: 'Initialize current directory with blank template',
+					type: 'boolean',
+					default: false,
+				});
+				args.option('t', {
+					alias: 'template',
+					describe: `Template name (${listProjectTemplateValues().join(', ')})`,
+					type: 'string',
+				});
+			},
+			handler: async ({ name, inPlace, template }) => {
+				if (name && inPlace) {
+					throw new Error('--in-place cannot be used with <name>.');
+				}
+				const normalizedTemplate = normalizeTemplateType(template);
+				if (name) {
+					name = String(name);
+					await lpkCreate(name, process.cwd(), normalizedTemplate);
+					return;
+				}
+
+				if (inPlace) {
+					if (normalizedTemplate) {
+						throw new Error('--template cannot be used with --in-place.');
+					}
+					generate('blank', './');
+					logger.info(t('lzc_cli.lib.app.index.lpk_cmd_init_success', '应用初始化完成'));
+					return;
+				}
+
+				throw new Error('Project name is required unless --in-place is used.');
 			},
 		},
 		{
 			command: 'build [context]',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_build_desc', '构建'),
+			desc: false,
 			builder: (args) => {
 				args.option('o', {
 					alias: 'output',
@@ -58,9 +146,41 @@ export function lpkProjectCommand(program) {
 				await lpk.exec();
 			},
 		},
+		{
+			command: 'release [context]',
+			desc: 'Build release package',
+			builder: (args) => {
+				args.option('o', {
+					alias: 'output',
+					describe: t('lzc_cli.lib.app.index.lpk_cmd_build_args_output_desc', '输出文件'),
+					type: 'string',
+				});
+				args.option('f', {
+					alias: 'file',
+					describe: t('lzc_cli.lib.app.index.lpk_cmd_build_args_file_desc', '指定构建的lzc-build.yml文件'),
+					type: 'string',
+				});
+			},
+			handler: async ({ context, output, file }) => {
+				const cwd = context ? path.resolve(context) : process.cwd();
+				const configPath = resolveProjectReleaseConfigPath(cwd, file);
+				const projectCwd = path.dirname(configPath);
+				const configName = path.basename(configPath);
+				const lpk = await new LpkBuild(projectCwd, configName).init();
+				lpk.onBeforeBuildPackage(async (options) => {
+					delete options['devshell'];
+
+					if (output) {
+						options['lpkPath'] = output;
+					}
+					return options;
+				});
+				await lpk.exec();
+			},
+		},
 		{
 			command: 'devshell [context]',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_devshell_desc', '进入盒子的开发环境'),
+			desc: false,
 			builder: (args) => {
 				args.option('f', {
 					alias: 'force',
@@ -84,12 +204,16 @@ export function lpkProjectCommand(program) {
 				});
 			},
 			handler: async ({ context, force, config, contentdir, apk }) => {
-				await shellApi.init();
+				logger.warn('project devshell is deprecated. Use "project deploy", "project start", "project exec", "project cp", and "project log" instead.');
+				const cwd = context ? path.resolve(context) : process.cwd();
+				const buildRemote = resolveBuildRemoteFromFile(cwd, config);
+				if (!buildRemote) {
+					await shellApi.init();
+				}
 				// 检测 rsync 满足
 				await checkRsync();
 
 				installConfig.apk = apk == 'y';
-				const cwd = context ? path.resolve(context) : process.cwd();
 				const lpkBuild = await new LpkBuild(cwd, config).init();
 				lpkBuild.onBeforeBuildPackage(async (options) => {
 					// devshell 正常情况下，不需要执行 buildscript 和 contentdir 字段
@@ -109,6 +233,26 @@ export function lpkProjectCommand(program) {
 				await app.rsyncShell();
 			},
 		},
+		{
+			command: 'app',
+			desc: false,
+			builder: (args) => {
+				args.command([
+					lpkInstallSubCommand({
+						desc: false,
+					}),
+					lpkUninstallSubCommand({
+						desc: false,
+					}),
+				]);
+			},
+		},
+		projectExecCommand(),
+		projectCpCommand(),
+		projectLogCommand(),
+		projectInfoCommand(),
+		projectStartCommand(),
+		projectDeployCommand(),
 	];
 	program.command({
 		command: 'project',
@@ -121,52 +265,22 @@ export function lpkProjectCommand(program) {
 
 export function lpkAppCommand(program) {
 	let subCommands = [
-		{
-			command: 'install [pkgPath]',
+		lpkInstallSubCommand({
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_install_desc', '部署应用至设备, pkgPath 可以为路径，或者https://,http://请求地址, 如果不填写，将默认为当前目录下的lpk'),
-			builder: (args) => {
-				args.option('apk', {
-					describe: t('lzc_cli.lib.app.index.lpk_cmd_index_rags_apk_desc', '是否生成APK(y/n)'),
-					type: 'string',
-					default: 'y',
-				});
-			},
-			handler: async ({ pkgPath, apk }) => {
-				await shellApi.init();
-				installConfig.apk = apk == 'y';
-
-				pkgPath = pkgPath ?? process.cwd();
-				const installer = new LpkInstaller();
-				await installer.init();
-				await installer.install(pkgPath);
-			},
-		},
-		{
-			command: 'uninstall <pkgId>',
+		}),
+		lpkUninstallSubCommand({
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_desc', '从设备中卸载某一个应用'),
-			builder: (args) => {
-				args.option('delete-data', {
-					describe: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_rags_delete_data_desc', '删除应用数据 ⚠️ 警告: 应用数据删除后无法恢复'),
-					type: 'boolean',
-					default: false,
-				});
-			},
-			handler: async ({ pkgId, deleteData }) => {
-				await shellApi.init();
-
-				const bridge = new DebugBridge();
-				await bridge.init();
-				await bridge.uninstall(pkgId, deleteData);
-				logger.debug(`default lcmd device: ${bridge.boxname} , uninstall the app ${pkgId} finish`);
-			},
-		},
+		}),
 		{
 			command: 'status <pkgId>',
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_status_desc', '获取某一个应用的状态'),
 			handler: async ({ pkgId }) => {
-				await shellApi.init();
+				const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+				if (!buildRemote) {
+					await shellApi.init();
+				}
 
-				const bridge = new DebugBridge();
+				const bridge = new DebugBridge(process.cwd(), buildRemote);
 				await bridge.init();
 				const status = await bridge.status(pkgId);
 				console.log(status);
@@ -184,7 +298,9 @@ export function lpkAppCommand(program) {
 				});
 			},
 			handler: async () => {
-				await shellApi.init();
+				if (!resolveBuildRemoteFromFile(process.cwd())) {
+					await shellApi.init();
+				}
 
 				throw 'not yet realized';
 			},
@@ -192,7 +308,7 @@ export function lpkAppCommand(program) {
 	];
 	program.command({
 		command: 'app',
-		desc: t('lzc_cli.lib.app.index.lpk_cmd_app_desc', '应用管理'),
+		desc: false,
 		builder: async (args) => {
 			args.command(subCommands);
 		},

package/lib/app/lpk_build.js

@@ -1,8 +1,8 @@
 import path from 'node:path';
 import fs from 'node:fs';
+import zlib from 'node:zlib';
 import logger from 'loglevel';
 import {
-	loadFromYaml,
 	isDirExist,
 	isDirSync,
 	isFileExist,
@@ -19,7 +19,11 @@ import spawn from 'cross-spawn';
 import { LpkManifest } from './lpk_create.js';
 import archiver from 'archiver';
 import yaml from 'js-yaml';
+import { buildConfiguredImagesToTempDir } from './lpk_build_images.js';
+import { pipeline } from 'node:stream/promises';
 import { t } from '../i18n/index.js';
+import mergeWith from 'lodash.mergewith';
+import { DEFAULT_BUILD_BASE_FILE } from '../build_remote.js';
 
 async function archiveFolderTo(appDir, out, format = 'zip') {
 	return new Promise(async (resolve, reject) => {
@@ -46,6 +50,66 @@ async function archiveFolderTo(appDir, out, format = 'zip') {
 	});
 }
 
+async function gzipFileTo(inputPath, outputPath) {
+	const source = fs.createReadStream(inputPath);
+	const gzip = zlib.createGzip({ mtime: 0 });
+	const target = fs.createWriteStream(outputPath);
+	await pipeline(source, gzip, target);
+}
+
+function rewriteManifestEmbeddedImages(manifest, resolvedImageByAlias) {
+	const EMBED_PREFIX = 'embed:';
+	if (!resolvedImageByAlias || typeof resolvedImageByAlias !== 'object') {
+		return manifest;
+	}
+
+	const parseAlias = (rawValue) => {
+		const trimmed = String(rawValue ?? '').trim();
+		if (!trimmed.startsWith(EMBED_PREFIX)) {
+			return '';
+		}
+		const rest = trimmed.slice(EMBED_PREFIX.length).trim();
+		if (!rest) {
+			throw new Error(`Invalid image reference "${rawValue}", alias is required after "${EMBED_PREFIX}"`);
+		}
+		const at = rest.indexOf('@');
+		const alias = (at >= 0 ? rest.slice(0, at) : rest).trim();
+		if (!alias) {
+			throw new Error(`Invalid image reference "${rawValue}", alias is required after "${EMBED_PREFIX}"`);
+		}
+		return alias;
+	};
+
+	const walk = (value) => {
+		if (typeof value === 'string') {
+			const alias = parseAlias(value);
+			if (alias) {
+				const resolved = resolvedImageByAlias[alias];
+				if (!resolved) {
+					throw new Error(`Cannot resolve embedded image alias "${alias}" to final image reference`);
+				}
+				return `${EMBED_PREFIX}${alias}@${resolved}`;
+			}
+			return value;
+		}
+		if (Array.isArray(value)) {
+			for (let index = 0; index < value.length; index += 1) {
+				value[index] = walk(value[index]);
+			}
+			return value;
+		}
+		if (value && typeof value === 'object') {
+			for (const [key, item] of Object.entries(value)) {
+				value[key] = walk(item);
+			}
+			return value;
+		}
+		return value;
+	};
+
+	return walk(manifest);
+}
+
 async function fetchIconTo(options, cwd, destDir) {
 	if (!options['icon']) {
 		logger.warn(t('lzc_cli.lib.app.lpk_build.fetch_icon_to_icon_empty_fail', '图标icon 没有指定'));
@@ -68,7 +132,12 @@ async function fetchIconTo(options, cwd, destDir) {
 	}
 
 	if (!isPngWithFile(iconPath)) {
-		logger.warn(t('lzc_cli.lib.app.lpk_build.fetch_icon_to_icon_not_is_png_fail', `图标icon {{ iconPath }} 验证失败(不是一个png格式)`, { iconPath, interpolation: { escapeValue: false } }));
+		logger.warn(
+			t('lzc_cli.lib.app.lpk_build.fetch_icon_to_icon_not_is_png_fail', `图标icon {{ iconPath }} 验证失败(不是一个png格式)`, {
+				iconPath,
+				interpolation: { escapeValue: false },
+			}),
+		);
 		return;
 	} else {
 		logger.debug(t('lzc_cli.lib.app.lpk_build.fetch_icon_to_icon_is_png', `图标icon {{ iconPath }} 验证成功(png格式)`, { iconPath, interpolation: { escapeValue: false } }));
@@ -97,7 +166,12 @@ async function fetchLzcDeployParamTo(options, cwd, destDir) {
 	}
 
 	if (!isFileExist(deployParamsPath)) {
-		logger.warn(t('lzc_cli.lib.app.lpk_build.fetch_lzc_deploy_param_to_not_exist', `deploy_params {{ deployParamsPath }} 不存在`, { deployParamsPath, interpolation: { escapeValue: false } }));
+		logger.warn(
+			t('lzc_cli.lib.app.lpk_build.fetch_lzc_deploy_param_to_not_exist', `deploy_params {{ deployParamsPath }} 不存在`, {
+				deployParamsPath,
+				interpolation: { escapeValue: false },
+			}),
+		);
 		return;
 	}
 
@@ -151,12 +225,52 @@ function convenientEnv() {
 	);
 }
 
+function formatBytes(bytes) {
+	const value = Number(bytes ?? 0);
+	if (!Number.isFinite(value) || value <= 0) {
+		return '0 B';
+	}
+	const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+	let size = value;
+	let unitIndex = 0;
+	while (size >= 1024 && unitIndex < units.length - 1) {
+		size /= 1024;
+		unitIndex += 1;
+	}
+	const digits = unitIndex === 0 ? 0 : 2;
+	return `${size.toFixed(digits)} ${units[unitIndex]}`;
+}
+
+function mergeBuildOptions(baseOptions, topOptions) {
+	return mergeWith({}, baseOptions ?? {}, topOptions ?? {}, (objValue, srcValue) => {
+		if (Array.isArray(srcValue)) {
+			return srcValue;
+		}
+		return undefined;
+	});
+}
+
+function loadYamlIfExists(filePath) {
+	if (!filePath || !isFileExist(filePath)) {
+		return {};
+	}
+	return yaml.load(fs.readFileSync(filePath, 'utf8')) ?? {};
+}
+
+async function loadTemplatedYamlIfExists(filePath, env) {
+	if (!filePath || !isFileExist(filePath)) {
+		return {};
+	}
+	return yaml.load(await envTemplateFile(filePath, env)) ?? {};
+}
+
 export class LpkBuild {
 	constructor(cwd, buildConfigFile) {
 		this.pwd = cwd ?? process.cwd();
 
 		this.optionsFilePath = path.join(this.pwd, buildConfigFile);
-		this.options = loadFromYaml(this.optionsFilePath);
+		this.optionsBaseFilePath = path.join(path.dirname(this.optionsFilePath), DEFAULT_BUILD_BASE_FILE);
+		this.options = mergeBuildOptions(loadYamlIfExists(this.optionsBaseFilePath), loadYamlIfExists(this.optionsFilePath));
 
 		this.manifestFilePath = this.options['manifest'] ? path.join(this.pwd, this.options['manifest']) : path.join(this.pwd, 'lzc-manifest.yml');
 		this.manifest = null;
@@ -171,7 +285,10 @@ export class LpkBuild {
 	async init() {
 		const manifest = await this.getManifest();
 		const primitive = convenientEnv();
-		this.options = yaml.load(await envTemplateFile(this.optionsFilePath, Object.assign({}, primitive, manifest)));
+		const env = Object.assign({}, primitive, manifest);
+		const baseOptions = await loadTemplatedYamlIfExists(this.optionsBaseFilePath, env);
+		const topOptions = await loadTemplatedYamlIfExists(this.optionsFilePath, env);
+		this.options = mergeBuildOptions(baseOptions, topOptions);
 		return this;
 	}
 
@@ -245,9 +362,16 @@ export class LpkBuild {
 
 		// 输出路径
 		let packName = this.options['lpkPath'];
-		const pkgout = path.resolve(this.pwd, this.options['pkgout']);
-		if (!packName && !isDirExist(pkgout)) {
-			throw t('lzc_cli.lib.app.lpk_build.exec_pkgout_not_exist', `{{ pkgout }} 不存在`, { pkgout, interpolation: { escapeValue: false } });
+		let pkgout = '';
+		if (!packName) {
+			const rawPkgout = this.options['pkgout'];
+			if (rawPkgout !== undefined && rawPkgout !== null && typeof rawPkgout !== 'string') {
+				throw t('lzc_cli.lib.app.lpk_build.exec_pkgout_invalid_type', 'pkgout must be a string when specified');
+			}
+			pkgout = path.resolve(this.pwd, typeof rawPkgout === 'string' && rawPkgout.trim() !== '' ? rawPkgout : './');
+			if (!isDirExist(pkgout)) {
+				throw t('lzc_cli.lib.app.lpk_build.exec_pkgout_not_exist', `{{ pkgout }} 不存在`, { pkgout, interpolation: { escapeValue: false } });
+			}
 		}
 
 		const tempDir = fs.mkdtempSync('.lzc-cli-build');
@@ -291,7 +415,10 @@ export class LpkBuild {
 				} else if (isFileExist(browserExtension)) {
 					fs.copyFileSync(browserExtension, path.join(tempDir, 'extension.zip'));
 				} else {
-					throw t('lzc_cli.lib.app.lpk_build.exec_browser_extension_not_exist', `{{ browserExtension }} 不存在`, { browserExtension, interpolation: { escapeValue: false } });
+					throw t('lzc_cli.lib.app.lpk_build.exec_browser_extension_not_exist', `{{ browserExtension }} 不存在`, {
+						browserExtension,
+						interpolation: { escapeValue: false },
+					});
 				}
 			}
 
@@ -300,7 +427,7 @@ export class LpkBuild {
 				if (!isDirExist(aiPodService)) {
 					throw t('lzc_cli.lib.app.lpk_build.exec_ai_pos_service_not_exist', `{{ aiPodService }} 不存在`, {
 						aiPodService,
-						interpolation: { escapeValue: false }
+						interpolation: { escapeValue: false },
 					});
 				}
 				fs.cpSync(aiPodService, path.join(tempDir, 'ai-pod-service'), {
@@ -319,7 +446,43 @@ export class LpkBuild {
 				}, manifest);
 			}
 
-			if (process.env.LZC_MANIFEST_TEMPLATE) {
+			if (Object.prototype.hasOwnProperty.call(this.options, 'embed_images')) {
+				throw new Error('embed_images is removed, please use lzc-build.yml images and manifest embed:alias');
+			}
+			if (Object.prototype.hasOwnProperty.call(this.options, 'embed_all_images')) {
+				throw new Error('embed_all_images is removed');
+			}
+			if (Object.prototype.hasOwnProperty.call(this.options, 'upstream_registry')) {
+				throw new Error('upstream_registry is renamed to upstream_match');
+			}
+			if (Object.prototype.hasOwnProperty.call(this.options, 'upstream_match') || Object.prototype.hasOwnProperty.call(this.options, 'upstream-match')) {
+				throw new Error('upstream_match is moved to lzc-build.yml images.<alias>.upstream-match');
+			}
+
+			const hasImagesConfig = !!this.options['images'];
+
+			let useTarPackage = false;
+			let embeddedImageSummary = null;
+			if (hasImagesConfig) {
+				const buildResult = await buildConfiguredImagesToTempDir(this.options['images'], manifest, this.pwd, tempDir, {
+					remote: this.options['remote'],
+				});
+				if (buildResult.imageCount > 0) {
+					useTarPackage = true;
+					embeddedImageSummary = buildResult;
+					manifest = rewriteManifestEmbeddedImages(manifest, buildResult.resolvedImageByAlias);
+				}
+			}
+			if (useTarPackage) {
+				const contentTar = path.join(tempDir, 'content.tar');
+				const contentTarGz = path.join(tempDir, 'content.tar.gz');
+				if (isFileExist(contentTar)) {
+					await gzipFileTo(contentTar, contentTarGz);
+					fs.rmSync(contentTar, { force: true });
+				}
+			}
+
+			if (process.env.LZC_MANIFEST_TEMPLATE && !useTarPackage) {
 				logger.debug('copy origin manifest\n', this.manifestFilePath);
 				fs.copyFileSync(this.manifestFilePath, path.join(tempDir, 'manifest.yml'));
 			} else {
@@ -346,14 +509,26 @@ export class LpkBuild {
 			}
 
 			if (!packName) {
-				packName = path.resolve(pkgout, `${manifest.package}-v${manifest.version}.lpk`);
+				const ext = '.lpk';
+				packName = path.resolve(pkgout, `${manifest.package}-v${manifest.version}${ext}`);
 			}
 
-			const lpkPath = await archiveFolderTo(tempDir, packName);
-			logger.info(`${t('lzc_cli.lib.app.lpk_build.exec_output_lpk_path', '输出lpk包 {{ path }}', {
-				path: lpkPath.path,
-				interpolation: { escapeValue: false } // https://www.i18next.com/translation-function/interpolation#unescape
-			})}`);
+			const lpkPath = await archiveFolderTo(tempDir, packName, useTarPackage ? 'tar' : 'zip');
+			logger.info(
+				`${t('lzc_cli.lib.app.lpk_build.exec_output_lpk_path', '输出lpk包 {{ path }}', {
+					path: lpkPath.path,
+					interpolation: { escapeValue: false }, // https://www.i18next.com/translation-function/interpolation#unescape
+				})}`,
+			);
+			if (embeddedImageSummary && embeddedImageSummary.imageCount > 0) {
+				logger.info('Embedded image upstream summary:');
+				for (const [alias, upstream] of Object.entries(embeddedImageSummary.upstreamByAlias ?? {})) {
+					logger.info(`- ${alias}: ${upstream || '(none, full embed)'}`);
+				}
+				logger.info(
+					`Embedded image layer size: ${formatBytes(embeddedImageSummary.embeddedLayerBytes)} (${embeddedImageSummary.embeddedLayerBytes} bytes, ${embeddedImageSummary.embeddedLayerCount} unique layers)`,
+				);
+			}
 
 			return lpkPath.path;
 		} finally {