@code4bug/jarvis-agent 1.3.2 → 1.3.3

package/dist/components/DangerConfirm.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 危险命令交互式确认组件
  *
@@ -7,21 +7,18 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
  *   2. 持久授权（写入 ~/.jarvis/.permissions.json）
  *   3. 取消执行
  */
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
 const OPTIONS = [
     { key: 'once', label: '临时执行（仅本次会话）', color: 'yellow' },
     { key: 'always', label: '持久授权（写入 ~/.jarvis/.permissions.json）', color: 'green' },
     { key: 'cancel', label: '取消执行', color: 'red' },
 ];
-// 圆角边框字符
-const BORDER = { tl: '╭', tr: '╮', bl: '╰', br: '╯', h: '─', v: '│' };
 export default function DangerConfirm({ command, reason, ruleName, onSelect }) {
     const [selectedIndex, setSelectedIndex] = useState(2); // 默认选中「取消」，最安全
     const { stdout } = useStdout();
-    const cols = Math.min(stdout?.columns ?? 80, 80);
-    // 内容区宽度 = 总宽度 - 左右边框(2) - 左右 padding(2)
-    const innerWidth = cols - 4;
+    const cols = Math.min(stdout?.columns ?? 80, 84);
+    const contentWidth = Math.max(32, cols - 8);
     useInput((_input, key) => {
         if (key.upArrow) {
             setSelectedIndex((prev) => (prev > 0 ? prev - 1 : OPTIONS.length - 1));
@@ -36,15 +33,14 @@ export default function DangerConfirm({ command, reason, ruleName, onSelect }) {
             onSelect('cancel');
         }
     });
-    const hLine = BORDER.h.repeat(cols - 2);
-    const topBorder = BORDER.tl + hLine + BORDER.tr;
-    const bottomBorder = BORDER.bl + hLine + BORDER.br;
-    /** 渲染一行带左右边框的内容 */
-    const row = (children) => (_jsxs(Box, { children: [_jsxs(Text, { color: "yellow", children: [BORDER.v, " "] }), _jsx(Box, { width: innerWidth, children: children }), _jsxs(Text, { color: "yellow", children: [" ", BORDER.v] })] }));
-    const emptyRow = row(_jsx(Text, { children: " " }));
-    return (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: "yellow", children: topBorder }), row(_jsx(Text, { color: "yellow", bold: true, children: "\u5B89\u5168\u56F4\u680F\u62E6\u622A" })), emptyRow, row(_jsxs(Text, { color: "gray", children: ["\u547D\u4EE4: ", _jsx(Text, { color: "white", bold: true, children: command })] })), row(_jsxs(Text, { color: "gray", children: ["\u89C4\u5219: ", _jsx(Text, { color: "cyan", children: ruleName })] })), row(_jsx(Text, { color: "red", children: reason })), emptyRow, row(_jsx(Text, { color: "gray", dimColor: true, children: "\u4F7F\u7528 \u2191\u2193 \u9009\u62E9\uFF0CEnter \u786E\u8BA4\uFF0CESC \u53D6\u6D88:" })), emptyRow, OPTIONS.map((opt, i) => {
-                const isSelected = i === selectedIndex;
-                const prefix = isSelected ? '❯ ' : '  ';
-                return (_jsx(React.Fragment, { children: row(_jsxs(Text, { color: isSelected ? opt.color : 'gray', bold: isSelected, children: [prefix, opt.label] })) }, opt.key));
-            }), _jsx(Text, { color: "yellow", children: bottomBorder })] }));
+    const section = (label, value) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "gray", children: label }), _jsx(Box, { width: contentWidth, marginTop: 0, children: value })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginY: 1, paddingX: 1, children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { backgroundColor: "yellow", color: "black", bold: true, children: ' 安全围栏 ' }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "\u68C0\u6D4B\u5230\u9AD8\u98CE\u9669\u547D\u4EE4" }), _jsx(Text, { color: "gray", children: "\u8BF7\u786E\u8BA4\u662F\u5426\u7EE7\u7EED\u6267\u884C" })] })] }), section('命令', _jsx(Text, { color: "white", bold: true, wrap: "truncate-end", children: command })), section('规则', _jsx(Text, { color: "cyan", children: ruleName })), section('原因', _jsx(Text, { color: "red", children: reason })), _jsx(Box, { marginTop: 2, children: _jsx(Text, { color: "gray", dimColor: true, children: "\u4F7F\u7528 \u2191\u2193 \u9009\u62E9\uFF0CEnter \u786E\u8BA4\uFF0CESC \u53D6\u6D88" }) }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: OPTIONS.map((opt, i) => {
+                    const isSelected = i === selectedIndex;
+                    const prefix = isSelected ? '›' : ' ';
+                    const textColor = isSelected ? 'black' : opt.color;
+                    const backgroundColor = isSelected
+                        ? (opt.color === 'yellow' ? 'yellow' : opt.color === 'green' ? 'green' : 'red')
+                        : undefined;
+                    return (_jsx(Box, { marginTop: i === 0 ? 0 : 1, children: _jsx(Text, { color: textColor, backgroundColor: backgroundColor, bold: isSelected, children: ` ${prefix} ${opt.label} ` }) }, opt.key));
+                }) })] }));
 }

package/dist/components/StatusBar.js

@@ -2,6 +2,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
 import { PROJECT_NAME, getContextTokenLimit, getModelName, isThinkingModeToggleEnabled } from '../config/constants.js';
+import { getToolStatsText } from '../tools/index.js';
+function truncateText(text, maxChars) {
+    if (maxChars <= 0)
+        return '';
+    if (text.length <= maxChars)
+        return text;
+    if (maxChars === 1)
+        return '…';
+    return `${text.slice(0, maxChars - 1)}…`;
+}
 /** 生成 token 用量进度条 */
 function tokenProgressBar(used, limit, barWidth) {
     const ratio = Math.min(used / limit, 1);
@@ -15,7 +25,8 @@ function StatusBar({ width, totalTokens, activeAgents = 0 }) {
     const modelName = getModelName();
     const contextTokenLimit = getContextTokenLimit();
     const thinkingModeToggleEnabled = isThinkingModeToggleEnabled();
-    const left = ` ${modelName} │ ${PROJECT_NAME}`;
+    const toolStats = getToolStatsText();
+    const rawLeft = ` ${modelName} │ ${PROJECT_NAME} │ ${toolStats}`;
     // 右侧：智能体数量（有后台 Agent 时显示）+ token 进度条 + 思考模式切换（可选）
     const agentPart = activeAgents > 0 ? `⬡ ${activeAgents} agent${activeAgents > 1 ? 's' : ''} │ ` : '';
     const tokenLabel = `${totalTokens}/${contextTokenLimit}`;
@@ -24,6 +35,8 @@ function StatusBar({ width, totalTokens, activeAgents = 0 }) {
     const effortPart = thinkingModeToggleEnabled ? ' │ ● medium · /effort' : '';
     // 右侧完整文本长度（用于计算间距）
     const rightLen = agentPart.length + tokenLabel.length + 1 + barWidth + effortPart.length + 1;
+    const leftMaxWidth = Math.max(width - rightLen - 1, 1);
+    const left = truncateText(rawLeft, leftMaxWidth);
     const gap = Math.max(width - left.length - rightLen, 1);
     return (_jsxs(Box, { children: [_jsx(Text, { color: "gray", children: left }), _jsx(Text, { children: ' '.repeat(gap) }), activeAgents > 0 && _jsx(Text, { color: "cyan", children: agentPart }), _jsxs(Text, { color: "gray", children: [tokenLabel, " "] }), _jsx(Text, { color: color, children: bar }), thinkingModeToggleEnabled && _jsx(Text, { color: "gray", children: effortPart }), _jsx(Text, { children: " " })] }));
 }

package/dist/skills/index.js

@@ -12,7 +12,7 @@
 import { exec } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { scanExternalSkills, getExternalSkillsDir } from './loader.js';
+import { scanExternalSkills } from './loader.js';
 import { allTools as builtinTools } from '../tools/index.js';
 // ===== 缓存 =====
 let _skillCache = null;
@@ -210,7 +210,6 @@ export function loadExternalSkills() {
     if (_skillCache)
         return _skillCache;
     _skillCache = scanExternalSkills();
-    console.log(`[skills] 已加载 ${_skillCache.length} 个外部 skill (${getExternalSkillsDir()})`);
     return _skillCache;
 }
 /** 获取合并后的所有工具：内置 tools + 外部 skills */

package/dist/tools/index.d.ts

@@ -22,3 +22,5 @@ export declare function findTool(name: string): Tool | undefined;
 export declare function getAllTools(): Tool[];
 /** 按名称查找工具（内置 + 外部 skills） */
 export declare function findToolMerged(name: string): Tool | undefined;
+/** 获取状态栏用的工具统计摘要 */
+export declare function getToolStatsText(): string;

package/dist/tools/index.js

@@ -27,6 +27,7 @@ export function findTool(name) {
 }
 // ===== 合并工具（内置 + 外部 Skills）=====
 import { getMergedTools, findMergedTool } from '../skills/index.js';
+import { listSkills } from '../skills/index.js';
 /** 获取所有工具（内置 + 外部 skills），供 QueryEngine 使用 */
 export function getAllTools() {
     return getMergedTools();
@@ -35,3 +36,7 @@ export function getAllTools() {
 export function findToolMerged(name) {
     return findMergedTool(name);
 }
+/** 获取状态栏用的工具统计摘要 */
+export function getToolStatsText() {
+    return `skills（${allTools.length}/${listSkills().length}）`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code4bug/jarvis-agent",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "基于 React + TypeScript + Ink 构建的命令行智能体交互界面",
   "type": "module",
   "main": "dist/index.js",