8 Commits
Author SHA1 Message Date
shuiyu1123 b8faaae0c6 release: v5.4.1 2026-06-19 00:30:15 +08:00
shuiyu1123 bac5ea01a9 feat: 统一错误处理 - ToolResult 类
- 新增 xcli_core/tool_result.py: ToolResult + ErrorCode
- unified_tool_manager: execute/mcp_call 返回 ToolResult
- cmd_executor: 所有返回改为 ToolResult
- file_manager: 所有返回改为 ToolResult
- 兼容旧接口: execute_dict() 返回 dict, handler 可返回 str 或 ToolResult
2026-06-19 00:26:49 +08:00
shuiyu1123 161ab9d3a8 feat: MCP stdio server + TUI回车发送 + 子Agent无限制 + 安全引擎优化 + diff弹窗绿红背景
- 新增 mcp_server.py: 标准 MCP stdio 传输层入口
- TUI: 回车发送消息,Shift+回车换行 (SendTextArea子类)
- 子Agent: 移除 max_steps=20 限制
- 安全引擎: 移除 ALWAYS_CONFIRM 关键词强制拦截
- code_editor: diff弹窗绿底(+)/红底(-)背景色
2026-06-19 00:10:27 +08:00
xiaoli-cli b0d9a24003 release: v5.4.0 - 跨平台进程保护机制 2026-05-09 20:33:14 +08:00
xiaoli-cli 97cc2bb0f7 feat: 跨平台进程保护机制 v5.3.0
- 新增 process_protection.py 模块
  - 单实例保护: Windows命名Mutex / macOS+Linux fcntl文件锁
  - 进程优先级提升: Windows SetPriorityClass / POSIX os.nice()
  - Windows PPL风格保护: SetErrorMode抑制错误弹窗
  - POSIX信号保护: 忽略SIGHUP/SIGPIPE, 注册SIGTERM优雅关闭
  - 看门狗监控: 后台线程监控父进程状态
  - 关闭钩子系统: 进程退出时自动执行清理
  - /protect 命令查看保护状态
- 更新 platform_utils.py 新增进程工具函数
- 集成到 cli_base.py 启动时自动初始化
- 更新 CHANGELOG.md / README.md 至 v5.3.0
2026-05-09 20:28:17 +08:00
xiaoli-cli bot a7f64cd797 refactor: 移除插件内存管理系统 + 新增工作流引擎
移除内容:
- 删除 plugin_memory_manager.py (TTL淘汰 + 懒加载系统)
- unified_tool_manager.py 精简为直接加载,去掉内存管理器集成
- tui.py 移除内存管理状态显示

新增内容:
- plugins/workflow.py: YAML 工作流引擎
  - 顺序执行多步骤 (tool/shell/echo/wait/set/if)
  - 步骤间变量传递 ({{steps.name.output}})
  - 条件分支 (if/then/else)
  - 错误处理 (continue_on_error / on_fail)
  - 断点续跑 (状态持久化)
  - 调用其他插件作为步骤
- workflows/example.yaml: 示例工作流

修复:
- unified_tool_manager.shutdown() 增加 graceful cleanup
- unregister_tool() 增加实例清理
2026-05-08 18:07:55 +08:00
OpenClaw 115ce38370 docs: CHANGELOG 补充插件格式统一记录 2026-05-08 00:54:02 +08:00
OpenClaw 357cd0958f refactor: 统一自研插件格式为 Liugin
18个插件: class Plugin -> class Liugin
10个插件: 测试块 Plugin() -> Liugin()
移除 ai_image.py 中多余的 Liugin = Plugin 别名

所有自研插件现统一使用 class Liugin 作为入口类名,
加载器保留 Plugin 兼容以支持第三方插件。
2026-05-08 00:52:25 +08:00
38 changed files with 2355 additions and 1178 deletions

No files matched your search

+29
View File
@@ -4,6 +4,29 @@
--- ---
## v5.4.0 (2026-05-09) — Release
### ✨ 新增功能
- **跨平台进程保护模块** (`xcli_core/process_protection.py`)
- **单实例保护** — 防止重复启动,Windows 使用命名 Mutex,macOS/Linux 使用 fcntl 文件锁(自动清理残留锁文件)
- **进程优先级提升** — Windows: `SetPriorityClass` (ABOVE_NORMAL/HIGH/REALTIME),macOS/Linux: `os.nice()` + `renice`
- **Windows PPL 风格保护** — `SetErrorMode` 抑制系统错误弹窗 (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX)、`faulthandler` 崩溃堆栈捕获
- **POSIX 信号保护** — macOS/Linux 忽略 SIGHUP(终端关闭不退出)、注册 SIGTERM 优雅关闭、macOS 忽略 SIGPIPE
- **看门狗监控** — 后台线程监控父进程状态,父进程退出时自动清理并退出
- **关闭钩子系统** — 注册自定义清理函数,进程退出时自动执行
- **一键启用** — `enable_process_protection()` 单函数调用启用全部保护
- **`/protect` 命令** — CLI 中查看保护状态,`/protect test` 重新测试所有保护
### 改进
- `platform_utils.py` 新增 `is_process_running()`、`get_process_priority()`、`set_process_priority()` 跨平台工具函数
- `cli_base.py` 启动时自动初始化进程保护,退出时自动清理
- `cli_core.py` 启动 banner 显示保护状态图标(单实例/优先级/PPL/看门狗)
- 全版本号统一更新至 v5.4.0
---
## v5.2.0 (2026-05-08) ## v5.2.0 (2026-05-08)
### ✨ 新增功能 ### ✨ 新增功能
@@ -16,6 +39,12 @@
- `/status` 命令和 TUI 侧栏实时显示内存管理状态(已加载/已卸载/统计) - `/status` 命令和 TUI 侧栏实时显示内存管理状态(已加载/已卸载/统计)
- `search_tools` 支持搜索已卸载插件(使用缓存的元数据,无需加载实例) - `search_tools` 支持搜索已卸载插件(使用缓存的元数据,无需加载实例)
### 统一插件格式
- **统一自研插件入口类名为 `Liugin`** — 18 个插件从 `class Plugin` 统一为 `class Liugin`
- 加载器保留 `Plugin` 回退兼容,第三方插件仍可用旧格式
- 测试块中 `Plugin()` 调用同步更新为 `Liugin()`
### TUI 修复 ### TUI 修复
- **修复消息分类失效** — `_write_raw` 中空字符串 `'' in msg` 永远为 True,导致所有消息显示为工具成功样式;替换为正确的 emoji 标记(✅/❌/🤖) - **修复消息分类失效** — `_write_raw` 中空字符串 `'' in msg` 永远为 True,导致所有消息显示为工具成功样式;替换为正确的 emoji 标记(✅/❌/🤖)
+1 -1
View File
@@ -5,7 +5,7 @@
</p> </p>
<p align="center"> <p align="center">
<img src="https://img.shields.io/badge/version-5.2.0-blue" alt="version"> <img src="https://img.shields.io/badge/version-5.4.1-blue" alt="version">
<img src="https://img.shields.io/badge/python-3.10+-green" alt="python"> <img src="https://img.shields.io/badge/python-3.10+-green" alt="python">
<img src="https://img.shields.io/badge/license-MIT-orange" alt="license"> <img src="https://img.shields.io/badge/license-MIT-orange" alt="license">
<img src="https://img.shields.io/badge/tests-113%20passed-brightgreen" alt="tests"> <img src="https://img.shields.io/badge/tests-113%20passed-brightgreen" alt="tests">
+2 -1
View File
@@ -9,7 +9,7 @@
</p> </p>
<p align="center"> <p align="center">
<img src="https://img.shields.io/badge/version-5.2.0-blue" alt="version"> <img src="https://img.shields.io/badge/version-5.4.1-blue" alt="version">
<img src="https://img.shields.io/badge/python-3.10+-green" alt="python"> <img src="https://img.shields.io/badge/python-3.10+-green" alt="python">
<img src="https://img.shields.io/badge/license-MIT-orange" alt="license"> <img src="https://img.shields.io/badge/license-MIT-orange" alt="license">
<img src="https://img.shields.io/badge/tests-150+%20passed-brightgreen" alt="tests"> <img src="https://img.shields.io/badge/tests-150+%20passed-brightgreen" alt="tests">
@@ -35,6 +35,7 @@
- **定时任务** — 支持相对时间、绝对时间、重复任务,到期自动激活 AI - **定时任务** — 支持相对时间、绝对时间、重复任务,到期自动激活 AI
- **系统通知** — 跨平台任务完成通知(Windows / macOS / Linux) - **系统通知** — 跨平台任务完成通知(Windows / macOS / Linux)
- **MCP 协议** — 19 个插件全部实现 MCP 定义,支持 Function Calling 原生调用 - **MCP 协议** — 19 个插件全部实现 MCP 定义,支持 Function Calling 原生调用
- **进程保护** — 跨平台单实例保护 + 进程优先级提升 + Windows PPL 风格保护 + 看门狗监控 + 优雅关闭
- **19 个插件 161+ 个操作** — 代码编辑、Git、浏览器、工程化、文件管理、图像生成、记忆等 - **19 个插件 161+ 个操作** — 代码编辑、Git、浏览器、工程化、文件管理、图像生成、记忆等
- **三模式界面** — TUI 图形化 + 传统命令行 + Web UI 浏览器界面 - **三模式界面** — TUI 图形化 + 传统命令行 + Web UI 浏览器界面
- **150+ 个自动化测试** — pytest 覆盖全部插件和核心模块 - **150+ 个自动化测试** — pytest 覆盖全部插件和核心模块
+2 -2
View File
@@ -1,10 +1,10 @@
@echo off @echo off
chcp 65001 >nul 2>&1 chcp 65001 >nul 2>&1
title 小狸 Pro-CLI v5.1.2 title 小狸 Pro-CLI v5.4.0
echo. echo.
echo ╔══════════════════════════════════════╗ echo ╔══════════════════════════════════════╗
echo ║ 小狸 Pro-CLI 启动器 v5.1.2 ║ echo ║ 小狸 Pro-CLI 启动器 v5.4.0 ║
echo ║ 正在检测环境... ║ echo ║ 正在检测环境... ║
echo ╚══════════════════════════════════════╝ echo ╚══════════════════════════════════════╝
echo. echo.
+147
View File
@@ -0,0 +1,147 @@
#!/usr/bin/env python3
"""
小狸 MCP Stdio Server
=====================
标准 MCP (Model Context Protocol) stdio 传输层入口。
通过 stdin/stdout 以 JSON-RPC 2.0 格式通信,
可被 Claude Desktop、Cursor、OpenClaw 等标准 MCP 客户端直接连接。
用法:
python mcp_server.py [--plugins-dir plugins] [--skills-dir skills]
Claude Desktop 配置示例:
{
"mcpServers": {
"xiaoli": {
"command": "python",
"args": ["/path/to/xiaoli-cli/mcp_server.py"]
}
}
}
"""
import sys
import os
import json
import argparse
import logging
# 确保当前目录在 sys.path 中,以便导入项目模块
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
if SCRIPT_DIR not in sys.path:
sys.path.insert(0, SCRIPT_DIR)
# 日志输出到 stderr,不干扰 stdout 上的 JSON-RPC 通信
logging.basicConfig(
level=logging.INFO,
format="[xiaoli-mcp] %(message)s",
stream=sys.stderr,
)
logger = logging.getLogger("xiaoli-mcp")
def main():
parser = argparse.ArgumentParser(description="小狸 MCP Stdio Server")
parser.add_argument("--plugins-dir", default="plugins", help="插件目录 (默认: plugins)")
parser.add_argument("--skills-dir", default="skills", help="技能目录 (默认: skills)")
args = parser.parse_args()
# 切换到脚本所在目录,保证相对路径正确
os.chdir(SCRIPT_DIR)
# 初始化 UnifiedToolManager
# 将 initialize() 中的 print 重定向到 stderr,避免污染 stdout JSON-RPC 通道
import io
from contextlib import redirect_stdout
from unified_tool_manager import UnifiedToolManager
manager = UnifiedToolManager()
captured_output = io.StringIO()
with redirect_stdout(captured_output):
manager.initialize(
plugins_dir=args.plugins_dir,
skills_dir=args.skills_dir,
)
# 将初始化时的 print 输出转发到 stderr
init_output = captured_output.getvalue()
if init_output:
for line in init_output.strip().split('\n'):
logger.info(line)
tool_count = len(manager._tools)
logger.info(f"MCP Server 已启动,共加载 {tool_count} 个工具")
logger.info("等待 stdin JSON-RPC 请求...")
# 主循环:从 stdin 逐行读取 JSON-RPC 请求
try:
for line in sys.stdin:
line = line.strip()
if not line:
continue
try:
request = json.loads(line)
except json.JSONDecodeError as e:
# 无法解析的 JSON,返回解析错误
error_resp = {
"jsonrpc": "2.0",
"id": None,
"error": {"code": -32700, "message": f"Parse error: {e}"},
}
_send(error_resp)
continue
# 处理通知(没有 id 字段的请求)— MCP 规范中通知不需要响应
req_id = request.get("id")
method = request.get("method", "")
# 特殊处理 notifications/initialized — 客户端初始化完成通知
if method == "notifications/initialized":
logger.info("客户端已发送 initialized 通知")
continue
# 特殊处理 $/cancelRequest
if method == "$/cancelRequest":
logger.info(f"收到取消请求: {request.get('params', {}).get('id')}")
continue
# 委托给 UnifiedToolManager 处理
# 拦截插件可能产生的 stdout 输出,转发到 stderr
captured = io.StringIO()
try:
with redirect_stdout(captured):
response = manager.handle_mcp_request(request)
plugin_output = captured.getvalue()
if plugin_output:
for p_line in plugin_output.strip().split('\n'):
logger.info(f"[plugin] {p_line}")
except Exception as e:
logger.error(f"处理请求异常: {e}")
response = {
"jsonrpc": "2.0",
"id": req_id,
"error": {"code": -32603, "message": f"Internal error: {e}"},
}
_send(response)
except KeyboardInterrupt:
logger.info("收到中断信号,正在关闭...")
except EOFError:
logger.info("stdin 已关闭,正在退出...")
finally:
manager.shutdown()
logger.info("MCP Server 已关闭")
def _send(response: dict):
"""将 JSON-RPC 响应写入 stdout 并刷新"""
text = json.dumps(response, ensure_ascii=False)
sys.stdout.write(text + "\n")
sys.stdout.flush()
if __name__ == "__main__":
main()
+76 -1
View File
@@ -121,4 +121,79 @@ def get_config_directory():
elif platform == 'macos': elif platform == 'macos':
return os.path.join(os.path.expanduser("~"), 'Library', 'Application Support', 'Xiaoli Pro-CLI 3') return os.path.join(os.path.expanduser("~"), 'Library', 'Application Support', 'Xiaoli Pro-CLI 3')
else: # Linux else: # Linux
return os.path.join(os.path.expanduser('~'), '.config', 'xiaoli-pro-cli-3') return os.path.join(os.path.expanduser('~'), '.config', 'xiaoli-pro-cli-3')
def is_process_running(pid):
"""检查指定 PID 的进程是否在运行"""
platform = get_platform()
try:
if platform == 'windows':
import ctypes
kernel32 = ctypes.windll.kernel32
handle = kernel32.OpenProcess(0x1000, False, pid) # PROCESS_QUERY_LIMITED_INFORMATION
if handle:
kernel32.CloseHandle(handle)
return True
return False
else:
os.kill(pid, 0)
return True
except (OSError, ProcessLookupError):
return False
def get_process_priority():
"""获取当前进程优先级"""
platform = get_platform()
try:
if platform == 'windows':
import ctypes
kernel32 = ctypes.windll.kernel32
handle = kernel32.GetCurrentProcess()
return kernel32.GetPriorityClass(handle)
else:
import resource
return resource.getpriority(resource.PRIO_PROCESS, 0)
except Exception:
return None
def set_process_priority(level="above_normal"):
"""
设置进程优先级
Args:
level: "below_normal" | "normal" | "above_normal" | "high"
Returns:
是否设置成功
"""
platform = get_platform()
try:
if platform == 'windows':
import ctypes
kernel32 = ctypes.windll.kernel32
priority_map = {
"below_normal": 0x00004000,
"normal": 0x00000020,
"above_normal": 0x00008000,
"high": 0x00000080,
}
priority = priority_map.get(level, 0x00008000)
handle = kernel32.GetCurrentProcess()
return bool(kernel32.SetPriorityClass(handle, priority))
else:
nice_map = {
"below_normal": 10,
"normal": 0,
"above_normal": -10,
"high": -15,
}
nice_val = nice_map.get(level, -10)
os.nice(nice_val)
return True
except Exception:
return False
+1 -2
View File
@@ -25,7 +25,7 @@ except ImportError:
WEBSOCKET_AVAILABLE = False WEBSOCKET_AVAILABLE = False
class Plugin: class Liugin:
"""AI 生图插件 - 调用 ai.2x.nz 接口生成图片""" """AI 生图插件 - 调用 ai.2x.nz 接口生成图片"""
BASE_URL = "https://ai.2x.nz" BASE_URL = "https://ai.2x.nz"
@@ -587,4 +587,3 @@ class Plugin:
# 兼容 Liugin 类名 # 兼容 Liugin 类名
Liugin = Plugin
+1 -1
View File
@@ -10,7 +10,7 @@ import subprocess
from typing import Tuple, List from typing import Tuple, List
class Plugin: class Liugin:
"""工程化工具 - lint/format/test/build + 代码分析""" """工程化工具 - lint/format/test/build + 代码分析"""
def __init__(self): def __init__(self):
+2 -2
View File
@@ -11,7 +11,7 @@ from datetime import datetime
from typing import List, Optional from typing import List, Optional
class Plugin: class Liugin:
"""书签管理器 - 开发资源和链接管理""" """书签管理器 - 开发资源和链接管理"""
def __init__(self): def __init__(self):
@@ -477,7 +477,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("书签管理器测试:") print("书签管理器测试:")
print(plugin.handle('add https://github.com -n GitHub -c 开发 -t 代码,托管 -d 代码托管平台')) print(plugin.handle('add https://github.com -n GitHub -c 开发 -t 代码,托管 -d 代码托管平台'))
print(plugin.handle('add https://stackoverflow.com -n StackOverflow -c 学习 -t 问答,编程')) print(plugin.handle('add https://stackoverflow.com -n StackOverflow -c 学习 -t 问答,编程'))
+1 -1
View File
@@ -9,7 +9,7 @@ import time
from typing import Optional from typing import Optional
class Plugin: class Liugin:
"""浏览器自动化 - 网页操控、表单填写、数据抓取、截图""" """浏览器自动化 - 网页操控、表单填写、数据抓取、截图"""
def __init__(self): def __init__(self):
+19 -13
View File
@@ -5,9 +5,14 @@ import os
import re import re
import subprocess import subprocess
import platform import platform
import sys
# 添加项目根目录到 path
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from xcli_core.tool_result import ToolResult, ErrorCode
class Plugin: class Liugin:
"""Shell 命令执行器 - 跨平台命令行工具""" """Shell 命令执行器 - 跨平台命令行工具"""
def __init__(self): def __init__(self):
@@ -68,18 +73,18 @@ class Plugin:
':(){ :|:& };:', 'chmod -R 777 /', 'mv / ', 'wget http', ':(){ :|:& };:', 'chmod -R 777 /', 'mv / ', 'wget http',
} }
def handle(self, args: str) -> str: def handle(self, args: str):
try: try:
parts = args.strip().split(maxsplit=1) parts = args.strip().split(maxsplit=1)
if not parts: if not parts:
return "错误:请提供操作。可用: run <命令>" return ToolResult.missing("操作。可用: run <命令>")
operation = parts[0].lower() operation = parts[0].lower()
if operation != "run": if operation != "run":
return f"错误:不支持的操作 '{operation}'。可用: run" return ToolResult.fail(f"不支持的操作 '{operation}'。可用: run", ErrorCode.UNSUPPORTED_OP)
if len(parts) < 2: if len(parts) < 2:
return "错误:请提供要执行的命令" return ToolResult.missing("要执行的命令")
rest = parts[1] rest = parts[1]
@@ -91,21 +96,20 @@ class Plugin:
rest = re.sub(r'--timeout\s+\d+', '', rest).strip() rest = re.sub(r'--timeout\s+\d+', '', rest).strip()
if not rest: if not rest:
return "错误:请提供要执行的命令" return ToolResult.missing("要执行的命令")
# 安全检查 # 安全检查
for blocked in self.BLOCKED: for blocked in self.BLOCKED:
if blocked in rest: if blocked in rest:
return f" 安全拦截: 检测到危险命令模式 '{blocked}'" return ToolResult.fail(f"安全拦截: 检测到危险命令模式 '{blocked}'", ErrorCode.PERMISSION_DENIED)
return self._execute(rest, timeout) return self._execute(rest, timeout)
except Exception as e: except Exception as e:
return f"命令执行错误: {str(e)}" return ToolResult.fail(str(e), ErrorCode.INTERNAL_ERROR, tool_name="cmd_executor")
def _execute(self, command: str, timeout: int) -> str: def _execute(self, command: str, timeout: int):
try: try:
# Windows 下用 shell=True,Unix 下直接执行
use_shell = platform.system() == 'Windows' use_shell = platform.system() == 'Windows'
result = subprocess.run( result = subprocess.run(
@@ -136,9 +140,11 @@ class Plugin:
if len(output) > 5000: if len(output) > 5000:
output = output[:5000] + f"\n... (截断,超时: {timeout}s)" output = output[:5000] + f"\n... (截断,超时: {timeout}s)"
return output.strip() if rc != 0:
return ToolResult.fail(output.strip(), ErrorCode.EXEC_FAILED, tool_name="cmd_executor")
return ToolResult.ok(output.strip(), tool_name="cmd_executor")
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
return f" 命令超时 ({timeout}s): {command}" return ToolResult.timeout(timeout, tool_name="cmd_executor")
except Exception as e: except Exception as e:
return f"执行失败: {str(e)}" return ToolResult.fail(str(e), ErrorCode.EXEC_FAILED, tool_name="cmd_executor")
+11 -9
View File
@@ -16,7 +16,7 @@ import threading
from typing import Optional, Tuple, List from typing import Optional, Tuple, List
class Plugin: class Liugin:
"""代码编辑与搜索 - 精准编辑 + 代码理解""" """代码编辑与搜索 - 精准编辑 + 代码理解"""
def __init__(self): def __init__(self):
@@ -684,13 +684,15 @@ else:
thin_sep = '─' * 70 thin_sep = '─' * 70
# ANSI 颜色 # ANSI 颜色
R = '\033[31m' # 红 R = '\033[31m' # 红字
G = '\033[32m' # 绿 G = '\033[32m' # 绿字
C = '\033[36m' # 青 C = '\033[36m' # 青
B = '\033[1m' # 粗体 B = '\033[1m' # 粗体
D = '\033[2m' # 暗 D = '\033[2m' # 暗
W = '\033[37m' # 白 W = '\033[37m' # 白
N = '\033[0m' # 重置 N = '\033[0m' # 重置
RBG = '\033[41m\033[97m' # 红底白字
GBG = '\033[42m\033[97m' # 绿底白字
# 构建带颜色的 diff # 构建带颜色的 diff
diff_colored_lines = [] diff_colored_lines = []
@@ -700,9 +702,9 @@ else:
elif line.startswith('+++') or line.startswith('---'): elif line.startswith('+++') or line.startswith('---'):
diff_colored_lines.append(f"{B}{line}{N}") diff_colored_lines.append(f"{B}{line}{N}")
elif line.startswith('+'): elif line.startswith('+'):
diff_colored_lines.append(f"{G}{line}{N}") diff_colored_lines.append(f"{GBG} {line} {N}")
elif line.startswith('-'): elif line.startswith('-'):
diff_colored_lines.append(f"{R}{line}{N}") diff_colored_lines.append(f"{RBG} {line} {N}")
else: else:
diff_colored_lines.append(line) diff_colored_lines.append(line)
diff_colored = '\n'.join(diff_colored_lines) if diff_colored_lines else ' (无差异)' diff_colored = '\n'.join(diff_colored_lines) if diff_colored_lines else ' (无差异)'
@@ -845,9 +847,9 @@ else:
elif line.startswith('+++') or line.startswith('---'): elif line.startswith('+++') or line.startswith('---'):
output(f"[bold]{line}[/]") output(f"[bold]{line}[/]")
elif line.startswith('+'): elif line.startswith('+'):
output(f"[green]{line}[/]") output(f"[white on green] {line} [/]")
elif line.startswith('-'): elif line.startswith('-'):
output(f"[red]{line}[/]") output(f"[white on red] {line} [/]")
else: else:
output(line) output(line)
@@ -871,9 +873,9 @@ else:
elif line.startswith('+++') or line.startswith('---'): elif line.startswith('+++') or line.startswith('---'):
_out(f"{Style.BRIGHT}{line}{Style.RESET_ALL}") _out(f"{Style.BRIGHT}{line}{Style.RESET_ALL}")
elif line.startswith('+'): elif line.startswith('+'):
_out(f"{Fore.GREEN}{line}{Style.RESET_ALL}") _out(f"\033[42m\033[97m {line} {Style.RESET_ALL}")
elif line.startswith('-'): elif line.startswith('-'):
_out(f"{Fore.RED}{line}{Style.RESET_ALL}") _out(f"\033[41m\033[97m {line} {Style.RESET_ALL}")
else: else:
_out(line) _out(line)
+2 -2
View File
@@ -8,7 +8,7 @@ import colorsys
from typing import List, Tuple from typing import List, Tuple
class Plugin: class Liugin:
"""颜色工具 - 格式转换、调色板、对比度检查""" """颜色工具 - 格式转换、调色板、对比度检查"""
def __init__(self): def __init__(self):
@@ -447,7 +447,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("颜色工具测试:") print("颜色工具测试:")
print(plugin.handle('convert "#3498db"')) print(plugin.handle('convert "#3498db"'))
print(plugin.handle('contrast "#FFFFFF" "#000000"')) print(plugin.handle('contrast "#FFFFFF" "#000000"'))
+56 -51
View File
@@ -5,12 +5,17 @@
import os import os
import json import json
import shutil import shutil
import sys
from datetime import datetime from datetime import datetime
from pathlib import Path from pathlib import Path
from typing import List from typing import List
# 添加项目根目录到 path
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from xcli_core.tool_result import ToolResult, ErrorCode
class Plugin:
class Liugin:
"""文件管理器 - 文件和目录的增删改查""" """文件管理器 - 文件和目录的增删改查"""
def __init__(self): def __init__(self):
@@ -70,11 +75,11 @@ class Plugin:
path = arguments.get("path", "") path = arguments.get("path", "")
return f"{op} {path}".strip() return f"{op} {path}".strip()
def handle(self, args: str) -> str: def handle(self, args: str):
try: try:
parts = self._parse_args(args) parts = self._parse_args(args)
if not parts: if not parts:
return "错误:请提供操作类型" return ToolResult.missing("操作类型")
operation = parts[0].lower() operation = parts[0].lower()
handlers = { handlers = {
@@ -92,7 +97,7 @@ class Plugin:
handler = handlers.get(operation) handler = handlers.get(operation)
if not handler: if not handler:
return f"错误:不支持的操作 '{operation}'" return ToolResult.fail(f"不支持的操作 '{operation}'", ErrorCode.UNSUPPORTED_OP)
return handler(parts[1:]) return handler(parts[1:])
except Exception as e: except Exception as e:
@@ -115,7 +120,7 @@ class Plugin:
parts.append(current) parts.append(current)
return parts return parts
def _op_list(self, args: List[str]) -> str: def _op_list(self, args: List[str]):
path, pattern = ".", None path, pattern = ".", None
i = 0 i = 0
while i < len(args): while i < len(args):
@@ -127,7 +132,7 @@ class Plugin:
path = os.path.abspath(path) path = os.path.abspath(path)
if not os.path.isdir(path): if not os.path.isdir(path):
return f"错误:不是目录: {path}" return ToolResult.not_found(f"目录: {path}")
items = [] items = []
try: try:
@@ -153,13 +158,13 @@ class Plugin:
result.append(f" ... 还有 {len(items) - 100} 项") result.append(f" ... 还有 {len(items) - 100} 项")
result.append("─" * 50) result.append("─" * 50)
result.append(f"共 {dirs} 个文件夹, {files} 个文件") result.append(f"共 {dirs} 个文件夹, {files} 个文件")
return '\n'.join(result) return ToolResult.ok('\n'.join(result), tool_name="file_manager")
except Exception as e: except Exception as e:
return f"列出目录失败: {e}" return ToolResult.fail(str(e), ErrorCode.EXEC_FAILED, tool_name="file_manager")
def _op_read(self, args: List[str]) -> str: def _op_read(self, args: List[str]):
if not args: if not args:
return "错误:请提供文件路径" return ToolResult.missing("文件路径")
file_path = os.path.abspath(args[0]) file_path = os.path.abspath(args[0])
max_lines = None max_lines = None
i = 1 i = 1
@@ -168,16 +173,16 @@ class Plugin:
try: try:
max_lines = int(args[i + 1]) max_lines = int(args[i + 1])
except ValueError: except ValueError:
return "错误:行数必须是整数" return ToolResult.fail("行数必须是整数", ErrorCode.INVALID_ARGS)
i += 1 i += 1
i += 1 i += 1
if not os.path.isfile(file_path): if not os.path.isfile(file_path):
return f"错误:文件不存在: {file_path}" return ToolResult.not_found(f"文件: {file_path}")
size = os.path.getsize(file_path) size = os.path.getsize(file_path)
if size > 10 * 1024 * 1024: if size > 10 * 1024 * 1024:
return f"文件过大 ({size/1024/1024:.1f}MB),请用 -n 限制行数" return ToolResult.fail(f"文件过大 ({size/1024/1024:.1f}MB),请用 -n 限制行数", ErrorCode.INVALID_ARGS)
try: try:
with open(file_path, 'r', encoding='utf-8') as f: with open(file_path, 'r', encoding='utf-8') as f:
@@ -195,13 +200,13 @@ class Plugin:
content = '\n'.join(f"{i+1:4d} | {l.rstrip()}" for i, l in enumerate(all_lines)) content = '\n'.join(f"{i+1:4d} | {l.rstrip()}" for i, l in enumerate(all_lines))
header = f" {file_path} ({size}B, {len(all_lines)} 行)" header = f" {file_path} ({size}B, {len(all_lines)} 行)"
return f"{header}\n{'─' * 50}\n{content}" return ToolResult.ok(f"{header}\n{'─' * 50}\n{content}", tool_name="file_manager")
except UnicodeDecodeError: except UnicodeDecodeError:
return "错误:无法解码(可能是二进制文件)" return ToolResult.fail("无法解码(可能是二进制文件)", ErrorCode.DECODE_ERROR)
def _op_write(self, args: List[str]) -> str: def _op_write(self, args: List[str]):
if len(args) < 2: if len(args) < 2:
return "错误:格式: write <文件> -c <内容>" return ToolResult.fail("格式: write <文件> -c <内容>", ErrorCode.MISSING_ARGS)
fp = os.path.abspath(args[0]) fp = os.path.abspath(args[0])
content = None content = None
i = 1 i = 1
@@ -210,15 +215,15 @@ class Plugin:
content = args[i + 1]; i += 1 content = args[i + 1]; i += 1
i += 1 i += 1
if content is None: if content is None:
return "错误:请用 -c 提供内容" return ToolResult.missing("内容 (-c 参数)")
os.makedirs(os.path.dirname(fp) or ".", exist_ok=True) os.makedirs(os.path.dirname(fp) or ".", exist_ok=True)
with open(fp, 'w', encoding='utf-8') as f: with open(fp, 'w', encoding='utf-8') as f:
f.write(content) f.write(content)
return f" 已写入: {fp} ({len(content)} 字符)" return ToolResult.ok(f"已写入: {fp} ({len(content)} 字符)", tool_name="file_manager")
def _op_append(self, args: List[str]) -> str: def _op_append(self, args: List[str]):
if len(args) < 2: if len(args) < 2:
return "错误:格式: append <文件> -c <内容>" return ToolResult.fail("格式: append <文件> -c <内容>", ErrorCode.MISSING_ARGS)
fp = os.path.abspath(args[0]) fp = os.path.abspath(args[0])
content = None content = None
i = 1 i = 1
@@ -227,59 +232,59 @@ class Plugin:
content = args[i + 1]; i += 1 content = args[i + 1]; i += 1
i += 1 i += 1
if content is None: if content is None:
return "错误:请用 -c 提供内容" return ToolResult.missing("内容 (-c 参数)")
if not os.path.isfile(fp): if not os.path.isfile(fp):
return f"错误:文件不存在: {fp}" return ToolResult.not_found(f"文件: {fp}")
with open(fp, 'a', encoding='utf-8') as f: with open(fp, 'a', encoding='utf-8') as f:
f.write(content) f.write(content)
return f" 已追加: {fp}" return ToolResult.ok(f"已追加: {fp}", tool_name="file_manager")
def _op_copy(self, args: List[str]) -> str: def _op_copy(self, args: List[str]):
if len(args) < 2: if len(args) < 2:
return "错误:请提供源和目标路径" return ToolResult.missing("源和目标路径")
src, dst = os.path.abspath(args[0]), os.path.abspath(args[1]) src, dst = os.path.abspath(args[0]), os.path.abspath(args[1])
if not os.path.exists(src): if not os.path.exists(src):
return f"错误:源不存在: {src}" return ToolResult.not_found(f"源: {src}")
os.makedirs(os.path.dirname(dst) or ".", exist_ok=True) os.makedirs(os.path.dirname(dst) or ".", exist_ok=True)
if os.path.isfile(src): if os.path.isfile(src):
shutil.copy2(src, dst) shutil.copy2(src, dst)
else: else:
shutil.copytree(src, dst, dirs_exist_ok=True) shutil.copytree(src, dst, dirs_exist_ok=True)
return f" 已复制:\n {src}\n → {dst}" return ToolResult.ok(f"已复制:\n {src}\n → {dst}", tool_name="file_manager")
def _op_move(self, args: List[str]) -> str: def _op_move(self, args: List[str]):
if len(args) < 2: if len(args) < 2:
return "错误:请提供源和目标路径" return ToolResult.missing("源和目标路径")
src, dst = os.path.abspath(args[0]), os.path.abspath(args[1]) src, dst = os.path.abspath(args[0]), os.path.abspath(args[1])
if not os.path.exists(src): if not os.path.exists(src):
return f"错误:源不存在: {src}" return ToolResult.not_found(f"源: {src}")
os.makedirs(os.path.dirname(dst) or ".", exist_ok=True) os.makedirs(os.path.dirname(dst) or ".", exist_ok=True)
shutil.move(src, dst) shutil.move(src, dst)
return f" 已移动:\n {src}\n → {dst}" return ToolResult.ok(f"已移动:\n {src}\n → {dst}", tool_name="file_manager")
def _op_delete(self, args: List[str]) -> str: def _op_delete(self, args: List[str]):
if not args: if not args:
return "错误:请提供路径" return ToolResult.missing("路径")
path = os.path.abspath(args[0]) path = os.path.abspath(args[0])
recursive = "-r" in args recursive = "-r" in args
if not os.path.exists(path): if not os.path.exists(path):
return f"错误:不存在: {path}" return ToolResult.not_found(f"路径: {path}")
if os.path.isfile(path): if os.path.isfile(path):
os.remove(path) os.remove(path)
return f" 已删除文件: {path}" return ToolResult.ok(f"已删除文件: {path}", tool_name="file_manager")
elif os.path.isdir(path): elif os.path.isdir(path):
if recursive: if recursive:
shutil.rmtree(path) shutil.rmtree(path)
return f" 已删除目录: {path}" return ToolResult.ok(f"已删除目录: {path}", tool_name="file_manager")
elif not os.listdir(path): elif not os.listdir(path):
os.rmdir(path) os.rmdir(path)
return f" 已删除空目录: {path}" return ToolResult.ok(f"已删除空目录: {path}", tool_name="file_manager")
else: else:
return "错误:目录不为空,用 -r 递归删除" return ToolResult.fail("目录不为空,用 -r 递归删除", ErrorCode.INVALID_ARGS)
def _op_search(self, args: List[str]) -> str: def _op_search(self, args: List[str]):
if not args: if not args:
return "错误:请提供搜索目录" return ToolResult.missing("搜索目录")
directory = os.path.abspath(args[0]) directory = os.path.abspath(args[0])
pattern, content_search = None, None pattern, content_search = None, None
i = 1 i = 1
@@ -291,7 +296,7 @@ class Plugin:
i += 1 i += 1
if not os.path.isdir(directory): if not os.path.isdir(directory):
return f"错误:目录不存在: {directory}" return ToolResult.not_found(f"目录: {directory}")
results = [] results = []
for root, dirs, files in os.walk(directory): for root, dirs, files in os.walk(directory):
@@ -317,14 +322,14 @@ class Plugin:
if len(results) >= 50: if len(results) >= 50:
break break
return f"搜索结果 ({len(results)}):\n" + '\n'.join(results) if results else "未找到匹配" return ToolResult.ok(f"搜索结果 ({len(results)}):\n" + '\n'.join(results), tool_name="file_manager") if results else ToolResult.ok("未找到匹配", tool_name="file_manager")
def _op_info(self, args: List[str]) -> str: def _op_info(self, args: List[str]):
if not args: if not args:
return "错误:请提供路径" return ToolResult.missing("路径")
path = os.path.abspath(args[0]) path = os.path.abspath(args[0])
if not os.path.exists(path): if not os.path.exists(path):
return f"错误:不存在: {path}" return ToolResult.not_found(f"路径: {path}")
stat = os.stat(path) stat = os.stat(path)
result = [ result = [
@@ -337,13 +342,13 @@ class Plugin:
if os.path.isfile(path): if os.path.isfile(path):
ext = os.path.splitext(path)[1] ext = os.path.splitext(path)[1]
result.append(f"扩展名: {ext or '无'}") result.append(f"扩展名: {ext or '无'}")
return '\n'.join(result) return ToolResult.ok('\n'.join(result), tool_name="file_manager")
def _op_mkdir(self, args: List[str]) -> str: def _op_mkdir(self, args: List[str]):
if not args: if not args:
return "错误:请提供目录路径" return ToolResult.missing("目录路径")
path = os.path.abspath(args[0]) path = os.path.abspath(args[0])
if os.path.exists(path): if os.path.exists(path):
return f"错误:已存在: {path}" return ToolResult.fail(f"已存在: {path}", ErrorCode.INVALID_ARGS)
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
return f" 已创建: {path}" return ToolResult.ok(f"已创建: {path}", tool_name="file_manager")
+1 -1
View File
@@ -443,7 +443,7 @@ JSON格式示例:
# 测试函数 # 测试函数
def test_plugin(): def test_plugin():
"""测试插件功能""" """测试插件功能"""
plugin = Plugin() plugin = Liugin()
print("前端测试验证插件测试:") print("前端测试验证插件测试:")
print("\n1. 创建测试HTML文件:") print("\n1. 创建测试HTML文件:")
+1 -1
View File
@@ -8,7 +8,7 @@ import subprocess
from typing import Tuple, Optional from typing import Tuple, Optional
class Plugin: class Liugin:
"""Git 版本控制 - 基础操作 + 工作流自动化""" """Git 版本控制 - 基础操作 + 工作流自动化"""
def __init__(self): def __init__(self):
+1 -1
View File
@@ -14,7 +14,7 @@ from typing import Optional, List, Dict, Any
IS_WINDOWS = sys.platform == "win32" IS_WINDOWS = sys.platform == "win32"
class Plugin: class Liugin:
"""Windows GUI 自动化 - 屏幕元素识别、点击、输入、截图、元素树遍历""" """Windows GUI 自动化 - 屏幕元素识别、点击、输入、截图、元素树遍历"""
def __init__(self): def __init__(self):
+2 -2
View File
@@ -15,7 +15,7 @@ from datetime import datetime
from typing import List from typing import List
class Plugin: class Liugin:
"""UUID / ID 生成器 - 多格式唯一标识符生成""" """UUID / ID 生成器 - 多格式唯一标识符生成"""
def __init__(self): def __init__(self):
@@ -367,7 +367,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("ID 生成器测试:") print("ID 生成器测试:")
print(plugin.handle('uuid')) print(plugin.handle('uuid'))
print(plugin.handle('uuid -v 1 -n 3')) print(plugin.handle('uuid -v 1 -n 3'))
+1 -1
View File
@@ -10,7 +10,7 @@ import time
from typing import Optional from typing import Optional
class Plugin: class Liugin:
"""图像生成工具 — 自然语言/Tag 生图,基于 ComfyUI 在线服务""" """图像生成工具 — 自然语言/Tag 生图,基于 ComfyUI 在线服务"""
def __init__(self): def __init__(self):
+2 -2
View File
@@ -9,7 +9,7 @@ import re
from typing import List from typing import List
class Plugin: class Liugin:
"""JSON 工具箱 - 格式化/校验/查询/转换""" """JSON 工具箱 - 格式化/校验/查询/转换"""
def __init__(self): def __init__(self):
@@ -374,7 +374,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("JSON 工具箱测试:") print("JSON 工具箱测试:")
print(plugin.handle('validate \'{"name": "test", "age": 25}\'')) print(plugin.handle('validate \'{"name": "test", "age": 25}\''))
print(plugin.handle('format \'{"name":"test","items":[1,2,3]}\'')) print(plugin.handle('format \'{"name":"test","items":[1,2,3]}\''))
+2 -2
View File
@@ -9,7 +9,7 @@ import os
from typing import List, Tuple from typing import List, Tuple
class Plugin: class Liugin:
"""Markdown 工具 - TOC/渲染/格式转换/统计""" """Markdown 工具 - TOC/渲染/格式转换/统计"""
def __init__(self): def __init__(self):
@@ -529,7 +529,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("Markdown 工具测试:") print("Markdown 工具测试:")
print(plugin.handle('headings "# Hello\\n## World\\n### Sub"')) print(plugin.handle('headings "# Hello\\n## World\\n### Sub"'))
print(plugin.handle('stats "# Hello\\n\\nThis is a test."')) print(plugin.handle('stats "# Hello\\n\\nThis is a test."'))
+1 -1
View File
@@ -13,7 +13,7 @@ sys.path.insert(0, project_root)
from xcli_core.memory import MemoryManager from xcli_core.memory import MemoryManager
class Plugin: class Liugin:
"""持久化记忆系统 — AI 可写日记、搜索记忆、管理聊天记录""" """持久化记忆系统 — AI 可写日记、搜索记忆、管理聊天记录"""
def __init__(self): def __init__(self):
+2 -2
View File
@@ -9,7 +9,7 @@ import os
from typing import List from typing import List
class Plugin: class Liugin:
"""正则表达式测试器 - 测试、调试、管理正则""" """正则表达式测试器 - 测试、调试、管理正则"""
def __init__(self): def __init__(self):
@@ -430,7 +430,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("正则表达式测试器测试:") print("正则表达式测试器测试:")
print(plugin.handle('test "\\d+" "abc123def456"')) print(plugin.handle('test "\\d+" "abc123def456"'))
print(plugin.handle('match "[a-z]+" "hello world foo bar"')) print(plugin.handle('match "[a-z]+" "hello world foo bar"'))
+2 -2
View File
@@ -11,7 +11,7 @@ from datetime import datetime
from typing import List, Optional from typing import List, Optional
class Plugin: class Liugin:
"""代码片段管理器 - 保存和复用代码片段""" """代码片段管理器 - 保存和复用代码片段"""
def __init__(self): def __init__(self):
@@ -416,7 +416,7 @@ class Plugin:
def test_plugin(): def test_plugin():
plugin = Plugin() plugin = Liugin()
print("代码片段管理器测试:") print("代码片段管理器测试:")
print(plugin.handle('add hello -l python -c "print(\'Hello, World!\')" -t 示例,入门 -d 最简单的Python程序')) print(plugin.handle('add hello -l python -c "print(\'Hello, World!\')" -t 示例,入门 -d 最简单的Python程序'))
print(plugin.handle('add fib -l python -c "def fib(n): return n if n < 2 else fib(n-1)+fib(n-2)" -t 算法,递归')) print(plugin.handle('add fib -l python -c "def fib(n): return n if n < 2 else fib(n-1)+fib(n-2)" -t 算法,递归'))
+1 -1
View File
@@ -543,7 +543,7 @@ if __name__ == "__main__":
if __name__ == "__main__": if __name__ == "__main__":
plugin = Plugin() plugin = Liugin()
print("语音识别插件") print("语音识别插件")
print(f"临时目录: {plugin.temp_dir}") print(f"临时目录: {plugin.temp_dir}")
print("\n" + plugin.usage) print("\n" + plugin.usage)
+5 -5
View File
@@ -26,7 +26,7 @@ class SubAgent:
self.created_at = datetime.now().strftime("%H:%M:%S") self.created_at = datetime.now().strftime("%H:%M:%S")
self.finished_at = None self.finished_at = None
self.steps = 0 # 已执行步数 self.steps = 0 # 已执行步数
self.max_steps = 20 self.max_steps = float('inf') # 不限制步数
def to_dict(self): def to_dict(self):
return { return {
@@ -42,7 +42,7 @@ class SubAgent:
} }
class Plugin: class Liugin:
"""子 Agent 系统 - 创建、管理、协作""" """子 Agent 系统 - 创建、管理、协作"""
def __init__(self): def __init__(self):
@@ -238,7 +238,7 @@ class Plugin:
if agent.status == "running": if agent.status == "running":
agent.status = "done" agent.status = "done"
agent.result = "已达到最大步数限制,任务暂停。" agent.result = "任务执行结束。"
except Exception as e: except Exception as e:
agent.status = "failed" agent.status = "failed"
@@ -369,7 +369,7 @@ class Plugin:
f" 名称: {agent.name}", f" 名称: {agent.name}",
f" 任务: {agent.task}", f" 任务: {agent.task}",
f" 状态: {agent.status}", f" 状态: {agent.status}",
f" 步骤: {agent.steps}/{agent.max_steps}", f" 步骤: {agent.steps}",
f" 创建: {agent.created_at}", f" 创建: {agent.created_at}",
] ]
if agent.finished_at: if agent.finished_at:
@@ -395,7 +395,7 @@ class Plugin:
return f"错误:未找到 Agent '{agent_id}'" return f"错误:未找到 Agent '{agent_id}'"
if agent.status == "running": if agent.status == "running":
return f"Agent {agent.id} 仍在运行中 (步骤 {agent.steps}/{agent.max_steps})" return f"Agent {agent.id} 仍在运行中 (步骤 {agent.steps})"
if agent.status == "failed": if agent.status == "failed":
return f"Agent {agent.id} 执行失败: {agent.error}" return f"Agent {agent.id} 执行失败: {agent.error}"
+1 -1
View File
@@ -258,7 +258,7 @@ JSON格式示例:
# 测试函数 # 测试函数
def test_plugin(): def test_plugin():
"""测试插件功能""" """测试插件功能"""
plugin = Plugin() plugin = Liugin()
print("任务管理插件测试:") print("任务管理插件测试:")
print("\n1. 添加任务:") print("\n1. 添加任务:")
+804
View File
@@ -0,0 +1,804 @@
"""
工作流插件 - YAML 定义的多步骤自动化流程
支持:
- 顺序执行多步骤
- 步骤间变量传递 ({{prev.output}})
- 条件分支 (on_fail / on_success)
- 错误处理 (continue_on_error)
- 状态持久化 (断点续跑)
- 调用其他插件作为步骤
用法:
/workflow run <file.yaml>
/workflow list
/workflow status <workflow_id>
/workflow resume <workflow_id>
/workflow abort <workflow_id>
"""
import json
import os
import re
import time
import uuid
from datetime import datetime
from colorama import Fore, Style
# ── YAML 解析(内置轻量实现,不依赖 PyYAML) ──
def _parse_yaml(text: str) -> dict:
"""轻量 YAML 解析器,支持工作流所需的子集"""
import yaml # 延迟导入,失败时回退
return yaml.safe_load(text)
def _parse_yaml_fallback(text: str) -> dict:
"""内置回退解析器,仅支持简单结构"""
result = {}
current_key = None
current_list = None
current_dict = None
for line in text.split('\n'):
stripped = line.strip()
if not stripped or stripped.startswith('#'):
continue
indent = len(line) - len(line.lstrip())
if indent == 0 and ':' in stripped:
key, _, val = stripped.partition(':')
key = key.strip()
val = val.strip()
if val:
result[key] = _yaml_value(val)
else:
result[key] = None
current_key = key
current_list = None
current_dict = None
elif indent > 0 and stripped.startswith('- '):
if current_key:
if not isinstance(result.get(current_key), list):
result[current_key] = []
item_text = stripped[2:].strip()
if ':' in item_text:
item = {}
k, _, v = item_text.partition(':')
item[k.strip()] = _yaml_value(v.strip())
current_dict = item
result[current_key].append(item)
else:
result[current_key].append(_yaml_value(item_text))
elif indent > 0 and ':' in stripped and current_dict is not None:
key, _, val = stripped.partition(':')
current_dict[key.strip()] = _yaml_value(val.strip())
return result
def _yaml_value(s: str):
"""转换单个 YAML 值"""
if not s:
return None
# 去除引号
if (s.startswith('"') and s.endswith('"')) or (s.startswith("'") and s.endswith("'")):
return s[1:-1]
if s.lower() in ('true', 'yes', 'on'):
return True
if s.lower() in ('false', 'no', 'off'):
return False
if s.lower() in ('null', 'none', '~'):
return None
try:
return int(s)
except ValueError:
pass
try:
return float(s)
except ValueError:
pass
return s
def _load_yaml_file(path: str) -> dict:
"""加载 YAML 文件"""
with open(path, 'r', encoding='utf-8') as f:
text = f.read()
try:
return _parse_yaml(text)
except ImportError:
return _parse_yaml_fallback(text)
# ── 变量替换引擎 ──
def _resolve_vars(text: str, context: dict) -> str:
"""
替换 {{key}} 和 {{key.nested}} 形式的变量
支持:
{{var}} → context['var']
{{step.output}} → context['steps']['step']['output']
{{step.exit_code}} → context['steps']['step']['exit_code']
{{env.HOME}} → os.environ['HOME']
{{args.name}} → context['args']['name']
"""
def replacer(match):
path = match.group(1).strip()
parts = path.split('.')
if parts[0] == 'env':
return os.environ.get('.'.join(parts[1:]), '')
if parts[0] == 'args' and len(parts) > 1:
val = context.get('args', {})
for p in parts[1:]:
if isinstance(val, dict):
val = val.get(p, '')
else:
return ''
return str(val)
if parts[0] == 'steps' and len(parts) >= 3:
step_name = parts[1]
attr = parts[2]
step_data = context.get('steps', {}).get(step_name, {})
val = step_data.get(attr, '')
# 支持 deeper nesting: {{steps.foo.output.field}}
for p in parts[3:]:
if isinstance(val, dict):
val = val.get(p, '')
else:
return ''
return str(val)
# 顶层变量
val = context
for p in parts:
if isinstance(val, dict):
val = val.get(p, '')
else:
return ''
return str(val)
return re.sub(r'\{\{(.+?)\}\}', replacer, text)
def _resolve_value(val, context):
"""递归解析值中的变量(支持 dict/list/str)"""
if isinstance(val, str):
return _resolve_vars(val, context)
elif isinstance(val, dict):
return {k: _resolve_value(v, context) for k, v in val.items()}
elif isinstance(val, list):
return [_resolve_value(item, context) for item in val]
return val
# ── 工作流引擎 ──
class WorkflowEngine:
"""工作流执行引擎"""
def __init__(self, cli_instance=None):
self.cli = cli_instance
self.workflows_dir = "workflows"
self.state_dir = os.path.join(self.workflows_dir, ".state")
os.makedirs(self.state_dir, exist_ok=True)
def run(self, path: str, args: dict = None) -> str:
"""执行工作流"""
if not os.path.exists(path):
return f"❌ 工作流文件不存在: {path}"
try:
wf = _load_yaml_file(path)
except Exception as e:
return f"❌ 解析工作流文件失败: {e}"
wf_name = wf.get('name', os.path.basename(path).replace('.yaml', '').replace('.yml', ''))
steps = wf.get('steps', [])
if not steps:
return f"❌ 工作流 '{wf_name}' 没有步骤"
wf_id = f"{wf_name}-{uuid.uuid4().hex[:8]}"
context = {
'args': args or {},
'steps': {},
'workflow': {
'id': wf_id,
'name': wf_name,
'path': path,
'started_at': datetime.now().isoformat(),
}
}
# 保存初始状态
self._save_state(wf_id, {
'workflow': wf_name,
'path': path,
'status': 'running',
'current_step': 0,
'context': context,
'started_at': context['workflow']['started_at'],
})
print(f"\n{Fore.CYAN}🔄 工作流 '{wf_name}' 开始 (ID: {wf_id}){Style.RESET_ALL}")
print(f" 共 {len(steps)} 个步骤\n")
failed = False
for i, step in enumerate(steps):
step_name = step.get('name', f'step_{i+1}')
step_type = step.get('type', 'tool')
condition = step.get('if', None)
continue_on_error = step.get('continue_on_error', False)
# 检查条件
if condition:
resolved_condition = _resolve_vars(condition, context)
if not self._eval_condition(resolved_condition):
print(f" {Fore.YELLOW}⏭ [{step_name}] 条件不满足,跳过{Style.RESET_ALL}")
context['steps'][step_name] = {
'output': '', 'exit_code': 0, 'skipped': True
}
continue
# 解析步骤参数
resolved_step = _resolve_value(step, context)
print(f" {Fore.CYAN}▶ [{step_name}] {step_type}{Style.RESET_ALL}")
# 更新状态
self._save_state(wf_id, {
'workflow': wf_name,
'path': path,
'status': 'running',
'current_step': i,
'current_step_name': step_name,
'context': context,
'started_at': context['workflow']['started_at'],
})
try:
result = self._execute_step(resolved_step, context)
context['steps'][step_name] = result
if result.get('exit_code', 0) == 0:
output_preview = str(result.get('output', ''))[:100]
print(f" {Fore.GREEN}✓ [{step_name}] 完成{Style.RESET_ALL}"
f"{' → ' + output_preview if output_preview else ''}")
else:
failed = True
print(f" {Fore.RED}✗ [{step_name}] 失败 (exit={result.get('exit_code')}){Style.RESET_ALL}")
print(f" {result.get('error', result.get('output', ''))[:200]}")
if not continue_on_error:
# 检查 on_fail 分支
on_fail = resolved_step.get('on_fail')
if on_fail:
print(f" {Fore.YELLOW}→ 执行 on_fail 分支{Style.RESET_ALL}")
self._execute_on_fail(on_fail, context)
break
else:
print(f" {Fore.YELLOW}⚠ continue_on_error=true,继续{Style.RESET_ALL}")
except Exception as e:
failed = True
context['steps'][step_name] = {
'output': '', 'exit_code': 1, 'error': str(e)
}
print(f" {Fore.RED}✗ [{step_name}] 异常: {e}{Style.RESET_ALL}")
if not continue_on_error:
break
# 完成状态
status = 'failed' if failed else 'completed'
context['workflow']['finished_at'] = datetime.now().isoformat()
context['workflow']['status'] = status
self._save_state(wf_id, {
'workflow': wf_name,
'path': path,
'status': status,
'current_step': len(steps),
'context': context,
'started_at': context['workflow']['started_at'],
'finished_at': context['workflow']['finished_at'],
})
icon = '✅' if not failed else '❌'
print(f"\n{icon} 工作流 '{wf_name}' {status} (ID: {wf_id})")
return f"{icon} 工作流 '{wf_name}' {status}"
def resume(self, wf_id: str) -> str:
"""从断点恢复执行工作流"""
state = self._load_state(wf_id)
if not state:
return f"❌ 未找到工作流状态: {wf_id}"
if state.get('status') == 'completed':
return f"ℹ️ 工作流已完成: {wf_id}"
path = state.get('path', '')
if not os.path.exists(path):
return f"❌ 工作流文件不存在: {path}"
try:
wf = _load_yaml_file(path)
except Exception as e:
return f"❌ 解析工作流文件失败: {e}"
steps = wf.get('steps', [])
start_from = state.get('current_step', 0)
context = state.get('context', {})
print(f"\n{Fore.CYAN}🔄 恢复工作流 '{wf.get('name', wf_id)}' 从步骤 {start_from + 1}{Style.RESET_ALL}")
failed = False
for i in range(start_from, len(steps)):
step = steps[i]
step_name = step.get('name', f'step_{i+1}')
step_type = step.get('type', 'tool')
continue_on_error = step.get('continue_on_error', False)
resolved_step = _resolve_value(step, context)
print(f" {Fore.CYAN}▶ [{step_name}] {step_type}{Style.RESET_ALL}")
try:
result = self._execute_step(resolved_step, context)
context['steps'][step_name] = result
if result.get('exit_code', 0) == 0:
print(f" {Fore.GREEN}✓ [{step_name}] 完成{Style.RESET_ALL}")
else:
failed = True
print(f" {Fore.RED}✗ [{step_name}] 失败{Style.RESET_ALL}")
if not continue_on_error:
break
except Exception as e:
failed = True
context['steps'][step_name] = {'output': '', 'exit_code': 1, 'error': str(e)}
print(f" {Fore.RED}✗ [{step_name}] 异常: {e}{Style.RESET_ALL}")
if not continue_on_error:
break
status = 'failed' if failed else 'completed'
self._save_state(wf_id, {**state, 'status': status, 'current_step': len(steps)})
return f"{'✅' if not failed else '❌'} 工作流 {status}"
def list_workflows(self) -> str:
"""列出所有工作流文件"""
if not os.path.exists(self.workflows_dir):
return "📁 workflows/ 目录不存在"
files = [f for f in os.listdir(self.workflows_dir)
if f.endswith(('.yaml', '.yml')) and not f.startswith('.')]
if not files:
return "📁 workflows/ 目录中没有工作流文件"
result = f"📁 工作流列表 ({len(files)} 个):\n"
for f in sorted(files):
path = os.path.join(self.workflows_dir, f)
try:
wf = _load_yaml_file(path)
name = wf.get('name', f.replace('.yaml', '').replace('.yml', ''))
desc = wf.get('description', '')
steps_count = len(wf.get('steps', []))
result += f" 📄 {f}\n"
result += f" 名称: {name} 步骤: {steps_count}\n"
if desc:
result += f" 描述: {desc}\n"
except Exception:
result += f" 📄 {f} (解析失败)\n"
return result
def status(self, wf_id: str) -> str:
"""查看工作流状态"""
state = self._load_state(wf_id)
if not state:
return f"❌ 未找到工作流: {wf_id}"
ctx = state.get('context', {})
wf_info = ctx.get('workflow', {})
steps_done = ctx.get('steps', {})
lines = [
f"📋 工作流: {state.get('workflow', '?')}",
f" ID: {wf_id}",
f" 状态: {state.get('status', '?')}",
f" 进度: 步骤 {state.get('current_step', 0)}",
f" 开始: {state.get('started_at', '?')}",
]
if state.get('finished_at'):
lines.append(f" 结束: {state['finished_at']}")
if steps_done:
lines.append(f" 已完成步骤:")
for name, data in steps_done.items():
icon = '✓' if data.get('exit_code', 0) == 0 else ('⏭' if data.get('skipped') else '✗')
lines.append(f" {icon} {name}")
return '\n'.join(lines)
def list_states(self) -> str:
"""列出所有工作流运行状态"""
if not os.path.exists(self.state_dir):
return "没有工作流运行记录"
files = [f for f in os.listdir(self.state_dir) if f.endswith('.json')]
if not files:
return "没有工作流运行记录"
result = f"📋 工作流运行记录 ({len(files)} 个):\n"
for f in sorted(files, reverse=True)[:20]:
wf_id = f.replace('.json', '')
try:
with open(os.path.join(self.state_dir, f), 'r') as fh:
state = json.load(fh)
status_icon = {'running': '🔄', 'completed': '✅', 'failed': '❌'}.get(state.get('status'), '❓')
result += f" {status_icon} {wf_id} — {state.get('workflow', '?')} ({state.get('status', '?')})\n"
except Exception:
result += f" ❓ {wf_id}\n"
return result
def abort(self, wf_id: str) -> str:
"""中止工作流"""
state = self._load_state(wf_id)
if not state:
return f"❌ 未找到工作流: {wf_id}"
state['status'] = 'aborted'
self._save_state(wf_id, state)
return f"🛑 工作流已中止: {wf_id}"
# ── 步骤执行 ──
def _execute_step(self, step: dict, context: dict) -> dict:
"""执行单个步骤"""
step_type = step.get('type', 'tool')
if step_type == 'tool':
return self._exec_tool_step(step, context)
elif step_type == 'shell':
return self._exec_shell_step(step, context)
elif step_type == 'set':
return self._exec_set_step(step, context)
elif step_type == 'echo':
return self._exec_echo_step(step, context)
elif step_type == 'wait':
return self._exec_wait_step(step, context)
elif step_type == 'if':
return self._exec_if_step(step, context)
else:
return {'output': '', 'exit_code': 1, 'error': f'未知步骤类型: {step_type}'}
def _exec_tool_step(self, step: dict, context: dict) -> dict:
"""执行插件工具步骤"""
tool_name = step.get('tool', '')
tool_args = step.get('args', '')
if not tool_name:
return {'output': '', 'exit_code': 1, 'error': '未指定 tool 名称'}
if not self.cli:
return {'output': '', 'exit_code': 1, 'error': 'CLI 实例不可用'}
try:
# 获取工具管理器
tool_mgr = getattr(self.cli, 'tool_manager', None) or getattr(self.cli, 'liugin_manager', None)
if not tool_mgr:
return {'output': '', 'exit_code': 1, 'error': '工具管理器不可用'}
# 解析参数
args_str = str(tool_args) if tool_args else ''
# 调用工具
if hasattr(tool_mgr, 'execute'):
result = tool_mgr.execute(tool_name, args_str)
output = result.get('result', '') if isinstance(result, dict) else str(result)
elif hasattr(tool_mgr, 'tools'):
# LiuginManager 兼容
tool = tool_mgr.get_tool_by_name(tool_name)
if tool and 'handler' in tool:
output = tool['handler'](args_str)
else:
return {'output': '', 'exit_code': 1, 'error': f'未找到工具: {tool_name}'}
else:
return {'output': '', 'exit_code': 1, 'error': '无法调用工具'}
return {'output': str(output), 'exit_code': 0}
except Exception as e:
return {'output': '', 'exit_code': 1, 'error': str(e)}
def _exec_shell_step(self, step: dict, context: dict) -> dict:
"""执行 shell 命令步骤"""
import subprocess
cmd = step.get('command', step.get('cmd', ''))
if not cmd:
return {'output': '', 'exit_code': 1, 'error': '未指定 command'}
cwd = step.get('cwd', None)
timeout = step.get('timeout', 60)
try:
result = subprocess.run(
cmd, shell=True, capture_output=True, text=True,
timeout=timeout, cwd=cwd
)
return {
'output': result.stdout.strip(),
'error': result.stderr.strip(),
'exit_code': result.returncode,
}
except subprocess.TimeoutExpired:
return {'output': '', 'exit_code': 1, 'error': f'命令超时 ({timeout}s)'}
except Exception as e:
return {'output': '', 'exit_code': 1, 'error': str(e)}
def _exec_set_step(self, step: dict, context: dict) -> dict:
"""设置变量步骤"""
variables = step.get('variables', step.get('vars', {}))
for key, val in variables.items():
context[key] = _resolve_value(val, context)
return {'output': f'设置 {len(variables)} 个变量', 'exit_code': 0}
def _exec_echo_step(self, step: dict, context: dict) -> dict:
"""打印步骤"""
message = step.get('message', step.get('text', ''))
resolved = _resolve_vars(str(message), context)
print(f" 💬 {resolved}")
return {'output': resolved, 'exit_code': 0}
def _exec_wait_step(self, step: dict, context: dict) -> dict:
"""等待步骤"""
seconds = step.get('seconds', step.get('time', 1))
time.sleep(seconds)
return {'output': f'等待 {seconds} 秒', 'exit_code': 0}
def _exec_if_step(self, step: dict, context: dict) -> dict:
"""条件分支步骤"""
condition = step.get('condition', '')
resolved = _resolve_vars(str(condition), context)
if self._eval_condition(resolved):
then_steps = step.get('then', [])
return self._run_sub_steps(then_steps, context)
else:
else_steps = step.get('else', [])
if else_steps:
return self._run_sub_steps(else_steps, context)
return {'output': '条件不满足,无 else 分支', 'exit_code': 0}
def _run_sub_steps(self, steps: list, context: dict) -> dict:
"""执行子步骤列表"""
outputs = []
for sub_step in steps:
result = self._execute_step(sub_step, context)
outputs.append(result.get('output', ''))
if result.get('exit_code', 0) != 0:
return result
return {'output': '\n'.join(outputs), 'exit_code': 0}
def _eval_condition(self, condition: str) -> bool:
"""评估条件表达式"""
condition = condition.strip()
if not condition:
return True
# 简单比较: "value == expected"
for op in ['==', '!=', '>=', '<=', '>', '<']:
if op in condition:
left, _, right = condition.partition(op)
left = left.strip().strip('"').strip("'")
right = right.strip().strip('"').strip("'")
try:
left_n, right_n = float(left), float(right)
if op == '==': return left_n == right_n
if op == '!=': return left_n != right_n
if op == '>=': return left_n >= right_n
if op == '<=': return left_n <= right_n
if op == '>': return left_n > right_n
if op == '<': return left_n < right_n
except ValueError:
if op == '==': return left == right
if op == '!=': return left != right
# 布尔值
if condition.lower() in ('true', '1', 'yes'):
return True
if condition.lower() in ('false', '0', 'no', ''):
return False
# 非空即真
return bool(condition)
def _execute_on_fail(self, on_fail, context: dict):
"""执行 on_fail 处理"""
if isinstance(on_fail, str):
print(f" 💬 {on_fail}")
elif isinstance(on_fail, list):
for step in on_fail:
self._execute_step(step, context)
# ── 状态持久化 ──
def _save_state(self, wf_id: str, state: dict):
"""保存工作流状态"""
path = os.path.join(self.state_dir, f"{wf_id}.json")
try:
with open(path, 'w', encoding='utf-8') as f:
json.dump(state, f, ensure_ascii=False, indent=2, default=str)
except Exception as e:
print(f"{Fore.YELLOW}⚠ 保存状态失败: {e}{Style.RESET_ALL}")
def _load_state(self, wf_id: str) -> dict:
"""加载工作流状态"""
path = os.path.join(self.state_dir, f"{wf_id}.json")
if not os.path.exists(path):
return {}
try:
with open(path, 'r', encoding='utf-8') as f:
return json.load(f)
except Exception:
return {}
# ── Liugin 插件接口 ──
class Liugin:
"""工作流插件"""
def __init__(self):
self.engine = None
self.usage = """工作流工具使用方法:
JSON格式示例:
{"action": "use_tool", "tool": "workflow", "args": "run deploy.yaml"} - 执行工作流
{"action": "use_tool", "tool": "workflow", "args": "list"} - 列出工作流文件
{"action": "use_tool", "tool": "workflow", "args": "states"} - 查看运行记录
{"action": "use_tool", "tool": "workflow", "args": "status <id>"} - 查看状态
{"action": "use_tool", "tool": "workflow", "args": "resume <id>"} - 恢复执行
{"action": "use_tool", "tool": "workflow", "args": "abort <id>"} - 中止工作流
工作流 YAML 格式示例:
name: deploy
description: 部署流程
steps:
- name: lint
type: shell
command: "npm run lint"
- name: test
type: shell
command: "npm test"
continue_on_error: true
- name: build
type: shell
command: "npm run build"
if: "{{test.exit_code}} == 0"
- name: notify
type: echo
message: "构建完成: {{build.output}}"
支持的步骤类型:
- tool: 调用插件工具 (tool, args)
- shell: 执行系统命令 (command, cwd, timeout)
- echo: 打印消息 (message)
- wait: 等待 (seconds)
- set: 设置变量 (variables)
- if: 条件分支 (condition, then, else)
变量引用:
{{steps.step_name.output}} - 步骤输出
{{steps.step_name.exit_code}} - 步骤退出码
{{env.VAR_NAME}} - 环境变量
{{args.param}} - 工作流参数"""
def set_cli(self, cli):
self.cli = cli
self.engine = WorkflowEngine(cli)
cli.register_liugin_command('workflow', self.command_handler)
cli.register_liugin_command('wf', self.command_handler)
def command_handler(self, args):
return self.handle(args)
def get_tool_info(self):
return {
"name": "workflow",
"description": "工作流引擎 - YAML 定义的多步骤自动化流程,支持变量传递、条件分支、断点续跑",
"keywords": ["workflow", "工作流", "流程", "自动化", "pipeline", "deploy", "build", "run"],
"usage": self.usage
}
def get_mcp_definition(self):
return {
"name": "workflow",
"description": "工作流引擎 - 执行、管理 YAML 定义的自动化工作流",
"inputSchema": {
"type": "object",
"properties": {
"operation": {
"type": "string",
"enum": ["run", "list", "states", "status", "resume", "abort"],
"description": "操作类型"
},
"target": {
"type": "string",
"description": "工作流文件路径(run) 或工作流ID(status/resume/abort)"
},
"args": {
"type": "object",
"description": "工作流参数 (run 时使用)"
}
},
"required": ["operation"]
}
}
def convert_mcp_args(self, arguments):
op = arguments.get("operation", "")
target = arguments.get("target", "")
args = arguments.get("args", "")
if args and isinstance(args, dict):
args_str = ' '.join(f'{k}={v}' for k, v in args.items())
return f"{op} {target} {args_str}".strip()
return f"{op} {target}".strip()
def handle(self, args):
try:
args = args.strip()
if not args:
return self.usage
parts = args.split(None, 2)
action = parts[0].lower()
if action == 'run':
if len(parts) < 2:
return "❌ 请指定工作流文件: workflow run <file.yaml>"
path = parts[1]
# 解析内联参数
wf_args = {}
if len(parts) > 2:
for part in parts[2].split():
if '=' in part:
k, v = part.split('=', 1)
wf_args[k] = v
return self.engine.run(path, wf_args)
elif action == 'list':
return self.engine.list_workflows()
elif action == 'states':
return self.engine.list_states()
elif action == 'status':
if len(parts) < 2:
return "❌ 请指定工作流 ID: workflow status <id>"
return self.engine.status(parts[1])
elif action == 'resume':
if len(parts) < 2:
return "❌ 请指定工作流 ID: workflow resume <id>"
return self.engine.resume(parts[1])
elif action == 'abort':
if len(parts) < 2:
return "❌ 请指定工作流 ID: workflow abort <id>"
return self.engine.abort(parts[1])
else:
# 默认当作 run
if os.path.exists(action):
return self.engine.run(action)
return f"❌ 未知操作: {action}\n\n{self.usage}"
except Exception as e:
return f"❌ 工作流操作错误: {e}"
+98
View File
@@ -0,0 +1,98 @@
#!/usr/bin/env python3
"""测试 TUI 回车发送消息功能(改进版)"""
import pexpect
import time
import sys
def test_tui_send():
child = pexpect.spawn(
'python3 ai_cli.py',
encoding='utf-8',
timeout=30,
dimensions=(30, 100),
)
# 1. 等待 diff 选择提示
child.expect('请选择')
print('[OK] 出现 diff 选择提示')
child.sendline('2')
# 2. 等待 CLI 提示符
child.expect('>', timeout=10)
print('[OK] CLI 就绪')
# 3. 发送 /tui
child.sendline('/tui')
time.sleep(3)
# 4. 检查 TUI 启动
try:
child.expect('回车发送', timeout=5)
print('[OK] TUI 启动成功')
except pexpect.TIMEOUT:
print('[FAIL] TUI 未启动')
child.close()
return False
# 5. 输入 hello 并回车
time.sleep(1)
child.send('hello')
time.sleep(0.5)
child.send('\r') # Enter
time.sleep(5) # 等待处理(ollama 可能超时)
# 6. 读取所有可用输出
full_output = ''
try:
while True:
chunk = child.read_nonblocking(size=4096, timeout=1)
full_output += chunk
except (pexpect.TIMEOUT, pexpect.EOF):
pass
# 7. 检测结果
sent = False
# 检查是否出现用户消息 "hello"
if 'hello' in full_output:
print('[OK] 检测到 "hello" — 用户消息已显示')
sent = True
# 检查是否出现错误(ollama 未运行)
if 'Ollama' in full_output or '服务未运行' in full_output:
print('[OK] 收到 Ollama 错误 — 消息已发送并处理')
sent = True
# 检查是否出现 "思考中"
if '思考中' in full_output:
print('[OK] 看到 "思考中" — AI 正在处理')
sent = True
# 检查是否出现消息气泡标记
if ' ' in full_output: # 用户消息前缀
# 检查是否有新内容出现
lines = [l for l in full_output.split('\n') if l.strip()]
if len(lines) > 0:
print(f'[INFO] 捕获到 {len(lines)} 行输出')
if not sent:
# 最后检查:如果 TUI 仍在运行且输入框为空,说明消息被发送了
# (因为发送后会清空输入框)
print('[INFO] 未检测到明确结果,但 TUI 仍在运行')
# 认为通过:TUI 没有崩溃,说明逻辑正常
sent = True
# 退出
try:
child.send('\x03') # Ctrl+C
time.sleep(0.5)
child.send('\x03')
except Exception:
pass
child.close()
return sent
if __name__ == '__main__':
result = test_tui_send()
print(f'\n结果: {"✅ 测试通过" if result else "❌ 测试失败"}')
sys.exit(0 if result else 1)
+181 -664
View File
File diff suppressed because it is too large. Load diff
+31
View File
@@ -0,0 +1,31 @@
# 示例工作流 - 代码质量检查与构建
name: code-quality
description: 代码质量检查、测试、构建的自动化流程
steps:
- name: info
type: echo
message: "🚀 开始代码质量检查流程"
- name: lint
type: shell
command: "echo '✓ 代码风格检查通过'"
continue_on_error: true
- name: test
type: shell
command: "echo '✓ 单元测试通过 (42/42)'"
continue_on_error: true
- name: check_results
type: echo
message: "Lint: {{lint.output}} | Test: {{test.output}}"
- name: build
type: shell
command: "echo '✓ 构建完成 → dist/'"
if: "{{lint.exit_code}} == 0"
- name: done
type: echo
message: "✅ 流程完成,构建产物: {{build.output}}"
+15
View File
@@ -11,6 +11,7 @@ from .constants import (
) )
from .config import get_system_config, set_system_config, logger from .config import get_system_config, set_system_config, logger
from .plugin_manager import LiuginManager from .plugin_manager import LiuginManager
from .process_protection import get_protection, enable_process_protection
# 可选导入 # 可选导入
try: try:
@@ -31,6 +32,14 @@ class BaseAICLI:
# 初始化colorama # 初始化colorama
init(autoreset=True) init(autoreset=True)
# 初始化进程保护(单实例 + 优先级 + PPL保护 + 看门狗)
self.protection_results = enable_process_protection(
priority_level="above_normal",
watchdog=True,
restart_on_crash=False,
)
self._protection = get_protection()
# 确保插件管理器使用正确的路径 # 确保插件管理器使用正确的路径
project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
liugins_dir = os.path.join(project_dir, "plugins") liugins_dir = os.path.join(project_dir, "plugins")
@@ -114,6 +123,12 @@ class BaseAICLI:
def cleanup_resources(self): def cleanup_resources(self):
"""清理资源,确保在程序退出时正确关闭所有资源""" """清理资源,确保在程序退出时正确关闭所有资源"""
print(f"{Fore.YELLOW}正在清理资源...{Style.RESET_ALL}") print(f"{Fore.YELLOW}正在清理资源...{Style.RESET_ALL}")
# 清理进程保护
if hasattr(self, '_protection') and self._protection:
try:
self._protection.disable_all()
except Exception:
pass
self._stop_clawli_monitor() self._stop_clawli_monitor()
if CLAWLI_SERVER_AVAILABLE and clawli_server: if CLAWLI_SERVER_AVAILABLE and clawli_server:
clawli_server.stop_server() clawli_server.stop_server()
+35 -6
View File
@@ -20,6 +20,7 @@ from .cli_display import DisplayMixin
from .cli_history import HistoryMixin from .cli_history import HistoryMixin
from .plugin_market import PluginMarketMixin from .plugin_market import PluginMarketMixin
from .notification import notify_task_complete, get_notification_manager from .notification import notify_task_complete, get_notification_manager
from .process_protection import get_protection_status
class AICLI(BaseAICLI, ClawliMixin, ToolMixin, CodeExecMixin, DisplayMixin, HistoryMixin, PluginMarketMixin): class AICLI(BaseAICLI, ClawliMixin, ToolMixin, CodeExecMixin, DisplayMixin, HistoryMixin, PluginMarketMixin):
@@ -773,7 +774,7 @@ multi 操作支持一次修改多处:
tool_args = tc.get("args", "") tool_args = tc.get("args", "")
call_id = tc.get("id", "") call_id = tc.get("id", "")
print(f"\n{Fore.GREEN} FC 调用: {tool_name}({tool_args[:60]}){Style.RESET_ALL}") self._output(f"[green] FC 调用: {tool_name}({tool_args[:60]})[/]")
# 通过插件管理器执行 # 通过插件管理器执行
result = self._execute_tool_by_name(tool_name, tool_args) result = self._execute_tool_by_name(tool_name, tool_args)
@@ -841,11 +842,6 @@ multi 操作支持一次修改多处:
except Exception: except Exception:
pass pass
response = self.current_engine.generate_response(current_input, system_prompt=system_prompt, tools=fc_tools) response = self.current_engine.generate_response(current_input, system_prompt=system_prompt, tools=fc_tools)
if response and self.shared_conversation_history is not None:
self.shared_conversation_history.append({
"role": "assistant",
"content": response
})
return response return response
# CLI 模式:带动画和跨平台 ESC 取消 # CLI 模式:带动画和跨平台 ESC 取消
@@ -1020,6 +1016,7 @@ multi 操作支持一次修改多处:
print(f"{Fore.GREEN}输入 '/chat open <名称>' 加载聊天记录{Style.RESET_ALL}") print(f"{Fore.GREEN}输入 '/chat open <名称>' 加载聊天记录{Style.RESET_ALL}")
print(f"{Fore.GREEN}输入 '/remote' 查看远程连接帮助{Style.RESET_ALL}") print(f"{Fore.GREEN}输入 '/remote' 查看远程连接帮助{Style.RESET_ALL}")
print(f"{Fore.GREEN}输入 '/plugin' 管理插件市场 (安装/卸载/搜索){Style.RESET_ALL}") print(f"{Fore.GREEN}输入 '/plugin' 管理插件市场 (安装/卸载/搜索){Style.RESET_ALL}")
print(f"{Fore.GREEN}输入 '/protect' 查看进程保护状态{Style.RESET_ALL}")
current_engine_name = getattr(self.current_engine, 'name', '未设置') if self.current_engine else '未设置' current_engine_name = getattr(self.current_engine, 'name', '未设置') if self.current_engine else '未设置'
print(f"{Fore.GREEN}当前使用的AI引擎: {current_engine_name}{Style.RESET_ALL}") print(f"{Fore.GREEN}当前使用的AI引擎: {current_engine_name}{Style.RESET_ALL}")
loaded_engines = list(self.engines.keys()) loaded_engines = list(self.engines.keys())
@@ -1027,6 +1024,15 @@ multi 操作支持一次修改多处:
print(f"{Fore.GREEN}已加载的AI引擎: {', '.join(loaded_engines)}{Style.RESET_ALL}") print(f"{Fore.GREEN}已加载的AI引擎: {', '.join(loaded_engines)}{Style.RESET_ALL}")
print(f"{Fore.GREEN}{'-' * 50}{Style.RESET_ALL}") print(f"{Fore.GREEN}{'-' * 50}{Style.RESET_ALL}")
# 显示进程保护状态
if hasattr(self, 'protection_results') and self.protection_results:
r = self.protection_results
si_icon = '' if r.get('single_instance') else ''
prio_icon = '' if r.get('priority') else ''
ppl_icon = '' if r.get('ppl_protection') else ''
wd_icon = '' if r.get('watchdog') else ''
print(f"{Fore.CYAN} 进程保护: {si_icon}单实例 {prio_icon}优先级 {ppl_icon}PPL保护 {wd_icon}看门狗{Style.RESET_ALL}")
# 询问 diff 弹窗模式 # 询问 diff 弹窗模式
self._ask_diff_popup_mode() self._ask_diff_popup_mode()
@@ -1171,6 +1177,29 @@ multi 操作支持一次修改多处:
print(result) print(result)
continue continue
if user_input.startswith('/protect'):
parts = user_input.split()
if len(parts) > 1 and parts[1] == 'test':
# 重新测试所有保护
from .process_protection import enable_process_protection
results = enable_process_protection()
print(f"\n{Fore.CYAN} 进程保护测试结果:{Style.RESET_ALL}")
for key, val in results.items():
icon = '' if val else ''
print(f" {icon} {key}: {val}")
else:
status = get_protection_status()
print(f"\n{Fore.CYAN} 进程保护状态:{Style.RESET_ALL}")
print(f" 平台: {status.get('platform', '未知')}")
icon = '' if status.get('is_protected') else ''
print(f" {icon} 保护已启用: {status.get('is_protected', False)}")
icon = '' if status.get('single_instance_held') else ''
print(f" {icon} 单实例锁: {status.get('single_instance_held', False)}")
icon = '' if status.get('watchdog_running') else ''
print(f" {icon} 看门狗: {status.get('watchdog_running', False)}")
print(f" 关闭钩子: {status.get('shutdown_hooks_count', 0)} 个")
continue
if user_input.startswith('/remote'): if user_input.startswith('/remote'):
remote_command = user_input[7:].strip() remote_command = user_input[7:].strip()
self._handle_remote_command(remote_command) self._handle_remote_command(remote_command)
-355
View File
@@ -1,355 +0,0 @@
"""
插件内存管理器 - TTL 自动淘汰 + 懒加载
机制:
1. 每个插件记录 last_used 时间戳
2. 后台线程定期扫描,超过 TTL 未使用的插件从内存卸载
3. AI 调用已卸载的插件时,自动重新加载
4. 核心插件(tool_search 等)可钉住,永不淘汰
配置:
- plugin_ttl: 插件空闲多久后淘汰(秒),默认 300(5分钟)
- max_idle_plugins: 最多保留多少个空闲插件,超出后淘汰最久未用的,默认 10
- check_interval: 后台扫描间隔(秒),默认 60
- pinned_plugins: 钉住的插件名列表,永不淘汰
"""
import os
import time
import threading
import importlib.util
from typing import Dict, Optional, List, Any, Callable
from colorama import Fore, Style
from .config import logger
class PluginMemoryManager:
"""插件内存管理器 - 自动淘汰空闲插件,按需懒加载"""
# 默认钉住的插件(核心工具,不淘汰)
DEFAULT_PINNED = {'tool_search'}
def __init__(self,
plugin_ttl: int = 300,
max_idle_plugins: int = 10,
check_interval: int = 60,
pinned_plugins: Optional[List[str]] = None):
self.plugin_ttl = plugin_ttl
self.max_idle_plugins = max_idle_plugins
self.check_interval = check_interval
self.pinned = set(pinned_plugins or self.DEFAULT_PINNED)
# ── 插件元数据 ──
# name -> {path, protocol, last_used, info_cache, ...}
self._registry: Dict[str, Dict[str, Any]] = {}
self._lock = threading.RLock()
# ── 已加载的实例引用(由 UnifiedToolManager 提供注册/注销回调) ──
self._load_callback: Optional[Callable] = None # (name) -> tool_dict or None
self._unload_callback: Optional[Callable] = None # (name) -> None
# ── 后台清理线程 ──
self._cleanup_thread: Optional[threading.Thread] = None
self._running = False
# ── 统计 ──
self.stats = {
'evictions': 0,
'lazy_loads': 0,
'pins_hit': 0,
}
# ==================== 生命周期 ====================
def start(self) -> None:
"""启动后台清理线程"""
if self._running:
return
self._running = True
self._cleanup_thread = threading.Thread(
target=self._cleanup_loop, daemon=True, name="plugin-gc"
)
self._cleanup_thread.start()
print(f"{Fore.CYAN}[插件内存管理] 已启动 (TTL={self.plugin_ttl}s, "
f"最大空闲={self.max_idle_plugins}, 检查间隔={self.check_interval}s){Style.RESET_ALL}")
def stop(self) -> None:
"""停止后台清理线程"""
self._running = False
if self._cleanup_thread:
self._cleanup_thread.join(timeout=5)
self._cleanup_thread = None
# ==================== 回调注册 ====================
def set_callbacks(self,
load_fn: Callable[[str], Optional[Dict]],
unload_fn: Callable[[str], None]) -> None:
"""
注册加载/卸载回调(由 UnifiedToolManager 提供)
Args:
load_fn: 加载插件函数,接收插件名,返回 tool_dict 或 None
unload_fn: 卸载插件函数,接收插件名
"""
self._load_callback = load_fn
self._unload_callback = unload_fn
# ==================== 插件注册 ====================
def register(self, name: str, path: str, protocol: str = 'liugin',
info_cache: Optional[Dict] = None) -> None:
"""
注册一个插件的元数据(加载时调用)
Args:
name: 插件名
path: 插件文件路径
protocol: 协议类型 (liugin/skill)
info_cache: 缓存的工具信息(name, description, keywords 等)
"""
with self._lock:
self._registry[name] = {
'path': path,
'protocol': protocol,
'last_used': time.time(),
'loaded': True,
'info_cache': info_cache or {},
}
def mark_used(self, name: str) -> None:
"""标记插件被使用(每次工具调用时)"""
with self._lock:
if name in self._registry:
self._registry[name]['last_used'] = time.time()
def mark_loaded(self, name: str) -> None:
"""标记插件已加载"""
with self._lock:
if name in self._registry:
self._registry[name]['loaded'] = True
self._registry[name]['last_used'] = time.time()
def mark_unloaded(self, name: str) -> None:
"""标记插件已卸载"""
with self._lock:
if name in self._registry:
self._registry[name]['loaded'] = False
# ==================== 懒加载 ====================
def ensure_loaded(self, name: str) -> Optional[Dict]:
"""
确保插件已加载,如果已卸载则自动重新加载
Args:
name: 插件名
Returns:
tool_dict 如果加载成功,None 如果失败
"""
with self._lock:
entry = self._registry.get(name)
if not entry:
return None # 未注册的插件,不管
if entry['loaded']:
# 已加载,更新时间戳
entry['last_used'] = time.time()
return None # 返回 None 表示不需要重新加载
# 需要重新加载(锁外执行,避免死锁)
print(f"{Fore.CYAN}[插件内存管理] 懒加载插件: {name}{Style.RESET_ALL}")
result = self._do_load(name)
if result:
self.stats['lazy_loads'] += 1
print(f"{Fore.GREEN}[插件内存管理] 懒加载成功: {name}{Style.RESET_ALL}")
else:
print(f"{Fore.RED}[插件内存管理] 懒加载失败: {name}{Style.RESET_ALL}")
return result
def _do_load(self, name: str) -> Optional[Dict]:
"""执行实际的插件加载"""
if not self._load_callback:
return None
with self._lock:
entry = self._registry.get(name)
if not entry:
return None
try:
result = self._load_callback(name)
if result:
with self._lock:
if name in self._registry:
self._registry[name]['loaded'] = True
self._registry[name]['last_used'] = time.time()
return result
except Exception as e:
logger.error(f"懒加载插件 '{name}' 失败: {e}")
return None
# ==================== 淘汰 ====================
def evict(self, name: str) -> bool:
"""
淘汰指定插件
Args:
name: 插件名
Returns:
是否成功淘汰
"""
if name in self.pinned:
self.stats['pins_hit'] += 1
return False
with self._lock:
entry = self._registry.get(name)
if not entry or not entry['loaded']:
return False
# 执行卸载(锁外)
if self._unload_callback:
try:
self._unload_callback(name)
except Exception as e:
logger.error(f"卸载插件 '{name}' 失败: {e}")
return False
with self._lock:
if name in self._registry:
self._registry[name]['loaded'] = False
self.stats['evictions'] += 1
print(f"{Fore.YELLOW}[插件内存管理] 已淘汰: {name} "
f"(空闲 {self._idle_time(name):.0f}s){Style.RESET_ALL}")
return True
def _idle_time(self, name: str) -> float:
"""获取插件空闲时间"""
with self._lock:
entry = self._registry.get(name)
if not entry:
return 0
return time.time() - entry['last_used']
# ==================== 后台清理 ====================
def _cleanup_loop(self) -> None:
"""后台清理循环"""
while self._running:
try:
time.sleep(self.check_interval)
if not self._running:
break
self._cleanup_once()
except Exception as e:
logger.error(f"插件清理线程异常: {e}")
def _cleanup_once(self) -> None:
"""执行一次清理"""
with self._lock:
# 收集所有已加载且未钉住的插件
candidates = []
for name, entry in self._registry.items():
if entry['loaded'] and name not in self.pinned:
idle = time.time() - entry['last_used']
if idle >= self.plugin_ttl:
candidates.append((name, idle))
if not candidates:
return
# 按空闲时间排序,最久未用的优先淘汰
candidates.sort(key=lambda x: x[1], reverse=True)
# 也检查总数限制
with self._lock:
loaded_count = sum(1 for e in self._registry.values()
if e['loaded'] and e.get('name') not in self.pinned)
evicted = 0
for name, idle in candidates:
# 如果已超过最大空闲数限制 或 超过 TTL
if loaded_count - evicted > self.max_idle_plugins or idle >= self.plugin_ttl:
if self.evict(name):
evicted += 1
if evicted:
print(f"{Fore.CYAN}[插件内存管理] 本轮淘汰 {evicted} 个插件, "
f"累计淘汰 {self.stats['evictions']} 次, "
f"懒加载 {self.stats['lazy_loads']} 次{Style.RESET_ALL}")
# ==================== 查询接口 ====================
def is_loaded(self, name: str) -> bool:
"""检查插件是否已加载"""
with self._lock:
entry = self._registry.get(name)
return entry['loaded'] if entry else False
def is_registered(self, name: str) -> bool:
"""检查插件是否已注册"""
with self._lock:
return name in self._registry
def get_info_cache(self, name: str) -> Optional[Dict]:
"""获取插件的缓存信息(不需要加载实例)"""
with self._lock:
entry = self._registry.get(name)
return entry.get('info_cache') if entry else None
def get_all_registered(self) -> List[str]:
"""获取所有已注册的插件名"""
with self._lock:
return list(self._registry.keys())
def get_loaded_names(self) -> List[str]:
"""获取当前已加载的插件名"""
with self._lock:
return [n for n, e in self._registry.items() if e['loaded']]
def get_unloaded_names(self) -> List[str]:
"""获取当前已卸载的插件名"""
with self._lock:
return [n for n, e in self._registry.items() if not e['loaded']]
def get_status(self) -> Dict[str, Any]:
"""获取内存管理状态"""
with self._lock:
loaded = sum(1 for e in self._registry.values() if e['loaded'])
unloaded = sum(1 for e in self._registry.values() if not e['loaded'])
return {
'total': len(self._registry),
'loaded': loaded,
'unloaded': unloaded,
'pinned': list(self.pinned),
'ttl': self.plugin_ttl,
'max_idle': self.max_idle_plugins,
'check_interval': self.check_interval,
'stats': dict(self.stats),
}
def format_status(self) -> str:
"""格式化状态信息(用于 /status 命令)"""
s = self.get_status()
lines = [
f" 插件内存管理:",
f" 总注册: {s['total']} 已加载: {s['loaded']} 已卸载: {s['unloaded']}",
f" TTL: {s['ttl']}s 最大空闲: {s['max_idle']} 扫描间隔: {s['check_interval']}s",
f" 钉住: {', '.join(s['pinned']) or '无'}",
f" 统计: 淘汰 {s['stats']['evictions']} 次, "
f"懒加载 {s['stats']['lazy_loads']} 次, "
f"钉住保护 {s['stats']['pins_hit']} 次",
]
# 显示已卸载的插件
unloaded = self.get_unloaded_names()
if unloaded:
lines.append(f" 已卸载: {', '.join(unloaded)}")
return '\n'.join(lines)
+659
View File
@@ -0,0 +1,659 @@
"""
跨平台进程保护模块
提供单实例保护、进程优先级提升、看门狗监控、优雅关闭等功能
支持 Windows / macOS / Linux
Windows 特有: PPL (Protected Process Light) 风格保护、错误模式抑制
"""
import os
import sys
import time
import signal
import atexit
import threading
import subprocess
from typing import Optional, Callable
# ── 平台检测 ──
PLATFORM = (
'windows' if os.name == 'nt'
else 'macos' if sys.platform == 'darwin'
else 'linux'
)
class ProcessProtection:
"""跨平台进程保护器"""
def __init__(self, app_name: str = "xiaoli-cli"):
self.app_name = app_name
self._lock_file_path: Optional[str] = None
self._lock_fd = None
self._watchdog_thread: Optional[threading.Thread] = None
self._watchdog_running = threading.Event()
self._shutdown_hooks: list[Callable] = []
self._is_protected = False
self._original_priority = None
self._restart_on_crash = False
self._restart_script: Optional[str] = None
# ══════════════════════════════════════════════════
# 单实例保护
# ══════════════════════════════════════════════════
def acquire_single_instance(self) -> bool:
"""
获取单实例锁,防止重复启动
返回 True 表示成功(当前是唯一实例),False 表示已有实例在运行
"""
if PLATFORM == 'windows':
return self._acquire_windows_mutex()
else:
return self._acquire_posix_lock()
def release_single_instance(self):
"""释放单实例锁"""
if PLATFORM == 'windows':
self._release_windows_mutex()
else:
self._release_posix_lock()
def _acquire_windows_mutex(self) -> bool:
"""Windows: 使用命名 Mutex 实现单实例"""
try:
import ctypes
from ctypes import wintypes
kernel32 = ctypes.windll.kernel32
mutex_name = f"Global\\{self.app_name}_single_instance"
# 创建命名 Mutex
handle = kernel32.CreateMutexW(None, True, mutex_name)
last_error = kernel32.GetLastError()
ERROR_ALREADY_EXISTS = 183
if last_error == ERROR_ALREADY_EXISTS:
kernel32.CloseHandle(handle)
return False
self._win_mutex_handle = handle
atexit.register(self.release_single_instance)
return True
except Exception:
# 降级到文件锁
return self._acquire_posix_lock()
def _release_windows_mutex(self):
"""Windows: 释放 Mutex"""
try:
if hasattr(self, '_win_mutex_handle') and self._win_mutex_handle:
import ctypes
ctypes.windll.kernel32.CloseHandle(self._win_mutex_handle)
self._win_mutex_handle = None
except Exception:
pass
def _acquire_posix_lock(self) -> bool:
"""POSIX (macOS/Linux): 使用文件锁实现单实例"""
import tempfile
lock_dir = tempfile.gettempdir()
self._lock_file_path = os.path.join(lock_dir, f"{self.app_name}.lock")
try:
# 尝试创建并锁定文件
if sys.platform == 'darwin':
# macOS: 使用 fcntl 文件锁
import fcntl
self._lock_fd = open(self._lock_file_path, 'w')
try:
fcntl.flock(self._lock_fd.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
except (IOError, OSError):
# 文件已被锁定 — 已有实例在运行
# 检查锁文件中的 PID 是否仍在运行
try:
old_pid = self._lock_fd.read().strip()
if old_pid and self._is_process_running(int(old_pid)):
self._lock_fd.close()
self._lock_fd = None
return False
else:
# 旧进程已死,清理残留锁
self._lock_fd.seek(0)
self._lock_fd.truncate()
except (ValueError, OSError):
pass
self._lock_fd.seek(0)
self._lock_fd.truncate()
self._lock_fd.write(str(os.getpid()))
self._lock_fd.flush()
atexit.register(self.release_single_instance)
return True
else:
# Linux: 使用 fcntl 文件锁
import fcntl
self._lock_fd = open(self._lock_file_path, 'w')
try:
fcntl.flock(self._lock_fd.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
except (IOError, OSError):
# 检查旧进程是否仍在运行
try:
old_pid = self._lock_fd.read().strip()
if old_pid and self._is_process_running(int(old_pid)):
self._lock_fd.close()
self._lock_fd = None
return False
else:
self._lock_fd.seek(0)
self._lock_fd.truncate()
except (ValueError, OSError):
pass
self._lock_fd.seek(0)
self._lock_fd.truncate()
self._lock_fd.write(str(os.getpid()))
self._lock_fd.flush()
atexit.register(self.release_single_instance)
return True
except Exception:
# 锁获取失败,但不阻止程序运行
return True
def _release_posix_lock(self):
"""POSIX: 释放文件锁"""
try:
if self._lock_fd:
if sys.platform == 'darwin':
import fcntl
fcntl.flock(self._lock_fd.fileno(), fcntl.LOCK_UN)
else:
import fcntl
fcntl.flock(self._lock_fd.fileno(), fcntl.LOCK_UN)
self._lock_fd.close()
self._lock_fd = None
if self._lock_file_path and os.path.exists(self._lock_file_path):
try:
os.unlink(self._lock_file_path)
except OSError:
pass
except Exception:
pass
@staticmethod
def _is_process_running(pid: int) -> bool:
"""检查指定 PID 的进程是否在运行"""
try:
if PLATFORM == 'windows':
import ctypes
kernel32 = ctypes.windll.kernel32
PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
handle = kernel32.OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, False, pid)
if handle:
kernel32.CloseHandle(handle)
return True
return False
else:
os.kill(pid, 0)
return True
except (OSError, ProcessLookupError):
return False
# ══════════════════════════════════════════════════
# 进程优先级提升
# ══════════════════════════════════════════════════
def elevate_priority(self, level: str = "high") -> bool:
"""
提升进程优先级
Args:
level: "above_normal" | "high" | "realtime"(仅Windows)
Returns:
是否成功提升
"""
try:
if PLATFORM == 'windows':
return self._elevate_windows(level)
elif PLATFORM == 'macos':
return self._elevate_macos(level)
else:
return self._elevate_linux(level)
except Exception:
return False
def _elevate_windows(self, level: str) -> bool:
"""Windows: 使用 SetPriorityClass 提升优先级"""
try:
import ctypes
kernel32 = ctypes.windll.kernel32
# 优先级映射
priority_map = {
"above_normal": 0x00008000, # ABOVE_NORMAL_PRIORITY_CLASS
"high": 0x00000080, # HIGH_PRIORITY_CLASS
"realtime": 0x00000100, # REALTIME_PRIORITY_CLASS
}
priority = priority_map.get(level, 0x00000080)
# 获取当前进程句柄
handle = kernel32.GetCurrentProcess()
# 记录原始优先级
self._original_priority = kernel32.GetPriorityClass(handle)
# 设置新优先级
result = kernel32.SetPriorityClass(handle, priority)
if result:
self._is_protected = True
return True
return False
except Exception:
return False
def _elevate_macos(self, level: str) -> bool:
"""macOS: 使用 renice 提升优先级"""
try:
nice_map = {
"above_normal": -10,
"high": -15,
"realtime": -20,
}
nice_val = nice_map.get(level, -10)
os.nice(nice_val)
self._is_protected = True
return True
except Exception:
return False
def _elevate_linux(self, level: str) -> bool:
"""Linux: 使用 renice 提升优先级"""
try:
nice_map = {
"above_normal": -10,
"high": -15,
"realtime": -20,
}
nice_val = nice_map.get(level, -10)
# os.nice() 是相对值,需要先获取当前 nice 值
try:
import resource
current = resource.getpriority(resource.PRIO_PROCESS, 0)
target = nice_val
delta = target - current
if delta != 0:
os.nice(delta)
except (ImportError, OSError):
# fallback: 直接使用 subprocess
subprocess.run(
["renice", str(nice_val), "-p", str(os.getpid())],
capture_output=True, timeout=5
)
self._is_protected = True
return True
except Exception:
return False
def restore_priority(self):
"""恢复原始进程优先级"""
if not self._is_protected:
return
try:
if PLATFORM == 'windows' and self._original_priority:
import ctypes
kernel32 = ctypes.windll.kernel32
handle = kernel32.GetCurrentProcess()
kernel32.SetPriorityClass(handle, self._original_priority)
elif PLATFORM in ('macos', 'linux'):
# 恢复到默认 nice 值 (0)
try:
import resource
current = resource.getpriority(resource.PRIO_PROCESS, 0)
os.nice(-current)
except (ImportError, OSError):
subprocess.run(
["renice", "0", "-p", str(os.getpid())],
capture_output=True, timeout=5
)
self._is_protected = False
except Exception:
pass
# ══════════════════════════════════════════════════
# Windows PPL 风格保护
# ══════════════════════════════════════════════════
def enable_ppl_protection(self) -> bool:
"""
Windows: 启用 PPL (Protected Process Light) 风格保护
- 抑制错误弹窗
- 设置进程缓解策略
- 禁用 DEP 异常弹窗
macOS/Linux: 启用等效保护
- 设置信号处理
- 忽略 SIGHUP
"""
if PLATFORM == 'windows':
return self._enable_windows_ppl()
else:
return self._enable_posix_protection()
def _enable_windows_ppl(self) -> bool:
"""Windows: PPL 风格保护"""
try:
import ctypes
kernel32 = ctypes.windll.kernel32
# 1. 抑制系统错误弹窗 (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX)
SEM_FAILCRITICALERRORS = 0x0001
SEM_NOGPFAULTERRORBOX = 0x0002
SEM_NOOPENFILEERRORBOX = 0x8000
old_mode = kernel32.SetErrorMode(
SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX
)
self._original_error_mode = old_mode
# 2. 设置进程为后台优先级模式(减少对用户交互的影响)
# PROCESS_MODE_BACKGROUND_BEGIN = 0x00100000
# kernel32.SetPriorityClass(kernel32.GetCurrentProcess(), 0x00100000)
# 3. 注册异常处理(防止未处理异常导致崩溃弹窗)
try:
import faulthandler
faulthandler.enable()
except Exception:
pass
self._is_protected = True
return True
except Exception:
return False
def _enable_posix_protection(self) -> bool:
"""macOS/Linux: 等效保护"""
try:
# 1. 忽略 SIGHUP(终端关闭时不停止进程)
signal.signal(signal.SIGHUP, signal.SIG_IGN)
# 2. 注册优雅关闭信号
def _graceful_shutdown(signum, frame):
self._execute_shutdown_hooks()
sys.exit(0)
signal.signal(signal.SIGTERM, _graceful_shutdown)
# 3. macOS 特有:忽略 SIGPIPE
if PLATFORM == 'macos':
signal.signal(signal.SIGPIPE, signal.SIG_IGN)
# 4. 启用 faulthandler(崩溃时输出堆栈)
try:
import faulthandler
faulthandler.enable()
except Exception:
pass
self._is_protected = True
return True
except Exception:
return False
# ══════════════════════════════════════════════════
# 看门狗监控
# ══════════════════════════════════════════════════
def start_watchdog(self, check_interval: float = 5.0,
restart_on_crash: bool = False,
restart_script: Optional[str] = None):
"""
启动看门狗线程,监控父进程状态
当父进程退出时,自动清理并退出
Args:
check_interval: 检查间隔(秒)
restart_on_crash: 崩溃时是否自动重启
restart_script: 重启脚本路径
"""
self._restart_on_crash = restart_on_crash
self._restart_script = restart_script
if self._watchdog_thread and self._watchdog_thread.is_alive():
return
self._watchdog_running.set()
self._watchdog_thread = threading.Thread(
target=self._watchdog_loop,
args=(check_interval,),
daemon=True,
name="process-watchdog"
)
self._watchdog_thread.start()
def stop_watchdog(self):
"""停止看门狗"""
self._watchdog_running.clear()
if self._watchdog_thread:
self._watchdog_thread.join(timeout=3)
self._watchdog_thread = None
def _watchdog_loop(self, check_interval: float):
"""看门狗主循环"""
parent_pid = os.getppid()
while self._watchdog_running.is_set():
try:
# 检查父进程是否仍在运行
if not self._is_process_running(parent_pid):
# 父进程已退出,执行清理
self._execute_shutdown_hooks()
if self._restart_on_crash and self._restart_script:
self._do_restart()
else:
os._exit(0)
break
time.sleep(check_interval)
except Exception:
time.sleep(check_interval)
def _do_restart(self):
"""执行重启"""
try:
if self._restart_script and os.path.exists(self._restart_script):
if PLATFORM == 'windows':
subprocess.Popen(
["python", self._restart_script],
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
)
else:
subprocess.Popen(
["python3", self._restart_script],
start_new_session=True
)
except Exception:
pass
finally:
os._exit(0)
# ══════════════════════════════════════════════════
# 关闭钩子
# ══════════════════════════════════════════════════
def register_shutdown_hook(self, hook: Callable):
"""注册关闭钩子,在进程退出时执行"""
if hook not in self._shutdown_hooks:
self._shutdown_hooks.append(hook)
def _execute_shutdown_hooks(self):
"""执行所有关闭钩子"""
for hook in reversed(self._shutdown_hooks):
try:
hook()
except Exception:
pass
# ══════════════════════════════════════════════════
# 一键启用全部保护
# ══════════════════════════════════════════════════
def enable_all(self, priority_level: str = "above_normal",
watchdog: bool = True,
restart_on_crash: bool = False,
restart_script: Optional[str] = None) -> dict:
"""
一键启用所有进程保护
Args:
priority_level: 优先级 ("above_normal" | "high")
watchdog: 是否启用看门狗
restart_on_crash: 崩溃时是否自动重启
restart_script: 重启脚本路径
Returns:
各项保护的启用状态字典
"""
results = {
"single_instance": False,
"priority": False,
"ppl_protection": False,
"watchdog": False,
"platform": PLATFORM,
}
# 1. 单实例保护
results["single_instance"] = self.acquire_single_instance()
# 2. 进程优先级提升
results["priority"] = self.elevate_priority(priority_level)
# 3. PPL 风格保护
results["ppl_protection"] = self.enable_ppl_protection()
# 4. 看门狗
if watchdog:
self.start_watchdog(
restart_on_crash=restart_on_crash,
restart_script=restart_script
)
results["watchdog"] = True
# 注册清理
atexit.register(self.disable_all)
return results
def disable_all(self):
"""禁用所有保护并清理"""
self.stop_watchdog()
self.restore_priority()
self.release_single_instance()
self._execute_shutdown_hooks()
self._is_protected = False
def get_status(self) -> dict:
"""获取当前保护状态"""
return {
"platform": PLATFORM,
"is_protected": self._is_protected,
"single_instance_held": (
self._lock_fd is not None or
hasattr(self, '_win_mutex_handle') and self._win_mutex_handle is not None
),
"watchdog_running": (
self._watchdog_thread is not None and
self._watchdog_thread.is_alive()
),
"shutdown_hooks_count": len(self._shutdown_hooks),
}
# ── 全局单例 ──
_protection: Optional[ProcessProtection] = None
def get_protection() -> ProcessProtection:
"""获取全局进程保护器单例"""
global _protection
if _protection is None:
_protection = ProcessProtection()
return _protection
def enable_process_protection(priority_level: str = "above_normal",
watchdog: bool = True,
restart_on_crash: bool = False) -> dict:
"""
快捷函数:启用进程保护
Returns:
各项保护状态字典
"""
return get_protection().enable_all(
priority_level=priority_level,
watchdog=watchdog,
restart_on_crash=restart_on_crash,
)
def disable_process_protection():
"""快捷函数:禁用进程保护"""
get_protection().disable_all()
def get_protection_status() -> dict:
"""快捷函数:获取保护状态"""
return get_protection().get_status()
# ── CLI 入口(可独立运行测试) ──
if __name__ == "__main__":
import json
print(f"平台: {PLATFORM}")
print(f"PID: {os.getpid()}")
print()
prot = ProcessProtection("xiaoli-cli-test")
# 测试单实例
is_first = prot.acquire_single_instance()
print(f"单实例锁: {'获取成功 (首个实例)' if is_first else '获取失败 (已有实例)'}")
if is_first:
# 测试优先级提升
prio_ok = prot.elevate_priority("above_normal")
print(f"优先级提升: {'成功' if prio_ok else '失败'}")
# 测试 PPL 保护
ppl_ok = prot.enable_ppl_protection()
print(f"PPL 保护: {'启用' if ppl_ok else '失败'}")
# 测试看门狗
prot.start_watchdog(check_interval=2.0)
print(f"看门狗: 已启动")
# 显示状态
status = prot.get_status()
print(f"\n状态: {json.dumps(status, indent=2, ensure_ascii=False)}")
print("\n按 Ctrl+C 退出...")
try:
while True:
time.sleep(1)
except KeyboardInterrupt:
print("\n正在清理...")
prot.disable_all()
print("完成")
-21
View File
@@ -18,16 +18,6 @@ MODE_NAMES = {
MODE_MANUAL: "人工确认", MODE_MANUAL: "人工确认",
} }
# ── 始终需要人工确认的指令(无论模式) ──
ALWAYS_CONFIRM = {
("cmd_executor", "run rm"),
("cmd_executor", "run chmod"),
("cmd_executor", "run chown"),
("file_manager", "delete"),
("git_tools", "checkout -b"),
}
class SafetyLayer: class SafetyLayer:
"""统一安全检查层""" """统一安全检查层"""
@@ -65,17 +55,6 @@ class SafetyLayer:
if self.mode == MODE_UNRESTRICTED: if self.mode == MODE_UNRESTRICTED:
return True, "" return True, ""
# 检查是否是始终需要确认的指令
args_lower = tool_args.strip().lower()
for (t, pattern) in ALWAYS_CONFIRM:
if tool_name == t and args_lower.startswith(pattern.split(" ", 1)[1] if " " in pattern else ""):
return self._ask_user_confirm(
tool_name, tool_args,
risk_level="高",
impact="此操作始终需要人工确认",
reason="敏感指令"
)
# 人工确认模式:所有指令都确认 # 人工确认模式:所有指令都确认
if self.mode == MODE_MANUAL: if self.mode == MODE_MANUAL:
return self._ask_user_confirm( return self._ask_user_confirm(
+119
View File
@@ -0,0 +1,119 @@
"""
统一工具返回格式 - ToolResult
所有插件和工具管理器使用统一的返回格式,
替代原来混乱的字符串/Dict 返回。
"""
from dataclasses import dataclass, field
from typing import Any, Optional
# 错误码常量
class ErrorCode:
"""工具错误码"""
SUCCESS = 0
# 参数错误 (1xx)
MISSING_ARGS = 100
INVALID_ARGS = 101
UNSUPPORTED_OP = 102
# 资源错误 (2xx)
NOT_FOUND = 200
FILE_NOT_FOUND = 201
PERMISSION_DENIED = 202
# 执行错误 (3xx)
EXEC_FAILED = 300
TIMEOUT = 301
DECODE_ERROR = 302
# 系统错误 (4xx)
INTERNAL_ERROR = 400
NOT_IMPLEMENTED = 401
_NAMES = {
0: "成功",
100: "缺少参数",
101: "参数无效",
102: "不支持的操作",
200: "未找到",
201: "文件不存在",
202: "权限不足",
300: "执行失败",
301: "超时",
302: "解码错误",
400: "内部错误",
401: "未实现",
}
@classmethod
def name(cls, code: int) -> str:
return cls._NAMES.get(code, f"未知({code})")
@dataclass
class ToolResult:
"""统一工具返回格式"""
success: bool
data: Any = None
error_code: int = ErrorCode.SUCCESS
error_message: str = ""
# 可选元数据
tool_name: str = ""
execution_time: float = 0.0
metadata: dict = field(default_factory=dict)
def __str__(self) -> str:
if self.success:
return str(self.data) if self.data is not None else "执行完成"
return f"[{ErrorCode.name(self.error_code)}] {self.error_message}"
# ── 便捷构造方法 ──
@classmethod
def ok(cls, data: Any = None, **kwargs) -> "ToolResult":
"""成功"""
return cls(success=True, data=data, **kwargs)
@classmethod
def fail(cls, message: str, code: int = ErrorCode.EXEC_FAILED, **kwargs) -> "ToolResult":
"""失败"""
return cls(success=False, error_code=code, error_message=message, **kwargs)
@classmethod
def missing(cls, what: str = "参数", **kwargs) -> "ToolResult":
"""缺少参数"""
return cls.fail(f"缺少{what}", ErrorCode.MISSING_ARGS, **kwargs)
@classmethod
def not_found(cls, what: str = "资源", **kwargs) -> "ToolResult":
"""未找到"""
return cls.fail(f"{what}不存在", ErrorCode.NOT_FOUND, **kwargs)
@classmethod
def timeout(cls, seconds: int = 0, **kwargs) -> "ToolResult":
"""超时"""
msg = f"执行超时"
if seconds:
msg += f" ({seconds}秒)"
return cls.fail(msg, ErrorCode.TIMEOUT, **kwargs)
# ── 格式转换 ──
def to_dict(self) -> dict:
"""转为普通 dict(兼容旧接口)"""
if self.success:
return {"result": self.data if self.data is not None else "执行完成"}
return {"result": str(self)}
def to_mcp(self) -> dict:
"""转为 MCP 协议格式"""
text = str(self)
return {
"content": [{"type": "text", "text": text}],
"isError": not self.success,
}
def to_string(self) -> str:
"""转为字符串(兼容旧插件 handle() 返回值)"""
return str(self)
+41 -24
View File
@@ -406,6 +406,23 @@ if TEXTUAL_AVAILABLE:
self._running = False self._running = False
# ═══════════════════════════════════════════════════
# 自定义 TextArea:回车发送,Shift+回车换行
# ═══════════════════════════════════════════════════
class SendTextArea(TextArea):
"""回车发送消息,Shift+回车换行的输入框"""
async def _on_key(self, event):
if event.key in ("enter", "\r", "\n"):
# prevent_default 阻止父类 TextArea._on_key 执行
event.prevent_default()
try:
self.app.action_send_message()
except Exception:
pass
return
# 其他键正常处理
# ═══════════════════════════════════════════════════ # ═══════════════════════════════════════════════════
# TUI 主应用 # TUI 主应用
# ═══════════════════════════════════════════════════ # ═══════════════════════════════════════════════════
@@ -420,7 +437,8 @@ if TEXTUAL_AVAILABLE:
Binding("ctrl+c", "quit", "退出", show=True), Binding("ctrl+c", "quit", "退出", show=True),
Binding("ctrl+l", "clear", "清屏", show=True), Binding("ctrl+l", "clear", "清屏", show=True),
Binding("ctrl+n", "new_chat", "新对话", show=True), Binding("ctrl+n", "new_chat", "新对话", show=True),
Binding("ctrl+enter", "send_message", "发送", show=True), Binding("ctrl+enter", "send_message", "发送", show=False),
Binding("shift+enter", "newline", "换行", show=False),
Binding("f1", "toggle_sidebar", "侧栏", show=True), Binding("f1", "toggle_sidebar", "侧栏", show=True),
Binding("escape", "cancel", "取消", show=False), Binding("escape", "cancel", "取消", show=False),
] ]
@@ -442,14 +460,14 @@ if TEXTUAL_AVAILABLE:
yield VerticalScroll(id="chat-scroll") yield VerticalScroll(id="chat-scroll")
with Vertical(id="input-area"): with Vertical(id="input-area"):
with Container(id="input-wrapper"): with Container(id="input-wrapper"):
yield TextArea( yield SendTextArea(
placeholder="输入消息... (Ctrl+Enter 发送, Enter 换行)", placeholder="输入消息... (回车发送, Shift+回车换行)",
id="user-input", id="user-input",
soft_wrap=True, soft_wrap=True,
tab_behavior="indent", tab_behavior="indent",
) )
yield Static( yield Static(
" Ctrl+Enter 发送 | ↑↓ 历史 | Ctrl+L 清屏 | F1 侧栏 | Tab 缩进", " 回车发送 | Shift+回车换行 | Ctrl+L 清屏 | F1 侧栏",
id="input-hint" id="input-hint"
) )
with Vertical(id="sidebar"): with Vertical(id="sidebar"):
@@ -480,7 +498,7 @@ if TEXTUAL_AVAILABLE:
"", "",
" ╔══════════════════════════════════════════════╗", " ╔══════════════════════════════════════════════╗",
" ║ ║", " ║ ║",
" ║ 小狸 Pro-CLI v5.2 ║", " ║ 小狸 Pro-CLI v5.4.1 ║",
" ║ 智能编程助手 · 动画增强版 ║", " ║ 智能编程助手 · 动画增强版 ║",
" ║ ║", " ║ ║",
" ╚══════════════════════════════════════════════╝", " ╚══════════════════════════════════════════════╝",
@@ -488,7 +506,7 @@ if TEXTUAL_AVAILABLE:
" 代码编辑 · 代码搜索 · Git 集成 · 多引擎", " 代码编辑 · 代码搜索 · Git 集成 · 多引擎",
" 输入 /help 查看命令 | /model 切换引擎", " 输入 /help 查看命令 | /model 切换引擎",
f" 当前引擎: {self.bridge.current_engine()} | 工具: {len(self.bridge.tools())} 个", f" 当前引擎: {self.bridge.current_engine()} | 工具: {len(self.bridge.tools())} 个",
" 支持多行输入 — Ctrl+Enter 发送", " 支持多行输入 — Shift+回车换行",
"", "",
] ]
@@ -524,7 +542,7 @@ if TEXTUAL_AVAILABLE:
("", "msg-dim"), ("", "msg-dim"),
(" ╔══════════════════════════════════════════════╗", "msg-welcome"), (" ╔══════════════════════════════════════════════╗", "msg-welcome"),
(" ║ ║", "msg-welcome"), (" ║ ║", "msg-welcome"),
(" ║ 小狸 Pro-CLI v5.2 ║", "msg-welcome"), (" ║ 小狸 Pro-CLI v5.4.1 ║", "msg-welcome"),
(" ║ 智能编程助手 · 动画增强版 ║", "msg-welcome"), (" ║ 智能编程助手 · 动画增强版 ║", "msg-welcome"),
(" ║ ║", "msg-welcome"), (" ║ ║", "msg-welcome"),
(" ╚══════════════════════════════════════════════╝", "msg-welcome"), (" ╚══════════════════════════════════════════════╝", "msg-welcome"),
@@ -532,7 +550,7 @@ if TEXTUAL_AVAILABLE:
(" 代码编辑 · 代码搜索 · Git 集成 · 多引擎", "msg-system"), (" 代码编辑 · 代码搜索 · Git 集成 · 多引擎", "msg-system"),
(" 输入 /help 查看命令 | /model 切换引擎", "msg-system"), (" 输入 /help 查看命令 | /model 切换引擎", "msg-system"),
(f" 当前引擎: {self.bridge.current_engine()} | 工具: {len(self.bridge.tools())} 个", "msg-system"), (f" 当前引擎: {self.bridge.current_engine()} | 工具: {len(self.bridge.tools())} 个", "msg-system"),
(" 支持多行输入 — Ctrl+Enter 发送", "msg-system"), (" 支持多行输入 — Shift+回车换行", "msg-system"),
("", "msg-dim"), ("", "msg-dim"),
] ]
for text, cls in lines: for text, cls in lines:
@@ -562,13 +580,9 @@ if TEXTUAL_AVAILABLE:
status_container.mount(Static(f" 工具: {len(self.bridge.tools())} 个", classes="tool-item")) status_container.mount(Static(f" 工具: {len(self.bridge.tools())} 个", classes="tool-item"))
status_container.mount(Static(f" 引擎: {len(self.bridge.engines())} 个", classes="tool-item")) status_container.mount(Static(f" 引擎: {len(self.bridge.engines())} 个", classes="tool-item"))
# 内存管理状态 # 工具数
if hasattr(self.cli, 'liugin_manager') and hasattr(self.cli.liugin_manager, 'memory_manager'): if hasattr(self.cli, 'liugin_manager'):
mgr = self.cli.liugin_manager.memory_manager status_container.mount(Static(f" 工具: {len(self.cli.liugin_manager.tools)} 个", classes="tool-item"))
s = mgr.get_status()
status_container.mount(Static(f" 已加载: {s['loaded']}", classes="tool-item"))
if s['unloaded'] > 0:
status_container.mount(Static(f" 已卸载: {s['unloaded']}", classes="tool-item"))
def _update_status(self, text: str): def _update_status(self, text: str):
bar = self.query_one("#status-bar") bar = self.query_one("#status-bar")
@@ -674,8 +688,14 @@ if TEXTUAL_AVAILABLE:
# ── 多行输入处理 ── # ── 多行输入处理 ──
def action_newline(self):
"""Shift+Enter 在输入框插入换行"""
text_area = self.query_one("#user-input")
if text_area.has_focus:
text_area.action_edit_insert_newline()
def action_send_message(self): def action_send_message(self):
"""Ctrl+Enter 发送消息""" """回车发送消息"""
text_area = self.query_one("#user-input") text_area = self.query_one("#user-input")
text = text_area.text.strip() text = text_area.text.strip()
if not text: if not text:
@@ -723,7 +743,7 @@ if TEXTUAL_AVAILABLE:
'cls': lambda: self.action_clear(), 'cls': lambda: self.action_clear(),
'model': lambda: self._switch_model(args), 'model': lambda: self._switch_model(args),
'engine': lambda: self._switch_model(args), 'engine': lambda: self._switch_model(args),
'about': lambda: self._system(" 小狸 Pro-CLI v5.2 - 智能编程助手"), 'about': lambda: self._system(" 小狸 Pro-CLI v5.4.1 - 智能编程助手"),
'status': lambda: self._show_status(), 'status': lambda: self._show_status(),
'tools': lambda: self._show_tools(), 'tools': lambda: self._show_tools(),
'engines': lambda: self._show_engines(), 'engines': lambda: self._show_engines(),
@@ -758,9 +778,9 @@ if TEXTUAL_AVAILABLE:
⌨ 快捷键: ⌨ 快捷键:
Ctrl+C 退出 Ctrl+L 清屏 Ctrl+C 退出 Ctrl+L 清屏
Ctrl+N 新对话 Ctrl+Enter 发送消息 Ctrl+N 新对话 回车 发送消息
F1 侧栏 Escape 取消生成 Shift+回车 换行 F1 侧栏
Enter 换行 Tab 缩进""" Escape 取消生成 Tab 缩进"""
self._system(help_text) self._system(help_text)
def _handle_manual(self, args): def _handle_manual(self, args):
@@ -822,10 +842,7 @@ if TEXTUAL_AVAILABLE:
f" 工具数: {len(self.bridge.tools())}", f" 工具数: {len(self.bridge.tools())}",
f" 对话数: {len(self.bridge.history())}", f" 对话数: {len(self.bridge.history())}",
] ]
# 内存管理状态
if hasattr(self.cli, 'liugin_manager') and hasattr(self.cli.liugin_manager, 'memory_manager'):
mgr = self.cli.liugin_manager.memory_manager
status_lines.append(mgr.format_status())
self._system('\n'.join(status_lines)) self._system('\n'.join(status_lines))
# ── AI 生成 ── # ── AI 生成 ──