clawt 2.3.2 → 2.3.3

package/dist/index.js

@@ -1037,8 +1037,16 @@ function migrateChangesViaPatch(targetWorktreePath, mainWorktreePath, branchName
     }
   } finally {
     if (didTempCommit) {
-      gitResetSoft(1, targetWorktreePath);
-      gitRestoreStaged(targetWorktreePath);
+      try {
+        gitResetSoft(1, targetWorktreePath);
+      } catch (error) {
+        logger.error(`\u64A4\u9500\u4E34\u65F6 commit \u5931\u8D25: ${error}`);
+      }
+      try {
+        gitRestoreStaged(targetWorktreePath);
+      } catch (error) {
+        logger.error(`\u6062\u590D\u6682\u5B58\u533A\u5931\u8D25: ${error}`);
+      }
     }
   }
 }

package/package.json

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

package/src/commands/validate.ts

@@ -127,9 +127,18 @@ function migrateChangesViaPatch(targetWorktreePath: string, mainWorktreePath: st
     }
   } finally {
     // 确保临时 commit 一定会被撤销，恢复目标 worktree 原状
+    // 每个操作独立 try-catch，避免前一个失败导致后续操作不执行
     if (didTempCommit) {
-      gitResetSoft(1, targetWorktreePath);
-      gitRestoreStaged(targetWorktreePath);
+      try {
+        gitResetSoft(1, targetWorktreePath);
+      } catch (error) {
+        logger.error(`撤销临时 commit 失败: ${error}`);
+      }
+      try {
+        gitRestoreStaged(targetWorktreePath);
+      } catch (error) {
+        logger.error(`恢复暂存区失败: ${error}`);
+      }
     }
   }
 }