@antaif3ng/til-work 0.3.0 → 0.4.0

package/dist/core/system-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../../src/core/system-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EACN,UAAU,EACV,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,GAG3B,MAAM,aAAa,CAAC;AAarB,MAAM,gBAAgB,GAA2B;IAChD,IAAI,EAAE,mDAAmD;IACzD,IAAI,EAAE,mJAAmJ;IACzJ,KAAK,EAAE,2BAA2B;IAClC,IAAI,EAAE,2DAA2D;IACjE,WAAW,EAAE,wDAAwD;IACrE,YAAY,EAAE,kEAAkE;IAChF,UAAU,EAAE,+EAA+E;IAC3F,SAAS,EAAE,kDAAkD;IAC7D,UAAU,EAAE,sFAAsF;IAClG,QAAQ,EAAE,4KAA4K;IACtL,OAAO,EAAE,iJAAiJ;CAC1J,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,OAA4B;IAC7D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,SAAS,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;SACrD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,QAAQ,CAAC,IAAI,CAAC;;;;;;;;;0EAS2D,CAAC,CAAC;IAE3E,QAAQ,CAAC,IAAI,CAAC;;EAEb,SAAS,EAAE,CAAC,CAAC;IAEd,QAAQ,CAAC,IAAI,CAAC;;;;;;;;;;;;mSAYoR,CAAC,CAAC;IAEpS,IAAI,kBAAkB,EAAE,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,6BAA6B,kBAAkB,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,6DAA6D;IAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAElD,8BAA8B;IAC9B,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAC/D,IAAI,YAAY;QAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE9C,uEAAuE;IACvE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,WAAW;YAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC;;kBAEG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;kBACtC,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE;uBAC1B,GAAG;QAClB,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE;aACtC,OAAO,CAAC,OAAO;UAClB,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ;WACrB,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../../src/core/system-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EACN,UAAU,EACV,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,GAG3B,MAAM,aAAa,CAAC;AAarB,MAAM,gBAAgB,GAA2B;IAChD,IAAI,EAAE,mDAAmD;IACzD,IAAI,EAAE,mJAAmJ;IACzJ,KAAK,EAAE,2BAA2B;IAClC,IAAI,EAAE,2DAA2D;IACjE,WAAW,EAAE,wDAAwD;IACrE,YAAY,EAAE,kEAAkE;IAChF,UAAU,EAAE,+EAA+E;IAC3F,SAAS,EAAE,kDAAkD;IAC7D,UAAU,EAAE,sFAAsF;IAClG,QAAQ,EAAE,4KAA4K;IACtL,OAAO,EAAE,kUAAkU;CAC3U,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,OAA4B;IAC7D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,SAAS,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;SACrD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,QAAQ,CAAC,IAAI,CAAC;;;;;;;;;0EAS2D,CAAC,CAAC;IAE3E,QAAQ,CAAC,IAAI,CAAC;;EAEb,SAAS,EAAE,CAAC,CAAC;IAEd,QAAQ,CAAC,IAAI,CAAC;;;;;;;;;;;;mSAYoR,CAAC,CAAC;IAEpS,IAAI,kBAAkB,EAAE,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,6BAA6B,kBAAkB,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,6DAA6D;IAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAElD,8BAA8B;IAC9B,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAC/D,IAAI,YAAY;QAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE9C,uEAAuE;IACvE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,WAAW;YAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC;;kBAEG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;kBACtC,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE;uBAC1B,GAAG;QAClB,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE;aACtC,OAAO,CAAC,OAAO;UAClB,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ;WACrB,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC"}

package/dist/modes/interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/modes/interactive.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAgSrE,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAqjB/E"}
+{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/modes/interactive.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiSrE,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAqpB/E"}

package/dist/modes/interactive.js

@@ -5,7 +5,7 @@ import * as readline from "node:readline";
 import { readFileSync } from "node:fs";
 import chalk from "chalk";
 import { TilSession } from "../core/session.js";
-import { getConfigPath, loadConfig, saveConfig } from "../core/config.js";
+import { getConfigPath, loadConfig, saveConfig, saveProjectMcpServers, loadProjectMcpServers } from "../core/config.js";
 import { VERSION } from "../version.js";
 import { createToolCallRequestHandler } from "../core/tool-permissions.js";
 import { formatTokenCount } from "../core/pricing.js";
@@ -16,8 +16,8 @@ const COMMANDS = {
     "/help": "显示帮助信息",
     "/clear": "清空对话历史",
     "/model": "查看/切换/管理模型",
-    "/skills": "查看已加载的技能",
-    "/mcp": "查看已连接的 MCP 服务和工具",
+    "/skills": "查看/管理技能 (reload/install/enable/disable/rm)",
+    "/mcp": "查看/管理 MCP 服务 (add/rm/reload)",
     "/extensions": "查看已加载的扩展和 MCP 服务",
     "/memory": "查看当前记忆内容",
     "/sessions": "查看历史会话列表",
@@ -471,6 +471,114 @@ export async function runInteractiveMode(options) {
                 resetMenu(menu);
             }
         }
+        else if (line.startsWith("/mcp ")) {
+            const mcpSub = line.slice("/mcp ".length);
+            if (!mcpSub.includes(" ")) {
+                const mcpSubcmds = [
+                    { label: "add", detail: "添加 MCP 服务", value: "/mcp add " },
+                    { label: "rm", detail: "删除 MCP 服务", value: "/mcp rm " },
+                    { label: "reload", detail: "重载所有 MCP 服务", value: "/mcp reload" },
+                ];
+                const filtered = mcpSub ? mcpSubcmds.filter((e) => e.label.startsWith(mcpSub)) : mcpSubcmds;
+                if (filtered.length > 0) {
+                    menu.visible = true;
+                    menu.items = filtered;
+                    menu.type = "command";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else if (mcpSub.startsWith("rm ")) {
+                const nameFilter = mcpSub.slice("rm ".length);
+                const mcpExt = session.extensionRunner?.loadedExtensions.find((e) => e.name === "mcp");
+                const serverNames = new Set();
+                if (mcpExt) {
+                    for (const key of mcpExt.tools.keys()) {
+                        const parts = key.split("_");
+                        if (parts.length >= 3 && parts[0] === "mcp")
+                            serverNames.add(parts[1]);
+                    }
+                }
+                if (session.config.mcpServers) {
+                    for (const name of Object.keys(session.config.mcpServers))
+                        serverNames.add(name);
+                }
+                const entries = [...serverNames]
+                    .filter((n) => !nameFilter || n.startsWith(nameFilter))
+                    .map((n) => ({ label: n, detail: "MCP 服务", value: `/mcp rm ${n}` }));
+                if (entries.length > 0) {
+                    menu.visible = true;
+                    menu.items = entries;
+                    menu.type = "command";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else {
+                resetMenu(menu);
+            }
+        }
+        else if (line.startsWith("/skills ")) {
+            const skillsSub = line.slice("/skills ".length);
+            if (!skillsSub.includes(" ")) {
+                const skillSubcmds = [
+                    { label: "reload", detail: "重新扫描并加载技能", value: "/skills reload" },
+                    { label: "install", detail: "安装技能", value: "/skills install " },
+                    { label: "enable", detail: "启用技能", value: "/skills enable " },
+                    { label: "disable", detail: "禁用技能", value: "/skills disable " },
+                    { label: "rm", detail: "删除技能文件", value: "/skills rm " },
+                ];
+                const filtered = skillsSub ? skillSubcmds.filter((e) => e.label.startsWith(skillsSub)) : skillSubcmds;
+                if (filtered.length > 0) {
+                    menu.visible = true;
+                    menu.items = filtered;
+                    menu.type = "command";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else if (skillsSub.startsWith("enable ")) {
+                const nameFilter = skillsSub.slice("enable ".length);
+                const disabled = session.config.disabledSkills ?? [];
+                const entries = disabled
+                    .filter((n) => !nameFilter || n.startsWith(nameFilter))
+                    .map((n) => ({ label: n, detail: "已禁用", value: `/skills enable ${n}` }));
+                if (entries.length > 0) {
+                    menu.visible = true;
+                    menu.items = entries;
+                    menu.type = "command";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else if (skillsSub.startsWith("disable ") || skillsSub.startsWith("rm ")) {
+                const cmd = skillsSub.startsWith("disable ") ? "disable" : "rm";
+                const nameFilter = skillsSub.slice(cmd.length + 1);
+                const entries = session.skills
+                    .filter((s) => !nameFilter || s.name.startsWith(nameFilter))
+                    .map((s) => ({ label: s.name, detail: s.source, value: `/skills ${cmd} ${s.name}` }));
+                if (entries.length > 0) {
+                    menu.visible = true;
+                    menu.items = entries;
+                    menu.type = "command";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else {
+                resetMenu(menu);
+            }
+        }
         else if (line.startsWith("/") && !line.includes(" ")) {
             const filtered = filterEntries(allEntries, line);
             if (filtered.length > 0) {
@@ -736,6 +844,8 @@ export async function runInteractiveMode(options) {
         }
     });
     rl.on("close", () => {
+        clearBelowArea(below, getCursorCol());
+        below.active = false;
         printExitMessage(session).finally(() => process.exit(0));
     });
     // Main REPL loop
@@ -961,61 +1071,334 @@ async function handleCommand(input, session) {
             break;
         }
         case "/skills": {
-            const skills = session.skills;
-            if (skills.length === 0) {
-                console.log(chalk.dim("\n  暂无技能。将 SKILL.md 文件放入 ~/.til/skills/ 或 .til/skills/ 即可加载。\n"));
+            const sub = args[0];
+            if (!sub) {
+                const skills = session.skills;
+                const cfg = await loadConfig();
+                const disabledSkills = cfg.disabledSkills ?? [];
+                const totalCount = skills.length + disabledSkills.length;
+                if (totalCount === 0) {
+                    console.log(chalk.dim("\n  暂无技能。将 SKILL.md 文件放入 ~/.til/skills/ 或 .til/skills/ 即可加载。\n"));
+                }
+                else {
+                    const sourceLabel = { builtin: "内置", user: "用户", project: "项目", path: "路径" };
+                    console.log(chalk.bold(`\n已加载技能 (${skills.length}):\n`));
+                    for (const s of skills) {
+                        const tag = chalk.dim(`[${sourceLabel[s.source] || s.source}]`);
+                        console.log(`  ${chalk.green("●")} ${chalk.cyan(s.name.padEnd(24))} ${tag} ${chalk.dim(s.description.slice(0, 50))}`);
+                    }
+                    if (disabledSkills.length > 0) {
+                        console.log(chalk.bold(`\n已禁用技能 (${disabledSkills.length}):\n`));
+                        for (const name of disabledSkills) {
+                            console.log(`  ${chalk.red("○")} ${chalk.dim(name)}`);
+                        }
+                    }
+                }
+                console.log(chalk.dim("\n  /skill:<名称>              查看技能详情"));
+                console.log(chalk.dim("  /skills reload              重新扫描并加载技能"));
+                console.log(chalk.dim("  /skills install <source>    安装技能 (npx skills add)"));
+                console.log(chalk.dim("  /skills enable <name>       启用已禁用的技能"));
+                console.log(chalk.dim("  /skills disable <name>      禁用技能"));
+                console.log(chalk.dim("  /skills rm <name>           删除技能文件\n"));
+                break;
             }
-            else {
-                const sourceLabel = { builtin: "内置", user: "用户", project: "项目", path: "路径" };
-                console.log(chalk.bold(`\n已加载技能 (${skills.length}):\n`));
-                for (const s of skills) {
-                    const tag = chalk.dim(`[${sourceLabel[s.source] || s.source}]`);
-                    console.log(`  ${chalk.cyan(s.name.padEnd(24))} ${tag} ${chalk.dim(s.description.slice(0, 50))}`);
-                }
-                console.log(chalk.dim("\n  使用 /skill:<名称> 查看技能详情。"));
-                console.log(chalk.dim("  自定义: ~/.til/skills/ 或 .til/skills/\n"));
+            if (sub === "reload") {
+                const reloadSpinner = new Spinner("正在重新加载技能...");
+                reloadSpinner.start();
+                try {
+                    await session.reloadSkills();
+                    reloadSpinner.stop(chalk.green(`  ✓ 技能已重载 (${session.skills.length} 个)`));
+                }
+                catch (err) {
+                    reloadSpinner.stop(chalk.red(`  ✗ 重载失败: ${err.message}`));
+                }
+                console.log();
+                break;
             }
+            if (sub === "install") {
+                const source = args[1];
+                if (!source) {
+                    console.log(chalk.red("\n  用法: /skills install <source>"));
+                    console.log(chalk.dim("  示例: /skills install ivangdavila/excel-xlsx\n"));
+                    break;
+                }
+                console.log(chalk.dim(`\n  正在安装技能: ${source}...`));
+                const { execSync } = await import("node:child_process");
+                try {
+                    const output = execSync(`npx skills add ${source} -g -y`, {
+                        encoding: "utf-8",
+                        timeout: 60000,
+                        cwd: session.cwd,
+                    });
+                    console.log(chalk.green(`  ✓ 安装完成`));
+                    if (output.trim())
+                        console.log(chalk.dim(`  ${output.trim()}`));
+                    await session.reloadSkills();
+                    console.log(chalk.dim(`  已重载 (${session.skills.length} 个技能)\n`));
+                }
+                catch (err) {
+                    console.log(chalk.red(`  ✗ 安装失败: ${err.message}\n`));
+                }
+                break;
+            }
+            if (sub === "enable") {
+                const name = args[1];
+                if (!name) {
+                    console.log(chalk.red("\n  用法: /skills enable <name>\n"));
+                    break;
+                }
+                const cfg = await loadConfig();
+                const disabled = cfg.disabledSkills ?? [];
+                if (!disabled.includes(name)) {
+                    console.log(chalk.yellow(`\n  技能 "${name}" 未被禁用\n`));
+                    break;
+                }
+                cfg.disabledSkills = disabled.filter((n) => n !== name);
+                await saveConfig(cfg);
+                await session.reloadSkills();
+                console.log(chalk.green(`\n  已启用技能: ${name} (当前 ${session.skills.length} 个)\n`));
+                break;
+            }
+            if (sub === "disable") {
+                const name = args[1];
+                if (!name) {
+                    console.log(chalk.red("\n  用法: /skills disable <name>\n"));
+                    break;
+                }
+                const skill = session.skills.find((s) => s.name === name);
+                if (!skill) {
+                    console.log(chalk.yellow(`\n  技能 "${name}" 未找到或已禁用\n`));
+                    break;
+                }
+                const cfg = await loadConfig();
+                if (!cfg.disabledSkills)
+                    cfg.disabledSkills = [];
+                if (!cfg.disabledSkills.includes(name)) {
+                    cfg.disabledSkills.push(name);
+                }
+                await saveConfig(cfg);
+                await session.reloadSkills();
+                console.log(chalk.green(`\n  已禁用技能: ${name} (当前 ${session.skills.length} 个)\n`));
+                break;
+            }
+            if (sub === "rm") {
+                const name = args[1];
+                if (!name) {
+                    console.log(chalk.red("\n  用法: /skills rm <name>\n"));
+                    break;
+                }
+                const { loadSkills: loadAllSkills } = await import("../core/skills.js");
+                const allResult = loadAllSkills({ cwd: session.cwd, includeDefaults: true });
+                const target = allResult.skills.find((s) => s.name === name);
+                if (!target) {
+                    console.log(chalk.yellow(`\n  技能 "${name}" 未找到\n`));
+                    break;
+                }
+                if (target.source === "builtin") {
+                    console.log(chalk.red(`\n  内置技能不能删除，使用 /skills disable ${name} 禁用\n`));
+                    break;
+                }
+                const { unlink } = await import("node:fs/promises");
+                try {
+                    await unlink(target.filePath);
+                    console.log(chalk.green(`\n  已删除: ${target.filePath}`));
+                    // Also remove from disabled list if present
+                    const cfg = await loadConfig();
+                    if (cfg.disabledSkills?.includes(name)) {
+                        cfg.disabledSkills = cfg.disabledSkills.filter((n) => n !== name);
+                        await saveConfig(cfg);
+                    }
+                    await session.reloadSkills();
+                    console.log(chalk.dim(`  已重载 (${session.skills.length} 个技能)\n`));
+                }
+                catch (err) {
+                    console.log(chalk.red(`\n  删除失败: ${err.message}\n`));
+                }
+                break;
+            }
+            console.log(chalk.yellow(`\n  未知子命令: ${sub}。使用 /skills 查看帮助。\n`));
             break;
         }
         case "/mcp": {
-            const cfg = await loadConfig();
-            const mcpServers = cfg.mcpServers ?? {};
-            const serverNames = Object.keys(mcpServers);
-            if (serverNames.length === 0) {
-                console.log(chalk.dim("\n  暂无 MCP 服务。\n"));
-                console.log(chalk.dim("  在 ~/.til/config.json 中配置 mcpServers:"));
-                console.log(chalk.dim('  { "mcpServers": { "name": { "transport": "streamable_http", "url": "..." } } }\n'));
+            const sub = args[0];
+            if (!sub) {
+                // Display MCP status
+                const cfg = await loadConfig();
+                const globalMcp = cfg.mcpServers ?? {};
+                const projectMcp = loadProjectMcpServers(session.cwd);
+                const mergedMcp = { ...globalMcp, ...projectMcp };
+                const serverNames = Object.keys(mergedMcp);
+                if (serverNames.length === 0) {
+                    console.log(chalk.dim("\n  暂无 MCP 服务。\n"));
+                    console.log(chalk.dim("  使用 /mcp add 添加服务，或在 ~/.til/config.json 中配置 mcpServers。\n"));
+                }
+                else {
+                    const mcpExt = session.extensionRunner?.loadedExtensions.find((e) => e.name === "mcp");
+                    const mcpTools = mcpExt ? [...mcpExt.tools.keys()] : [];
+                    console.log(chalk.bold(`\nMCP 服务 (${serverNames.length}):\n`));
+                    for (const name of serverNames) {
+                        const server = mergedMcp[name];
+                        const isProject = name in projectMcp;
+                        const rawTransport = server.transport ?? server.type;
+                        const transport = (rawTransport === "http" || rawTransport === "streamable_http" || rawTransport === "sse")
+                            ? "http"
+                            : rawTransport === "stdio" ? "stdio"
+                                : server.url ? "http" : "stdio";
+                        const serverTools = mcpTools.filter((t) => t.startsWith(`mcp_${name}_`));
+                        const status = serverTools.length > 0 ? chalk.green("✓ 已连接") : chalk.red("✗ 未连接");
+                        const scope = isProject ? chalk.yellow("[项目]") : chalk.dim("[全局]");
+                        console.log(`  ${chalk.cyan(name.padEnd(20))} ${status}  ${chalk.dim(transport)}  ${scope}`);
+                        if (server.url)
+                            console.log(`    ${chalk.dim("URL:")} ${server.url}`);
+                        if (server.command)
+                            console.log(`    ${chalk.dim("CMD:")} ${server.command} ${(server.args ?? []).join(" ")}`);
+                        if (serverTools.length > 0) {
+                            console.log(`    ${chalk.dim(`工具 (${serverTools.length}):`)}`);
+                            for (const toolKey of serverTools) {
+                                const shortName = toolKey.replace(`mcp_${name}_`, "");
+                                const toolDef = mcpExt?.tools.get(toolKey);
+                                const desc = toolDef ? chalk.dim(` — ${(toolDef.description ?? "").slice(0, 50)}`) : "";
+                                console.log(`      ${chalk.white(shortName)}${desc}`);
+                            }
+                        }
+                        console.log();
+                    }
+                }
+                console.log(chalk.dim(`  /mcp add <name> --stdio <cmd> [args...]           添加 stdio 服务`));
+                console.log(chalk.dim(`  /mcp add <name> --url <url> [-H key:value ...]     添加 HTTP 服务`));
+                console.log(chalk.dim(`  /mcp add <name> ... --project                      添加到项目级配置`));
+                console.log(chalk.dim(`  /mcp rm <name>                                     删除服务`));
+                console.log(chalk.dim(`  /mcp reload                                        重载所有服务\n`));
+                break;
             }
-            else {
-                const mcpExt = session.extensionRunner?.loadedExtensions.find((e) => e.name === "mcp");
-                const mcpTools = mcpExt ? [...mcpExt.tools.keys()] : [];
-                console.log(chalk.bold(`\nMCP 服务 (${serverNames.length}):\n`));
-                for (const name of serverNames) {
-                    const server = mcpServers[name];
-                    const rawTransport = server.transport ?? server.type;
-                    const transport = (rawTransport === "http" || rawTransport === "streamable_http" || rawTransport === "sse")
-                        ? "http"
-                        : rawTransport === "stdio" ? "stdio"
-                            : server.url ? "http" : "stdio";
-                    const serverTools = mcpTools.filter((t) => t.startsWith(`mcp_${name}_`));
-                    const status = serverTools.length > 0 ? chalk.green("✓ 已连接") : chalk.red("✗ 未连接");
-                    console.log(`  ${chalk.cyan(name.padEnd(20))} ${status}  ${chalk.dim(transport)}`);
-                    if (server.url)
-                        console.log(`    ${chalk.dim("URL:")} ${server.url}`);
-                    if (server.command)
-                        console.log(`    ${chalk.dim("CMD:")} ${server.command} ${(server.args ?? []).join(" ")}`);
-                    if (serverTools.length > 0) {
-                        console.log(`    ${chalk.dim(`工具 (${serverTools.length}):`)}`);
-                        for (const toolKey of serverTools) {
-                            const shortName = toolKey.replace(`mcp_${name}_`, "");
-                            const toolDef = mcpExt?.tools.get(toolKey);
-                            const desc = toolDef ? chalk.dim(` — ${(toolDef.description ?? "").slice(0, 50)}`) : "";
-                            console.log(`      ${chalk.white(shortName)}${desc}`);
+            if (sub === "add") {
+                const name = args[1];
+                if (!name) {
+                    console.log(chalk.red("\n  用法:"));
+                    console.log(chalk.dim("    /mcp add <name> --stdio <command> [args...]"));
+                    console.log(chalk.dim("    /mcp add <name> --url <url> [-H key:value ...]"));
+                    console.log(chalk.dim("    添加 --project 存入项目级配置\n"));
+                    break;
+                }
+                const restArgs = args.slice(2);
+                const isProject = restArgs.includes("--project");
+                const filteredArgs = restArgs.filter((a) => a !== "--project");
+                let serverConfig = null;
+                if (filteredArgs.includes("--stdio")) {
+                    const stdioIdx = filteredArgs.indexOf("--stdio");
+                    const command = filteredArgs[stdioIdx + 1];
+                    if (!command) {
+                        console.log(chalk.red("\n  --stdio 后需要指定命令\n"));
+                        break;
+                    }
+                    const cmdArgs = filteredArgs.slice(stdioIdx + 2).filter((a) => !a.startsWith("-H"));
+                    const env = {};
+                    // Parse -E key=value for env vars
+                    for (let i = 0; i < filteredArgs.length; i++) {
+                        if (filteredArgs[i] === "-E" && filteredArgs[i + 1]) {
+                            const [k, ...vParts] = filteredArgs[i + 1].split("=");
+                            if (k)
+                                env[k] = vParts.join("=");
+                        }
+                    }
+                    serverConfig = {
+                        transport: "stdio",
+                        command,
+                        args: cmdArgs.length > 0 ? cmdArgs : undefined,
+                        env: Object.keys(env).length > 0 ? env : undefined,
+                    };
+                }
+                else if (filteredArgs.includes("--url")) {
+                    const urlIdx = filteredArgs.indexOf("--url");
+                    const url = filteredArgs[urlIdx + 1];
+                    if (!url) {
+                        console.log(chalk.red("\n  --url 后需要指定 URL\n"));
+                        break;
+                    }
+                    const headers = {};
+                    for (let i = 0; i < filteredArgs.length; i++) {
+                        if (filteredArgs[i] === "-H" && filteredArgs[i + 1]) {
+                            const colonIdx = filteredArgs[i + 1].indexOf(":");
+                            if (colonIdx > 0) {
+                                const key = filteredArgs[i + 1].slice(0, colonIdx).trim();
+                                const value = filteredArgs[i + 1].slice(colonIdx + 1).trim();
+                                headers[key] = value;
+                            }
                         }
                     }
-                    console.log();
+                    serverConfig = {
+                        transport: "streamable_http",
+                        url,
+                        headers: Object.keys(headers).length > 0 ? headers : undefined,
+                    };
+                }
+                else {
+                    console.log(chalk.red("\n  需要指定 --stdio 或 --url\n"));
+                    break;
+                }
+                if (serverConfig) {
+                    if (isProject) {
+                        const projectServers = loadProjectMcpServers(session.cwd);
+                        projectServers[name] = serverConfig;
+                        await saveProjectMcpServers(session.cwd, projectServers);
+                        console.log(chalk.green(`\n  已添加 MCP 服务: ${name} (项目级)`));
+                    }
+                    else {
+                        const cfg = await loadConfig();
+                        if (!cfg.mcpServers)
+                            cfg.mcpServers = {};
+                        cfg.mcpServers[name] = serverConfig;
+                        await saveConfig(cfg);
+                        console.log(chalk.green(`\n  已添加 MCP 服务: ${name} (全局)`));
+                    }
+                    console.log(chalk.dim(`  使用 /mcp reload 激活\n`));
+                }
+                break;
+            }
+            if (sub === "rm") {
+                const name = args[1];
+                if (!name) {
+                    console.log(chalk.red("\n  用法: /mcp rm <name>\n"));
+                    break;
+                }
+                let removed = false;
+                const cfg = await loadConfig();
+                if (cfg.mcpServers?.[name]) {
+                    delete cfg.mcpServers[name];
+                    await saveConfig(cfg);
+                    removed = true;
+                }
+                const projectServers = loadProjectMcpServers(session.cwd);
+                if (projectServers[name]) {
+                    delete projectServers[name];
+                    await saveProjectMcpServers(session.cwd, projectServers);
+                    removed = true;
+                }
+                if (removed) {
+                    console.log(chalk.green(`\n  已删除 MCP 服务: ${name}`));
+                    console.log(chalk.dim(`  使用 /mcp reload 使变更生效\n`));
                 }
+                else {
+                    console.log(chalk.red(`\n  MCP 服务 "${name}" 不存在\n`));
+                }
+                break;
+            }
+            if (sub === "reload") {
+                const reloadSpinner = new Spinner("正在重载 MCP 服务...");
+                reloadSpinner.start();
+                try {
+                    await session.reloadMcpServers();
+                    const mcpExt = session.extensionRunner?.loadedExtensions.find((e) => e.name === "mcp");
+                    const toolCount = mcpExt ? mcpExt.tools.size : 0;
+                    reloadSpinner.stop(chalk.green(`  ✓ MCP 服务已重载 (${toolCount} 个工具)`));
+                }
+                catch (err) {
+                    reloadSpinner.stop(chalk.red(`  ✗ 重载失败: ${err.message}`));
+                }
+                console.log();
+                break;
             }
+            console.log(chalk.yellow(`\n  未知子命令: ${sub}。使用 /mcp 查看帮助。\n`));
             break;
         }
         case "/extensions": {