@antaif3ng/til-work 0.2.0 → 0.4.0

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": "查看历史会话列表",
@@ -25,6 +25,15 @@ const COMMANDS = {
     "/config": "查看当前配置",
     "/exit": "退出 TIL",
 };
+const TIPS = [
+    "输入 / 查看所有可用命令，方向键选择",
+    "使用 /model 切换模型",
+    "按 Ctrl+C 或 Esc 中止正在执行的请求",
+    "使用 /memory 查看记忆内容",
+    "使用 /sessions 查看历史会话",
+    "输入 @ 引用文件内容（支持搜索和方向键选择）",
+    "换行: 行尾输入 \\ 再回车，或 Ctrl+J / Alt+Enter",
+];
 // ── UI helpers ──
 function getBorderWidth() {
     return Math.min(process.stdout.columns || 80, 80);
@@ -32,8 +41,16 @@ function getBorderWidth() {
 function printBorder(ch = "─") {
     console.log(chalk.dim(ch.repeat(getBorderWidth())));
 }
+function shortenDir(cwd) {
+    return cwd.replace(process.env.HOME || "", "~");
+}
 // ── Interactive Popup Menu ──
-const PROMPT_WIDTH = 3; // visible width of " › "
+const PROMPT_WIDTH = 3; // visible width of " › " or " … "
+function resetMenu(menu) {
+    menu.visible = false;
+    menu.items = [];
+    menu.selectedIndex = 0;
+}
 function getCommandEntries(session) {
     const allCmds = Object.keys(COMMANDS);
     const skillCmds = session.getSkillNames().map((n) => `/skill:${n}`);
@@ -54,13 +71,11 @@ function filterEntries(entries, filter) {
 function getModelMenuEntries(filter, session) {
     const entries = [];
     const currentId = session.model.id;
-    // Current model first
     entries.push({
         label: currentId,
         detail: "当前",
         value: `/model ${currentId}`,
     });
-    // Load config synchronously — config.models is already migrated at startup
     const cfg = session.config;
     if (cfg.models) {
         for (const [id, m] of Object.entries(cfg.models)) {
@@ -88,44 +103,63 @@ function getFileMenuEntries(prefix, cwd) {
         value: s.value,
     }));
 }
+const PLACEHOLDER = "Ctrl+J 或 \\+Enter 换行";
 /**
- * Render the popup menu below the input line using relative cursor movement.
- * Unlike \x1b[s / \x1b[u (save/restore absolute position), relative movement
- * via \x1b[nA works correctly even when the terminal scrolls during output.
+ * Render the area below the input cursor: popup menu (if any) +
+ * underline + status line. Only called at prompt start and on menu
+ * state changes — NEVER on every keystroke — so CJK IME is not disturbed.
  */
-function renderMenu(menu, cursorCol) {
-    if (!menu.visible || menu.items.length === 0)
+function renderBelowArea(menu, below, session, cursorCol) {
+    if (!below.active)
         return;
-    const totalLinesToClear = Math.max(menu.items.length, menu.renderedLines);
-    const padWidth = menu.type === "file" ? 24 : 16;
+    const menuItemCount = menu.visible && menu.items.length > 0 ? menu.items.length : 0;
+    const fixedLines = 2; // underline + status
+    const contentLines = menuItemCount + fixedLines;
+    const totalLinesToProcess = Math.max(contentLines, below.renderedLines);
+    // Pre-scroll: ensure enough vertical space below cursor so that
+    // writing \n never causes unexpected scrolling after rendering.
+    let preScroll = "";
+    for (let i = 0; i < totalLinesToProcess + 1; i++)
+        preScroll += "\n";
+    preScroll += `\x1b[${totalLinesToProcess + 1}A`;
     let output = "\n";
-    for (let i = 0; i < menu.items.length; i++) {
-        const { label, detail } = menu.items[i];
-        const isSelected = i === menu.selectedIndex;
-        if (isSelected) {
-            output += `  ${chalk.bgCyan.black(` ${label.padEnd(padWidth)}`)} ${chalk.white(detail)}`;
-        }
-        else {
-            output += `  ${chalk.cyan(` ${label.padEnd(padWidth)}`)} ${chalk.dim(detail)}`;
+    // Menu items
+    if (menuItemCount > 0) {
+        const padWidth = menu.type === "file" ? 24 : 16;
+        for (let i = 0; i < menu.items.length; i++) {
+            const { label, detail } = menu.items[i];
+            const isSelected = i === menu.selectedIndex;
+            if (isSelected) {
+                output += `  ${chalk.bgCyan.black(` ${label.padEnd(padWidth)}`)} ${chalk.white(detail)}`;
+            }
+            else {
+                output += `  ${chalk.cyan(` ${label.padEnd(padWidth)}`)} ${chalk.dim(detail)}`;
+            }
+            output += "\x1b[K\n";
         }
-        output += "\x1b[K\n";
     }
-    for (let i = menu.items.length; i < menu.renderedLines; i++) {
+    // Underline
+    output += chalk.dim("─".repeat(getBorderWidth())) + "\x1b[K\n";
+    // Status line
+    const dir = shortenDir(session.cwd);
+    output += chalk.dim(` ${dir} · Tip: ${below.tip}`) + "\x1b[K\n";
+    // Clear stale lines from previous render
+    for (let i = contentLines; i < below.renderedLines; i++) {
         output += "\x1b[K\n";
     }
-    menu.renderedLines = Math.max(menu.renderedLines, menu.items.length);
-    const linesToGoUp = 1 + totalLinesToClear;
+    below.renderedLines = contentLines;
+    const linesToGoUp = 1 + totalLinesToProcess;
     output += `\x1b[${linesToGoUp}A\r`;
     if (cursorCol > 0) {
         output += `\x1b[${cursorCol}C`;
     }
-    process.stdout.write(output);
+    process.stdout.write(preScroll + output);
 }
-function clearMenu(menu, cursorCol = 0) {
-    if (menu.renderedLines === 0)
+function clearBelowArea(below, cursorCol) {
+    if (below.renderedLines === 0)
         return;
     let output = "";
-    const totalLines = menu.renderedLines + 1;
+    const totalLines = below.renderedLines + 1;
     for (let i = 0; i < totalLines; i++) {
         output += "\n\x1b[K";
     }
@@ -134,10 +168,11 @@ function clearMenu(menu, cursorCol = 0) {
         output += `\x1b[${cursorCol}C`;
     }
     process.stdout.write(output);
-    menu.visible = false;
-    menu.items = [];
-    menu.selectedIndex = 0;
-    menu.renderedLines = 0;
+    below.renderedLines = 0;
+}
+/** Show grey placeholder text when input is empty, using cursor save/restore. */
+function showPlaceholder() {
+    process.stdout.write(`\x1b[s${chalk.dim(PLACEHOLDER)}\x1b[u`);
 }
 // ── Spinner ──
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -185,9 +220,18 @@ async function printExitMessage(session) {
     console.log(chalk.dim(`继续最近会话: ${chalk.cyan("til --continue")}`));
     await session.shutdown();
 }
+// ── Tips helper ──
+function getRandomTip(session) {
+    const tips = [...TIPS];
+    if (session.skills.length > 0)
+        tips.push("使用 /skills 查看已加载的技能");
+    const extInfo = session.getExtensionInfo();
+    if (extInfo.length > 0)
+        tips.push("使用 /extensions 查看已加载的扩展");
+    return tips[Math.floor(Math.random() * tips.length)];
+}
 // ── Main interactive mode ──
 export async function runInteractiveMode(options) {
-    // Pending permission prompts queue — resolved by the readline prompt
     let pendingPermissionResolve = null;
     const permissionPrompt = (question) => {
         return new Promise((resolve) => {
@@ -210,6 +254,10 @@ export async function runInteractiveMode(options) {
     let firstTokenReceived = false;
     let insideThinkBlock = false;
     let thinkTagBuffer = "";
+    // Multi-line input state
+    const multiLineBuffer = [];
+    // Below-area state: menu + underline + status
+    const below = { renderedLines: 0, active: false, tip: "" };
     session.subscribe((event) => {
         switch (event.type) {
             case "agent_start":
@@ -365,13 +413,11 @@ export async function runInteractiveMode(options) {
                     spinner = null;
                 }
                 isStreaming = false;
-                // Check for errors
                 const lastMsg = event.messages?.[event.messages.length - 1];
                 if (lastMsg && "stopReason" in lastMsg && lastMsg.stopReason === "error") {
                     const errText = lastMsg.errorMessage || "未知错误";
                     process.stdout.write(chalk.red(`\n  ✗ 错误: ${errText}\n`));
                 }
-                // Show per-turn usage summary
                 const turnUsage = session.getLastTurnUsageSummary();
                 const ctxInfo = session.getContextUsagePercent();
                 if (turnUsage) {
@@ -382,7 +428,7 @@ export async function runInteractiveMode(options) {
                         ctxColor = chalk.yellow;
                     process.stdout.write(chalk.dim(`\n  ${turnUsage}  ctx:${ctxColor(ctxInfo.display)}`));
                 }
-                process.stdout.write("\n");
+                process.stdout.write("\n\n");
                 break;
             }
         }
@@ -391,7 +437,6 @@ export async function runInteractiveMode(options) {
         visible: false,
         items: [],
         selectedIndex: 0,
-        renderedLines: 0,
         type: "command",
     };
     const completer = (line) => {
@@ -406,7 +451,167 @@ export async function runInteractiveMode(options) {
     const getCursorCol = () => PROMPT_WIDTH + (rl.cursor ?? 0);
     const allEntries = getCommandEntries(session);
     const originalTtyWrite = rl._ttyWrite;
+    // Helper: update menu visibility based on current line content
+    function updateMenuForLine(line, session) {
+        if (line.startsWith("/model ")) {
+            const modelFilter = line.slice("/model ".length);
+            if (!["add ", "rm ", "default "].some((sub) => modelFilter.startsWith(sub))) {
+                const entries = getModelMenuEntries(modelFilter, session);
+                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("/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) {
+                menu.visible = true;
+                menu.items = filtered;
+                menu.type = "command";
+                menu.selectedIndex = 0;
+            }
+            else {
+                resetMenu(menu);
+            }
+        }
+        else {
+            const atPrefix = extractAtPrefix(line);
+            if (atPrefix !== null) {
+                const entries = getFileMenuEntries(atPrefix, session.cwd);
+                if (entries.length > 0) {
+                    menu.visible = true;
+                    menu.items = entries;
+                    menu.type = "file";
+                    menu.selectedIndex = 0;
+                }
+                else {
+                    resetMenu(menu);
+                }
+            }
+            else {
+                resetMenu(menu);
+            }
+        }
+    }
     rl._ttyWrite = function (s, key) {
+        // ── Permission prompt passthrough ──
         if (pendingPermissionResolve && s) {
             const resolve = pendingPermissionResolve;
             pendingPermissionResolve = null;
@@ -414,6 +619,7 @@ export async function runInteractiveMode(options) {
             resolve(s);
             return;
         }
+        // ── Streaming: only Esc to abort ──
         if (isStreaming) {
             if (key && key.name === "escape") {
                 if (spinner) {
@@ -428,28 +634,55 @@ export async function runInteractiveMode(options) {
             return originalTtyWrite.call(this, s, key);
         }
         const cursorCol = getCursorCol();
+        const keyName = key?.name;
+        const isReturnKey = keyName === "return" || keyName === "enter";
+        // ── Multi-line newline insertion ──
+        // 1. Shift+Enter / Alt+Enter (terminals that report modifier flags)
+        // 2. Ctrl+J: raw char is always \n (0x0A), distinct from Enter's \r (0x0D)
+        // 3. Raw \x1b\r from Kitty shift+enter mapping or legacy Alt+Enter
+        const isNewlineInsert = (key && isReturnKey && (key.shift === true || key.meta === true)) ||
+            s === "\n" ||
+            s === "\x1b\r";
+        if (isNewlineInsert) {
+            clearBelowArea(below, cursorCol);
+            multiLineBuffer.push(rl.line ?? "");
+            process.stdout.write("\n");
+            rl.line = "";
+            rl.cursor = 0;
+            rl._prompt = chalk.cyan(" … ");
+            process.stdout.write(chalk.cyan(" … "));
+            resetMenu(menu);
+            renderBelowArea(menu, below, session, PROMPT_WIDTH);
+            return;
+        }
+        // ── Menu visible: handle navigation & selection ──
         if (menu.visible) {
-            if (key && key.name === "up") {
-                menu.selectedIndex = Math.max(0, menu.selectedIndex - 1);
-                renderMenu(menu, cursorCol);
+            if (key && keyName === "up") {
+                menu.selectedIndex = menu.selectedIndex <= 0
+                    ? menu.items.length - 1
+                    : menu.selectedIndex - 1;
+                renderBelowArea(menu, below, session, cursorCol);
                 return;
             }
-            if (key && key.name === "down") {
-                menu.selectedIndex = Math.min(menu.items.length - 1, menu.selectedIndex + 1);
-                renderMenu(menu, cursorCol);
+            if (key && keyName === "down") {
+                menu.selectedIndex = menu.selectedIndex >= menu.items.length - 1
+                    ? 0
+                    : menu.selectedIndex + 1;
+                renderBelowArea(menu, below, session, cursorCol);
                 return;
             }
-            if (key && (key.name === "return" || key.name === "tab")) {
+            if (key && (isReturnKey || keyName === "tab")) {
                 const selected = menu.items[menu.selectedIndex];
                 const menuType = menu.type;
                 if (selected) {
-                    clearMenu(menu, cursorCol);
+                    resetMenu(menu);
                     if (menuType === "command") {
                         rl.line = "";
                         rl.cursor = 0;
                         process.stdout.write("\r\x1b[K");
                         process.stdout.write(chalk.cyan(" › "));
-                        if (key.name === "return") {
+                        if (isReturnKey) {
+                            clearBelowArea(below, PROMPT_WIDTH);
                             rl.line = selected.value;
                             rl.cursor = selected.value.length;
                             process.stdout.write(selected.value);
@@ -459,6 +692,7 @@ export async function runInteractiveMode(options) {
                             rl.line = selected.value;
                             rl.cursor = selected.value.length;
                             process.stdout.write(selected.value);
+                            renderBelowArea(menu, below, session, getCursorCol());
                             return;
                         }
                     }
@@ -475,68 +709,87 @@ export async function runInteractiveMode(options) {
                             process.stdout.write(chalk.cyan(" › "));
                             process.stdout.write(newLine);
                         }
+                        renderBelowArea(menu, below, session, getCursorCol());
                         return;
                     }
                 }
             }
-            if (key && key.name === "escape") {
-                clearMenu(menu, cursorCol);
+            if (key && keyName === "escape") {
+                resetMenu(menu);
+                renderBelowArea(menu, below, session, cursorCol);
                 return;
             }
         }
-        originalTtyWrite.call(this, s, key);
-        const newLine = rl.line ?? "";
-        const newCursorCol = getCursorCol();
-        if (newLine.startsWith("/model ")) {
-            const modelFilter = newLine.slice("/model ".length);
-            if (!["add ", "rm ", "default "].some((sub) => modelFilter.startsWith(sub))) {
-                const entries = getModelMenuEntries(modelFilter, session);
-                if (entries.length > 0) {
-                    menu.visible = true;
-                    menu.items = entries;
-                    menu.type = "command";
-                    menu.selectedIndex = 0;
-                    renderMenu(menu, newCursorCol);
+        // ── Escape: cancel multi-line or ignore ──
+        if (key && keyName === "escape") {
+            if (multiLineBuffer.length > 0) {
+                clearBelowArea(below, cursorCol);
+                for (let i = 0; i < multiLineBuffer.length; i++) {
+                    process.stdout.write("\x1b[1A\x1b[2K");
                 }
-                else if (menu.visible) {
-                    clearMenu(menu, newCursorCol);
-                }
-            }
-            else if (menu.visible) {
-                clearMenu(menu, newCursorCol);
+                process.stdout.write("\r\x1b[K");
+                multiLineBuffer.length = 0;
+                rl.line = "";
+                rl.cursor = 0;
+                rl._prompt = chalk.cyan(" › ");
+                process.stdout.write(chalk.cyan(" › "));
+                renderBelowArea(menu, below, session, PROMPT_WIDTH);
+                showPlaceholder();
+                return;
             }
+            return;
         }
-        else if (newLine.startsWith("/") && !newLine.includes(" ")) {
-            const filtered = filterEntries(allEntries, newLine);
-            if (filtered.length > 0) {
-                menu.visible = true;
-                menu.items = filtered;
-                menu.type = "command";
-                menu.selectedIndex = 0;
-                renderMenu(menu, newCursorCol);
+        // ── Enter: submit or backslash-newline ──
+        if (key && isReturnKey) {
+            const currentLine = rl.line ?? "";
+            const cursor = rl.cursor ?? 0;
+            // Backslash+Enter → newline (pi-mono style, works in ALL terminals)
+            if (cursor > 0 && currentLine[cursor - 1] === "\\") {
+                clearBelowArea(below, cursorCol);
+                const before = currentLine.slice(0, cursor - 1);
+                const after = currentLine.slice(cursor);
+                multiLineBuffer.push(before + after);
+                process.stdout.write("\n");
+                rl.line = "";
+                rl.cursor = 0;
+                rl._prompt = chalk.cyan(" … ");
+                process.stdout.write(chalk.cyan(" … "));
+                resetMenu(menu);
+                renderBelowArea(menu, below, session, PROMPT_WIDTH);
+                return;
             }
-            else if (menu.visible) {
-                clearMenu(menu, newCursorCol);
+            // Normal submit
+            clearBelowArea(below, cursorCol);
+            below.active = false;
+            if (multiLineBuffer.length > 0) {
+                const fullInput = [...multiLineBuffer, currentLine].join("\n");
+                multiLineBuffer.length = 0;
+                rl.line = fullInput;
+                rl.cursor = fullInput.length;
+                rl._prompt = chalk.cyan(" › ");
             }
+            originalTtyWrite.call(this, s, key);
+            return;
         }
-        else {
-            const atPrefix = extractAtPrefix(newLine);
-            if (atPrefix !== null) {
-                const entries = getFileMenuEntries(atPrefix, session.cwd);
-                if (entries.length > 0) {
-                    menu.visible = true;
-                    menu.items = entries;
-                    menu.type = "file";
-                    menu.selectedIndex = 0;
-                    renderMenu(menu, newCursorCol);
-                }
-                else if (menu.visible) {
-                    clearMenu(menu, newCursorCol);
-                }
-            }
-            else if (menu.visible) {
-                clearMenu(menu, newCursorCol);
-            }
+        // ── Normal key processing ──
+        const prevMenuVisible = menu.visible;
+        const prevMenuItemCount = menu.items.length;
+        const prevLine = rl.line ?? "";
+        originalTtyWrite.call(this, s, key);
+        const newLine = rl.line ?? "";
+        updateMenuForLine(newLine, session);
+        // Clear placeholder remnants when first character is typed
+        if (prevLine.length === 0 && newLine.length > 0) {
+            process.stdout.write("\x1b[K");
+        }
+        const menuChanged = menu.visible !== prevMenuVisible ||
+            (menu.visible && menu.items.length !== prevMenuItemCount);
+        if (menuChanged) {
+            renderBelowArea(menu, below, session, getCursorCol());
+        }
+        // Re-show placeholder when input is empty
+        if (newLine.length === 0 && multiLineBuffer.length === 0 && !menu.visible) {
+            showPlaceholder();
         }
     };
     if (process.stdin.isTTY) {
@@ -544,13 +797,22 @@ export async function runInteractiveMode(options) {
     }
     const promptUser = () => {
         return new Promise((resolve) => {
-            clearMenu(menu);
+            clearBelowArea(below, 0);
+            resetMenu(menu);
+            multiLineBuffer.length = 0;
+            below.active = true;
+            below.tip = getRandomTip(session);
+            console.log();
             printBorder();
             rl.question(chalk.cyan(" › "), (answer) => {
-                clearMenu(menu);
+                clearBelowArea(below, getCursorCol());
+                below.active = false;
                 printBorder();
                 resolve(answer);
             });
+            // Render placeholder + underline + status below input
+            showPlaceholder();
+            renderBelowArea(menu, below, session, PROMPT_WIDTH);
         });
     };
     process.on("SIGINT", () => {
@@ -563,11 +825,27 @@ export async function runInteractiveMode(options) {
             process.stdout.write(chalk.yellow("\n⚡ 已中止 (Ctrl+C)\n"));
             printSessionTip(session);
         }
+        else if (multiLineBuffer.length > 0) {
+            clearBelowArea(below, getCursorCol());
+            for (let i = 0; i < multiLineBuffer.length; i++) {
+                process.stdout.write("\x1b[1A\x1b[2K");
+            }
+            process.stdout.write("\r\x1b[K");
+            multiLineBuffer.length = 0;
+            rl.line = "";
+            rl.cursor = 0;
+            rl._prompt = chalk.cyan(" › ");
+            process.stdout.write(chalk.cyan(" › "));
+            showPlaceholder();
+            renderBelowArea(menu, below, session, PROMPT_WIDTH);
+        }
         else {
             console.log(chalk.dim("\n(输入 /exit 或 Ctrl+D 退出)"));
         }
     });
     rl.on("close", () => {
+        clearBelowArea(below, getCursorCol());
+        below.active = false;
         printExitMessage(session).finally(() => process.exit(0));
     });
     // Main REPL loop
@@ -585,9 +863,10 @@ export async function runInteractiveMode(options) {
             continue;
         }
         try {
-            // Expand @path references into file contents
             const { expandedText, fileContent } = extractAtReferences(trimmed, session.cwd);
-            const finalInput = fileContent ? fileContent + "\n" + expandedText : expandedText;
+            const finalInput = fileContent
+                ? `${expandedText}\n\n<referenced_files>\n${fileContent}</referenced_files>`
+                : expandedText;
             await session.prompt(finalInput);
         }
         catch (err) {
@@ -612,7 +891,6 @@ async function handleCommand(input, session) {
             break;
         case "/model": {
             const sub = args[0];
-            // /model — show current + configured models
             if (!sub) {
                 const cfg = await loadConfig();
                 const configuredModels = cfg.models ?? {};
@@ -639,7 +917,6 @@ async function handleCommand(input, session) {
                 console.log(chalk.dim(`  /model rm <id>                      删除模型\n`));
                 break;
             }
-            // /model default <id> — set persistent default
             if (sub === "default") {
                 const modelId = args[1];
                 if (!modelId) {
@@ -653,7 +930,6 @@ async function handleCommand(input, session) {
                 console.log(chalk.green(`\n  默认模型已设为: ${modelId} (已同步切换)\n`));
                 break;
             }
-            // /model add <id> [baseUrl] [apiKey]
             if (sub === "add") {
                 const modelId = args[1];
                 if (!modelId) {
@@ -675,7 +951,6 @@ async function handleCommand(input, session) {
                 console.log(chalk.dim(`  切换使用: /model ${modelId}\n`));
                 break;
             }
-            // /model rm <id>
             if (sub === "rm") {
                 const modelId = args[1];
                 if (!modelId) {
@@ -692,7 +967,6 @@ async function handleCommand(input, session) {
                 console.log(chalk.green(`\n  已删除: ${modelId}\n`));
                 break;
             }
-            // /model <id> — switch model
             try {
                 session.switchModel(sub);
                 console.log(chalk.green(`\n  已切换到: ${sub}\n`));
@@ -797,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": {
@@ -913,7 +1460,6 @@ async function handleCommand(input, session) {
                 }
                 break;
             }
-            // Try extension-registered commands
             const extCmd = cmd.slice(1);
             const extCommands = session.getExtensionCommands();
             if (extCommands.has(extCmd)) {
@@ -1014,7 +1560,7 @@ function countVisualLines(text, termWidth) {
 }
 function printBanner(session) {
     const modelId = session.model.name || session.model.id;
-    const dir = session.cwd.replace(process.env.HOME || "", "~");
+    const dir = shortenDir(session.cwd);
     const sm = session.sessionManager;
     console.log();
     console.log(chalk.bold.cyan(">_") + " " + chalk.bold("欢迎使用千岛湖 Til-Work") + " " + chalk.dim(`v${VERSION}`));
@@ -1036,21 +1582,7 @@ function printBanner(session) {
         const totalTools = extInfo.reduce((sum, e) => sum + e.toolCount, 0);
         console.log(`  ${chalk.dim("extensions")} ${chalk.white(String(extInfo.length))} 个已加载 (${totalTools} 工具)`);
     }
-    const tips = [
-        "输入 / 查看所有可用命令，方向键选择",
-        "使用 /model 切换模型",
-        "按 Ctrl+C 或 Esc 中止正在执行的请求",
-        "使用 /memory 查看记忆内容",
-        "使用 /sessions 查看历史会话",
-        "输入 @ 引用文件内容（支持搜索和方向键选择）",
-    ];
-    if (session.skills.length > 0) {
-        tips.push("使用 /skills 查看已加载的技能");
-    }
-    if (extInfo.length > 0) {
-        tips.push("使用 /extensions 查看已加载的扩展");
-    }
-    const tip = tips[Math.floor(Math.random() * tips.length)];
+    const tip = getRandomTip(session);
     console.log(`\n  ${chalk.bold("Tip:")} ${chalk.italic(tip)}\n`);
 }
 //# sourceMappingURL=interactive.js.map