@build-script/package-tools 0.0.27 → 0.0.28

package/lib/common/version.generated.js

@@ -10,7 +10,7 @@
  * https://github.com/GongT/baobao
  *
  ******************************************************************************/
-export const self_package_version = "0.0.27";
+export const self_package_version = "0.0.28";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "https://github.com/GongT/baobao";
 //# sourceMappingURL=version.generated.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@build-script/package-tools",
   "type": "module",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "A Node.js package managing tool",
   "bin": {
     "package-tools": "./bins/load.devel.js",
@@ -22,16 +22,16 @@
     "targz": "^1.0.1",
     "tiny-async-pool": "^2.1.0",
     "yaml": "^2.8.2",
-    "@build-script/monorepo-lib": "^0.0.25",
-    "@idlebox/cli": "^0.0.15",
-    "@idlebox/common": "^1.5.22",
-    "@idlebox/dependency-graph": "^0.0.22",
+    "@build-script/monorepo-lib": "^0.0.26",
+    "@idlebox/common": "^1.5.24",
+    "@idlebox/dependency-graph": "^0.0.23",
+    "@idlebox/ensure-symlink": "^1.0.41",
     "@idlebox/json-edit": "^0.0.15",
-    "@idlebox/node": "^1.4.31",
+    "@idlebox/node": "^1.4.32",
+    "@idlebox/cli": "^0.0.16",
     "@idlebox/source-map-support": "^0.0.21",
-    "@idlebox/ensure-symlink": "^1.0.41",
-    "@idlebox/unshare": "^0.0.13",
-    "@idlebox/terminal-control": "^0.0.4"
+    "@idlebox/terminal-control": "^0.0.5",
+    "@idlebox/unshare": "^0.0.13"
   },
   "devDependencies": {
     "@types/cacache": "^20.0.1",
@@ -43,9 +43,8 @@
     "@types/targz": "^1.0.5",
     "@types/tiny-async-pool": "^2.0.3",
     "@types/tinycolor2": "^1.4.6",
-    "@build-script/codegen": "^1.0.23",
-    "@idlebox/cli-static-generator": "^0.0.15",
-    "@mpis/run": "^0.0.26",
+    "@idlebox/cli-static-generator": "^0.0.16",
+    "@build-script/codegen": "^1.0.24",
     "@build-script/baseline-rig": "latest"
   },
   "sideEffects": false,

package/src/commands/monorepo-publish.ts

@@ -1,9 +1,9 @@
 import { applyPublishWorkspace, createWorkspace, normalizePackageName, type IPackageInfo, type MonorepoWorkspace } from '@build-script/monorepo-lib';
-import { app, argv, CommandDefine, logger } from '@idlebox/cli';
+import { app, argv, CommandDefine, createLogger, logger, NodejsOutput, type IMyLogger } from '@idlebox/cli';
 import { prettyPrintError } from '@idlebox/common';
 import { Job, JobGraphBuilder, JobState } from '@idlebox/dependency-graph';
 import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
-import { commandInPath, emptyDir, setExitCodeIfNot, shutdown, workingDirectory, writeFileIfChange } from '@idlebox/node';
+import { CollectingStream, commandInPath, emptyDir, setExitCodeIfNot, shutdown, workingDirectory, writeFileIfChange } from '@idlebox/node';
 import { CSI } from '@idlebox/terminal-control/constants';
 import { FsNodeType, spawnReadonlyFileSystemWithCommand } from '@idlebox/unshare';
 import { execaNode } from 'execa';
@@ -35,6 +35,8 @@ export class Command extends CommandDefine {
 class BuildPackageJob extends Job<void> {
 	private shouldPublish = '';
 	public initialVersion = true;
+	public override readonly logger: IMyLogger;
+	private readonly collector;
 
 	constructor(
 		name: string,
@@ -45,17 +47,28 @@ class BuildPackageJob extends Job<void> {
 	) {
 		super(name, deps);
 
+		const collector = new CollectingStream();
+		const stream = new NodejsOutput({
+			stream: collector,
+			colorEnabled: logger.colorEnabled,
+		});
+
+		this.collector = collector;
+		this.logger = createLogger('pub', { colors: false, console: stream });
+
 		this.detect = unshareExecuter ? this.unsharedDetect : this.sharedDetect;
 		this.pack = unshareExecuter ? this.unsharedPack : this.sharedPack;
 	}
 
-	private readonly logText: string[] = [];
-	log(text: string) {
-		this.logText.push(text);
-	}
 	flushLog() {
-		console.log(this.logText.join('\n'));
-		this.logText.length = 0;
+		const output = this.collector.getOutput();
+		this.collector.clear();
+		return output;
+	}
+
+	log(message: string) {
+		// biome-ignore lint/style/useTemplate: too simple
+		this.collector.write(message + '\n');
 	}
 
 	getPackagePath() {
@@ -167,7 +180,7 @@ class BuildPackageJob extends Job<void> {
 		try {
 			this.log(`    🔍 ${CSI}38;5;14m检查包${CSI}0m`);
 
-			const pm = await createPackageManager(PackageManagerUsageKind.Write, this.workspace, this.project.absolute);
+			const pm = await createPackageManager(PackageManagerUsageKind.Write, this.workspace, this.project.absolute, this.logger);
 			const { changedFiles, hasChange, remoteVersion, packageJsonDiff } = await this.detect(pm);
 			const shouldPublish = hasChange || changedFiles.length > 0;
 			let localVersion = this.project.packageJson.version;
@@ -259,10 +272,15 @@ export async function main() {
 
 	const projects = await workspace.listPackages();
 
-	let concurrency = Number.parseInt(argv.single(['--concurrency']) || '0', 10) || 5;
-	if (app.debug) {
-		concurrency = 1;
-		logger.warn`由于设置了--debug参数，运行模式改为单线程`;
+	let concurrency = Number.parseInt(argv.single(['--concurrency']) || '-1', 10);
+	if (concurrency <= 0) {
+		if (app.debug) {
+			concurrency = 1;
+			logger.warn`由于设置了--debug参数，运行模式默认为单线程，设置 --concurrency 参数可改变此设置`;
+		} else {
+			concurrency = process.env.CI ? 10 : 3;
+			logger.info`使用默认并发数 ${concurrency}`;
+		}
 	}
 	const builder = new JobGraphBuilder(concurrency, logger);
 
@@ -290,8 +308,8 @@ export async function main() {
 		job.onStateChange(() => {
 			if (job.isStopped()) {
 				indexDisplay++;
-				console.log(`${CSI}K📦 [${indexDisplay.toFixed(0).padStart(width)}/${shouldPublishProjects.length}] ${project.name}`);
-				job.flushLog();
+				const output = job.flushLog();
+				process.stderr.write(`\n${CSI}K📦 [${indexDisplay.toFixed(0).padStart(width)}/${shouldPublishProjects.length}] ${project.name}\n${output}\n`);
 
 				const e = job.getLastError();
 				if (e) {

package/src/common/cache/native.npm.ts

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/cli';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { sleep, type IPackageJson } from '@idlebox/common';
 import { get as cacheGet, rm as cacheRm } from 'cacache';
 import { rm } from 'node:fs/promises';
@@ -8,7 +8,7 @@ import { json as npmFetchJson } from 'npm-registry-fetch';
 import { DEFAULT_NPM_REGISTRY } from '../package-manager/constant.js';
 import type { IPackageManager } from '../package-manager/package-manager.js';
 import { getProxyValue } from '../package-manager/proxy.js';
-import { downloadFileCached } from '../taball/file-download.js';
+import { FileDownloader } from '../taball/file-download.js';
 import { self_package_name, self_package_repository, self_package_version } from '../version.generated.js';
 import { escapePackageNameToFilename } from './escape-package-path.js';
 
@@ -44,17 +44,18 @@ export class NpmCacheHandler {
 		private readonly pm: IPackageManager,
 		private readonly registry: string,
 		public readonly path: string,
+		public readonly logger = defaultLogger,
 	) {
 		this.cache_path = resolve(path, '_cacache');
 	}
 
 	deleteMetadata(name: string) {
-		return deleteNpmCache(this.cache_path, name, this.registry);
+		return deleteNpmCache(this.cache_path, name, this.registry, this.logger);
 	}
 
 	async fetchMetadata(name: string, cacheMode = CacheMode.Normal) {
 		const registry = await this.pm.getNpmRegistry();
-		return fetchNpmWithCache(this.cache_path, name, registry, { mode: cacheMode });
+		return fetchNpmWithCache(this.cache_path, name, registry, { mode: cacheMode, logger: this.logger });
 	}
 
 	async fetchVersion(name: string, distTag = 'latest', cacheMode = CacheMode.Normal) {
@@ -64,7 +65,7 @@ export class NpmCacheHandler {
 		}
 		const version = getVersion(json, distTag);
 		if (!version) {
-			logger.warn(` ! 找不到版本信息(${name}@${distTag})`);
+			this.logger.warn(` ! 找不到版本信息(${name}@${distTag})`);
 			return;
 		}
 		return version;
@@ -80,7 +81,7 @@ export class NpmCacheHandler {
 		if (!r) {
 			throw new Error(`无此版本: ${name} = ${distTag}`);
 		}
-		return await downloadFileCached(r.dist.tarball, this.getTarballFile(name, distTag));
+		return await new FileDownloader(this.logger).download(r.dist.tarball, this.getTarballFile(name, distTag));
 	}
 
 	public deleteTarball(name: string, distTag: string) {
@@ -110,16 +111,18 @@ export enum CacheMode {
 interface IMyOpts {
 	mode?: CacheMode;
 	maxRetry?: number;
+	logger?: IMyLogger;
 }
 const defOpt: Required<IMyOpts> = {
 	mode: CacheMode.Normal,
 	maxRetry: 3,
+	logger: defaultLogger,
 };
 
 export async function fetchNpmWithCache(path: string, name: string, registry: string, _options?: IMyOpts) {
-	logger.debug(`   * npm-registry-fetch: ${registry} :: ${name}`);
+	const { logger, ...options }: Required<IMyOpts> = Object.assign({}, defOpt, _options);
 
-	const options: Required<IMyOpts> = Object.assign({}, defOpt, _options);
+	logger.debug(`   * npm-registry-fetch: ${registry} :: ${name}`);
 
 	let _try_cnt = 0;
 	let retry = options.maxRetry;
@@ -130,7 +133,7 @@ export async function fetchNpmWithCache(path: string, name: string, registry: st
 		_try_cnt++;
 		retry--;
 		try {
-			const proxy = getProxyValue(registry);
+			const proxy = getProxyValue(registry, logger);
 			json = (await npmFetchJson(name, {
 				cache: path,
 				registry: registry,
@@ -172,7 +175,7 @@ export async function fetchNpmWithCache(path: string, name: string, registry: st
 	return json;
 }
 
-async function deleteNpmCache(path: string, name: string, registry?: string) {
+async function deleteNpmCache(path: string, name: string, registry?: string, logger: IMyLogger = defaultLogger) {
 	const require = createRequire(import.meta.url);
 	const cacheKey = require('make-fetch-happen/lib/cache/key.js');
 	const registries = new Set([DEFAULT_NPM_REGISTRY, 'https://registry.npmmirror.com/']);

package/src/common/git/git.ts

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/cli';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { commandInPath, execLazyError, exists } from '@idlebox/node';
 import { rm } from 'node:fs/promises';
 import { resolve } from 'node:path';
@@ -12,38 +12,41 @@ export async function requireGitInPath() {
 }
 
 export class GitWorkingTree {
-	constructor(public readonly path: string) {}
+	constructor(
+		public readonly path: string,
+		public readonly logger: IMyLogger = defaultLogger,
+	) {}
 
 	protected _exec(cmds: string[]) {
 		return execLazyError('git', cmds, { cwd: this.path, verbose: isVerbose });
 	}
 
 	async init() {
-		logger.debug('初始化git工作区: %s', this.path);
+		this.logger.debug('初始化git工作区: %s', this.path);
 		const gitDir = resolve(this.path, '.git');
 		if (await exists(gitDir)) {
-			logger.debug('   - 删除已有.git文件夹');
+			this.logger.debug('   - 删除已有.git文件夹');
 			await rm(gitDir, { recursive: true, force: true });
 		}
 		await this._exec(['init']);
 		await this._exec(['add', '.']);
 		await this._exec(['commit', '-m', 'Init']);
-		logger.debug('(初始化完成)');
+		this.logger.debug('(初始化完成)');
 	}
 
 	async commitChanges() {
-		logger.debug('检测文件更改:');
+		this.logger.debug('检测文件更改:');
 
 		const { stdout: testOut } = await this._exec(['status']);
 		const statusOut = testOut.toString().trim();
 		if (statusOut.includes('nothing to commit, working tree clean')) {
-			logger.debug('    git工作区状态: 干净');
+			this.logger.debug('    git工作区状态: 干净');
 			return [];
 		}
 		// if (isDebugMode) {
 		// 	await execa('git', ['diff'], { cwd: this.path, stdio: ['ignore', 2, 2] });
 		// }
-		logger.debug('    git工作区状态: 有修改');
+		this.logger.debug('    git工作区状态: 有修改');
 
 		await this._exec(['add', '.']);
 		await this._exec(['commit', '-m', 'DetectChangedFiles']);
@@ -61,7 +64,7 @@ export class GitWorkingTree {
 		}
 		const files = lines.slice(titleLine + 1);
 
-		logger.debug('    文件更改: %d 个 (%s%s)', files.length, files.slice(0, 5).join(', '), files.length > 5 ? ' ...' : '');
+		this.logger.debug('    文件更改: %d 个 (%s%s)', files.length, files.slice(0, 5).join(', '), files.length > 5 ? ' ...' : '');
 
 		return files.map((item) => {
 			return item.replace('Would remove ', '');
@@ -70,7 +73,7 @@ export class GitWorkingTree {
 
 	async fileDiff(file: string) {
 		const { stdout } = await this._exec(['diff', '--color=never', '-U0', `HEAD~1`, file]);
-		logger.verbose(stdout.trimEnd());
+		this.logger.verbose(stdout.trimEnd());
 		const lines = stdout.toString().trim().split('\n').slice(4);
 
 		let diff = formatChangeSideBySide('Published', 'Local');

package/src/common/package-manager/driver.abstract.ts

@@ -1,5 +1,5 @@
 import type { WorkspaceBase } from '@build-script/monorepo-lib';
-import { logger } from '@idlebox/cli';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { ensureLinkTarget } from '@idlebox/ensure-symlink';
 import { execLazyError, exists, writeFileIfChange } from '@idlebox/node';
 import { execa } from 'execa';
@@ -31,8 +31,9 @@ export abstract class PackageManager {
 		public readonly usageKind: PackageManagerUsageKind,
 		public readonly workspace: WorkspaceBase,
 		subdir = process.cwd(),
+		public readonly logger: IMyLogger = defaultLogger,
 	) {
-		this.configTemp = new TempWorkingFolder(this.workspace, 'package-manager', true);
+		this.configTemp = new TempWorkingFolder(this.workspace, 'package-manager', logger, true);
 		this.projectPath = resolve(workspace.root, subdir);
 		if (!this.projectPath.startsWith(workspace.root)) {
 			throw new Error(`project "${this.projectPath}" is outside the workspace root`);
@@ -45,15 +46,15 @@ export abstract class PackageManager {
 
 	public async pack(saveAs: string) {
 		const pkg = await this.loadPackageJson();
-		logger.log`打包项目 (${pkg.publishConfig?.['packCommand'] ? 'custom' : 'default'}): relative<${this.projectPath}> -> relative<${saveAs}>`;
+		this.logger.log`打包项目 (${pkg.publishConfig?.['packCommand'] ? 'custom' : 'default'}): relative<${this.projectPath}> -> relative<${saveAs}>`;
 		if (pkg.publishConfig?.['packCommand']) {
 			const cmds = typeof pkg.publishConfig['packCommand'] === 'string' ? splitCmd(pkg.publishConfig['packCommand']) : pkg.publishConfig['packCommand'];
 
 			if (!Array.isArray(cmds)) {
-				logger.fatal`publishConfig.packCommand必须是字符串或字符串数组, 但实际是: ${typeof pkg.publishConfig['packCommand']}`;
+				this.logger.fatal`publishConfig.packCommand必须是字符串或字符串数组, 但实际是: ${typeof pkg.publishConfig['packCommand']}`;
 			}
 
-			logger.verbose` - 自定义打包命令: ${Array.from(cmds)}`;
+			this.logger.verbose` - 自定义打包命令: ${Array.from(cmds)}`;
 
 			const [cmd, ...args] = cmds;
 			await execLazyError(cmd, [...args, '--out', saveAs], {
@@ -110,25 +111,25 @@ export abstract class PackageManager {
 		const scope = await this.getScope();
 		if (scope) {
 			const { stdout } = await this._execGetOut(cwd, ['config', 'get', `${scope}:${key}`], true, binary);
-			logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', binary, scope, key, stdout, cwd);
+			this.logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', binary, scope, key, stdout, cwd);
 			if (`${stdout}` !== 'undefined') {
 				return stdout;
 			}
 		}
 		const { stdout } = await this._execGetOut(cwd, ['config', 'get', key], true, binary);
-		logger.debug('$ %s config get %s -> %s (cwd: %s)', binary, key, stdout, cwd);
+		this.logger.debug('$ %s config get %s -> %s (cwd: %s)', binary, key, stdout, cwd);
 		return stdout === 'undefined' ? undefined : stdout;
 	}
 
 	protected abstract _uploadTarball(pack: string, cwd: string): Promise<IUploadResult>;
 	public async uploadTarball(pack: string, cwd: string = this.projectPath) {
-		logger.debug(`上传压缩包: ${pack}`);
+		this.logger.debug(`上传压缩包: ${pack}`);
 		try {
 			const r = await this._uploadTarball(pack, cwd);
-			logger.debug`    发布成功: ${r.name} @ ${r.version} [${r.published}]`;
+			this.logger.debug`    发布成功: ${r.name} @ ${r.version} [${r.published}]`;
 			return r;
 		} catch (e: any) {
-			logger.debug`    tarball发布失败`;
+			this.logger.debug`    tarball发布失败`;
 			throw e;
 		}
 	}
@@ -161,14 +162,14 @@ export abstract class PackageManager {
 		if (!this._cachedReg) {
 			switch (registryInput) {
 				case 'detect':
-					logger.debug(`检测registry地址: ${registryInput}`);
+					this.logger.debug(`检测registry地址: ${registryInput}`);
 					this._cachedReg = await this.getConfig('registry');
 					break;
 				default:
 					if (!registryInput.startsWith('https://')) {
 						throw new Error(`不支持的--registry协议: ${registryInput}`);
 					}
-					logger.debug('使用命令行提供的registry地址 (%s)', registryInput);
+					this.logger.debug('使用命令行提供的registry地址 (%s)', registryInput);
 					this._cachedReg = registryInput;
 			}
 		}
@@ -183,7 +184,7 @@ export abstract class PackageManager {
 			const path = await this.getConfig('cache');
 			if (!path) throw new Error('npm config get cache返回为空');
 
-			this._cache_handler = new NpmCacheHandler(this, registry, path);
+			this._cache_handler = new NpmCacheHandler(this, registry, path, this.logger);
 		}
 		return this._cache_handler;
 	}

package/src/common/package-manager/package-manager.ts

@@ -1,4 +1,5 @@
 import type { WorkspaceBase } from '@build-script/monorepo-lib';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { commandInPath, PathEnvironment } from '@idlebox/node';
 import type { PackageManager, PackageManagerUsageKind } from './driver.abstract.js';
 import { NPM } from './driver.npm.js';
@@ -7,13 +8,18 @@ import { reconfigureProxyWithNpmrc } from './proxy.js';
 
 export type IPackageManager = PackageManager;
 
-type PackageManagerConstructor = new (usage: PackageManagerUsageKind, workspace: WorkspaceBase, subdir?: string) => IPackageManager;
+type PackageManagerConstructor = new (usage: PackageManagerUsageKind, workspace: WorkspaceBase, subdir?: string, logger?: IMyLogger) => IPackageManager;
 
 let pmCls: PackageManagerConstructor | undefined;
 
-export async function createPackageManager(usage: PackageManagerUsageKind, workspace: WorkspaceBase, subdir?: string): Promise<IPackageManager> {
+export async function createPackageManager(
+	usage: PackageManagerUsageKind,
+	workspace: WorkspaceBase,
+	subdir?: string,
+	logger: IMyLogger = defaultLogger,
+): Promise<IPackageManager> {
 	if (pmCls) {
-		return new pmCls(usage, workspace, subdir);
+		return new pmCls(usage, workspace, subdir, logger);
 	}
 
 	const supports: Record<string, PackageManagerConstructor> = { pnpm: PNPM, npm: NPM };
@@ -22,7 +28,7 @@ export async function createPackageManager(usage: PackageManagerUsageKind, works
 			continue;
 		}
 
-		const pm = new Cls(usage, workspace, subdir);
+		const pm = new Cls(usage, workspace, subdir, logger);
 
 		await reconfigureProxyWithNpmrc(pm);
 

package/src/common/package-manager/proxy.ts

@@ -1,5 +1,5 @@
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { escapeRegExp } from '@idlebox/common';
-import { logger } from '@idlebox/cli';
 import { getEnvironment } from '@idlebox/node';
 import type { IPackageManager } from './package-manager.js';
 
@@ -13,7 +13,7 @@ function makeRe(str: string) {
 	return new RegExp(`^${reTxt}$`, 'i');
 }
 
-export function getProxyValue(url: string) {
+export function getProxyValue(url: string, logger: IMyLogger = defaultLogger): string {
 	const proxyValue = process.env.http_proxy;
 	if (!proxyValue) {
 		return '';
@@ -65,21 +65,21 @@ export function getProxyValue(url: string) {
 export async function reconfigureProxyWithNpmrc(pm: IPackageManager) {
 	if (proxy_override_by_env) return;
 
-	logger.debug('通过npm设置代理服务器:');
+	pm.logger.debug('通过npm设置代理服务器:');
 	const p = await pm.getConfig('proxy');
 	const np = await pm.getConfig('noproxy');
 
 	if (p) {
-		logger.debug(`   * proxy server = ${p}`);
+		pm.logger.debug(`   * proxy server = ${p}`);
 	}
 	if (np) {
-		logger.debug(`   * no_proxy = ${np}`);
+		pm.logger.debug(`   * no_proxy = ${np}`);
 	}
 
 	applyEnv(p || '', np || '');
 }
 
-export function configureProxyFromEnvironment() {
+export function configureProxyFromEnvironment(logger: IMyLogger = defaultLogger) {
 	// bootstrap({
 	// 	environmentVariableNamespace: '',
 	// 	forceGlobalAgent: true,

package/src/common/shared-jobs/detect-change-job.ts

@@ -1,4 +1,3 @@
-import { logger } from '@idlebox/cli';
 import { PathEnvironment } from '@idlebox/node';
 import { resolve } from 'node:path';
 import { gt } from 'semver';
@@ -21,7 +20,8 @@ interface IDetectOptions {
 
 export async function executeChangeDetect(pm: IPackageManager, options: IDetectOptions = {}): Promise<IResult> {
 	const packageJson = await pm.loadPackageJson();
-	logger.debug('修改检测 | 包名: %s', packageJson.name);
+
+	pm.logger.debug('修改检测 | 包名: %s', packageJson.name);
 	if (!packageJson.name) {
 		throw new Error(`${pm.projectPath}/package.json 中缺少 name 字段`);
 	}
@@ -38,16 +38,16 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 	}
 
 	if (packageJson.private && !options.forcePrivate) {
-		logger.debug('检测到私有包，禁止运行');
+		pm.logger.debug('检测到私有包，禁止运行');
 		return { changedFiles: [], hasChange: false };
 	}
 
 	const remotePackage = await cache.fetchVersion(packageJson.name, distTagInput);
-	logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
-	logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
+	pm.logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
+	pm.logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
 
 	if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
-		logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
+		pm.logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
 		return {
 			changedFiles: ['package.json'],
 			hasChange: false,
@@ -55,33 +55,33 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 			packageJsonDiff: `短路检测: "version" 本地为 ${packageJson.version}, 远程版本为 ${remotePackage?.version}`,
 		};
 	}
-	logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
+	pm.logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
 
 	const tarball = await cache.downloadTarball(packageJson.name, distTagInput);
 
-	const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect');
+	const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect', pm.logger);
 	const workingRoot = tempFolder.resolve('working');
 	await workingRoot.unpack(tarball);
 	await makePackageJsonOrderConsistence(workingRoot.path);
 
-	const gitrepo = new GitWorkingTree(workingRoot.path);
+	const gitrepo = new GitWorkingTree(workingRoot.path, pm.logger);
 	await gitrepo.init();
 
 	const pack = await pm.pack(tempFolder.joinpath('local-pack.tgz'));
-	logger.verbose('  --> %s', pack);
+	pm.logger.verbose('  --> %s', pack);
 
 	await workingRoot.unpack(pack);
-	logger.verbose('  unpacked successfully');
+	pm.logger.verbose('  unpacked successfully');
 
 	await makePackageJsonOrderConsistence(workingRoot.path);
 
 	const changedFiles = await gitrepo.commitChanges();
-	logger.verbose`  changed files: list<${changedFiles}>`;
+	pm.logger.verbose`  changed files: list<${changedFiles}>`;
 
 	let packageJsonDiff = '';
 	if (changedFiles.includes('package.json')) {
 		packageJsonDiff = await gitrepo.fileDiff('package.json');
-		logger.debug(`    - package.json 文件的修改:\n${packageJsonDiff}`);
+		pm.logger.debug(`    - package.json 文件的修改:\n${packageJsonDiff}`);
 	}
 
 	return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version, packageJsonDiff };

package/src/common/taball/decompress.ts

@@ -1,11 +1,11 @@
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { convertCatchedError } from '@idlebox/common';
-import { logger } from '@idlebox/cli';
 import { existsSync, unlinkSync } from 'node:fs';
 import tgz from 'targz';
 
 const packageFolder = /^package\//;
 
-export async function decompressPack(src: string, dest: string) {
+export async function decompressPack(src: string, dest: string, logger: IMyLogger = defaultLogger) {
 	logger.debug(`解压文件: ${src}\n\u3000\u3000目录: ${dest}`);
 	await new Promise<void>((resolve, reject) => {
 		if (!existsSync(src)) {