@antaif3ng/til-work 0.1.2 → 0.3.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 { getKnownModels, loadConfig, saveConfig, guessProvider } from "../core/config.js";
+import { getConfigPath, loadConfig, saveConfig } from "../core/config.js";
 import { VERSION } from "../version.js";
 import { createToolCallRequestHandler } from "../core/tool-permissions.js";
 import { formatTokenCount } from "../core/pricing.js";
@@ -15,8 +15,7 @@ import { extractAtReferences } from "../utils/file-processor.js";
 const COMMANDS = {
     "/help": "显示帮助信息",
     "/clear": "清空对话历史",
-    "/model": "切换模型（如 /model gpt-4o）",
-    "/models": "查看可用模型列表",
+    "/model": "查看/切换/管理模型",
     "/skills": "查看已加载的技能",
     "/mcp": "查看已连接的 MCP 服务和工具",
     "/extensions": "查看已加载的扩展和 MCP 服务",
@@ -26,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);
@@ -33,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}`);
@@ -52,6 +68,33 @@ function filterEntries(entries, filter) {
         return entries;
     return entries.filter((e) => e.label.startsWith(filter));
 }
+function getModelMenuEntries(filter, session) {
+    const entries = [];
+    const currentId = session.model.id;
+    entries.push({
+        label: currentId,
+        detail: "当前",
+        value: `/model ${currentId}`,
+    });
+    const cfg = session.config;
+    if (cfg.models) {
+        for (const [id, m] of Object.entries(cfg.models)) {
+            if (id === currentId)
+                continue;
+            const parts = [];
+            if (m.baseUrl)
+                parts.push(m.baseUrl.replace(/https?:\/\//, "").slice(0, 30));
+            entries.push({
+                label: id,
+                detail: parts.join(" ") || "",
+                value: `/model ${id}`,
+            });
+        }
+    }
+    if (!filter)
+        return entries;
+    return entries.filter((e) => e.label.includes(filter));
+}
 function getFileMenuEntries(prefix, cwd) {
     const suggestions = getFileSuggestions(prefix, cwd);
     return suggestions.slice(0, 10).map((s) => ({
@@ -60,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";
     }
@@ -106,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 = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -157,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) => {
@@ -180,6 +252,12 @@ export async function runInteractiveMode(options) {
     let isStreaming = false;
     let spinner = null;
     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":
@@ -187,12 +265,49 @@ export async function runInteractiveMode(options) {
                 streamingRawText = "";
                 isStreaming = true;
                 firstTokenReceived = false;
+                insideThinkBlock = false;
+                thinkTagBuffer = "";
                 spinner = new Spinner("思考中...");
                 spinner.start();
                 break;
             case "message_update": {
                 if (event.delta) {
-                    if (!firstTokenReceived) {
+                    currentOutput += event.delta;
+                    let text = thinkTagBuffer + event.delta;
+                    thinkTagBuffer = "";
+                    let normalText = "";
+                    let thinkText = "";
+                    while (text.length > 0) {
+                        if (insideThinkBlock) {
+                            const closeIdx = text.indexOf("</think>");
+                            if (closeIdx === -1) {
+                                thinkText += text;
+                                break;
+                            }
+                            thinkText += text.slice(0, closeIdx);
+                            text = text.slice(closeIdx + 8);
+                            insideThinkBlock = false;
+                        }
+                        else {
+                            const openIdx = text.indexOf("<think>");
+                            if (openIdx === -1) {
+                                const partialIdx = text.lastIndexOf("<");
+                                if (partialIdx !== -1 && partialIdx > text.length - 8 && "<think>".startsWith(text.slice(partialIdx))) {
+                                    thinkTagBuffer = text.slice(partialIdx);
+                                    normalText += text.slice(0, partialIdx);
+                                }
+                                else {
+                                    normalText += text;
+                                }
+                                break;
+                            }
+                            normalText += text.slice(0, openIdx);
+                            text = text.slice(openIdx + 7);
+                            insideThinkBlock = true;
+                        }
+                    }
+                    const hasOutput = normalText || thinkText;
+                    if (hasOutput && !firstTokenReceived) {
                         firstTokenReceived = true;
                         if (spinner) {
                             spinner.stop();
@@ -200,33 +315,47 @@ export async function runInteractiveMode(options) {
                         }
                         process.stdout.write("\n");
                     }
-                    // Stream raw text for responsiveness
-                    process.stdout.write(chalk.white(event.delta));
-                    streamingRawText += event.delta;
-                    currentOutput += event.delta;
+                    if (thinkText) {
+                        process.stdout.write(chalk.dim.italic(thinkText));
+                        streamingRawText += thinkText;
+                    }
+                    if (normalText) {
+                        process.stdout.write(chalk.white(normalText));
+                        streamingRawText += normalText;
+                    }
                 }
                 break;
             }
             case "message_end": {
                 if (event.message.role === "assistant") {
                     const assistantMsg = event.message;
-                    const fullText = assistantMsg.content
+                    let fullText = assistantMsg.content
                         .filter((c) => c.type === "text")
                         .map((c) => c.text)
                         .join("");
-                    if (fullText.trim() && streamingRawText.trim()) {
+                    const thinkBlocks = extractThinkBlocks(fullText);
+                    const cleanText = stripThinkBlocks(fullText);
+                    if ((cleanText.trim() || thinkBlocks.length > 0) && streamingRawText.trim()) {
                         const termWidth = process.stdout.columns || 80;
                         const visualLines = countVisualLines(streamingRawText, termWidth);
                         for (let i = 0; i < visualLines; i++) {
                             process.stdout.write("\x1b[2K\x1b[1A");
                         }
                         process.stdout.write("\x1b[2K\r");
-                        try {
-                            const rendered = renderMarkdown(fullText);
-                            process.stdout.write(rendered + "\n");
+                        if (thinkBlocks.length > 0) {
+                            const thinkContent = thinkBlocks.join("\n").trim();
+                            if (thinkContent) {
+                                process.stdout.write(chalk.dim.italic(thinkContent) + "\n\n");
+                            }
                         }
-                        catch {
-                            process.stdout.write(fullText + "\n");
+                        if (cleanText.trim()) {
+                            try {
+                                const rendered = renderMarkdown(cleanText);
+                                process.stdout.write(rendered + "\n");
+                            }
+                            catch {
+                                process.stdout.write(cleanText + "\n");
+                            }
                         }
                     }
                     streamingRawText = "";
@@ -284,7 +413,11 @@ export async function runInteractiveMode(options) {
                     spinner = null;
                 }
                 isStreaming = false;
-                // Show per-turn usage summary
+                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`));
+                }
                 const turnUsage = session.getLastTurnUsageSummary();
                 const ctxInfo = session.getContextUsagePercent();
                 if (turnUsage) {
@@ -295,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;
             }
         }
@@ -304,7 +437,6 @@ export async function runInteractiveMode(options) {
         visible: false,
         items: [],
         selectedIndex: 0,
-        renderedLines: 0,
         type: "command",
     };
     const completer = (line) => {
@@ -319,7 +451,59 @@ 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("/") && !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;
@@ -327,6 +511,7 @@ export async function runInteractiveMode(options) {
             resolve(s);
             return;
         }
+        // ── Streaming: only Esc to abort ──
         if (isStreaming) {
             if (key && key.name === "escape") {
                 if (spinner) {
@@ -341,28 +526,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);
@@ -372,6 +584,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;
                         }
                     }
@@ -388,49 +601,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("/") && !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);
-            }
-            else if (menu.visible) {
-                clearMenu(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");
+                }
+                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 {
-            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);
-                }
+        // ── 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;
+        }
+        // ── 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) {
@@ -438,13 +689,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", () => {
@@ -457,6 +717,20 @@ 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 退出)"));
         }
@@ -479,9 +753,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) {
@@ -505,41 +780,95 @@ async function handleCommand(input, session) {
             console.log(chalk.dim("对话已清空。\n"));
             break;
         case "/model": {
-            const modelId = args[0];
-            if (!modelId) {
-                console.log(chalk.yellow(`当前模型: ${session.model.id}`));
-                console.log(chalk.dim("用法: /model <model-id>\n"));
+            const sub = args[0];
+            if (!sub) {
+                const cfg = await loadConfig();
+                const configuredModels = cfg.models ?? {};
+                const modelIds = Object.keys(configuredModels);
+                console.log(chalk.bold(`\n当前模型: ${chalk.cyan(session.model.id)}\n`));
+                if (modelIds.length > 0) {
+                    console.log(chalk.bold("已配置模型:\n"));
+                    for (const [id, m] of Object.entries(configuredModels)) {
+                        const marker = id === session.model.id ? chalk.green(" ●") : "  ";
+                        const parts = [];
+                        if (m.baseUrl)
+                            parts.push(m.baseUrl);
+                        if (m.apiKey)
+                            parts.push(chalk.green("key ✓"));
+                        console.log(`${marker} ${chalk.white(id)}${parts.length > 0 ? chalk.dim(`  ${parts.join("  ")}`) : ""}`);
+                    }
+                }
+                else {
+                    console.log(chalk.dim("  暂无配置模型。使用 /model add 添加。"));
+                }
+                console.log(chalk.dim(`\n  /model <id>                        切换模型`));
+                console.log(chalk.dim(`  /model add <id> [baseUrl] [apiKey]  添加模型`));
+                console.log(chalk.dim(`  /model default <id>                 设为默认（持久化）`));
+                console.log(chalk.dim(`  /model rm <id>                      删除模型\n`));
                 break;
             }
-            try {
+            if (sub === "default") {
+                const modelId = args[1];
+                if (!modelId) {
+                    console.log(chalk.red("\n  用法: /model default <model-id>\n"));
+                    break;
+                }
+                const cfg = await loadConfig();
+                cfg.model = modelId;
+                await saveConfig(cfg);
                 session.switchModel(modelId);
-                console.log(chalk.green(`已切换到: ${modelId}\n`));
+                console.log(chalk.green(`\n  默认模型已设为: ${modelId} (已同步切换)\n`));
+                break;
+            }
+            if (sub === "add") {
+                const modelId = args[1];
+                if (!modelId) {
+                    console.log(chalk.red("\n  用法: /model add <model-id> [baseUrl] [apiKey]\n"));
+                    console.log(chalk.dim("  示例: /model add deepseek-chat https://api.deepseek.com/v1 sk-xxx\n"));
+                    break;
+                }
+                const cfg = await loadConfig();
+                if (!cfg.models)
+                    cfg.models = {};
+                const entry = {};
+                if (args[2])
+                    entry.baseUrl = args[2];
+                if (args[3])
+                    entry.apiKey = args[3];
+                cfg.models[modelId] = entry;
+                await saveConfig(cfg);
+                console.log(chalk.green(`\n  已添加: ${modelId}`));
+                console.log(chalk.dim(`  切换使用: /model ${modelId}\n`));
+                break;
+            }
+            if (sub === "rm") {
+                const modelId = args[1];
+                if (!modelId) {
+                    console.log(chalk.red("\n  用法: /model rm <model-id>\n"));
+                    break;
+                }
+                const cfg = await loadConfig();
+                if (!cfg.models?.[modelId]) {
+                    console.log(chalk.red(`\n  自定义模型 "${modelId}" 不存在\n`));
+                    break;
+                }
+                delete cfg.models[modelId];
+                await saveConfig(cfg);
+                console.log(chalk.green(`\n  已删除: ${modelId}\n`));
+                break;
+            }
+            try {
+                session.switchModel(sub);
+                console.log(chalk.green(`\n  已切换到: ${sub}\n`));
             }
             catch (err) {
-                console.log(chalk.red(`切换失败: ${err.message}\n`));
+                console.log(chalk.red(`\n  切换失败: ${err.message}\n`));
             }
             break;
         }
-        case "/models": {
-            const cfg = await loadConfig();
-            const builtinModels = getKnownModels();
-            console.log(chalk.bold("\n内置模型:\n"));
-            for (const [id, m] of Object.entries(builtinModels)) {
-                const marker = id === session.model.id ? chalk.green(" ●") : "  ";
-                const ctx = m.contextWindow ? chalk.dim(` ${formatTokenCount(m.contextWindow)} ctx`) : "";
-                console.log(`${marker} ${id.padEnd(35)} ${chalk.dim(m.provider)}${ctx}`);
-            }
-            if (cfg.customModels && Object.keys(cfg.customModels).length > 0) {
-                console.log(chalk.bold("\n自定义模型:\n"));
-                for (const [id, m] of Object.entries(cfg.customModels)) {
-                    const marker = id === session.model.id ? chalk.green(" ●") : "  ";
-                    const ctx = m.contextWindow ? chalk.dim(` ${formatTokenCount(m.contextWindow)} ctx`) : "";
-                    console.log(`${marker} ${id.padEnd(35)} ${chalk.dim(m.provider)}${ctx}`);
-                }
-            }
-            console.log(chalk.dim(`\n  当前: ${session.model.id} | 切换: /model <id> | 添加: /config add model <id> <provider>\n`));
+        case "/models":
+            console.log(chalk.dim("  已合并到 /model 命令，请直接使用 /model\n"));
             break;
-        }
         case "/memory": {
             const mem = session.getMemoryContent();
             if (!mem) {
@@ -573,151 +902,62 @@ async function handleCommand(input, session) {
         case "/config": {
             const config = await loadConfig();
             const sub = args[0];
-            if (!sub) {
-                console.log(chalk.bold("\n当前配置:\n"));
-                console.log(`  模型:     ${chalk.cyan(session.model.id)}`);
-                console.log(`  Provider: ${chalk.cyan(session.model.provider)}`);
-                console.log(`  Base URL: ${chalk.cyan(session.model.baseUrl || "(默认)")}`);
-                console.log(`  API Key:  ${session.model.apiKey ? chalk.green("已配置") : chalk.red("未设置")}`);
-                console.log(`  Session:  ${chalk.cyan(session.sessionManager.shortId)}`);
-                if (session.model.headers && Object.keys(session.model.headers).length > 0) {
-                    console.log(`  Headers:  ${chalk.dim(Object.keys(session.model.headers).join(", "))}`);
-                }
-                console.log(chalk.bold("\n  所有 Provider:"));
-                for (const [name, prov] of Object.entries(config.providers)) {
-                    const parts = [];
-                    if (prov.apiKey)
-                        parts.push(chalk.green("key ✓"));
-                    else
-                        parts.push(chalk.dim("无 key"));
-                    if (prov.baseUrl)
-                        parts.push(prov.baseUrl);
-                    console.log(`    ${chalk.cyan(name.padEnd(20))} ${parts.join("  ")}`);
-                }
-                if (config.customModels && Object.keys(config.customModels).length > 0) {
-                    console.log(chalk.bold("\n  自定义模型:"));
-                    for (const [id, m] of Object.entries(config.customModels)) {
-                        console.log(`    ${chalk.cyan(id.padEnd(30))} ${chalk.dim(m.provider)}${m.contextWindow ? `  ctx:${formatTokenCount(m.contextWindow)}` : ""}`);
-                    }
+            if (sub === "check") {
+                console.log(chalk.bold("\n配置检测:\n"));
+                const m = session.model;
+                const provider = m.provider;
+                const maskedKey = m.apiKey ? m.apiKey.slice(0, 8) + "..." + m.apiKey.slice(-4) : chalk.red("未设置");
+                console.log(`  模型:     ${chalk.cyan(m.id)}`);
+                console.log(`  Provider: ${chalk.cyan(provider)}`);
+                console.log(`  Base URL: ${chalk.cyan(m.baseUrl || "(默认)")}`);
+                console.log(`  API Key:  ${maskedKey}`);
+                if (!m.apiKey) {
+                    console.log(chalk.red("\n  ✗ API Key 未设置，无法连接\n"));
+                    break;
                 }
-                console.log(chalk.dim("\n  用法: /config set model|key|url|add-model  (查看 /config help)\n"));
-                break;
-            }
-            if (sub === "help") {
-                console.log(chalk.bold("\n/config 子命令:\n"));
-                console.log(`  ${chalk.cyan("/config")}                          查看当前配置`);
-                console.log(`  ${chalk.cyan("/config set model <id>")}           设置默认模型 (持久化)`);
-                console.log(`  ${chalk.cyan("/config set key <provider> <key>")} 设置 Provider API Key`);
-                console.log(`  ${chalk.cyan("/config set url <provider> <url>")} 设置 Provider Base URL`);
-                console.log(`  ${chalk.cyan("/config add model <id> <provider>")} 添加自定义模型`);
-                console.log(`  ${chalk.cyan("/config rm model <id>")}            删除自定义模型`);
-                console.log();
-                console.log(chalk.dim("  示例:"));
-                console.log(chalk.dim("    /config set model gpt-4o"));
-                console.log(chalk.dim("    /config set key openai sk-xxx"));
-                console.log(chalk.dim("    /config set url openai https://my-proxy.com/v1"));
-                console.log(chalk.dim("    /config add model deepseek-chat openai-compatible"));
-                console.log();
-                break;
-            }
-            if (sub === "set") {
-                const field = args[1];
-                if (field === "model") {
-                    const modelId = args[2];
-                    if (!modelId) {
-                        console.log(chalk.red("\n  用法: /config set model <model-id>\n"));
-                        break;
-                    }
-                    const provider = guessProvider(modelId);
-                    config.defaultModel = { provider, id: modelId };
-                    await saveConfig(config);
-                    session.switchModel(modelId);
-                    console.log(chalk.green(`\n  默认模型已设为: ${modelId} (provider: ${provider})`));
-                    console.log(chalk.dim(`  已同步切换当前会话模型\n`));
-                }
-                else if (field === "key") {
-                    const provider = args[2];
-                    const key = args[3];
-                    if (!provider || !key) {
-                        console.log(chalk.red("\n  用法: /config set key <provider> <api-key>\n"));
-                        break;
-                    }
-                    if (!config.providers[provider])
-                        config.providers[provider] = {};
-                    config.providers[provider].apiKey = key;
-                    await saveConfig(config);
-                    console.log(chalk.green(`\n  已设置 ${provider} 的 API Key\n`));
-                }
-                else if (field === "url") {
-                    const provider = args[2];
-                    const url = args[3];
-                    if (!provider || !url) {
-                        console.log(chalk.red("\n  用法: /config set url <provider> <base-url>\n"));
-                        break;
-                    }
-                    if (!config.providers[provider])
-                        config.providers[provider] = {};
-                    config.providers[provider].baseUrl = url;
-                    await saveConfig(config);
-                    console.log(chalk.green(`\n  已设置 ${provider} 的 Base URL: ${url}\n`));
+                console.log(chalk.dim("\n  正在测试 API 连接..."));
+                try {
+                    const { completeLLM } = await import("../core/llm.js");
+                    const text = await completeLLM(m, "You are a test.", "Say OK", 32);
+                    console.log(chalk.green(`  ✓ 连接成功! 模型响应: "${text.slice(0, 80)}"`));
                 }
-                else {
-                    console.log(chalk.red(`\n  未知字段: ${field}。支持: model, key, url`));
-                    console.log(chalk.dim("  查看帮助: /config help\n"));
+                catch (err) {
+                    console.log(chalk.red(`  ✗ 连接失败: ${err.message}`));
                 }
+                console.log();
                 break;
             }
-            if (sub === "add") {
-                const what = args[1];
-                if (what === "model") {
-                    const modelId = args[2];
-                    const provider = args[3];
-                    if (!modelId || !provider) {
-                        console.log(chalk.red("\n  用法: /config add model <model-id> <provider>\n"));
-                        console.log(chalk.dim("  provider 可选: anthropic, openai, openai-compatible, google\n"));
-                        break;
-                    }
-                    if (!config.customModels)
-                        config.customModels = {};
-                    config.customModels[modelId] = {
-                        provider,
-                        name: modelId,
-                        maxTokens: 8192,
-                    };
-                    await saveConfig(config);
-                    console.log(chalk.green(`\n  已添加自定义模型: ${modelId} (provider: ${provider})`));
-                    console.log(chalk.dim(`  切换使用: /model ${modelId}\n`));
-                }
-                else {
-                    console.log(chalk.red(`\n  未知类型: ${what}。支持: model`));
-                    console.log(chalk.dim("  查看帮助: /config help\n"));
+            console.log(chalk.bold("\n当前配置:\n"));
+            console.log(`  模型:     ${chalk.cyan(session.model.id)}`);
+            console.log(`  Base URL: ${chalk.cyan(session.model.baseUrl || "(默认)")}`);
+            console.log(`  API Key:  ${session.model.apiKey ? chalk.green("已配置") : chalk.red("未设置")}`);
+            console.log(`  Session:  ${chalk.cyan(session.sessionManager.shortId)}`);
+            if (config.models && Object.keys(config.models).length > 0) {
+                console.log(chalk.bold("\n  自定义模型:"));
+                for (const [id, m] of Object.entries(config.models)) {
+                    const parts = [];
+                    if (m.apiKey)
+                        parts.push(chalk.green("key ✓"));
+                    if (m.baseUrl)
+                        parts.push(m.baseUrl);
+                    console.log(`    ${chalk.cyan(id.padEnd(25))} ${parts.join("  ") || chalk.dim("(继承全局)")}`);
                 }
-                break;
             }
-            if (sub === "rm") {
-                const what = args[1];
-                if (what === "model") {
-                    const modelId = args[2];
-                    if (!modelId) {
-                        console.log(chalk.red("\n  用法: /config rm model <model-id>\n"));
-                        break;
-                    }
-                    if (!config.customModels?.[modelId]) {
-                        console.log(chalk.red(`\n  自定义模型 "${modelId}" 不存在 (内置模型不可删除)\n`));
-                        break;
+            if (Object.keys(config.providers).length > 0) {
+                console.log(chalk.bold("\n  Provider 凭证:"));
+                for (const [name, prov] of Object.entries(config.providers)) {
+                    const parts = [];
+                    if (prov.apiKey)
+                        parts.push(chalk.green("key ✓"));
+                    if (prov.baseUrl)
+                        parts.push(prov.baseUrl);
+                    if (parts.length > 0) {
+                        console.log(`    ${chalk.cyan(name.padEnd(20))} ${parts.join("  ")}`);
                     }
-                    delete config.customModels[modelId];
-                    await saveConfig(config);
-                    console.log(chalk.green(`\n  已删除自定义模型: ${modelId}\n`));
-                }
-                else {
-                    console.log(chalk.red(`\n  未知类型: ${what}。支持: model`));
-                    console.log(chalk.dim("  查看帮助: /config help\n"));
                 }
-                break;
             }
-            console.log(chalk.red(`\n  未知子命令: ${sub}`));
-            console.log(chalk.dim("  查看帮助: /config help\n"));
+            console.log(chalk.dim(`\n  配置文件: ${getConfigPath()}`));
+            console.log(chalk.dim(`  /config check 测试连接 | /model 管理模型 | til --setup 重新配置\n`));
             break;
         }
         case "/skills": {
@@ -726,12 +966,14 @@ async function handleCommand(input, session) {
                 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) {
-                    console.log(`  ${chalk.cyan(s.name.padEnd(24))} ${chalk.dim(s.description.slice(0, 60))}`);
-                    console.log(`  ${chalk.dim(s.filePath)}`);
+                    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:<名称> 查看技能详情。\n"));
+                console.log(chalk.dim("\n  使用 /skill:<名称> 查看技能详情。"));
+                console.log(chalk.dim("  自定义: ~/.til/skills/ 或 .til/skills/\n"));
             }
             break;
         }
@@ -835,7 +1077,6 @@ async function handleCommand(input, session) {
                 }
                 break;
             }
-            // Try extension-registered commands
             const extCmd = cmd.slice(1);
             const extCommands = session.getExtensionCommands();
             if (extCommands.has(extCmd)) {
@@ -909,6 +1150,20 @@ function getVisualWidth(str) {
     }
     return w;
 }
+function extractThinkBlocks(text) {
+    const blocks = [];
+    const re = /<think>([\s\S]*?)<\/think>/g;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+        const content = m[1].trim();
+        if (content)
+            blocks.push(content);
+    }
+    return blocks;
+}
+function stripThinkBlocks(text) {
+    return text.replace(/<think>[\s\S]*?<\/think>\s*/g, "").replace(/\n{3,}/g, "\n\n").trim();
+}
 function countVisualLines(text, termWidth) {
     if (termWidth <= 0)
         return text.split("\n").length;
@@ -922,7 +1177,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}`));
@@ -944,21 +1199,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