clawt 3.8.2 → 3.8.3

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 (8) hide show
  1. package/README.md +1 -1
  2. package/dist/index.js +3 -3
  3. package/dist/postinstall.js +2 -2
  4. package/docs/config-file.md +2 -2
  5. package/docs/merge.md +1 -1
  6. package/package.json +1 -1
  7. package/src/constants/config.ts +2 -2
  8. package/src/utils/conflict-resolver.ts +1 -1
package/README.md CHANGED
@@ -341,7 +341,7 @@ clawt alias remove l
341
341
  | `aliases` | `{}` | 命令别名映射（如 `{"l": "list", "r": "run"}`） |
342
342
  | `autoUpdate` | `true` | 自动检查新版本（每 24 小时检查一次 npm registry） |
343
343
  | `conflictResolveMode` | `"ask"` | merge 冲突时的解决模式：`ask`（询问是否使用 AI）、`auto`（自动 AI 解决）、`manual`（手动解决） |
344
- | `conflictResolveTimeoutMs` | `300000` | Claude Code 冲突解决超时时间（毫秒），默认 5 分钟 |
344
+ | `conflictResolveTimeoutMs` | `600000` | Claude Code 冲突解决超时时间（毫秒），默认 10 分钟 |
345
345
 
346
346
  ## postCreate Hook
347
347
 
package/dist/index.js CHANGED
@@ -744,8 +744,8 @@ var CONFIG_DEFINITIONS = {
744
744
  allowedValues: ["ask", "auto", "manual"]
745
745
  },
746
746
  conflictResolveTimeoutMs: {
747
- defaultValue: 3e5,
748
- description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 300000\uFF085 \u5206\u949F\uFF09"
747
+ defaultValue: 6e5,
748
+ description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 600000\uFF0810 \u5206\u949F\uFF09"
749
749
  }
750
750
  };
751
751
  function deriveDefaultConfig(definitions) {
@@ -4292,7 +4292,7 @@ var InteractivePanel = class {
4292
4292
 
4293
4293
  // src/utils/conflict-resolver.ts
4294
4294
  import { execFileSync as execFileSync4 } from "child_process";
4295
- var DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 3e5;
4295
+ var DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 6e5;
4296
4296
  function buildConflictResolvePrompt() {
4297
4297
  return CONFLICT_RESOLVE_PROMPT;
4298
4298
  }
package/dist/postinstall.js CHANGED
@@ -680,8 +680,8 @@ var CONFIG_DEFINITIONS = {
680
680
  allowedValues: ["ask", "auto", "manual"]
681
681
  },
682
682
  conflictResolveTimeoutMs: {
683
- defaultValue: 3e5,
684
- description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 300000\uFF085 \u5206\u949F\uFF09"
683
+ defaultValue: 6e5,
684
+ description: "Claude Code \u51B2\u7A81\u89E3\u51B3\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 600000\uFF0810 \u5206\u949F\uFF09"
685
685
  }
686
686
  };
687
687
  function deriveDefaultConfig(definitions) {
package/docs/config-file.md CHANGED
@@ -26,7 +26,7 @@
26
26
  "aliases": {},
27
27
  "autoUpdate": true,
28
28
  "conflictResolveMode": "ask",
29
- "conflictResolveTimeoutMs": 300000
29
+ "conflictResolveTimeoutMs": 600000
30
30
  }
31
31
  ```
32
32
 
@@ -44,6 +44,6 @@
44
44
  | `aliases` | `Record<string, string>` | `{}` | 命令别名映射，键为别名，值为目标内置命令名 |
45
45
  | `autoUpdate` | `boolean` | `true` | 是否启用自动更新检查（每 24 小时通过 npm registry 检查一次新版本） |
46
46
  | `conflictResolveMode` | `string` | `"ask"` | merge 冲突时的解决模式：`ask`（询问是否使用 AI）、`auto`（自动 AI 解决）、`manual`（手动解决） |
47
- | `conflictResolveTimeoutMs` | `number` | `300000` | Claude Code 冲突解决超时时间（毫秒），默认 300000（5 分钟） |
47
+ | `conflictResolveTimeoutMs` | `number` | `600000` | Claude Code 冲突解决超时时间（毫秒），默认 600000（10 分钟） |
48
48
 
49
49
  ---
package/docs/merge.md CHANGED
@@ -104,7 +104,7 @@ clawt merge [-m <commitMessage>]
104
104
  | `auto` | — | 直接调用 AI 解决，不询问 |
105
105
  | `manual` | — | 输出冲突提示信息，用户手动解决 |
106
106
 
107
- AI 解决冲突时，调用 Claude Code CLI 在主 worktree 中分析并解决冲突文件，超时时间由配置项 `conflictResolveTimeoutMs` 控制（默认 5 分钟）。AI 解决成功后自动执行 `git add . && git merge --continue` 完成合并。
107
+ AI 解决冲突时，调用 Claude Code CLI 在主 worktree 中分析并解决冲突文件，超时时间由配置项 `conflictResolveTimeoutMs` 控制（默认 10 分钟）。AI 解决成功后自动执行 `git add . && git merge --continue` 完成合并。
108
108
  10. **推送（受 `autoPullPush` 配置控制）**
109
109
  - `autoPullPush` 为 `false` → 输出提示 `已跳过自动 pull/push，请手动执行 git pull && git push`
110
110
  - `autoPullPush` 为 `true` → 执行 `git pull` + `git push`：
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "clawt",
3
- "version": "3.8.2",
3
+ "version": "3.8.3",
4
4
  "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/constants/config.ts CHANGED
@@ -53,8 +53,8 @@ export const CONFIG_DEFINITIONS: ConfigDefinitions = {
53
53
  allowedValues: ['ask', 'auto', 'manual'] as const,
54
54
  },
55
55
  conflictResolveTimeoutMs: {
56
- defaultValue: 300000,
57
- description: 'Claude Code 冲突解决超时时间（毫秒），默认 300000（5 分钟）',
56
+ defaultValue: 600000,
57
+ description: 'Claude Code 冲突解决超时时间（毫秒），默认 600000（10 分钟）',
58
58
  },
59
59
  };
60
60
 
package/src/utils/conflict-resolver.ts CHANGED
@@ -10,7 +10,7 @@ import { CONFLICT_RESOLVE_PROMPT } from '../constants/ai-prompts.js';
10
10
  import { getEnvWithoutNestedSessionFlag } from './shell.js';
11
11
 
12
12
  /** 默认 Claude Code 冲突解决超时时间（毫秒） */
13
- const DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 300000;
13
+ const DEFAULT_CONFLICT_RESOLVE_TIMEOUT_MS = 600000;
14
14
 
15
15
  /**
16
16
  * 构建发送给 Claude Code 的冲突解决 prompt