mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-28 16:20:56 +08:00
* ✨ feat!(llm): 重构并升级大语言模型服务为全新 AI 智能体框架 - 【重构】将原 services/llm 重构并迁移至全新的 services/ai 架构,提供向下兼容垫片 - 【新增】引入 Agent、Team、Workflow 三大智能体与工作流编排范式 - 【新增】引入基于 RAG 的长期向量记忆与中期槽位记忆系统 - 【新增】引入基于 Docker 的安全代码执行沙箱环境 - 【新增】支持 MCP 协议,允许动态管理和调用 MCP 服务 - 【新增】引入输入输出安全合规护栏与自愈反思机制 - 【优化】重构并优化多厂商 API 适配器 (Gemini, OpenAI, DeepSeek, GLM 等) - 【优化】优化日志脱敏与 Token 预估机制 - 【移除】移除旧版 llm default 和 llm reset-key 命令,新增 llm mcp 管理命令 * 🔧 chore(deps): 更新项目依赖与配置 - 添加 mcp、jieba 和 aiodocker 依赖到配置文件及 requirements.txt - 在 pyright 配置中设置 reportMissingImports 为 none - 调整 .gitignore 中 resources 目录的忽略规则 * ♻️ refactor(tools): 重构工具终止机制并清理知识库日志输出 - 统一使用 `context.state["__end_run__"]` 替代 `EndRunResult` 控制任务结束 - 移除文件系统和向量知识库检索工具中 `ToolResult` 的 `.with_log` 调用 - 调整指令处理器(Directive)的返回值为 `tool_res.output` - 修复部分类型检查警告并优化联合类型判断语法 * ♻️ refactor(tools): 重构工具副作用指令与控制流熔断机制 - 引入 `DirectivePayload` 及 `ToolResult` 的子类以结构化表达工具副作用 - 移除通过 `context.state` 传递魔术变量的隐式控制流设计 - 重构 `DirectiveManager` 处理器接口,直接在处理器中修改 `AgentState` 并构建 `AgentRunResult` - 在 `StandardAgentExecutor` 中统一通过 `directive_manager` 调度工具返回的副作用指令 - 补全 `MessageBuilder` 中部分核心方法的文档注释 * 🐛 fix(sandbox): 修复 Docker 沙箱容器状态检测与会话清理逻辑 -【修复】修正 `is_alive` 中直接读取私有属性的问题,改用 `show()` 返回值 -【修复】解决 `execute_code` 中缓存的执行器与当前会话不一致的问题 -【优化】在清理工作区前增加容器存活检测,避免向已死容器发送请求 -【优化】创建容器时增加运行状态校验,若已停止则自动从缓存中移除并重建 -【优化】优化容器销毁和清理逻辑,静默处理容器不存在 (404) 的异常 * 📝 docs(core): 补充核心模块初始化方法的文档注释 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: webjoin111 <455457521@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
132 lines
3.1 KiB
Python
132 lines
3.1 KiB
Python
import hashlib
|
|
from pathlib import PurePath, PurePosixPath
|
|
from typing import Final
|
|
|
|
_INSTALL_MARKER: Final[str] = "INSTALL_VFS_HELPER_V1"
|
|
|
|
_RESOLVE_WORKSPACE_PATH_SCRIPT: Final[str] = """
|
|
#!/bin/sh
|
|
set -eu
|
|
|
|
root="$1"
|
|
candidate="$2"
|
|
for_write="$3"
|
|
max_symlink_depth=64
|
|
|
|
case "$for_write" in
|
|
0|1) ;;
|
|
*)
|
|
printf 'for_write must be 0 or 1\\n' >&2
|
|
exit 64
|
|
;;
|
|
esac
|
|
|
|
resolve_path() {
|
|
path="$1"
|
|
depth="${2:-0}"
|
|
seen="${3:-}"
|
|
if [ "$path" = "/" ]; then
|
|
printf '/\\n'
|
|
return 0
|
|
fi
|
|
|
|
if [ "$depth" -ge "$max_symlink_depth" ]; then
|
|
printf 'symlink resolution depth exceeded: %s\\n' "$path" >&2
|
|
exit 112
|
|
fi
|
|
|
|
if [ -d "$path" ]; then
|
|
(
|
|
cd "$path"
|
|
pwd -P
|
|
)
|
|
return 0
|
|
fi
|
|
|
|
parent=${path%/*}
|
|
base=${path##*/}
|
|
if [ -z "$parent" ] || [ "$parent" = "$path" ]; then
|
|
parent="/"
|
|
fi
|
|
|
|
resolved_parent=$(resolve_path "$parent" "$depth" "$seen")
|
|
candidate_path="$resolved_parent/$base"
|
|
if [ -L "$candidate_path" ]; then
|
|
case ":$seen:" in
|
|
*":$candidate_path:"*)
|
|
printf 'symlink resolution depth exceeded: %s\\n' "$candidate_path" >&2
|
|
exit 112
|
|
;;
|
|
esac
|
|
target=$(readlink "$candidate_path")
|
|
next_depth=$((depth + 1))
|
|
next_seen="${seen}:$candidate_path"
|
|
case "$target" in
|
|
/*) resolve_path "$target" "$next_depth" "$next_seen" ;;
|
|
*) resolve_path "$resolved_parent/$target" "$next_depth" "$next_seen" ;;
|
|
esac
|
|
return 0
|
|
fi
|
|
|
|
printf '%s\\n' "$candidate_path"
|
|
}
|
|
|
|
resolved_candidate=$(resolve_path "$candidate" 0)
|
|
resolved_root=$(resolve_path "$root" 0)
|
|
|
|
case "$resolved_candidate" in
|
|
"$resolved_root"|"$resolved_root"/*)
|
|
printf '%s\\n' "$resolved_candidate"
|
|
exit 0
|
|
;;
|
|
esac
|
|
|
|
printf 'workspace escape: %s\\n' "$resolved_candidate" >&2
|
|
exit 111
|
|
""".strip()
|
|
|
|
|
|
class VfsHelperScript:
|
|
"""VFS 运行时探针"""
|
|
|
|
def __init__(self, name: str, content: str):
|
|
self.name = name
|
|
self.content = content
|
|
digest = hashlib.sha256(content.encode("utf-8")).hexdigest()[:12]
|
|
self.install_path = (
|
|
PurePosixPath("/tmp/zhenxun-sandbox/bin") / f"{name}-{digest}"
|
|
)
|
|
|
|
def install_command(self) -> list[str]:
|
|
tmp_template = f"{self.install_path}.tmp.$$"
|
|
heredoc = (
|
|
f"ZHENXUN_VFS_HELPER_{self.install_path.name.upper().replace('-', '_')}"
|
|
)
|
|
script = f"""
|
|
# {_INSTALL_MARKER}
|
|
set -eu
|
|
dest="$1"
|
|
tmp="{tmp_template}"
|
|
mkdir -p -- "$(dirname -- "$dest")"
|
|
cat > "$tmp" <<'{heredoc}'
|
|
{self.content}
|
|
{heredoc}
|
|
chmod 0555 "$tmp"
|
|
rm -f -- "$dest"
|
|
mv -f -- "$tmp" "$dest"
|
|
"""
|
|
return ["sh", "-c", script.strip(), "sh", str(self.install_path)]
|
|
|
|
|
|
RESOLVE_PATH_HELPER = VfsHelperScript(
|
|
"resolve-workspace-path", _RESOLVE_WORKSPACE_PATH_SCRIPT
|
|
)
|
|
|
|
|
|
def coerce_posix_path(path: str | PurePath) -> PurePosixPath:
|
|
if isinstance(path, PurePath):
|
|
path = path.as_posix()
|
|
else:
|
|
path = path.replace("\\", "/")
|
|
return PurePosixPath(path)
|