clawt 2.17.0 → 2.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.js +0 -6
  2. package/dist/postinstall.js +0 -3
  3. package/package.json +1 -1
  4. package/src/commands/validate.ts +1 -4
  5. package/src/constants/messages/validate.ts +0 -3
package/dist/index.js CHANGED
@@ -216,9 +216,6 @@ ${branches.map((b) => ` - ${b}`).join("\n")}`,
216
216
  VALIDATE_CONFIRM_AUTO_SYNC: (branch) => `\u662F\u5426\u7ACB\u5373\u6267\u884C sync \u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch}\uFF1F`,
217
217
  /** 自动 sync 开始提示 */
218
218
  VALIDATE_AUTO_SYNC_START: (branch) => `\u6B63\u5728\u81EA\u52A8\u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch} ...`,
219
- /** 自动 sync 存在冲突，无法重试 */
220
- VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath) => `\u540C\u6B65\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u91CD\u8BD5
221
- cd ${worktreePath}`,
222
219
  /** 用户拒绝自动 sync */
223
220
  VALIDATE_AUTO_SYNC_DECLINED: (branch) => `\u8BF7\u624B\u52A8\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`
224
221
  };
@@ -2740,9 +2737,6 @@ async function handlePatchApplyFailure(targetWorktreePath, branchName) {
2740
2737
  }
2741
2738
  printInfo(MESSAGES.VALIDATE_AUTO_SYNC_START(branchName));
2742
2739
  const syncResult = executeSyncForBranch(targetWorktreePath, branchName);
2743
- if (syncResult.hasConflict) {
2744
- printWarning(MESSAGES.VALIDATE_AUTO_SYNC_CONFLICT(targetWorktreePath));
2745
- }
2746
2740
  }
2747
2741
  function saveCurrentSnapshotTree(mainWorktreePath, projectName, branchName) {
2748
2742
  gitAddAll(mainWorktreePath);
package/dist/postinstall.js CHANGED
@@ -208,9 +208,6 @@ ${branches.map((b) => ` - ${b}`).join("\n")}`,
208
208
  VALIDATE_CONFIRM_AUTO_SYNC: (branch) => `\u662F\u5426\u7ACB\u5373\u6267\u884C sync \u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch}\uFF1F`,
209
209
  /** 自动 sync 开始提示 */
210
210
  VALIDATE_AUTO_SYNC_START: (branch) => `\u6B63\u5728\u81EA\u52A8\u540C\u6B65\u4E3B\u5206\u652F\u5230 ${branch} ...`,
211
- /** 自动 sync 存在冲突，无法重试 */
212
- VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath) => `\u540C\u6B65\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u8FDB\u5165\u76EE\u6807 worktree \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u91CD\u8BD5
213
- cd ${worktreePath}`,
214
211
  /** 用户拒绝自动 sync */
215
212
  VALIDATE_AUTO_SYNC_DECLINED: (branch) => `\u8BF7\u624B\u52A8\u6267\u884C clawt sync -b ${branch} \u540C\u6B65\u4E3B\u5206\u652F\u540E\u91CD\u8BD5`
216
213
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "clawt",
3
- "version": "2.17.0",
3
+ "version": "2.17.1",
4
4
  "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/commands/validate.ts CHANGED
@@ -188,10 +188,7 @@ async function handlePatchApplyFailure(targetWorktreePath: string, branchName: s
188
188
  printInfo(MESSAGES.VALIDATE_AUTO_SYNC_START(branchName));
189
189
  const syncResult = executeSyncForBranch(targetWorktreePath, branchName);
190
190
 
191
- if (syncResult.hasConflict) {
192
- // sync 存在冲突，提示用户手动解决
193
- printWarning(MESSAGES.VALIDATE_AUTO_SYNC_CONFLICT(targetWorktreePath));
194
- }
191
+ // sync 冲突提示已在 executeSyncForBranch 内部输出（SYNC_CONFLICT），此处无需重复提示
195
192
  }
196
193
 
197
194
  /**
package/src/constants/messages/validate.ts CHANGED
@@ -59,9 +59,6 @@ export const VALIDATE_MESSAGES = {
59
59
  /** 自动 sync 开始提示 */
60
60
  VALIDATE_AUTO_SYNC_START: (branch: string) =>
61
61
  `正在自动同步主分支到 ${branch} ...`,
62
- /** 自动 sync 存在冲突，无法重试 */
63
- VALIDATE_AUTO_SYNC_CONFLICT: (worktreePath: string) =>
64
- `同步存在冲突，请进入目标 worktree 手动解决冲突后重试\n cd ${worktreePath}`,
65
62
  /** 用户拒绝自动 sync */
66
63
  VALIDATE_AUTO_SYNC_DECLINED: (branch: string) =>
67
64
  `请手动执行 clawt sync -b ${branch} 同步主分支后重试`,