clawt 3.9.7 → 3.9.8

package/README.md

@@ -56,7 +56,7 @@ clawt init show           # Interactively view and modify project configuration
 clawt init show --json    # Output project configuration in JSON format
 ```
 
-Sets the project's main work branch. Re-running updates the main work branch configuration. `init show` provides an interactive panel for viewing and modifying project settings (e.g., commands to auto-run after validate succeeds, postCreate hook commands after worktree creation, etc.). `init show --json` outputs the current project configuration in JSON format.
+Sets the project's main work branch. Re-running updates the main work branch configuration. `init show` provides an interactive panel for viewing and modifying project settings (e.g., commands to auto-run after validate succeeds, postCreate hook commands after worktree creation, claudeCodeCommand, etc.). `init show --json` outputs the current project configuration in JSON format.
 
 ### `clawt run` — Create worktree and execute tasks
 
@@ -334,7 +334,7 @@ Configuration file is located at `~/.clawt/config.json`, auto-generated after in
 | Config Item | Default | Description |
 | ------ | ------ | ---- |
 | `autoDeleteBranch` | `false` | Auto-delete merged/removed branches |
-| `claudeCodeCommand` | `"claude"` | Claude Code CLI launch command |
+| `claudeCodeCommand` | `"claude"` | Claude Code CLI launch command (can be overridden per-project via `clawt init show`) |
 | `autoPullPush` | `false` | Auto pull/push after merge |
 | `confirmDestructiveOps` | `true` | Confirm before destructive operations |
 | `maxConcurrency` | `0` | Max concurrency for run command, `0` means unlimited |

package/dist/index.js

@@ -782,6 +782,10 @@ var PROJECT_CONFIG_DEFINITIONS = {
   postCreate: {
     defaultValue: void 0,
     description: "worktree \u521B\u5EFA\u540E\u81EA\u52A8\u6267\u884C\u7684\u547D\u4EE4\uFF0C\u7528\u4E8E\u5B89\u88C5\u4F9D\u8D56\u7B49\u521D\u59CB\u5316\u64CD\u4F5C"
+  },
+  claudeCodeCommand: {
+    defaultValue: void 0,
+    description: "Claude Code CLI \u542F\u52A8\u6307\u4EE4\uFF08\u672A\u8BBE\u7F6E\u65F6\u56DE\u9000\u5230\u5168\u5C40\u914D\u7F6E\uFF09"
   }
 };
 function deriveDefaultConfig2(definitions) {
@@ -1662,7 +1666,7 @@ function validateBranchesNotExist(branchNames) {
 }
 
 // src/utils/project-config.ts
-import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { join as join4 } from "path";
 
 // src/utils/fs.ts
@@ -1704,6 +1708,101 @@ function calculateDirSize(dirPath) {
   return totalSize;
 }
 
+// src/utils/config.ts
+import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
+function loadConfig() {
+  if (!existsSync3(CONFIG_PATH)) {
+    return { ...DEFAULT_CONFIG };
+  }
+  try {
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
+    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
+  } catch {
+    logger.warn(MESSAGES.CONFIG_CORRUPTED);
+    writeDefaultConfig();
+    return { ...DEFAULT_CONFIG };
+  }
+}
+function writeConfig(config2) {
+  writeFileSync(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
+}
+function writeDefaultConfig() {
+  writeConfig(DEFAULT_CONFIG);
+}
+function saveConfig(config2) {
+  writeFileSync(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
+}
+function getConfigValue(key) {
+  const config2 = loadConfig();
+  return config2[key];
+}
+function ensureClawtDirs() {
+  ensureDir(CLAWT_HOME);
+  ensureDir(LOGS_DIR);
+  ensureDir(WORKTREES_DIR);
+  ensureDir(PROJECTS_CONFIG_DIR);
+}
+function parseConcurrency(optionValue, configValue) {
+  if (optionValue === void 0) {
+    return configValue;
+  }
+  const parsed = parseInt(optionValue, 10);
+  if (Number.isNaN(parsed) || parsed < 0) {
+    throw new ClawtError(MESSAGES.CONCURRENCY_INVALID);
+  }
+  return parsed;
+}
+
+// src/utils/json.ts
+function primitiveToString(value) {
+  if (value === void 0) {
+    return "undefined";
+  }
+  if (value === null) {
+    return "null";
+  }
+  if (typeof value === "symbol") {
+    return value.toString();
+  }
+  if (typeof value === "function") {
+    return `[Function: ${value.name || "anonymous"}]`;
+  }
+  return String(value);
+}
+function safeStringify(value, indent = 2) {
+  if (value === null || typeof value !== "object") {
+    return primitiveToString(value);
+  }
+  try {
+    const seen = /* @__PURE__ */ new WeakSet();
+    return JSON.stringify(
+      value,
+      (_key, val) => {
+        if (typeof val === "bigint") {
+          return val.toString();
+        }
+        if (typeof val === "undefined" || typeof val === "function" || typeof val === "symbol") {
+          return primitiveToString(val);
+        }
+        if (typeof val === "object" && val !== null) {
+          if (seen.has(val)) {
+            return "[Circular]";
+          }
+          seen.add(val);
+        }
+        return val;
+      },
+      indent
+    );
+  } catch {
+    try {
+      return JSON.stringify(String(value), null, indent);
+    } catch {
+      return "[Unserializable]";
+    }
+  }
+}
+
 // src/utils/project-config.ts
 function getProjectConfigPath(projectName) {
   return join4(PROJECTS_CONFIG_DIR, projectName, "config.json");
@@ -1711,11 +1810,11 @@ function getProjectConfigPath(projectName) {
 function loadProjectConfig() {
   const projectName = getProjectName();
   const configPath = getProjectConfigPath(projectName);
-  if (!existsSync3(configPath)) {
+  if (!existsSync4(configPath)) {
     return null;
   }
   try {
-    const raw = readFileSync(configPath, "utf-8");
+    const raw = readFileSync2(configPath, "utf-8");
     return JSON.parse(raw);
   } catch (error) {
     logger.warn(`\u9879\u76EE\u914D\u7F6E\u6587\u4EF6\u89E3\u6790\u5931\u8D25: ${error}`);
@@ -1727,7 +1826,7 @@ function saveProjectConfig(config2) {
   const configPath = getProjectConfigPath(projectName);
   const projectDir = join4(PROJECTS_CONFIG_DIR, projectName);
   ensureDir(projectDir);
-  writeFileSync(configPath, JSON.stringify(config2, null, 2), "utf-8");
+  writeFileSync2(configPath, safeStringify({ ...config2 }, 2), "utf-8");
   logger.info(`\u9879\u76EE\u914D\u7F6E\u5DF2\u4FDD\u5B58: ${configPath}`);
 }
 function requireProjectConfig() {
@@ -1755,6 +1854,24 @@ function getValidateRunCommand() {
   const config2 = loadProjectConfig();
   return config2?.validateRunCommand || void 0;
 }
+function resolveClaudeCodeCommand() {
+  const projectConfig = loadProjectConfig();
+  if (projectConfig?.claudeCodeCommand) {
+    return projectConfig.claudeCodeCommand;
+  }
+  return getConfigValue("claudeCodeCommand");
+}
+function normalizeProjectConfig(config2, key, value) {
+  if (value === "") {
+    const def = PROJECT_CONFIG_DEFINITIONS[key];
+    if (def?.defaultValue === void 0) {
+      const normalized = { ...config2 };
+      delete normalized[key];
+      return normalized;
+    }
+  }
+  return config2;
+}
 
 // src/utils/validate-branch.ts
 import Enquirer from "enquirer";
@@ -1921,7 +2038,7 @@ async function runPreChecks(options) {
 
 // src/utils/worktree.ts
 import { join as join5 } from "path";
-import { existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync5, readdirSync as readdirSync2 } from "fs";
 function getProjectWorktreeDir() {
   const projectName = getProjectName();
   return join5(WORKTREES_DIR, projectName);
@@ -1958,7 +2075,7 @@ function createWorktreesByBranches(branchNames) {
 }
 function getProjectWorktrees() {
   const projectDir = getProjectWorktreeDir();
-  if (!existsSync4(projectDir)) {
+  if (!existsSync5(projectDir)) {
     return [];
   }
   const worktreeListOutput = gitWorktreeList();
@@ -2008,51 +2125,6 @@ function getWorktreeStatus(worktree) {
   }
 }
 
-// src/utils/config.ts
-import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-function loadConfig() {
-  if (!existsSync5(CONFIG_PATH)) {
-    return { ...DEFAULT_CONFIG };
-  }
-  try {
-    const raw = readFileSync2(CONFIG_PATH, "utf-8");
-    return { ...DEFAULT_CONFIG, ...JSON.parse(raw) };
-  } catch {
-    logger.warn(MESSAGES.CONFIG_CORRUPTED);
-    writeDefaultConfig();
-    return { ...DEFAULT_CONFIG };
-  }
-}
-function writeConfig(config2) {
-  writeFileSync2(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
-}
-function writeDefaultConfig() {
-  writeConfig(DEFAULT_CONFIG);
-}
-function saveConfig(config2) {
-  writeFileSync2(CONFIG_PATH, JSON.stringify(config2, null, 2), "utf-8");
-}
-function getConfigValue(key) {
-  const config2 = loadConfig();
-  return config2[key];
-}
-function ensureClawtDirs() {
-  ensureDir(CLAWT_HOME);
-  ensureDir(LOGS_DIR);
-  ensureDir(WORKTREES_DIR);
-  ensureDir(PROJECTS_CONFIG_DIR);
-}
-function parseConcurrency(optionValue, configValue) {
-  if (optionValue === void 0) {
-    return configValue;
-  }
-  const parsed = parseInt(optionValue, 10);
-  if (Number.isNaN(parsed) || parsed < 0) {
-    throw new ClawtError(MESSAGES.CONCURRENCY_INVALID);
-  }
-  return parsed;
-}
-
 // src/utils/prompt.ts
 import Enquirer2 from "enquirer";
 async function promptCommitMessage(promptMessage, nonInteractiveErrorMessage) {
@@ -2224,7 +2296,7 @@ function hasClaudeSessionHistory(worktreePath) {
   return entries.some((entry) => entry.endsWith(".jsonl"));
 }
 function launchInteractiveClaude(worktree, options = {}) {
-  const commandStr = getConfigValue("claudeCodeCommand");
+  const commandStr = resolveClaudeCodeCommand();
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
   const args = [
@@ -2259,7 +2331,7 @@ function escapeShellSingleQuote(str) {
   return str.replace(/'/g, "'\\''");
 }
 function buildClaudeCommand(worktree, hasPreviousSession) {
-  const commandStr = getConfigValue("claudeCodeCommand");
+  const commandStr = resolveClaudeCodeCommand();
   const systemPrompt = APPEND_SYSTEM_PROMPT;
   const escapedPath = escapeShellSingleQuote(worktree.path);
   const escapedPrompt = escapeShellSingleQuote(systemPrompt);
@@ -3586,56 +3658,6 @@ async function checkForUpdates(currentVersion) {
   }
 }
 
-// src/utils/json.ts
-function primitiveToString(value) {
-  if (value === void 0) {
-    return "undefined";
-  }
-  if (value === null) {
-    return "null";
-  }
-  if (typeof value === "symbol") {
-    return value.toString();
-  }
-  if (typeof value === "function") {
-    return `[Function: ${value.name || "anonymous"}]`;
-  }
-  return String(value);
-}
-function safeStringify(value, indent = 2) {
-  if (value === null || typeof value !== "object") {
-    return primitiveToString(value);
-  }
-  try {
-    const seen = /* @__PURE__ */ new WeakSet();
-    return JSON.stringify(
-      value,
-      (_key, val) => {
-        if (typeof val === "bigint") {
-          return val.toString();
-        }
-        if (typeof val === "undefined" || typeof val === "function" || typeof val === "symbol") {
-          return primitiveToString(val);
-        }
-        if (typeof val === "object" && val !== null) {
-          if (seen.has(val)) {
-            return "[Circular]";
-          }
-          seen.add(val);
-        }
-        return val;
-      },
-      indent
-    );
-  } catch {
-    try {
-      return JSON.stringify(String(value), null, indent);
-    } catch {
-      return "[Unserializable]";
-    }
-  }
-}
-
 // src/utils/validate-runner.ts
 function handleErrorClipboard(clipboardContent) {
   const success = copyToClipboard(clipboardContent);
@@ -6281,7 +6303,8 @@ async function handleInitShow(options) {
     PROJECT_CONFIG_DEFINITIONS,
     { selectPrompt: MESSAGES.INIT_SELECT_PROMPT }
   );
-  const updatedConfig = { ...config2, [key]: newValue };
+  const mergedConfig = { ...config2, [key]: newValue };
+  const updatedConfig = normalizeProjectConfig(mergedConfig, key, newValue);
   saveProjectConfig(updatedConfig);
   printSuccess(MESSAGES.INIT_SET_SUCCESS(key, String(newValue)));
 }

package/dist/postinstall.js

@@ -724,6 +724,10 @@ var PROJECT_CONFIG_DEFINITIONS = {
   postCreate: {
     defaultValue: void 0,
     description: "worktree \u521B\u5EFA\u540E\u81EA\u52A8\u6267\u884C\u7684\u547D\u4EE4\uFF0C\u7528\u4E8E\u5B89\u88C5\u4F9D\u8D56\u7B49\u521D\u59CB\u5316\u64CD\u4F5C"
+  },
+  claudeCodeCommand: {
+    defaultValue: void 0,
+    description: "Claude Code CLI \u542F\u52A8\u6307\u4EE4\uFF08\u672A\u8BBE\u7F6E\u65F6\u56DE\u9000\u5230\u5168\u5C40\u914D\u7F6E\uFF09"
   }
 };
 function deriveDefaultConfig2(definitions) {

package/docs/config-file.md

@@ -35,7 +35,7 @@
 | 配置项             | 类型      | 默认值    | 说明                                               |
 | ------------------ | --------- | --------- | -------------------------------------------------- |
 | `autoDeleteBranch` | `boolean` | `false`   | 移除 worktree 时是否自动删除对应本地分支（无需每次确认）；merge 成功后是否自动清理 worktree 和分支；run 任务被中断（Ctrl+C）后是否自动清理本次创建的 worktree 和分支 |
-| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面 |
+| `claudeCodeCommand` | `string` | `"claude"` | Claude Code CLI 启动指令，用于 `clawt run` 不传 `--tasks` 时和 `clawt resume` 在 worktree 中打开交互式界面。可被项目级配置 `claudeCodeCommand` 覆盖（优先级：项目级 > 全局级，详见 [project-config.md](./project-config.md)） |
 | `autoPullPush` | `boolean` | `false` | merge 成功后是否自动执行 git pull 和 git push |
 | `confirmDestructiveOps` | `boolean` | `true` | 执行破坏性操作（reset、validate --clean）前是否提示确认 |
 | `maxConcurrency` | `number` | `0` | run 命令默认最大并发数，`0` 表示不限制 |

package/docs/init.md

@@ -26,7 +26,7 @@ clawt init show --json
 
 **功能说明：**
 
-初始化项目级配置，将指定分支记录为该项目的主工作分支（`clawtMainWorkBranch`）。该配置用于 `create` / `run` 时检测当前分支是否为主工作分支，并在偏离时提醒用户。`init show` 子命令提供交互式面板，可查看和修改所有项目配置项（如 `validateRunCommand`、`postCreate`）。项目级配置的完整说明见 [project-config.md](./project-config.md)。
+初始化项目级配置，将指定分支记录为该项目的主工作分支（`clawtMainWorkBranch`）。该配置用于 `create` / `run` 时检测当前分支是否为主工作分支，并在偏离时提醒用户。`init show` 子命令提供交互式面板，可查看和修改所有项目配置项（如 `validateRunCommand`、`postCreate`、`claudeCodeCommand`）。项目级配置的完整说明见 [project-config.md](./project-config.md)。
 
 **运行流程（设置模式）：**
 
@@ -53,7 +53,7 @@ clawt init show --json
 3. **交互式配置编辑**：调用 `interactiveConfigEditor`（`src/utils/config-strategy.ts`），基于 `PROJECT_CONFIG_DEFINITIONS` 构建配置项列表（详见 [project-config.md](./project-config.md)）
    - 列出所有项目配置项，显示名称、当前值和描述
    - 用户选择配置项后，根据值类型自动选择输入方式（与全局配置的交互式编辑逻辑一致）
-4. **持久化修改**：将修改后的值合并到当前配置并写入配置文件
+4. **持久化修改**：将修改后的值合并到当前配置，经 `normalizeProjectConfig` 归一化处理后写入配置文件（可选字段的空字符串会被移除，等同于未设置）
 5. **输出成功提示**：`✓ 项目配置 <key> 已设置为 <value>`
 
 **输出格式：**
@@ -85,5 +85,6 @@ clawt init show --json
 - `init show` 子命令从 JSON 展示改为交互式面板，调用 `interactiveConfigEditor`（`src/utils/config-strategy.ts`）实现通用交互式配置编辑
 - 配置项定义来自 `PROJECT_CONFIG_DEFINITIONS`（`src/constants/project-config.ts`），详见 [项目级配置文档](./project-config.md)
 - 消息常量：`MESSAGES.INIT_SELECT_PROMPT`（选择配置项提示语）、`MESSAGES.INIT_SET_SUCCESS`（修改成功提示），定义在 `src/constants/messages/init.ts`
+- `handleInitShow` 使用 `normalizeProjectConfig` 对修改后的配置进行归一化处理：可选字段（如 `validateRunCommand`、`postCreate`、`claudeCodeCommand`）设为空字符串时自动移除该键，避免 JSON 文件中出现冗余的 `"field": ""` 条目
 
 ---

package/docs/project-config.md

@@ -18,7 +18,8 @@
 {
   "clawtMainWorkBranch": "main",
   "validateRunCommand": "npm test",
-  "postCreate": "npm install"
+  "postCreate": "npm install",
+  "claudeCodeCommand": "claude --model opus"
 }
 ```
 
@@ -27,6 +28,7 @@
 | `clawtMainWorkBranch` | `string` | 是 | `""` | 项目的主工作分支名，用于 create 时检测当前分支是否为主分支，以及 sync、merge 等命令获取主分支名 |
 | `validateRunCommand` | `string` | 否 | `undefined` | validate 成功后自动执行的命令（作为 `-r` 选项的默认值）。不传 `-r` 时，validate 命令会自动从此项读取 |
 | `postCreate` | `string` | 否 | `undefined` | worktree 创建后自动执行的初始化命令（如安装依赖、生成配置文件、编译资源等）。详见 [post-create-hook.md](./post-create-hook.md) |
+| `claudeCodeCommand` | `string` | 否 | `undefined` | Claude Code CLI 启动指令，项目级覆盖全局配置。未设置时回退到全局配置 `claudeCodeCommand`（详见 [config-file.md](./config-file.md)）。优先级：项目级 > 全局级 |
 
 #### 配置项定义数据源
 
@@ -48,6 +50,10 @@ export const PROJECT_CONFIG_DEFINITIONS: ProjectConfigDefinitions = {
     defaultValue: undefined as unknown as string | undefined,
     description: 'worktree 创建后自动执行的命令，用于安装依赖等初始化操作',
   },
+  claudeCodeCommand: {
+    defaultValue: undefined as unknown as string | undefined,
+    description: 'Claude Code CLI 启动指令（未设置时回退到全局配置）',
+  },
 };
 
 /** 项目默认配置（从 PROJECT_CONFIG_DEFINITIONS 自动派生） */
@@ -63,7 +69,7 @@ export const PROJECT_CONFIG_DESCRIPTIONS: Record<keyof Required<ProjectConfig>,
 
 | 类型 | 说明 |
 | --- | --- |
-| `ProjectConfig` | 项目级配置接口，包含 `clawtMainWorkBranch`（必填）、`validateRunCommand`（可选）和 `postCreate`（可选） |
+| `ProjectConfig` | 项目级配置接口，包含 `clawtMainWorkBranch`（必填）、`validateRunCommand`（可选）、`postCreate`（可选）和 `claudeCodeCommand`（可选） |
 | `ProjectConfigItemDefinition<T>` | 单个配置项定义，含 `defaultValue`（默认值）、`description`（描述）、可选 `allowedValues`（枚举值列表，仅对 string 类型有效） |
 | `ProjectConfigDefinitions` | 所有配置项的完整定义映射，键为 `ProjectConfig` 的所有属性名，值为对应的 `ProjectConfigItemDefinition` |
 
@@ -74,6 +80,7 @@ export interface ProjectConfig {
   clawtMainWorkBranch: string;
   validateRunCommand?: string;
   postCreate?: string;
+  claudeCodeCommand?: string;
 }
 
 export interface ProjectConfigItemDefinition<T> {
@@ -99,6 +106,8 @@ export type ProjectConfigDefinitions = {
 | `requireProjectConfig` | `() => ProjectConfig` | 获取当前项目配置，不存在或缺少 `clawtMainWorkBranch` 时抛出 `ClawtError` |
 | `getMainWorkBranch` | `() => string` | 从项目配置中获取主工作分支名（内部调用 `requireProjectConfig`） |
 | `getValidateRunCommand` | `() => string \| undefined` | 从项目配置中获取 validate 自动执行命令，未配置时返回 `undefined` |
+| `resolveClaudeCodeCommand` | `() => string` | 解析当前项目生效的 Claude Code 启动指令，优先级：项目级配置 > 全局配置 |
+| `normalizeProjectConfig` | `(config: ProjectConfig, key: string, value: unknown) => ProjectConfig` | 归一化项目配置：可选字段的空字符串等同于未设置，从对象中删除该键以保持 JSON 文件整洁 |
 
 #### 设置方式
 

package/package.json

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

package/src/commands/init.ts

@@ -13,6 +13,7 @@ import {
   printSuccess,
   interactiveConfigEditor,
   safeStringify,
+  normalizeProjectConfig,
 } from '../utils/index.js';
 
 /**
@@ -62,7 +63,8 @@ async function handleInitShow(options: InitShowOptions): Promise<void> {
   );
 
   // 合并修改后的值并持久化
-  const updatedConfig: ProjectConfig = { ...config, [key]: newValue };
+  const mergedConfig: ProjectConfig = { ...config, [key]: newValue };
+  const updatedConfig = normalizeProjectConfig(mergedConfig, key as string, newValue);
   saveProjectConfig(updatedConfig);
 
   printSuccess(MESSAGES.INIT_SET_SUCCESS(key as string, String(newValue)));

package/src/constants/project-config.ts

@@ -17,6 +17,10 @@ export const PROJECT_CONFIG_DEFINITIONS: ProjectConfigDefinitions = {
     defaultValue: undefined as unknown as string | undefined,
     description: 'worktree 创建后自动执行的命令，用于安装依赖等初始化操作',
   },
+  claudeCodeCommand: {
+    defaultValue: undefined as unknown as string | undefined,
+    description: 'Claude Code CLI 启动指令（未设置时回退到全局配置）',
+  },
 };
 
 /**

package/src/types/projectConfig.ts

@@ -6,6 +6,8 @@ export interface ProjectConfig {
   validateRunCommand?: string;
   /** worktree 创建后自动执行的命令，用于安装依赖等初始化操作 */
   postCreate?: string;
+  /** Claude Code CLI 启动指令（项目级覆盖全局配置，未设置时回退到全局配置） */
+  claudeCodeCommand?: string;
 }
 
 /** 单个项目配置项的完整定义（默认值 + 描述） */

package/src/utils/claude.ts

@@ -3,7 +3,7 @@ import { existsSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { ClawtError } from '../errors/index.js';
 import { APPEND_SYSTEM_PROMPT, CLAUDE_PROJECTS_DIR } from '../constants/index.js';
-import { getConfigValue } from './config.js';
+import { resolveClaudeCodeCommand } from './project-config.js';
 import { printInfo, printWarning } from './formatter.js';
 import { openCommandInNewTerminalTab } from './terminal.js';
 import type { WorktreeInfo } from '../types/index.js';
@@ -51,7 +51,7 @@ interface LaunchClaudeOptions {
 }
 
 export function launchInteractiveClaude(worktree: WorktreeInfo, options: LaunchClaudeOptions = {}): void {
-  const commandStr = getConfigValue('claudeCodeCommand');
+  const commandStr = resolveClaudeCodeCommand();
   const parts = commandStr.split(/\s+/).filter(Boolean);
   const cmd = parts[0];
   const args = [
@@ -107,7 +107,7 @@ function escapeShellSingleQuote(str: string): string {
  * @returns {string} 完整的 shell 命令字符串
  */
 export function buildClaudeCommand(worktree: WorktreeInfo, hasPreviousSession: boolean): string {
-  const commandStr = getConfigValue('claudeCodeCommand');
+  const commandStr = resolveClaudeCodeCommand();
   const systemPrompt = APPEND_SYSTEM_PROMPT;
 
   const escapedPath = escapeShellSingleQuote(worktree.path);

package/src/utils/index.ts

@@ -86,7 +86,7 @@ export { truncateTaskDesc, printDryRunPreview } from './dry-run.js';
 export { applyAliases } from './alias.js';
 export { isValidConfigKey, getValidConfigKeys, parseConfigValue, promptConfigValue, formatConfigValue, interactiveConfigEditor } from './config-strategy.js';
 export { checkForUpdates } from './update-checker.js';
-export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand } from './project-config.js';
+export { getProjectConfigPath, loadProjectConfig, saveProjectConfig, requireProjectConfig, getMainWorkBranch, guardMainWorkBranchExists, getValidateRunCommand, resolveClaudeCodeCommand, normalizeProjectConfig } from './project-config.js';
 export { getValidateBranchName, createValidateBranch, deleteValidateBranch, rebuildValidateBranch, ensureOnMainWorkBranch, handleDirtyWorkingDir } from './validate-branch.js';
 export { safeStringify } from './json.js';
 export { isNonInteractive, setNonInteractive } from './interactive.js';

package/src/utils/project-config.ts

@@ -1,10 +1,12 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { PROJECTS_CONFIG_DIR, MESSAGES } from '../constants/index.js';
+import { PROJECTS_CONFIG_DIR, MESSAGES, PROJECT_CONFIG_DEFINITIONS } from '../constants/index.js';
 import { ClawtError } from '../errors/index.js';
 import { logger } from '../logger/index.js';
 import { getProjectName, checkBranchExists } from './git.js';
 import { ensureDir } from './fs.js';
+import { getConfigValue } from './config.js';
+import { safeStringify } from './json.js';
 import type { ProjectConfig } from '../types/index.js';
 
 /**
@@ -47,7 +49,7 @@ export function saveProjectConfig(config: ProjectConfig): void {
   // 确保项目子目录存在
   const projectDir = join(PROJECTS_CONFIG_DIR, projectName);
   ensureDir(projectDir);
-  writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+  writeFileSync(configPath, safeStringify({ ...config }, 2), 'utf-8');
   logger.info(`项目配置已保存: ${configPath}`);
 }
 
@@ -99,3 +101,36 @@ export function getValidateRunCommand(): string | undefined {
   const config = loadProjectConfig();
   return config?.validateRunCommand || undefined;
 }
+
+/**
+ * 解析当前项目生效的 Claude Code 启动指令
+ * 优先级：项目级配置 > 全局配置
+ * @returns {string} 生效的 Claude Code 启动指令
+ */
+export function resolveClaudeCodeCommand(): string {
+  const projectConfig = loadProjectConfig();
+  if (projectConfig?.claudeCodeCommand) {
+    return projectConfig.claudeCodeCommand;
+  }
+  return getConfigValue('claudeCodeCommand');
+}
+
+/**
+ * 归一化项目配置：可选字段的空字符串等同于未设置，从对象中删除该键
+ * 保持 JSON 文件整洁，避免出现 "field": "" 的冗余条目
+ * @param {ProjectConfig} config - 原始项目配置
+ * @param {string} key - 被修改的配置项键名
+ * @param {unknown} value - 被修改的配置项新值
+ * @returns {ProjectConfig} 归一化后的项目配置
+ */
+export function normalizeProjectConfig(config: ProjectConfig, key: string, value: unknown): ProjectConfig {
+  if (value === '') {
+    const def = PROJECT_CONFIG_DEFINITIONS[key as keyof typeof PROJECT_CONFIG_DEFINITIONS];
+    if (def?.defaultValue === undefined) {
+      const normalized = { ...config };
+      delete (normalized as unknown as Record<string, unknown>)[key];
+      return normalized;
+    }
+  }
+  return config;
+}

package/tests/unit/commands/init.test.ts

@@ -34,6 +34,7 @@ vi.mock('../../../src/utils/index.js', () => ({
   interactiveConfigEditor: vi.fn(),
   guardMainWorkBranch: vi.fn().mockResolvedValue(undefined),
   guardMainWorkBranchExists: vi.fn(),
+  normalizeProjectConfig: vi.fn((config: unknown) => config),
 }));
 
 import { registerInitCommand } from '../../../src/commands/init.js';

package/tests/unit/utils/project-config.test.ts

@@ -42,6 +42,16 @@ vi.mock('../../../src/utils/fs.js', () => ({
   ensureDir: vi.fn(),
 }));
 
+// mock config
+vi.mock('../../../src/utils/config.js', () => ({
+  getConfigValue: vi.fn().mockReturnValue('claude'),
+}));
+
+// mock json
+vi.mock('../../../src/utils/json.js', () => ({
+  safeStringify: (value: unknown, indent: number = 2) => JSON.stringify(value, null, indent),
+}));
+
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import {
   getProjectConfigPath,
@@ -50,7 +60,9 @@ import {
   requireProjectConfig,
   getMainWorkBranch,
   getValidateRunCommand,
+  resolveClaudeCodeCommand,
 } from '../../../src/utils/project-config.js';
+import { getConfigValue } from '../../../src/utils/config.js';
 
 const mockedExistsSync = vi.mocked(existsSync);
 const mockedReadFileSync = vi.mocked(readFileSync);
@@ -166,3 +178,41 @@ describe('getValidateRunCommand', () => {
     expect(getValidateRunCommand()).toBeUndefined();
   });
 });
+
+describe('resolveClaudeCodeCommand', () => {
+  const mockedGetConfigValue = vi.mocked(getConfigValue);
+
+  beforeEach(() => {
+    mockedGetConfigValue.mockReset();
+    mockedGetConfigValue.mockReturnValue('claude');
+  });
+
+  it('项目配置中有 claudeCodeCommand 时返回项目级值', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({
+      clawtMainWorkBranch: 'main',
+      claudeCodeCommand: 'claude --model opus',
+    }));
+    expect(resolveClaudeCodeCommand()).toBe('claude --model opus');
+  });
+
+  it('项目配置中无 claudeCodeCommand 时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({ clawtMainWorkBranch: 'main' }));
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+
+  it('项目配置中 claudeCodeCommand 为空字符串时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(true);
+    mockedReadFileSync.mockReturnValue(JSON.stringify({
+      clawtMainWorkBranch: 'main',
+      claudeCodeCommand: '',
+    }));
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+
+  it('项目配置文件不存在时回退到全局配置', () => {
+    mockedExistsSync.mockReturnValue(false);
+    expect(resolveClaudeCodeCommand()).toBe('claude');
+  });
+});