mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-19 13:52:00 +00:00
界面与交互全面翻修(前两波):运行态有了 HUD 和时间轴,终态会收尾,全站令牌、组件、文案统一
来自 2026-09 的 UI/UX 审查(142 条)。本提交是前两波,第三波(记录页接入时间轴、跨页互链、check-ui 更新、全站扫尾)另行提交。 地基 - 设计令牌:全局规则和 .btn/.field/.chip 放进 CSS 层,Tailwind 工具类重新生效,选中态、开启态不再被吞掉;字号阶梯; 辅助文字在所有底色上 >= 4.5:1;状态色专用,节点类型色与之拉开色相;「跟随系统」真的跟随,首帧不闪深色;新字标与 favicon - 基础组件:confirmDialog / promptDialog 取代原生对话框;toast 出错不自动消失、可复制、读屏可播报;离线横幅与断线恢复; 九种剪影的状态徽标;唯一一份状态文案(lib/status)、格式化(lib/format)、术语(lib/terms)、报错人话(lib/errors) - 运行态内核:事件折成航迹(run/trace.ts),可投影到任意时刻;取消 / 失败 / 服务重启后统一收尾,不再永远转圈; run.status 随事件回写;token 事件不再堆进 events - 后端:协作成员逐个完成即发事件,调度者决策有事件;时长分执行 / 墙钟 / 等人;API 时间带时区; 中断的运行也发 stream.end;运行列表可筛选翻页;删除运行 / 工作流有保护;运行默认值接通;可测未保存的配置; 报错说清发生了什么、为什么、怎么办 功能 - 画布:状态四重编码、固定高度遥测槽、按缩放三档、运行胶囊与 HUD、航迹时间轴与回放、执行轨迹边、 等待闸门、跟随执行、正式运行只读、一次性时刻(开场点亮、回扫、阻断级联、出具印章) - 编辑:撤销重做、版本历史、问题面板可定位、三栏可收起、模板与表达式字段区分、变量血缘、快捷键、带搜索的选择器 - 回答流 / 问数据:贴底才跟随滚动、工件下钻、出具横幅列出缺口、答案可复制导出、按会话的忙闲、 答案不再在 2000 字处截断、重启后这一轮会收尾 - 记录页:待审批 / 运行中 / 失败页签、筛选翻页、实时接流、排错路径指到节点、封存凭证常驻 - 管理页:新的「数据」页、写操作失败都有反馈、弹窗里先测连接、统一持久的连接状态 - 外壳:导航改版、⌘K 命令面板、? 快捷键帮助、404、页面标题与 favicon 状态点、后台提醒 验证(沙箱):tsc 干净,pytest 579 passed,14 个检查脚本中 13 个全绿;check-ui 剩 1 项旧断言(按旧日期格式找运行行),第三波更新。
This commit is contained in:
+96
-16
@@ -7,11 +7,14 @@ from pydantic import BaseModel, Field
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.api.errors import explain, raw
|
||||
from app.db.base import get_session
|
||||
from app.db.models import CustomTool, McpServer
|
||||
from app.tools.custom import run_custom_tool
|
||||
from app.tools.mcp_manager import mcp_manager
|
||||
from app.tools.registry import ToolContext, all_specs, call_tool
|
||||
from app.tools.registry import (
|
||||
ToolArgsError, ToolContext, all_specs, build_tools, call_is_dangerous, call_tool, get_spec,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/api/tools", tags=["tools"])
|
||||
|
||||
@@ -29,6 +32,9 @@ async def list_tools(session: AsyncSession = Depends(get_session)) -> list[dict[
|
||||
"category": spec.category,
|
||||
"source": "builtin",
|
||||
"dangerous": spec.dangerous,
|
||||
# 工作流里 approval=dangerous 的关卡认不认得它。dangerous 说的是「有副作用」,
|
||||
# 这一项说的是「运行时真会停下来等审批」——两件事以前混在一个标签里
|
||||
"runtime_approval": spec.dangerous,
|
||||
"schema": spec.json_schema(),
|
||||
}
|
||||
)
|
||||
@@ -45,12 +51,16 @@ async def list_tools(session: AsyncSession = Depends(get_session)) -> list[dict[
|
||||
"category": f"自定义 · {row.kind}",
|
||||
"source": "custom",
|
||||
"dangerous": True,
|
||||
# 运行时的审批关卡查不到自定义工具的危险标记,不会停下来等人——
|
||||
# 在补上之前不能让标签说它会被审批
|
||||
"runtime_approval": False,
|
||||
"schema": row.parameters or {},
|
||||
}
|
||||
)
|
||||
|
||||
try:
|
||||
out.extend({**t, "source": "mcp", "dangerous": True} for t in await mcp_manager.list_tools())
|
||||
out.extend({**t, "source": "mcp", "dangerous": True, "runtime_approval": False}
|
||||
for t in await mcp_manager.list_tools())
|
||||
except Exception: # noqa: BLE001 - MCP 连不上不该让整个工具列表挂掉
|
||||
pass
|
||||
return out
|
||||
@@ -62,13 +72,75 @@ class RunToolIn(BaseModel):
|
||||
# 再加一道模式校验做纵深防御——畸形的 session 直接 422 拒掉,
|
||||
# 而不是悄悄被净化成 "default" 让调用方以为自己写对了。
|
||||
sandbox_session: str = Field(default="playground", pattern=r"^[A-Za-z0-9_-]{1,64}$")
|
||||
#: 有副作用的工具要带上它才执行。也可以写在查询串里(?confirm=true)
|
||||
confirm: bool = False
|
||||
|
||||
|
||||
def _builtin_effect(name: str, args: dict[str, Any]) -> str:
|
||||
if name == "file_write":
|
||||
path = args.get("path") or "(没填路径)"
|
||||
if args.get("append"):
|
||||
return f"会往 playground 工作目录里的「{path}」追加内容"
|
||||
return f"会在 playground 工作目录里写入「{path}」,同名文件会被覆盖"
|
||||
if name == "http_request":
|
||||
return (f"会向 {args.get('url') or '(没填地址)'} 发一个 {args.get('method') or 'GET'} 请求"
|
||||
"(内网和回环地址会被拦截)")
|
||||
if name == "shell_exec":
|
||||
return f"会在沙箱里执行命令:{str(args.get('command') or '')[:120]}"
|
||||
if name == "python_exec":
|
||||
return "会在沙箱里执行这段 Python 代码"
|
||||
if name == "run_code":
|
||||
lang = args.get("language") or "python"
|
||||
return f"会在沙箱里执行这段 {lang} 代码" + (",并且允许联网" if args.get("network") else "")
|
||||
return f"「{name}」有副作用"
|
||||
|
||||
|
||||
async def _side_effect(name: str, args: dict[str, Any], session: AsyncSession) -> str | None:
|
||||
"""这次调用有副作用就说清会做什么,没有返回 None。口径和列表上的 dangerous 一致。"""
|
||||
spec = get_spec(name)
|
||||
if spec is not None:
|
||||
return _builtin_effect(name, args) if spec.dangerous else None
|
||||
if name.startswith("mcp:"):
|
||||
server, _, tool = name[4:].partition("/")
|
||||
return (f"会调用 MCP 服务「{server}」上的工具「{tool}」。它是外部进程,"
|
||||
"会做什么由它自己决定,这里预知不了")
|
||||
row = (await session.execute(
|
||||
select(CustomTool).where(CustomTool.name == name)
|
||||
)).scalar_one_or_none()
|
||||
if row is not None:
|
||||
cfg = row.config or {}
|
||||
if row.kind == "http":
|
||||
return (f"会调用自定义接口「{name}」"
|
||||
f"({cfg.get('method') or 'GET'} {cfg.get('url') or '(没填地址)'})")
|
||||
return f"会在沙箱里执行自定义工具「{name}」的代码"
|
||||
# 数据源工具:只读源上的查询没有副作用,可写源上的写操作有
|
||||
tools = await build_tools([name], ToolContext(run_id="playground", node_id="playground"),
|
||||
session=session)
|
||||
if tools and call_is_dangerous(tools[0], name, args):
|
||||
return f"会在可写数据源上执行写操作:{str(args.get('sql') or '')[:120]}"
|
||||
return None
|
||||
|
||||
|
||||
@router.post("/{tool_name:path}/run")
|
||||
async def run_tool(
|
||||
tool_name: str, payload: RunToolIn, session: AsyncSession = Depends(get_session)
|
||||
tool_name: str,
|
||||
payload: RunToolIn,
|
||||
confirm: bool = False,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
) -> dict[str, Any]:
|
||||
"""直接试跑一个工具。工具面板上的"试一下"用它,不用为了测工具去搭一张图。"""
|
||||
"""直接试跑一个工具。工具面板上的"试一下"用它,不用为了测工具去搭一张图。
|
||||
|
||||
有副作用的工具先 409 说清它会做什么,带上 confirm 再来一次才执行。工作流里
|
||||
同一个「需确认」意味着要人工审批,在这里却点一下就真跑了——同一个标签两种
|
||||
含义,工具库里试 file_write、shell_exec 的人会以为还有一道关。
|
||||
"""
|
||||
if not (confirm or payload.confirm):
|
||||
effect = await _side_effect(tool_name, payload.args, session)
|
||||
if effect:
|
||||
# 只说后果,不说怎么确认:弹窗还是再点一次是界面的事,写死在这里
|
||||
# 放进确认框里读起来就不对
|
||||
raise HTTPException(409, f"{effect}。在工具库里执行不经过审批,确认后才会执行。")
|
||||
|
||||
ctx = ToolContext(run_id="playground", node_id="playground",
|
||||
sandbox_session=payload.sandbox_session)
|
||||
import time
|
||||
@@ -77,11 +149,18 @@ async def run_tool(
|
||||
try:
|
||||
result = await call_tool(tool_name, payload.args, ctx, session=session)
|
||||
except KeyError as e:
|
||||
raise HTTPException(404, str(e)) from e
|
||||
raise HTTPException(404, str(e.args[0] if e.args else e)) from e
|
||||
except ToolArgsError as e:
|
||||
# 参数对不上时报错里已经写清该填什么,原样给
|
||||
return {"ok": False, "error": str(e), "hint": "", "detail": raw(e),
|
||||
"duration_ms": int((time.perf_counter() - started) * 1000)}
|
||||
except Exception as e: # noqa: BLE001
|
||||
reason, hint = explain(e)
|
||||
return {
|
||||
"ok": False,
|
||||
"error": f"{type(e).__name__}: {e}",
|
||||
"error": f"工具执行失败:{reason}",
|
||||
"hint": hint,
|
||||
"detail": raw(e),
|
||||
"duration_ms": int((time.perf_counter() - started) * 1000),
|
||||
}
|
||||
return {
|
||||
@@ -123,9 +202,9 @@ async def create_custom(
|
||||
payload: CustomToolIn, session: AsyncSession = Depends(get_session)
|
||||
) -> CustomTool:
|
||||
if (await session.execute(select(CustomTool).where(CustomTool.name == payload.name))).scalar_one_or_none():
|
||||
raise HTTPException(409, "同名工具已存在")
|
||||
raise HTTPException(409, f"已经有叫「{payload.name}」的工具了,换个名字")
|
||||
if payload.name in all_specs():
|
||||
raise HTTPException(409, "这个名字和内置工具冲突")
|
||||
raise HTTPException(409, f"「{payload.name}」和内置工具重名了,换个名字")
|
||||
row = CustomTool(**payload.model_dump())
|
||||
session.add(row)
|
||||
await session.commit()
|
||||
@@ -139,7 +218,7 @@ async def update_custom(
|
||||
) -> CustomTool:
|
||||
row = await session.get(CustomTool, tool_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "工具不存在")
|
||||
raise HTTPException(404, "这个工具不存在,可能已经被删了")
|
||||
for key, value in payload.model_dump().items():
|
||||
setattr(row, key, value)
|
||||
await session.commit()
|
||||
@@ -151,7 +230,7 @@ async def update_custom(
|
||||
async def delete_custom(tool_id: str, session: AsyncSession = Depends(get_session)) -> None:
|
||||
row = await session.get(CustomTool, tool_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "工具不存在")
|
||||
raise HTTPException(404, "这个工具不存在,可能已经被删了")
|
||||
await session.delete(row)
|
||||
await session.commit()
|
||||
|
||||
@@ -162,12 +241,13 @@ async def test_custom(
|
||||
) -> dict[str, Any]:
|
||||
row = await session.get(CustomTool, tool_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "工具不存在")
|
||||
raise HTTPException(404, "这个工具不存在,可能已经被删了")
|
||||
ctx = ToolContext(run_id="playground", node_id="test", sandbox_session="playground")
|
||||
try:
|
||||
result = await run_custom_tool(session, row.name, payload.args, ctx)
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"ok": False, "error": f"{type(e).__name__}: {e}"}
|
||||
reason, hint = explain(e)
|
||||
return {"ok": False, "error": f"工具执行失败:{reason}", "hint": hint, "detail": raw(e)}
|
||||
return {"ok": True, "result": result}
|
||||
|
||||
|
||||
@@ -207,7 +287,7 @@ async def create_server(
|
||||
payload: McpIn, session: AsyncSession = Depends(get_session)
|
||||
) -> McpServer:
|
||||
if (await session.execute(select(McpServer).where(McpServer.name == payload.name))).scalar_one_or_none():
|
||||
raise HTTPException(409, "同名 MCP server 已存在")
|
||||
raise HTTPException(409, f"已经有叫「{payload.name}」的 MCP 服务了,换个名字")
|
||||
row = McpServer(**payload.model_dump())
|
||||
session.add(row)
|
||||
await session.commit()
|
||||
@@ -221,7 +301,7 @@ async def update_server(
|
||||
) -> McpServer:
|
||||
row = await session.get(McpServer, server_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "MCP server 不存在")
|
||||
raise HTTPException(404, "这个 MCP 服务不存在,可能已经被删了")
|
||||
for key, value in payload.model_dump().items():
|
||||
setattr(row, key, value)
|
||||
await session.commit()
|
||||
@@ -233,7 +313,7 @@ async def update_server(
|
||||
async def delete_server(server_id: str, session: AsyncSession = Depends(get_session)) -> None:
|
||||
row = await session.get(McpServer, server_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "MCP server 不存在")
|
||||
raise HTTPException(404, "这个 MCP 服务不存在,可能已经被删了")
|
||||
await session.delete(row)
|
||||
await session.commit()
|
||||
|
||||
@@ -244,7 +324,7 @@ async def probe_server(
|
||||
) -> dict[str, Any]:
|
||||
row = await session.get(McpServer, server_id)
|
||||
if not row:
|
||||
raise HTTPException(404, "MCP server 不存在")
|
||||
raise HTTPException(404, "这个 MCP 服务不存在,可能已经被删了")
|
||||
result = await mcp_manager.probe(row)
|
||||
row.status = "ok" if result.get("ok") else "error"
|
||||
row.last_error = result.get("error")
|
||||
|
||||
Reference in New Issue
Block a user