@xfe-repo/cli 2.0.13 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @xfe-repo/cli
 
+## 2.1.0
+
+### Minor Changes
+
+- 新增deploy自动部署支持
+
+### Patch Changes
+
+- Updated dependencies
+  - @xfe-repo/cli-presets@2.1.0
+  - @xfe-repo/cli-core@2.1.0
+
 ## 2.0.13
 
 ### Patch Changes

package/dist/app.js

@@ -20,6 +20,7 @@ import { MenuView } from './views/MenuView.js';
 import { RunnerView } from './views/RunnerView.js';
 const BOTTOM_RESERVED_ROWS = 1;
 const MIN_VIEW_ROWS = 1;
+const FORCE_EXIT_TIMEOUT_MS = 3000;
 // ============================================================
 // App
 // ============================================================
@@ -33,21 +34,31 @@ function AppInner({ runner, toast, scriptName }) {
     const store = runner.getStore();
     const storeSnapshot = useSyncExternalStore(store.subscribe, store.getState);
     const viewRef = useRef(view);
+    const isExitingRef = useRef(false);
     viewRef.current = view;
     const doExit = useCallback(() => {
+        if (isExitingRef.current)
+            return;
+        isExitingRef.current = true;
+        if (!scriptName)
+            setView({ type: 'exiting' });
         const ctx = runner.getContext();
         // 兜底：若异步清理被未完成的 git 等操作阻塞，强制退出
-        const forceExitTimer = setTimeout(() => process.exit(0), 3000);
-        ctx.sessions
-            .killAll()
-            .then(() => ctx.exec.killAll())
-            .then(() => runner.triggerCleanup())
-            .then(() => waitUntilRenderFlush())
-            .finally(() => {
-            clearTimeout(forceExitTimer);
-            exit();
-        });
-    }, [runner, exit, waitUntilRenderFlush]);
+        const forceExitTimer = setTimeout(() => process.exit(0), FORCE_EXIT_TIMEOUT_MS);
+        const cleanupAndExit = async () => {
+            try {
+                await ctx.sessions.killAll();
+                await ctx.exec.killAll();
+                await runner.triggerCleanup();
+                await waitUntilRenderFlush();
+            }
+            finally {
+                clearTimeout(forceExitTimer);
+                exit();
+            }
+        };
+        void cleanupAndExit();
+    }, [runner, scriptName, exit, waitUntilRenderFlush]);
     const sessionManager = useSessionManager({
         runner,
         directScriptName: scriptName,
@@ -189,6 +200,8 @@ function AppInner({ runner, toast, scriptName }) {
             }
             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' }) })] }));
+            case 'exiting':
+                return (_jsxs(Box, { flexDirection: "column", gap: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [_jsx(Spinner, { label: "\u6B63\u5728\u9000\u51FA..." }), _jsx(Text, { color: "gray", children: "\u6B63\u5728\u7EC8\u6B62\u4EFB\u52A1\u5E76\u91CA\u653E\u8D44\u6E90" })] }));
             case 'error':
                 return (_jsx(Box, { children: _jsxs(Text, { color: "red", children: ["ERROR: ", view.message] }) }));
         }

package/dist/components/StatusBar.js

@@ -7,23 +7,46 @@ import { Text } from 'ink';
 import Link from 'ink-link';
 import { resolveBadgeProp } from '@xfe-repo/cli-core';
 import { useElapsedTime, formatElapsed } from '../hooks/use-elapsed-time.js';
+const BADGE_REFRESH_START_TIME = Date.now();
 export const StatusBar = memo(function StatusBar({ projectName, scriptName, startTime, endTime, badges, storeSnapshot }) {
     const stopped = endTime !== undefined;
-    const elapsed = useElapsedTime(startTime, stopped);
     const statusBadges = useMemo(() => (badges ?? []).filter((b) => matchSlot(b, 'status')), [badges]);
-    return (_jsxs(Text, { dimColor: true, children: [projectName, scriptName && _jsxs(Text, { children: [" | ", scriptName] }), statusBadges.map((badge) => {
-                const value = storeSnapshot ? resolveBadgeProp(badge.value, storeSnapshot) : undefined;
-                if (!value)
-                    return null;
-                const resolvedColor = storeSnapshot ? resolveBadgeProp(badge.color, storeSnapshot) : undefined;
-                const resolvedUrl = storeSnapshot ? resolveBadgeProp(badge.url, storeSnapshot) : undefined;
-                const label = (_jsxs(Text, { color: resolvedColor, children: [badge.label, ": ", value] }));
-                return (_jsxs(Text, { children: [' | ', resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: label }) : label] }, badge.name));
-            }), elapsed !== null && _jsxs(Text, { children: [" | ", formatElapsed(stopped ? endTime - startTime : elapsed)] })] }));
+    const elapsed = useElapsedTime(startTime, stopped);
+    return (_jsxs(Text, { dimColor: true, children: [projectName, scriptName && _jsxs(Text, { children: [" | ", scriptName] }), statusBadges.map((badge) => (_jsx(StatusBadgeItem, { badge: badge, storeSnapshot: storeSnapshot }, badge.name))), elapsed !== null && _jsxs(Text, { children: [" | ", formatElapsed(stopped ? endTime - startTime : elapsed)] })] }));
+});
+const StatusBadgeItem = memo(function StatusBadgeItem({ badge, storeSnapshot }) {
+    useBadgeRefresh(badge);
+    const value = storeSnapshot ? resolveBadgeProp(badge.value, storeSnapshot) : undefined;
+    if (!value)
+        return null;
+    const resolvedColor = storeSnapshot ? resolveBadgeProp(badge.color, storeSnapshot) : undefined;
+    const resolvedIcon = storeSnapshot ? resolveBadgeProp(badge.icon, storeSnapshot) : undefined;
+    const resolvedUrl = storeSnapshot ? resolveBadgeProp(badge.url, storeSnapshot) : undefined;
+    const label = (_jsxs(Text, { color: resolvedColor, children: [badge.label, ": ", value, resolvedIcon ? ` ${resolvedIcon}` : ''] }));
+    return (_jsxs(Text, { children: [' | ', resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: label }) : label] }));
 });
 // ─── Helpers ────────────────────────────────────────────────
 /** 判断 badge 是否匹配目标 slot（兼容单个或数组） */
 function matchSlot(badge, target) {
     return Array.isArray(badge.slot) ? badge.slot.includes(target) : badge.slot === target;
 }
+function useBadgeRefresh(badge) {
+    const interval = resolveBadgeRefreshInterval(badge);
+    useElapsedTime(interval ? BADGE_REFRESH_START_TIME : null, false, interval);
+}
+function resolveBadgeRefreshInterval(badge) {
+    if (!badge.interval)
+        return undefined;
+    if (!Number.isFinite(badge.interval) || badge.interval <= 0)
+        return undefined;
+    if (!hasDynamicBadgeProp(badge))
+        return undefined;
+    return badge.interval;
+}
+function hasDynamicBadgeProp(badge) {
+    return (typeof badge.value === 'function' ||
+        typeof badge.color === 'function' ||
+        typeof badge.icon === 'function' ||
+        typeof badge.url === 'function');
+}
 //# sourceMappingURL=StatusBar.js.map

package/dist/hooks/use-elapsed-time.d.ts

@@ -4,7 +4,7 @@
  * 根据 startTime 计算并实时更新已用时间
  */
 /** 根据 startTime 实时计算经过的毫秒数，stopped 为 true 时停止计时并保留最终值 */
-export declare function useElapsedTime(startTime?: number | null, stopped?: boolean): number | null;
+export declare function useElapsedTime(startTime?: number | null, stopped?: boolean, intervalMs?: number): number | null;
 /** 将毫秒格式化为 MM:SS */
 export declare function formatElapsed(ms: number): string;
 //# sourceMappingURL=use-elapsed-time.d.ts.map

package/dist/hooks/use-elapsed-time.js

@@ -7,7 +7,7 @@ import { useState, useEffect, useRef } from 'react';
 const TIMER_INTERVAL_MS = 1000;
 const SECONDS_PER_MINUTE = 60;
 /** 根据 startTime 实时计算经过的毫秒数，stopped 为 true 时停止计时并保留最终值 */
-export function useElapsedTime(startTime, stopped = false) {
+export function useElapsedTime(startTime, stopped = false, intervalMs = TIMER_INTERVAL_MS) {
     const [elapsed, setElapsed] = useState(null);
     const intervalRef = useRef(null);
     useEffect(() => {
@@ -24,9 +24,9 @@ export function useElapsedTime(startTime, stopped = false) {
             return cleanup;
         intervalRef.current = setInterval(() => {
             setElapsed(Date.now() - startTime);
-        }, TIMER_INTERVAL_MS);
+        }, intervalMs);
         return cleanup;
-    }, [startTime, stopped]);
+    }, [startTime, stopped, intervalMs]);
     return elapsed;
 }
 /** 将毫秒格式化为 MM:SS */

package/dist/launcher.js

@@ -69,7 +69,7 @@ export async function launch(options) {
         exitOnCtrlC: false,
         incrementalRendering: true,
         concurrent: true,
-        alternateScreen: !scriptName,
+        alternateScreen: false,
         kittyKeyboard: { mode: !scriptName ? 'enabled' : 'disabled' },
     });
     await waitUntilExit();

package/dist/views/MenuView.js

@@ -19,6 +19,8 @@ import { Toast } from '../components/Toast.js';
 import { Commands } from '../components/Commands.js';
 // ─── Constants ──────────────────────────────────────────────
 const LOGO_HEIGHT = 7;
+const BADGE_REFRESH_START_TIME = Date.now();
+const HEADER_BADGE_SEPARATOR = '·';
 // 非建议区域的固定行数（header + commands chrome + footer 等）
 const BASE_CHROME_HEIGHT = 12;
 const TASK_GRID_CHROME_HEIGHT = 6;
@@ -68,29 +70,59 @@ export const MenuView = memo(function MenuView({ availableRows, projectName, com
         layer: KeymapLayer.Panel,
         isActive: effectiveFocus === 'tasks',
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [showLogo && _jsx(Logo, {}), _jsx(Box, { flexDirection: "column", margin: 1, flexShrink: 0, children: _jsxs(Text, { children: [_jsxs(Text, { color: "cyan", bold: true, children: ["\u5F53\u524D\u9879\u76EE:", ' '] }), _jsx(Text, { bold: true, children: projectName }), headerBadges.map((badge) => {
-                            const value = resolveBadgeProp(badge.value, storeSnapshot);
-                            if (!value)
-                                return null;
-                            const resolvedColor = resolveBadgeProp(badge.color, storeSnapshot);
-                            const resolvedUrl = resolveBadgeProp(badge.url, storeSnapshot);
-                            const content = (_jsxs(Text, { color: resolvedColor ?? 'gray', bold: true, children: ["[", badge.label, ": ", value, "]"] }));
-                            return _jsxs(Text, { children: [" ", resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: content }) : content] }, badge.name);
-                        })] }) }), hasActiveSessions && (_jsx(Box, { flexShrink: 0, children: _jsx(TaskGrid, { activeSessions: activeSessions, isFocused: effectiveFocus === 'tasks', onFocusSession: onFocusSession }) })), _jsx(Box, { flexShrink: 1, flexDirection: "column", overflow: "hidden", children: _jsx(Commands, { commandOptions: commandOptions, isActive: effectiveFocus === 'commands', maxSuggestions: maxSuggestions, onSelect: onSelect, onUserInput: onUserInput, onExit: onExit, onTabFallthrough: handleTabFallthrough }) }), _jsxs(Box, { flexDirection: "row", flexWrap: "wrap", justifyContent: "space-between", marginLeft: 1, flexShrink: 0, children: [footerBadges.length > 0 && (_jsx(Box, { flexDirection: "row", flexWrap: "wrap", children: footerBadges.map((badge) => {
-                            const value = resolveBadgeProp(badge.value, storeSnapshot);
-                            if (!value)
-                                return null;
-                            const resolvedColor = resolveBadgeProp(badge.color, storeSnapshot);
-                            const resolvedIcon = resolveBadgeProp(badge.icon, storeSnapshot);
-                            const resolvedUrl = resolveBadgeProp(badge.url, storeSnapshot);
-                            const prefix = resolvedIcon ?? '●';
-                            const content = (_jsxs(Text, { color: resolvedColor ?? 'gray', children: [prefix, " ", value] }));
-                            return (_jsx(Box, { marginRight: 2, children: resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: content }) : content }, badge.name));
-                        }) })), toasts.length > 0 && (_jsx(Box, { flexDirection: "column", alignItems: "flex-end", children: toasts.map((t) => (_jsx(Toast, { message: t.message, level: t.level }, t.id))) }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [showLogo && _jsx(Logo, {}), _jsxs(Box, { flexDirection: "row", flexWrap: "wrap", margin: 1, flexShrink: 0, children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "cyan", bold: true, children: ["\u5F53\u524D\u9879\u76EE:", ' '] }), _jsx(Text, { bold: true, children: projectName })] }), headerBadges.map((badge) => (_jsx(HeaderBadge, { badge: badge, storeSnapshot: storeSnapshot }, badge.name)))] }), hasActiveSessions && (_jsx(Box, { flexShrink: 0, children: _jsx(TaskGrid, { activeSessions: activeSessions, isFocused: effectiveFocus === 'tasks', onFocusSession: onFocusSession }) })), _jsx(Box, { flexShrink: 1, flexDirection: "column", overflow: "hidden", children: _jsx(Commands, { commandOptions: commandOptions, isActive: effectiveFocus === 'commands', maxSuggestions: maxSuggestions, onSelect: onSelect, onUserInput: onUserInput, onExit: onExit, onTabFallthrough: handleTabFallthrough }) }), _jsxs(Box, { flexDirection: "row", flexWrap: "wrap", justifyContent: "space-between", marginLeft: 1, flexShrink: 0, children: [footerBadges.length > 0 && (_jsx(Box, { flexDirection: "row", flexWrap: "wrap", children: footerBadges.map((badge) => (_jsx(FooterBadge, { badge: badge, storeSnapshot: storeSnapshot }, badge.name))) })), toasts.length > 0 && (_jsx(Box, { flexDirection: "column", alignItems: "flex-end", children: toasts.map((t) => (_jsx(Toast, { message: t.message, level: t.level }, t.id))) }))] })] }));
+});
+const HeaderBadge = memo(function HeaderBadge({ badge, storeSnapshot }) {
+    useBadgeRefresh(badge);
+    const value = resolveBadgeProp(badge.value, storeSnapshot);
+    if (!value)
+        return null;
+    const resolvedColor = resolveBadgeProp(badge.color, storeSnapshot);
+    const resolvedIcon = resolveBadgeProp(badge.icon, storeSnapshot);
+    const resolvedUrl = resolveBadgeProp(badge.url, storeSnapshot);
+    const badgeValue = formatHeaderBadgeValue(value, resolvedIcon);
+    const content = (_jsxs(Text, { color: resolvedColor ?? 'gray', children: [badge.label, " ", badgeValue] }));
+    return (_jsxs(Box, { flexDirection: "row", marginLeft: 1, children: [_jsx(Text, { dimColor: true, children: HEADER_BADGE_SEPARATOR }), _jsx(Text, { children: " " }), resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: content }) : content] }));
+});
+const FooterBadge = memo(function FooterBadge({ badge, storeSnapshot }) {
+    useBadgeRefresh(badge);
+    const value = resolveBadgeProp(badge.value, storeSnapshot);
+    if (!value)
+        return null;
+    const resolvedColor = resolveBadgeProp(badge.color, storeSnapshot);
+    const resolvedIcon = resolveBadgeProp(badge.icon, storeSnapshot);
+    const resolvedUrl = resolveBadgeProp(badge.url, storeSnapshot);
+    const prefix = resolvedIcon ?? '●';
+    const content = (_jsxs(Text, { color: resolvedColor ?? 'gray', children: [prefix, " ", value] }));
+    return _jsx(Box, { marginRight: 2, children: resolvedUrl ? _jsx(Link, { url: resolvedUrl, children: content }) : content });
 });
 // ─── Helpers ────────────────────────────────────────────────
 /** 判断 badge 是否匹配目标 slot（兼容单个或数组） */
 function matchSlot(badge, target) {
     return Array.isArray(badge.slot) ? badge.slot.includes(target) : badge.slot === target;
 }
+function formatHeaderBadgeValue(value, icon) {
+    if (!icon)
+        return value;
+    return `${value} ${icon}`;
+}
+function useBadgeRefresh(badge) {
+    const interval = resolveBadgeRefreshInterval(badge);
+    useElapsedTime(interval ? BADGE_REFRESH_START_TIME : null, false, interval);
+}
+function resolveBadgeRefreshInterval(badge) {
+    if (!badge.interval)
+        return undefined;
+    if (!Number.isFinite(badge.interval) || badge.interval <= 0)
+        return undefined;
+    if (!hasDynamicBadgeProp(badge))
+        return undefined;
+    return badge.interval;
+}
+function hasDynamicBadgeProp(badge) {
+    return (typeof badge.value === 'function' ||
+        typeof badge.color === 'function' ||
+        typeof badge.icon === 'function' ||
+        typeof badge.url === 'function');
+}
 //# sourceMappingURL=MenuView.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/cli",
-  "version": "2.0.13",
+  "version": "2.1.0",
   "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-core": "2.0.8",
-    "@xfe-repo/cli-presets": "2.0.8"
+    "@xfe-repo/cli-core": "2.1.0",
+    "@xfe-repo/cli-presets": "2.1.0"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",