clawt 1.0.4 → 1.0.5

package/dist/index.js

@@ -72,10 +72,14 @@ var MESSAGES = {
   INTERRUPT_CLEANED: (count) => `\u2713 \u5DF2\u6E05\u7406 ${count} \u4E2A worktree \u548C\u5BF9\u5E94\u5206\u652F`,
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: "\u5DF2\u4FDD\u7559 worktree\uFF0C\u53EF\u7A0D\u540E\u4F7F\u7528 clawt remove \u624B\u52A8\u6E05\u7406",
+  /** 配置文件损坏，已重新生成默认配置 */
+  CONFIG_CORRUPTED: "\u914D\u7F6E\u6587\u4EF6\u635F\u574F\u6216\u65E0\u6CD5\u89E3\u6790\uFF0C\u5DF2\u91CD\u65B0\u751F\u6210\u9ED8\u8BA4\u914D\u7F6E",
   /** 分隔线 */
   SEPARATOR: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
   /** 粗分隔线 */
-  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"
+  DOUBLE_SEPARATOR: "\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550",
+  /** 创建数量参数无效 */
+  INVALID_COUNT: (value) => `\u65E0\u6548\u7684\u521B\u5EFA\u6570\u91CF: "${value}"\uFF0C\u8BF7\u8F93\u5165\u6B63\u6574\u6570`
 };
 
 // src/constants/exitCodes.ts
@@ -426,13 +430,22 @@ function cleanupWorktrees(worktrees) {
 }
 
 // src/utils/config.ts
-import { existsSync as existsSync4, readFileSync } from "fs";
+import { existsSync as existsSync4, readFileSync, writeFileSync } from "fs";
 function loadConfig() {
   if (!existsSync4(CONFIG_PATH)) {
     return { ...DEFAULT_CONFIG };
   }
-  const raw = readFileSync(CONFIG_PATH, "utf-8");
-  return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  try {
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+function writeDefaultConfig() {
+  writeFileSync(CONFIG_PATH, JSON.stringify(DEFAULT_CONFIG, null, 2), "utf-8");
 }
 function getConfigValue(key) {
   const config = loadConfig();
@@ -480,6 +493,12 @@ function registerCreateCommand(program2) {
 function handleCreate(options) {
   validateMainWorktree();
   const count = Number(options.number);
+  if (!Number.isInteger(count) || count <= 0) {
+    throw new ClawtError(
+      MESSAGES.INVALID_COUNT(options.number),
+      EXIT_CODES.ARGUMENT_ERROR
+    );
+  }
   logger.info(`create \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${options.branch}\uFF0C\u6570\u91CF: ${count}`);
   const worktrees = createWorktrees(options.branch, count);
   printSuccess(MESSAGES.WORKTREE_CREATED(worktrees.length));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/create.ts

@@ -1,5 +1,6 @@
 import type { Command } from 'commander';
-import { MESSAGES } from '../constants/index.js';
+import { MESSAGES, EXIT_CODES } from '../constants/index.js';
+import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
 import type { CreateOptions } from '../types/index.js';
 import {
@@ -33,6 +34,15 @@ function handleCreate(options: CreateOptions): void {
   validateMainWorktree();
 
   const count = Number(options.number);
+
+  // 校验创建数量必须为正整数
+  if (!Number.isInteger(count) || count <= 0) {
+    throw new ClawtError(
+      MESSAGES.INVALID_COUNT(options.number),
+      EXIT_CODES.ARGUMENT_ERROR,
+    );
+  }
+
   logger.info(`create 命令执行，分支: ${options.branch}，数量: ${count}`);
 
   const worktrees = createWorktrees(options.branch, count);

package/src/constants/messages.ts

@@ -54,8 +54,12 @@ export const MESSAGES = {
   INTERRUPT_CLEANED: (count: number) => `✓ 已清理 ${count} 个 worktree 和对应分支`,
   /** 中断后保留 worktree */
   INTERRUPT_KEPT: '已保留 worktree，可稍后使用 clawt remove 手动清理',
+  /** 配置文件损坏，已重新生成默认配置 */
+  CONFIG_CORRUPTED: '配置文件损坏或无法解析，已重新生成默认配置',
   /** 分隔线 */
   SEPARATOR: '────────────────────────────────────────',
   /** 粗分隔线 */
   DOUBLE_SEPARATOR: '════════════════════════════════════════',
+  /** 创建数量参数无效 */
+  INVALID_COUNT: (value: string) => `无效的创建数量: "${value}"，请输入正整数`,
 } as const;

package/src/types/command.ts

@@ -2,8 +2,8 @@
 export interface CreateOptions {
   /** 分支名 */
   branch: string;
-  /** 创建数量，默认 1 */
-  number: number;
+  /** 创建数量（Commander 传入为字符串），默认 '1' */
+  number: string;
 }
 
 /** run 命令选项 */

package/src/utils/config.ts

@@ -1,18 +1,34 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { CONFIG_PATH, CLAWT_HOME, LOGS_DIR, WORKTREES_DIR, DEFAULT_CONFIG } from '../constants/index.js';
+import { CONFIG_PATH, CLAWT_HOME, LOGS_DIR, WORKTREES_DIR, DEFAULT_CONFIG, MESSAGES } from '../constants/index.js';
 import { ensureDir } from './fs.js';
+import { logger } from '../logger/index.js';
 import type { ClawtConfig } from '../types/index.js';
 
 /**
  * 加载全局配置，不存在则返回默认配置
+ * 配置文件损坏或无法解析时，视为不存在，重新生成默认配置
  * @returns {ClawtConfig} 配置对象
  */
 export function loadConfig(): ClawtConfig {
   if (!existsSync(CONFIG_PATH)) {
     return { ...DEFAULT_CONFIG };
   }
-  const raw = readFileSync(CONFIG_PATH, 'utf-8');
-  return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  try {
+    const raw = readFileSync(CONFIG_PATH, 'utf-8');
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    // 配置文件损坏或无法解析时，重新生成默认配置
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+
+/**
+ * 将默认配置写入配置文件
+ */
+function writeDefaultConfig(): void {
+  writeFileSync(CONFIG_PATH, JSON.stringify(DEFAULT_CONFIG, null, 2), 'utf-8');
 }
 
 /**