openhorse 0.1.19 → 0.1.21

package/dist/cli.js

@@ -34,6 +34,8 @@ const multiline_input_1 = require("./ui/multiline-input");
 const file_completion_1 = require("./ui/file-completion");
 const status_bar_1 = require("./ui/status-bar");
 const user_input_1 = require("./ui/user-input");
+const ui_v2_1 = require("./ui-v2");
+const turn_controller_1 = require("./runtime/turn-controller");
 // Get version from package.json
 const VERSION = (() => {
     try {
@@ -66,10 +68,12 @@ function showCliHelp() {
     console.log('  openhorse              Start interactive REPL');
     console.log('  openhorse --help       Show this help message');
     console.log('  openhorse --version    Show version');
+    console.log('  openhorse --ui v2      Enable UI v2 preview components');
     console.log();
     console.log(ACCENT('Options:'));
     console.log('  -h, --help     Show help');
     console.log('  -v, --version  Show version');
+    console.log('  --ui <mode>    UI renderer: legacy | v2');
     console.log();
     console.log(ACCENT('Interactive Commands:'));
     console.log('  /help          Show available slash commands');
@@ -81,6 +85,24 @@ function showCliHelp() {
     console.log(DIM('Type /help in REPL for full command list.'));
     console.log();
 }
+function parseCliUIRenderer(args) {
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        const value = arg === '--ui'
+            ? args[i + 1]
+            : arg.startsWith('--ui=')
+                ? arg.slice('--ui='.length)
+                : undefined;
+        if (value === undefined)
+            continue;
+        if (value === 'legacy' || value === 'v2')
+            return value;
+        console.error(ERROR(`Invalid --ui value: ${value}`));
+        console.error(DIM('Expected one of: legacy, v2'));
+        process.exit(1);
+    }
+    return undefined;
+}
 // ============================================================================
 // 全局状态
 // ============================================================================
@@ -88,29 +110,108 @@ let llm = null;
 let store;
 let currentSession = null;
 let runtime;
+const turnController = new turn_controller_1.TurnController();
+let isShuttingDown = false;
 // 输入状态
 let currentInput = '';
 let inputHistory = [];
 let historyIndex = -1;
 let historyMode = 'none';
 let searchQuery = '';
+let resumePickerState = null;
+let resumePickerLines = [];
+let resumePickerReservedHeight = 0;
+function ensureCurrentSession() {
+    if (!currentSession) {
+        currentSession = (0, session_storage_1.createSession)(process.cwd(), store.getSnapshot().currentModel || store.getSnapshot().config.model);
+        (0, global_config_1.incrementSessionCount)();
+    }
+    return currentSession;
+}
+function setCurrentSession(session) {
+    currentSession = session;
+}
+function getCurrentSession() {
+    return currentSession;
+}
 function echoSubmittedInput(input) {
-    process.stdout.write('\x1b[2K\r');
-    console.log((0, user_input_1.renderUserInputEcho)(input));
-    (0, command_panel_1.resetRenderLength)();
+    (0, command_panel_1.clearRenderedInput)();
+    const rendered = isV2UI()
+        ? (0, user_input_1.renderUserInputEchoFrame)(input)
+        : (0, user_input_1.renderUserInputEcho)(input);
+    (0, command_panel_1.writeLinePreservingInput)(rendered);
+    if (isV2UI()) {
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+    }
+}
+function isExitCommandInput(input) {
+    const parsed = (0, parser_1.parseInput)(input.trim());
+    if (!parsed.isCommand)
+        return false;
+    const cmd = (0, commands_1.findCommand)(parsed.name);
+    return cmd?.name === 'exit';
 }
 function submitInput(input) {
     const submittedInput = input;
     currentInput = '';
     echoSubmittedInput(submittedInput);
-    handleInput(submittedInput).catch(err => {
-        console.log(ERROR(`Input error: ${err.message || String(err)}`));
-        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
-    });
     (0, global_config_1.addToInputHistory)(submittedInput);
     inputHistory = (0, global_config_1.getInputHistory)();
+    if (turnController.hasActiveTurn()) {
+        const text = submittedInput.trim();
+        const parsed = (0, parser_1.parseInput)(text);
+        if (isExitCommandInput(text)) {
+            void shutdownCli();
+            return;
+        }
+        if (parsed.isCommand) {
+            console.log(DIM('Command ignored while agent is running. Press Ctrl+C to interrupt first.'));
+            (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            return;
+        }
+        if (text) {
+            turnController.clearExitIntent();
+            turnController.requestRevision(submittedInput);
+            (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+        }
+        return;
+    }
+    void runInputTurn(submittedInput);
+}
+async function runInputTurn(input) {
+    let nextInput = input;
+    while (nextInput) {
+        const turn = turnController.beginTurn(nextInput);
+        store.setProcessing(true);
+        try {
+            await handleInput(nextInput, turn.abortSignal, { redrawPrompt: false, updateStatus: false });
+        }
+        catch (err) {
+            console.log(ERROR(`Input error: ${err.message || String(err)}`));
+        }
+        finally {
+            const revision = turnController.finishTurn(turn.id);
+            store.setProcessing(false);
+            if (revision && revision.trim()) {
+                (0, command_panel_1.writeLinePreservingInput)(DIM('Interrupted. Restarting with latest instruction...'));
+                nextInput = revision;
+            }
+            else {
+                nextInput = undefined;
+            }
+        }
+    }
+    updateStatusBar();
+    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
 }
 function parseKey(char, key) {
+    const sequence = key?.sequence || char || '';
+    if (sequence === '\x1b[13;2u') {
+        return { name: 'enter', ctrl: false, shift: true, meta: false, sequence };
+    }
+    if (sequence === '\x1b[13;3u') {
+        return { name: 'enter', ctrl: false, shift: false, meta: true, sequence };
+    }
     if (!key) {
         // 手动解析
         if (char === '\r' || char === '\n')
@@ -127,6 +228,9 @@ function parseKey(char, key) {
     if (key.name === 'return') {
         key.name = 'enter';
     }
+    if (key.name === 'enter' && (key.shift || key.meta)) {
+        return key;
+    }
     // 如果 key.name 为空，使用 char 作为 name
     if (!key.name && char) {
         key.name = char;
@@ -135,6 +239,14 @@ function parseKey(char, key) {
 }
 function handleKeypress(char, key) {
     const k = parseKey(char, key);
+    if (k.ctrl && k.name === 'l') {
+        clearTerminalView();
+        return;
+    }
+    if (k.ctrl && k.name === 'c') {
+        void handleCtrlC();
+        return;
+    }
     // 命令面板模式
     if ((0, command_panel_1.isPanelVisible)()) {
         handlePanelKeypress(k, char);
@@ -145,6 +257,11 @@ function handleKeypress(char, key) {
         handleFileCompletionKeypress(k, char);
         return;
     }
+    // Resume session picker mode
+    if (resumePickerState?.visible) {
+        handleResumePickerKeypress(k, char);
+        return;
+    }
     // 历史导航模式
     if (historyMode !== 'none') {
         handleHistoryKeypress(k, char);
@@ -161,6 +278,13 @@ function handlePanelKeypress(k, char) {
         case 'down':
             (0, command_panel_1.navigatePanel)('down');
             break;
+        case 'tab':
+            const completedCmd = (0, command_panel_1.completeSelectedCommand)();
+            if (completedCmd) {
+                currentInput = completedCmd;
+                (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            }
+            break;
         case 'enter':
             const cmd = (0, command_panel_1.selectCommand)();
             if (cmd) {
@@ -310,16 +434,146 @@ function handleFileCompletionKeypress(k, char) {
             }
     }
 }
+function handleResumePickerKeypress(k, char) {
+    if (!resumePickerState?.visible)
+        return;
+    switch (k.name) {
+        case 'up':
+            resumePickerState.selectedIndex = Math.max(0, resumePickerState.selectedIndex - 1);
+            renderResumePicker();
+            break;
+        case 'down':
+            resumePickerState.selectedIndex = Math.min(resumePickerState.sessions.length - 1, resumePickerState.selectedIndex + 1);
+            renderResumePicker();
+            break;
+        case 'enter':
+            restoreSelectedResumeSession();
+            break;
+        case 'escape':
+            hideResumePicker();
+            (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            break;
+        default:
+            if (char && /^[1-9]$/.test(char)) {
+                const index = Number(char) - 1;
+                if (index >= 0 && index < resumePickerState.sessions.length) {
+                    resumePickerState.selectedIndex = index;
+                    restoreSelectedResumeSession();
+                }
+            }
+    }
+}
+function showResumePicker(options) {
+    resumePickerState = {
+        visible: true,
+        sessions: options.sessions,
+        selectedIndex: 0,
+        title: options.title,
+        showProject: options.showProject,
+        moreCount: options.moreCount,
+        allProjects: options.allProjects,
+    };
+    renderResumePicker();
+}
+function renderResumePicker() {
+    if (!resumePickerState?.visible)
+        return;
+    clearResumePicker({ release: false });
+    const lines = (0, ui_v2_1.renderSessionPicker)({
+        title: resumePickerState.title,
+        sessions: resumePickerState.sessions,
+        selectedIndex: resumePickerState.selectedIndex,
+        width: process.stdout.columns || 80,
+        showProject: resumePickerState.showProject,
+        moreCount: resumePickerState.moreCount,
+        footer: '  ↑↓ Select  Enter Resume  1-9 Quick  Esc Cancel',
+        theme: {
+            accent: ACCENT,
+            dim: DIM,
+            selected: text => chalk_1.default.bgHex('#1E293B').hex('#E2E8F0')(text),
+        },
+    });
+    const offset = getResumePickerOffsetRows();
+    reserveResumePickerSpace(lines.length + offset);
+    resumePickerLines = lines;
+    process.stdout.write('\x1b7');
+    if (offset > 0) {
+        process.stdout.write(`\x1b[${offset}B\r`);
+    }
+    process.stdout.write('\x1b[J');
+    for (let index = 0; index < lines.length; index++) {
+        if (index > 0 || offset === 0) {
+            process.stdout.write('\n');
+        }
+        process.stdout.write('\r' + lines[index]);
+    }
+    process.stdout.write('\x1b8');
+}
+function hideResumePicker() {
+    clearResumePicker({ release: true });
+    resumePickerState = null;
+}
+function clearResumePicker(options = {}) {
+    const height = Math.max(resumePickerReservedHeight, resumePickerLines.length);
+    if (height <= 0)
+        return;
+    process.stdout.write('\x1b7');
+    const offset = getResumePickerOffsetRows();
+    if (offset > 0) {
+        process.stdout.write(`\x1b[${offset}B\r`);
+    }
+    process.stdout.write('\x1b[J');
+    process.stdout.write('\x1b8');
+    resumePickerLines = [];
+    if (options.release) {
+        resumePickerReservedHeight = 0;
+    }
+}
+function reserveResumePickerSpace(requiredHeight) {
+    if (requiredHeight <= resumePickerReservedHeight)
+        return;
+    const extraLines = requiredHeight - resumePickerReservedHeight;
+    process.stdout.write('\n'.repeat(extraLines));
+    process.stdout.write(`\x1b[${extraLines}A`);
+    resumePickerReservedHeight = requiredHeight;
+}
+function getResumePickerOffsetRows() {
+    return isV2UI() ? 2 : 1;
+}
+function restoreSelectedResumeSession() {
+    if (!resumePickerState?.visible)
+        return;
+    const session = resumePickerState.sessions[resumePickerState.selectedIndex];
+    const suffix = resumePickerState.allProjects ? ' --all' : '';
+    hideResumePicker();
+    currentInput = '';
+    (0, command_panel_1.clearRenderedInput)();
+    runInputTurn(`/resume ${session.id}${suffix}`).catch(err => {
+        console.log(ERROR(`Resume error: ${err.message || String(err)}`));
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+    });
+}
 function handleNormalKeypress(k, char) {
     switch (k.name) {
         case 'enter':
+            if (k.shift || k.meta) {
+                if (isV2UI()) {
+                    insertInputNewline();
+                }
+                return;
+            }
             // 多行模式：添加行
             if ((0, multiline_input_1.isMultilineActive)()) {
                 if ((0, multiline_input_1.shouldEnterMultiline)(currentInput)) {
-                    (0, multiline_input_1.addMultilineLine)(currentInput.slice(0, -1));
+                    (0, multiline_input_1.addMultilineLine)(currentInput);
                     currentInput = '';
-                    process.stdout.write('\r\x1b[2K');
-                    process.stdout.write((0, multiline_input_1.renderContinuationPrompt)());
+                    if (isV2UI()) {
+                        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+                    }
+                    else {
+                        process.stdout.write('\r\x1b[2K');
+                        process.stdout.write((0, multiline_input_1.renderContinuationPrompt)());
+                    }
                 }
                 else {
                     // 结束多行，发送完整输入
@@ -337,8 +591,13 @@ function handleNormalKeypress(k, char) {
             if ((0, multiline_input_1.shouldEnterMultiline)(currentInput)) {
                 (0, multiline_input_1.enterMultiline)(currentInput);
                 currentInput = '';
-                process.stdout.write('\r\x1b[2K');
-                process.stdout.write((0, multiline_input_1.renderContinuationPrompt)());
+                if (isV2UI()) {
+                    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+                }
+                else {
+                    process.stdout.write('\r\x1b[2K');
+                    process.stdout.write((0, multiline_input_1.renderContinuationPrompt)());
+                }
                 return;
             }
             // 正常发送输入
@@ -392,7 +651,7 @@ function handleNormalKeypress(k, char) {
         case 'd':
             if (k.ctrl && currentInput === '') {
                 // Ctrl+D：退出（空输入时）
-                handleCtrlC();
+                void shutdownCli();
             }
             else if (char) {
                 currentInput += char;
@@ -402,9 +661,8 @@ function handleNormalKeypress(k, char) {
         case '/':
             // Issue #30 fix: 只在输入为空时触发命令面板（即 `/` 是第一个字符）
             // 避免在 URL（http://）、路径（src/）、正则等场景误触发
-            if (currentInput === '') {
+            if (currentInput === '' && !turnController.hasActiveTurn()) {
                 currentInput = '/';
-                (0, command_panel_1.resetRenderLength)();
                 (0, command_panel_1.redrawInputWithPrompt)(currentInput);
                 (0, command_panel_1.showCommandPanel)('');
             }
@@ -416,10 +674,25 @@ function handleNormalKeypress(k, char) {
             break;
         case '@':
             // 显示文件补全
-            const baseInput = currentInput;
-            currentInput += '@';
-            (0, file_completion_1.showFileCompletion)('', baseInput);
-            (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            if (turnController.hasActiveTurn()) {
+                currentInput += '@';
+                (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            }
+            else {
+                const baseInput = currentInput;
+                currentInput += '@';
+                (0, file_completion_1.showFileCompletion)('', baseInput);
+                (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            }
+            break;
+        case '?':
+            if (currentInput === '' && store.getSnapshot().config.ui?.renderer === 'v2' && !turnController.hasActiveTurn()) {
+                showV2Shortcuts();
+            }
+            else {
+                currentInput += '?';
+                (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+            }
             break;
         default:
             // 普通字符
@@ -429,6 +702,10 @@ function handleNormalKeypress(k, char) {
             }
     }
 }
+function insertInputNewline() {
+    currentInput += '\n';
+    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+}
 function updateHistorySearch() {
     if (searchQuery) {
         const allHistory = (0, global_config_1.getInputHistory)();
@@ -444,10 +721,72 @@ function updateHistorySearch() {
     (0, command_panel_1.redrawInputWithPrompt)(currentInput, `[Search: ${searchQuery}]`);
 }
 function showHistorySearchPrompt() {
-    process.stdout.write('\r\x1b[2K');
-    process.stdout.write(ACCENT('❯ ') + DIM('[Search: ]'));
+    (0, command_panel_1.clearRenderedInput)();
+    (0, command_panel_1.redrawInputWithPrompt)('', '[Search: ]');
 }
-async function handleCtrlC() {
+function isV2UI() {
+    return store.getSnapshot().config.ui?.renderer === 'v2';
+}
+function showV2Shortcuts() {
+    console.log();
+    console.log((0, ui_v2_1.renderV2Shortcuts)(process.stdout.columns || 80));
+    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+}
+function clearTerminalView() {
+    (0, command_panel_1.hideCommandPanel)();
+    (0, file_completion_1.hideFileCompletion)();
+    (0, command_panel_1.resetRenderLength)();
+    process.stdout.write('\x1Bc');
+    showBanner();
+    if (isV2UI()) {
+        console.log(DIM('  View cleared. Conversation context is preserved.'));
+        console.log((0, ui_v2_1.renderV2FooterHint)(process.stdout.columns || 80));
+    }
+    else {
+        console.log(DIM('  View cleared. Conversation context is preserved.'));
+    }
+    console.log();
+    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+}
+function cancelActiveInputMode() {
+    if ((0, multiline_input_1.isMultilineActive)()) {
+        (0, multiline_input_1.resetMultiline)();
+        currentInput = '';
+        console.log(DIM('(cancelled)'));
+        (0, command_panel_1.redrawInputWithPrompt)('');
+        return true;
+    }
+    if ((0, command_panel_1.isPanelVisible)()) {
+        (0, command_panel_1.hideCommandPanel)();
+        (0, command_panel_1.clearPendingCommand)();
+        currentInput = '';
+        (0, command_panel_1.redrawInputWithPrompt)('');
+        return true;
+    }
+    if ((0, file_completion_1.isFileCompletionVisible)()) {
+        (0, file_completion_1.hideFileCompletion)();
+        currentInput = (0, file_completion_1.getBaseInput)() + '@' + (0, file_completion_1.getFileQuery)();
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+        return true;
+    }
+    if (resumePickerState?.visible) {
+        hideResumePicker();
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+        return true;
+    }
+    if (historyMode !== 'none') {
+        historyMode = 'none';
+        searchQuery = '';
+        historyIndex = -1;
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+        return true;
+    }
+    return false;
+}
+async function shutdownCli() {
+    if (isShuttingDown)
+        return;
+    isShuttingDown = true;
     // 保存会话摘要后退出
     if (currentSession) {
         const messages = (0, session_storage_1.readSessionMessages)(currentSession.id);
@@ -468,18 +807,54 @@ async function handleCtrlC() {
     console.log(SUCCESS('Goodbye! 🐴'));
     process.exit(0);
 }
+async function handleCtrlC() {
+    if (cancelActiveInputMode()) {
+        turnController.clearExitIntent();
+        return;
+    }
+    if (turnController.hasActiveTurn()) {
+        const shouldExit = turnController.registerExitIntent();
+        turnController.interruptActiveTurn();
+        if (shouldExit) {
+            await shutdownCli();
+            return;
+        }
+        (0, command_panel_1.writeLinePreservingInput)(DIM('Interrupted. Press Ctrl+C again to exit.'));
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+        return;
+    }
+    if (turnController.registerExitIntent()) {
+        await shutdownCli();
+        return;
+    }
+    (0, command_panel_1.writeLinePreservingInput)(DIM('Press Ctrl+C again to exit.'));
+    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+}
 // ============================================================================
 // Banner
 // ============================================================================
 function showBanner() {
     const config = store.getSnapshot().config;
     const baseUrl = config.apiBaseUrl || '';
+    const provider = baseUrl.includes('anthropic') ? 'Anthropic'
+        : baseUrl.includes('openai') ? 'OpenAI'
+            : baseUrl.includes('dashscope') ? 'Alibaba Cloud'
+                : 'Custom';
+    if (config.ui?.renderer === 'v2') {
+        console.log();
+        console.log((0, ui_v2_1.renderV2ShellHeader)({
+            provider,
+            model: config.model,
+            projectPath: process.cwd(),
+            status: llm ? 'ready' : 'loading',
+            statusText: llm ? 'ready' : 'Set OPENHORSE_API_KEY',
+            version: VERSION,
+        }));
+        return;
+    }
     console.log();
     console.log((0, box_1.renderHeaderBox)({
-        provider: baseUrl.includes('anthropic') ? 'Anthropic'
-            : baseUrl.includes('openai') ? 'OpenAI'
-                : baseUrl.includes('dashscope') ? 'Alibaba Cloud'
-                    : 'Custom',
+        provider,
         model: config.model,
         endpoint: baseUrl,
         status: llm ? 'ready' : 'loading',
@@ -496,7 +871,9 @@ function getPrompt() {
     const modeIndicator = modeText ? `[${modeText}] ` : '';
     return ACCENT('❯ ') + DIM(modeIndicator);
 }
-async function handleInput(input) {
+async function handleInput(input, abortSignal, options = {}) {
+    const redrawPrompt = options.redrawPrompt !== false;
+    const shouldUpdateStatus = options.updateStatus !== false;
     const text = input.trim();
     if (!text)
         return;
@@ -509,13 +886,21 @@ async function handleInput(input) {
         llm,
         runtime,
         sessionId: currentSession?.id,
+        ensureSession: ensureCurrentSession,
+        setSession: setCurrentSession,
+        getSession: getCurrentSession,
+        abortSignal,
+        writeOutput: command_panel_1.writeOutputPreservingInput,
+        writeLine: command_panel_1.writeLinePreservingInput,
     };
+    let pendingSessionPicker;
     try {
         const parsed = (0, parser_1.parseInput)(text);
         if (parsed.isCommand) {
             const cmd = (0, commands_1.findCommand)(parsed.name);
             if (cmd) {
                 const result = await cmd.execute(ctx, parsed.args);
+                pendingSessionPicker = result.sessionPicker;
                 // executeChat 会被 cmd.execute 调用，如果需要
                 if (!result.continueAsChat) {
                     // 命令完成后的输出已经在 cmd.execute 中处理
@@ -540,9 +925,16 @@ async function handleInput(input) {
         console.log(ERROR(`Error: ${err.message || String(err)}`));
     }
     // 显示状态栏
-    updateStatusBar();
+    if (shouldUpdateStatus) {
+        updateStatusBar();
+    }
     // 重新显示 prompt
-    (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+    if (redrawPrompt) {
+        (0, command_panel_1.redrawInputWithPrompt)(currentInput);
+    }
+    if (pendingSessionPicker) {
+        showResumePicker(pendingSessionPicker);
+    }
 }
 /**
  * 更新状态栏显示
@@ -563,7 +955,17 @@ function updateStatusBar() {
         mcpTotal: mcpStatus.length,
     };
     // 在 prompt 上一行显示状态栏
-    console.log((0, status_bar_1.renderStatusBar)(stats));
+    if (snapshot.config.ui?.renderer === 'v2') {
+        (0, command_panel_1.setInputStatusText)((0, ui_v2_1.renderV2StatusBadge)({
+            ...stats,
+            sessionId: currentSession?.id,
+            modeText: (0, types_1.getModeDisplayText)(snapshot.permissionMode) || undefined,
+            width: process.stdout.columns || 80,
+        }));
+    }
+    else {
+        console.log((0, status_bar_1.renderStatusBar)(stats));
+    }
 }
 // 接口变量（用于兼容性，主要逻辑通过 keypress 处理）
 let rl = null;
@@ -584,7 +986,13 @@ async function main() {
     (0, config_dir_1.ensureConfigDir)();
     (0, global_config_1.recordFirstStartTime)();
     const projectPath = process.cwd();
-    const cliConfig = (0, config_1.loadConfig)();
+    const uiRenderer = parseCliUIRenderer(args);
+    const cliConfig = (0, config_1.loadConfig)(uiRenderer ? { ui: { renderer: uiRenderer } } : {});
+    (0, command_panel_1.setInputPromptRenderer)(cliConfig.ui?.renderer === 'v2' ? 'v2' : 'legacy');
+    (0, command_panel_1.setInputRenderContextProvider)(() => (cliConfig.ui?.renderer === 'v2' && (0, multiline_input_1.isMultilineActive)()
+        ? { prefixLines: (0, multiline_input_1.getMultilineLines)() }
+        : {}));
+    (0, file_completion_1.setFileCompletionPromptRenderer)(cliConfig.ui?.renderer === 'v2' ? 'v2' : 'legacy');
     // Load project memory
     const memories = (0, storage_1.loadAllMemories)(projectPath);
     const memoryContent = memories.length > 0
@@ -615,8 +1023,6 @@ async function main() {
             currentPlan: s.currentPlan,
         });
     });
-    currentSession = (0, session_storage_1.createSession)(projectPath, cliConfig.model);
-    (0, global_config_1.incrementSessionCount)();
     if ((0, config_1.isConfigured)(cliConfig)) {
         try {
             llm = new llm_1.LLMService({
@@ -656,6 +1062,10 @@ async function main() {
     // 提示
     console.log(SUCCESS('✔ System initialized'));
     console.log(DIM('  Type /help for commands, /exit to quit'));
+    if (cliConfig.ui?.renderer === 'v2') {
+        console.log(DIM('  UI v2 preview enabled: command palette and session picker'));
+        console.log((0, ui_v2_1.renderV2FooterHint)(process.stdout.columns || 80));
+    }
     if (!(0, config_1.isConfigured)(cliConfig)) {
         console.log(WARN('  ⚠ LLM not configured — set OPENHORSE_API_KEY'));
     }
@@ -687,6 +1097,9 @@ async function main() {
         }
     });
     // 初始 prompt
+    if (cliConfig.ui?.renderer === 'v2') {
+        updateStatusBar();
+    }
     (0, command_panel_1.redrawInputWithPrompt)('');
 }
 main().catch(err => {