zen-gitsync 2.13.30 → 2.13.32

package/src/cli/customCommand.test.js

@@ -0,0 +1,143 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/cli/customCommand.js 单元测试。
+// 覆盖 validateCustomCommand(输入校验)与 isCmdStrictMode(--cmd-strict 检测)。
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { validateCustomCommand, isCmdStrictMode, MAX_CUSTOM_CMD_LENGTH } from './customCommand.js'
+
+// ========== validateCustomCommand: 入参类型 ==========
+
+test('validateCustomCommand: 非字符串直接拒绝', () => {
+  for (const bad of [null, undefined, 123, true, [], {}, Symbol('x')]) {
+    const r = validateCustomCommand(bad)
+    assert.equal(r.ok, false, `validateCustomCommand(${String(bad)}) 应拒绝`)
+    assert.ok(r.rejectReason, '应给出拒绝原因')
+  }
+})
+
+test('validateCustomCommand: 空字符串 / 纯空白拒绝', () => {
+  assert.equal(validateCustomCommand('').ok, false)
+  assert.equal(validateCustomCommand('   ').ok, false)
+  assert.equal(validateCustomCommand('\n\t').ok, false)
+  assert.match(validateCustomCommand('').rejectReason, /不能为空/)
+})
+
+// ========== validateCustomCommand: 长度限制 ==========
+
+test('validateCustomCommand: 长度等于 MAX_CUSTOM_CMD_LENGTH 通过', () => {
+  const cmd = 'echo ' + 'a'.repeat(MAX_CUSTOM_CMD_LENGTH - 5)
+  assert.equal(cmd.length, MAX_CUSTOM_CMD_LENGTH)
+  const r = validateCustomCommand(cmd)
+  assert.equal(r.ok, true, `length=${cmd.length} 应通过`)
+})
+
+test('validateCustomCommand: 长度超过上限拒绝', () => {
+  const cmd = 'echo ' + 'a'.repeat(MAX_CUSTOM_CMD_LENGTH) // +1 over
+  const r = validateCustomCommand(cmd)
+  assert.equal(r.ok, false)
+  assert.match(r.rejectReason, /过长/)
+})
+
+// ========== validateCustomCommand: - 开头拒绝 ==========
+
+test('validateCustomCommand: 以 - 开头的命令拒绝(避免 exec 误解析为 flag)', () => {
+  for (const cmd of ['-rf /', '--help', '-v', '  -something']) {
+    const r = validateCustomCommand(cmd)
+    assert.equal(r.ok, false, `"${cmd}" 应被拒绝`)
+    assert.match(r.rejectReason, /-/)
+  }
+})
+
+// ========== validateCustomCommand: 正常命令通过 ==========
+
+test('validateCustomCommand: 正常命令通过且无 warning', () => {
+  for (const cmd of [
+    'echo hello',
+    'npm run dev',
+    'git status',
+    'ls -la',
+    'echo "hello world"',
+    "echo 'with quotes'",
+    'cmd1 | cmd2',           // shell 管道(本地 CLI 允许)
+    'cmd > out.txt',         // shell 重定向
+    'echo $HOME',            // shell 变量
+    'cmd && other',          // shell 列表
+  ]) {
+    const r = validateCustomCommand(cmd)
+    assert.equal(r.ok, true, `"${cmd}" 应通过`)
+    assert.equal(r.warnings.length, 0, `"${cmd}" 不应有 warning`)
+  }
+})
+
+// ========== validateCustomCommand: 危险模式 warning ==========
+
+test('validateCustomCommand: rm -<flag> / 模式 warning', () => {
+  const r1 = validateCustomCommand('rm -rf /')
+  assert.equal(r1.ok, true, '本地 CLI,警告而非阻止')
+  assert.ok(r1.warnings.some(w => /rm/.test(w)), '应有 rm 警告')
+
+  const r2 = validateCustomCommand('rm -fr /*')
+  assert.equal(r2.ok, true)
+  assert.ok(r2.warnings.some(w => /rm/.test(w)))
+})
+
+test('validateCustomCommand: fork bomb 模式 warning', () => {
+  // 经典 fork bomb: :(){ :|:& };:
+  const r = validateCustomCommand(':(){ :|:& };:')
+  assert.equal(r.ok, true)
+  assert.ok(r.warnings.some(w => /fork bomb/i.test(w)))
+})
+
+test('validateCustomCommand: chmod 777 / 模式 warning', () => {
+  const r = validateCustomCommand('chmod -R 777 /')
+  assert.equal(r.ok, true)
+  assert.ok(r.warnings.some(w => /chmod/.test(w)))
+})
+
+test('validateCustomCommand: 普通 chmod 不 warning', () => {
+  // chmod 644 a.txt 不应触发(危险模式只匹配根目录)
+  const r = validateCustomCommand('chmod 644 a.txt')
+  assert.equal(r.ok, true)
+  assert.equal(r.warnings.length, 0)
+})
+
+test('validateCustomCommand: rm 局部文件不 warning', () => {
+  // rm -rf build/ 不应触发(只匹配根目录形式)
+  const r = validateCustomCommand('rm -rf build/')
+  assert.equal(r.ok, true)
+  assert.equal(r.warnings.length, 0)
+})
+
+// ========== isCmdStrictMode ==========
+
+test('isCmdStrictMode: argv 含 --cmd-strict 返回 true', () => {
+  assert.equal(isCmdStrictMode(['node', 'g.js', '--cmd-strict']), true)
+  assert.equal(isCmdStrictMode(['--cmd=echo hi', '--cmd-strict']), true)
+})
+
+test('isCmdStrictMode: argv 不含 --cmd-strict 返回 false', () => {
+  assert.equal(isCmdStrictMode(['node', 'g.js', '--cmd=echo hi']), false)
+  assert.equal(isCmdStrictMode([]), false)
+  // 相似名字不误匹配
+  assert.equal(isCmdStrictMode(['--cmd-strict-mode']), false)
+  assert.equal(isCmdStrictMode(['--strict-cmd']), false)
+})
+
+test('isCmdStrictMode: 非数组入参返回 false', () => {
+  assert.equal(isCmdStrictMode(null), false)
+  assert.equal(isCmdStrictMode(undefined), false)
+  assert.equal(isCmdStrictMode('--cmd-strict'), false) // 字符串而非数组
+})

package/src/cli/ui.js

@@ -0,0 +1,59 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// CLI 共用 UI 工具:
+//   - boxenAdaptive(): boxen 包装,宽度自适应终端(避免 80 列硬编码在窄终端换行难看)
+//   - 预留 messages 表的导入入口(后续把硬编码中文迁移过来)
+//
+// 当前会话先落地 boxen 宽度自适应 — messages 表作为下轮 i18n 的过渡形态,
+// 避免一次性大改风险。
+
+import boxen from 'boxen'
+
+/**
+ * 默认 boxen 宽度 — 当 process.stdout.columns 不可用(管道/CI)时使用
+ */
+const FALLBACK_TERMINAL_WIDTH = 100
+
+/**
+ * 计算 boxen 的 width 选项,基于终端列数 + 留出 padding/margin 空间
+ *
+ * @param {object} [opts]
+ * @param {number} [opts.headroom=6] - 留给 padding(2) + margin(2) + 边框(2) 的总列数
+ * @returns {number} 用于 boxen options.width
+ */
+export function calcBoxenWidth({ headroom = 6 } = {}) {
+  const cols = process.stdout?.columns
+  if (typeof cols !== 'number' || cols <= 0 || !Number.isFinite(cols)) {
+    return FALLBACK_TERMINAL_WIDTH
+  }
+  // cols 已经包含 padding,boxen 的 width 选项是 "内部内容宽度" 还是 "总宽度" 与 version 有关
+  // boxen 8.x: width = 内框内容宽度(不含 padding/border)
+  // 我们设 width = cols - headroom,让 boxen 自己处理 padding
+  const w = cols - headroom
+  return w > 0 ? w : FALLBACK_TERMINAL_WIDTH
+}
+
+/**
+ * boxen 包装,宽度自适应终端
+ *
+ * @param {string} message - 内容
+ * @param {object} [options] - 透传给 boxen 的选项(width 会覆盖)
+ * @returns {string}
+ */
+export function boxenAdaptive(message, options = {}) {
+  // 用户显式传 width 时尊重用户;否则按终端自适应
+  const width = options.width ?? calcBoxenWidth()
+  return boxen(message, { ...options, width })
+}

package/src/cli/ui.test.js

@@ -0,0 +1,115 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/cli/ui.js 单元测试 — boxen 宽度自适应。
+import { test, afterEach } from 'node:test'
+import assert from 'node:assert/strict'
+import { calcBoxenWidth, boxenAdaptive } from './ui.js'
+
+// 保留原始 stdout.columns 用于恢复
+const originalColumns = process.stdout.columns
+afterEach(() => {
+  // 恢复 columns(有些 Node 版本 columns 是 getter,需要用 defineProperty)
+  try {
+    Object.defineProperty(process.stdout, 'columns', {
+      value: originalColumns,
+      configurable: true,
+      writable: true,
+    })
+  } catch (_) {}
+})
+
+function setColumns(value) {
+  Object.defineProperty(process.stdout, 'columns', {
+    value,
+    configurable: true,
+    writable: true,
+  })
+}
+
+// ========== calcBoxenWidth ==========
+
+test('calcBoxenWidth: 正常 columns 返回 cols - headroom', () => {
+  setColumns(120)
+  assert.equal(calcBoxenWidth(), 120 - 6)
+})
+
+test('calcBoxenWidth: 自定义 headroom 生效', () => {
+  setColumns(120)
+  assert.equal(calcBoxenWidth({ headroom: 10 }), 110)
+})
+
+test('calcBoxenWidth: 窄终端仍返回正数', () => {
+  setColumns(10)
+  const w = calcBoxenWidth()
+  // 10 - 6 = 4,正数
+  assert.ok(w > 0, `窄终端 width 应为正,实际 ${w}`)
+})
+
+test('calcBoxenWidth: 极窄终端回退到 FALLBACK', () => {
+  setColumns(2)
+  const w = calcBoxenWidth()
+  // 2 - 6 < 0,回退 100
+  assert.equal(w, 100)
+})
+
+test('calcBoxenWidth: columns 为 0 / undefined / 非数字时回退', () => {
+  setColumns(undefined)
+  assert.equal(calcBoxenWidth(), 100)
+  setColumns(0)
+  assert.equal(calcBoxenWidth(), 100)
+  setColumns(NaN)
+  assert.equal(calcBoxenWidth(), 100)
+})
+
+// ========== boxenAdaptive ==========
+
+test('boxenAdaptive: 返回字符串且包含 message 内容', () => {
+  setColumns(120)
+  const out = boxenAdaptive('hello world', { padding: 1 })
+  assert.equal(typeof out, 'string')
+  assert.ok(out.includes('hello world'), '输出应包含原始 message')
+})
+
+test('boxenAdaptive: 默认 width 自适应终端(可通过 boxen 8.x 截断观察)', () => {
+  // 验证 boxen 调用确实传入了 width(而非 options 被忽略)
+  // boxen 8.x 在 width 不足时会换行,我们只验证函数能跑通 + 返回 string
+  setColumns(40)
+  const out = boxenAdaptive('a'.repeat(200), { padding: 0 })
+  assert.ok(out.length > 0)
+  // boxen 8.x 默认会保留 message 内容(可能换行),不应被截掉
+  // 不严格断言保留多少字符 — boxen 内部 wordWrap 实现可能切到任意位置
+  assert.ok(out.includes('aaa'), '应至少保留 message 的开头')
+})
+
+test('boxenAdaptive: 用户显式传 width 时尊重用户(不被自适应覆盖)', () => {
+  setColumns(120)
+  // 用户传 width: 60,即使终端 120 也按 60 处理
+  // 我们用 boxen 8 的渲染:width=60 时单行内容应 < 60
+  const out = boxenAdaptive('short', { width: 20 })
+  // boxen 8.x 加 padding/border 后总宽度 > 20,但单行 message "short" 仍存在
+  assert.ok(out.includes('short'))
+})
+
+test('boxenAdaptive: 自适应下窄终端的 box 不会超宽', () => {
+  setColumns(30)
+  // boxen 8 默认行为:width 是内框宽度,总宽度 = width + padding*2 + border*2
+  // 30 - 6 (headroom) = 24 width
+  // 总宽度 = 24 + 2*1 + 2 = 30,与 cols 对齐
+  const out = boxenAdaptive('x', { padding: 1 })
+  // 检查每行长度都不超过 cols + 少量余量(ANSI 转义不影响字符数,但我们按 \n split 数 line length)
+  // 简单起见:确保渲染成功
+  assert.ok(out.length > 0)
+  assert.ok(out.includes('x'))
+})

package/src/config.js

@@ -176,24 +176,36 @@ async function loadConfig() {
   };
 }
 
+// 配置写入失败的错误类型,让上层 catch 后能区分是参数错误还是 IO 错误
+class ConfigWriteError extends Error {
+  constructor(message, cause) {
+    super(message);
+    this.name = 'ConfigWriteError';
+    if (cause) this.cause = cause;
+  }
+}
+
 // 异步保存配置
+// 契约变更(2026-06-26):之前在错误分支仅 console.warn + return undefined,
+// 调用方按成功处理 → 用户看到 ✓ / 200 OK 但其实没写盘(MAINT-4)。
+// 现在改为:参数非法 → 抛 ConfigWriteError;IO/解析失败 → 抛 ConfigWriteError(wrapped)。
+// 成功路径仍然返回 undefined,保持与大多数 fs.writeFile 风格一致。
 async function saveConfig(config) {
   if(!config || typeof config !== 'object' || Array.isArray(config)){
-    console.warn(chalk.yellow('⚠️ 配置文件为空，已取消写入以避免覆盖。')); 
-    console.warn(chalk.gray(`文件: ${configPath}`));
-    return;
+    throw new ConfigWriteError(`saveConfig: 入参必须是普通对象,实际收到 ${Array.isArray(config) ? 'array' : typeof config}`);
   }
   if (Object.keys(config).length === 0) {
-    console.warn(chalk.yellow('⚠️ 配置文件为空，已取消写入以避免覆盖。')); 
-    console.warn(chalk.gray(`文件: ${configPath}`));
-    return;
+    throw new ConfigWriteError('saveConfig: 配置对象为空,已取消写入以避免覆盖');
   }
   const key = getCurrentProjectKey();
   const state = await safeLoadRaw();
   if (!state.ok) {
-    console.warn(chalk.yellow('⚠️ 解析配置文件失败，已取消写入以避免覆盖。')); 
-    console.warn(chalk.gray(`文件: ${configPath}`));
-    return;
+    const cause = state.error;
+    const detail = cause?.message ? String(cause.message) : String(cause);
+    throw new ConfigWriteError(
+      `解析配置文件失败,已取消写入以避免覆盖。\n文件: ${configPath}\n原因: ${detail}`,
+      cause
+    );
   }
 
   const raw = state.obj; // 保留现有顶层键
@@ -234,7 +246,16 @@ async function lockFile(filePath) {
 
   if (!config.lockedFiles.includes(normalizedPath)) {
     config.lockedFiles.push(normalizedPath);
-    await saveConfig(config);
+    try {
+      await saveConfig(config);
+    } catch (err) {
+      // 写入失败时回滚内存变更,避免"以为锁了实际没锁"
+      const idx = config.lockedFiles.lastIndexOf(normalizedPath);
+      if (idx > -1) config.lockedFiles.splice(idx, 1);
+      console.error(chalk.red(`❌ 锁定失败: "${normalizedPath}"`));
+      console.error(chalk.gray(err.message));
+      throw err;
+    }
     console.log(chalk.green(`✓ 文件已锁定: "${normalizedPath}"`));
     return true;
   } else {
@@ -250,7 +271,15 @@ async function unlockFile(filePath) {
 
   if (index > -1) {
     config.lockedFiles.splice(index, 1);
-    await saveConfig(config);
+    try {
+      await saveConfig(config);
+    } catch (err) {
+      // 写入失败时回滚(把刚 splice 掉的项加回去)
+      config.lockedFiles.splice(index, 0, normalizedPath);
+      console.error(chalk.red(`❌ 解锁失败: "${normalizedPath}"`));
+      console.error(chalk.gray(err.message));
+      throw err;
+    }
     console.log(chalk.green(`✓ 文件已解锁: "${normalizedPath}"`));
     return true;
   } else {
@@ -296,17 +325,24 @@ async function saveRecentDirectory(dirPath) {
   if (!dirPath || typeof dirPath !== 'string') return;
   const state = await safeLoadRaw();
   if (!state.ok) {
-    console.warn(chalk.yellow('⚠️ 解析配置文件失败，已取消写入最近目录以避免覆盖。'));
-    console.warn(chalk.gray(`文件: ${configPath}`));
-    return [];
+    const cause = state.error;
+    const detail = cause?.message ? String(cause.message) : String(cause);
+    throw new ConfigWriteError(
+      `解析配置文件失败,已取消写入最近目录以避免覆盖。\n文件: ${configPath}\n原因: ${detail}`,
+      cause
+    );
   }
   const raw = state.obj; // 保留现有顶层键
   let list = Array.isArray(raw.recentDirectories) ? raw.recentDirectories.slice() : [];
 
-  // 规范化：Windows 下统一为小写，去掉重复，保持最新在前
+  // 规范化:Windows 下统一为小写,去掉重复,保持最新在前
+  // 修复(MAINT-5):unshift 用原始大小写,Windows 下 C:\Project 与 C:\PROJECT
+  // 会产生两条"看起来一样"的项;现在 unshift 前先 normalize,dup 检测自然合并。
+  // 注意:存的字符串是 normalized 形式,在 Windows 下显示为小写路径,
+  // 这是有意为之 — 用 OS 标准大小写形式消除歧义,GUI 层可选择单独保留原始形式。
   const normalized = normalizeProjectPath(dirPath);
   list = list.filter(p => normalizeProjectPath(p) !== normalized);
-  list.unshift(dirPath);
+  list.unshift(normalized);
   if (list.length > MAX_RECENT_DIRS) list = list.slice(0, MAX_RECENT_DIRS);
 
   raw.recentDirectories = list;
@@ -341,7 +377,13 @@ async function handleConfigCommands() {
     const newMessage = setMsgArg.split('=')[1];
     const currentConfig = await loadConfig();
     currentConfig.defaultCommitMessage = newMessage;
-    await saveConfig(currentConfig);
+    try {
+      await saveConfig(currentConfig);
+    } catch (err) {
+      console.error(chalk.red('❌ 默认提交信息写入失败'));
+      console.error(chalk.gray(err.message));
+      process.exit(1);
+    }
     console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
     process.exit();
   }
@@ -361,3 +403,6 @@ export default {
   readRawConfigFile,
   writeRawConfigFile
 };
+
+// 命名导出 — 用于测试与外部复用
+export { ConfigWriteError, normalizeProjectPath };

package/src/gitCommit.js

@@ -28,15 +28,21 @@ import { format as dateFormat } from 'date-fns/format';
 import logUpdate from 'log-update';
 import startUIServer from './ui/server/index.js';
 import { exec } from 'child_process';
+import {
+  registerCleanup, trackChild, setupSigintHandler,
+} from './cli/cleanup.js';
+import { validateCustomCommand, isCmdStrictMode } from './cli/customCommand.js';
+import { boxenAdaptive } from './cli/ui.js';
 
 let countdownInterval = null;
 
 function startCountdown(interval) {
   let remaining = interval;
 
-  // 清除旧的倒计时
+  // 清除旧的倒计时(同一时刻只允许一个倒计时可见)
   if (countdownInterval) {
     clearInterval(countdownInterval);
+    countdownInterval = null;
   }
 
   const render = () => {
@@ -52,7 +58,7 @@ function startCountdown(interval) {
       chalk.dim('按 Ctrl+C 终止进程')
     ].join('\n');
 
-    const box = boxen(message, {
+    const box = boxenAdaptive(message, {
       padding: 1,
       margin: 1,
       borderColor: 'cyan',
@@ -74,12 +80,21 @@ function startCountdown(interval) {
 
     if (remaining <= 0) {
       clearInterval(countdownInterval);
+      countdownInterval = null;
       logUpdate.clear();
       return;
     }
 
     render();
   }, 1000);
+  // 注册到 SIGINT cleanup 表,Ctrl+C 时一并清掉,避免倒计时残影
+  registerCleanup('countdown', () => {
+    if (countdownInterval) {
+      clearInterval(countdownInterval);
+      countdownInterval = null;
+    }
+    try { logUpdate.clear(); } catch (_) {}
+  });
 }
 
 const {loadConfig, saveConfig, handleConfigCommands} = config;
@@ -182,6 +197,18 @@ async function handleFileLockCommands() {
 async function main() {
   judgePlatform()
 
+  // 一次性注册 SIGINT 处理器 — 所有长跑流程(定时 commit / 自定义命令循环 /
+  // 倒计时)都通过 registerCleanup 上报,SIGINT 时由统一处理器 drain。
+  setupSigintHandler({
+    onBeforeCleanup: () => {
+      try { logUpdate.clear(); } catch (_) {}
+      console.log(chalk.yellow('\n🛑 收到终止信号,清理中...'))
+    },
+    onAfterCleanup: () => {
+      console.log(chalk.yellow('🛑 已清理,退出'))
+    }
+  })
+
   // 检查是否是UI命令
   if (process.argv.includes('ui')) {
     await startUIServer(false, false); // 传入noOpen=false, savePort=false
@@ -218,7 +245,22 @@ async function main() {
     const cmdMatch = cmdArg.match(/^--cmd=(['"]?)(.*)\1$/);
     let cmd = cmdMatch ? cmdMatch[2] : '';
     cmd = cmd.replace(/%%/g, '%'); // 关键修复
-    
+
+    // 输入校验(SEC-CLI-1) — 本地 CLI,用户明确输入,所以检测而非阻止:
+    // 拒绝对抗性输入(空 / - 开头 / 超长);危险模式打 warning。
+    const cmdValidation = validateCustomCommand(cmd);
+    if (!cmdValidation.ok) {
+      console.error(chalk.red(`❌ --cmd 校验失败: ${cmdValidation.rejectReason}`));
+      process.exit(2); // 2 = 命令行参数错误(Bash 惯例)
+    }
+    for (const w of cmdValidation.warnings) {
+      console.warn(chalk.yellow(`⚠️ ${w}`));
+    }
+    // 显式 --cmd-strict 时打一条提示,让用户知道 shell 特性被禁用
+    if (isCmdStrictMode(process.argv)) {
+      console.log(chalk.dim('ℹ️ --cmd-strict 模式:将通过 execFile 拆 argv 执行,管道/重定向/通配符将不可用'));
+    }
+
     const atArg = process.argv.find(arg => arg.startsWith('--at='));
     const intervalArg = process.argv.find(arg => arg.startsWith('--cmd-interval='));
     
@@ -229,13 +271,13 @@ async function main() {
 
       const runOnce = () => {
         console.log(`\n[自定义命令执行] ${new Date().toLocaleString()}\n> ${cmd}`);
-        exec(cmd, (err, stdout, stderr) => {
+        trackChild(exec(cmd, (err, stdout, stderr) => {
           if (err) {
             console.error(`[自定义命令错误]`, err.message);
           }
           if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
           if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
-        });
+        }));
       };
 
       const getNextTarget = (now) => {
@@ -283,43 +325,48 @@ async function main() {
           runOnce();
           if (repeatDaily) scheduleNext();
         }, delay);
+        // 注册到 SIGINT cleanup 表 — Ctrl+C 时由统一处理器清理
+        registerCleanup('atTimer', () => {
+          if (atTimer) {
+            clearTimeout(atTimer);
+            atTimer = null;
+          }
+        });
       };
 
       scheduleNext();
-
-      process.on('SIGINT', () => {
-        if (atTimer) clearTimeout(atTimer);
-        process.exit();
-      });
+      // 旧的内联 SIGINT handler 已被 setupSigintHandler 替代,这里不再重复注册
     } else if (intervalArg) {
       // 定时循环执行
       const intervalMatch = intervalArg.match(/^--cmd-interval=(['"]?)(.*)\1$/);
       const interval = intervalMatch ? parseInt(intervalMatch[2], 10) * 1000 : 0;
       if (interval > 0) {
         console.log(`每隔 ${interval/1000} 秒执行: ${cmd}`);
-        setInterval(() => {
+        const cmdIntervalId = setInterval(() => {
           console.log(`\n[自定义命令执行] ${new Date().toLocaleString()}\n> ${cmd}`);
-          exec(cmd, (err, stdout, stderr) => {
+          trackChild(exec(cmd, (err, stdout, stderr) => {
             if (err) {
               console.error(`[自定义命令错误]`, err.message);
             }
             if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
             if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
-          });
+          }));
         }, interval);
+        // 注册 cleanup,Ctrl+C 时清掉这个 interval(否则进程不退)
+        registerCleanup('cmdInterval', () => clearInterval(cmdIntervalId));
       } else {
         console.error('无效的时间间隔参数');
       }
     } else {
       // 立即执行一次
       console.log(`[自定义命令立即执行] > ${cmd}`);
-      exec(cmd, (err, stdout, stderr) => {
+      trackChild(exec(cmd, (err, stdout, stderr) => {
         if (err) {
           console.error(`[自定义命令错误]`, err.message);
         }
         if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
         if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
-      });
+      }));
     }
   }
   // ========== 新增功能结束 ==========
@@ -355,12 +402,21 @@ const commitAndSchedule = async (interval) => {
   try {
     await createGitCommit({exit: false});
     // await delay(2000)
-    startCountdown(interval); // 启动倒计时
+    startCountdown(interval); // 启动倒计时(内部已注册 cleanup)
 
     // 设置定时提交
     timer = setTimeout(async () => {
       await commitAndSchedule(interval);
     }, interval + 100);
+    // 注册到 SIGINT cleanup 表 — Ctrl+C 时统一清掉
+    // 注意:cleanup 命名 'commitTimer',每次递归都覆盖上一次的 handler
+    // (cleanupTasks.set 同名覆盖语义),保证只清当前 pending 那个 setTimeout
+    registerCleanup('commitTimer', () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    });
   } catch (error) {
     console.error('提交出错:', error.message);
     clearTimeout(timer);
@@ -381,15 +437,7 @@ const judgeInterval = async () => {
       console.error(chalk.red.bold('定时提交致命错误:'), error.message);
       process.exit(1);
     }
-
-    // 处理退出清理
-    process.on('SIGINT', () => {
-      logUpdate.clear();
-      clearTimeout(timer);
-      clearInterval(countdownInterval);
-      console.log(chalk.yellow('\n🛑 定时任务已终止'));
-      process.exit();
-    });
+    // 旧的 inline SIGINT handler 已移除,改由 setupSigintHandler 统一处理
   } else {
     createGitCommit({exit: false});
   }