Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0d9a24003 | ||
|
|
97cc2bb0f7 | ||
|
|
a7f64cd797 | ||
|
|
115ce38370 | ||
|
|
357cd0958f |
No files matched your search
@@ -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)
|
||||
|
||||
### ✨ 新增功能
|
||||
@@ -16,6 +39,12 @@
|
||||
- `/status` 命令和 TUI 侧栏实时显示内存管理状态(已加载/已卸载/统计)
|
||||
- `search_tools` 支持搜索已卸载插件(使用缓存的元数据,无需加载实例)
|
||||
|
||||
### 统一插件格式
|
||||
|
||||
- **统一自研插件入口类名为 `Liugin`** — 18 个插件从 `class Plugin` 统一为 `class Liugin`
|
||||
- 加载器保留 `Plugin` 回退兼容,第三方插件仍可用旧格式
|
||||
- 测试块中 `Plugin()` 调用同步更新为 `Liugin()`
|
||||
|
||||
### TUI 修复
|
||||
|
||||
- **修复消息分类失效** — `_write_raw` 中空字符串 `'' in msg` 永远为 True,导致所有消息显示为工具成功样式;替换为正确的 emoji 标记(✅/❌/🤖)
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
</p>
|
||||
|
||||
<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.0-blue" alt="version">
|
||||
<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/tests-113%20passed-brightgreen" alt="tests">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</p>
|
||||
|
||||
<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.0-blue" alt="version">
|
||||
<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/tests-150+%20passed-brightgreen" alt="tests">
|
||||
@@ -35,6 +35,7 @@
|
||||
- **定时任务** — 支持相对时间、绝对时间、重复任务,到期自动激活 AI
|
||||
- **系统通知** — 跨平台任务完成通知(Windows / macOS / Linux)
|
||||
- **MCP 协议** — 19 个插件全部实现 MCP 定义,支持 Function Calling 原生调用
|
||||
- **进程保护** — 跨平台单实例保护 + 进程优先级提升 + Windows PPL 风格保护 + 看门狗监控 + 优雅关闭
|
||||
- **19 个插件 161+ 个操作** — 代码编辑、Git、浏览器、工程化、文件管理、图像生成、记忆等
|
||||
- **三模式界面** — TUI 图形化 + 传统命令行 + Web UI 浏览器界面
|
||||
- **150+ 个自动化测试** — pytest 覆盖全部插件和核心模块
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
@echo off
|
||||
chcp 65001 >nul 2>&1
|
||||
title 小狸 Pro-CLI v5.1.2
|
||||
title 小狸 Pro-CLI v5.4.0
|
||||
|
||||
echo.
|
||||
echo ╔══════════════════════════════════════╗
|
||||
echo ║ 小狸 Pro-CLI 启动器 v5.1.2 ║
|
||||
echo ║ 小狸 Pro-CLI 启动器 v5.4.0 ║
|
||||
echo ║ 正在检测环境... ║
|
||||
echo ╚══════════════════════════════════════╝
|
||||
echo.
|
||||
|
||||
+76
-1
@@ -121,4 +121,79 @@ def get_config_directory():
|
||||
elif platform == 'macos':
|
||||
return os.path.join(os.path.expanduser("~"), 'Library', 'Application Support', 'Xiaoli Pro-CLI 3')
|
||||
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
@@ -25,7 +25,7 @@ except ImportError:
|
||||
WEBSOCKET_AVAILABLE = False
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""AI 生图插件 - 调用 ai.2x.nz 接口生成图片"""
|
||||
|
||||
BASE_URL = "https://ai.2x.nz"
|
||||
@@ -587,4 +587,3 @@ class Plugin:
|
||||
|
||||
|
||||
# 兼容 Liugin 类名
|
||||
Liugin = Plugin
|
||||
@@ -10,7 +10,7 @@ import subprocess
|
||||
from typing import Tuple, List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""工程化工具 - lint/format/test/build + 代码分析"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -11,7 +11,7 @@ from datetime import datetime
|
||||
from typing import List, Optional
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""书签管理器 - 开发资源和链接管理"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -477,7 +477,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("书签管理器测试:")
|
||||
print(plugin.handle('add https://github.com -n GitHub -c 开发 -t 代码,托管 -d 代码托管平台'))
|
||||
print(plugin.handle('add https://stackoverflow.com -n StackOverflow -c 学习 -t 问答,编程'))
|
||||
|
||||
@@ -9,7 +9,7 @@ import time
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""浏览器自动化 - 网页操控、表单填写、数据抓取、截图"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -7,7 +7,7 @@ import subprocess
|
||||
import platform
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""Shell 命令执行器 - 跨平台命令行工具"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -16,7 +16,7 @@ import threading
|
||||
from typing import Optional, Tuple, List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""代码编辑与搜索 - 精准编辑 + 代码理解"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -8,7 +8,7 @@ import colorsys
|
||||
from typing import List, Tuple
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""颜色工具 - 格式转换、调色板、对比度检查"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -447,7 +447,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("颜色工具测试:")
|
||||
print(plugin.handle('convert "#3498db"'))
|
||||
print(plugin.handle('contrast "#FFFFFF" "#000000"'))
|
||||
|
||||
@@ -10,7 +10,7 @@ from pathlib import Path
|
||||
from typing import List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""文件管理器 - 文件和目录的增删改查"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -443,7 +443,7 @@ JSON格式示例:
|
||||
# 测试函数
|
||||
def test_plugin():
|
||||
"""测试插件功能"""
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("前端测试验证插件测试:")
|
||||
|
||||
print("\n1. 创建测试HTML文件:")
|
||||
|
||||
@@ -8,7 +8,7 @@ import subprocess
|
||||
from typing import Tuple, Optional
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""Git 版本控制 - 基础操作 + 工作流自动化"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ from typing import Optional, List, Dict, Any
|
||||
IS_WINDOWS = sys.platform == "win32"
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""Windows GUI 自动化 - 屏幕元素识别、点击、输入、截图、元素树遍历"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -15,7 +15,7 @@ from datetime import datetime
|
||||
from typing import List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""UUID / ID 生成器 - 多格式唯一标识符生成"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -367,7 +367,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("ID 生成器测试:")
|
||||
print(plugin.handle('uuid'))
|
||||
print(plugin.handle('uuid -v 1 -n 3'))
|
||||
|
||||
@@ -10,7 +10,7 @@ import time
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""图像生成工具 — 自然语言/Tag 生图,基于 ComfyUI 在线服务"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -9,7 +9,7 @@ import re
|
||||
from typing import List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""JSON 工具箱 - 格式化/校验/查询/转换"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -374,7 +374,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("JSON 工具箱测试:")
|
||||
print(plugin.handle('validate \'{"name": "test", "age": 25}\''))
|
||||
print(plugin.handle('format \'{"name":"test","items":[1,2,3]}\''))
|
||||
|
||||
@@ -9,7 +9,7 @@ import os
|
||||
from typing import List, Tuple
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""Markdown 工具 - TOC/渲染/格式转换/统计"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -529,7 +529,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("Markdown 工具测试:")
|
||||
print(plugin.handle('headings "# Hello\\n## World\\n### Sub"'))
|
||||
print(plugin.handle('stats "# Hello\\n\\nThis is a test."'))
|
||||
|
||||
@@ -13,7 +13,7 @@ sys.path.insert(0, project_root)
|
||||
from xcli_core.memory import MemoryManager
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""持久化记忆系统 — AI 可写日记、搜索记忆、管理聊天记录"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -9,7 +9,7 @@ import os
|
||||
from typing import List
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""正则表达式测试器 - 测试、调试、管理正则"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -430,7 +430,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("正则表达式测试器测试:")
|
||||
print(plugin.handle('test "\\d+" "abc123def456"'))
|
||||
print(plugin.handle('match "[a-z]+" "hello world foo bar"'))
|
||||
|
||||
@@ -11,7 +11,7 @@ from datetime import datetime
|
||||
from typing import List, Optional
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""代码片段管理器 - 保存和复用代码片段"""
|
||||
|
||||
def __init__(self):
|
||||
@@ -416,7 +416,7 @@ class Plugin:
|
||||
|
||||
|
||||
def test_plugin():
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("代码片段管理器测试:")
|
||||
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 算法,递归'))
|
||||
|
||||
@@ -543,7 +543,7 @@ if __name__ == "__main__":
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("语音识别插件")
|
||||
print(f"临时目录: {plugin.temp_dir}")
|
||||
print("\n" + plugin.usage)
|
||||
@@ -42,7 +42,7 @@ class SubAgent:
|
||||
}
|
||||
|
||||
|
||||
class Plugin:
|
||||
class Liugin:
|
||||
"""子 Agent 系统 - 创建、管理、协作"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -258,7 +258,7 @@ JSON格式示例:
|
||||
# 测试函数
|
||||
def test_plugin():
|
||||
"""测试插件功能"""
|
||||
plugin = Plugin()
|
||||
plugin = Liugin()
|
||||
print("任务管理插件测试:")
|
||||
|
||||
print("\n1. 添加任务:")
|
||||
|
||||
@@ -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}"
|
||||
+143
-648
File diff suppressed because it is too large.
Load diff
@@ -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}}"
|
||||
@@ -11,6 +11,7 @@ from .constants import (
|
||||
)
|
||||
from .config import get_system_config, set_system_config, logger
|
||||
from .plugin_manager import LiuginManager
|
||||
from .process_protection import get_protection, enable_process_protection
|
||||
|
||||
# 可选导入
|
||||
try:
|
||||
@@ -31,6 +32,14 @@ class BaseAICLI:
|
||||
# 初始化colorama
|
||||
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__)))
|
||||
liugins_dir = os.path.join(project_dir, "plugins")
|
||||
@@ -114,6 +123,12 @@ class BaseAICLI:
|
||||
def cleanup_resources(self):
|
||||
"""清理资源,确保在程序退出时正确关闭所有资源"""
|
||||
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()
|
||||
if CLAWLI_SERVER_AVAILABLE and clawli_server:
|
||||
clawli_server.stop_server()
|
||||
|
||||
@@ -20,6 +20,7 @@ from .cli_display import DisplayMixin
|
||||
from .cli_history import HistoryMixin
|
||||
from .plugin_market import PluginMarketMixin
|
||||
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):
|
||||
@@ -1020,6 +1021,7 @@ multi 操作支持一次修改多处:
|
||||
print(f"{Fore.GREEN}输入 '/chat open <名称>' 加载聊天记录{Style.RESET_ALL}")
|
||||
print(f"{Fore.GREEN}输入 '/remote' 查看远程连接帮助{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 '未设置'
|
||||
print(f"{Fore.GREEN}当前使用的AI引擎: {current_engine_name}{Style.RESET_ALL}")
|
||||
loaded_engines = list(self.engines.keys())
|
||||
@@ -1027,6 +1029,15 @@ multi 操作支持一次修改多处:
|
||||
print(f"{Fore.GREEN}已加载的AI引擎: {', '.join(loaded_engines)}{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 弹窗模式
|
||||
self._ask_diff_popup_mode()
|
||||
|
||||
@@ -1171,6 +1182,29 @@ multi 操作支持一次修改多处:
|
||||
print(result)
|
||||
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'):
|
||||
remote_command = user_input[7:].strip()
|
||||
self._handle_remote_command(remote_command)
|
||||
|
||||
@@ -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)
|
||||
@@ -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("完成")
|
||||
+7
-14
@@ -480,7 +480,7 @@ if TEXTUAL_AVAILABLE:
|
||||
"",
|
||||
" ╔══════════════════════════════════════════════╗",
|
||||
" ║ ║",
|
||||
" ║ 小狸 Pro-CLI v5.2 ║",
|
||||
" ║ 小狸 Pro-CLI v5.4 ║",
|
||||
" ║ 智能编程助手 · 动画增强版 ║",
|
||||
" ║ ║",
|
||||
" ╚══════════════════════════════════════════════╝",
|
||||
@@ -524,7 +524,7 @@ if TEXTUAL_AVAILABLE:
|
||||
("", "msg-dim"),
|
||||
(" ╔══════════════════════════════════════════════╗", "msg-welcome"),
|
||||
(" ║ ║", "msg-welcome"),
|
||||
(" ║ 小狸 Pro-CLI v5.2 ║", "msg-welcome"),
|
||||
(" ║ 小狸 Pro-CLI v5.4 ║", "msg-welcome"),
|
||||
(" ║ 智能编程助手 · 动画增强版 ║", "msg-welcome"),
|
||||
(" ║ ║", "msg-welcome"),
|
||||
(" ╚══════════════════════════════════════════════╝", "msg-welcome"),
|
||||
@@ -562,13 +562,9 @@ if TEXTUAL_AVAILABLE:
|
||||
status_container.mount(Static(f" 工具: {len(self.bridge.tools())} 个", 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'):
|
||||
mgr = self.cli.liugin_manager.memory_manager
|
||||
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"))
|
||||
# 工具数
|
||||
if hasattr(self.cli, 'liugin_manager'):
|
||||
status_container.mount(Static(f" 工具: {len(self.cli.liugin_manager.tools)} 个", classes="tool-item"))
|
||||
|
||||
def _update_status(self, text: str):
|
||||
bar = self.query_one("#status-bar")
|
||||
@@ -723,7 +719,7 @@ if TEXTUAL_AVAILABLE:
|
||||
'cls': lambda: self.action_clear(),
|
||||
'model': 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 - 智能编程助手"),
|
||||
'status': lambda: self._show_status(),
|
||||
'tools': lambda: self._show_tools(),
|
||||
'engines': lambda: self._show_engines(),
|
||||
@@ -822,10 +818,7 @@ if TEXTUAL_AVAILABLE:
|
||||
f" 工具数: {len(self.bridge.tools())}",
|
||||
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))
|
||||
|
||||
# ── AI 生成 ──
|
||||
|
||||
Reference in new issue
Block a user