@fatdoge/wtree 0.1.10 → 0.2.1

package/dist-node/api/cli/wtree.js

@@ -5,12 +5,32 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { execSync } from 'node:child_process';
 import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import { getRepoRoot } from '../core/git.js';
 import { git, gitOrThrow } from '../core/git.js';
 import { listWorktrees, parseWorktreePorcelain } from '../core/worktree.js';
 import { openPath } from '../core/open.js';
 import { readConfig, writeConfig, getConfigPaths } from '../core/config.js';
 import { startUiDevServer } from '../ui/startUiDev.js';
+function getVersion() {
+    try {
+        const __dirname = path.dirname(fileURLToPath(import.meta.url));
+        // 从 api/cli/ 或 dist-node/api/cli/ 向上查找 package.json
+        let dir = __dirname;
+        for (let i = 0; i < 5; i++) {
+            const pkgPath = path.join(dir, 'package.json');
+            if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                return pkg.version || 'unknown';
+            }
+            dir = path.dirname(dir);
+        }
+        return 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
 function errMsg(e) {
     return e instanceof Error ? e.message : String(e);
 }
@@ -21,6 +41,15 @@ function parseArgs(argv) {
         noOpen: false,
         repo: '',
         port: undefined,
+        json: false,
+        yes: false,
+        force: false,
+        dir: '',
+        base: '',
+        editor: undefined,
+        noEditor: false,
+        noInstall: false,
+        version: false,
     };
     const positional = [];
     while (args.length) {
@@ -43,6 +72,42 @@ function parseArgs(argv) {
                 flags.port = v;
             continue;
         }
+        if (a === '--json') {
+            flags.json = true;
+            continue;
+        }
+        if (a === '--yes' || a === '-y') {
+            flags.yes = true;
+            continue;
+        }
+        if (a === '--force' || a === '-f') {
+            flags.force = true;
+            continue;
+        }
+        if (a === '--dir') {
+            flags.dir = String(args.shift() || '');
+            continue;
+        }
+        if (a === '--base') {
+            flags.base = String(args.shift() || '');
+            continue;
+        }
+        if (a === '--editor') {
+            flags.editor = String(args.shift() || '');
+            continue;
+        }
+        if (a === '--no-editor') {
+            flags.noEditor = true;
+            continue;
+        }
+        if (a === '--no-install') {
+            flags.noInstall = true;
+            continue;
+        }
+        if (a === '--version' || a === '-v') {
+            flags.version = true;
+            continue;
+        }
         if (a.startsWith('--'))
             continue;
         positional.push(a);
@@ -80,8 +145,12 @@ function parseCommand(positional) {
     }
     return { command: 'interactive', rest: positional };
 }
-function printWorktreeList(rootDir) {
+function printWorktreeList(rootDir, json = false) {
     const items = listWorktrees(rootDir);
+    if (json) {
+        console.info(JSON.stringify(items, null, 2));
+        return;
+    }
     if (items.length === 0) {
         console.info('未读取到 worktree。');
         return;
@@ -98,7 +167,7 @@ function printHelp() {
     console.info('  wtree');
     console.info('  wtree list');
     console.info('  wtree create [branch]');
-    console.info('  wtree delete');
+    console.info('  wtree delete [branch|path ...]');
     console.info('  wtree open [path|branch]');
     console.info('  wtree lock [path|branch]');
     console.info('  wtree unlock [path|branch]');
@@ -107,8 +176,25 @@ function printHelp() {
     console.info('  wtree config get <key>');
     console.info('  wtree config set <key> <value>');
     console.info('  wtree --ui [--repo <path>] [--no-open] [--port <number>]');
+    console.info('  wtree --version, -v');
+    console.info('');
+    console.info('选项:');
+    console.info('  --json          以 JSON 格式输出 (适合脚本/agent 使用)');
+    console.info('  --yes, -y       自动确认所有提示');
+    console.info('  --force, -f     强制操作 (如强制删除有未提交更改的 worktree)');
+    console.info('  --dir <path>    指定 worktree 目录路径 (相对于 git 根目录)');
+    console.info('  --base <ref>    创建新分支时的基准引用 (如 main, origin/main)');
+    console.info('  --editor <name> 创建后使用指定编辑器打开 (trae, cursor, code, none)');
+    console.info('  --no-editor     创建后不打开编辑器');
+    console.info('  --no-install    创建后不自动安装依赖');
     console.info('');
     console.info('可用配置 key: baseDir, openCommand, editorCommand');
+    console.info('');
+    console.info('非交互示例:');
+    console.info('  wtree list --json');
+    console.info('  wtree create feat/x --yes --no-editor --no-install --json');
+    console.info('  wtree create feat/new --base main --yes --dir worktrees/feat-new --json');
+    console.info('  wtree delete feat/old --yes --force --json');
 }
 function resolveWorktree(rootDir, key) {
     const items = listWorktrees(rootDir);
@@ -258,6 +344,10 @@ async function pruneWorktrees(rootDir) {
 }
 async function main() {
     const { flags, positional } = parseArgs(process.argv.slice(2));
+    if (flags.version || positional[0] === 'version') {
+        console.info(getVersion());
+        return;
+    }
     const cwd = flags.repo ? path.resolve(flags.repo) : process.cwd();
     const rootDir = getRepoRoot(cwd);
     if (flags.ui) {
@@ -276,18 +366,20 @@ async function main() {
         process.on('SIGTERM', close);
         return;
     }
-    console.info(chalk.blue(`检测到git repo根目录 ${rootDir}，将在这里运行git命令`));
+    if (!flags.json) {
+        console.info(chalk.blue(`检测到git repo根目录 ${rootDir}，将在这里运行git命令`));
+    }
     const { command, rest } = parseCommand(positional);
     if (command === 'list') {
-        printWorktreeList(rootDir);
+        printWorktreeList(rootDir, flags.json);
         return;
     }
     if (command === 'create') {
-        await createWorktree({ rootDir }, rest[0]);
+        await createWorktree({ rootDir, flags }, rest[0]);
         return;
     }
     if (command === 'delete') {
-        await deleteWorktree({ rootDir });
+        await deleteWorktree({ rootDir, flags }, rest);
         return;
     }
     if (command === 'open') {
@@ -329,7 +421,7 @@ async function main() {
     }
     const directBranch = rest[0];
     const action = await getUserAction(directBranch);
-    const ctx = { rootDir };
+    const ctx = { rootDir, flags };
     if (action === 'create') {
         await createWorktree(ctx, directBranch);
     }
@@ -374,21 +466,28 @@ async function getUserAction(directBranch) {
     return action;
 }
 async function createWorktree(ctx, directBranch) {
-    const { rootDir } = ctx;
+    const { rootDir, flags } = ctx;
     const defaultBranch = git(rootDir, ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']).stdout
         .replace(/^origin\//, '')
         .trim() || 'master';
     const { sourceType, selection } = await selectSource(rootDir, directBranch, defaultBranch);
-    const { targetBranch, baseRef, isNewBranch } = await resolveBranchInfo(rootDir, sourceType, selection, directBranch, defaultBranch);
-    const { targetDir, dirName } = await selectTargetDir(rootDir, targetBranch);
-    console.info(chalk.green(`\n准备创建 Worktree:`));
-    console.info(`  分支: ${targetBranch}`);
-    console.info(`  目录: ${targetDir}`);
-    console.info(`  来源: ${baseRef || 'Existing Local'}`);
+    const { targetBranch, baseRef, isNewBranch } = await resolveBranchInfo(rootDir, sourceType, selection, directBranch, defaultBranch, flags);
+    const { targetDir, dirName } = await selectTargetDir(rootDir, targetBranch, flags);
+    if (!flags.json) {
+        console.info(chalk.green(`\n准备创建 Worktree:`));
+        console.info(`  分支: ${targetBranch}`);
+        console.info(`  目录: ${targetDir}`);
+        console.info(`  来源: ${baseRef || 'Existing Local'}`);
+    }
     await createGitWorktree(rootDir, targetDir, targetBranch, baseRef, isNewBranch, sourceType, defaultBranch);
     await setupWorktreeEnv(rootDir, targetDir, dirName);
-    await installDependencies(targetDir);
-    await openInIDE(targetDir);
+    await installDependencies(targetDir, flags.noInstall);
+    await openInIDE(targetDir, flags);
+    if (flags.json) {
+        const items = listWorktrees(rootDir);
+        const created = items.find(x => path.resolve(x.path) === path.resolve(targetDir));
+        console.info(JSON.stringify({ ok: true, data: created || null }));
+    }
 }
 async function selectSource(rootDir, directBranch, defaultBranch) {
     let sourceType;
@@ -430,7 +529,7 @@ async function selectSource(rootDir, directBranch, defaultBranch) {
     }
     return { sourceType, selection };
 }
-async function resolveBranchInfo(rootDir, sourceType, selection, directBranch, defaultBranch) {
+async function resolveBranchInfo(rootDir, sourceType, selection, directBranch, defaultBranch, flags) {
     let targetBranch = '';
     let baseRef = '';
     let isNewBranch = false;
@@ -470,20 +569,26 @@ async function resolveBranchInfo(rootDir, sourceType, selection, directBranch, d
                 isNewBranch = true;
             }
             else {
-                const { createNew } = await inquirer.prompt([
-                    {
-                        type: 'confirm',
-                        name: 'createNew',
-                        message: `分支 ${targetBranch} 不存在。是否基于 ${defaultBranch} 创建新分支?`,
-                        default: true,
-                    },
-                ]);
-                if (createNew) {
-                    baseRef = defaultBranch;
+                if (flags.yes) {
+                    baseRef = flags.base || defaultBranch;
                     isNewBranch = true;
                 }
                 else {
-                    process.exit(1);
+                    const { createNew } = await inquirer.prompt([
+                        {
+                            type: 'confirm',
+                            name: 'createNew',
+                            message: `分支 ${targetBranch} 不存在。是否基于 ${defaultBranch} 创建新分支?`,
+                            default: true,
+                        },
+                    ]);
+                    if (createNew) {
+                        baseRef = defaultBranch;
+                        isNewBranch = true;
+                    }
+                    else {
+                        process.exit(1);
+                    }
                 }
             }
         }
@@ -539,16 +644,26 @@ async function resolveBranchInfo(rootDir, sourceType, selection, directBranch, d
     }
     return { targetBranch, baseRef, isNewBranch };
 }
-async function selectTargetDir(rootDir, targetBranch) {
+async function selectTargetDir(rootDir, targetBranch, flags) {
     const defaultDirName = `worktrees/${targetBranch.split('/').join('-')}`;
-    const { dirName } = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'dirName',
-            message: `请输入 Worktree 目录路径 (相对于 Git 根目录, 默认: ${defaultDirName}):`,
-            default: defaultDirName,
-        },
-    ]);
+    let dirName;
+    if (flags.dir) {
+        dirName = flags.dir;
+    }
+    else if (flags.yes) {
+        dirName = defaultDirName;
+    }
+    else {
+        const result = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'dirName',
+                message: `请输入 Worktree 目录路径 (相对于 Git 根目录, 默认: ${defaultDirName}):`,
+                default: defaultDirName,
+            },
+        ]);
+        dirName = result.dirName;
+    }
     const targetDir = path.resolve(rootDir, dirName);
     if (fs.existsSync(targetDir)) {
         console.error(chalk.red(`目录 ${targetDir} 已存在!`));
@@ -594,7 +709,9 @@ async function setupWorktreeEnv(rootDir, targetDir, dirName) {
         }
     }
 }
-async function installDependencies(targetDir) {
+async function installDependencies(targetDir, skip = false) {
+    if (skip)
+        return;
     if (!fs.existsSync(path.join(targetDir, 'package.json')))
         return;
     try {
@@ -615,7 +732,20 @@ function hasCommand(cmd) {
         return false;
     }
 }
-async function openInIDE(targetDir) {
+async function openInIDE(targetDir, flags) {
+    if (flags.noEditor)
+        return;
+    if (flags.editor !== undefined) {
+        if (flags.editor === 'none' || flags.editor === '')
+            return;
+        try {
+            execSync(`${flags.editor} "${targetDir}"`, { stdio: 'ignore' });
+        }
+        catch (e) {
+            void e;
+        }
+        return;
+    }
     const editors = [];
     if (hasCommand('trae'))
         editors.push({ name: `在 Trae 中打开 （trae ${targetDir}）`, value: 'trae' });
@@ -644,34 +774,63 @@ async function openInIDE(targetDir) {
         void e;
     }
 }
-async function deleteWorktree(ctx) {
-    const worktrees = getWorktreeList(ctx.rootDir);
-    const choices = getDeletableWorktrees(ctx.rootDir, worktrees);
+async function deleteWorktree(ctx, targets = []) {
+    const { rootDir, flags } = ctx;
+    const worktrees = getWorktreeList(rootDir);
+    const choices = getDeletableWorktrees(rootDir, worktrees);
     if (choices.length === 0) {
-        console.warn(chalk.yellow('没有可删除的 Worktree (除了主 Worktree)'));
+        if (flags.json) {
+            console.info(JSON.stringify({ ok: true, data: [], message: 'No deletable worktrees' }));
+        }
+        else {
+            console.warn(chalk.yellow('没有可删除的 Worktree (除了主 Worktree)'));
+        }
         return;
     }
-    const { targetPaths } = await inquirer.prompt([
-        {
-            type: 'checkbox',
-            name: 'targetPaths',
-            message: '请选择要删除的 Worktree:',
-            choices,
-            validate: (answer) => (answer.length > 0 ? true : '请至少选择一个'),
-        },
-    ]);
-    const { confirmDelete } = await inquirer.prompt([
-        {
-            type: 'confirm',
-            name: 'confirmDelete',
-            message: `确定要删除这 ${targetPaths.length} 个 Worktree 吗?`,
-            default: false,
-        },
-    ]);
-    if (!confirmDelete)
-        return;
+    let targetPaths;
+    if (targets.length > 0) {
+        // Non-interactive: resolve each target to a worktree path
+        targetPaths = [];
+        for (const key of targets) {
+            const wt = resolveWorktree(rootDir, key);
+            if (!wt) {
+                console.error(chalk.red(`未找到 worktree: ${key}`));
+                process.exit(1);
+            }
+            if (path.resolve(wt.path) === path.resolve(rootDir)) {
+                console.error(chalk.red(`不能删除主 worktree: ${key}`));
+                process.exit(1);
+            }
+            targetPaths.push(wt.path);
+        }
+    }
+    else {
+        // Interactive: checkbox prompt
+        const result = await inquirer.prompt([
+            {
+                type: 'checkbox',
+                name: 'targetPaths',
+                message: '请选择要删除的 Worktree:',
+                choices,
+                validate: (answer) => (answer.length > 0 ? true : '请至少选择一个'),
+            },
+        ]);
+        targetPaths = result.targetPaths;
+    }
+    if (!flags.yes) {
+        const { confirmDelete } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'confirmDelete',
+                message: `确定要删除这 ${targetPaths.length} 个 Worktree 吗?`,
+                default: false,
+            },
+        ]);
+        if (!confirmDelete)
+            return;
+    }
     for (const targetPath of targetPaths) {
-        await deleteSingleWorktree(ctx.rootDir, targetPath);
+        await deleteSingleWorktree(rootDir, targetPath, flags);
     }
 }
 function getWorktreeList(rootDir) {
@@ -690,29 +849,55 @@ function getDeletableWorktrees(rootDir, worktrees) {
         return { name: `${wt.branch || 'HEAD'} (${relativePath})`, value: wt.path };
     });
 }
-async function deleteSingleWorktree(rootDir, targetPath) {
+async function deleteSingleWorktree(rootDir, targetPath, flags) {
     try {
         gitOrThrow(rootDir, ['worktree', 'remove', targetPath], 'WORKTREE_REMOVE');
-        console.info(chalk.green(`成功删除: ${targetPath}`));
+        if (flags.json) {
+            console.info(JSON.stringify({ ok: true, removed: targetPath }));
+        }
+        else {
+            console.info(chalk.green(`成功删除: ${targetPath}`));
+        }
     }
     catch (e) {
-        console.error(chalk.red(`删除失败: ${errMsg(e)}`));
-        const { force } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'force',
-                message: '删除失败 (可能有未提交的更改). 强制删除吗?',
-                default: false,
-            },
-        ]);
-        if (!force)
-            return;
-        try {
-            gitOrThrow(rootDir, ['worktree', 'remove', '--force', targetPath], 'WORKTREE_REMOVE_FORCE');
-            console.info(chalk.green(`成功强制删除: ${targetPath}`));
+        if (flags.force) {
+            try {
+                gitOrThrow(rootDir, ['worktree', 'remove', '--force', targetPath], 'WORKTREE_REMOVE_FORCE');
+                if (flags.json) {
+                    console.info(JSON.stringify({ ok: true, removed: targetPath, forced: true }));
+                }
+                else {
+                    console.info(chalk.green(`成功强制删除: ${targetPath}`));
+                }
+            }
+            catch (forceErr) {
+                if (flags.json) {
+                    console.error(JSON.stringify({ ok: false, error: errMsg(forceErr), path: targetPath }));
+                }
+                else {
+                    console.error(chalk.red(`强制删除也失败了: ${errMsg(forceErr)}`));
+                }
+            }
         }
-        catch (forceErr) {
-            console.error(chalk.red(`强制删除也失败了: ${errMsg(forceErr)}`));
+        else {
+            console.error(chalk.red(`删除失败: ${errMsg(e)}`));
+            const { force } = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'force',
+                    message: '删除失败 (可能有未提交的更改). 强制删除吗?',
+                    default: false,
+                },
+            ]);
+            if (!force)
+                return;
+            try {
+                gitOrThrow(rootDir, ['worktree', 'remove', '--force', targetPath], 'WORKTREE_REMOVE_FORCE');
+                console.info(chalk.green(`成功强制删除: ${targetPath}`));
+            }
+            catch (forceErr) {
+                console.error(chalk.red(`强制删除也失败了: ${errMsg(forceErr)}`));
+            }
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fatdoge/wtree",
   "private": false,
-  "version": "0.1.10",
+  "version": "0.2.1",
   "description": "CLI + UI tool for managing git worktrees",
   "keywords": [
     "git",
@@ -30,6 +30,7 @@
     "api",
     "src",
     "shared",
+    "skills",
     "index.html",
     "vite.config.ts",
     "tailwind.config.js",
@@ -37,6 +38,19 @@
     "README.md",
     "LICENSE"
   ],
+  "scripts": {
+    "client:dev": "vite",
+    "build:ui": "vite build",
+    "build:cli": "tsc -p tsconfig.node.json",
+    "build": "pnpm run build:cli && pnpm run build:ui",
+    "lint": "eslint .",
+    "preview": "vite preview",
+    "check": "tsc --noEmit && tsc -p tsconfig.node.json --noEmit",
+    "server:dev": "nodemon",
+    "dev": "concurrently \"pnpm run client:dev\" \"pnpm run server:dev\"",
+    "wtree": "tsx api/cli/wtree.ts",
+    "test": "vitest run"
+  },
   "dependencies": {
     "@vitejs/plugin-react": "^4.4.1",
     "autoprefixer": "^10.4.21",
@@ -82,18 +96,5 @@
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.30.1",
     "vitest": "^2.1.9"
-  },
-  "scripts": {
-    "client:dev": "vite",
-    "build:ui": "vite build",
-    "build:cli": "tsc -p tsconfig.node.json",
-    "build": "pnpm run build:cli && pnpm run build:ui",
-    "lint": "eslint .",
-    "preview": "vite preview",
-    "check": "tsc --noEmit && tsc -p tsconfig.node.json --noEmit",
-    "server:dev": "nodemon",
-    "dev": "concurrently \"pnpm run client:dev\" \"pnpm run server:dev\"",
-    "wtree": "tsx api/cli/wtree.ts",
-    "test": "vitest run"
   }
-}
+}