clawt 3.8.6 → 3.8.8

package/dist/index.js

@@ -67,7 +67,13 @@ var COMMON_MESSAGES = {
   /** 守卫检测：配置的主工作分支已不存在 */
   GUARD_BRANCH_NOT_EXISTS: (branchName) => `\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${branchName} \u5DF2\u4E0D\u5B58\u5728\uFF0C\u8BF7\u6267\u884C clawt init \u91CD\u65B0\u8BBE\u7F6E\u4E3B\u5DE5\u4F5C\u5206\u652F`,
   /** 守卫检测：当前分支与配置的主工作分支不一致 */
-  GUARD_BRANCH_MISMATCH: (configuredBranch, currentBranch) => `\u5F53\u524D\u5206\u652F ${currentBranch} \u4E0E\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${configuredBranch} \u4E0D\u4E00\u81F4\uFF0C\u5982\u9700\u66F4\u65B0\u8BF7\u6267\u884C clawt init`
+  GUARD_BRANCH_MISMATCH: (configuredBranch, currentBranch) => `\u5F53\u524D\u5206\u652F ${currentBranch} \u4E0E\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${configuredBranch} \u4E0D\u4E00\u81F4\uFF0C\u5982\u9700\u66F4\u65B0\u8BF7\u6267\u884C clawt init`,
+  /** Git index 被锁定（index.lock 存在） */
+  GIT_INDEX_LOCKED: (lockFilePath) => `Git index \u88AB\u9501\u5B9A\uFF0C\u65E0\u6CD5\u6267\u884C\u64CD\u4F5C
+  \u539F\u56E0\uFF1A\u9501\u6587\u4EF6\u5DF2\u5B58\u5728\uFF08\u53EF\u80FD\u662F\u4E0A\u6B21 git \u64CD\u4F5C\u5F02\u5E38\u4E2D\u65AD\u6B8B\u7559\uFF09
+  \u9501\u6587\u4EF6\u8DEF\u5F84\uFF1A${lockFilePath}
+  \u4FEE\u590D\u65B9\u6CD5\uFF1A\u786E\u8BA4\u6CA1\u6709\u5176\u4ED6 git \u64CD\u4F5C\u5728\u8FDB\u884C\u540E\uFF0C\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u5220\u9664\u9501\u6587\u4EF6\uFF1A
+  rm ${lockFilePath}`
 };
 
 // src/constants/messages/run.ts
@@ -993,20 +999,71 @@ function enableConsoleTransport() {
 }
 
 // src/utils/shell.ts
-import { execSync, execFileSync, spawn, spawnSync } from "child_process";
+import { execSync as execSync2, execFileSync, spawn, spawnSync } from "child_process";
+
+// src/utils/git-lock.ts
+import { join as join2, isAbsolute } from "path";
+import { execSync } from "child_process";
+var INDEX_LOCK_ERROR_PATTERNS = [
+  /Unable to write.*index/i,
+  /index\.lock/i,
+  /Unable to create.*index/i
+];
+var INDEX_LOCK_PATH_EXTRACT_PATTERN = /'([^']*index\.lock)'/;
+function isGitIndexLockError(errorMessage) {
+  return INDEX_LOCK_ERROR_PATTERNS.some((pattern) => pattern.test(errorMessage));
+}
+function extractFullErrorMessage(error) {
+  if (!(error instanceof Error)) return String(error);
+  const stderr = error.stderr;
+  const stderrStr = stderr ? String(stderr) : "";
+  return stderrStr ? `${error.message}
+${stderrStr}` : error.message;
+}
+function findGitIndexLockPath(cwd) {
+  try {
+    const gitDir = execSync("git rev-parse --git-dir", {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return isAbsolute(gitDir) ? join2(gitDir, "index.lock") : join2(cwd || process.cwd(), gitDir, "index.lock");
+  } catch (error) {
+    logger.warn(`\u5B9A\u4F4D git \u76EE\u5F55\u5931\u8D25: ${error}`);
+    return join2(cwd || process.cwd(), ".git", "index.lock");
+  }
+}
+function parseIndexLockPathFromError(errorMessage) {
+  const match = errorMessage.match(INDEX_LOCK_PATH_EXTRACT_PATTERN);
+  return match?.[1];
+}
+function throwIfGitIndexLockError(error, cwd) {
+  const errorMessage = extractFullErrorMessage(error);
+  if (isGitIndexLockError(errorMessage)) {
+    const lockFilePath = parseIndexLockPathFromError(errorMessage) ?? findGitIndexLockPath(cwd);
+    throw new ClawtError(MESSAGES.GIT_INDEX_LOCKED(lockFilePath));
+  }
+}
+
+// src/utils/shell.ts
 function getEnvWithoutNestedSessionFlag() {
   const { CLAUDECODE: _, ...env } = process.env;
   return env;
 }
 function execCommand(command, options) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
-  const result = execSync(command, {
-    cwd: options?.cwd,
-    encoding: "utf-8",
-    stdio: ["pipe", "pipe", "pipe"],
-    maxBuffer: EXEC_MAX_BUFFER
-  });
-  return result.trim();
+  try {
+    const result = execSync2(command, {
+      cwd: options?.cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      maxBuffer: EXEC_MAX_BUFFER
+    });
+    return result.trim();
+  } catch (error) {
+    throwIfGitIndexLockError(error, options?.cwd);
+    throw error;
+  }
 }
 function spawnProcess(command, args, options) {
   logger.debug(`\u542F\u52A8\u5B50\u8FDB\u7A0B: ${command} ${args.join(" ")}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
@@ -1025,14 +1082,19 @@ function killAllChildProcesses(children) {
 }
 function execCommandWithInput(command, args, options) {
   logger.debug(`\u6267\u884C\u547D\u4EE4(stdin): ${command} ${args.join(" ")}${options.cwd ? ` (cwd: ${options.cwd})` : ""}`);
-  const result = execFileSync(command, args, {
-    cwd: options.cwd,
-    input: options.input,
-    encoding: "utf-8",
-    stdio: ["pipe", "pipe", "pipe"],
-    maxBuffer: EXEC_MAX_BUFFER
-  });
-  return result.trim();
+  try {
+    const result = execFileSync(command, args, {
+      cwd: options.cwd,
+      input: options.input,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      maxBuffer: EXEC_MAX_BUFFER
+    });
+    return result.trim();
+  } catch (error) {
+    throwIfGitIndexLockError(error, options.cwd);
+    throw error;
+  }
 }
 function runCommandInherited(command, options) {
   logger.debug(`\u6267\u884C\u547D\u4EE4(inherit): ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ""}`);
@@ -1127,7 +1189,7 @@ function copyToClipboard(text) {
 
 // src/utils/git-core.ts
 import { basename } from "path";
-import { execSync as execSync2, execFileSync as execFileSync2 } from "child_process";
+import { execSync as execSync3, execFileSync as execFileSync2 } from "child_process";
 function getGitCommonDir(cwd) {
   return execCommand("git rev-parse --git-common-dir", { cwd });
 }
@@ -1220,7 +1282,7 @@ function getHeadCommitHash(cwd) {
 }
 function gitDiffBinaryAgainstBranch(branchName, cwd) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: git diff HEAD...${branchName} --binary${cwd ? ` (cwd: ${cwd})` : ""}`);
-  return execSync2(`git diff HEAD...${branchName} --binary`, {
+  return execSync3(`git diff HEAD...${branchName} --binary`, {
     cwd,
     stdio: ["pipe", "pipe", "pipe"],
     maxBuffer: EXEC_MAX_BUFFER
@@ -1258,7 +1320,7 @@ function getCommitTreeHash(commitHash, cwd) {
 }
 function gitDiffTree(baseTreeHash, targetTreeHash, cwd) {
   logger.debug(`\u6267\u884C\u547D\u4EE4: git diff-tree -p --binary ${baseTreeHash} ${targetTreeHash}${cwd ? ` (cwd: ${cwd})` : ""}`);
-  return execSync2(`git diff-tree -p --binary ${baseTreeHash} ${targetTreeHash}`, {
+  return execSync3(`git diff-tree -p --binary ${baseTreeHash} ${targetTreeHash}`, {
     cwd,
     stdio: ["pipe", "pipe", "pipe"],
     maxBuffer: EXEC_MAX_BUFFER
@@ -1535,11 +1597,11 @@ function validateBranchesNotExist(branchNames) {
 
 // src/utils/project-config.ts
 import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 // src/utils/fs.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, rmdirSync, statSync } from "fs";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 function ensureDir(dirPath) {
   if (!existsSync2(dirPath)) {
     mkdirSync2(dirPath, { recursive: true });
@@ -1561,7 +1623,7 @@ function calculateDirSize(dirPath) {
   try {
     const entries = readdirSync(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join2(dirPath, entry.name);
+      const fullPath = join3(dirPath, entry.name);
       try {
         if (entry.isDirectory()) {
           totalSize += calculateDirSize(fullPath);
@@ -1578,7 +1640,7 @@ function calculateDirSize(dirPath) {
 
 // src/utils/project-config.ts
 function getProjectConfigPath(projectName) {
-  return join3(PROJECTS_CONFIG_DIR, projectName, "config.json");
+  return join4(PROJECTS_CONFIG_DIR, projectName, "config.json");
 }
 function loadProjectConfig() {
   const projectName = getProjectName();
@@ -1597,7 +1659,7 @@ function loadProjectConfig() {
 function saveProjectConfig(config2) {
   const projectName = getProjectName();
   const configPath = getProjectConfigPath(projectName);
-  const projectDir = join3(PROJECTS_CONFIG_DIR, projectName);
+  const projectDir = join4(PROJECTS_CONFIG_DIR, projectName);
   ensureDir(projectDir);
   writeFileSync(configPath, JSON.stringify(config2, null, 2), "utf-8");
   logger.info(`\u9879\u76EE\u914D\u7F6E\u5DF2\u4FDD\u5B58: ${configPath}`);
@@ -1792,11 +1854,11 @@ async function runPreChecks(options) {
 }
 
 // src/utils/worktree.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
 function getProjectWorktreeDir() {
   const projectName = getProjectName();
-  return join4(WORKTREES_DIR, projectName);
+  return join5(WORKTREES_DIR, projectName);
 }
 function createWorktrees(branchName, count) {
   const sanitized = sanitizeBranchName(branchName);
@@ -1806,7 +1868,7 @@ function createWorktrees(branchName, count) {
   ensureDir(projectDir);
   const results = [];
   for (const name of branchNames) {
-    const worktreePath = join4(projectDir, name);
+    const worktreePath = join5(projectDir, name);
     createWorktree(name, worktreePath);
     createValidateBranch(name);
     results.push({ path: worktreePath, branch: name });
@@ -1820,7 +1882,7 @@ function createWorktreesByBranches(branchNames) {
   ensureDir(projectDir);
   const results = [];
   for (const name of branchNames) {
-    const worktreePath = join4(projectDir, name);
+    const worktreePath = join5(projectDir, name);
     createWorktree(name, worktreePath);
     createValidateBranch(name);
     results.push({ path: worktreePath, branch: name });
@@ -1843,7 +1905,7 @@ function getProjectWorktrees() {
     if (!entry.isDirectory()) {
       continue;
     }
-    const fullPath = join4(projectDir, entry.name);
+    const fullPath = join5(projectDir, entry.name);
     if (registeredPaths.has(fullPath)) {
       worktrees.push({
         path: fullPath,
@@ -1944,7 +2006,7 @@ async function promptCommitMessage(promptMessage, nonInteractiveErrorMessage) {
 // src/utils/claude.ts
 import { spawnSync as spawnSync3 } from "child_process";
 import { existsSync as existsSync7, readdirSync as readdirSync3 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/utils/terminal.ts
 import { execFileSync as execFileSync3 } from "child_process";
@@ -2023,7 +2085,7 @@ function encodeClaudeProjectPath(absolutePath) {
 }
 function hasClaudeSessionHistory(worktreePath) {
   const encodedName = encodeClaudeProjectPath(worktreePath);
-  const projectDir = join5(CLAUDE_PROJECTS_DIR, encodedName);
+  const projectDir = join6(CLAUDE_PROJECTS_DIR, encodedName);
   if (!existsSync7(projectDir)) {
     return false;
   }
@@ -2081,16 +2143,16 @@ function launchInteractiveClaudeInNewTerminal(worktree, hasPreviousSession) {
 }
 
 // src/utils/validate-snapshot.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { existsSync as existsSync8, readFileSync as readFileSync3, writeFileSync as writeFileSync3, unlinkSync, readdirSync as readdirSync4, rmdirSync as rmdirSync2, statSync as statSync2 } from "fs";
 function getSnapshotPath(projectName, branchName) {
-  return join6(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.tree`);
+  return join7(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.tree`);
 }
 function getSnapshotHeadPath(projectName, branchName) {
-  return join6(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
+  return join7(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
 }
 function getSnapshotStagedPath(projectName, branchName) {
-  return join6(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.staged`);
+  return join7(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.staged`);
 }
 function hasSnapshot(projectName, branchName) {
   return existsSync8(getSnapshotPath(projectName, branchName));
@@ -2112,7 +2174,7 @@ function readSnapshot(projectName, branchName) {
   return { treeHash, headCommitHash, stagedTreeHash };
 }
 function writeSnapshot(projectName, branchName, treeHash, headCommitHash, stagedTreeHash) {
-  const snapshotDir = join6(VALIDATE_SNAPSHOTS_DIR, projectName);
+  const snapshotDir = join7(VALIDATE_SNAPSHOTS_DIR, projectName);
   ensureDir(snapshotDir);
   if (treeHash !== void 0) {
     writeFileSync3(getSnapshotPath(projectName, branchName), treeHash, "utf-8");
@@ -2143,7 +2205,7 @@ function removeSnapshot(projectName, branchName) {
   }
 }
 function getProjectSnapshotBranches(projectName) {
-  const projectDir = join6(VALIDATE_SNAPSHOTS_DIR, projectName);
+  const projectDir = join7(VALIDATE_SNAPSHOTS_DIR, projectName);
   if (!existsSync8(projectDir)) {
     return [];
   }
@@ -2151,13 +2213,13 @@ function getProjectSnapshotBranches(projectName) {
   return files.filter((f) => f.endsWith(".tree")).map((f) => f.replace(/\.tree$/, ""));
 }
 function removeProjectSnapshots(projectName) {
-  const projectDir = join6(VALIDATE_SNAPSHOTS_DIR, projectName);
+  const projectDir = join7(VALIDATE_SNAPSHOTS_DIR, projectName);
   if (!existsSync8(projectDir)) {
     return;
   }
   const files = readdirSync4(projectDir);
   for (const file of files) {
-    unlinkSync(join6(projectDir, file));
+    unlinkSync(join7(projectDir, file));
   }
   try {
     rmdirSync2(projectDir);
@@ -3080,7 +3142,7 @@ async function executeBatchTasks(worktrees, tasks, concurrency, continueFlags) {
 
 // src/utils/dry-run.ts
 import chalk6 from "chalk";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 var DRY_RUN_TASK_DESC_MAX_LENGTH = 80;
 function truncateTaskDesc(task) {
   const oneLine = task.replace(/\n/g, " ").trim();
@@ -3108,7 +3170,7 @@ function printDryRunPreview(branchNames, tasks, concurrency) {
   let hasConflict = false;
   for (let i = 0; i < branchNames.length; i++) {
     const branch = branchNames[i];
-    const worktreePath = join7(projectDir, branch);
+    const worktreePath = join8(projectDir, branch);
     const exists = checkBranchExists(branch);
     if (exists) hasConflict = true;
     const indexLabel = `[${i + 1}/${branchNames.length}]`;
@@ -3264,7 +3326,7 @@ async function promptStringValue(key, currentValue) {
 
 // src/utils/update-checker.ts
 import { readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { request } from "https";
 import chalk8 from "chalk";
 import stringWidth2 from "string-width";
@@ -3330,7 +3392,7 @@ function detectPackageManager() {
   ];
   for (const { name, command } of checks) {
     try {
-      const output = execSync3(command, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+      const output = execSync4(command, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
       if (output.includes(PACKAGE_NAME)) {
         return name;
       }
@@ -4002,14 +4064,7 @@ var InteractivePanel = class {
     this.clearTimers();
     this.keyboardController.stop();
     this.restoreTerminal();
-    if (this.resizeHandler) {
-      process.stdout.removeListener("resize", this.resizeHandler);
-      this.resizeHandler = null;
-    }
-    if (this.exitHandler) {
-      process.removeListener("exit", this.exitHandler);
-      this.exitHandler = null;
-    }
+    this.removeTerminalListeners();
     if (this.resolveStart) {
       this.resolveStart();
       this.resolveStart = null;
@@ -4019,6 +4074,7 @@ var InteractivePanel = class {
    * 初始化终端：进入备选屏幕、隐藏光标、禁用行换行
    */
   initTerminal() {
+    this.removeTerminalListeners();
     process.stdout.write(ALT_SCREEN_ENTER);
     process.stdout.write(CURSOR_HIDE);
     process.stdout.write(LINE_WRAP_DISABLE);
@@ -4029,13 +4085,22 @@ var InteractivePanel = class {
       }
     };
     process.stdout.on("resize", this.resizeHandler);
-    this.exitHandler = () => {
-      process.stdout.write(LINE_WRAP_ENABLE);
-      process.stdout.write(CURSOR_SHOW);
-      process.stdout.write(ALT_SCREEN_LEAVE);
-    };
+    this.exitHandler = () => this.restoreTerminal();
     process.on("exit", this.exitHandler);
   }
+  /**
+   * 移除终端事件监听器（resize 和 exit）
+   */
+  removeTerminalListeners() {
+    if (this.resizeHandler) {
+      process.stdout.removeListener("resize", this.resizeHandler);
+      this.resizeHandler = null;
+    }
+    if (this.exitHandler) {
+      process.removeListener("exit", this.exitHandler);
+      this.exitHandler = null;
+    }
+  }
   /**
    * 恢复终端：启用行换行、显示光标、退出备选屏幕
    */
@@ -4178,6 +4243,7 @@ var InteractivePanel = class {
     this.isOperating = true;
     this.clearTimers();
     this.restoreTerminal();
+    this.removeTerminalListeners();
     this.keyboardController.stop();
     action();
     console.log(PANEL_PRESS_ENTER_TO_RETURN);
@@ -4336,7 +4402,7 @@ async function handleMergeConflict(currentBranch, incomingBranch, cwd, autoFlag)
 // src/hooks/post-create.ts
 import { existsSync as existsSync10, accessSync, chmodSync, constants as fsConstants } from "fs";
 import { spawn as spawn2 } from "child_process";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var POST_CREATE_SCRIPT_RELATIVE_PATH = ".clawt/postCreate.sh";
 function isExecutable(filePath) {
   try {
@@ -4368,7 +4434,7 @@ function resolvePostCreateHook() {
     }
   }
   const mainWorktreePath = getMainWorktreePath();
-  const scriptPath = join8(mainWorktreePath, POST_CREATE_SCRIPT_RELATIVE_PATH);
+  const scriptPath = join9(mainWorktreePath, POST_CREATE_SCRIPT_RELATIVE_PATH);
   if (existsSync10(scriptPath)) {
     if (!isExecutable(scriptPath)) {
       autoFixExecutablePermission(scriptPath);
@@ -5596,7 +5662,7 @@ function registerAliasCommand(program2) {
 
 // src/commands/projects.ts
 import { existsSync as existsSync11, readdirSync as readdirSync5, statSync as statSync4 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import chalk13 from "chalk";
 function registerProjectsCommand(program2) {
   program2.command("projects [name]").description("\u5C55\u793A\u6240\u6709\u9879\u76EE\u7684 worktree \u6982\u89C8\uFF0C\u6216\u67E5\u770B\u6307\u5B9A\u9879\u76EE\u7684 worktree \u8BE6\u60C5").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA").action((name, options) => {
@@ -5620,7 +5686,7 @@ function handleProjectsOverview(json) {
   printProjectsOverviewAsText(result);
 }
 function handleProjectDetail(name, json) {
-  const projectDir = join9(WORKTREES_DIR, name);
+  const projectDir = join10(WORKTREES_DIR, name);
   if (!existsSync11(projectDir)) {
     printError(MESSAGES.PROJECTS_NOT_FOUND(name));
     process.exit(1);
@@ -5643,7 +5709,7 @@ function collectProjectsOverview() {
     if (!entry.isDirectory()) {
       continue;
     }
-    const projectDir = join9(WORKTREES_DIR, entry.name);
+    const projectDir = join10(WORKTREES_DIR, entry.name);
     const overview = collectSingleProjectOverview(entry.name, projectDir);
     projects.push(overview);
   }
@@ -5660,7 +5726,7 @@ function collectSingleProjectOverview(name, projectDir) {
   const worktreeDirs = subEntries.filter((e) => e.isDirectory());
   const worktreeCount = worktreeDirs.length;
   const diskUsage = calculateDirSize(projectDir);
-  const lastActiveTime = resolveProjectLastActiveTime(projectDir, worktreeDirs.map((e) => join9(projectDir, e.name)));
+  const lastActiveTime = resolveProjectLastActiveTime(projectDir, worktreeDirs.map((e) => join10(projectDir, e.name)));
   return {
     name,
     worktreeCount,
@@ -5675,7 +5741,7 @@ function collectProjectDetail(name, projectDir) {
     if (!entry.isDirectory()) {
       continue;
     }
-    const wtPath = join9(projectDir, entry.name);
+    const wtPath = join10(projectDir, entry.name);
     const detail = collectSingleWorktreeDetail(entry.name, wtPath);
     worktrees.push(detail);
   }
@@ -5826,11 +5892,11 @@ compdef _clawt_completion clawt
 
 // src/utils/completion-engine.ts
 import { existsSync as existsSync12, readdirSync as readdirSync6, statSync as statSync5 } from "fs";
-import { join as join10, dirname, basename as basename2 } from "path";
+import { join as join11, dirname, basename as basename2 } from "path";
 function completeFilePath(partial) {
   const cwd = process.cwd();
   const hasDir = partial.includes("/");
-  const searchDir = hasDir ? join10(cwd, dirname(partial)) : cwd;
+  const searchDir = hasDir ? join11(cwd, dirname(partial)) : cwd;
   const prefix = hasDir ? basename2(partial) : partial;
   if (!existsSync12(searchDir)) {
     return [];
@@ -5841,7 +5907,7 @@ function completeFilePath(partial) {
   for (const entry of entries) {
     if (!entry.startsWith(prefix)) continue;
     if (entry.startsWith(".")) continue;
-    const fullPath = join10(searchDir, entry);
+    const fullPath = join11(searchDir, entry);
     try {
       const stat = statSync5(fullPath);
       if (stat.isDirectory()) {
@@ -6065,12 +6131,12 @@ async function handleHome() {
 }
 
 // src/commands/tasks.ts
-import { resolve as resolve3, dirname as dirname2, join as join11 } from "path";
+import { resolve as resolve3, dirname as dirname2, join as join12 } from "path";
 import { existsSync as existsSync14, writeFileSync as writeFileSync6 } from "fs";
 function registerTasksCommand(program2) {
   const taskCmd = program2.command("tasks").description("\u4EFB\u52A1\u6587\u4EF6\u7BA1\u7406");
   taskCmd.command("init").description("\u751F\u6210\u4EFB\u52A1\u6A21\u677F\u6587\u4EF6").argument("[path]", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").action(async (path2) => {
-    const filePath = path2 ?? join11(TASK_TEMPLATE_OUTPUT_DIR, generateTaskFilename(TASK_TEMPLATE_FILENAME_PREFIX));
+    const filePath = path2 ?? join12(TASK_TEMPLATE_OUTPUT_DIR, generateTaskFilename(TASK_TEMPLATE_FILENAME_PREFIX));
     await handleTasksInit(filePath);
   });
 }

package/dist/postinstall.js

@@ -58,7 +58,13 @@ var COMMON_MESSAGES = {
   /** 守卫检测：配置的主工作分支已不存在 */
   GUARD_BRANCH_NOT_EXISTS: (branchName) => `\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${branchName} \u5DF2\u4E0D\u5B58\u5728\uFF0C\u8BF7\u6267\u884C clawt init \u91CD\u65B0\u8BBE\u7F6E\u4E3B\u5DE5\u4F5C\u5206\u652F`,
   /** 守卫检测：当前分支与配置的主工作分支不一致 */
-  GUARD_BRANCH_MISMATCH: (configuredBranch, currentBranch) => `\u5F53\u524D\u5206\u652F ${currentBranch} \u4E0E\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${configuredBranch} \u4E0D\u4E00\u81F4\uFF0C\u5982\u9700\u66F4\u65B0\u8BF7\u6267\u884C clawt init`
+  GUARD_BRANCH_MISMATCH: (configuredBranch, currentBranch) => `\u5F53\u524D\u5206\u652F ${currentBranch} \u4E0E\u914D\u7F6E\u7684\u4E3B\u5DE5\u4F5C\u5206\u652F ${configuredBranch} \u4E0D\u4E00\u81F4\uFF0C\u5982\u9700\u66F4\u65B0\u8BF7\u6267\u884C clawt init`,
+  /** Git index 被锁定（index.lock 存在） */
+  GIT_INDEX_LOCKED: (lockFilePath) => `Git index \u88AB\u9501\u5B9A\uFF0C\u65E0\u6CD5\u6267\u884C\u64CD\u4F5C
+  \u539F\u56E0\uFF1A\u9501\u6587\u4EF6\u5DF2\u5B58\u5728\uFF08\u53EF\u80FD\u662F\u4E0A\u6B21 git \u64CD\u4F5C\u5F02\u5E38\u4E2D\u65AD\u6B8B\u7559\uFF09
+  \u9501\u6587\u4EF6\u8DEF\u5F84\uFF1A${lockFilePath}
+  \u4FEE\u590D\u65B9\u6CD5\uFF1A\u786E\u8BA4\u6CA1\u6709\u5176\u4ED6 git \u64CD\u4F5C\u5728\u8FDB\u884C\u540E\uFF0C\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u5220\u9664\u9501\u6587\u4EF6\uFF1A
+  rm ${lockFilePath}`
 };
 
 // src/constants/messages/run.ts

package/package.json

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

package/src/constants/messages/common.ts

@@ -48,4 +48,11 @@ export const COMMON_MESSAGES = {
   /** 守卫检测：当前分支与配置的主工作分支不一致 */
   GUARD_BRANCH_MISMATCH: (configuredBranch: string, currentBranch: string) =>
     `当前分支 ${currentBranch} 与配置的主工作分支 ${configuredBranch} 不一致，如需更新请执行 clawt init`,
+  /** Git index 被锁定（index.lock 存在） */
+  GIT_INDEX_LOCKED: (lockFilePath: string) =>
+    `Git index 被锁定，无法执行操作\n` +
+    `  原因：锁文件已存在（可能是上次 git 操作异常中断残留）\n` +
+    `  锁文件路径：${lockFilePath}\n` +
+    `  修复方法：确认没有其他 git 操作在进行后，执行以下命令删除锁文件：\n` +
+    `  rm ${lockFilePath}`,
 } as const;

package/src/utils/git-lock.ts

@@ -0,0 +1,90 @@
+import { join, isAbsolute } from 'node:path';
+import { execSync } from 'node:child_process';
+import { logger } from '../logger/index.js';
+import { ClawtError } from '../errors/index.js';
+import { MESSAGES } from '../constants/index.js';
+
+/**
+ * index.lock 错误的关键词匹配模式
+ * 每个模式同时要求包含 index 关键词，避免 "Unable to write" 单独匹配导致误报
+ */
+const INDEX_LOCK_ERROR_PATTERNS = [
+  /Unable to write.*index/i,
+  /index\.lock/i,
+  /Unable to create.*index/i,
+];
+
+/** 从 Git 错误消息中提取 index.lock 文件路径的正则（路径被 ASCII 单引号包裹） */
+const INDEX_LOCK_PATH_EXTRACT_PATTERN = /'([^']*index\.lock)'/;
+
+/**
+ * 检测错误消息是否为 Git index.lock 相关错误
+ * @param {string} errorMessage - 错误消息字符串
+ * @returns {boolean} 是否为 index.lock 相关错误
+ */
+export function isGitIndexLockError(errorMessage: string): boolean {
+  return INDEX_LOCK_ERROR_PATTERNS.some((pattern) => pattern.test(errorMessage));
+}
+
+/**
+ * 从错误对象中提取完整的错误消息（包括 stderr）
+ * execSync/execFileSync 抛出的错误对象的 stderr 属性包含 git 的实际错误输出
+ * @param {unknown} error - 捕获的错误对象
+ * @returns {string} 合并后的错误消息
+ */
+function extractFullErrorMessage(error: unknown): string {
+  if (!(error instanceof Error)) return String(error);
+  const stderr = (error as { stderr?: string | Buffer }).stderr;
+  const stderrStr = stderr ? String(stderr) : '';
+  return stderrStr ? `${error.message}\n${stderrStr}` : error.message;
+}
+
+/**
+ * 定位 Git index.lock 文件的完整路径
+ * 兼容主 worktree 和子 worktree 场景（子 worktree 的 .git 是文件而非目录）
+ * @param {string} [cwd] - 工作目录
+ * @returns {string} index.lock 文件的完整路径
+ */
+export function findGitIndexLockPath(cwd?: string): string {
+  try {
+    // 不使用 shell.ts 的 execCommand，避免循环依赖（shell.ts → git-lock.ts → shell.ts）
+    const gitDir = execSync('git rev-parse --git-dir', {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+    // git rev-parse --git-dir 在某些场景（如设置了 GIT_DIR 环境变量）下返回绝对路径
+    return isAbsolute(gitDir) ? join(gitDir, 'index.lock') : join(cwd || process.cwd(), gitDir, 'index.lock');
+  } catch (error) {
+    logger.warn(`定位 git 目录失败: ${error}`);
+    // 降级：返回默认路径
+    return join(cwd || process.cwd(), '.git', 'index.lock');
+  }
+}
+
+/**
+ * 从 Git 错误消息中解析 index.lock 文件的完整路径
+ * Git 的 index.lock 错误消息格式统一为：Unable to create '<绝对路径>/index.lock': File exists
+ * 路径被 ASCII 单引号包裹（中英文 locale 均如此，实测验证）
+ * @param {string} errorMessage - 错误消息字符串
+ * @returns {string | undefined} 解析出的路径，无法解析时返回 undefined
+ */
+function parseIndexLockPathFromError(errorMessage: string): string | undefined {
+  const match = errorMessage.match(INDEX_LOCK_PATH_EXTRACT_PATTERN);
+  return match?.[1];
+}
+
+/**
+ * 检测错误是否为 Git index.lock 错误，如果是则抛出中文友好提示的 ClawtError
+ * @param {unknown} error - 捕获的错误对象
+ * @param {string} [cwd] - 工作目录（用于定位锁文件路径）
+ * @throws {ClawtError} 当检测到 index.lock 错误时抛出
+ */
+export function throwIfGitIndexLockError(error: unknown, cwd?: string): void {
+  const errorMessage = extractFullErrorMessage(error);
+  if (isGitIndexLockError(errorMessage)) {
+    // 优先从 git 错误消息中解析路径（零开销且最准确），解析失败时降级到 findGitIndexLockPath
+    const lockFilePath = parseIndexLockPathFromError(errorMessage) ?? findGitIndexLockPath(cwd);
+    throw new ClawtError(MESSAGES.GIT_INDEX_LOCKED(lockFilePath));
+  }
+}

package/src/utils/git.ts

@@ -1,3 +1,4 @@
 export * from './git-core.js';
 export * from './git-branch.js';
 export * from './git-worktree.js';
+export * from './git-lock.js';

package/src/utils/index.ts

@@ -57,6 +57,7 @@ export {
   gitMergeContinue,
   gitMergeAbort,
   buildAutoSaveCommitMessage,
+  throwIfGitIndexLockError,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled, validateHeadExists, validateWorkingDirClean, runPreChecks } from './validation.js';

package/src/utils/interactive-panel.ts

@@ -125,17 +125,7 @@ export class InteractivePanel {
     // 恢复终端
     this.restoreTerminal();
 
-    // 移除 resize 监听
-    if (this.resizeHandler) {
-      process.stdout.removeListener('resize', this.resizeHandler);
-      this.resizeHandler = null;
-    }
-
-    // 移除 exit 兜底
-    if (this.exitHandler) {
-      process.removeListener('exit', this.exitHandler);
-      this.exitHandler = null;
-    }
+    this.removeTerminalListeners();
 
     // 完成 Promise
     if (this.resolveStart) {
@@ -148,6 +138,9 @@ export class InteractivePanel {
    * 初始化终端：进入备选屏幕、隐藏光标、禁用行换行
    */
   private initTerminal(): void {
+    // 确保不会重复注册监听器
+    this.removeTerminalListeners();
+
     process.stdout.write(ALT_SCREEN_ENTER);
     process.stdout.write(CURSOR_HIDE);
     process.stdout.write(LINE_WRAP_DISABLE);
@@ -163,14 +156,24 @@ export class InteractivePanel {
     process.stdout.on('resize', this.resizeHandler);
 
     // 注册 exit 兜底，确保异常退出时终端状态被恢复
-    this.exitHandler = () => {
-      process.stdout.write(LINE_WRAP_ENABLE);
-      process.stdout.write(CURSOR_SHOW);
-      process.stdout.write(ALT_SCREEN_LEAVE);
-    };
+    this.exitHandler = () => this.restoreTerminal();
     process.on('exit', this.exitHandler);
   }
 
+  /**
+   * 移除终端事件监听器（resize 和 exit）
+   */
+  private removeTerminalListeners(): void {
+    if (this.resizeHandler) {
+      process.stdout.removeListener('resize', this.resizeHandler);
+      this.resizeHandler = null;
+    }
+    if (this.exitHandler) {
+      process.removeListener('exit', this.exitHandler);
+      this.exitHandler = null;
+    }
+  }
+
   /**
    * 恢复终端：启用行换行、显示光标、退出备选屏幕
    */
@@ -365,6 +368,8 @@ export class InteractivePanel {
 
     // 恢复终端以便子命令输出
     this.restoreTerminal();
+    // 移除旧的终端事件监听器，避免 initTerminal() 重复注册导致泄漏
+    this.removeTerminalListeners();
 
     // 恢复 stdin 以便子命令交互
     this.keyboardController.stop();

package/src/utils/shell.ts

@@ -1,6 +1,7 @@
 import { execSync, execFileSync, spawn, spawnSync, type ChildProcess, type SpawnSyncReturns, type StdioOptions } from 'node:child_process';
 import { logger } from '../logger/index.js';
 import { EXEC_MAX_BUFFER } from '../constants/git.js';
+import { throwIfGitIndexLockError } from './git-lock.js';
 
 /**
  * 获取移除了 CLAUDECODE 嵌套会话标记的环境变量副本
@@ -45,17 +46,23 @@ export interface ParallelCommandResultWithStderr extends ParallelCommandResult {
  * @param {object} options - 可选配置
  * @param {string} options.cwd - 工作目录
  * @returns {string} 命令的标准输出（已 trim）
- * @throws {Error} 命令执行失败时抛出
+ * @throws {ClawtError} 检测到 index.lock 错误时抛出中文友好提示
+ * @throws {Error} 其他命令执行失败时抛出
  */
 export function execCommand(command: string, options?: { cwd?: string }): string {
   logger.debug(`执行命令: ${command}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`);
-  const result = execSync(command, {
-    cwd: options?.cwd,
-    encoding: 'utf-8',
-    stdio: ['pipe', 'pipe', 'pipe'],
-    maxBuffer: EXEC_MAX_BUFFER,
-  });
-  return result.trim();
+  try {
+    const result = execSync(command, {
+      cwd: options?.cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      maxBuffer: EXEC_MAX_BUFFER,
+    });
+    return result.trim();
+  } catch (error) {
+    throwIfGitIndexLockError(error, options?.cwd);
+    throw error;
+  }
 }
 
 /**
@@ -100,18 +107,24 @@ export function killAllChildProcesses(children: ChildProcess[]): void {
  * @param {Buffer} options.input - 通过 stdin 传入的数据（Buffer 格式，保留二进制完整性）
  * @param {string} [options.cwd] - 工作目录
  * @returns {string} 命令的标准输出（已 trim）
- * @throws {Error} 命令执行失败时抛出
+ * @throws {ClawtError} 检测到 index.lock 错误时抛出中文友好提示
+ * @throws {Error} 其他命令执行失败时抛出
  */
 export function execCommandWithInput(command: string, args: string[], options: { input: Buffer; cwd?: string }): string {
   logger.debug(`执行命令(stdin): ${command} ${args.join(' ')}${options.cwd ? ` (cwd: ${options.cwd})` : ''}`);
-  const result = execFileSync(command, args, {
-    cwd: options.cwd,
-    input: options.input,
-    encoding: 'utf-8',
-    stdio: ['pipe', 'pipe', 'pipe'],
-    maxBuffer: EXEC_MAX_BUFFER,
-  });
-  return result.trim();
+  try {
+    const result = execFileSync(command, args, {
+      cwd: options.cwd,
+      input: options.input,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      maxBuffer: EXEC_MAX_BUFFER,
+    });
+    return result.trim();
+  } catch (error) {
+    throwIfGitIndexLockError(error, options.cwd);
+    throw error;
+  }
 }
 
 /**

package/tests/unit/utils/git-lock.test.ts

@@ -0,0 +1,149 @@
+import { describe, it, expect, vi } from 'vitest';
+
+// mock node:child_process
+vi.mock('node:child_process', () => ({
+  execSync: vi.fn(),
+}));
+
+// mock logger
+vi.mock('../../../src/logger/index.js', () => ({
+  logger: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+
+// mock errors
+vi.mock('../../../src/errors/index.js', () => ({
+  ClawtError: class ClawtError extends Error {
+    constructor(message: string) {
+      super(message);
+      this.name = 'ClawtError';
+    }
+  },
+}));
+
+// mock constants
+vi.mock('../../../src/constants/index.js', () => ({
+  MESSAGES: {
+    GIT_INDEX_LOCKED: (lockFilePath: string) => `Git index 被锁定，锁文件路径：${lockFilePath}`,
+  },
+}));
+
+import { execSync } from 'node:child_process';
+import { isGitIndexLockError, findGitIndexLockPath, throwIfGitIndexLockError } from '../../../src/utils/git-lock.js';
+
+const mockedExecSync = vi.mocked(execSync);
+
+describe('isGitIndexLockError', () => {
+  it('检测 "Unable to write index" 错误', () => {
+    expect(isGitIndexLockError('fatal: Unable to write index.')).toBe(true);
+  });
+
+  it('检测 "Unable to write new index file" 错误', () => {
+    expect(isGitIndexLockError('fatal: Unable to write new index file')).toBe(true);
+  });
+
+  it('检测包含 "index.lock" 的错误', () => {
+    expect(isGitIndexLockError("fatal: Unable to create '/repo/.git/index.lock': File exists.")).toBe(true);
+  });
+
+  it('检测 "Unable to create" 含 index 的错误', () => {
+    expect(isGitIndexLockError("Unable to create '/path/.git/index.lock'")).toBe(true);
+  });
+
+  it('不误判普通 merge 冲突错误', () => {
+    expect(isGitIndexLockError('CONFLICT (content): Merge conflict in file.ts')).toBe(false);
+  });
+
+  it('不误判分支不存在错误', () => {
+    expect(isGitIndexLockError("error: pathspec 'nonexistent' did not match any file(s) known to git")).toBe(false);
+  });
+
+  it('不误判普通命令失败', () => {
+    expect(isGitIndexLockError('Command failed: git merge feature-branch')).toBe(false);
+  });
+
+  it('不误判 push 拒绝错误', () => {
+    expect(isGitIndexLockError('error: failed to push some refs')).toBe(false);
+  });
+
+  it('空字符串不匹配', () => {
+    expect(isGitIndexLockError('')).toBe(false);
+  });
+
+  it('不误判不含 index 关键词的 Unable to write 错误', () => {
+    expect(isGitIndexLockError('fatal: Unable to write sha1 filename')).toBe(false);
+  });
+
+  it('大小写不敏感匹配 "unable to write"', () => {
+    expect(isGitIndexLockError('FATAL: UNABLE TO WRITE INDEX.')).toBe(true);
+  });
+});
+
+describe('findGitIndexLockPath', () => {
+  it('正确拼接 git 目录和 index.lock 路径', () => {
+    mockedExecSync.mockReturnValue('.git\n');
+    const result = findGitIndexLockPath('/repo');
+    expect(result).toContain('.git');
+    expect(result).toContain('index.lock');
+  });
+
+  it('git rev-parse 失败时降级返回默认路径', () => {
+    mockedExecSync.mockImplementation(() => { throw new Error('not a git repo'); });
+    const result = findGitIndexLockPath('/repo');
+    expect(result).toContain('.git');
+    expect(result).toContain('index.lock');
+  });
+
+  it('不传 cwd 时使用 process.cwd()', () => {
+    mockedExecSync.mockReturnValue('.git\n');
+    const result = findGitIndexLockPath();
+    expect(result).toContain('index.lock');
+  });
+});
+
+describe('throwIfGitIndexLockError', () => {
+  it('从英文错误消息中解析 index.lock 路径（无需调用 git rev-parse）', () => {
+    const error = new Error(
+      "Command failed: git add .\n" +
+      "fatal: Unable to create '/repo/.git/index.lock': File exists.\n"
+    );
+    // 不设置 mockedExecSync 的返回值，确认不会调用 git rev-parse
+    mockedExecSync.mockImplementation(() => { throw new Error('should not be called'); });
+    expect(() => throwIfGitIndexLockError(error)).toThrow(/\/repo\/\.git\/index\.lock/);
+  });
+
+  it('从中文错误消息中解析 index.lock 路径', () => {
+    const error = new Error(
+      "Command failed: git add .\n" +
+      "致命错误：无法创建 '/repo/.git/index.lock'：File exists。\n"
+    );
+    mockedExecSync.mockImplementation(() => { throw new Error('should not be called'); });
+    expect(() => throwIfGitIndexLockError(error)).toThrow(/\/repo\/\.git\/index\.lock/);
+  });
+
+  it('从子 worktree 错误消息中解析 index.lock 路径', () => {
+    const error = new Error(
+      "Command failed: git add .\n" +
+      "fatal: Unable to create '/repo/.git/worktrees/my-wt/index.lock': File exists.\n"
+    );
+    mockedExecSync.mockImplementation(() => { throw new Error('should not be called'); });
+    expect(() => throwIfGitIndexLockError(error)).toThrow(/\/repo\/\.git\/worktrees\/my-wt\/index\.lock/);
+  });
+
+  it('从 error.stderr 中解析路径', () => {
+    const error = new Error("Command failed: git merge feature");
+    (error as any).stderr = "error: Unable to create '/repo/.git/index.lock': File exists.\n";
+    mockedExecSync.mockImplementation(() => { throw new Error('should not be called'); });
+    expect(() => throwIfGitIndexLockError(error)).toThrow(/\/repo\/\.git\/index\.lock/);
+  });
+
+  it('错误消息不含路径时降级到 findGitIndexLockPath', () => {
+    const error = new Error("fatal: Unable to write index.");
+    mockedExecSync.mockReturnValue('.git\n' as any);
+    expect(() => throwIfGitIndexLockError(error, '/fallback')).toThrow(/index\.lock/);
+  });
+
+  it('非 index.lock 错误不抛出', () => {
+    const error = new Error("Command failed: git merge feature");
+    expect(() => throwIfGitIndexLockError(error)).not.toThrow();
+  });
+});