@xfe-repo/cli 2.0.11 → 2.0.12

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @xfe-repo/cli
 
+## 2.0.12
+
+### Patch Changes
+
+- 优化体验
+- Updated dependencies
+  - @xfe-repo/cli-presets@2.0.7
+  - @xfe-repo/cli-core@2.0.7
+
 ## 2.0.11
 
 ### Patch Changes

package/dist/app.js

@@ -10,7 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * 统一使用 useKeymap 注册全局快捷键，避免多 useInput 冲突
  */
 import { useState, useEffect, useCallback, useRef, useSyncExternalStore } from 'react';
-import { Box, Static, Text, useApp } from 'ink';
+import { Box, Static, Text, useApp, useWindowSize } from 'ink';
 import { ConfirmInput, Spinner } from '@inkjs/ui';
 import { InkLogger } from './adapters/ink-adapter.js';
 import { useLogs } from './hooks/use-adapters.js';
@@ -18,6 +18,8 @@ import { KeymapProvider, useKeymap, KeymapLayer } from './hooks/use-keymap.js';
 import { useSessionManager } from './hooks/use-session-manager.js';
 import { MenuView } from './views/MenuView.js';
 import { RunnerView } from './views/RunnerView.js';
+const BOTTOM_RESERVED_ROWS = 1;
+const MIN_VIEW_ROWS = 1;
 // ============================================================
 // App
 // ============================================================
@@ -163,6 +165,8 @@ function AppInner({ runner, toast, scriptName }) {
     const emptyLoggerRef = useRef(new InkLogger());
     const activeLogger = activeSession?.logger ?? emptyLoggerRef.current;
     const { entries: logEntries } = useLogs(activeLogger);
+    const { rows: terminalRows } = useWindowSize();
+    const availableViewRows = resolveAvailableViewRows({ terminalRows, staticRows: logEntries.length });
     // 当 session 被移除但 view 仍为 session 时，自动回退到菜单（直接命令模式不回退，等待 doExit 完成）
     useEffect(() => {
         if (scriptName)
@@ -172,16 +176,16 @@ function AppInner({ runner, toast, scriptName }) {
         }
     }, [view, sessionManager.sessions, scriptName]);
     // ── 渲染 ──
-    const renderView = () => {
+    const renderView = (availableRows) => {
         switch (view.type) {
             case 'loading':
                 return _jsx(Spinner, { label: "\u521D\u59CB\u5316\u63D2\u4EF6..." });
             case 'menu':
-                return (_jsx(MenuView, { projectName: projectDisplayName, commandsWithSource: runner.getCommandsWithSource(), activeSessions: sessionManager.activeSessions, runningCommandNames: sessionManager.runningScriptNames, badges: badges, storeSnapshot: storeSnapshot, toast: toast, onSelect: handleSelect, onFocusSession: handleFocusSession, onExit: handleExit, onUserInput: handleUserInput }));
+                return (_jsx(MenuView, { availableRows: availableRows, projectName: projectDisplayName, commandsWithSource: runner.getCommandsWithSource(), activeSessions: sessionManager.activeSessions, runningCommandNames: sessionManager.runningScriptNames, badges: badges, storeSnapshot: storeSnapshot, toast: toast, onSelect: handleSelect, onFocusSession: handleFocusSession, onExit: handleExit, onUserInput: handleUserInput }));
             case 'session': {
                 if (!activeSession)
                     return null;
-                return (_jsx(RunnerView, { projectName: projectDisplayName, scriptName: activeSession.scriptName, startTime: activeSession.startTime, endTime: activeSession.endTime, prompt: activeSession.prompt, spinner: activeSession.spinner, badges: badges, storeSnapshot: storeSnapshot, hasError: activeSession.status === 'error', isCompleted: activeSession.status === 'completed', isSingleCommand: !!scriptName, isReadOnly: activeSession.isReadOnly }));
+                return (_jsx(RunnerView, { availableRows: availableRows, projectName: projectDisplayName, scriptName: activeSession.scriptName, startTime: activeSession.startTime, endTime: activeSession.endTime, prompt: activeSession.prompt, spinner: activeSession.spinner, badges: badges, storeSnapshot: storeSnapshot, hasError: activeSession.status === 'error', isCompleted: activeSession.status === 'completed', isSingleCommand: !!scriptName, isReadOnly: activeSession.isReadOnly }));
             }
             case 'exit-confirm':
                 return (_jsxs(Box, { flexDirection: "column", gap: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["\u5F53\u524D\u6709 ", sessionManager.runningSessions.length, " \u4E2A\u4EFB\u52A1\u6B63\u5728\u8FD0\u884C"] }), _jsx(Text, { children: "\u9000\u51FA\u5C06\u7EC8\u6B62\u6240\u6709\u8FD0\u884C\u4E2D\u7684\u4EFB\u52A1\uFF0C\u786E\u8BA4\u9000\u51FA\uFF1F(\u56DE\u8F66\u76F4\u63A5\u9000\u51FA)" }), _jsx(ConfirmInput, { onConfirm: doExit, onCancel: () => setView({ type: 'menu' }) })] }));
@@ -189,7 +193,7 @@ function AppInner({ runner, toast, scriptName }) {
                 return (_jsx(Box, { children: _jsxs(Text, { color: "red", children: ["ERROR: ", view.message] }) }));
         }
     };
-    return (_jsxs(_Fragment, { children: [_jsx(Static, { items: logEntries, children: (entry, i) => _jsx(LogLine, { entry: entry }, `${entry.timestamp}-${i}`) }), renderView()] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Static, { items: logEntries, children: (entry, i) => _jsx(LogLine, { entry: entry }, `${entry.timestamp}-${i}`) }), _jsx(Box, { flexDirection: "column", height: availableViewRows, overflow: "hidden", children: renderView(availableViewRows) })] }));
 }
 // ─── Render Helpers ─────────────────────────────────────────
 function LogLine({ entry }) {
@@ -204,4 +208,7 @@ function LogLine({ entry }) {
         return _jsx(Text, { color: color, children: entry.message });
     return _jsx(Text, { children: entry.message });
 }
+function resolveAvailableViewRows({ terminalRows, staticRows }) {
+    return Math.max(MIN_VIEW_ROWS, terminalRows - staticRows - BOTTOM_RESERVED_ROWS);
+}
 //# sourceMappingURL=app.js.map

package/dist/components/Prompts/FuzzyPathPrompt.js

@@ -8,9 +8,15 @@ import fs from 'fs';
 import path from 'path';
 import { useKeymap, KeymapLayer } from '../../hooks/use-keymap.js';
 import { useSelectableList } from './use-selectable-list.js';
-import { OptionList, SearchBar } from './OptionList.js';
-export const FuzzyPathPrompt = memo(function FuzzyPathPrompt({ question, onSubmit }) {
+import { OptionList, SearchBar, resolveOptionPageSize } from './OptionList.js';
+const SEARCH_PROMPT_RESERVED_ROWS = 3;
+export const FuzzyPathPrompt = memo(function FuzzyPathPrompt({ question, onSubmit, maxContentRows }) {
     const options = useMemo(() => collectPaths(question.rootPath || '.', question.itemType || 'any', question.excludePath).map((p) => ({ key: p, label: p, value: p })), [question.rootPath, question.itemType, question.excludePath]);
+    const pageSize = resolveOptionPageSize({
+        pageSize: question.pageSize,
+        maxRows: maxContentRows,
+        reservedRows: SEARCH_PROMPT_RESERVED_ROWS,
+    });
     const { searchText, filtered, selectedIndex, selectedItem } = useSelectableList({
         items: options,
         searchable: true,
@@ -23,7 +29,7 @@ export const FuzzyPathPrompt = memo(function FuzzyPathPrompt({ question, onSubmi
         },
         layer: KeymapLayer.Navigation,
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: question.pageSize ?? 10 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: pageSize }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
 });
 // ─── Helpers ────────────────────────────────────────────────
 function collectPaths(rootPath, itemType, excludePath) {

package/dist/components/Prompts/ListPrompt.js

@@ -6,11 +6,13 @@ import { memo } from 'react';
 import { Box, Text } from 'ink';
 import { useKeymap, KeymapLayer } from '../../hooks/use-keymap.js';
 import { useSelectableList } from './use-selectable-list.js';
-import { OptionList } from './OptionList.js';
+import { OptionList, resolveOptionPageSize } from './OptionList.js';
 import { normalizeChoices } from './index.js';
-export const ListPrompt = memo(function ListPrompt({ question, onSubmit }) {
+const LIST_PROMPT_RESERVED_ROWS = 2;
+export const ListPrompt = memo(function ListPrompt({ question, onSubmit, maxContentRows }) {
     const options = normalizeChoices(question.choices);
     const defaultIndex = question.default != null ? options.findIndex((o) => o.value === question.default) : -1;
+    const pageSize = resolveOptionPageSize({ pageSize: question.pageSize, maxRows: maxContentRows, reservedRows: LIST_PROMPT_RESERVED_ROWS });
     const { filtered, selectedIndex, selectedItem } = useSelectableList({ items: options, defaultIndex });
     useKeymap({
         key: 'return',
@@ -20,6 +22,6 @@ export const ListPrompt = memo(function ListPrompt({ question, onSubmit }) {
         },
         layer: KeymapLayer.Navigation,
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: question.pageSize ?? 10 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: pageSize }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
 });
 //# sourceMappingURL=ListPrompt.js.map

package/dist/components/Prompts/OptionList.d.ts

@@ -13,10 +13,16 @@ interface OptionListProps {
     readonly pageSize: number;
     readonly mode?: 'single' | 'checkbox';
 }
+interface ResolveOptionPageSizeOptions {
+    readonly pageSize?: number;
+    readonly maxRows?: number;
+    readonly reservedRows?: number;
+}
 export declare const OptionList: import("react").NamedExoticComponent<OptionListProps>;
 export declare const SearchBar: import("react").NamedExoticComponent<{
     readonly text: string;
 }>;
+export declare function resolveOptionPageSize({ pageSize, maxRows, reservedRows }: ResolveOptionPageSizeOptions): number;
 export declare function computeWindow<T>(items: readonly T[], selectedIndex: number, pageSize: number): {
     visibleItems: T[];
     startIndex: number;

package/dist/components/Prompts/OptionList.js

@@ -27,6 +27,11 @@ const CHECKBOX_OPTION_PREFIX_WIDTH = 4;
 const FOCUSED_MARK = '❯';
 const EMPTY_MARK = ' ';
 const DESCRIPTION_COLOR = 'gray';
+const DEFAULT_OPTION_PAGE_SIZE = 10;
+const MIN_OPTION_PAGE_SIZE = 1;
+const OPTION_LIST_TOP_MARGIN_ROWS = 1;
+const OPTION_CONTENT_ROW_HEIGHT = 2;
+const SCROLL_INDICATOR_ROWS = 2;
 const OptionPrefix = memo(function OptionPrefix({ mode, checked, isFocused, }) {
     const prefixWidth = mode === 'checkbox' ? CHECKBOX_OPTION_PREFIX_WIDTH : OPTION_PREFIX_WIDTH;
     return (_jsxs(Box, { width: prefixWidth, flexShrink: 0, children: [_jsx(Text, { color: isFocused ? 'cyan' : undefined, children: isFocused ? FOCUSED_MARK : EMPTY_MARK }), mode === 'checkbox' && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(CheckboxIcon, { checked: checked })] })), _jsx(Text, { children: " " })] }));
@@ -38,6 +43,15 @@ const CheckboxIcon = memo(function CheckboxIcon({ checked }) {
     return _jsx(Text, { color: checked ? 'green' : 'gray', children: checked ? '◉' : '○' });
 });
 // ─── Helpers ────────────────────────────────────────────────
+export function resolveOptionPageSize({ pageSize, maxRows, reservedRows = 0 }) {
+    const requestedPageSize = pageSize ?? DEFAULT_OPTION_PAGE_SIZE;
+    if (maxRows == null)
+        return requestedPageSize;
+    const availableOptionRows = maxRows - reservedRows - OPTION_LIST_TOP_MARGIN_ROWS - SCROLL_INDICATOR_ROWS;
+    const safeOptionRows = Math.max(OPTION_CONTENT_ROW_HEIGHT, availableOptionRows);
+    const heightLimitedPageSize = Math.floor(safeOptionRows / OPTION_CONTENT_ROW_HEIGHT);
+    return Math.max(MIN_OPTION_PAGE_SIZE, Math.min(requestedPageSize, heightLimitedPageSize));
+}
 export function computeWindow(items, selectedIndex, pageSize) {
     const totalItems = items.length;
     const windowSize = Math.min(pageSize, totalItems);

package/dist/components/Prompts/SearchCheckboxPrompt.js

@@ -6,9 +6,11 @@ import { memo, useState, useMemo } from 'react';
 import { Box, Text } from 'ink';
 import { useKeymap, KeymapLayer } from '../../hooks/use-keymap.js';
 import { useSelectableList } from './use-selectable-list.js';
-import { OptionList, SearchBar } from './OptionList.js';
+import { OptionList, SearchBar, resolveOptionPageSize } from './OptionList.js';
 import { normalizeChoices } from './index.js';
-export const SearchCheckboxPrompt = memo(function SearchCheckboxPrompt({ question, onSubmit }) {
+const SEARCH_PROMPT_RESERVED_ROWS = 3;
+const ERROR_MESSAGE_ROWS = 2;
+export const SearchCheckboxPrompt = memo(function SearchCheckboxPrompt({ question, onSubmit, maxContentRows }) {
     const defaultSet = useMemo(() => {
         if (question.default == null)
             return new Set();
@@ -19,6 +21,11 @@ export const SearchCheckboxPrompt = memo(function SearchCheckboxPrompt({ questio
     const defaultIndex = firstDefault != null ? allOptions.findIndex((o) => o.value === firstDefault) : -1;
     const [items, setItems] = useState(allOptions);
     const [error, setError] = useState('');
+    const pageSize = resolveOptionPageSize({
+        pageSize: question.pageSize,
+        maxRows: maxContentRows,
+        reservedRows: SEARCH_PROMPT_RESERVED_ROWS + (error ? ERROR_MESSAGE_ROWS : 0),
+    });
     const { searchText, filtered, selectedIndex } = useSelectableList({ items, defaultIndex, searchable: true });
     const toggleItem = () => {
         const target = filtered[selectedIndex];
@@ -45,6 +52,6 @@ export const SearchCheckboxPrompt = memo(function SearchCheckboxPrompt({ questio
     useKeymap({ key: ' ', handler: toggleItem, layer: KeymapLayer.Navigation });
     useKeymap({ key: 'ctrl+o', handler: toggleAll, layer: KeymapLayer.Navigation });
     useKeymap({ key: 'return', handler: submit, layer: KeymapLayer.Navigation });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { mode: "checkbox", options: filtered, selectedIndex: selectedIndex, pageSize: question.pageSize ?? 10 }), error && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "red", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u7A7A\u683C \u5207\u6362 Ctrl+O \u5168\u9009 \u21B5 \u786E\u8BA4" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { mode: "checkbox", options: filtered, selectedIndex: selectedIndex, pageSize: pageSize }), error && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "red", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u7A7A\u683C \u5207\u6362 Ctrl+O \u5168\u9009 \u21B5 \u786E\u8BA4" }) })] }));
 });
 //# sourceMappingURL=SearchCheckboxPrompt.js.map

package/dist/components/Prompts/SearchListPrompt.js

@@ -6,11 +6,17 @@ import { memo } from 'react';
 import { Box, Text } from 'ink';
 import { useKeymap, KeymapLayer } from '../../hooks/use-keymap.js';
 import { useSelectableList } from './use-selectable-list.js';
-import { OptionList, SearchBar } from './OptionList.js';
+import { OptionList, SearchBar, resolveOptionPageSize } from './OptionList.js';
 import { normalizeChoices } from './index.js';
-export const SearchListPrompt = memo(function SearchListPrompt({ question, onSubmit }) {
+const SEARCH_PROMPT_RESERVED_ROWS = 3;
+export const SearchListPrompt = memo(function SearchListPrompt({ question, onSubmit, maxContentRows }) {
     const options = normalizeChoices(question.choices);
     const defaultIndex = question.default != null ? options.findIndex((o) => o.value === question.default) : -1;
+    const pageSize = resolveOptionPageSize({
+        pageSize: question.pageSize,
+        maxRows: maxContentRows,
+        reservedRows: SEARCH_PROMPT_RESERVED_ROWS,
+    });
     const { searchText, filtered, selectedIndex, selectedItem } = useSelectableList({
         items: options,
         defaultIndex,
@@ -24,6 +30,6 @@ export const SearchListPrompt = memo(function SearchListPrompt({ question, onSub
         },
         layer: KeymapLayer.Navigation,
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: question.pageSize ?? 10 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SearchBar, { text: searchText }), _jsx(OptionList, { options: filtered, selectedIndex: selectedIndex, pageSize: pageSize }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u8F93\u5165\u641C\u7D22 \u2191\u2193 \u9009\u62E9 \u21B5 \u786E\u8BA4" }) })] }));
 });
 //# sourceMappingURL=SearchListPrompt.js.map

package/dist/components/Prompts/index.d.ts

@@ -3,6 +3,7 @@ import type { SelectOption } from './use-selectable-list.js';
 export interface PromptViewProps {
     readonly question: PromptQuestion;
     readonly onSubmit: (value: any) => void;
+    readonly maxContentRows?: number;
 }
 export { InputPrompt } from './InputPrompt.js';
 export { ConfirmPrompt } from './ConfirmPrompt.js';

package/dist/components/Prompts/index.js

@@ -16,19 +16,19 @@ export { ListPrompt } from './ListPrompt.js';
 export { SearchListPrompt } from './SearchListPrompt.js';
 export { SearchCheckboxPrompt } from './SearchCheckboxPrompt.js';
 export { FuzzyPathPrompt } from './FuzzyPathPrompt.js';
-export const Prompt = memo(function Prompt({ question, onSubmit }) {
+export const Prompt = memo(function Prompt({ question, onSubmit, maxContentRows }) {
     switch (question.type) {
         case 'confirm':
             return _jsx(ConfirmPrompt, { question: question, onSubmit: onSubmit });
         case 'search-list':
-            return _jsx(SearchListPrompt, { question: question, onSubmit: onSubmit });
+            return _jsx(SearchListPrompt, { question: question, onSubmit: onSubmit, maxContentRows: maxContentRows });
         case 'search-checkbox':
-            return _jsx(SearchCheckboxPrompt, { question: question, onSubmit: onSubmit });
+            return _jsx(SearchCheckboxPrompt, { question: question, onSubmit: onSubmit, maxContentRows: maxContentRows });
         case 'fuzzy-path':
-            return _jsx(FuzzyPathPrompt, { question: question, onSubmit: onSubmit });
+            return _jsx(FuzzyPathPrompt, { question: question, onSubmit: onSubmit, maxContentRows: maxContentRows });
         case 'list':
         case 'rawlist':
-            return _jsx(ListPrompt, { question: question, onSubmit: onSubmit });
+            return _jsx(ListPrompt, { question: question, onSubmit: onSubmit, maxContentRows: maxContentRows });
         case 'input':
         default:
             return _jsx(InputPrompt, { question: question, onSubmit: onSubmit });

package/dist/hooks/use-adapters.js

@@ -17,20 +17,18 @@ import { useState, useEffect, useCallback, useRef } from 'react';
  */
 const FLUSH_DELAY_MS = 16;
 export function useLogs(logger) {
-    const [entries, setEntries] = useState(() => logger.getUnrenderedEntries());
+    const [entries, setEntries] = useState([]);
     const bufferRef = useRef([]);
     const timerRef = useRef(null);
     const pendingRef = useRef([]);
     useEffect(() => {
         // 恢复上一个 logger 未刷新的缓冲条目（解决 session 关闭时日志丢失的竞态）
         const pending = pendingRef.current;
-        if (pending.length > 0) {
-            setEntries((prev) => [...prev, ...pending, ...logger.getUnrenderedEntries()]);
+        const unrendered = logger.getUnrenderedEntries();
+        if (pending.length > 0 || unrendered.length > 0) {
+            setEntries((prev) => [...prev, ...pending, ...unrendered]);
             pendingRef.current = [];
         }
-        else {
-            setEntries(logger.getUnrenderedEntries());
-        }
         const flushBuffer = () => {
             timerRef.current = null;
             const batch = bufferRef.current;

package/dist/views/MenuView.d.ts

@@ -8,6 +8,7 @@ import type { CommandWithSource, StatusBadge, PluginStoreSnapshot } from '@xfe-r
 import type { RunSession } from '../hooks/use-session-manager.js';
 import type { InkToast } from '../adapters/ink-adapter.js';
 interface MenuViewProps {
+    readonly availableRows: number;
     readonly projectName: string;
     readonly commandsWithSource: CommandWithSource[];
     readonly activeSessions: [string, RunSession][];

package/dist/views/MenuView.js

@@ -6,7 +6,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * 所有交互逻辑已下沉到子组件和 useKeymap 系统
  */
 import { useState, useMemo, useEffect, useCallback, memo } from 'react';
-import { Box, Text, useWindowSize } from 'ink';
+import { Box, Text } from 'ink';
 import Link from 'ink-link';
 import { resolveBadgeProp } from '@xfe-repo/cli-core';
 import { buildCommandCatalog } from '../completion/catalog.js';
@@ -23,17 +23,14 @@ const LOGO_HEIGHT = 7;
 const BASE_CHROME_HEIGHT = 12;
 const TASK_GRID_CHROME_HEIGHT = 6;
 const MIN_SUGGESTIONS = 3;
-// 终端底部保留空行数，避免光标挤压界面（尤其是多行输入时）
-const BOTTOM_RESERVE = 0;
+const MIN_VISIBLE_SUGGESTIONS = 1;
 // ─── Component ──────────────────────────────────────────────
-export const MenuView = memo(function MenuView({ projectName, commandsWithSource, activeSessions, runningCommandNames, badges, storeSnapshot, toast, onSelect, onFocusSession, onExit, onUserInput, }) {
+export const MenuView = memo(function MenuView({ availableRows, projectName, commandsWithSource, activeSessions, runningCommandNames, badges, storeSnapshot, toast, onSelect, onFocusSession, onExit, onUserInput, }) {
     const hasActiveSessions = activeSessions.length > 0;
     const [focusArea, setFocusArea] = useState('commands');
-    // ── 终端高度自适应 ──
-    const { rows: terminalRows } = useWindowSize();
     const chromeHeight = BASE_CHROME_HEIGHT + (hasActiveSessions ? TASK_GRID_CHROME_HEIGHT : 0);
-    const showLogo = terminalRows >= chromeHeight + LOGO_HEIGHT + MIN_SUGGESTIONS + BOTTOM_RESERVE;
-    const maxSuggestions = Math.max(MIN_SUGGESTIONS, terminalRows - chromeHeight - (showLogo ? LOGO_HEIGHT : 0) - BOTTOM_RESERVE);
+    const showLogo = availableRows >= chromeHeight + LOGO_HEIGHT + MIN_SUGGESTIONS;
+    const maxSuggestions = Math.max(MIN_VISIBLE_SUGGESTIONS, availableRows - chromeHeight - (showLogo ? LOGO_HEIGHT : 0));
     const effectiveFocus = hasActiveSessions ? focusArea : 'commands';
     // 单一共享定时器驱动所有任务卡片的时间刷新
     useElapsedTime(hasActiveSessions ? 1 : null);

package/dist/views/PromptView.d.ts

@@ -3,6 +3,12 @@
  *
  * 根据 PromptQuestion 类型路由到对应的 Prompt 组件
  */
-import type { PromptViewProps } from '../components/Prompts/index.js';
+import type { PromptViewProps as PromptProps } from '../components/Prompts/index.js';
+interface PromptViewProps {
+    readonly question: PromptProps['question'];
+    readonly onSubmit: PromptProps['onSubmit'];
+    readonly maxRows?: number;
+}
 export declare const PromptView: import("react").NamedExoticComponent<PromptViewProps>;
+export {};
 //# sourceMappingURL=PromptView.d.ts.map

package/dist/views/PromptView.js

@@ -7,8 +7,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
 import { Box, Text } from 'ink';
 import { Prompt } from '../components/Prompts/index.js';
+// ─── Constants ──────────────────────────────────────────────
+const PROMPT_VIEW_CHROME_ROWS = 3;
+const MIN_PROMPT_CONTENT_ROWS = 1;
 // ─── Main Component ─────────────────────────────────────────
-export const PromptView = memo(function PromptView({ question, onSubmit }) {
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, overflowX: "hidden", children: [_jsxs(Text, { bold: true, wrap: "truncate-end", children: [_jsx(Text, { color: "green", children: "?" }), " ", question.message, question.default != null && question.type !== 'confirm' && _jsxs(Text, { dimColor: true, children: [" (", String(question.default), ")"] })] }), _jsx(Prompt, { question: question, onSubmit: onSubmit })] }));
+export const PromptView = memo(function PromptView({ question, onSubmit, maxRows }) {
+    const maxContentRows = maxRows == null ? undefined : Math.max(MIN_PROMPT_CONTENT_ROWS, maxRows - PROMPT_VIEW_CHROME_ROWS);
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, maxHeight: maxRows, overflow: "hidden", children: [_jsxs(Text, { bold: true, wrap: "truncate-end", children: [_jsx(Text, { color: "green", children: "?" }), " ", question.message, question.default != null && question.type !== 'confirm' && _jsxs(Text, { dimColor: true, children: [" (", String(question.default), ")"] })] }), _jsx(Prompt, { question: question, onSubmit: onSubmit, maxContentRows: maxContentRows })] }));
 });
 //# sourceMappingURL=PromptView.js.map

package/dist/views/RunnerView.d.ts

@@ -4,6 +4,7 @@
 import type { InkPrompt, InkSpinner } from '../adapters/ink-adapter.js';
 import type { StatusBadge, PluginStoreSnapshot } from '@xfe-repo/cli-core';
 interface RunnerViewProps {
+    readonly availableRows: number;
     readonly projectName: string;
     readonly scriptName: string;
     readonly startTime: number;

package/dist/views/RunnerView.js

@@ -9,11 +9,48 @@ import { PromptView } from './PromptView.js';
 import { Logo } from '../components/Logo.js';
 import { SpinnerStatus } from '../components/SpinnerStatus.js';
 import { StatusBar } from '../components/StatusBar.js';
-export const RunnerView = memo(function RunnerView({ projectName, scriptName, startTime, endTime, prompt, spinner, badges, storeSnapshot, hasError, isCompleted, isSingleCommand, isReadOnly, }) {
+// ─── Constants ──────────────────────────────────────────────
+const LOGO_HEIGHT = 7;
+const STATUS_BAR_HEIGHT = 3;
+const SPINNER_STATUS_HEIGHT = 1;
+const CONTENT_GAP_HEIGHT = 1;
+const MIN_PROMPT_ROWS = 1;
+const PROMPT_WITH_LOGO_MIN_ROWS = 8;
+export const RunnerView = memo(function RunnerView({ availableRows, projectName, scriptName, startTime, endTime, prompt, spinner, badges, storeSnapshot, hasError, isCompleted, isSingleCommand, isReadOnly, }) {
     const { request, complete } = usePrompt(prompt);
     const spinnerState = useSpinnerState(spinner);
-    return (_jsxs(_Fragment, { children: [_jsx(Logo, {}), _jsxs(Box, { flexDirection: "column", gap: 1, overflowX: "hidden", children: [_jsx(SpinnerStatus, { state: spinnerState }), !isReadOnly && request && _jsx(PromptView, { question: request.question, onSubmit: complete }, request.id)] }), !isSingleCommand && (_jsxs(Box, { gap: 1, borderStyle: "round", borderColor: isReadOnly ? 'blue' : 'cyan', paddingX: 1, overflowX: "hidden", children: [_jsx(StatusBar, { projectName: projectName, scriptName: scriptName, startTime: startTime, endTime: endTime, badges: badges, storeSnapshot: storeSnapshot }), _jsx(StatusHint, { isReadOnly: isReadOnly, hasError: hasError, isCompleted: isCompleted })] }))] }));
+    const hasPrompt = !isReadOnly && !!request;
+    const layout = resolveRunnerLayout({
+        availableRows,
+        hasPrompt,
+        hasSpinnerStatus: isSpinnerStatusVisible(spinnerState),
+        hasStatusBar: !isSingleCommand,
+    });
+    return (_jsxs(_Fragment, { children: [layout.showLogo && _jsx(Logo, {}), _jsxs(Box, { flexDirection: "column", gap: 1, overflowX: "hidden", children: [_jsx(SpinnerStatus, { state: spinnerState }), hasPrompt && _jsx(PromptView, { question: request.question, maxRows: layout.promptRows, onSubmit: complete }, request.id)] }), !isSingleCommand && (_jsxs(Box, { gap: 1, borderStyle: "round", borderColor: isReadOnly ? 'blue' : 'cyan', paddingX: 1, overflowX: "hidden", children: [_jsx(StatusBar, { projectName: projectName, scriptName: scriptName, startTime: startTime, endTime: endTime, badges: badges, storeSnapshot: storeSnapshot }), _jsx(StatusHint, { isReadOnly: isReadOnly, hasError: hasError, isCompleted: isCompleted })] }))] }));
 });
+// ─── Layout Helpers ────────────────────────────────────────
+function resolveRunnerLayout({ availableRows, hasPrompt, hasSpinnerStatus, hasStatusBar }) {
+    const fixedRows = resolveFixedRows({ hasSpinnerStatus, hasStatusBar });
+    if (!hasPrompt) {
+        return { showLogo: availableRows >= fixedRows + LOGO_HEIGHT };
+    }
+    const showLogo = availableRows >= fixedRows + LOGO_HEIGHT + PROMPT_WITH_LOGO_MIN_ROWS;
+    const logoRows = showLogo ? LOGO_HEIGHT : 0;
+    const availablePromptRows = availableRows - fixedRows - logoRows;
+    return {
+        showLogo,
+        promptRows: Math.max(MIN_PROMPT_ROWS, availablePromptRows),
+    };
+}
+function resolveFixedRows({ hasSpinnerStatus, hasStatusBar, }) {
+    const spinnerRows = hasSpinnerStatus ? SPINNER_STATUS_HEIGHT : 0;
+    const contentGapRows = hasSpinnerStatus ? CONTENT_GAP_HEIGHT : 0;
+    const statusBarRows = hasStatusBar ? STATUS_BAR_HEIGHT : 0;
+    return spinnerRows + contentGapRows + statusBarRows;
+}
+function isSpinnerStatusVisible(state) {
+    return state.active || !!state.variant;
+}
 function StatusHint({ isReadOnly, hasError, isCompleted }) {
     if (isReadOnly) {
         const prefix = hasError ? '错误发生，' : isCompleted ? '任务完成，' : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/cli",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "XFE CLI - Ink-based terminal UI for project scaffolding",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,8 +17,8 @@
     "ink-link": "^5.0.0",
     "react": "^19.1.0",
     "zod": "^4.3.6",
-    "@xfe-repo/cli-presets": "2.0.6",
-    "@xfe-repo/cli-core": "2.0.6"
+    "@xfe-repo/cli-core": "2.0.7",
+    "@xfe-repo/cli-presets": "2.0.7"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",