clawt 3.4.3 → 3.4.4

package/dist/index.js

@@ -1367,6 +1367,11 @@ function validateHeadExists() {
     throw new ClawtError(MESSAGES.HEAD_NOT_FOUND);
   }
 }
+function validateWorkingDirClean() {
+  if (!isWorkingDirClean()) {
+    throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
+  }
+}
 function runPreChecks(options) {
   if (options.mainWorktree) {
     validateMainWorktree();
@@ -3871,6 +3876,7 @@ async function handleCreate(options) {
   runPreChecks({ mainWorktree: true, headExists: true });
   await guardMainWorkBranch();
   await ensureOnMainWorkBranch();
+  validateWorkingDirClean();
   const count = Number(options.number);
   if (!Number.isInteger(count) || count <= 0) {
     throw new ClawtError(
@@ -4014,6 +4020,7 @@ async function handleRun(options) {
   if (!options.dryRun) {
     await guardMainWorkBranch();
     await ensureOnMainWorkBranch();
+    validateWorkingDirClean();
   }
   if (options.file && options.tasks) {
     throw new ClawtError(MESSAGES.FILE_AND_TASKS_CONFLICT);

package/package.json

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

package/src/commands/create.ts

@@ -7,6 +7,7 @@ import {
   runPreChecks,
   createWorktrees,
   ensureOnMainWorkBranch,
+  validateWorkingDirClean,
   getValidateBranchName,
   printSuccess,
   printInfo,
@@ -40,6 +41,8 @@ async function handleCreate(options: CreateOptions): Promise<void> {
 
   await ensureOnMainWorkBranch();
 
+  validateWorkingDirClean();
+
   const count = Number(options.number);
 
   // 校验创建数量必须为正整数

package/src/commands/run.ts

@@ -20,6 +20,7 @@ import {
   executeBatchTasks,
   printDryRunPreview,
   ensureOnMainWorkBranch,
+  validateWorkingDirClean,
   guardMainWorkBranch,
 } from '../utils/index.js';
 
@@ -126,6 +127,7 @@ async function handleRun(options: RunOptions): Promise<void> {
   if (!options.dryRun) {
     await guardMainWorkBranch();
     await ensureOnMainWorkBranch();
+    validateWorkingDirClean();
   }
 
   // 互斥校验：--file 和 --tasks 不能同时使用

package/src/utils/index.ts

@@ -50,7 +50,7 @@ export {
   createBranch,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
-export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, runPreChecks } from './validation.js';
+export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, validateWorkingDirClean, runPreChecks } from './validation.js';
 export { createWorktrees, getProjectWorktrees, getProjectWorktreeDir, cleanupWorktrees, getWorktreeStatus, createWorktreesByBranches } from './worktree.js';
 export { loadConfig, writeDefaultConfig, writeConfig, saveConfig, getConfigValue, ensureClawtDirs, parseConcurrency } from './config.js';
 export { printSuccess, printError, printWarning, printInfo, printHint, printSeparator, printDoubleSeparator, confirmAction, confirmDestructiveAction, formatWorktreeStatus, isWorktreeIdle, formatDuration, formatRelativeTime, formatDiskSize, formatLocalISOString } from './formatter.js';

package/src/utils/validation.ts

@@ -1,7 +1,7 @@
 import { MESSAGES } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { execCommand } from './shell.js';
-import { getGitCommonDir } from './git.js';
+import { getGitCommonDir, isWorkingDirClean } from './git.js';
 import { requireProjectConfig, guardMainWorkBranchExists } from './project-config.js';
 
 /** 统一前置校验选项 */
@@ -73,6 +73,17 @@ export function validateHeadExists(): void {
   }
 }
 
+/**
+ * 校验主分支工作区和暂存区是否干净
+ * 当存在未提交的更改时抛出错误，防止基于脏状态创建 worktree
+ * @throws {ClawtError} 工作区或暂存区不干净时抛出
+ */
+export function validateWorkingDirClean(): void {
+  if (!isWorkingDirClean()) {
+    throw new ClawtError(MESSAGES.MAIN_WORKTREE_DIRTY);
+  }
+}
+
 /**
  * 统一前置校验入口，按需执行各项校验
  * @param {PreCheckOptions} options - 校验选项