clawt 3.1.1 → 3.1.2

package/README.md

@@ -113,7 +113,7 @@ clawt resume -b <branch>   # 指定分支
 clawt resume                # 交互式多选（按创建日期分组）
 ```
 
-不传 `-b` 时，分支列表按创建日期分组显示，支持全局全选和按组全选。选 1 个在当前终端恢复，选多个自动在独立终端 Tab 中批量恢复（仅 macOS）。
+不传 `-b` 时，分支列表按创建日期分组显示，支持全局全选和按组全选。选 1 个默认在新终端 Tab 中恢复（设置 `resumeInPlace: true` 可改为在当前终端就地恢复），选多个自动在独立终端 Tab 中批量恢复（仅 macOS）。
 
 如果目标 worktree 存在历史会话，会自动继续上次对话（`--continue`）。
 
@@ -290,6 +290,7 @@ clawt alias remove l
 | `confirmDestructiveOps` | `true` | 破坏性操作前确认 |
 | `maxConcurrency` | `0` | run 命令最大并发数，`0` 为不限制 |
 | `terminalApp` | `"auto"` | 批量 resume 使用的终端：`auto` / `iterm2` / `terminal` |
+| `resumeInPlace` | `false` | resume 单选时在当前终端就地恢复，`false` 则在新 Tab 中打开 |
 | `aliases` | `{}` | 命令别名映射（如 `{"l": "list", "r": "run"}`） |
 | `autoUpdate` | `true` | 自动检查新版本（每 24 小时检查一次 npm registry） |
 

package/dist/index.js

@@ -580,6 +580,10 @@ var CONFIG_DEFINITIONS = {
     description: "\u6279\u91CF resume \u4F7F\u7528\u7684\u7EC8\u7AEF\u5E94\u7528\uFF1Aauto\uFF08\u81EA\u52A8\u68C0\u6D4B\uFF09\u3001iterm2\u3001terminal\uFF08macOS\uFF09",
     allowedValues: VALID_TERMINAL_APPS
   },
+  resumeInPlace: {
+    defaultValue: false,
+    description: "resume \u5355\u9009\u65F6\u662F\u5426\u5728\u5F53\u524D\u7EC8\u7AEF\u5C31\u5730\u6253\u5F00\uFF0Cfalse \u5219\u901A\u8FC7 terminalApp \u5728\u65B0 Tab \u4E2D\u6253\u5F00"
+  },
   aliases: {
     defaultValue: {},
     description: "\u547D\u4EE4\u522B\u540D\u6620\u5C04"
@@ -3805,7 +3809,13 @@ async function handleResume(options) {
     return;
   }
   if (targetWorktrees.length === 1) {
-    launchInteractiveClaude(targetWorktrees[0], { autoContinue: true });
+    const inPlace = getConfigValue("resumeInPlace");
+    if (inPlace) {
+      launchInteractiveClaude(targetWorktrees[0], { autoContinue: true });
+    } else {
+      const hasPreviousSession = hasClaudeSessionHistory(targetWorktrees[0].path);
+      launchInteractiveClaudeInNewTerminal(targetWorktrees[0], hasPreviousSession);
+    }
   } else {
     await handleBatchResume(targetWorktrees);
   }

package/dist/postinstall.js

@@ -525,6 +525,10 @@ var CONFIG_DEFINITIONS = {
     description: "\u6279\u91CF resume \u4F7F\u7528\u7684\u7EC8\u7AEF\u5E94\u7528\uFF1Aauto\uFF08\u81EA\u52A8\u68C0\u6D4B\uFF09\u3001iterm2\u3001terminal\uFF08macOS\uFF09",
     allowedValues: VALID_TERMINAL_APPS
   },
+  resumeInPlace: {
+    defaultValue: false,
+    description: "resume \u5355\u9009\u65F6\u662F\u5426\u5728\u5F53\u524D\u7EC8\u7AEF\u5C31\u5730\u6253\u5F00\uFF0Cfalse \u5219\u901A\u8FC7 terminalApp \u5728\u65B0 Tab \u4E2D\u6253\u5F00"
+  },
   aliases: {
     defaultValue: {},
     description: "\u547D\u4EE4\u522B\u540D\u6620\u5C04"

package/docs/config-file.md

@@ -22,6 +22,7 @@
   "confirmDestructiveOps": true,
   "maxConcurrency": 0,
   "terminalApp": "auto",
+  "resumeInPlace": false,
   "aliases": {},
   "autoUpdate": true
 }
@@ -37,6 +38,7 @@
 | `confirmDestructiveOps` | `boolean` | `true` | 执行破坏性操作（reset、validate --clean）前是否提示确认 |
 | `maxConcurrency` | `number` | `0` | run 命令默认最大并发数，`0` 表示不限制 |
 | `terminalApp` | `string` | `"auto"` | 批量 resume 使用的终端应用：`auto`（自动检测）、`iterm2`、`terminal`（macOS） |
+| `resumeInPlace` | `boolean` | `false` | resume 单选时是否在当前终端就地打开，`false` 则通过 `terminalApp` 在新 Tab 中打开 |
 | `aliases` | `Record<string, string>` | `{}` | 命令别名映射，键为别名，值为目标内置命令名 |
 | `autoUpdate` | `boolean` | `true` | 是否启用自动更新检查（每 24 小时通过 npm registry 检查一次新版本） |
 

package/docs/resume.md

@@ -38,8 +38,10 @@ clawt resume
      3. **无匹配** → 报错退出，并列出所有可用分支名
 4. **根据选中数量自动分发**：
    - **用户未选择任何分支** → 直接退出
-   - **选中 1 个** → 在当前终端恢复（同原有行为），通过 `launchInteractiveClaude()` 启动（使用 `spawnSync` + `inherit stdio`）
-   - **选中多个** → 进入批量恢复流程（见下文）
+   - **选中 1 个** → 根据全局配置项 `resumeInPlace` 决定打开方式：
+     - `resumeInPlace: true` → 在当前终端就地恢复，通过 `launchInteractiveClaude()` 启动（使用 `spawnSync` + `inherit stdio`）
+     - `resumeInPlace: false`（默认） → 通过 `launchInteractiveClaudeInNewTerminal()` 在新终端 Tab 中恢复，终端类型由 `terminalApp` 配置控制
+   - **选中多个** → 进入批量恢复流程（见下文），始终在新终端 Tab 中打开，不受 `resumeInPlace` 影响
 
 **批量恢复流程：**
 

package/package.json

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

package/src/commands/resume.ts

@@ -15,6 +15,7 @@ import {
   printInfo,
   printSuccess,
   confirmAction,
+  getConfigValue,
 } from '../utils/index.js';
 import type { WorktreeMultiResolveMessages } from '../utils/index.js';
 
@@ -66,10 +67,18 @@ async function handleResume(options: ResumeOptions): Promise<void> {
   }
 
   if (targetWorktrees.length === 1) {
-    // 选中 1 个 → 当前终端恢复（resume 自动续接历史会话）
-    launchInteractiveClaude(targetWorktrees[0], { autoContinue: true });
+    // 选中 1 个 → 根据 resumeInPlace 配置决定打开方式
+    const inPlace = getConfigValue('resumeInPlace');
+    if (inPlace) {
+      // 就地在当前终端恢复
+      launchInteractiveClaude(targetWorktrees[0], { autoContinue: true });
+    } else {
+      // 默认通过 terminalApp 在新 Tab 中恢复
+      const hasPreviousSession = hasClaudeSessionHistory(targetWorktrees[0].path);
+      launchInteractiveClaudeInNewTerminal(targetWorktrees[0], hasPreviousSession);
+    }
   } else {
-    // 选中多个 → 逐个在新终端 Tab 中启动
+    // 选中多个 → 逐个在新终端 Tab 中启动（不受 resumeInPlace 影响）
     await handleBatchResume(targetWorktrees);
   }
 }

package/src/constants/config.ts

@@ -35,6 +35,10 @@ export const CONFIG_DEFINITIONS: ConfigDefinitions = {
     description: '批量 resume 使用的终端应用：auto（自动检测）、iterm2、terminal（macOS）',
     allowedValues: VALID_TERMINAL_APPS,
   },
+  resumeInPlace: {
+    defaultValue: false,
+    description: 'resume 单选时是否在当前终端就地打开，false 则通过 terminalApp 在新 Tab 中打开',
+  },
   aliases: {
     defaultValue: {} as Record<string, string>,
     description: '命令别名映射',

package/src/constants/terminal.ts

@@ -17,3 +17,4 @@ export const VALID_TERMINAL_APPS: readonly string[] = ['auto', 'iterm2', 'termin
 
 /** iTerm2 应用路径，用于 auto 模式检测是否已安装 */
 export const ITERM2_APP_PATH = '/Applications/iTerm.app';
+

package/src/types/config.ts

@@ -12,6 +12,8 @@ export interface ClawtConfig {
   maxConcurrency: number;
   /** 批量 resume 使用的终端应用：'auto'（自动检测）、'iterm2'、'terminal'（macOS） */
   terminalApp: string;
+  /** resume 单选时是否在当前终端就地打开，false 则通过 terminalApp 在新 Tab 中打开 */
+  resumeInPlace: boolean;
   /** 命令别名映射，键为别名，值为目标内置命令名 */
   aliases: Record<string, string>;
   /** 是否启用自动更新检查 */

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

@@ -11,6 +11,8 @@ vi.mock('../../../src/constants/index.js', () => ({
     RESUME_SELECT_BRANCH: '选择要恢复的分支',
     RESUME_MULTIPLE_MATCHES: (keyword: string) => `找到多个匹配 "${keyword}" 的分支`,
     RESUME_NO_MATCH: (keyword: string, branches: string[]) => `未找到匹配 "${keyword}" 的分支`,
+    RESUME_ALL_CONFIRM: (count: number) => `确认恢复 ${count} 个分支？`,
+    RESUME_ALL_SUCCESS: (count: number) => `已恢复 ${count} 个分支`,
   },
 }));
 
@@ -19,8 +21,14 @@ vi.mock('../../../src/utils/index.js', () => ({
   validateClaudeCodeInstalled: vi.fn(),
   getProjectWorktrees: vi.fn(),
   launchInteractiveClaude: vi.fn(),
+  launchInteractiveClaudeInNewTerminal: vi.fn(),
+  hasClaudeSessionHistory: vi.fn(),
   resolveTargetWorktrees: vi.fn(),
   promptGroupedMultiSelectBranches: vi.fn(),
+  printInfo: vi.fn(),
+  printSuccess: vi.fn(),
+  confirmAction: vi.fn(),
+  getConfigValue: vi.fn(),
 }));
 
 import { registerResumeCommand } from '../../../src/commands/resume.js';
@@ -29,24 +37,36 @@ import {
   validateClaudeCodeInstalled,
   getProjectWorktrees,
   launchInteractiveClaude,
+  launchInteractiveClaudeInNewTerminal,
+  hasClaudeSessionHistory,
   resolveTargetWorktrees,
   promptGroupedMultiSelectBranches,
+  confirmAction,
+  getConfigValue,
 } from '../../../src/utils/index.js';
 
 const mockedValidateMainWorktree = vi.mocked(validateMainWorktree);
 const mockedValidateClaudeCodeInstalled = vi.mocked(validateClaudeCodeInstalled);
 const mockedGetProjectWorktrees = vi.mocked(getProjectWorktrees);
 const mockedLaunchInteractiveClaude = vi.mocked(launchInteractiveClaude);
+const mockedLaunchInteractiveClaudeInNewTerminal = vi.mocked(launchInteractiveClaudeInNewTerminal);
+const mockedHasClaudeSessionHistory = vi.mocked(hasClaudeSessionHistory);
 const mockedResolveTargetWorktrees = vi.mocked(resolveTargetWorktrees);
 const mockedPromptGroupedMultiSelectBranches = vi.mocked(promptGroupedMultiSelectBranches);
+const mockedConfirmAction = vi.mocked(confirmAction);
+const mockedGetConfigValue = vi.mocked(getConfigValue);
 
 beforeEach(() => {
   mockedValidateMainWorktree.mockReset();
   mockedValidateClaudeCodeInstalled.mockReset();
   mockedGetProjectWorktrees.mockReset();
   mockedLaunchInteractiveClaude.mockReset();
+  mockedLaunchInteractiveClaudeInNewTerminal.mockReset();
+  mockedHasClaudeSessionHistory.mockReset();
   mockedResolveTargetWorktrees.mockReset();
   mockedPromptGroupedMultiSelectBranches.mockReset();
+  mockedConfirmAction.mockReset();
+  mockedGetConfigValue.mockReset();
 });
 
 describe('registerResumeCommand', () => {
@@ -63,6 +83,7 @@ describe('handleResume', () => {
     const worktree = { path: '/path/feature', branch: 'feature' };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
+    mockedGetConfigValue.mockReturnValue(true);
 
     const program = new Command();
     program.exitOverride();
@@ -83,6 +104,7 @@ describe('handleResume', () => {
     ];
     mockedGetProjectWorktrees.mockReturnValue(worktrees);
     mockedPromptGroupedMultiSelectBranches.mockResolvedValue([worktrees[0]]);
+    mockedGetConfigValue.mockReturnValue(true);
 
     const program = new Command();
     program.exitOverride();
@@ -100,6 +122,7 @@ describe('handleResume', () => {
     const worktree = { path: '/path/feature', branch: 'feature' };
     mockedGetProjectWorktrees.mockReturnValue([worktree]);
     mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
+    mockedGetConfigValue.mockReturnValue(true);
 
     const program = new Command();
     program.exitOverride();
@@ -110,3 +133,93 @@ describe('handleResume', () => {
     expect(mockedPromptGroupedMultiSelectBranches).not.toHaveBeenCalled();
   });
 });
+
+describe('handleResume — resumeInPlace 配置', () => {
+  it('resumeInPlace 为 true 时，单选在当前终端就地恢复', async () => {
+    const worktree = { path: '/path/feature', branch: 'feature' };
+    mockedGetProjectWorktrees.mockReturnValue([worktree]);
+    mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
+    mockedGetConfigValue.mockReturnValue(true);
+
+    const program = new Command();
+    program.exitOverride();
+    registerResumeCommand(program);
+    await program.parseAsync(['resume', '-b', 'feature'], { from: 'user' });
+
+    expect(mockedGetConfigValue).toHaveBeenCalledWith('resumeInPlace');
+    expect(mockedLaunchInteractiveClaude).toHaveBeenCalledWith(worktree, { autoContinue: true });
+    expect(mockedLaunchInteractiveClaudeInNewTerminal).not.toHaveBeenCalled();
+  });
+
+  it('resumeInPlace 为 false 时，单选在新终端 Tab 中恢复', async () => {
+    const worktree = { path: '/path/feature', branch: 'feature' };
+    mockedGetProjectWorktrees.mockReturnValue([worktree]);
+    mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
+    mockedGetConfigValue.mockReturnValue(false);
+    mockedHasClaudeSessionHistory.mockReturnValue(true);
+
+    const program = new Command();
+    program.exitOverride();
+    registerResumeCommand(program);
+    await program.parseAsync(['resume', '-b', 'feature'], { from: 'user' });
+
+    expect(mockedGetConfigValue).toHaveBeenCalledWith('resumeInPlace');
+    expect(mockedHasClaudeSessionHistory).toHaveBeenCalledWith(worktree.path);
+    expect(mockedLaunchInteractiveClaudeInNewTerminal).toHaveBeenCalledWith(worktree, true);
+    expect(mockedLaunchInteractiveClaude).not.toHaveBeenCalled();
+  });
+
+  it('resumeInPlace 为 false 且无历史会话时，传 false 给新终端启动', async () => {
+    const worktree = { path: '/path/feature', branch: 'feature' };
+    mockedGetProjectWorktrees.mockReturnValue([worktree]);
+    mockedResolveTargetWorktrees.mockResolvedValue([worktree]);
+    mockedGetConfigValue.mockReturnValue(false);
+    mockedHasClaudeSessionHistory.mockReturnValue(false);
+
+    const program = new Command();
+    program.exitOverride();
+    registerResumeCommand(program);
+    await program.parseAsync(['resume', '-b', 'feature'], { from: 'user' });
+
+    expect(mockedLaunchInteractiveClaudeInNewTerminal).toHaveBeenCalledWith(worktree, false);
+  });
+
+  it('多选时不受 resumeInPlace 影响，始终在新 Tab 中打开', async () => {
+    const worktrees = [
+      { path: '/path/feature-a', branch: 'feature-a' },
+      { path: '/path/feature-b', branch: 'feature-b' },
+    ];
+    mockedGetProjectWorktrees.mockReturnValue(worktrees);
+    mockedPromptGroupedMultiSelectBranches.mockResolvedValue(worktrees);
+    mockedConfirmAction.mockResolvedValue(true);
+    mockedHasClaudeSessionHistory.mockReturnValue(false);
+    mockedGetConfigValue.mockReturnValue(true);
+
+    const program = new Command();
+    program.exitOverride();
+    registerResumeCommand(program);
+    await program.parseAsync(['resume'], { from: 'user' });
+
+    // 多选走 handleBatchResume，不读取 resumeInPlace
+    expect(mockedLaunchInteractiveClaude).not.toHaveBeenCalled();
+    expect(mockedLaunchInteractiveClaudeInNewTerminal).toHaveBeenCalledTimes(2);
+  });
+
+  it('用户未选择任何分支时直接退出', async () => {
+    const worktrees = [
+      { path: '/path/feature-a', branch: 'feature-a' },
+      { path: '/path/feature-b', branch: 'feature-b' },
+    ];
+    mockedGetProjectWorktrees.mockReturnValue(worktrees);
+    mockedPromptGroupedMultiSelectBranches.mockResolvedValue([]);
+
+    const program = new Command();
+    program.exitOverride();
+    registerResumeCommand(program);
+    await program.parseAsync(['resume'], { from: 'user' });
+
+    expect(mockedLaunchInteractiveClaude).not.toHaveBeenCalled();
+    expect(mockedLaunchInteractiveClaudeInNewTerminal).not.toHaveBeenCalled();
+    expect(mockedGetConfigValue).not.toHaveBeenCalled();
+  });
+});

package/tests/unit/constants/config.test.ts

@@ -33,6 +33,7 @@ describe('DEFAULT_CONFIG', () => {
     expect(DEFAULT_CONFIG.confirmDestructiveOps).toBe(true);
     expect(DEFAULT_CONFIG.maxConcurrency).toBe(0);
     expect(DEFAULT_CONFIG.aliases).toEqual({});
+    expect(DEFAULT_CONFIG.resumeInPlace).toBe(false);
   });
 });