@done-coding/cli-utils 0.8.2-alpha.1 → 0.8.3-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.8.2-alpha.1",
+  "version": "0.8.3-alpha.0",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -18,10 +18,7 @@
     "types"
   ],
   "scripts": {
-    "clean": "rimraf es lib types",
-    "predev": "pnpm run clean",
-    "dev": "vite build --watch",
-    "prebuild": "pnpm run clean",
+    "dev": "vite build -w -m hotBuild",
     "build": "vite build",
     "prepack": "pnpm build"
   },
@@ -47,26 +44,30 @@
     "@types/pinyin": "^2.10.0",
     "@types/prompts": "^2.4.6",
     "@types/semver": "^7.5.3",
+    "@types/signal-exit": "^4.0.0",
     "@types/yargs": "^17.0.28",
-    "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
     "vite": "^4.4.11",
     "vite-plugin-dts": "^3.6.0"
   },
-  "engines": {
-    "node": ">=18.0.0"
-  },
   "dependencies": {
+    "@done-coding/output-node": "0.1.1",
     "chalk": "^5.3.0",
+    "dayjs": "^1.11.19",
     "json5": "^2.2.3",
     "lodash.curry": "^4.1.1",
     "lodash.get": "^4.4.2",
     "lodash.merge": "^4.6.2",
     "lodash.set": "^4.3.2",
+    "pino": "8.17.2",
     "pinyin": "^2.11.2",
     "prompts": "^2.4.2",
     "semver": "^7.5.4",
+    "signal-exit": "4.1.0",
     "yargs": "^17.7.2"
   },
-  "gitHead": "660e39fc523e4eba1ea621e3c59122f98015a2de"
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "gitHead": "906b7683d9e4dc75fb07806b12e5507827122a16"
 }

package/types/index.d.ts

@@ -1,10 +1,13 @@
 import type { ArgumentsCamelCase } from 'yargs';
+import chalk from 'chalk';
 import type { CommandModule } from 'yargs';
 import _curry from 'lodash.curry';
-import { ExecSyncOptions } from 'node:child_process';
-import fs from 'node:fs';
+import dayjs from 'dayjs';
 import _get from 'lodash.get';
 import json5 from 'json5';
+import { OutputConsole } from '@done-coding/output-node';
+import { OutputConsoleTypeEnum } from '@done-coding/output-node';
+import { OutputLogFile } from '@done-coding/output-node';
 import { Answers as PromptAnswers } from 'prompts';
 import { Choice as PromptChoice } from 'prompts';
 import { Falsy as PromptFalsy } from 'prompts';
@@ -16,7 +19,6 @@ import prompts from 'prompts';
 import { PromptType } from 'prompts';
 import { ValueOrFunc as PromptValueOrFunc } from 'prompts';
 import _set from 'lodash.set';
-import type { WriteStream } from 'node:fs';
 import yargs from 'yargs';
 import type { Argv as YargsArgv } from 'yargs';
 import type { Options as YargsOptions } from 'yargs';
@@ -36,9 +38,6 @@ export declare const addPackageConfig: ({ patchConfig, rootDir, }: {
     rootDir: string;
 }) => void;
 
-/** 允许输出日志到控制台 */
-export declare const allowConsoleLog: () => boolean;
-
 /**
  * 申请使用临时目录
  * ---
@@ -66,6 +65,8 @@ assetPath: string) => boolean;
  */
 export declare const assetIsExitsAsync: (path: string) => Promise<boolean>;
 
+export { chalk }
+
 /** 检测当前正在变基 */
 export declare const checkCurrentIsRebasing: (rootDir: string) => boolean;
 
@@ -122,12 +123,17 @@ export declare const createSubcommand: (cliInfo: SubCliInfo) => CommandModule;
 
 export { _curry }
 
+export { dayjs }
+
 /** AES 解密 */
 export declare function decryptAES({ encryptedText, secretKey, }: {
     encryptedText: string;
     secretKey: string;
 }): string;
 
+/** done-coding 当前进程日志文件名symbol */
+declare const DONE_CODING_CURRENT_LOG_FILE_NAME_SYMBOL: unique symbol;
+
 /** done-coding 全局环境配置symbol */
 declare const DONE_CONFIG_ENV_CONFIG_GLOBAL_SYMBOL: unique symbol;
 
@@ -171,16 +177,19 @@ export declare function encryptAES({ text, secretKey, }: {
  * !!! 不作为主要的通信方式
  */
 export declare interface EnvConfig {
-    /** 调用模式 */
-    callMode: EnvConfigCallModeEnum;
     /** 系列
      * ----
      * 规划的系列 会有 cli 、server等
      * 默认会是 `${DONE_CODING_SERIES_DEFAULT}`
      */
     series: string;
-    /** 是否允许日志输出到控制台 */
-    consoleLog: boolean;
+    /**
+     * 是否允许日志输出到控制台
+     * ---
+     * boolean 类型 表示是否允许所有类型日志输出到控制台
+     * array 类型 表示允许的日志类型
+     */
+    consoleLog: boolean | OutputConsoleTypeEnum[];
     /** 日志输出路径 */
     logOutputDir: string;
     /**
@@ -189,12 +198,16 @@ export declare interface EnvConfig {
      * 新进程的日志从左侧进栈
      */
     processLogFileNameList: string[];
+    /** 自身或祖先进程是否被劫持进程创建 */
+    processCreateByHijack: boolean;
+    /** 自身或祖先进程被劫持进程创建 行为预设信息 */
+    processCreateByHijackPresetInfo?: EnvConfigProcessCreateByHijackPresetInfo;
 }
 
-/** 环境配置 - 调用模式枚举 */
-export declare enum EnvConfigCallModeEnum {
-    DEFAULT = "DEFAULT",
-    MCP = "MCP"
+/** 自身或祖先进程被劫持进程创建 行为预设信息 */
+export declare interface EnvConfigProcessCreateByHijackPresetInfo {
+    /** 开始等待用户输入前退出 */
+    beforeInputExit?: boolean;
 }
 
 /**
@@ -207,52 +220,42 @@ export declare enum EnvConfigProcessKeyEnum {
     GLOBAL_CONFIG_IMAGE = "GLOBAL_CONFIG_IMAGE"
 }
 
-/**
- * 工业级同步执行分发日志 (2026 稳定版)
- */
-export declare const execSyncWithLogDispatch: (command: string, options?: ExecSyncOptions) => string | Buffer;
-
 /** 文件添加执行权限 */
 export declare const fileAddX: (filePath: string) => void;
 
-/** 格式化日志流写入格式 */
-export declare const formatLogSteamWrite: ({ stream, type, content, }: {
-    /** 流类型 */
-    stream: WriteStream;
-    /** 日志类型 */
-    type: LogTypeEnum;
-    /** 日志内容 */
-    content: string;
-}) => boolean;
+/** 生成 获取答案的快捷函数 */
+export declare const generateGetAnswerSwiftFn: ({ presetAnswer, }: Pick<GetAnswerOptions<unknown, string>, "presetAnswer">) => <V = unknown, T extends string = string>(key: T, 
+/** 表单问询配置 */
+questionConfig?: Parameters<typeof prompts<T>>[0], 
+/** 默认值 */
+defaultValue?: V) => Promise<V | undefined>;
 
 export { _get }
 
-/** 快捷获取答案 */
-export declare const getAnswerSwift: <V = unknown, T extends string = string>(key: T, 
-/** 表单问询配置 */
-questionConfig: Parameters<typeof prompts<T>>[0]) => Promise<V>;
-
 /**
  * 获取答案 考虑mcp情况
  * ----
  * mcp 只拿预设值，非mcp优先拿默认值
  * 有预设值的场景: MCP
  */
-export declare const getAnswerWithMCP: <V = unknown, T extends string = string>({ isMCP, key, presetAnswer, defaultValue, questionConfig, }: {
-    /** 是否mcp场景 */
-    isMCP: boolean;
+export declare const getAnswer: <V = unknown, T extends string = string>({ key, presetAnswer, defaultValue, questionConfig, }: GetAnswerOptions<V, T>) => GetAnswerResult<V, T, typeof questionConfig>;
+
+/** 获取答案 考虑mcp情况 的选项 */
+export declare interface GetAnswerOptions<V, T extends string> {
     /** 表单key */
     key: T;
     /** 预设答案所在的对象 */
-    presetAnswer?: object & { [K in T]: any; };
+    presetAnswer?: object & {
+        [K in T]?: any;
+    };
     /** 默认值 */
     defaultValue?: V;
     /** 表单问询配置 */
-    questionConfig: Parameters<typeof prompts<T>>[0];
-}) => Promise<V>;
+    questionConfig?: Parameters<typeof prompts<T>>[0];
+}
 
-/** 获取调用模式 */
-export declare const getCallMode: () => EnvConfigCallModeEnum;
+/** 获取答案结果类型 */
+export declare type GetAnswerResult<V, T extends string, Q extends GetAnswerOptions<V, T>["questionConfig"]> = Promise<Q extends undefined ? V | undefined : V>;
 
 /** 获取cli模块【临时】目录[绝对路径] */
 export declare const getCliModuleTempDir: (moduleName: string) => string;
@@ -279,7 +282,7 @@ export declare const getCurrentBranchLastCommitList: ({ count, }?: {
 /** 获取当前分支名 */
 export declare const getCurrentBranchName: () => string | undefined;
 
-/** 获取自身进程日志文件名 */
+/** 获取当前进程日志文件名 */
 export declare const getCurrentProcessLogFileName: () => string;
 
 /** 获取编辑器类型 */
@@ -325,32 +328,6 @@ export declare const getLastReflogList: ({ count, filterItem, }?: {
  */
 export declare const getLogOutputDir: (persistent?: boolean) => string;
 
-/** 获取输出文字 */
-export declare const getLogText: ((type: LogTypeEnum, ...messages: unknown[]) => string) & {
-    /** 系统 */
-    system: (...messages: unknown[]) => string;
-    /** 成功 */
-    success: (...messages: unknown[]) => string;
-    /** /步骤 */
-    stage: (...messages: unknown[]) => string;
-    /** 提示信息 */
-    info: (...messages: unknown[]) => string;
-    /** 警告 */
-    warn: (...messages: unknown[]) => string;
-    /** 错误 */
-    error: (...messages: unknown[]) => string;
-    /** 跳过 */
-    skip: (...messages: unknown[]) => string;
-    /** 表格 */
-    table: (...messages: unknown[]) => string;
-};
-
-/** 格式: 2026-01-18 11:38:05 */
-export declare const getLogTime: () => string;
-
-/** 通过 LogTypeEnum 枚举值或者key */
-export declare const getLogTypeByValue: (value: LogTypeEnum) => string;
-
 /** 获取package.json文件内容 */
 export declare const getPackageJson: <R extends PackageJson>({ rootDir, }: {
     rootDir: string;
@@ -359,12 +336,12 @@ export declare const getPackageJson: <R extends PackageJson>({ rootDir, }: {
 /** 获取父级进程日志文件名 */
 export declare const getParentProcessLogFileName: () => string | undefined;
 
+/** 获取自身或祖先进程被劫持进程创建 行为预设信息 */
+export declare const getProcessCreateByHijackPresetInfo: () => EnvConfigProcessCreateByHijackPresetInfo | undefined;
+
 /** 获取环境变量 */
 export declare const getProcessEnv: <T>(keyInit: EnvConfigProcessKeyEnum, defaultValue?: T) => T | undefined;
 
-/** 获取当前进程对应的日志流 */
-export declare const getProcessLogStream: () => XFsWriteStream;
-
 /** 获取依赖包版本 */
 export declare const getRelyPkgVersion: <R extends PackageJson>({ rootDir, pkgJson, pkgName, isDevPkg, }: {
     rootDir: string;
@@ -539,6 +516,33 @@ export declare interface GitRemoteInfo {
     url?: string;
 }
 
+/**
+ * 劫持子进程
+ * -----
+ * 用途:
+ * 如 mcp模式禁止控制台输出、process.exit等操作,需要shim进程拦截控制台输出及退出
+ * 如果mcp禁止输入 那么监听到开始等待用户输入事件后 那么直接中断子进程
+ */
+export declare const hijackChildProcess: ({ command, args, env, cwd, beforeInputExit, }: HijackChildProcessOptions) => Promise<{
+    success: boolean;
+    code: number | null;
+    signal: NodeJS.Signals | null;
+    stdout: string;
+    stderr: string;
+}>;
+
+/** 劫持子进程选项 */
+export declare interface HijackChildProcessOptions extends EnvConfigProcessCreateByHijackPresetInfo {
+    /** 命令 */
+    command: string;
+    /** 参数 */
+    args: string[];
+    /** 工作目录 */
+    cwd: string;
+    /** 环境变量 */
+    env: NodeJS.ProcessEnv;
+}
+
 export declare enum HooksNameEnum {
     /** 预提交 */
     PRE_COMMIT = "pre-commit",
@@ -567,19 +571,6 @@ export declare const initConfigFile: <T>(content: T, argv: CliHandlerArgv<InitCo
 /** 初始化文件选项 */
 export declare type InitConfigFileOptions = ConfigFileCommonOptions;
 
-/**
- * 初始化环境配置
- * ---
- * !!! 顶级进程才调用且只能调用一次
- * 非顶级进程调用会忽略入参 即优先使用父级设置的进程配置
- * ---
- * 即顶级进程调用
- * 非顶级进程通过进程环境继承
- */
-export declare const initEnvConfig: ({ series, ...otherConfig }: Partial<Pick<EnvConfig, "callMode" | "consoleLog"> & {
-    series: string;
-}>) => EnvConfig;
-
 /** 初始化配置文件通用处理器 */
 export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<InitConfigFileOptions>, { onFileGenerated, edit, }?: {
     /** 文件已生成 */
@@ -590,55 +581,13 @@ export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<Ini
 /** 是http git地址 */
 export declare const isHttpGitUrl: (url: string) => boolean;
 
-/** 是mcp模式 */
-export declare const isMcpMode: () => boolean;
-
 /** 是 ssh git地址 */
 export declare const isSshGitUrl: (url: string) => boolean;
 
 export { json5 }
 
-/** 日志 */
-export declare const log: ((type: LogTypeEnum, ...messages: unknown[]) => void) & {
-    /** 系统 */
-    system: (...messages: unknown[]) => void;
-    /** 成功 */
-    success: (...messages: unknown[]) => void;
-    /** /步骤 */
-    stage: (...messages: unknown[]) => void;
-    /** 提示信息 */
-    info: (...messages: unknown[]) => void;
-    /** 警告 */
-    warn: (...messages: unknown[]) => void;
-    /** 错误 */
-    error: (...messages: unknown[]) => void;
-    /** 跳过 */
-    skip: (...messages: unknown[]) => void;
-    /** 表格 */
-    table: (...messages: unknown[]) => void;
-};
-
-export declare type LogParams = [type: LogTypeEnum, ...messages: unknown[]];
-
-/** 日志类型 */
-export declare enum LogTypeEnum {
-    /** 系统 */
-    SYSTEM = "magenta",
-    /** 成功 */
-    SUCCESS = "greenBright",
-    /** 步骤 */
-    STAGE = "blue",
-    /** 提示信息 */
-    INFO = "white",
-    /** 警告 */
-    WARN = "yellow",
-    /** 错误 */
-    ERROR = "redBright",
-    /** 跳过 */
-    SKIP = "dim",
-    /** ---- 表格 ---- */
-    TABLE = "table"
-}
+/** 日志文件输出实例 */
+export declare const logger: OutputLogFile;
 
 /**
  * 查找目标文件或目录
@@ -653,6 +602,9 @@ target: string, { currentDir, isFindFarthest, }?: {
 /** 用编辑器打开文件 */
 export declare const openFileInEditor: (path: string, editorType: EditorTypeEnum) => void;
 
+/** 控制台输出实例 */
+export declare const outputConsole: OutputConsole;
+
 /** package.json文件内容 */
 export declare interface PackageJson {
     name: string;
@@ -665,9 +617,20 @@ export declare interface PackageJson {
     peerDependencies?: Record<string, string>;
 }
 
+/**
+ * 参数转cli参数
+ * -----
+ * yargs 参数格式：
+ * --key=value
+ */
+export declare const params2cliParams: (params: Record<string, any>) => string[];
+
 /** 路径是否安全 */
 export declare const pathIsSafe: (path?: string) => boolean;
 
+/** 是否被劫持进程创建 */
+export declare const processIsHijacked: () => boolean;
+
 /** 进程值变量初始值 */
 export declare interface ProcessValueInit<T> {
     value: T;
@@ -794,17 +757,20 @@ export declare const SUPPORT_GET_COMMIT_BY_HOOKS_NAMES: readonly [HooksNameEnum.
 
 export declare type SupportGetCommitByHookName = (typeof SUPPORT_GET_COMMIT_BY_HOOKS_NAMES)[number];
 
-export declare const uuidv4: () => `${string}-${string}-${string}-${string}-${string}`;
-
 /**
- * fs.WriteStream 确实没有直接声明 fd 属性（虽然运行时它确实存在）。这是因为 fd 是由底层的物理文件句柄分配的，其类型定义在内部较为隐蔽。
+ * 更新环境配置
+ * ---
+ * 可以多次调用 不限制进程层级
  */
-declare interface XFsWriteStream extends fs.WriteStream {
-    fd?: number;
-}
+export declare const updateEnvConfig: ({ series, consoleLog, }: Partial<Pick<EnvConfig, "consoleLog" | "series">>) => EnvConfig;
+
+export declare const uuidv4: () => `${string}-${string}-${string}-${string}-${string}`;
 
 export declare interface XGlobalThis {
-    [DONE_CONFIG_ENV_CONFIG_GLOBAL_SYMBOL]: EnvConfig;
+    /** 全局配置 */
+    [DONE_CONFIG_ENV_CONFIG_GLOBAL_SYMBOL]?: EnvConfig;
+    /** 当前进程日志文件名 */
+    [DONE_CODING_CURRENT_LOG_FILE_NAME_SYMBOL]?: string;
 }
 
 /** prompts 拓展 */