@zhipu/zp-cli 0.0.1 → 0.0.3

package/dist/cli.mjs

@@ -1,12 +1,14 @@
 import { a as findConfigFile, c as loadConfig, l as templateFileName, n as SCHEMA_FILE_NAME, o as isConfigFormat, r as configFileName, s as listConfigFiles, t as CONFIG_FORMATS } from "./config-BZc9pg7J.mjs";
 import { createRequire } from "node:module";
-import fs from "node:fs";
+import fs, { mkdtempSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { Command } from "@commander-js/extra-typings";
 import { spawn } from "node:child_process";
+import os, { tmpdir } from "node:os";
+import chalk from "chalk";
 import zlib from "node:zlib";
 //#region package.json
-var version = "0.0.1";
+var version = "0.0.3";
 var description = "内部单命令部署工具";
 //#endregion
 //#region src/utils/deploy-paths.ts
@@ -33,7 +35,82 @@ function shouldSkipDeployRuntime() {
 	return process.env.ZPC_DEPLOY_SKIP_RUNTIME === "1";
 }
 //#endregion
+//#region src/utils/tty-shim.ts
+/** 子进程预加载脚本：让 piped stdout/stderr 表现为 TTY，以启用 Vite 等工具的进度覆写。 */
+const TTY_SHIM_CJS = String.raw`'use strict';
+
+function patchStdStream(stream) {
+  if (!stream || stream.__zpcTtyPatched) return;
+  stream.__zpcTtyPatched = true;
+  Object.defineProperty(stream, 'isTTY', {
+    value: true,
+    enumerable: true,
+    configurable: true,
+  });
+  if (stream.columns == null) stream.columns = 120;
+  if (stream.rows == null) stream.rows = 30;
+  if (typeof stream.clearLine !== 'function') {
+    stream.clearLine = function clearLine(dir, cb) {
+      if (typeof dir === 'function') {
+        cb = dir;
+        dir = 0;
+      }
+      if (dir === 0 || dir === undefined) stream.write('\x1b[2K\r');
+      cb?.();
+      return true;
+    };
+  }
+  if (typeof stream.cursorTo !== 'function') {
+    stream.cursorTo = function cursorTo(x, y, cb) {
+      if (typeof y === 'function') {
+        cb = y;
+        y = undefined;
+      }
+      if (typeof x === 'function') {
+        cb = x;
+        x = 0;
+        y = undefined;
+      }
+      if (y === undefined) stream.write('\x1b[' + (x + 1) + 'G');
+      else stream.write('\x1b[' + (y + 1) + ';' + (x + 1) + 'H');
+      cb?.();
+      return true;
+    };
+  }
+}
+
+patchStdStream(process.stdout);
+patchStdStream(process.stderr);
+`;
+//#endregion
+//#region src/utils/tty-shim-path.ts
+let cachedShimPath;
+/** 将 tty shim 写入临时目录并缓存路径，供 NODE_OPTIONS --require 使用。 */
+function ensureTtyShimPath() {
+	if (cachedShimPath) return cachedShimPath;
+	const dir = mkdtempSync(path.join(tmpdir(), "zpc-tty-"));
+	cachedShimPath = path.join(dir, "tty-shim.cjs");
+	writeFileSync(cachedShimPath, TTY_SHIM_CJS, "utf8");
+	return cachedShimPath;
+}
+//#endregion
 //#region src/utils/run.ts
+function killProcessTree(child) {
+	if (!child.pid || child.killed) return;
+	if (process.platform === "win32") {
+		spawn("taskkill", [
+			"/pid",
+			String(child.pid),
+			"/f",
+			"/t"
+		], {
+			stdio: "ignore",
+			windowsHide: true
+		});
+		return;
+	}
+	child.kill("SIGTERM");
+}
 function runCommand(command, args, opts = {}) {
 	return new Promise((resolve, reject) => {
 		const useCmd = opts.windowsCmd && process.platform === "win32";
@@ -64,6 +141,63 @@ function runCommand(command, args, opts = {}) {
 		});
 	});
 }
+function decodeChunk(chunk) {
+	return typeof chunk === "string" ? chunk : chunk.toString("utf8");
+}
+function quoteNodeOption(value) {
+	if (!/[ \t"]/u.test(value)) return value;
+	return `"${value.replace(/"/g, "\\\"")}"`;
+}
+function buildCapturedEnv(opts) {
+	const env = opts.env ? {
+		...process.env,
+		...opts.env
+	} : { ...process.env };
+	if (!opts.fakeTty) return env;
+	const requireFlag = `--require ${quoteNodeOption(ensureTtyShimPath())}`;
+	env.NODE_OPTIONS = env.NODE_OPTIONS ? `${env.NODE_OPTIONS} ${requireFlag}` : requireFlag;
+	delete env.CI;
+	return env;
+}
+function runCommandCaptured(command, args, opts = {}) {
+	const useCmd = opts.windowsCmd && process.platform === "win32";
+	const child = spawn(useCmd ? process.env.ComSpec || "cmd.exe" : command, useCmd ? [
+		"/d",
+		"/s",
+		"/c",
+		command,
+		...args
+	] : args, {
+		cwd: opts.cwd,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		windowsHide: true,
+		env: buildCapturedEnv(opts)
+	});
+	child.stdout?.on("data", (chunk) => {
+		opts.onStdout?.(decodeChunk(chunk));
+	});
+	child.stderr?.on("data", (chunk) => {
+		opts.onStderr?.(decodeChunk(chunk));
+	});
+	return {
+		promise: new Promise((resolve, reject) => {
+			child.on("error", (err) => {
+				reject(/* @__PURE__ */ new Error(`无法启动 ${command}: ${err.message}`));
+			});
+			child.on("exit", (code, signal) => {
+				resolve({
+					exitCode: code,
+					signal
+				});
+			});
+		}),
+		kill: () => killProcessTree(child)
+	};
+}
 //#endregion
 //#region src/utils/templates.ts
 const require = createRequire(import.meta.url);
@@ -187,17 +321,20 @@ function listNamedDirs(parent) {
 	if (!fs.existsSync(parent)) return [];
 	return fs.readdirSync(parent, { withFileTypes: true }).filter((d) => d.isDirectory() && isSafeDirName(d.name) && !d.name.startsWith(".")).map((d) => d.name);
 }
-/** 原子风格替换目录：删旧 `.bak` → 现目录改名为 `.bak` → 拷入新内容。 */
+function backupTimestamp() {
+	const d = /* @__PURE__ */ new Date();
+	const pad = (n) => String(n).padStart(2, "0");
+	return `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getSeconds())}`;
+}
+/**
+* 原子风格替换目录：现目录改名为带时间戳的唯一 `.bak-*` 备份 → 拷入新内容。
+* 备份名含时间戳，多次覆盖不会互相覆盖，历史版本得以保留；失败从该备份恢复。
+*/
 function deployDir(src, dest, log) {
 	fs.mkdirSync(path.dirname(dest), { recursive: true });
-	const bak = `${dest}.bak`;
-	if (fs.existsSync(bak)) {
-		log(`删除旧备份 ${bak}`);
-		fs.rmSync(bak, {
-			recursive: true,
-			force: true
-		});
-	}
+	const stamp = backupTimestamp();
+	let bak = `${dest}.bak-${stamp}`;
+	for (let i = 1; fs.existsSync(bak); i++) bak = `${dest}.bak-${stamp}-${i}`;
 	if (fs.existsSync(dest)) {
 		log(`备份 ${dest} -> ${bak}`);
 		fs.renameSync(dest, bak);
@@ -304,6 +441,273 @@ async function configureNginxProxies(projectName, apis, force, log) {
 	log("nginx 已 reload");
 }
 //#endregion
+//#region src/utils/deploy-state.ts
+const DEPLOY_STATE_VERSION = 1;
+const DEPLOY_STATE_FILE = "deploy-state.json";
+function getZpcHome() {
+	return process.env.ZPC_HOME ?? path.join(os.homedir(), ".zpc");
+}
+function getDeployStatePath() {
+	return path.join(getZpcHome(), DEPLOY_STATE_FILE);
+}
+/** 以项目根目录绝对路径为键（统一分隔符，便于跨平台比对）。 */
+function deployStateProjectKey(root) {
+	return path.resolve(root).replace(/\\/g, "/");
+}
+function emptyDeployState() {
+	return {
+		version: DEPLOY_STATE_VERSION,
+		projects: {}
+	};
+}
+function readDeployStateFile() {
+	const filePath = getDeployStatePath();
+	if (!fs.existsSync(filePath)) return emptyDeployState();
+	let parsed;
+	try {
+		parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+	} catch {
+		throw new Error(`[deploy] 无法解析 ${filePath}，请检查 JSON 格式或删除后重试`);
+	}
+	if (typeof parsed !== "object" || parsed == null || parsed.version !== DEPLOY_STATE_VERSION || typeof parsed.projects !== "object" || parsed.projects == null) throw new Error(`[deploy] ${filePath} 格式无效，请删除后重试`);
+	return parsed;
+}
+function writeDeployStateFile(state) {
+	const home = getZpcHome();
+	fs.mkdirSync(home, { recursive: true });
+	fs.writeFileSync(getDeployStatePath(), `${JSON.stringify(state, null, 2)}\n`, "utf8");
+}
+function hasFullDeployRecord(root) {
+	const state = readDeployStateFile();
+	return deployStateProjectKey(root) in state.projects;
+}
+function markProjectFullDeployed(root, projectName) {
+	const state = readDeployStateFile();
+	const key = deployStateProjectKey(root);
+	state.projects[key] = {
+		projectName,
+		root: key,
+		fullDeployedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	writeDeployStateFile(state);
+}
+/** 返回 ~/.zpc/deploy-state.json 中已记录的所有 projectName（去重、排序）。 */
+function listRecordedProjectNames() {
+	const state = readDeployStateFile();
+	return [...new Set(Object.values(state.projects).map((p) => p.projectName))].sort();
+}
+//#endregion
+//#region src/utils/check-state.ts
+/** 从 nginx 配置的 `owned-by: projectName/name` 头解析出 projectName。 */
+function nginxProjectName(text) {
+	const owned = parseNginxOwnedBy(text);
+	if (!owned) return null;
+	const idx = owned.indexOf("/");
+	return idx >= 0 ? owned.slice(0, idx) : owned;
+}
+/** 盘点部署痕迹（api/web 目录 + nginx 配置）与部署记录，合并成按系统分组的结果。 */
+function collectSystemChecks() {
+	const recorded = new Set(listRecordedProjectNames());
+	const apiByProject = /* @__PURE__ */ new Map();
+	for (const projectName of listNamedDirs(getApiRoot())) apiByProject.set(projectName, listNamedDirs(path.join(getApiRoot(), projectName)));
+	const webByProject = /* @__PURE__ */ new Map();
+	for (const projectName of listNamedDirs(getWebRoot())) webByProject.set(projectName, listNamedDirs(path.join(getWebRoot(), projectName)));
+	const nginxByProject = /* @__PURE__ */ new Map();
+	const unownedNginxConfs = [];
+	const nginxDir = getNginxDefaultD();
+	if (fs.existsSync(nginxDir)) for (const name of fs.readdirSync(nginxDir)) {
+		if (!name.endsWith(".conf")) continue;
+		const full = path.join(nginxDir, name);
+		let text = "";
+		try {
+			text = fs.readFileSync(full, "utf8");
+		} catch {}
+		const projectName = nginxProjectName(text);
+		if (projectName) {
+			const arr = nginxByProject.get(projectName) ?? [];
+			arr.push(full);
+			nginxByProject.set(projectName, arr);
+		} else unownedNginxConfs.push(full);
+	}
+	return {
+		systems: [.../* @__PURE__ */ new Set([
+			...recorded,
+			...apiByProject.keys(),
+			...webByProject.keys(),
+			...nginxByProject.keys()
+		])].sort().map((projectName) => ({
+			projectName,
+			recorded: recorded.has(projectName),
+			apiDirs: apiByProject.get(projectName) ?? [],
+			webDirs: webByProject.get(projectName) ?? [],
+			nginxConfs: nginxByProject.get(projectName) ?? []
+		})),
+		unownedNginxConfs
+	};
+}
+//#endregion
+//#region src/utils/log.ts
+function tagged(tag, message) {
+	return `${chalk.cyan(`[${tag}]`)} ${message}`;
+}
+/** 带命令前缀的彩色日志：info 默认、success 绿、warn 黄。 */
+function createLogger(tag) {
+	return {
+		info: (message) => {
+			console.log(tagged(tag, message));
+		},
+		success: (message) => {
+			console.log(tagged(tag, chalk.green(message)));
+		},
+		warn: (message) => {
+			console.log(tagged(tag, chalk.yellow(message)));
+		}
+	};
+}
+function logError(message) {
+	console.error(chalk.red(message));
+}
+//#endregion
+//#region src/commands/check.ts
+const log$3 = createLogger("check");
+function systemStatus(system) {
+	if (!system.recorded) return "未记录";
+	return system.apiDirs.length > 0 || system.webDirs.length > 0 || system.nginxConfs.length > 0 ? "已记录" : "记录但缺失";
+}
+function runCheck() {
+	const { systems, unownedNginxConfs } = collectSystemChecks();
+	if (systems.length === 0 && unownedNginxConfs.length === 0) {
+		log$3.info("未发现任何部署记录或部署痕迹");
+		return;
+	}
+	for (const system of systems) {
+		const status = systemStatus(system);
+		const head = `[${status}] ${system.projectName}`;
+		if (status === "已记录") log$3.info(head);
+		else log$3.warn(head);
+		if (!(system.apiDirs.length > 0 || system.webDirs.length > 0 || system.nginxConfs.length > 0)) continue;
+		if (system.apiDirs.length > 0) log$3.info(`  api: ${system.apiDirs.join(", ")}`);
+		if (system.webDirs.length > 0) log$3.info(`  web: ${system.webDirs.join(", ")}`);
+		if (system.nginxConfs.length > 0) log$3.info(`  nginx: ${system.nginxConfs.join(", ")}`);
+	}
+	if (unownedNginxConfs.length > 0) {
+		log$3.warn(`[未归属 nginx 配置] ${unownedNginxConfs.length} 个`);
+		for (const conf of unownedNginxConfs) log$3.warn(`  ${conf}`);
+	}
+}
+function createCheckCommand() {
+	return new Command("check").description("盘点部署目录与 nginx 配置，标注已记录 / 未记录 / 记录但缺失").action(async () => {
+		runCheck();
+	});
+}
+//#endregion
+//#region src/utils/dist-zip.ts
+const ZPC_GITIGNORE_HEADER = "# zpc files";
+const ZPC_DIST_ZIP_IGNORE = "*-dist.zip";
+function distZipFileName(projectName) {
+	return `${projectName}-dist.zip`;
+}
+function distZipPath(projectRoot, projectName) {
+	return path.join(projectRoot, distZipFileName(projectName));
+}
+function gitignoreHasDistZipRule(content) {
+	return content.split(/\r?\n/u).some((line) => line.trim() === ZPC_DIST_ZIP_IGNORE);
+}
+/** 若项目 .gitignore 缺少 *-dist.zip 规则则追加，返回是否新写入。 */
+function ensureZpcGitignore(projectRoot) {
+	const gitignorePath = path.join(projectRoot, ".gitignore");
+	const existing = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, "utf8") : "";
+	if (gitignoreHasDistZipRule(existing)) return false;
+	const block = `${existing.length > 0 && !existing.endsWith("\n") ? "\n" : ""}\n${ZPC_GITIGNORE_HEADER}\n${ZPC_DIST_ZIP_IGNORE}\n`;
+	fs.writeFileSync(gitignorePath, `${existing}${block}`, "utf8");
+	return true;
+}
+//#endregion
+//#region src/utils/deploy-conflict.ts
+function isDirectoryNonEmpty$1(dir) {
+	if (!fs.existsSync(dir)) return false;
+	try {
+		return fs.readdirSync(dir).length > 0;
+	} catch {
+		return false;
+	}
+}
+/** 收集「无 ~/.zpc 记录」时应提示用户的部署痕迹：api/web 目录非空、已存在/冲突的 nginx 配置。 */
+function collectDeployConflicts(config) {
+	const projectName = config.projectName;
+	const conflicts = [];
+	if (!projectName) return conflicts;
+	for (const item of config.api ?? []) {
+		const dir = path.join(getApiRoot(), projectName, item.name);
+		if (isDirectoryNonEmpty$1(dir)) conflicts.push({
+			kind: "api-dir",
+			message: `api 部署目录非空: ${dir}`
+		});
+	}
+	for (const item of config.web ?? []) {
+		const dir = path.join(getWebRoot(), projectName, item.name);
+		if (isDirectoryNonEmpty$1(dir)) conflicts.push({
+			kind: "web-dir",
+			message: `web 部署目录非空: ${dir}`
+		});
+	}
+	const defaultD = getNginxDefaultD();
+	if (!fs.existsSync(defaultD)) return conflicts;
+	const proxies = (config.api ?? []).map((item) => item.proxy).filter((p) => !!p);
+	for (const name of fs.readdirSync(defaultD)) {
+		if (!name.endsWith(".conf")) continue;
+		const full = path.join(defaultD, name);
+		let text;
+		try {
+			text = fs.readFileSync(full, "utf8");
+		} catch {
+			continue;
+		}
+		const owned = parseNginxOwnedBy(text);
+		if (owned?.startsWith(`${projectName}/`) || name.startsWith(`${projectName}-`)) {
+			conflicts.push({
+				kind: "nginx",
+				message: `已存在本项目 nginx 配置: ${full}`
+			});
+			continue;
+		}
+		for (const proxy of proxies) if (confDefinesProxy(text, proxy)) {
+			conflicts.push({
+				kind: "nginx",
+				message: `nginx 配置 ${full} 已定义 proxy ${nginxLocation(proxy)}（归属 ${owned ?? "未知"}）`
+			});
+			break;
+		}
+	}
+	return conflicts;
+}
+function isInteractive() {
+	return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+/** 交互询问部署方式；非 TTY 环境直接返回取消（默认）。 */
+async function promptDeployResolution() {
+	if (!isInteractive()) return "cancel";
+	const { select } = await import("@inquirer/prompts");
+	return await select({
+		message: "检测到已有部署痕迹（无 ~/.zpc 记录），请选择部署方式：",
+		choices: [
+			{
+				name: "清空目标文件夹并覆盖（全量，旧目录将备份）",
+				value: "full"
+			},
+			{
+				name: "使用增量部署（api 保留 public，跳过 web）",
+				value: "incremental"
+			},
+			{
+				name: "取消部署",
+				value: "cancel"
+			}
+		],
+		default: "cancel"
+	});
+}
+//#endregion
 //#region src/utils/zip.ts
 /** ZIP End of Central Directory 签名 */
 const SIG_EOCD = 101010256;
@@ -419,27 +823,7 @@ async function zipDirectory(stagingDir, zipPath, cwd) {
 }
 //#endregion
 //#region src/commands/deploy.ts
-function log$1(message) {
-	console.log(`[deploy] ${message}`);
-}
-function envFlag(name) {
-	const value = process.env[name];
-	return value === "1" || value === "true";
-}
-function resolveFlags(options) {
-	const forceFull = Boolean(options.full);
-	const force = Boolean(options.force) || envFlag("DEPLOY_FORCE");
-	let wantIncremental = Boolean(options.incremental) || envFlag("DEPLOY_INCREMENTAL");
-	if (forceFull) wantIncremental = false;
-	return {
-		wantIncremental,
-		forceFull,
-		force
-	};
-}
-function hasProjectFiles(dir) {
-	return fs.existsSync(path.join(dir, "dist.zip")) && Boolean(findConfigFile(dir));
-}
+const log$2 = createLogger("deploy");
 function resolveProjectDir(dirArg) {
 	let dir;
 	if (dirArg) {
@@ -448,39 +832,40 @@ function resolveProjectDir(dirArg) {
 		dir = fs.statSync(abs).isDirectory() ? abs : path.dirname(abs);
 	} else if (process.env.DEPLOY_DIR) dir = path.resolve(process.env.DEPLOY_DIR);
 	else dir = process.cwd();
-	if (!hasProjectFiles(dir)) throw new Error(`[deploy] ${dir} 中需要同时有 dist.zip 和 zpc.config.*（配置请单独上传，不要打进压缩包）`);
+	if (!findConfigFile(dir)) throw new Error(`[deploy] ${dir} 中需要 zpc.config.*（配置请单独上传，不要打进压缩包）`);
 	return dir;
 }
 async function deployKind(stagingDir, items, kind, destRoot, projectName, incremental) {
 	const packed = new Set(listNamedDirs(path.join(stagingDir, kind)));
 	const configured = items ?? [];
-	for (const extra of packed) if (!configured.some((item) => item.name === extra)) log$1(`跳过压缩包中的 ${kind}/${extra}（未在配置中列出）`);
+	for (const extra of packed) if (!configured.some((item) => item.name === extra)) log$2.warn(`跳过压缩包中的 ${kind}/${extra}（未在配置中列出）`);
 	for (const item of configured) {
 		const src = path.join(stagingDir, kind, item.name);
 		if (!fs.existsSync(src)) throw new Error(`[deploy] 配置中有 ${kind}/${item.name}，但压缩包中没有对应目录`);
 		const dest = path.join(destRoot, projectName, item.name);
 		const pm2Name = `${projectName}-${item.name}`;
-		if (kind === "api" && incremental && fs.existsSync(dest)) deployApiIncremental(src, dest, log$1);
+		if (kind === "api" && incremental && fs.existsSync(dest)) deployApiIncremental(src, dest, log$2.info);
 		else {
-			if (kind === "api" && incremental && !fs.existsSync(dest)) log$1(`${dest} 不存在，增量改为全量部署`);
-			deployDir(src, dest, log$1);
+			if (kind === "api" && incremental && !fs.existsSync(dest)) log$2.warn(`${dest} 不存在，增量改为全量部署`);
+			deployDir(src, dest, log$2.info);
 		}
-		if (kind === "api" && !shouldSkipDeployRuntime()) await installAndReloadApi(pm2Name, dest, item, log$1);
+		if (kind === "api" && !shouldSkipDeployRuntime()) await installAndReloadApi(pm2Name, dest, item, log$2.info);
 	}
 }
-async function runDeploy(dir, options) {
-	const { wantIncremental, forceFull, force } = resolveFlags(options);
+async function runDeploy(dir, options, prompt = promptDeployResolution) {
+	const force = Boolean(options.force) || process.env.DEPLOY_FORCE === "1" || process.env.DEPLOY_FORCE === "true";
 	const projectDir = resolveProjectDir(dir);
 	const stagingDir = path.join(projectDir, ".deploy-staging");
-	const zipPath = path.join(projectDir, "dist.zip");
 	const { file, config } = await loadConfig(projectDir);
 	assertDeployConfig(config);
-	log$1(`项目目录: ${projectDir}`);
-	log$1(`压缩包: ${zipPath}`);
-	log$1(`配置: ${file}`);
-	log$1(`项目: ${config.projectName}`);
+	const zipPath = distZipPath(projectDir, config.projectName);
+	if (!fs.existsSync(zipPath)) throw new Error(`[deploy] 找不到 ${zipPath}，请先在该目录执行 zpc pack（配置请单独上传，不要打进压缩包）`);
+	log$2.info(`项目目录: ${projectDir}`);
+	log$2.info(`压缩包: ${zipPath}`);
+	log$2.info(`配置: ${file}`);
+	log$2.info(`项目: ${config.projectName}`);
 	try {
-		log$1(`解压 ${zipPath}`);
+		log$2.info(`解压 ${zipPath}`);
 		await extractArchive(zipPath, stagingDir);
 	} catch (err) {
 		fs.rmSync(stagingDir, {
@@ -490,17 +875,35 @@ async function runDeploy(dir, options) {
 		const message = err instanceof Error ? err.message : String(err);
 		throw new Error(`[deploy] 解压失败: ${message}`);
 	}
-	const packIsIncremental = fs.existsSync(path.join(stagingDir, INCREMENTAL_MARKER));
-	let incremental = wantIncremental || packIsIncremental;
+	const zipIsIncremental = fs.existsSync(path.join(stagingDir, INCREMENTAL_MARKER));
+	const hadRecord = hasFullDeployRecord(projectDir);
+	let incremental;
+	let resolvedFromConflicts = false;
+	if (hadRecord) incremental = true;
+	else {
+		const conflicts = collectDeployConflicts(config);
+		if (conflicts.length > 0) {
+			for (const conflict of conflicts) log$2.warn(conflict.message);
+			const choice = await prompt();
+			if (choice === "cancel") {
+				log$2.warn("已取消部署");
+				fs.rmSync(stagingDir, {
+					recursive: true,
+					force: true
+				});
+				return;
+			}
+			incremental = choice === "incremental";
+			resolvedFromConflicts = true;
+		} else incremental = zipIsIncremental;
+	}
 	try {
-		if (packIsIncremental && forceFull) throw new Error("[deploy] 当前 dist.zip 是增量包（含 .deploy-incremental），不能 --full，请使用 --incremental，或重新 pack 全量包");
-		if (packIsIncremental && !wantIncremental) throw new Error("[deploy] 当前 dist.zip 是增量包（由 zpc pack -i 生成），请加上 --incremental / -i，以免全量覆盖清空 public");
-		incremental = wantIncremental || packIsIncremental;
-		log$1(`模式: ${incremental ? "增量（api 保留 public，跳过 web）" : "全量"}`);
-		if (force) log$1("已启用 --force（允许抢占冲突的 nginx proxy）");
+		log$2.info(`模式: ${incremental ? "增量（api 保留 public，跳过 web）" : "全量"}`);
+		if (!incremental && !hadRecord) log$2.info("首次部署该项目，完成后将记录到 ~/.zpc/deploy-state.json");
+		if (force) log$2.warn("已启用 --force（允许抢占冲突的 nginx proxy）");
 		await deployKind(stagingDir, config.api, "api", getApiRoot(), config.projectName, incremental);
 		if (!incremental) await deployKind(stagingDir, config.web, "web", getWebRoot(), config.projectName, false);
-		else if (config.web?.length) log$1("增量模式跳过 web 部署");
+		else if (config.web?.length) log$2.warn("增量模式跳过 web 部署");
 	} finally {
 		fs.rmSync(stagingDir, {
 			recursive: true,
@@ -508,21 +911,28 @@ async function runDeploy(dir, options) {
 		});
 	}
 	if (!shouldSkipDeployRuntime()) {
-		await configureNginxProxies(config.projectName, config.api, force, log$1);
+		await configureNginxProxies(config.projectName, config.api, force, log$2.info);
 		if (config.api?.length) await runCommand("pm2", ["save"], { ignoreExit: true });
 	}
+	if (!hasFullDeployRecord(projectDir)) {
+		markProjectFullDeployed(projectDir, config.projectName);
+		if (!incremental) log$2.info("已记录全量部署状态到 ~/.zpc/deploy-state.json，下次 deploy 将默认增量");
+		else if (resolvedFromConflicts) log$2.info("已根据现有部署目录建立部署记录，下次 deploy 将默认增量");
+		else if (zipIsIncremental) log$2.info("已记录部署状态，下次 deploy 将默认增量");
+	}
 	const apiCount = config.api?.length ?? 0;
 	const webCount = incremental ? 0 : config.web?.length ?? 0;
 	const prefix = `${config.projectName}/<name>`;
-	log$1(`完成: api ${apiCount} 个 -> ${getApiRoot()}/${prefix}，web ${webCount} 个 -> ${getWebRoot()}/${prefix}`);
+	log$2.success(`完成: api ${apiCount} 个 -> ${getApiRoot()}/${prefix}，web ${webCount} 个 -> ${getWebRoot()}/${prefix}`);
 }
 function createDeployCommand() {
-	return new Command("deploy").description("按 zpc.config 将 dist.zip 部署到服务器").argument("[dir]", "项目目录，默认为当前目录").option("-i, --incremental", "增量部署（api 保留 public，跳过 web）").option("--full", "全量部署").option("--force", "允许抢占冲突的 nginx proxy").action(async (dir, options) => {
+	return new Command("deploy").description("按 zpc.config 将 <projectName>-dist.zip 部署到服务器").argument("[dir]", "项目目录，默认为当前目录").option("--force", "允许抢占冲突的 nginx proxy").action(async (dir, options) => {
 		await runDeploy(dir, options);
 	});
 }
 //#endregion
 //#region src/commands/init.ts
+const log$1 = createLogger("init");
 async function runInit(dir, options) {
 	const format = resolveFormat(options.template);
 	const root = path.resolve(dir ?? process.cwd());
@@ -536,10 +946,10 @@ async function runInit(dir, options) {
 	fs.mkdirSync(root, { recursive: true });
 	for (const file of existing) if (file !== dest) fs.rmSync(file);
 	fs.copyFileSync(resolveTemplateFile(format), dest);
-	console.log(`[init] 已写入 ${dest}`);
+	log$1.success(`已写入 ${dest}`);
 	if (format === "json") {
 		fs.copyFileSync(resolveSchemaFile(), schemaDest);
-		console.log(`[init] 已写入 ${schemaDest}`);
+		log$1.success(`已写入 ${schemaDest}`);
 	} else if (fs.existsSync(schemaDest)) fs.rmSync(schemaDest);
 }
 function resolveFormat(template) {
@@ -553,14 +963,59 @@ function createInitCommand() {
 	});
 }
 //#endregion
-//#region src/commands/pack.ts
-function log(message) {
-	console.log(`[pack] ${message}`);
+//#region src/utils/incremental-mode.ts
+function isDirectoryNonEmpty(dir) {
+	if (!fs.existsSync(dir)) return false;
+	try {
+		return fs.readdirSync(dir).length > 0;
+	} catch {
+		return false;
+	}
+}
+/** 配置中所有部署目录（api + web）里已存在且非空的目录。 */
+function findNonemptyDeployDirs(config) {
+	const projectName = config.projectName;
+	if (!projectName) return [];
+	const found = [];
+	for (const item of config.api ?? []) {
+		const deployDir = path.join(getApiRoot(), projectName, item.name);
+		if (isDirectoryNonEmpty(deployDir)) found.push(deployDir);
+	}
+	for (const item of config.web ?? []) {
+		const deployDir = path.join(getWebRoot(), projectName, item.name);
+		if (isDirectoryNonEmpty(deployDir)) found.push(deployDir);
+	}
+	return found;
 }
-function resolveIncremental(options) {
-	if (options.full) return false;
-	return Boolean(options.incremental);
+/**
+* 全量 / 增量判定（pack 只读、deploy 读后写入）：
+* 1. ~/.zpc/deploy-state.json 有记录 → 增量
+* 2. 无记录但 api/web 部署目录非空 → 交由调用方决策（不直接判定）
+* 3. 无记录但 zip 含增量标记 → 增量
+* 4. 否则全量
+*/
+function resolveIncrementalMode(projectRoot, config, options = {}) {
+	if (hasFullDeployRecord(projectRoot)) return {
+		incremental: true,
+		existingDeployDirs: []
+	};
+	const existingDeployDirs = findNonemptyDeployDirs(config);
+	if (existingDeployDirs.length > 0) return {
+		incremental: false,
+		existingDeployDirs
+	};
+	if (options.zipIsIncremental) return {
+		incremental: true,
+		existingDeployDirs: []
+	};
+	return {
+		incremental: false,
+		existingDeployDirs: []
+	};
 }
+//#endregion
+//#region src/commands/pack.ts
+const log = createLogger("pack");
 function resolveProjects(root, config, incremental) {
 	const projects = [];
 	const kinds = incremental ? ["api"] : ["api", "web"];
@@ -596,18 +1051,45 @@ function resolveBuildEnv(project, config) {
 	}
 	return env;
 }
-async function buildAll(projects, config) {
-	log(`并行构建 ${projects.length} 个项目`);
-	await Promise.all(projects.map(async (project) => {
+function shouldUseBuildTui(options) {
+	return Boolean(process.stdout.isTTY) && options.tui !== false;
+}
+function toBuildJobSpecs(projects, config) {
+	return projects.map((project) => ({
+		id: `${project.kind}/${project.name}`,
+		label: `${project.kind}/${project.name}`,
+		cwd: project.absPath,
+		env: resolveBuildEnv(project, config)
+	}));
+}
+async function buildAllLegacy(projects, config, concurrency) {
+	const limitText = concurrency !== void 0 ? `，最多同时 ${concurrency} 个` : "";
+	log.info(`构建 ${projects.length} 个项目${limitText}`);
+	const { runWithConcurrency } = await import("./build-jobs-m5jbiNTx.mjs");
+	await runWithConcurrency(projects, concurrency ?? 0, async (project) => {
 		const env = resolveBuildEnv(project, config);
-		if (project.kind === "web" && env.VITE_API_PROXY) log(`build ${project.kind}/${project.name} VITE_API_PROXY=${env.VITE_API_PROXY}`);
-		else log(`build ${project.kind}/${project.name} -> ${project.absPath}`);
+		if (project.kind === "web" && env.VITE_API_PROXY) log.info(`build ${project.kind}/${project.name} VITE_API_PROXY=${env.VITE_API_PROXY}`);
+		else log.info(`build ${project.kind}/${project.name} -> ${project.absPath}`);
 		await runCommand("npm", ["run", "build"], {
 			cwd: project.absPath,
 			env,
 			windowsCmd: true
 		});
-	}));
+	});
+}
+async function buildAllWithTui(projects, config, options) {
+	const { runBuildDashboard } = await import("./build-dashboard-CqZVHPH7.mjs");
+	await runBuildDashboard(toBuildJobSpecs(projects, config), {
+		concurrency: options.concurrency,
+		stayOnSuccess: options.stay
+	});
+}
+async function buildAll(projects, config, options) {
+	if (shouldUseBuildTui(options)) {
+		await buildAllWithTui(projects, config, options);
+		return;
+	}
+	await buildAllLegacy(projects, config, options.concurrency);
 }
 function copyRequiredFile(src, destDir, label) {
 	if (!fs.existsSync(src)) throw new Error(`[pack] 缺少 ${label}: ${src}`);
@@ -619,7 +1101,7 @@ function stageApi(project, dest, incremental) {
 	copyRequiredFile(path.join(project.absPath, "package.json"), dest, "package.json");
 	copyRequiredFile(path.join(project.absPath, "bootstrap.js"), dest, "bootstrap.js");
 	if (incremental) {
-		log(`api/${project.name} 增量：跳过 public`);
+		log.warn(`api/${project.name} 增量：跳过 public`);
 		return;
 	}
 	const publicDir = path.join(project.absPath, "public");
@@ -639,26 +1121,32 @@ function stageDist(stagingDir, root, projects, incremental) {
 		const dest = path.join(stagingDir, project.kind, project.name);
 		if (project.kind === "api") stageApi(project, dest, incremental);
 		else fs.cpSync(project.distPath, dest, { recursive: true });
-		log(`收集 ${project.kind}/${project.name} -> ${path.relative(root, dest)}`);
+		log.info(`收集 ${project.kind}/${project.name} -> ${path.relative(root, dest)}`);
 	}
 }
 async function runPack(dir, options) {
 	const root = path.resolve(dir ?? process.cwd());
 	if (!fs.existsSync(root)) throw new Error(`[pack] 找不到路径: ${root}`);
 	const projectRoot = fs.statSync(root).isDirectory() ? root : path.dirname(root);
-	const incremental = resolveIncremental(options);
 	const stagingDir = path.join(projectRoot, ".packup-staging");
-	const zipPath = path.join(projectRoot, "dist.zip");
 	const { file, config } = await loadConfig(projectRoot);
-	log(`项目目录: ${projectRoot}`);
-	log(`配置: ${file}`);
-	log(`项目: ${config.projectName}`);
-	log(`模式: ${incremental ? "增量（仅 api，不含 public）" : "全量"}`);
+	const zipPath = distZipPath(projectRoot, config.projectName);
+	const packMode = resolveIncrementalMode(projectRoot, config);
+	const incremental = packMode.incremental || packMode.existingDeployDirs.length > 0;
+	log.info(`项目目录: ${projectRoot}`);
+	log.info(`配置: ${file}`);
+	log.info(`项目: ${config.projectName}`);
+	log.info(`模式: ${incremental ? "增量（仅 api，不含 public）" : "全量"}`);
+	if (packMode.existingDeployDirs.length > 0) {
+		const listed = packMode.existingDeployDirs.map((dir) => path.normalize(dir)).join(", ");
+		log.warn(`无 ~/.zpc 部署记录，但检测到部署目录非空：${listed}。将按增量处理（api 保留 public，跳过 web）；若确需全量请清空部署目录并删除 deploy-state 中对应记录`);
+	}
+	if (options.concurrency !== void 0) log.info(`并行上限: ${options.concurrency}`);
 	const projects = resolveProjects(projectRoot, config, incremental);
-	await buildAll(projects, config);
+	await buildAll(projects, config, options);
 	stageDist(stagingDir, projectRoot, projects, incremental);
 	try {
-		log(`压缩 ${path.relative(projectRoot, zipPath)}`);
+		log.info(`压缩 ${path.relative(projectRoot, zipPath)}`);
 		await zipDirectory(stagingDir, zipPath, projectRoot);
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
@@ -669,18 +1157,23 @@ async function runPack(dir, options) {
 			force: true
 		});
 	}
-	log(`完成: ${zipPath}`);
-	if (incremental) log("请使用: zpc deploy --incremental");
+	log.success(`完成: ${zipPath}`);
+	if (ensureZpcGitignore(projectRoot)) log.info("已更新 .gitignore，忽略 *-dist.zip");
+	if (incremental) log.info("增量包已生成，部署时将自动识别为增量模式");
 }
 function createPackCommand() {
-	return new Command("pack").description("按 zpc.config 构建并打包 dist.zip").argument("[dir]", "项目目录，默认为当前目录").option("-i, --incremental", "增量打包（仅 api，不含 public）").option("--full", "全量打包").action(async (dir, options) => {
+	return new Command("pack").description("按 zpc.config 构建并打包 <projectName>-dist.zip").argument("[dir]", "项目目录，默认为当前目录").option("--no-tui", "禁用构建 TUI，使用传统输出").option("--stay", "构建成功后保留 TUI，手动退出").option("-c, --concurrency <n>", "最大同时构建数（默认不限制）", (value) => {
+		const parsed = Number(value);
+		if (!Number.isInteger(parsed) || parsed < 1) throw new Error("--concurrency 必须是大于 0 的整数");
+		return parsed;
+	}).action(async (dir, options) => {
 		await runPack(dir, options);
 	});
 }
 //#endregion
 //#region src/utils/program.ts
 function createProgram() {
-	const program = new Command().name("zpc").description(description).version(version).showHelpAfterError().addCommand(createInitCommand()).addCommand(createPackCommand()).addCommand(createDeployCommand());
+	const program = new Command().name("zpc").description(description).version(version).showHelpAfterError().addCommand(createInitCommand()).addCommand(createPackCommand()).addCommand(createDeployCommand()).addCommand(createCheckCommand());
 	program.action(() => {
 		program.outputHelp();
 	});
@@ -690,8 +1183,7 @@ async function runCli(argv = process.argv) {
 	try {
 		await createProgram().parseAsync(argv);
 	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		console.error(message);
+		logError(err instanceof Error ? err.message : String(err));
 		process.exitCode = 1;
 	}
 }
@@ -699,4 +1191,4 @@ async function runCli(argv = process.argv) {
 //#region src/cli.ts
 runCli();
 //#endregion
-export {};
+export { runCommandCaptured as t };