clawt 2.3.2 → 2.3.4

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}`);
+      }
     }
   }
 }
@@ -1258,6 +1266,7 @@ function formatConfigValue(value) {
 
 // src/commands/sync.ts
 import { existsSync as existsSync8 } from "fs";
+import { join as join6 } from "path";
 function registerSyncCommand(program2) {
   program2.command("sync").description("\u5C06\u4E3B\u5206\u652F\u6700\u65B0\u4EE3\u7801\u540C\u6B65\u5230\u76EE\u6807 worktree").requiredOption("-b, --branch <branchName>", "\u8981\u540C\u6B65\u7684\u5206\u652F\u540D").action(async (options) => {
     await handleSync(options);
@@ -1285,7 +1294,7 @@ async function handleSync(options) {
   const { branch } = options;
   logger.info(`sync \u547D\u4EE4\u6267\u884C\uFF0C\u5206\u652F: ${branch}`);
   const projectWorktreeDir = getProjectWorktreeDir();
-  const targetWorktreePath = `${projectWorktreeDir}/${branch}`;
+  const targetWorktreePath = join6(projectWorktreeDir, branch);
   if (!existsSync8(targetWorktreePath)) {
     throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(branch));
   }

package/package.json

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

package/src/commands/sync.ts

@@ -1,4 +1,5 @@
 import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import type { Command } from 'commander';
 import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
@@ -81,7 +82,7 @@ async function handleSync(options: SyncOptions): Promise<void> {
 
   // 检查目标 worktree 是否存在
   const projectWorktreeDir = getProjectWorktreeDir();
-  const targetWorktreePath = `${projectWorktreeDir}/${branch}`;
+  const targetWorktreePath = join(projectWorktreeDir, branch);
 
   if (!existsSync(targetWorktreePath)) {
     throw new ClawtError(MESSAGES.WORKTREE_NOT_FOUND(branch));

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}`);
+      }
     }
   }
 }