clawt 2.17.0 → 2.18.0

package/src/constants/messages/update.ts

@@ -0,0 +1,15 @@
+/** 各包管理器对应的全局安装命令 */
+export const UPDATE_COMMANDS: Record<string, string> = {
+  npm: 'npm i -g clawt',
+  pnpm: 'pnpm add -g clawt',
+  yarn: 'yarn global add clawt',
+} as const;
+
+/** 更新检查相关提示消息 */
+export const UPDATE_MESSAGES = {
+  /** 版本更新提示 */
+  UPDATE_AVAILABLE: (currentVersion: string, latestVersion: string) =>
+    `clawt 有新版本可用: ${currentVersion} → ${latestVersion}`,
+  /** 更新操作提示 */
+  UPDATE_HINT: (command: string) => `执行 ${command} 进行更新`,
+} as const;

package/src/constants/messages/validate.ts

@@ -59,9 +59,6 @@ export const VALIDATE_MESSAGES = {
   /** 自动 sync 开始提示 */
   VALIDATE_AUTO_SYNC_START: (branch: string) =>
     `正在自动同步主分支到 ${branch} ...`,
-  /** 自动 sync 存在冲突，无法重试 */
-  VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath: string) =>
-    `同步存在冲突，请进入目标 worktree 手动解决冲突后重试\n  cd ${worktreePath}`,
   /** 用户拒绝自动 sync */
   VALIDATE_AUTO_SYNC_DECLINED: (branch: string) =>
     `请手动执行 clawt sync -b ${branch} 同步主分支后重试`,

package/src/constants/paths.ts

@@ -18,3 +18,6 @@ export const VALIDATE_SNAPSHOTS_DIR = join(CLAWT_HOME, 'validate-snapshots');
 
 /** Claude Code 项目会话目录 ~/.claude/projects/ */
 export const CLAUDE_PROJECTS_DIR = join(homedir(), '.claude', 'projects');
+
+/** 更新检查缓存文件路径 ~/.clawt/update-check.json */
+export const UPDATE_CHECK_PATH = join(CLAWT_HOME, 'update-check.json');

package/src/constants/update.ts

@@ -0,0 +1,11 @@
+/** 更新检查间隔，24 小时（毫秒） */
+export const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
+
+/** npm registry 查询地址 */
+export const NPM_REGISTRY_URL = 'https://registry.npmjs.org/clawt/latest';
+
+/** npm registry 请求超时时间（毫秒） */
+export const NPM_REGISTRY_TIMEOUT_MS = 5000;
+
+/** 包名 */
+export const PACKAGE_NAME = 'clawt';

package/src/index.ts

@@ -3,7 +3,7 @@ import { Command } from 'commander';
 import { ClawtError } from './errors/index.js';
 import { logger, enableConsoleTransport } from './logger/index.js';
 import { EXIT_CODES } from './constants/index.js';
-import { printError, ensureClawtDirs, loadConfig, applyAliases } from './utils/index.js';
+import { printError, ensureClawtDirs, loadConfig, applyAliases, checkForUpdates } from './utils/index.js';
 import { registerListCommand } from './commands/list.js';
 import { registerCreateCommand } from './commands/create.js';
 import { registerRemoveCommand } from './commands/remove.js';
@@ -83,4 +83,16 @@ process.on('unhandledRejection', (reason) => {
   process.exit(EXIT_CODES.ERROR);
 });
 
-program.parse(process.argv);
+/**
+ * 异步主入口函数
+ * 执行命令解析后，根据配置项决定是否进行自动更新检查
+ */
+async function main(): Promise<void> {
+  await program.parseAsync(process.argv);
+
+  if (config.autoUpdate) {
+    await checkForUpdates(version);
+  }
+}
+
+main();

package/src/types/config.ts

@@ -14,6 +14,8 @@ export interface ClawtConfig {
   terminalApp: string;
   /** 命令别名映射，键为别名，值为目标内置命令名 */
   aliases: Record<string, string>;
+  /** 是否启用自动更新检查 */
+  autoUpdate: boolean;
 }
 
 /** 单个配置项的完整定义（默认值 + 描述） */

package/src/utils/index.ts

@@ -67,4 +67,5 @@ export { detectTerminalApp, openCommandInNewTerminalTab } from './terminal.js';
 export { truncateTaskDesc, printDryRunPreview } from './dry-run.js';
 export { applyAliases } from './alias.js';
 export { isValidConfigKey, getValidConfigKeys, parseConfigValue, promptConfigValue, formatConfigValue } from './config-strategy.js';
+export { checkForUpdates } from './update-checker.js';
 

package/src/utils/update-checker.ts

@@ -0,0 +1,213 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { execSync } from 'node:child_process';
+import { request } from 'node:https';
+import chalk from 'chalk';
+import stringWidth from 'string-width';
+import {
+  UPDATE_CHECK_PATH,
+  UPDATE_CHECK_INTERVAL_MS,
+  NPM_REGISTRY_URL,
+  NPM_REGISTRY_TIMEOUT_MS,
+  PACKAGE_NAME,
+} from '../constants/index.js';
+import { UPDATE_MESSAGES, UPDATE_COMMANDS } from '../constants/messages/index.js';
+
+/** 更新检查缓存结构 */
+interface UpdateCache {
+  /** 上次检查时间戳 */
+  lastCheck: number;
+  /** 最新版本号 */
+  latestVersion: string;
+  /** 检查时的本地版本号 */
+  currentVersion: string;
+}
+
+/**
+ * 读取更新检查缓存文件
+ * @returns {UpdateCache | null} 缓存数据，文件不存在或解析失败返回 null
+ */
+function readUpdateCache(): UpdateCache | null {
+  try {
+    const raw = readFileSync(UPDATE_CHECK_PATH, 'utf-8');
+    return JSON.parse(raw) as UpdateCache;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 写入更新检查缓存文件
+ * @param {UpdateCache} cache - 缓存数据
+ */
+function writeUpdateCache(cache: UpdateCache): void {
+  try {
+    writeFileSync(UPDATE_CHECK_PATH, JSON.stringify(cache, null, 2), 'utf-8');
+  } catch {
+    // 写入失败时静默忽略，不影响 CLI 正常功能
+  }
+}
+
+/**
+ * 判断缓存是否过期（超过 24 小时或本地版本已变化）
+ * @param {UpdateCache} cache - 缓存数据
+ * @param {string} currentVersion - 当前本地版本号
+ * @returns {boolean} 缓存是否已过期
+ */
+function isCacheExpired(cache: UpdateCache, currentVersion: string): boolean {
+  if (cache.currentVersion !== currentVersion) {
+    return true;
+  }
+  return Date.now() - cache.lastCheck > UPDATE_CHECK_INTERVAL_MS;
+}
+
+/**
+ * 简易 semver 版本比较（不引入新依赖）
+ * @param {string} latest - 最新版本号
+ * @param {string} current - 当前版本号
+ * @returns {boolean} latest 是否大于 current
+ */
+function isNewerVersion(latest: string, current: string): boolean {
+  const latestParts = latest.split('.').map(Number);
+  const currentParts = current.split('.').map(Number);
+
+  for (let i = 0; i < 3; i++) {
+    const l = latestParts[i] || 0;
+    const c = currentParts[i] || 0;
+    if (l > c) return true;
+    if (l < c) return false;
+  }
+  return false;
+}
+
+/**
+ * 从 npm registry 获取最新版本号（5 秒超时）
+ * @returns {Promise<string | null>} 最新版本号，请求失败返回 null
+ */
+function fetchLatestVersion(): Promise<string | null> {
+  return new Promise((resolve) => {
+    const req = request(NPM_REGISTRY_URL, { timeout: NPM_REGISTRY_TIMEOUT_MS }, (res) => {
+      let data = '';
+      res.on('data', (chunk: Buffer) => { data += chunk.toString(); });
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data) as { version?: string };
+          resolve(parsed.version ?? null);
+        } catch {
+          resolve(null);
+        }
+      });
+    });
+
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => {
+      req.destroy();
+      resolve(null);
+    });
+
+    req.end();
+  });
+}
+
+/**
+ * 探测当前全局安装 clawt 所用的包管理器
+ * 依次尝试 pnpm、yarn 的全局列表命令，匹配到则返回对应名称，否则默认 npm
+ * @returns {string} 包管理器名称：'pnpm' | 'yarn' | 'npm'
+ */
+function detectPackageManager(): string {
+  const checks = [
+    { name: 'pnpm', command: `pnpm list -g --depth=0 ${PACKAGE_NAME}` },
+    { name: 'yarn', command: `yarn global list --depth=0 2>/dev/null` },
+  ];
+
+  for (const { name, command } of checks) {
+    try {
+      const output = execSync(command, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+      if (output.includes(PACKAGE_NAME)) {
+        return name;
+      }
+    } catch {
+      // 命令不存在或执行失败，跳过
+    }
+  }
+
+  return 'npm';
+}
+
+/**
+ * 绘制带边框的版本更新提示框
+ * @param {string} currentVersion - 当前版本号
+ * @param {string} latestVersion - 最新版本号
+ */
+function printUpdateNotification(currentVersion: string, latestVersion: string): void {
+  const updateText = UPDATE_MESSAGES.UPDATE_AVAILABLE(
+    chalk.red(currentVersion),
+    chalk.green(latestVersion),
+  );
+  const pm = detectPackageManager();
+  const updateCommand = UPDATE_COMMANDS[pm] || UPDATE_COMMANDS.npm;
+  const commandText = UPDATE_MESSAGES.UPDATE_HINT(chalk.cyan(updateCommand));
+
+  const updateTextWidth = stringWidth(updateText);
+  const commandTextWidth = stringWidth(commandText);
+  const innerWidth = Math.max(updateTextWidth, commandTextWidth) + 4;
+
+  const padLine = (text: string): string => {
+    const textWidth = stringWidth(text);
+    const leftPad = Math.floor((innerWidth - textWidth) / 2);
+    const rightPad = innerWidth - textWidth - leftPad;
+    return `│${' '.repeat(leftPad)}${text}${' '.repeat(rightPad)}│`;
+  };
+
+  const top = `╭${'─'.repeat(innerWidth)}╮`;
+  const bottom = `╰${'─'.repeat(innerWidth)}╯`;
+  const emptyLine = `│${' '.repeat(innerWidth)}│`;
+
+  console.log();
+  console.log(top);
+  console.log(emptyLine);
+  console.log(padLine(updateText));
+  console.log(padLine(commandText));
+  console.log(emptyLine);
+  console.log(bottom);
+  console.log();
+}
+
+/**
+ * 检查更新入口函数
+ * 读取缓存 → 缓存有效且有新版本则打印提示 → 缓存过期则请求 registry 刷新
+ * 所有异常静默处理，不影响 CLI 正常功能
+ * @param {string} currentVersion - 当前本地版本号
+ */
+export async function checkForUpdates(currentVersion: string): Promise<void> {
+  try {
+    const cache = readUpdateCache();
+
+    // 缓存有效：直接判断是否需要提示
+    if (cache && !isCacheExpired(cache, currentVersion)) {
+      if (isNewerVersion(cache.latestVersion, currentVersion)) {
+        printUpdateNotification(currentVersion, cache.latestVersion);
+      }
+      return;
+    }
+
+    // 缓存过期或不存在：请求 registry
+    const latestVersion = await fetchLatestVersion();
+    if (!latestVersion) {
+      return;
+    }
+
+    // 写入新缓存
+    writeUpdateCache({
+      lastCheck: Date.now(),
+      latestVersion,
+      currentVersion,
+    });
+
+    // 有新版本则打印提示
+    if (isNewerVersion(latestVersion, currentVersion)) {
+      printUpdateNotification(currentVersion, latestVersion);
+    }
+  } catch {
+    // 任何异常静默忽略，不影响 CLI 正常功能
+  }
+}

package/tests/unit/commands/alias.test.ts

@@ -50,6 +50,7 @@ function mockDefaultConfig(aliases: Record<string, string> = {}) {
     maxConcurrency: 0,
     terminalApp: 'auto',
     aliases,
+    autoUpdate: true,
   };
 }
 

package/tests/unit/commands/config.test.ts

@@ -51,6 +51,7 @@ vi.mock('../../../src/constants/index.js', () => ({
     maxConcurrency: 0,
     terminalApp: 'auto',
     aliases: {},
+    autoUpdate: true,
   },
   CONFIG_DESCRIPTIONS: {
     autoDeleteBranch: '自动删除分支',
@@ -60,6 +61,7 @@ vi.mock('../../../src/constants/index.js', () => ({
     maxConcurrency: '最大并发数',
     terminalApp: '终端应用',
     aliases: '命令别名映射',
+    autoUpdate: '自动更新',
   },
   CONFIG_DEFINITIONS: {
     autoDeleteBranch: { defaultValue: false, description: '自动删除分支' },
@@ -69,6 +71,7 @@ vi.mock('../../../src/constants/index.js', () => ({
     maxConcurrency: { defaultValue: 0, description: '最大并发数' },
     terminalApp: { defaultValue: 'auto', description: '终端应用', allowedValues: ['auto', 'iterm2', 'terminal'] },
     aliases: { defaultValue: {}, description: '命令别名映射' },
+    autoUpdate: { defaultValue: true, description: '自动更新' },
   },
   CONFIG_ALIAS_DISABLED_HINT: '(通过 clawt alias 命令管理)',
   MESSAGES: {
@@ -111,6 +114,7 @@ function createMockConfig() {
     maxConcurrency: 0,
     terminalApp: 'auto',
     aliases: {},
+    autoUpdate: true,
   };
 }
 

package/tests/unit/utils/config-strategy.test.ts

@@ -29,6 +29,7 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       confirmDestructiveOps: true,
       maxConcurrency: 0,
       terminalApp: 'auto',
+      autoUpdate: true,
     },
     CONFIG_DEFINITIONS: {
       autoDeleteBranch: { defaultValue: false, description: '自动删除分支' },
@@ -37,6 +38,7 @@ vi.mock('../../../src/constants/index.js', async (importOriginal) => {
       confirmDestructiveOps: { defaultValue: true, description: '破坏性操作确认' },
       maxConcurrency: { defaultValue: 0, description: '最大并发数' },
       terminalApp: { defaultValue: 'auto', description: '终端应用', allowedValues: ['auto', 'iterm2', 'terminal'] },
+      autoUpdate: { defaultValue: true, description: '自动更新' },
     },
     MESSAGES: {
       CONFIG_INVALID_BOOLEAN: (key: string) =>
@@ -86,7 +88,8 @@ describe('getValidConfigKeys', () => {
     expect(keys).toContain('confirmDestructiveOps');
     expect(keys).toContain('maxConcurrency');
     expect(keys).toContain('terminalApp');
-    expect(keys).toHaveLength(6);
+    expect(keys).toContain('autoUpdate');
+    expect(keys).toHaveLength(7);
   });
 });