aico-cli 0.0.9 → 0.1.0

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { J as readZcfConfig, K as updateZcfConfig, N as getTranslation, k as AI_OUTPUT_LANGUAGES, O as inquirer, P as addNumbersToChoices, Q as version, q as backupExistingConfig, r as copyConfigFiles, x as applyAiLanguageDirective, R as configureAiPersonality, C as CLAUDE_DIR, T as readJsonConfig, H as addCompletedOnboarding, S as SETTINGS_FILE, U as writeJsonConfig, o as openSettingsJson, b as importRecommendedPermissions, a as importRecommendedEnv, V as isWindows, z as readMcpConfig, G as fixWindowsMcpConfig, B as writeMcpConfig, W as selectMcpServices, D as backupMcpConfig, M as MCP_SERVICES, F as buildMcpServerConfig, X as EscapeKeyPressed, E as mergeMcpServers, Y as displayBanner, I as I18N, Z as selectAndInstallWorkflows, _ as handleExitPromptError, $ as handleGeneralError, a0 as displayBannerWithInfo, a1 as readZcfConfigAsync, i as init, a2 as executeWithEscapeSupport } from './shared/aico-cli.Ngtnxi15.mjs';
+import { J as readZcfConfig, K as updateZcfConfig, N as getTranslation, k as AI_OUTPUT_LANGUAGES, O as inquirer, P as addNumbersToChoices, Q as version, q as backupExistingConfig, r as copyConfigFiles, x as applyAiLanguageDirective, R as configureAiPersonality, C as CLAUDE_DIR, T as readJsonConfig, H as addCompletedOnboarding, S as SETTINGS_FILE, U as writeJsonConfig, o as openSettingsJson, b as importRecommendedPermissions, a as importRecommendedEnv, V as isWindows, z as readMcpConfig, G as fixWindowsMcpConfig, B as writeMcpConfig, W as selectMcpServices, D as backupMcpConfig, M as MCP_SERVICES, F as buildMcpServerConfig, X as EscapeKeyPressed, E as mergeMcpServers, Y as displayBanner, I as I18N, Z as selectAndInstallWorkflows, _ as handleExitPromptError, $ as handleGeneralError, a0 as displayBannerWithInfo, a1 as readZcfConfigAsync, i as init, a2 as executeWithEscapeSupport } from './shared/aico-cli.EaSFUITm.mjs';
 import inquirer$1 from 'inquirer';
 import { existsSync, copyFileSync, mkdirSync } from 'node:fs';
 import { exec, spawn } from 'node:child_process';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as AICO_CONFIG_FILE, k as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, e as CLAUDE_MD_FILE, f as ClAUDE_CONFIG_FILE, I as I18N, j as LANG_LABELS, L as LEGACY_AICO_CONFIG_FILE, M as MCP_SERVICES, S as SETTINGS_FILE, h as SUPPORTED_LANGS, H as addCompletedOnboarding, x as applyAiLanguageDirective, q as backupExistingConfig, D as backupMcpConfig, F as buildMcpServerConfig, d as cleanupPermissions, c as commandExists, s as configureApi, r as copyConfigFiles, p as ensureClaudeDir, G as fixWindowsMcpConfig, w as getExistingApiConfig, y as getMcpConfigPath, g as getPlatform, a as importRecommendedEnv, b as importRecommendedPermissions, i as init, n as installClaudeCode, l as isClaudeCodeInstalled, m as mergeAndCleanPermissions, t as mergeConfigs, E as mergeMcpServers, v as mergeSettingsFile, o as openSettingsJson, z as readMcpConfig, u as updateDefaultModel, B as writeMcpConfig } from './shared/aico-cli.Ngtnxi15.mjs';
+export { A as AICO_CONFIG_FILE, k as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, e as CLAUDE_MD_FILE, f as ClAUDE_CONFIG_FILE, I as I18N, j as LANG_LABELS, L as LEGACY_AICO_CONFIG_FILE, M as MCP_SERVICES, S as SETTINGS_FILE, h as SUPPORTED_LANGS, H as addCompletedOnboarding, x as applyAiLanguageDirective, q as backupExistingConfig, D as backupMcpConfig, F as buildMcpServerConfig, d as cleanupPermissions, c as commandExists, s as configureApi, r as copyConfigFiles, p as ensureClaudeDir, G as fixWindowsMcpConfig, w as getExistingApiConfig, y as getMcpConfigPath, g as getPlatform, a as importRecommendedEnv, b as importRecommendedPermissions, i as init, n as installClaudeCode, l as isClaudeCodeInstalled, m as mergeAndCleanPermissions, t as mergeConfigs, E as mergeMcpServers, v as mergeSettingsFile, o as openSettingsJson, z as readMcpConfig, u as updateDefaultModel, B as writeMcpConfig } from './shared/aico-cli.EaSFUITm.mjs';
 import 'inquirer';
 import 'ansis';
 import 'node:fs';

package/dist/shared/{aico-cli.Ngtnxi15.mjs → aico-cli.EaSFUITm.mjs}

@@ -80,7 +80,7 @@ const inquirer = {
   createPromptModule: inquirer$1.createPromptModule
 };
 
-const version = "0.0.9";
+const version = "0.1.0";
 
 const common$1 = {
   // Basic
@@ -305,7 +305,7 @@ const workflow$1 = {
     featPlanUx: "\u529F\u80FD\u89C4\u5212\u548C UX \u8BBE\u8BA1 (feat + planner + ui-ux-designer)",
     sixStepsWorkflow: "\u516D\u6B65\u5DE5\u4F5C\u6D41 (workflow)",
     bmadWorkflow: "BMAD-Method \u6269\u5C55\u5B89\u88C5\u5668 (\u652F\u6301\u654F\u6377\u5F00\u53D1\u5DE5\u4F5C\u6D41)",
-    gitWorkflow: "\u667A\u80FD Git \u64CD\u4F5C (Git \u63D0\u4EA4\u3001\u56DE\u6EDA\u3001\u6E05\u7406\u5206\u652F)"
+    gitWorkflow: "Git \u6307\u4EE4 (commit + rollback + cleanBranches + worktree)"
   },
   workflowDescription: {
     gitWorkflow: "\u589E\u5F3A\u7248 Git \u547D\u4EE4\uFF0C\u652F\u6301\u667A\u80FD\u63D0\u4EA4\u3001\u5B89\u5168\u56DE\u6EDA\u548C\u81EA\u52A8\u5316\u5206\u652F\u6E05\u7406"
@@ -751,7 +751,7 @@ const workflow = {
     featPlanUx: "Feature Planning and UX Design (feat + planner + ui-ux-designer)",
     sixStepsWorkflow: "Six Steps Workflow (workflow)",
     bmadWorkflow: "BMAD-Method Extension Installer (Agile Development Workflow)",
-    gitWorkflow: "Smart Git Operations (Git Commit, Rollback, Clean Branches)"
+    gitWorkflow: "Git Commands (commit + rollback + cleanBranches + worktree)"
   },
   workflowDescription: {
     gitWorkflow: "Enhanced Git commands for smart commits, safe rollbacks, and automated branch cleanup"
@@ -1993,7 +1993,7 @@ const WORKFLOW_CONFIGS = [
     descriptionKey: "workflowDescription.gitWorkflow",
     defaultSelected: true,
     order: 4,
-    commands: ["git-commit.md", "git-rollback.md", "git-cleanBranches.md"],
+    commands: ["git-commit.md", "git-rollback.md", "git-cleanBranches.md", "git-worktree.md"],
     agents: [],
     autoInstallAgents: false,
     category: "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aico-cli",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "packageManager": "pnpm@9.15.9",
   "description": "AI CLI",
   "repository": {

package/templates/en/workflow/git/commands/git-worktree.md

@@ -0,0 +1,301 @@
+---
+description: Manage Git worktrees, support add/list/remove/migrate operations, create in .zcf/ directory by default, auto-configure git ignore rules, support IDE quick open and content migration
+allowed-tools: Read(**), Exec(git worktree add, git worktree list, git worktree remove, git worktree prune, git branch, git checkout, git rev-parse, git stash, git cp, code, cursor, webstorm), Write(.git/info/exclude)
+argument-hint: <add|list|remove|prune|migrate> [path] [-b <branch>] [-o|--open] [--track] [--guess-remote] [--detach] [--checkout] [--lock] [--migrate-from <source-path>] [--migrate-stash]
+# examples:
+#   - /git-worktree add feature-ui                     # create worktree, ask whether to open in IDE by default
+#   - /git-worktree add feature-ui -o                  # create worktree and open directly in IDE
+#   - /git-worktree add hotfix -b fix/login -o         # create new branch, worktree and open in IDE directly
+#   - /git-worktree migrate feature-ui --from main     # migrate uncommitted content from main branch to feature-ui worktree
+#   - /git-worktree migrate feature-ui --stash         # migrate current stash content to feature-ui worktree
+---
+
+# Claude Command: Git Worktree
+
+**Purpose**: Provide Git worktree quick operations, manage multiple working trees in `.zcf/` directory by default, auto-handle git ignore configuration, support IDE quick open and cross-worktree content migration.
+
+---
+
+## Usage
+
+```bash
+# Add worktree (default in .zcf/)
+/git-worktree add <path>                           # checkout same-name branch to .zcf/<path>, ask whether to open IDE
+/git-worktree add <path> -b <branch>               # create new branch and add worktree
+/git-worktree add <path> -o                        # create and open directly in IDE
+/git-worktree add <path> -b <branch> --open        # create new branch, worktree and open directly
+
+# Content migration
+/git-worktree migrate <target-path> --from <source-path>  # migrate uncommitted content
+/git-worktree migrate <target-path> --stash               # migrate stash content
+
+# Other operations
+/git-worktree list                                 # show all worktree status
+/git-worktree remove <path>                        # remove specified worktree
+/git-worktree prune                                # clean invalid worktree records
+```
+
+### Options
+
+| Option | Description |
+|--------|-------------|
+| `add <path>` | Add new worktree in `.zcf/<path>` |
+| `migrate <target>` | Migrate content to specified worktree |
+| `list` | List all worktrees and their status |
+| `remove <path>` | Remove worktree at specified path |
+| `prune` | Clean invalid worktree references |
+| `-b <branch>` | Create new branch and checkout to worktree |
+| `-o, --open` | Open directly in IDE after creation (skip prompt) |
+| `--from <source>` | Specify migration source path (migrate only) |
+| `--stash` | Migrate current stash content (migrate only) |
+| `--track` | Set new branch to track corresponding remote branch |
+| `--guess-remote` | Auto guess remote branch for tracking |
+| `--detach` | Create detached HEAD worktree |
+| `--checkout` | Checkout immediately after creation (default behavior) |
+| `--lock` | Lock worktree after creation |
+
+---
+
+## What This Command Does
+
+### 1. **Environment Check**
+   - Confirm in Git repository via `git rev-parse --is-inside-work-tree`
+
+### 2. **Ignore Rules Configuration**
+   - Check if `.git/info/exclude` contains `/.zcf/` rule
+   - Auto-add `/.zcf/` to `.git/info/exclude` if not exists
+
+### 3. **Worktree Operations**
+   - **add**: Create new worktree in `.zcf/<path>`
+   - **list**: Show all worktree paths, branches and status
+   - **remove**: Safely remove specified worktree
+   - **prune**: Clean orphaned worktree records
+
+### 4. **🆕 IDE Quick Open Feature**
+   - **Default behavior**: Ask whether to open new worktree in IDE after `add` operation
+   - **Direct open**: Use `-o/--open` parameter to skip prompt and open directly
+   - **IDE detection**: Auto-detect common IDEs (VS Code, Cursor, WebStorm, etc.)
+   - **Smart selection**: Recommend best choice based on project type and installed IDEs
+
+### 5. **🆕 Content Migration Feature**
+   - **Uncommitted content migration**: Migrate uncommitted changes from one worktree to another
+   - **Stash migration**: Apply current stash content to target worktree
+   - **Safety check**: Check target worktree status before migration to avoid conflicts
+
+### 6. **Path Handling**
+   - Auto-add `.zcf/` prefix to all relative paths
+   - Keep absolute paths as-is
+   - Auto-create `.zcf/` directory if not exists
+
+### 7. **Branch Management**
+   - Support checking out existing branches or creating new branches
+   - Auto-handle remote branch tracking
+   - Provide branch status and HEAD position info
+
+---
+
+## Enhanced Features
+
+### 🖥️ **IDE Integration**
+
+**Supported IDEs**
+- **VS Code**: `code <path>`
+- **Cursor**: `cursor <path>`  
+- **WebStorm**: `webstorm <path>`
+- **Others**: Configurable custom IDE commands
+
+**Open Modes**
+```bash
+# Default: ask whether to open after creation
+/git-worktree add feature-ui
+# Output: 🖥️  Open .zcf/feature-ui in IDE? [y/n]:
+
+# Direct open: skip prompt
+/git-worktree add feature-ui -o
+# Output: 🚀 Opening .zcf/feature-ui in VS Code...
+```
+
+**Smart Detection Flow**
+1. Check installed IDEs in system
+2. Recommend based on project type (e.g., recommend VS Code for Node.js projects)
+3. Provide selection menu for user choice (default mode)
+4. Remember user preference for next time
+
+### 📦 **Content Migration System**
+
+**Migration Types**
+```bash
+# Migrate uncommitted content from main branch
+/git-worktree migrate feature-ui --from main
+
+# Migrate from other worktree
+/git-worktree migrate hotfix --from .zcf/feature-ui
+
+# Migrate current stash
+/git-worktree migrate feature-ui --stash
+
+# Migrate specific stash
+/git-worktree migrate feature-ui --stash stash@{2}
+```
+
+**Migration Flow**
+1. **Source check**: Verify source path exists and has uncommitted content
+2. **Target check**: Ensure target worktree working directory is clean
+3. **Content analysis**: Show files and changes to be migrated
+4. **Safe migration**: Use git native commands to ensure data safety
+5. **Result confirmation**: Show migration results and follow-up suggestions
+
+---
+
+## Safety Features
+
+- **Path check**: Prevent creating worktree in existing directory
+- **Branch conflict check**: Avoid same branch being checked out by multiple worktrees
+- **Auto cleanup**: Remove operation cleans both directory and git references
+- **Status display**: Clearly show each worktree's branch, commit and status
+
+### **Migration Safety Protection**
+- **Conflict detection**: Check for potential file conflicts before migration
+- **Backup mechanism**: Auto-create stash backup before migration
+- **Rollback support**: Provide rollback solution when migration fails
+- **Status validation**: Ensure source and target worktrees are in correct state
+
+### **IDE Integration Safety**
+- **Path validation**: Ensure IDE commands use correct paths
+- **Permission check**: Verify IDE executable permissions
+- **Error handling**: Friendly error messages when IDE startup fails
+
+---
+
+## Examples
+
+### **Basic Usage + IDE Open**
+```bash
+# Create worktree and ask for IDE open (default behavior)
+/git-worktree add feature-ui
+# Output:
+# ✅ Worktree created at .zcf/feature-ui
+# 🖥️  Detected IDEs:
+#    1. VS Code (recommended)
+#    2. Cursor
+# Open this worktree in IDE? [1/2/n]: 1
+# 🚀 Opening .zcf/feature-ui in VS Code...
+
+# Create worktree and open IDE directly
+/git-worktree add feature-ui -o
+# Output:
+# ✅ Worktree created at .zcf/feature-ui
+# 🚀 Opening .zcf/feature-ui in VS Code...
+
+# Create new branch and open directly
+/git-worktree add hotfix -b fix/login --open
+# Output:
+# ✅ Created branch 'fix/login' and worktree at .zcf/hotfix
+# 🚀 Opening .zcf/hotfix in VS Code...
+```
+
+### **Content Migration Scenarios**
+```bash
+# Scenario: developed some features on main branch, want to move to new branch
+# 1. Create new feature worktree
+/git-worktree add feature-ui -b feature/new-ui
+
+# 2. Migrate uncommitted content from main
+/git-worktree migrate feature-ui --from main
+# Output:
+# 📦 Found uncommitted content:
+#    M  src/components/Button.tsx
+#    A  src/components/Modal.tsx
+#    ??  src/styles/new-theme.css
+# 🔄 Migrating to .zcf/feature-ui...
+# ✅ Migration completed! Suggest committing these changes in new worktree.
+
+# 3. Ask whether to open IDE (since -o wasn't used during creation)
+# 🖥️  Open .zcf/feature-ui in IDE? [y/n]: y
+```
+
+### **Stash Migration**
+```bash
+# Have some stashes, want to apply to specific worktree
+/git-worktree migrate hotfix --stash
+# Output:
+# 📋 Found stashes:
+#    stash@{0}: WIP on main: fix user login
+#    stash@{1}: WIP on main: update docs
+# Select stash to migrate [0/1]: 0
+# 🔄 Applying stash@{0} to .zcf/hotfix...
+# ✅ Stash content applied successfully!
+```
+
+### **List and Manage Worktrees**
+```bash
+# View all worktrees
+/git-worktree list
+# Output:
+# /path/to/project                    [main]     ← main working tree
+# /path/to/project/.zcf/feature-ui    [feature/new-ui]
+# /path/to/project/.zcf/hotfix        [fix/login]
+
+# Remove unneeded worktree
+/git-worktree remove feature-ui
+# Output:
+# ✅ Worktree .zcf/feature-ui removed successfully
+
+# Clean invalid references
+/git-worktree prune
+# Output:
+# 🧹 Pruned 0 worktree entries
+```
+
+---
+
+## Directory Structure
+
+After using this command, project structure will be:
+```
+your-project/
+├── .git/
+├── .zcf/                    # worktree directory (ignored by git)
+│   ├── feature-ui/          # feature-ui branch working tree
+│   ├── hotfix/              # hotfix branch working tree
+│   ├── debug/               # debug working tree
+│   └── .worktree-config     # worktree config file
+├── src/                     # main working tree source
+└── package.json             # main working tree files
+```
+
+---
+
+## Configuration
+
+### **IDE Preferences**
+Command saves user preferences in `.zcf/.worktree-config`:
+```json
+{
+  "preferredIDE": "code",
+  "autoOpenIDE": false,
+  "migrateBackup": true,
+  "defaultWorktreeDir": ".zcf"
+}
+```
+
+### **Custom IDE Commands**
+```bash
+# Set custom IDE
+git config worktree.ide.custom "subl %s"  # Sublime Text
+git config worktree.ide.preferred "custom"
+```
+
+---
+
+## Notes
+
+- **Performance optimization**: Worktrees share `.git` directory, saving disk space
+- **IDE support**: Most modern IDEs support multi-worktree projects
+- **Cleanup suggestion**: Regularly run `prune` to clean invalid references
+- **Branch protection**: Avoid operations on protected branches (like main/master)
+- **Migration limitation**: Can only migrate uncommitted changes, use `git cherry-pick` for committed content
+- **IDE requirement**: IDE command-line tools must be installed and in PATH
+- **Cross-platform support**: IDE detection and startup support Windows, macOS, Linux
+
+---

package/templates/zh-CN/workflow/git/commands/git-commit.md

@@ -11,9 +11,10 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 #   - /git-commit --amend --signoff         # 修补上次提交并签名
 ---
 
-# Claude Command: Commit (Git‑only)
+# Claude Command: Commit (Git-only)
 
 该命令在**不依赖任何包管理器/构建工具**的前提下，仅通过 **Git**：
+
 - 读取改动（staged/unstaged）
 - 判断是否需要**拆分为多次提交**
 - 为每个提交生成 **Conventional Commits** 风格的信息（可选 emoji）
@@ -33,6 +34,7 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 ```
 
 ### Options
+
 - `--no-verify`：跳过本地 Git 钩子（`pre-commit`/`commit-msg` 等）。
 - `--all`：当暂存区为空时，自动 `git add -A` 将所有改动纳入本次提交。
 - `--amend`：在不创建新提交的情况下**修补**上一次提交（保持提交作者与时间，除非本地 Git 配置另有指定）。
@@ -41,33 +43,38 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 - `--scope <scope>`：指定提交作用域（如 `ui`、`docs`、`api`），写入消息头部。
 - `--type <type>`：强制提交类型（如 `feat`、`fix`、`docs` 等），覆盖自动判断。
 
-> 注：如框架不支持交互式确认，可在 front‑matter 中开启 `confirm: true` 以避免误操作。
+> 注：如框架不支持交互式确认，可在 front-matter 中开启 `confirm: true` 以避免误操作。
 
 ---
 
 ## What This Command Does
 
 1. **仓库/分支校验**
+
    - 通过 `git rev-parse --is-inside-work-tree` 判断是否位于 Git 仓库。
    - 读取当前分支/HEAD 状态；如处于 rebase/merge 冲突状态，先提示处理冲突后再继续。
 
 2. **改动检测**
+
    - 用 `git status --porcelain` 与 `git diff` 获取已暂存与未暂存的改动。
    - 若已暂存文件为 0：
      - 若传入 `--all` → 执行 `git add -A`。
      - 否则提示你选择：继续仅分析未暂存改动并给出**建议**，或取消命令后手动分组暂存。
 
 3. **拆分建议（Split Heuristics）**
+
    - 按**关注点**、**文件模式**、**改动类型**聚类（示例：源代码 vs 文档、测试；不同目录/包；新增 vs 删除）。
    - 若检测到**多组独立变更**或 diff 规模过大（如 > 300 行 / 跨多个顶级目录），建议拆分提交，并给出每一组的 pathspec（便于后续执行 `git add <paths>`）。
 
 4. **提交信息生成（Conventional 规范，可选 Emoji）**
+
    - 自动推断 `type`（`feat`/`fix`/`docs`/`refactor`/`test`/`chore`/`perf`/`style`/`ci`/`revert` …）与可选 `scope`。
    - 生成消息头：`[<emoji>] <type>(<scope>)?: <subject>`（首行 ≤ 72 字符，祈使语气，仅在使用 `--emoji` 时包含 emoji）。
    - 生成消息体：要点列表（动机、实现要点、影响范围、BREAKING CHANGE 如有）。
    - 将草稿写入 `.git/COMMIT_EDITMSG`，并用于 `git commit`。
 
 5. **执行提交**
+
    - 单提交场景：`git commit [-S] [--no-verify] [-s] -F .git/COMMIT_EDITMSG`
    - 多提交场景（如接受拆分建议）：按分组给出 `git add <paths> && git commit ...` 的明确指令；若允许执行则逐一完成。
 
@@ -88,16 +95,16 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 
 ## Type 与 Emoji 映射（使用 --emoji 时）
 
-- ✨ `feat`：新增功能  
-- 🐛 `fix`：缺陷修复（含 🔥 删除代码/文件、🚑️ 紧急修复、👽️ 适配外部 API 变更、🔒️ 安全修复、🚨 解决告警、💚 修复 CI）  
-- 📝 `docs`：文档与注释  
-- 🎨 `style`：风格/格式（不改语义）  
-- ♻️ `refactor`：重构（不新增功能、不修缺陷）  
-- ⚡️ `perf`：性能优化  
-- ✅ `test`：新增/修复测试、快照  
-- 🔧 `chore`：构建/工具/杂务（合并分支、更新配置、发布标记、依赖 pin、.gitignore 等）  
-- 👷 `ci`：CI/CD 配置与脚本  
-- ⏪️ `revert`：回滚提交  
+- ✨ `feat`：新增功能
+- 🐛 `fix`：缺陷修复（含 🔥 删除代码/文件、🚑️ 紧急修复、👽️ 适配外部 API 变更、🔒️ 安全修复、🚨 解决告警、💚 修复 CI）
+- 📝 `docs`：文档与注释
+- 🎨 `style`：风格/格式（不改语义）
+- ♻️ `refactor`：重构（不新增功能、不修缺陷）
+- ⚡️ `perf`：性能优化
+- ✅ `test`：新增/修复测试、快照
+- 🔧 `chore`：构建/工具/杂务（合并分支、更新配置、发布标记、依赖 pin、.gitignore 等）
+- 👷 `ci`：CI/CD 配置与脚本
+- ⏪️ `revert`：回滚提交
 - 💥 `feat`：破坏性变更（`BREAKING CHANGE:` 段落中说明）
 
 > 若传入 `--type`/`--scope`，将**覆盖**自动推断。
@@ -107,10 +114,10 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 
 ## Guidelines for Splitting Commits
 
-1. **不同关注点**：互不相关的功能/模块改动应拆分。  
-2. **不同类型**：不要将 `feat`、`fix`、`refactor` 混在同一提交。  
-3. **文件模式**：源代码 vs 文档/测试/配置分组提交。  
-4. **规模阈值**：超大 diff（示例：>300 行或跨多个顶级目录）建议拆分。  
+1. **不同关注点**：互不相关的功能/模块改动应拆分。
+2. **不同类型**：不要将 `feat`、`fix`、`refactor` 混在同一提交。
+3. **文件模式**：源代码 vs 文档/测试/配置分组提交。
+4. **规模阈值**：超大 diff（示例：>300 行或跨多个顶级目录）建议拆分。
 5. **可回滚性**：确保每个提交可独立回退。
 
 ---
@@ -118,35 +125,38 @@ argument-hint: [--no-verify] [--all] [--amend] [--signoff] [--emoji] [--scope <s
 ## Examples
 
 **Good (使用 --emoji)**
-- ✨ feat(ui): add user authentication flow  
-- 🐛 fix(api): handle token refresh race condition  
-- 📝 docs: update API usage examples  
-- ♻️ refactor(core): extract retry logic into helper  
-- ✅ test: add unit tests for rate limiter  
-- 🔧 chore: update git hooks and repository settings  
+
+- ✨ feat(ui): add user authentication flow
+- 🐛 fix(api): handle token refresh race condition
+- 📝 docs: update API usage examples
+- ♻️ refactor(core): extract retry logic into helper
+- ✅ test: add unit tests for rate limiter
+- 🔧 chore: update git hooks and repository settings
 - ⏪️ revert: revert "feat(core): introduce streaming API"
 
 **Good (不使用 --emoji)**
-- feat(ui): add user authentication flow  
-- fix(api): handle token refresh race condition  
-- docs: update API usage examples  
-- refactor(core): extract retry logic into helper  
-- test: add unit tests for rate limiter  
-- chore: update git hooks and repository settings  
+
+- feat(ui): add user authentication flow
+- fix(api): handle token refresh race condition
+- docs: update API usage examples
+- refactor(core): extract retry logic into helper
+- test: add unit tests for rate limiter
+- chore: update git hooks and repository settings
 - revert: revert "feat(core): introduce streaming API"
 
 **Split Example**
+
 - `feat(types): add new type defs for payment method`
 - `docs: update API docs for new types`
 - `test: add unit tests for payment types`
-- `fix: address linter warnings in new files`  ←（如你的仓库有钩子报错）
+- `fix: address linter warnings in new files` ←（如你的仓库有钩子报错）
 
 ---
 
 ## Important Notes
 
-- **仅使用 Git**：不调用任何包管理器/构建命令（无 `pnpm`/`npm`/`yarn` 等）。  
-- **尊重钩子**：默认执行本地 Git 钩子；使用 `--no-verify` 可跳过。  
-- **不改源码内容**：命令只读写 `.git/COMMIT_EDITMSG` 与暂存区；不会直接编辑工作区文件。  
-- **安全提示**：在 rebase/merge 冲突、detached HEAD 等状态下会先提示处理/确认再继续。  
-- **可审可控**：如开启 `confirm: true`，每个实际 `git add`/`git commit` 步骤都会进行二次确认。
+- **仅使用 Git**：不调用任何包管理器/构建命令（无 `pnpm`/`npm`/`yarn` 等）。
+- **尊重钩子**：默认执行本地 Git 钩子；使用 `--no-verify` 可跳过。
+- **不改源码内容**：命令只读写 `.git/COMMIT_EDITMSG` 与暂存区；不会直接编辑工作区文件。
+- **安全提示**：在 rebase/merge 冲突、detached HEAD 等状态下会先提示处理/确认再继续。
+- **可审可控**：如开启 `confirm: true`，每个实际 `git add`/`git commit` 步骤都会进行二次确认。

package/templates/zh-CN/workflow/git/commands/git-worktree.md

@@ -0,0 +1,301 @@
+---
+description: 管理 Git worktree，支持 add/list/remove/migrate 操作，默认在 .zcf/ 目录下创建，自动配置 git 忽略规则，支持 IDE 快速打开和内容迁移
+allowed-tools: Read(**), Exec(git worktree add, git worktree list, git worktree remove, git worktree prune, git branch, git checkout, git rev-parse, git stash, git cp, code, cursor, webstorm), Write(.git/info/exclude)
+argument-hint: <add|list|remove|prune|migrate> [path] [-b <branch>] [-o|--open] [--track] [--guess-remote] [--detach] [--checkout] [--lock] [--migrate-from <source-path>] [--migrate-stash]
+# examples:
+#   - /git-worktree add feature-ui                     # 创建 worktree，默认询问是否用 IDE 打开
+#   - /git-worktree add feature-ui -o                  # 创建 worktree 并直接用 IDE 打开
+#   - /git-worktree add hotfix -b fix/login -o         # 创建新分支、worktree 并直接打开 IDE
+#   - /git-worktree migrate feature-ui --from main     # 将主分支的未提交内容迁移到 feature-ui worktree
+#   - /git-worktree migrate feature-ui --stash         # 将当前 stash 内容迁移到 feature-ui worktree
+---
+
+# Claude Command: Git Worktree
+
+**目的**：提供 Git worktree 的快捷操作，默认在 `.zcf/` 目录下管理多个工作树，自动处理 git 忽略配置，支持 IDE 快速打开和跨 worktree 内容迁移。
+
+---
+
+## Usage
+
+```bash
+# 添加 worktree（默认在 .zcf/ 下）
+/git-worktree add <path>                           # 检出同名分支到 .zcf/<path>，询问是否打开 IDE
+/git-worktree add <path> -b <branch>               # 创建新分支并添加 worktree
+/git-worktree add <path> -o                        # 创建后直接用 IDE 打开
+/git-worktree add <path> -b <branch> --open        # 创建新分支、worktree 并直接打开
+
+# 内容迁移
+/git-worktree migrate <target-path> --from <source-path>  # 迁移未提交内容
+/git-worktree migrate <target-path> --stash               # 迁移 stash 内容
+
+# 其他操作
+/git-worktree list                                 # 显示所有 worktree 状态
+/git-worktree remove <path>                        # 删除指定的 worktree
+/git-worktree prune                                # 清理无效 worktree 记录
+```
+
+### Options
+
+| 选项 | 说明 |
+|------|------|
+| `add <path>` | 在 `.zcf/<path>` 添加新的 worktree |
+| `migrate <target>` | 迁移内容到指定 worktree |
+| `list` | 列出所有 worktree 及其状态 |
+| `remove <path>` | 删除指定路径的 worktree |
+| `prune` | 清理无效的 worktree 引用 |
+| `-b <branch>` | 创建新分支并检出到 worktree |
+| `-o, --open` | 创建成功后直接用 IDE 打开（跳过询问）|
+| `--from <source>` | 指定迁移源路径（migrate 专用）|
+| `--stash` | 迁移当前 stash 内容（migrate 专用）|
+| `--track` | 设置新分支跟踪对应的远程分支 |
+| `--guess-remote` | 自动猜测远程分支进行跟踪 |
+| `--detach` | 创建分离 HEAD 的 worktree |
+| `--checkout` | 创建后立即检出（默认行为）|
+| `--lock` | 创建后锁定 worktree |
+
+---
+
+## What This Command Does
+
+### 1. **环境检查**
+   - 通过 `git rev-parse --is-inside-work-tree` 确认在 Git 仓库中
+
+### 2. **忽略规则配置**
+   - 检查 `.git/info/exclude` 是否包含 `/.zcf/` 规则
+   - 如果不存在，自动添加 `/.zcf/` 到 `.git/info/exclude`
+
+### 3. **Worktree 操作**
+   - **add**: 在 `.zcf/<path>` 创建新的 worktree
+   - **list**: 显示所有 worktree 的路径、分支和状态
+   - **remove**: 安全删除指定的 worktree
+   - **prune**: 清理孤立的 worktree 记录
+
+### 4. **🆕 IDE 快速打开功能**
+   - **默认行为**：`add` 操作成功后询问是否用 IDE 打开新 worktree
+   - **直接打开**：使用 `-o/--open` 参数跳过询问，直接打开
+   - **IDE 检测**：自动检测常用 IDE（VS Code、Cursor、WebStorm 等）
+   - **智能选择**：基于项目类型和已安装的 IDE 推荐最佳选择
+
+### 5. **🆕 内容迁移功能**
+   - **未提交内容迁移**：将一个 worktree 的未提交改动迁移到另一个
+   - **Stash 迁移**：将当前 stash 内容应用到目标 worktree
+   - **安全检查**：迁移前检查目标 worktree 状态，避免冲突
+
+### 6. **路径处理**
+   - 所有相对路径自动添加 `.zcf/` 前缀
+   - 绝对路径保持原样
+   - 自动创建 `.zcf/` 目录（如果不存在）
+
+### 7. **分支管理**
+   - 支持检出现有分支或创建新分支
+   - 自动处理远程分支跟踪
+   - 提供分支状态和 HEAD 位置信息
+
+---
+
+## Enhanced Features
+
+### 🖥️ **IDE 集成**
+
+**支持的 IDE**
+- **VS Code**: `code <path>`
+- **Cursor**: `cursor <path>`  
+- **WebStorm**: `webstorm <path>`
+- **其他**: 可配置自定义 IDE 命令
+
+**打开模式**
+```bash
+# 默认：创建后询问是否打开
+/git-worktree add feature-ui
+# 输出：🖥️  是否在 IDE 中打开 .zcf/feature-ui？[y/n]:
+
+# 直接打开：跳过询问
+/git-worktree add feature-ui -o
+# 输出：🚀 正在用 VS Code 打开 .zcf/feature-ui...
+```
+
+**智能检测流程**
+1. 检查系统中已安装的 IDE
+2. 基于项目类型推荐（如 Node.js 项目推荐 VS Code）
+3. 提供选择菜单让用户选择（默认模式）
+4. 记住用户偏好供下次使用
+
+### 📦 **内容迁移系统**
+
+**迁移类型**
+```bash
+# 从主分支迁移未提交内容
+/git-worktree migrate feature-ui --from main
+
+# 从其他 worktree 迁移
+/git-worktree migrate hotfix --from .zcf/feature-ui
+
+# 迁移当前 stash
+/git-worktree migrate feature-ui --stash
+
+# 迁移指定 stash
+/git-worktree migrate feature-ui --stash stash@{2}
+```
+
+**迁移流程**
+1. **源检查**：验证源路径存在且有未提交内容
+2. **目标检查**：确保目标 worktree 工作区干净
+3. **内容分析**：显示即将迁移的文件和改动
+4. **安全迁移**：使用 git 原生命令确保数据安全
+5. **结果确认**：显示迁移结果和后续建议
+
+---
+
+## Safety Features
+
+- **路径检查**：防止在已存在的目录创建 worktree
+- **分支冲突检查**：避免同一分支被多个 worktree 检出
+- **自动清理**：remove 操作会同时清理目录和 git 引用
+- **状态显示**：清晰显示每个 worktree 的分支、提交和状态
+
+### **迁移安全保护**
+- **冲突检测**：迁移前检查是否会产生文件冲突
+- **备份机制**：迁移前自动创建 stash 备份
+- **回滚支持**：提供迁移失败时的回滚方案
+- **状态验证**：确保源和目标 worktree 处于正确状态
+
+### **IDE 集成安全**
+- **路径验证**：确保 IDE 命令使用正确的路径
+- **权限检查**：验证 IDE 可执行文件的权限
+- **错误处理**：IDE 启动失败时的友好错误提示
+
+---
+
+## Examples
+
+### **基础使用 + IDE 打开**
+```bash
+# 创建 worktree 并询问 IDE 打开（默认行为）
+/git-worktree add feature-ui
+# 输出：
+# ✅ Worktree created at .zcf/feature-ui
+# 🖥️  检测到以下 IDE：
+#    1. VS Code (推荐)
+#    2. Cursor
+# 是否在 IDE 中打开此 worktree？[1/2/n]: 1
+# 🚀 正在用 VS Code 打开 .zcf/feature-ui...
+
+# 创建 worktree 并直接打开 IDE
+/git-worktree add feature-ui -o
+# 输出：
+# ✅ Worktree created at .zcf/feature-ui
+# 🚀 正在用 VS Code 打开 .zcf/feature-ui...
+
+# 创建新分支并直接打开
+/git-worktree add hotfix -b fix/login --open
+# 输出：
+# ✅ Created branch 'fix/login' and worktree at .zcf/hotfix
+# 🚀 正在用 VS Code 打开 .zcf/hotfix...
+```
+
+### **内容迁移场景**
+```bash
+# 场景：在 main 分支开发了一些功能，想移到新分支
+# 1. 创建新的 feature worktree
+/git-worktree add feature-ui -b feature/new-ui
+
+# 2. 将 main 的未提交内容迁移过去
+/git-worktree migrate feature-ui --from main
+# 输出：
+# 📦 发现以下未提交内容：
+#    M  src/components/Button.tsx
+#    A  src/components/Modal.tsx
+#    ??  src/styles/new-theme.css
+# 🔄 迁移到 .zcf/feature-ui...
+# ✅ 迁移完成！建议在新 worktree 中提交这些改动。
+
+# 3. 询问是否打开 IDE（因为创建时没有使用 -o）
+# 🖥️  是否在 IDE 中打开 .zcf/feature-ui？[y/n]: y
+```
+
+### **Stash 迁移**
+```bash
+# 当前有一些 stash，想应用到特定 worktree
+/git-worktree migrate hotfix --stash
+# 输出：
+# 📋 发现以下 stash：
+#    stash@{0}: WIP on main: fix user login
+#    stash@{1}: WIP on main: update docs
+# 选择要迁移的 stash [0/1]: 0
+# 🔄 正在将 stash@{0} 应用到 .zcf/hotfix...
+# ✅ Stash 内容已成功应用！
+```
+
+### **列出和管理 worktree**
+```bash
+# 查看所有 worktree
+/git-worktree list
+# 输出：
+# /path/to/project                    [main]     ← 主工作树
+# /path/to/project/.zcf/feature-ui    [feature/new-ui]
+# /path/to/project/.zcf/hotfix        [fix/login]
+
+# 删除不需要的 worktree
+/git-worktree remove feature-ui
+# 输出：
+# ✅ Worktree .zcf/feature-ui removed successfully
+
+# 清理无效引用
+/git-worktree prune
+# 输出：
+# 🧹 Pruned 0 worktree entries
+```
+
+---
+
+## Directory Structure
+
+使用此命令后，项目结构会是：
+```
+your-project/
+├── .git/
+├── .zcf/                    # worktree 目录（被 git 忽略）
+│   ├── feature-ui/          # feature-ui 分支的工作树
+│   ├── hotfix/              # hotfix 分支的工作树
+│   ├── debug/               # debug 用的工作树
+│   └── .worktree-config     # worktree 配置文件
+├── src/                     # 主工作树的源码
+└── package.json             # 主工作树的文件
+```
+
+---
+
+## Configuration
+
+### **IDE 偏好设置**
+命令会在 `.zcf/.worktree-config` 中保存用户偏好：
+```json
+{
+  "preferredIDE": "code",
+  "autoOpenIDE": false,
+  "migrateBackup": true,
+  "defaultWorktreeDir": ".zcf"
+}
+```
+
+### **自定义 IDE 命令**
+```bash
+# 设置自定义 IDE
+git config worktree.ide.custom "subl %s"  # Sublime Text
+git config worktree.ide.preferred "custom"
+```
+
+---
+
+## Notes
+
+- **性能优化**：worktree 共享 `.git` 目录，节省磁盘空间
+- **IDE 支持**：大多数现代 IDE 都支持多 worktree 项目
+- **清理建议**：定期运行 `prune` 清理无效引用
+- **分支保护**：避免在受保护分支（如 main/master）上操作
+- **迁移限制**：只能迁移未提交的改动，已提交的内容需要使用 `git cherry-pick`
+- **IDE 要求**：需要 IDE 的命令行工具已安装并在 PATH 中
+- **跨平台支持**：IDE 检测和启动支持 Windows、macOS、Linux
+
+---