grf-cli 1.0.2 → 1.0.4

package/dist/commands/unload.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * unload 命令
- * 移除当前项目中已加载的参考代码（use 命令的逆操作）
+ * 从当前项目中移除已加载的参考代码（use 命令的逆操作）
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -41,67 +41,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unloadCommand = void 0;
+exports.registerUnloadCommand = registerUnloadCommand;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
-const ora_1 = __importDefault(require("ora"));
 const path_1 = __importDefault(require("path"));
-const readline = __importStar(require("readline"));
 const prompts_1 = require("@inquirer/prompts");
 const filesystem = __importStar(require("../core/filesystem.js"));
 const loading = __importStar(require("../core/loading.js"));
-const index_js_1 = require("../types/index.js");
-/** .gitreference 目录名 */
-const GITREFERENCE_DIR = ".gitreference";
+const spinner_js_1 = require("../ui/spinner.js");
+const prompt_js_1 = require("../ui/prompt.js");
+const table_js_1 = require("../ui/table.js");
+const error_js_1 = require("../utils/error.js");
+const constants_js_1 = require("../utils/constants.js");
+const index_js_1 = require("./options/index.js");
 /**
- * 从 loading.json 获取所有已加载仓库的目标路径
- * @param projectRoot 项目根目录
- * @returns 由 gitreference 管理的路径列表
+ * 注册 unload 命令
+ * @param program Commander 程序实例
  */
-async function getGitreferenceManagedPaths(projectRoot) {
-    const entries = await loading.getEntries(projectRoot);
-    return entries.map((entry) => entry.targetPath);
-}
-/**
- * 填充字符串到指定宽度
- * @param str 原始字符串
- * @param width 目标宽度
- * @returns 填充后的字符串
- */
-function padEnd(str, width) {
-    if (str.length >= width)
-        return str;
-    return str + " ".repeat(width - str.length);
-}
-/**
- * 确认提示
- * @param message 提示消息
- * @returns 用户是否确认
- */
-async function confirm(message) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    return new Promise((resolve) => {
-        rl.question(`${message} (y/N) `, (answer) => {
-            rl.close();
-            resolve(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
-        });
-    });
+function registerUnloadCommand(program) {
+    program.addCommand(exports.unloadCommand);
 }
+/** .gitreference 目录名（使用共享常量） */
+const GITREFERENCE_DIR = constants_js_1.DIR_NAMES.GITREFERENCE;
 /**
  * 从 loading.json 获取所有已加载的仓库条目
- * @param projectRoot 项目根目录
  * @returns 加载条目列表
  */
-async function getLoadedEntries(projectRoot) {
-    return await loading.getEntries(projectRoot);
+async function getLoadedEntries() {
+    return await loading.getEntries();
 }
 /**
- * 递归扫描 .gitreference 目录，获取空目录列表
+ * 递归扫描 .gitreference 目录以获取空目录列表
  * @param baseDir .gitreference 目录的绝对路径
- * @param currentPath 当前扫描的相对路径
- * @param loadedPaths 已加载的路径列表（用于排除）
+ * @param currentPath 当前正在扫描的相对路径
+ * @param loadedPaths 已加载路径列表（用于排除）
  * @returns 空目录列表
  */
 async function scanEmptyDirs(baseDir, currentPath = "", loadedPaths = new Set()) {
@@ -160,7 +133,7 @@ function matchEntries(entries, name) {
     return entries.filter((entry) => {
         const repoName = entry.repoName.replace(/\\/g, "/");
         const targetPath = entry.targetPath.replace(/\\/g, "/");
-        // 完整仓库名匹配: github.com/facebook/react
+        // 完整仓库名称匹配: github.com/facebook/react
         if (repoName === normalizedName) {
             return true;
         }
@@ -168,7 +141,7 @@ function matchEntries(entries, name) {
         if (targetPath === normalizedName) {
             return true;
         }
-        // 仓库短名匹配: react -> 匹配所有名为 react 的仓库
+        // 短仓库名称匹配: react -> 匹配所有名为 react 的仓库
         const shortName = path_1.default.basename(repoName);
         if (shortName === normalizedName) {
             return true;
@@ -187,7 +160,7 @@ function matchEntries(entries, name) {
 /**
  * 递归删除空的父目录
  * @param dirPath 起始目录路径
- * @param stopAt 停止删除的目录（不会删除此目录）
+ * @param stopAt 停止的目录（不会删除此目录）
  * @param verbose 是否输出详细信息
  */
 async function removeEmptyParents(dirPath, stopAt, verbose = false) {
@@ -197,7 +170,7 @@ async function removeEmptyParents(dirPath, stopAt, verbose = false) {
             const entries = await filesystem.readDir(currentDir);
             if (entries.length === 0) {
                 if (verbose) {
-                    console.log(chalk_1.default.gray(`  清理空目录: ${path_1.default.relative(stopAt, currentDir)}`));
+                    console.log(chalk_1.default.gray(`  Cleaning empty directory: ${path_1.default.relative(stopAt, currentDir)}`));
                 }
                 await filesystem.removeDir(currentDir);
                 currentDir = path_1.default.dirname(currentDir);
@@ -233,7 +206,7 @@ async function cleanEmptyDirectories(gitrefDir, emptyDirs, verbose = false) {
                 const entries = await filesystem.readDir(dir.absolutePath);
                 if (entries.length === 0) {
                     if (verbose) {
-                        console.log(chalk_1.default.gray(`  删除空目录: ${dir.fullPath.replace(/\\/g, "/")}`));
+                        console.log(chalk_1.default.gray(`  Removing empty directory: ${dir.fullPath.replace(/\\/g, "/")}`));
                     }
                     await filesystem.removeDir(dir.absolutePath);
                     cleanedCount++;
@@ -249,24 +222,24 @@ async function cleanEmptyDirectories(gitrefDir, emptyDirs, verbose = false) {
     return cleanedCount;
 }
 /**
- * 交互式选择仓库条目
+ * 交互式仓库条目选择
  * @param matches 匹配的条目列表
  * @param name 用户输入的名称
  * @returns 用户选择的条目，如果取消则返回 null
  */
 async function selectEntry(matches, name) {
-    console.log(chalk_1.default.yellow(`找到 ${matches.length} 个匹配 '${name}' 的参考代码:`));
+    console.log(chalk_1.default.yellow(`Found ${matches.length} reference code matching '${name}':`));
     console.log();
     try {
         const selected = await (0, prompts_1.select)({
-            message: "请选择要删除的参考代码:",
+            message: "Select reference code to remove:",
             choices: [
                 ...matches.map((match) => ({
                     name: `${match.repoName} -> ${match.targetPath}`,
                     value: match,
                 })),
                 {
-                    name: chalk_1.default.gray("取消"),
+                    name: chalk_1.default.gray("Cancel"),
                     value: null,
                 },
             ],
@@ -279,20 +252,20 @@ async function selectEntry(matches, name) {
     }
 }
 /**
- * 详细模式下删除目录
+ * 在详细模式下删除目录
  * @param dirPath 要删除的目录路径
- * @param displayPath 显示用的路径
+ * @param displayPath 用于显示的路径
  * @param verbose 是否输出详细信息
  */
 async function removeDirVerbose(dirPath, displayPath, verbose) {
     if (verbose) {
-        console.log(chalk_1.default.gray(`  删除目录: ${displayPath}`));
+        console.log(chalk_1.default.gray(`  Removing directory: ${displayPath}`));
     }
     await filesystem.removeDir(dirPath);
 }
 /**
- * 清理 .gitignore 中的参考代码路径条目
- * @param targetPath 被删除的目标路径（相对于工作目录）
+ * 从 .gitignore 中清理参考代码路径条目
+ * @param targetPath 已删除的目标路径（相对于工作目录）
  * @param gitreferenceDirExists .gitreference 目录是否仍然存在
  * @param verbose 是否输出详细信息
  */
@@ -301,11 +274,11 @@ async function cleanupGitignore(targetPath, gitreferenceDirExists, verbose = fal
     // 如果删除的是 .gitreference 目录下的内容
     if (targetPath.startsWith(".gitreference") ||
         targetPath.startsWith(GITREFERENCE_DIR)) {
-        // 只有当 .gitreference 目录不存在或为空时，才移除 .gitignore 中的 .gitreference/ 条目
+        // 只有当目录不存在或为空时才从 .gitignore 中移除 .gitreference/ 条目
         if (!gitreferenceDirExists) {
             const removed = await filesystem.removeFromGitignore(cwd, ".gitreference/");
             if (removed && verbose) {
-                console.log(chalk_1.default.gray("  已从 .gitignore 中移除 .gitreference/"));
+                console.log(chalk_1.default.gray("  Removed .gitreference/ from .gitignore"));
             }
         }
     }
@@ -316,27 +289,27 @@ async function cleanupGitignore(targetPath, gitreferenceDirExists, verbose = fal
             : targetPath + "/";
         const removed = await filesystem.removeFromGitignore(cwd, gitignoreEntry);
         if (removed && verbose) {
-            console.log(chalk_1.default.gray(`  已从 .gitignore 中移除 ${gitignoreEntry}`));
+            console.log(chalk_1.default.gray(`  Removed ${gitignoreEntry} from .gitignore`));
         }
     }
 }
 exports.unloadCommand = new commander_1.Command("unload")
     .description("Remove reference code from current project")
     .argument("[name]", "Repository name to remove")
-    .option("-a, --all", "Remove all reference code")
-    .option("-f, --force", "Skip confirmation prompt")
-    .option("--dry-run", "Show what would be deleted without actually deleting")
-    .option("-l, --list", "List all loaded reference code")
-    .option("--keep-empty", "Keep empty .gitreference/ directory after removal")
-    .option("--clean-empty", "Clean empty directory structures in .gitreference/")
-    .option("-v, --verbose", "Show detailed deletion progress")
+    .addOption(index_js_1.allOption)
+    .addOption(index_js_1.forceOption)
+    .addOption(index_js_1.dryRunOption)
+    .addOption(index_js_1.listOption)
+    .addOption(index_js_1.keepEmptyOption)
+    .addOption(index_js_1.cleanEmptyOption)
+    .addOption(index_js_1.verboseOption)
     .action(async (name, options) => {
     const startTime = Date.now();
     try {
         const cwd = process.cwd();
         const gitrefDir = path_1.default.join(cwd, GITREFERENCE_DIR);
         // 获取所有已加载的条目
-        const loadedEntries = await getLoadedEntries(cwd);
+        const loadedEntries = await getLoadedEntries();
         // 检查 .gitreference 目录是否存在（用于空目录扫描）
         const gitrefDirExists = await filesystem.exists(gitrefDir);
         // 扫描空目录（仅当 .gitreference 目录存在时）
@@ -347,29 +320,29 @@ exports.unloadCommand = new commander_1.Command("unload")
         // 情况 0: --clean-empty 选项，清理空目录
         if (options.cleanEmpty) {
             if (emptyDirs.length === 0) {
-                console.log(chalk_1.default.green("没有需要清理的空目录。"));
+                console.log(chalk_1.default.green("No empty directories to clean."));
                 return;
             }
-            console.log(`发现 ${chalk_1.default.bold(emptyDirs.length)} 个空目录:`);
+            console.log(`Found ${chalk_1.default.bold(emptyDirs.length)} empty directories:`);
             for (const dir of emptyDirs) {
                 console.log(`  - ${dir.fullPath.replace(/\\/g, "/")}`);
             }
             console.log();
             // dry-run 模式
             if (options.dryRun) {
-                console.log(chalk_1.default.yellow("(试运行模式，未执行实际删除)"));
+                console.log(chalk_1.default.yellow("(Dry run mode, no actual deletion)"));
                 return;
             }
             // 确认删除
             if (!options.force) {
-                const confirmed = await confirm("确定要清理这些空目录吗?");
+                const confirmed = await (0, prompt_js_1.confirm)("Are you sure you want to clean these empty directories?");
                 if (!confirmed) {
-                    console.log(chalk_1.default.yellow("操作已取消。"));
+                    console.log(chalk_1.default.yellow("Operation cancelled."));
                     return;
                 }
             }
             // 执行清理
-            const spinner = (0, ora_1.default)("正在清理空目录...").start();
+            const spinner = (0, spinner_js_1.startSpinner)("Cleaning empty directories...");
             try {
                 const cleanedCount = await cleanEmptyDirectories(gitrefDir, emptyDirs, options.verbose);
                 // 检查 .gitreference 目录是否为空
@@ -378,7 +351,7 @@ exports.unloadCommand = new commander_1.Command("unload")
                         const remaining = await filesystem.readDir(gitrefDir);
                         if (remaining.length === 0) {
                             if (options.verbose) {
-                                console.log(chalk_1.default.gray(`  删除空的 .gitreference 目录`));
+                                console.log(chalk_1.default.gray(`  Removing empty .gitreference directory`));
                             }
                             await filesystem.removeDir(gitrefDir);
                         }
@@ -388,13 +361,13 @@ exports.unloadCommand = new commander_1.Command("unload")
                     }
                 }
                 const elapsed = Date.now() - startTime;
-                spinner.succeed(chalk_1.default.green(`已清理 ${cleanedCount} 个空目录!`));
+                spinner.succeed(chalk_1.default.green(`Cleaned ${cleanedCount} empty directories!`));
                 if (options.verbose) {
-                    console.log(chalk_1.default.gray(`  耗时: ${elapsed}ms`));
+                    console.log(chalk_1.default.gray(`  Time elapsed: ${elapsed}ms`));
                 }
             }
             catch (error) {
-                spinner.fail(chalk_1.default.red("清理失败"));
+                spinner.fail(chalk_1.default.red("Cleanup failed"));
                 throw error;
             }
             return;
@@ -402,20 +375,20 @@ exports.unloadCommand = new commander_1.Command("unload")
         // 情况 1: --list 选项，列出所有已加载的参考代码
         if (options.list) {
             if (loadedEntries.length === 0 && emptyDirs.length === 0) {
-                console.log(chalk_1.default.yellow("当前项目中没有已加载的参考代码。"));
+                console.log(chalk_1.default.yellow("No loaded reference code in current project."));
                 return;
             }
             if (loadedEntries.length > 0) {
-                console.log(chalk_1.default.bold(`📦 当前项目中已加载的参考代码 (${loadedEntries.length} 个)`));
+                console.log(chalk_1.default.bold(`📦 Loaded reference code in current project (${loadedEntries.length})`));
                 console.log();
                 // 表头
                 const COL_NAME = 35;
                 const COL_PATH = 30;
                 const COL_COMMIT = 10;
                 console.log(chalk_1.default.gray("  " +
-                    padEnd("REPO", COL_NAME) +
-                    padEnd("PATH", COL_PATH) +
-                    padEnd("COMMIT", COL_COMMIT)));
+                    (0, table_js_1.padEnd)("REPO", COL_NAME) +
+                    (0, table_js_1.padEnd)("PATH", COL_PATH) +
+                    (0, table_js_1.padEnd)("COMMIT", COL_COMMIT)));
                 // 条目列表
                 for (const entry of loadedEntries) {
                     const repoName = entry.repoName.replace(/\\/g, "/");
@@ -424,51 +397,51 @@ exports.unloadCommand = new commander_1.Command("unload")
                         ? entry.commitId.substring(0, 7)
                         : "-";
                     console.log("  " +
-                        padEnd(repoName, COL_NAME) +
-                        padEnd(targetPath, COL_PATH) +
-                        padEnd(commitShort, COL_COMMIT));
+                        (0, table_js_1.padEnd)(repoName, COL_NAME) +
+                        (0, table_js_1.padEnd)(targetPath, COL_PATH) +
+                        (0, table_js_1.padEnd)(commitShort, COL_COMMIT));
                 }
                 console.log();
-                // 详细模式下显示更多信息
+                // 在详细模式下显示更多信息
                 if (options.verbose) {
-                    console.log(chalk_1.default.gray("详细信息:"));
+                    console.log(chalk_1.default.gray("Details:"));
                     for (const entry of loadedEntries) {
                         console.log(chalk_1.default.gray(`  - ${entry.repoName}`));
                         console.log(chalk_1.default.gray(`    ID: ${entry.id}`));
                         console.log(chalk_1.default.gray(`    URL: ${entry.repoUrl}`));
-                        console.log(chalk_1.default.gray(`    路径: ${entry.targetPath}`));
+                        console.log(chalk_1.default.gray(`    Path: ${entry.targetPath}`));
                         console.log(chalk_1.default.gray(`    Commit: ${entry.commitId}`));
                         if (entry.branch) {
-                            console.log(chalk_1.default.gray(`    分支: ${entry.branch}`));
+                            console.log(chalk_1.default.gray(`    Branch: ${entry.branch}`));
                         }
                         if (entry.subdir) {
-                            console.log(chalk_1.default.gray(`    子目录: ${entry.subdir}`));
+                            console.log(chalk_1.default.gray(`    Subdir: ${entry.subdir}`));
                         }
-                        console.log(chalk_1.default.gray(`    加载时间: ${entry.loadedAt}`));
+                        console.log(chalk_1.default.gray(`    Loaded at: ${entry.loadedAt}`));
                         if (entry.updatedAt) {
-                            console.log(chalk_1.default.gray(`    更新时间: ${entry.updatedAt}`));
+                            console.log(chalk_1.default.gray(`    Updated at: ${entry.updatedAt}`));
                         }
                     }
                     console.log();
                 }
             }
             else {
-                console.log(chalk_1.default.yellow("当前项目中没有已加载的参考代码。"));
+                console.log(chalk_1.default.yellow("No loaded reference code in current project."));
                 console.log();
             }
             // 显示空目录提示
             if (emptyDirs.length > 0) {
-                console.log(chalk_1.default.yellow(`⚠️  发现 ${emptyDirs.length} 个空目录结构`));
+                console.log(chalk_1.default.yellow(`⚠️  Found ${emptyDirs.length} empty directory structures`));
                 if (options.verbose) {
                     for (const dir of emptyDirs) {
                         console.log(chalk_1.default.gray(`    - ${dir.fullPath.replace(/\\/g, "/")}`));
                     }
                 }
-                console.log(chalk_1.default.gray(`   使用 'grf unload --clean-empty' 清理空目录`));
+                console.log(chalk_1.default.gray(`   Use 'grf unload --clean-empty' to clean empty directories`));
                 console.log();
             }
             if (loadedEntries.length > 0) {
-                console.log(chalk_1.default.gray(`💡 使用 'grf unload <name>' 移除指定的参考代码`));
+                console.log(chalk_1.default.gray(`💡 Use 'grf unload <name>' to remove specific reference code`));
             }
             return;
         }
@@ -476,9 +449,9 @@ exports.unloadCommand = new commander_1.Command("unload")
         if (options.all) {
             // 如果没有已加载的条目
             if (loadedEntries.length === 0) {
-                console.log(chalk_1.default.yellow("没有找到需要删除的参考代码。"));
+                console.log(chalk_1.default.yellow("No reference code found to delete."));
                 console.log();
-                console.log(chalk_1.default.gray("💡 提示: loading.json 中没有记录任何已加载的参考代码。"));
+                console.log(chalk_1.default.gray("💡 Hint: No loaded reference code recorded in loading.json."));
                 return;
             }
             const pathsToDelete = [];
@@ -492,40 +465,64 @@ exports.unloadCommand = new commander_1.Command("unload")
                 });
             }
             // 显示将要删除的内容
-            console.log(`将要删除 ${chalk_1.default.bold(loadedEntries.length)} 个参考代码:`);
+            console.log(`Will delete ${chalk_1.default.bold(loadedEntries.length)} reference code:`);
             for (const pathInfo of pathsToDelete) {
-                const status = pathInfo.exists ? "" : chalk_1.default.gray(" (路径不存在)");
+                const status = pathInfo.exists
+                    ? ""
+                    : chalk_1.default.gray(" (path does not exist)");
                 console.log(`  - ${pathInfo.entry.repoName} -> ${pathInfo.entry.targetPath}${status}`);
             }
             console.log();
             // dry-run 模式
             if (options.dryRun) {
-                console.log(chalk_1.default.yellow("(试运行模式，未执行实际删除)"));
+                console.log(chalk_1.default.yellow("(Dry run mode, no actual deletion)"));
                 return;
             }
             // 确认删除
             if (!options.force) {
-                const confirmed = await confirm("确定要删除吗?");
+                const confirmed = await (0, prompt_js_1.confirm)("Are you sure you want to delete?");
                 if (!confirmed) {
-                    console.log(chalk_1.default.yellow("操作已取消。"));
+                    console.log(chalk_1.default.yellow("Operation cancelled."));
                     return;
                 }
             }
             // 执行删除
-            const spinner = (0, ora_1.default)("正在删除参考代码...").start();
+            const spinner = (0, spinner_js_1.startSpinner)("Removing reference code...");
             try {
                 let deletedCount = 0;
                 for (const pathInfo of pathsToDelete) {
                     if (options.verbose) {
                         spinner.stop();
-                        console.log(chalk_1.default.gray(`  删除: ${pathInfo.entry.targetPath}`));
+                        console.log(chalk_1.default.gray(`  Removing: ${pathInfo.entry.targetPath}`));
                         spinner.start();
                     }
                     // 删除实际文件/目录（如果存在）
                     if (pathInfo.exists) {
                         await filesystem.removeDir(pathInfo.absolutePath);
+                        // 递归删除空的父目录
+                        if (pathInfo.entry.targetPath.startsWith(".gitreference/") ||
+                            pathInfo.entry.targetPath.startsWith(GITREFERENCE_DIR + "/")) {
+                            // 在 .gitreference 下，清理到 gitrefDir 为止
+                            if (options.verbose) {
+                                spinner.stop();
+                            }
+                            await removeEmptyParents(pathInfo.absolutePath, gitrefDir, options.verbose);
+                            if (options.verbose) {
+                                spinner.start();
+                            }
+                        }
+                        else {
+                            // 自定义路径，清理到工作目录为止
+                            if (options.verbose) {
+                                spinner.stop();
+                            }
+                            await removeEmptyParents(pathInfo.absolutePath, cwd, options.verbose);
+                            if (options.verbose) {
+                                spinner.start();
+                            }
+                        }
                     }
-                    // 清理 .gitignore 中对应的条目
+                    // 从 .gitignore 中清理对应条目
                     const gitignoreEntry = pathInfo.entry.targetPath.endsWith("/")
                         ? pathInfo.entry.targetPath
                         : pathInfo.entry.targetPath + "/";
@@ -533,21 +530,21 @@ exports.unloadCommand = new commander_1.Command("unload")
                     deletedCount++;
                 }
                 // 清空 loading.json
-                await loading.clearAllEntries(cwd);
+                await loading.clearAllEntries();
                 // 检查 .gitreference 目录是否为空
                 if (!options.keepEmpty && gitrefDirExists) {
                     try {
                         const remaining = await filesystem.readDir(gitrefDir);
-                        // 只剩下 loading.json 或为空时删除整个目录
+                        // 当只剩 loading.json 或为空时删除整个目录
                         if (remaining.length === 0 ||
                             (remaining.length === 1 && remaining[0] === "loading.json")) {
                             if (options.verbose) {
                                 spinner.stop();
-                                console.log(chalk_1.default.gray(`  删除 .gitreference 目录`));
+                                console.log(chalk_1.default.gray(`  Removing .gitreference directory`));
                                 spinner.start();
                             }
                             await filesystem.removeDir(gitrefDir);
-                            // 移除 .gitignore 中的 .gitreference/ 条目
+                            // 从 .gitignore 中移除 .gitreference/ 条目
                             await filesystem.removeFromGitignore(cwd, ".gitreference/");
                         }
                     }
@@ -556,44 +553,44 @@ exports.unloadCommand = new commander_1.Command("unload")
                     }
                 }
                 const elapsed = Date.now() - startTime;
-                spinner.succeed(chalk_1.default.green(`已删除 ${deletedCount} 个参考代码!`));
+                spinner.succeed(chalk_1.default.green(`Deleted ${deletedCount} reference code!`));
                 if (options.verbose) {
-                    console.log(chalk_1.default.gray(`  耗时: ${elapsed}ms`));
+                    console.log(chalk_1.default.gray(`  Time elapsed: ${elapsed}ms`));
                 }
             }
             catch (error) {
-                spinner.fail(chalk_1.default.red("删除失败"));
+                spinner.fail(chalk_1.default.red("Deletion failed"));
                 throw error;
             }
             return;
         }
-        // 情况 3: 指定仓库名称，删除指定的参考代码
+        // 情况 3: 指定了仓库名称，删除特定参考代码
         if (name) {
             // 匹配条目
             const matches = matchEntries(loadedEntries, name);
             if (matches.length === 0) {
-                console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} 未找到匹配的参考代码: ${name}`));
+                console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} No matching reference code found: ${name}`));
                 console.log();
-                console.log(`使用 '${chalk_1.default.cyan("grf unload --list")}' 查看所有已加载的参考代码。`);
+                console.log(`Use '${chalk_1.default.cyan("grf unload --list")}' to see all loaded reference code.`);
                 process.exit(1);
             }
             let targetEntry;
             if (matches.length > 1) {
-                // 如果使用了 --force 选项，仍然报错要求精确指定
+                // 如果使用了 --force 选项，仍然需要精确指定
                 if (options.force) {
-                    console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} 找到多个匹配的参考代码:`));
+                    console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} Found multiple matching reference code:`));
                     console.log();
                     for (const match of matches) {
                         console.log(`  - ${match.repoName} -> ${match.targetPath}`);
                     }
                     console.log();
-                    console.log(`请使用完整路径精确指定要删除的参考代码。`);
+                    console.log(`Please use full path to specify exactly which reference code to delete.`);
                     process.exit(1);
                 }
                 // 交互式选择
                 const selected = await selectEntry(matches, name);
                 if (!selected) {
-                    console.log(chalk_1.default.yellow("操作已取消。"));
+                    console.log(chalk_1.default.yellow("Operation cancelled."));
                     return;
                 }
                 targetEntry = selected;
@@ -607,46 +604,47 @@ exports.unloadCommand = new commander_1.Command("unload")
             const absolutePath = path_1.default.resolve(cwd, targetEntry.targetPath);
             const pathExists = await filesystem.exists(absolutePath);
             // 显示将要删除的内容
-            console.log(`将要删除: ${chalk_1.default.cyan(displayName)}`);
-            console.log(`  目标路径: ${chalk_1.default.gray(displayPath)}`);
+            console.log(`Will delete: ${chalk_1.default.cyan(displayName)}`);
+            console.log(`  Target path: ${chalk_1.default.gray(displayPath)}`);
             if (!pathExists) {
-                console.log(chalk_1.default.yellow(`  (注意: 目标路径不存在，将仅从 loading.json 中移除记录)`));
+                console.log(chalk_1.default.yellow(`  (Note: Target path does not exist, will only remove record from loading.json)`));
             }
             if (options.verbose) {
-                console.log(`  绝对路径: ${chalk_1.default.gray(absolutePath)}`);
+                console.log(`  Absolute path: ${chalk_1.default.gray(absolutePath)}`);
                 console.log(`  Commit: ${chalk_1.default.gray(targetEntry.commitId)}`);
                 if (targetEntry.branch) {
-                    console.log(`  分支: ${chalk_1.default.gray(targetEntry.branch)}`);
+                    console.log(`  Branch: ${chalk_1.default.gray(targetEntry.branch)}`);
                 }
             }
             console.log();
             // dry-run 模式
             if (options.dryRun) {
-                console.log(chalk_1.default.yellow("(试运行模式，未执行实际删除)"));
+                console.log(chalk_1.default.yellow("(Dry run mode, no actual deletion)"));
                 return;
             }
             // 确认删除
             if (!options.force) {
-                const confirmed = await confirm(`确定要删除 '${displayName}' 吗?`);
+                const confirmed = await (0, prompt_js_1.confirm)(`Are you sure you want to delete '${displayName}'?`);
                 if (!confirmed) {
-                    console.log(chalk_1.default.yellow("操作已取消。"));
+                    console.log(chalk_1.default.yellow("Operation cancelled."));
                     return;
                 }
             }
             // 执行删除
-            const spinner = (0, ora_1.default)("正在删除参考代码...").start();
+            const spinner = (0, spinner_js_1.startSpinner)("Removing reference code...");
             try {
                 // 删除实际文件/目录（如果存在）
                 if (pathExists) {
                     if (options.verbose) {
                         spinner.stop();
-                        console.log(chalk_1.default.gray(`  删除目录: ${displayPath}`));
+                        console.log(chalk_1.default.gray(`  Removing directory: ${displayPath}`));
                         spinner.start();
                     }
                     await filesystem.removeDir(absolutePath);
-                    // 递归删除空的父目录（仅当在 .gitreference 目录下时）
+                    // 递归删除空的父目录
                     if (targetEntry.targetPath.startsWith(".gitreference/") ||
                         targetEntry.targetPath.startsWith(GITREFERENCE_DIR + "/")) {
+                        // 在 .gitreference 下，清理到 gitrefDir 为止
                         if (options.verbose) {
                             spinner.stop();
                         }
@@ -655,36 +653,46 @@ exports.unloadCommand = new commander_1.Command("unload")
                             spinner.start();
                         }
                     }
+                    else {
+                        // 自定义路径，清理到工作目录为止
+                        if (options.verbose) {
+                            spinner.stop();
+                        }
+                        await removeEmptyParents(absolutePath, cwd, options.verbose);
+                        if (options.verbose) {
+                            spinner.start();
+                        }
+                    }
                 }
-                // 从 loading.json 移除条目
-                await loading.removeEntry(targetEntry.id, cwd);
-                // 清理 .gitignore 中对应的条目
+                // 从 loading.json 中移除条目
+                await loading.removeEntry(targetEntry.id);
+                // 从 .gitignore 中清理对应条目
                 const gitignoreEntry = targetEntry.targetPath.endsWith("/")
                     ? targetEntry.targetPath
                     : targetEntry.targetPath + "/";
                 const gitignoreRemoved = await filesystem.removeFromGitignore(cwd, gitignoreEntry);
                 if (gitignoreRemoved && options.verbose) {
                     spinner.stop();
-                    console.log(chalk_1.default.gray(`  已从 .gitignore 中移除 ${gitignoreEntry}`));
+                    console.log(chalk_1.default.gray(`  Removed ${gitignoreEntry} from .gitignore`));
                     spinner.start();
                 }
                 // 检查 .gitreference 目录是否为空
                 if (!options.keepEmpty && gitrefDirExists) {
                     try {
                         const remaining = await filesystem.readDir(gitrefDir);
-                        // 只剩下 loading.json 或为空时删除整个目录
+                        // 当只剩 loading.json 或为空时删除整个目录
                         if (remaining.length === 0 ||
                             (remaining.length === 1 && remaining[0] === "loading.json")) {
                             // 检查 loading.json 是否还有其他条目
-                            const remainingEntries = await loading.getEntries(cwd);
+                            const remainingEntries = await loading.getEntries();
                             if (remainingEntries.length === 0) {
                                 if (options.verbose) {
                                     spinner.stop();
-                                    console.log(chalk_1.default.gray(`  删除空的 .gitreference 目录`));
+                                    console.log(chalk_1.default.gray(`  Removing empty .gitreference directory`));
                                     spinner.start();
                                 }
                                 await filesystem.removeDir(gitrefDir);
-                                // 移除 .gitignore 中的 .gitreference/ 条目
+                                // 从 .gitignore 中移除 .gitreference/ 条目
                                 await filesystem.removeFromGitignore(cwd, ".gitreference/");
                             }
                         }
@@ -694,45 +702,33 @@ exports.unloadCommand = new commander_1.Command("unload")
                     }
                 }
                 const elapsed = Date.now() - startTime;
-                spinner.succeed(chalk_1.default.green("参考代码已移除!"));
+                spinner.succeed(chalk_1.default.green("Reference code removed!"));
                 console.log();
-                console.log(`  ${chalk_1.default.gray("仓库:")}   ${displayName}`);
-                console.log(`  ${chalk_1.default.gray("路径:")}   ${displayPath}`);
+                console.log(`  ${chalk_1.default.gray("Repository:")}   ${displayName}`);
+                console.log(`  ${chalk_1.default.gray("Path:")}   ${displayPath}`);
                 if (options.verbose) {
-                    console.log(chalk_1.default.gray(`  耗时: ${elapsed}ms`));
+                    console.log(chalk_1.default.gray(`  Time elapsed: ${elapsed}ms`));
                 }
             }
             catch (error) {
-                spinner.fail(chalk_1.default.red("删除失败"));
+                spinner.fail(chalk_1.default.red("Deletion failed"));
                 throw error;
             }
             return;
         }
-        // 情况 4: 没有指定名称也没有 --all 或 --list，显示使用说明
-        console.log(chalk_1.default.yellow("未指定要移除的参考代码。"));
+        // 情况 4: 未指定名称、--all 或 --list，显示用法
+        console.log(chalk_1.default.yellow("No reference code specified to remove."));
         console.log();
-        console.log("用法:");
-        console.log(`  ${chalk_1.default.cyan("grf unload <name>")}        移除指定的参考代码`);
-        console.log(`  ${chalk_1.default.cyan("grf unload --all")}         移除所有参考代码`);
-        console.log(`  ${chalk_1.default.cyan("grf unload --list")}        列出所有已加载的参考代码`);
-        console.log(`  ${chalk_1.default.cyan("grf unload --clean-empty")} 清理空目录结构`);
+        console.log("Usage:");
+        console.log(`  ${chalk_1.default.cyan("grf unload <name>")}        Remove specific reference code`);
+        console.log(`  ${chalk_1.default.cyan("grf unload --all")}         Remove all reference code`);
+        console.log(`  ${chalk_1.default.cyan("grf unload --list")}        List all loaded reference code`);
+        console.log(`  ${chalk_1.default.cyan("grf unload --clean-empty")} Clean empty directory structures`);
         console.log();
-        console.log(`使用 '${chalk_1.default.cyan("grf unload --list")}' 查看所有已加载的参考代码。`);
+        console.log(`Use '${chalk_1.default.cyan("grf unload --list")}' to see all loaded reference code.`);
     }
     catch (error) {
-        if (error instanceof index_js_1.GrfError) {
-            console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} ${error.message}`));
-            if (error.code === index_js_1.ErrorCode.FS_PERMISSION_DENIED) {
-                console.error(chalk_1.default.gray(`  权限被拒绝，请检查文件权限。`));
-            }
-        }
-        else if (error instanceof Error) {
-            console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} ${error.message}`));
-        }
-        else {
-            console.error(chalk_1.default.red(`${chalk_1.default.bold("✗")} 发生未知错误`));
-        }
-        process.exit(1);
+        (0, error_js_1.handleError)(error, { exit: true });
     }
 });
 //# sourceMappingURL=unload.js.map