From 3e311ec551f671c0a9cc8e38cb1628d94331c463 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Sun, 27 Sep 2026 23:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=B3=A2=E6=94=B6=E5=B0=BE?= =?UTF-8?q?=EF=BC=9A=E8=B7=A8=E6=A8=A1=E5=9D=97=E6=95=B4=E5=90=88=E3=80=81?= =?UTF-8?q?=E5=85=A8=E7=AB=99=E6=89=AB=E5=B0=BE=E3=80=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=95=B4=E5=90=88=EF=BC=9B=E7=BD=91=E9=A1=B5?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=AE=A4=E5=BE=97=E6=9C=AC=E6=9C=BA=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E7=9A=84=20fake-ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 整合(3c-integrate) - 公共层:跨天时长(formatSpan / formatOffset / formatLapse)、本机署名(lib/actor)、检索分类色令牌、 数据源目录(useDatasources)收进公共层;失败说明能一次列出多个写坏的自定义工具,查询超时指到数据源的查询时限 - 管理页收尾:设置页接入统一的离开前确认;检查脚本不再把沙箱里的真实值打进输出 - 画布 ↔ 右栏:点出具印章、点节点能跳到右栏对应位置;「定位」直接聚焦到出问题的字段 - 回答流 / 问数据 / 记录页:失败信息带「去哪修」且不再被翻译两遍;协作团队的结局按执行截取; 等审批时断流重连、而运行已在空档里跑完的,补全事件 扫尾(3c-sweep) - 术语统一:开始运行 / 继续运行、工作流最大步数;未保存的运行统一叫「未保存的工作流」(后端新运行同步) - 沙箱报错不再带 Python 异常类名;新增 check-tokens,未定义的 CSS 变量为 0,两个旧别名迁移后删除 检查脚本(3c-checks) - check-ui 跟上新界面(运行列表按 data 属性找行),加上令牌与选中态的回归断言,输出里的名字打码 - 新增 check-all:按顺序跑全部检查、汇总退出码,--repeat 列出偶发项 - 单节出错只记这一节失败、不再带崩整个脚本;外壳遥测浮层「重新检测」时焦点不再掉到 body 网页工具与 fake-ip - Clash / mihomo 一类代理开 TUN + fake-ip 时,查什么都先拿到 198.18 段的假地址,被当成内网拦截。 新增 AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES(默认空):落在段里的解析结果改向公共 DNS(DoH)核实真实地址, 公网放行、内网照拦、核实不了按拦截处理。DoH 默认先问境外的,境内公共 DNS 会对被封锁的域名返回污染结果 - 列表型环境变量接受逗号分隔(原来注释说逗号分隔、实际只认 JSON 数组);域名解析改为异步,不再阻塞事件循环 验证(沙箱):tsc 干净,pytest 866 passed(两遍),检查脚本全绿。 --- .env.example | 7 + README.md | 8 + backend/app/api/coded.py | 27 + backend/app/api/conversations.py | 15 +- backend/app/api/copilot.py | 8 +- backend/app/api/runs.py | 9 +- backend/app/api/workflows.py | 2 +- backend/app/core/config.py | 38 +- backend/app/data/engine.py | 28 +- backend/app/data/introspect.py | 4 +- backend/app/data/tabular.py | 8 +- backend/app/engine/compiler.py | 2 +- backend/app/engine/schema.py | 2 +- backend/app/main.py | 4 + backend/app/sandbox/bubblewrap_sandbox.py | 8 +- backend/app/sandbox/local_sandbox.py | 8 +- backend/app/sandbox/microvm_sandbox.py | 10 +- backend/app/sandbox/seatbelt_sandbox.py | 8 +- backend/app/seed.py | 2 +- backend/app/tools/net.py | 104 +- backend/tests/test_conversation_status.py | 47 + backend/tests/test_copilot_scope.py | 13 + backend/tests/test_datasource_preview.py | 4 + backend/tests/test_net_fake_ip.py | 198 ++ backend/tests/test_query_deadline.py | 94 +- backend/tests/test_runs_api.py | 13 + backend/tests/test_sandbox_errors.py | 111 + backend/tests/test_tabular.py | 14 + frontend/src/App.tsx | 37 +- frontend/src/api/client.ts | 55 +- frontend/src/canvas/FlowCanvas.tsx | 15 +- frontend/src/canvas/Inspector.tsx | 176 +- frontend/src/canvas/InspectorSheet.tsx | 49 +- frontend/src/canvas/NodeCard.tsx | 4 +- frontend/src/canvas/Palette.tsx | 66 +- frontend/src/canvas/PublishDialog.tsx | 17 +- frontend/src/canvas/RunTimeline.tsx | 143 +- frontend/src/canvas/TeamMatrix.tsx | 19 +- frontend/src/canvas/VariablesDrawer.tsx | 2 +- frontend/src/canvas/WorkflowPicker.tsx | 74 +- frontend/src/canvas/copilotMerge.ts | 43 + frontend/src/canvas/surface.css | 5 +- frontend/src/components/CommandPalette.tsx | 30 +- frontend/src/components/ui.tsx | 73 +- frontend/src/dev/preview.tsx | 9 +- frontend/src/dev/ui-harness.tsx | 22 +- frontend/src/index.css | 14 +- frontend/src/lib/actor.ts | 53 + frontend/src/lib/explain.ts | 88 +- frontend/src/lib/format.ts | 48 + frontend/src/lib/leave.ts | 7 + frontend/src/lib/terms.ts | 14 + frontend/src/main.tsx | 2 +- frontend/src/pages/ChatPage.tsx | 126 +- frontend/src/pages/DataSourcesTab.tsx | 155 +- frontend/src/pages/KnowledgePage.tsx | 10 +- frontend/src/pages/RunsPage.tsx | 4 +- frontend/src/pages/SettingsPage.tsx | 72 +- frontend/src/pages/StudioPage.tsx | 76 +- frontend/src/pages/ToolsPage.tsx | 81 +- frontend/src/pages/runs/Banners.tsx | 44 +- frontend/src/pages/runs/RunDetailView.tsx | 35 +- frontend/src/pages/runs/RunList.tsx | 12 +- frontend/src/pages/runs/Telemetry.tsx | 7 +- frontend/src/pages/runs/TracePane.tsx | 74 +- frontend/src/pages/runs/model.ts | 49 +- frontend/src/pages/runs/parts.tsx | 3 +- frontend/src/pages/runs/useRunDetail.ts | 23 +- frontend/src/run/AssistantPanel.tsx | 223 +- frontend/src/run/AssistantStream.tsx | 158 +- frontend/src/run/Composer.tsx | 60 +- frontend/src/run/RunControl.tsx | 2 +- frontend/src/run/RunHud.tsx | 30 +- frontend/src/run/RunPanel.tsx | 24 +- frontend/src/run/__tests__/synthetic.ts | 139 ++ frontend/src/run/decode.ts | 172 +- frontend/src/store/catalog.ts | 112 +- frontend/src/store/chat.ts | 54 +- frontend/src/store/conversations.ts | 9 +- frontend/src/store/studio.ts | 115 +- frontend/src/types.ts | 82 + scripts/check-all.mjs | 201 ++ scripts/check-canvas-fx.mjs | 474 ++-- scripts/check-canvas-layout.mjs | 40 +- scripts/check-chat.mjs | 333 ++- scripts/check-decode.mjs | 273 ++- scripts/check-guards.mjs | 223 +- scripts/check-manage.mjs | 385 ++- scripts/check-run-states.mjs | 114 +- scripts/check-runs.mjs | 2551 +++++++++++--------- scripts/check-shell.mjs | 386 ++- scripts/check-stream.mjs | 586 +++-- scripts/check-studio.mjs | 691 +++++- scripts/check-tokens.mjs | 111 + scripts/check-trace.mjs | 120 +- scripts/check-ui-kit.mjs | 1351 ++++++----- scripts/check-ui.mjs | 415 +++- scripts/e2e-check.mjs | 10 +- 98 files changed, 8431 insertions(+), 3645 deletions(-) create mode 100644 backend/app/api/coded.py create mode 100644 backend/tests/test_net_fake_ip.py create mode 100644 backend/tests/test_sandbox_errors.py create mode 100644 frontend/src/lib/actor.ts create mode 100644 scripts/check-all.mjs create mode 100644 scripts/check-tokens.mjs diff --git a/.env.example b/.env.example index 452b0d52..cede4581 100644 --- a/.env.example +++ b/.env.example @@ -36,6 +36,13 @@ # ---- HTTP 工具 ---- # 逗号分隔的域名白名单;留空表示只拦内网地址,不限制公网域名 # AGENTLAB_HTTP_TOOL_ALLOWLIST=api.github.com,news.ycombinator.com +# 本机代理(Clash / mihomo 等)开了 TUN + fake-ip 时,查任何域名都先拿到这个段的假地址, +# 网页工具会把它当内网拦掉。填上之后,落在段里的解析结果改向公共 DNS 核实真实地址: +# 公网放行,内网照拦,核实不了也拦。没开 fake-ip 就留空 +# AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES=198.18.0.0/15 +# 核实用的 DNS-over-HTTPS(JSON 接口),逗号分隔,按顺序试;写 IP 形式免得解析它自己的域名。 +# 境外的放前面:境内公共 DNS 对被封锁的域名返回污染结果,会被当成内网误拦 +# AGENTLAB_HTTP_TOOL_DOH_URLS=https://1.1.1.1/dns-query,https://223.5.5.5/resolve # ---- 落库加密密钥 ---- # 留空会自动生成并存到 data/.secret_key。换了这个值,之前存的 API Key 会解不开。 diff --git a/README.md b/README.md index bda256ad..64872dc1 100644 --- a/README.md +++ b/README.md @@ -358,6 +358,8 @@ Excel / CSV 若传入知识库,只能被切块检索,数字即成为模型 - 分支条件使用 AST 白名单求值器而非 `eval` - HTTP 工具解析域名后逐 IP 检查,拦截内网、回环与云元数据地址,且不跟随重定向(逐跳重新校验) + 本机代理开 fake-ip 时,解析结果是 198.18 段的假地址:配置 fake-ip 网段后,这类结果改向公共 DNS(DoH) + 核实真实地址再判断,核实不了按拦截处理 - 文件工具路径 `resolve()` 后必须仍位于工作区内 - SQL 守卫采用白名单动词判定 + 正文扫描 + 多语句拦截 + 结果集上限;`DROP` / `TRUNCATE` / `GRANT` 等 在可写数据源上亦一律拒绝。以查询开头却会写的语句(`WITH … DELETE`、`SELECT … INTO`、 @@ -452,6 +454,12 @@ pip install -e 'backend[microvm,dev,db,docs]' -c backend/requirements.lock # 需先处理超时或更换 schema。数据源卡片会显示失败原因与该服务器上的可选库列表。 agent 侧同样会收到实情,并被告知可直接查询 `information_schema` 自行确认表结构。 +**网页工具报「解析到内网地址 198.18.x.x,已拦截」。** 本机代理(Clash / mihomo 等)开了 TUN + fake-ip, +查任何域名都先拿到 198.18 段的假地址,被当成内网拦掉了。在 `.env` 里加一行 +`AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES=198.18.0.0/15`,重启后端即可:落在这个段里的解析结果会改向公共 DNS +核实真实地址,公网放行、内网照拦。核实用的 DoH 地址由 `AGENTLAB_HTTP_TOOL_DOH_URLS` 指定(逗号分隔)。 +不想改配置的话,把代理 DNS 改成 redir-host,或把要访问的域名加进 `fake-ip-filter`。 + **端口冲突。** 前端默认 5273、后端 8000,通过 `AGENTLAB_WEB_PORT` / `AGENTLAB_PORT` 修改。 **改了后端代码,正在跑的运行显示中断。** `dev.sh` 开着热重载,改一个后端文件就是一次 diff --git a/backend/app/api/coded.py b/backend/app/api/coded.py new file mode 100644 index 00000000..bf9a53aa --- /dev/null +++ b/backend/app/api/coded.py @@ -0,0 +1,27 @@ +"""带机器码的 HTTP 错误。 + +detail 仍是给人看的那一句,老前端照旧直接显示;code 是给程序认的稳定标识。 +以前前端只能按 detail 的开头几个字认出某一类错误,文案一改就悄悄失灵。 +""" +from __future__ import annotations + +from fastapi import HTTPException, Request +from fastapi.responses import JSONResponse + +#: 限定的数据源一个都不在了(删了或停用了),见 copilot._sources +DATASOURCE_SCOPE_EMPTY = "datasource_scope_empty" + + +class CodedHTTPException(HTTPException): + def __init__(self, status_code: int, detail: str, code: str) -> None: + super().__init__(status_code, detail) + self.code = code + + +async def coded_handler(_: Request, exc: Exception) -> JSONResponse: + assert isinstance(exc, CodedHTTPException) + return JSONResponse( + status_code=exc.status_code, + content={"detail": exc.detail, "code": exc.code}, + headers=exc.headers, + ) diff --git a/backend/app/api/conversations.py b/backend/app/api/conversations.py index 4111e813..a92381b5 100644 --- a/backend/app/api/conversations.py +++ b/backend/app/api/conversations.py @@ -91,6 +91,8 @@ class TurnOut(BaseModel): #: 可信度元数据。老轮次挂在 review.meta 下,读出来时统一放到这里 meta: dict[str, Any] | None = None created_at: Any = None + #: 最后一次落库。列表判「建图断了」按它算(BUILD_STALE),前端用同一只钟 + updated_at: Any = None model_config = {"from_attributes": True} @@ -132,6 +134,15 @@ def turn_meta(turn: Any) -> dict[str, Any] | None: return bridged if isinstance(bridged, dict) else None +def turn_run_id(turn: Any) -> str | None: + """这一轮现在的运行。meta 里写了 runId 就以它为准,哪怕是 null:重试会换一次运行, + run_id 列却清不掉(回填里 None 表示「不改」),还指着上一次的。老轮次没有这个键,看列。""" + meta = turn_meta(turn) or {} + if "runId" in meta: + return meta["runId"] or None + return turn.run_id or None + + def _turn_out(turn: ConversationTurn) -> TurnOut: out = TurnOut.model_validate(turn) out.meta = turn_meta(turn) @@ -212,9 +223,7 @@ async def _statuses( session: AsyncSession, turns: dict[str, ConversationTurn] ) -> dict[str, tuple[str, str | None]]: """会话 id → (last_status, last_run_id)。运行状态和待审批各一次查询。""" - run_of = { - cid: t.run_id or (turn_meta(t) or {}).get("runId") or None for cid, t in turns.items() - } + run_of = {cid: turn_run_id(t) for cid, t in turns.items()} run_ids = {r for r in run_of.values() if r} runs: dict[str, str] = {} waiting: set[str] = set() diff --git a/backend/app/api/copilot.py b/backend/app/api/copilot.py index 52489510..f7e97c0b 100644 --- a/backend/app/api/copilot.py +++ b/backend/app/api/copilot.py @@ -12,6 +12,7 @@ from pydantic import BaseModel, Field from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession +from app.api.coded import DATASOURCE_SCOPE_EMPTY, CodedHTTPException # 起别名:本文件底下有个叫 explain 的接口,generate 里又有个局部变量叫 raw,同名会互相盖掉 from app.core.errors import explain as explain_error, graph_error, not_configured, raw as raw_error from app.db.base import get_session @@ -43,9 +44,10 @@ async def _sources(session: AsyncSession, scope: list[str] | None) -> list[Any]: return rows picked = [r for r in rows if r.id in wanted or r.name in wanted] if not picked: - raise HTTPException( + raise CodedHTTPException( 400, "限定的数据源都不在了:可能已经被删掉或停用。去掉限定再问," "或者到「数据」页确认它还在、而且是启用的", + DATASOURCE_SCOPE_EMPTY, ) return picked @@ -157,7 +159,7 @@ NODE_REFERENCE = """\ **不要写 scope**。记忆域由平台给(当前统一是 default)。自己起一个域的后果是 写进去再也读不回来——真发生过:一轮写进 scope"user",下一轮没写 scope 落回 default,于是「我叫张三」存下来了,问「我是谁」却答不上来 -- human:人工介入。config: {mode: approve|input|edit, title, message} +- human:人工审批。config: {mode: approve|input|edit, title, message} - validate:JSON Schema 校验,可自动让模型修复。config: {schema, source, max_retries} - transform:数据整形。config: {mode: expression|template|json, expression/template, assign_to} - subgraph:嵌套另一个工作流。config: {workflow_id, input} @@ -1390,7 +1392,7 @@ async def extract_template( "先让它跑成功一次,再从那次运行提取", ) if not run.graph.get("nodes"): - raise HTTPException(400, "这次运行没有保存图快照,无法提取") + raise HTTPException(400, "这次运行没有保存工作流快照,无法提取") events = list( ( diff --git a/backend/app/api/runs.py b/backend/app/api/runs.py index a24c31c0..e2212e11 100644 --- a/backend/app/api/runs.py +++ b/backend/app/api/runs.py @@ -83,7 +83,8 @@ async def start_run( x_actor: str | None = Header(default=None), ) -> Run: actor = actor_of(x_actor) - name = "临时图" + # 没挂在工作流上(画布没保存就跑、问数据当场搭的)。老数据里是「临时图」,前端两种都认 + name = "未保存的工作流" version: int | None = None version_hash: str | None = None @@ -93,7 +94,7 @@ async def start_run( if not payload.workflow_id: raise HTTPException(400, "正式运行要从一个已保存的工作流发起:请求里没有指定工作流") if payload.graph is not None: - raise HTTPException(400, "正式运行只跑已发布的版本,不接受画布上的临时图——先保存并发布") + raise HTTPException(400, "正式运行只跑已发布的版本,不接受画布上没发布的改动——先保存并发布") workflow = await session.get(Workflow, payload.workflow_id) if not workflow: raise HTTPException(404, "找不到这个工作流,可能已经被删除了") @@ -141,7 +142,7 @@ async def start_run( graph = graph or workflow.graph name = workflow.name if not graph: - raise HTTPException(400, "没有要运行的内容:请求里既没有工作流,也没有图") + raise HTTPException(400, "没有要运行的内容:请求里既没有工作流 id,也没有工作流内容") from app.api.settings import resolve_run_scope @@ -453,7 +454,7 @@ async def delete_run( if not run: raise HTTPException(404, "运行记录不存在") if run.status in ("queued", "running") or run_manager.is_active(run_id): - raise HTTPException(409, "这次运行还在执行,现在删除会留下没人管的任务。先停止它,再删除") + raise HTTPException(409, "这次运行还在进行,现在删除会留下没人管的任务。先停止它,再删除") if run.run_class == "formal" and run.manifest_hash and not force: raise HTTPException( 409, diff --git a/backend/app/api/workflows.py b/backend/app/api/workflows.py index 7d95bd36..ef8f6720 100644 --- a/backend/app/api/workflows.py +++ b/backend/app/api/workflows.py @@ -152,7 +152,7 @@ async def delete_workflow( ) ) if live: - raise HTTPException(409, f"这个工作流还有 {live} 次运行在执行,现在删除它们会失去归属。先停止运行,再删除") + raise HTTPException(409, f"这个工作流还有 {live} 次运行在进行,现在删除它们会失去归属。先停止运行,再删除") await session.delete(workflow) await session.commit() diff --git a/backend/app/core/config.py b/backend/app/core/config.py index f0af072f..49c9e953 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -1,9 +1,12 @@ from __future__ import annotations +import ipaddress from functools import lru_cache from pathlib import Path +from typing import Annotated -from pydantic_settings import BaseSettings, SettingsConfigDict +from pydantic import field_validator +from pydantic_settings import BaseSettings, NoDecode, SettingsConfigDict BACKEND_DIR = Path(__file__).resolve().parents[2] PROJECT_DIR = BACKEND_DIR.parent @@ -83,7 +86,38 @@ class Settings(BaseSettings): http_tool_timeout: int = 20 http_tool_max_bytes: int = 2_000_000 # 逗号分隔的域名白名单;为空表示不限制(仅拦截内网地址) - http_tool_allowlist: list[str] = [] + http_tool_allowlist: Annotated[list[str], NoDecode] = [] + # 本机代理 fake-ip 模式给的假地址段,逗号分隔(Clash / mihomo 默认 198.18.0.0/15)。 + # 为空表示不认:解析到这些地址一律按内网拦截。配了之后,落在段里的解析结果改向 + # 下面的公共 DNS 核实真实地址——不能直接放行,内网域名在 fake-ip 下也是这个段 + http_tool_fake_ip_ranges: Annotated[list[str], NoDecode] = [] + # 核实用的 DNS-over-HTTPS(JSON 接口),按顺序试。写 IP 形式免得解析 DoH 自己的域名。 + # 境外的排前面:境内公共 DNS 对被封锁的域名返回污染结果(维基百科的 AAAA 给 2001::1), + # 会被当成内网误拦;开 fake-ip 的机器本来就有代理,连得上境外的 DoH + http_tool_doh_urls: Annotated[list[str], NoDecode] = [ + "https://1.1.1.1/dns-query", + "https://223.5.5.5/resolve", + ] + + @field_validator("http_tool_allowlist", "http_tool_fake_ip_ranges", "http_tool_doh_urls", mode="before") + @classmethod + def _comma_list(cls, value: object) -> object: + # 环境变量里写逗号分隔;也兼容 JSON 数组的写法 + if isinstance(value, str): + text = value.strip() + if text.startswith("["): + import json + + return json.loads(text) + return [part.strip() for part in text.split(",") if part.strip()] + return value + + @field_validator("http_tool_fake_ip_ranges") + @classmethod + def _valid_ranges(cls, value: list[str]) -> list[str]: + for cidr in value: + ipaddress.ip_network(cidr, strict=False) # 写错就在启动时报出来,别到运行时才静默失效 + return value @property def db_path(self) -> Path: diff --git a/backend/app/data/engine.py b/backend/app/data/engine.py index cb986582..d668ead0 100644 --- a/backend/app/data/engine.py +++ b/backend/app/data/engine.py @@ -292,7 +292,11 @@ def _causes(e: BaseException) -> list[BaseException]: class _Deadline: - """一条语句的时限。数据库那边按它停下;停下时报的错据此认成超时。""" + """一条语句的时限。数据库那边按它停下;停下时报的错据此认成超时。 + + 从取连接之前起算,和后端兜底同一个起点:取连接花掉的也算在时限里,数据库只拿到 + 剩下的那段(remaining_ms)。否则取连接一慢,兜底就抢在数据库前面取消语句。 + """ def __init__(self, seconds: float) -> None: self.seconds = seconds @@ -302,9 +306,11 @@ class _Deadline: #: 语句已经结束。回调这时要是还挂在连接上(摘除没成功),也不能再掐别人的语句 self.over = False - @property - def ms(self) -> int: - return max(1, int(self.seconds * 1000)) + def remaining_ms(self) -> int: + return max(1, int((self.ends - time.monotonic()) * 1000)) + + def remaining_seconds(self) -> float: + return max(0.001, round(self.ends - time.monotonic(), 3)) def expired(self) -> bool: return time.monotonic() >= self.ends @@ -354,7 +360,7 @@ async def _server_deadline(conn: AsyncConnection, kind: str, deadline: _Deadline """ if kind in ("postgres", "postgresql"): # SET LOCAL 只管这一个事务:连接还回池子时回滚,设置随之作废 - await conn.execute(text(f"SET LOCAL statement_timeout = {deadline.ms}")) + await conn.execute(text(f"SET LOCAL statement_timeout = {deadline.remaining_ms()}")) yield return @@ -362,9 +368,9 @@ async def _server_deadline(conn: AsyncConnection, kind: str, deadline: _Deadline # MySQL 的 max_execution_time 以毫秒计、只管 SELECT;MariaDB 没有它, # 用 max_statement_time(秒)。按连上的服务器认,不按表单里选的类型 if getattr(conn.dialect, "is_mariadb", False): - var, value = "max_statement_time", _seconds(deadline.seconds) + var, value = "max_statement_time", _seconds(deadline.remaining_seconds()) else: - var, value = "max_execution_time", str(deadline.ms) + var, value = "max_execution_time", str(deadline.remaining_ms()) try: await conn.execute(text(f"SET SESSION {var} = {value}")) except Exception as e: # noqa: BLE001 @@ -390,7 +396,7 @@ async def _server_deadline(conn: AsyncConnection, kind: str, deadline: _Deadline driver = await _driver(conn) before = getattr(driver, "call_timeout", 0) try: - driver.call_timeout = deadline.ms + driver.call_timeout = deadline.remaining_ms() except Exception as e: # noqa: BLE001 logger.warning("Oracle call_timeout 没设上(%s),只剩后端兜底", e) yield @@ -427,13 +433,17 @@ async def _bounded( """在 opener() 开的连接上跑 work,时限交给数据库执行,后端这边再留一道兜底。 数据库按时限停下语句时报的错,翻成 over 这句话:「超过 Ns 被中断」。 + 两道时限从同一刻(取连接之前)算起,数据库那道先到,兜底晚 BACKSTOP_S。 """ deadline: _Deadline | None = None async def _exec() -> Any: nonlocal deadline + deadline = _Deadline(limits.timeout_seconds) async with opener() as conn: - deadline = _Deadline(limits.timeout_seconds) + # 光等连接就把时限用完了:语句不必再发,发出去也只剩 1ms + if deadline.expired(): + raise SqlRejected(over) async with _server_deadline(conn, kind, deadline): return await work(conn) diff --git a/backend/app/data/introspect.py b/backend/app/data/introspect.py index 8d1a9fbd..65be8813 100644 --- a/backend/app/data/introspect.py +++ b/backend/app/data/introspect.py @@ -20,6 +20,7 @@ from typing import Any from sqlalchemy import inspect as sa_inspect from sqlalchemy.engine.reflection import ObjectKind +from app.core.errors import describe_exception, first_line from app.data.engine import engines # 一次探查最多带回多少张表。生产库动辄上千张,全拉回来既慢又没人看得完。 @@ -198,8 +199,9 @@ async def introspect(source: Any, *, schema: str | None = None) -> dict[str, Any candidates = await list_schemas(source) if not candidates: raise + # error 原样画在数据源卡片上、也交给 agent 看:驱动的异常类名和文档链接去掉,只留它自己的说明 payload = {"tables": {}, "truncated": False, "total": 0, - "failed": True, "error": f"{type(exc).__name__}: {exc}"} + "failed": True, "error": first_line(exc) or describe_exception(exc)} payload["synced_at"] = datetime.now(timezone.utc).isoformat() payload["schema"] = target diff --git a/backend/app/data/tabular.py b/backend/app/data/tabular.py index ae68262f..1c539f39 100644 --- a/backend/app/data/tabular.py +++ b/backend/app/data/tabular.py @@ -22,9 +22,12 @@ import csv import io import re import sqlite3 +import zipfile from dataclasses import dataclass, field from typing import Any +from app.core.errors import describe_exception + #: 扫多少行来推断列类型。全表扫一遍对几十万行的文件太慢,而类型这种东西 #: 前几千行看不出来的,后面多半也看不出来——真看错了,SQLite 的动态类型 #: 也还能把值原样存下去,不会丢数据 @@ -246,7 +249,10 @@ def _read_excel(raw: bytes, *, header_row: int) -> list[tuple[str, list[list[Any # data_only 取公式算出来的值而不是公式本身——用户要的是数 book = load_workbook(io.BytesIO(raw), read_only=True, data_only=True) except Exception as e: # noqa: BLE001 - raise UnsupportedTable(f"这个 Excel 读不开:{type(e).__name__}: {e}") from e + # 这句话原样进上传的 400:异常类名留在日志(from e),界面上只说能照着做的 + reason = "文件不是有效的 .xlsx(可能损坏,或者只是改了扩展名)" if isinstance(e, zipfile.BadZipFile) \ + else describe_exception(e) + raise UnsupportedTable(f"这个 Excel 读不开:{reason}。在 Excel 里另存为 .xlsx 或 .csv 再传") from e out: list[tuple[str, list[list[Any]]]] = [] for sheet in book.worksheets: diff --git a/backend/app/engine/compiler.py b/backend/app/engine/compiler.py index e7de975f..46ae78e4 100644 --- a/backend/app/engine/compiler.py +++ b/backend/app/engine/compiler.py @@ -319,7 +319,7 @@ def compile_graph(spec: GraphSpec, run_ctx: RunContext) -> StateGraph: # 入口 entries = spec.entry_nodes() if not entries: - raise ValueError("这张图没有入口节点") + raise ValueError("这个工作流没有入口节点") for node in entries: builder.add_edge(START, node.id) diff --git a/backend/app/engine/schema.py b/backend/app/engine/schema.py index 70693d51..2a03cae4 100644 --- a/backend/app/engine/schema.py +++ b/backend/app/engine/schema.py @@ -384,7 +384,7 @@ def validate_graph(spec: GraphSpec) -> ValidationResult: result.add(f"边指向了不存在的目标节点 {edge.target!r}", edge_id=edge.id) if not spec.entry_nodes(): - result.add("找不到入口:每个节点都有入边,图里存在环且没有起点") + result.add("找不到入口:每个节点都有入边,工作流里有环且没有起点") # 节点级必填项 for node in spec.nodes: diff --git a/backend/app/main.py b/backend/app/main.py index 5fe5b524..16a5f458 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -12,6 +12,7 @@ from app.api import ( artifacts, conversations, copilot, datasources, governance, knowledge, runs, sandbox, settings as settings_api, tools, workflows, ) +from app.api.coded import CodedHTTPException, coded_handler from app.core.config import settings from app.db.base import init_db from app.engine.runner import run_manager @@ -107,6 +108,9 @@ for router in ( app.include_router(router) +app.add_exception_handler(CodedHTTPException, coded_handler) + + @app.exception_handler(ValueError) async def value_error_handler(_: Request, exc: ValueError) -> JSONResponse: return JSONResponse(status_code=400, content={"detail": str(exc)}) diff --git a/backend/app/sandbox/bubblewrap_sandbox.py b/backend/app/sandbox/bubblewrap_sandbox.py index 81bd2573..c2341443 100644 --- a/backend/app/sandbox/bubblewrap_sandbox.py +++ b/backend/app/sandbox/bubblewrap_sandbox.py @@ -1,6 +1,7 @@ from __future__ import annotations import asyncio +import logging import os import resource import shutil @@ -9,9 +10,12 @@ import time from pathlib import Path from app.core.config import settings, sanitize_session +from app.core.errors import describe_exception, raw from app.sandbox import interpreter from app.sandbox.base import ENTRY_PREFIX, ExecResult, Sandbox, SandboxLimits, entry_name, truncate +logger = logging.getLogger(__name__) + # 入口脚本后缀 + 执行命令前缀(沙箱内路径在运行时拼)。文件名不能写死: # 同会话并发执行都写 main.py 会互相覆盖。 _LANG = { @@ -156,7 +160,9 @@ class BubblewrapSandbox(Sandbox): error=f"执行超过 {limits.timeout}s 被终止", ) except Exception as e: # noqa: BLE001 - return ExecResult(ok=False, backend=self.name, error=f"{type(e).__name__}: {e}") + # 起进程和收输出在同一个 try 里。首行只说原因,类名和 errno 这些留给日志 + logger.warning("%s 沙箱进程出错:%s", self.name, raw(e)) + return ExecResult(ok=False, backend=self.name, error=f"沙箱进程出错:{describe_exception(e)}") stdout, t1 = truncate(out.decode(errors="replace"), limits.max_output) stderr, t2 = truncate(err.decode(errors="replace"), limits.max_output) diff --git a/backend/app/sandbox/local_sandbox.py b/backend/app/sandbox/local_sandbox.py index d5e4e95a..ea98f911 100644 --- a/backend/app/sandbox/local_sandbox.py +++ b/backend/app/sandbox/local_sandbox.py @@ -1,6 +1,7 @@ from __future__ import annotations import asyncio +import logging import os import resource import shutil @@ -9,9 +10,12 @@ import time from pathlib import Path from app.core.config import settings, sanitize_session +from app.core.errors import describe_exception, raw from app.sandbox import interpreter from app.sandbox.base import ENTRY_PREFIX, ExecResult, Sandbox, SandboxLimits, entry_name, truncate +logger = logging.getLogger(__name__) + # 入口脚本后缀 + 执行命令。文件名运行时生成(entry_name),不能写死: # 同会话并发执行都写 main.py 会互相覆盖。 _LANG = { @@ -131,7 +135,9 @@ class LocalSandbox(Sandbox): preexec_fn=self._preexec(limits), ) except Exception as e: # noqa: BLE001 - return ExecResult(ok=False, backend=self.name, error=f"{type(e).__name__}: {e}") + # 首行只说原因,类名和 errno 这些留给日志 + logger.warning("%s 沙箱起进程失败:%s", self.name, raw(e)) + return ExecResult(ok=False, backend=self.name, error=f"没能启动进程:{describe_exception(e)}") try: out, err = await asyncio.wait_for(proc.communicate(), timeout=limits.timeout) diff --git a/backend/app/sandbox/microvm_sandbox.py b/backend/app/sandbox/microvm_sandbox.py index b271c7a0..f66d71ef 100644 --- a/backend/app/sandbox/microvm_sandbox.py +++ b/backend/app/sandbox/microvm_sandbox.py @@ -1,12 +1,14 @@ from __future__ import annotations import asyncio +import logging import time from dataclasses import dataclass, field from pathlib import Path from typing import Any from app.core.config import sanitize_session, settings +from app.core.errors import describe_exception, raw from app.sandbox.base import ( ENTRY_PREFIX, ExecResult, @@ -16,6 +18,8 @@ from app.sandbox.base import ( truncate, ) +logger = logging.getLogger(__name__) + _WORKDIR = "/workspace" # 各语言的入口脚本后缀与执行命令。文件名在运行时生成(见 entry_name), @@ -279,10 +283,11 @@ class MicroVMSandbox(Sandbox): + ("" if self.image_ready() else "(镜像未缓存,首次需拉取约 55s)"), ) except Exception as e: # noqa: BLE001 + logger.warning("microVM 启动失败:%s", raw(e)) return ExecResult( ok=False, backend=self.name, duration_ms=int((time.perf_counter() - started) * 1000), - error=f"microVM 启动失败:{type(e).__name__}: {e}", + error=f"microVM 启动失败:{describe_exception(e)}", ) try: @@ -327,10 +332,11 @@ class MicroVMSandbox(Sandbox): + ("" if killed else ";VM 已重置,该会话之前写的文件已丢失"), ) except Exception as e: # noqa: BLE001 + logger.warning("microVM 执行中断:%s", raw(e)) return ExecResult( ok=False, backend=self.name, duration_ms=int((time.perf_counter() - started) * 1000), - error=f"{type(e).__name__}: {e}", + error=f"microVM 里的执行中断了:{describe_exception(e)}", ) finally: if ephemeral: diff --git a/backend/app/sandbox/seatbelt_sandbox.py b/backend/app/sandbox/seatbelt_sandbox.py index 459fe522..1c1de97b 100644 --- a/backend/app/sandbox/seatbelt_sandbox.py +++ b/backend/app/sandbox/seatbelt_sandbox.py @@ -1,6 +1,7 @@ from __future__ import annotations import asyncio +import logging import os import resource import shutil @@ -9,9 +10,12 @@ import time from pathlib import Path from app.core.config import sanitize_session, settings +from app.core.errors import describe_exception, raw from app.sandbox import interpreter from app.sandbox.base import ENTRY_PREFIX, ExecResult, Sandbox, SandboxLimits, entry_name, truncate +logger = logging.getLogger(__name__) + SANDBOX_EXEC = "/usr/bin/sandbox-exec" def _real(path: str | Path) -> str: @@ -227,7 +231,9 @@ class SeatbeltSandbox(Sandbox): preexec_fn=self._preexec(limits), ) except Exception as e: # noqa: BLE001 - return ExecResult(ok=False, backend=self.name, error=f"{type(e).__name__}: {e}") + # 首行只说原因,类名和 errno 这些留给日志 + logger.warning("%s 沙箱起进程失败:%s", self.name, raw(e)) + return ExecResult(ok=False, backend=self.name, error=f"没能启动进程:{describe_exception(e)}") try: out, err = await asyncio.wait_for(proc.communicate(), timeout=limits.timeout) diff --git a/backend/app/seed.py b/backend/app/seed.py index d86a7bee..d4ff543a 100644 --- a/backend/app/seed.py +++ b/backend/app/seed.py @@ -74,7 +74,7 @@ TEMPLATES: list[dict[str, Any]] = [ { "name": "③ 带人工审批的发布流", "description": "起草 → 人工把关 → 通过就发布、驳回就改写。演示中断与断点恢复。", - "tags": ["人工介入", "分支"], + "tags": ["人工审批", "分支"], "nodes": [ _n("start", "input", "主题", fields=[{"name": "topic", "required": True}]), _n("draft", "llm", "起草", system="你是品牌文案。", diff --git a/backend/app/tools/net.py b/backend/app/tools/net.py index c04b26c4..f4bb729e 100644 --- a/backend/app/tools/net.py +++ b/backend/app/tools/net.py @@ -1,7 +1,8 @@ from __future__ import annotations +import asyncio import ipaddress -import socket +import time from urllib.parse import urlparse import httpx @@ -31,12 +32,79 @@ def _is_private(ip: str) -> bool: ) -def assert_safe_url(url: str) -> str: +# 本机代理 fake-ip 模式最常见的假地址段。没配 fake-ip 网段时,拦截报错里据此提示一句 +_COMMON_FAKE_IP = ipaddress.ip_network("198.18.0.0/15") +# 核实过的真实地址:host -> (过期时刻, 地址)。TTL 取 DNS 给的,夹在 30s–300s 之间 +_real_ip_cache: dict[str, tuple[float, tuple[str, ...]]] = {} +_DOH_TYPES = {"A": 1, "AAAA": 28} + + +def _fake_networks() -> list[ipaddress.IPv4Network | ipaddress.IPv6Network]: + return [ipaddress.ip_network(c, strict=False) for c in settings.http_tool_fake_ip_ranges] + + +def _in(ip: str, networks) -> bool: + try: + addr = ipaddress.ip_address(ip) + except ValueError: + return False + return any(addr.version == n.version and addr in n for n in networks) + + +def _doh_client() -> httpx.AsyncClient: + # 不走环境变量里的代理:核实要的就是公共 DNS 的原话 + return httpx.AsyncClient(timeout=5, trust_env=False) + + +async def _real_ips(host: str) -> tuple[str, ...]: + """向公共 DNS(DoH)问 host 的真实地址。问不到就拦——核实不了不能当作安全。""" + cached = _real_ip_cache.get(host) + if cached and cached[0] > time.monotonic(): + return cached[1] + + nxdomain = False + async with _doh_client() as client: + for base in settings.http_tool_doh_urls: + try: + replies = await asyncio.gather(*( + client.get(base, params={"name": host, "type": t}, + headers={"accept": "application/dns-json"}) + for t in _DOH_TYPES + )) + bodies = [r.json() for r in replies if r.status_code == 200] + except (httpx.HTTPError, ValueError): + continue + if len(bodies) != len(_DOH_TYPES): + continue + ips: list[str] = [] + ttls: list[int] = [] + for body in bodies: + for answer in body.get("Answer") or []: + if answer.get("type") in _DOH_TYPES.values() and answer.get("data"): + ips.append(str(answer["data"])) + ttls.append(int(answer.get("TTL") or 0)) + if ips: + ttl = min(max(min(ttls), 30), 300) + _real_ip_cache[host] = (time.monotonic() + ttl, tuple(ips)) + return tuple(ips) + nxdomain = nxdomain or all(b.get("Status") == 3 for b in bodies) + if nxdomain: + break + if nxdomain: + raise UnsafeUrlError(f"{host} 在公共 DNS 里查不到(本机只解析到代理的 fake-ip 假地址),已拦截") + raise UnsafeUrlError(f"{host} 解析到代理的 fake-ip 假地址,而且没能向公共 DNS 核实真实地址,已拦截") + + +async def assert_safe_url(url: str) -> str: """挡住 SSRF。 agent 手里的 HTTP 工具就是一把面向内网的扫描枪,所以这里做三件事: 只放行 http/https、解析域名后逐个 IP 检查是不是内网/回环/元数据地址、 再按配置里的域名白名单过一遍。 + + 本机代理开了 fake-ip 时,查什么都先拿到 198.18 段的假地址。配了 + http_tool_fake_ip_ranges 的话,落在段里的解析结果改向公共 DNS 核实真实地址 + 再判断;直接放行不行——内网域名在 fake-ip 下也是这个段。 """ parsed = urlparse(url) if parsed.scheme not in ("http", "https"): @@ -54,13 +122,35 @@ def assert_safe_url(url: str) -> str: # 逐个解析结果都要查:一个域名可能同时解析到公网和内网地址 try: - infos = socket.getaddrinfo(host, parsed.port or (443 if parsed.scheme == "https" else 80)) - except socket.gaierror as e: + infos = await asyncio.get_running_loop().getaddrinfo( + host, parsed.port or (443 if parsed.scheme == "https" else 80)) + except OSError as e: raise UnsafeUrlError(f"域名解析失败:{host}") from e + + fake = _fake_networks() + try: + ipaddress.ip_address(host) + is_literal = True # 直接写的 IP 没有域名可以去核实 + except ValueError: + is_literal = False + needs_check = False for info in infos: ip = info[4][0] + if fake and _in(ip, fake) and not is_literal: + needs_check = True # 假地址本身说明不了什么,下面问公共 DNS + continue if _is_private(ip): - raise UnsafeUrlError(f"{host} 解析到内网地址 {ip},已拦截") + hint = "" + if not fake and _in(ip, [_COMMON_FAKE_IP]): + hint = ("。198.18.x.x 通常是本机代理 fake-ip 模式给的假地址:可以设置 " + "AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES=198.18.0.0/15 让它向公共 DNS 核实真实地址," + "或者把代理的 DNS 改成 redir-host、把这个域名加进 fake-ip-filter") + raise UnsafeUrlError(f"{host} 解析到内网地址 {ip},已拦截{hint}") + + if needs_check: + for ip in await _real_ips(host): + if _is_private(ip): + raise UnsafeUrlError(f"{host} 的真实地址 {ip} 是内网地址,已拦截") return url @@ -79,7 +169,7 @@ async def safe_request( 逐跳重新校验,并对响应体截断。""" timeout = timeout or settings.http_tool_timeout max_bytes = max_bytes or settings.http_tool_max_bytes - current = assert_safe_url(url) + current = await assert_safe_url(url) async with httpx.AsyncClient( timeout=timeout, follow_redirects=False, trust_env=False @@ -94,7 +184,7 @@ async def safe_request( content=data, ) if resp.status_code in (301, 302, 303, 307, 308) and "location" in resp.headers: - current = assert_safe_url( + current = await assert_safe_url( str(httpx.URL(current).join(resp.headers["location"])) ) continue diff --git a/backend/tests/test_conversation_status.py b/backend/tests/test_conversation_status.py index 3b37ca5a..dc673b30 100644 --- a/backend/tests/test_conversation_status.py +++ b/backend/tests/test_conversation_status.py @@ -193,3 +193,50 @@ async def test_the_detail_carries_the_same_status(client): await _turn(client, conv, run_id=run) detail = (await client.get(f"/api/conversations/{conv}")).json() assert (detail["last_status"], detail["last_run_id"]) == ("waiting", run) + + +# -------------------------------------------------------------------------- +# 重试之后:meta.runId 才是这一轮现在的运行 +# -------------------------------------------------------------------------- + + +async def test_a_retried_turn_reports_the_new_run_not_the_old_one(client): + """重试会换一次运行,可 run_id 列清不掉(TurnPatch 的 None 表示「不改」), + 还指着上一次失败的运行;前端写的 meta.runId 才是权威。列表得按它报, + 不然重试正在建图时,左栏还挂着上一次的「失败」。""" + conv = await _conversation(client, "重试了") + old = await _run("failed") + turn = await _turn(client, conv, run_id=old, status="error", error="查询超时", + meta={"v": 1, "runId": old}) + # 重试:重新建图,还没有运行 + r = await client.patch(f"/api/conversations/{conv}/turns/{turn['id']}", + json={"status": "running", "meta": {"v": 1, "runId": None}}) + assert r.status_code == 200 + item = (await _listed(client))[conv] + assert (item["last_status"], item["last_run_id"]) == ("running", None) + + # 重试出来的运行起来了,还在跑 + new = await _run("running") + await client.patch(f"/api/conversations/{conv}/turns/{turn['id']}", + json={"meta": {"v": 1, "runId": new}}) + item = (await _listed(client))[conv] + assert (item["last_status"], item["last_run_id"]) == ("running", new) + detail = (await client.get(f"/api/conversations/{conv}")).json() + assert (detail["last_status"], detail["last_run_id"]) == ("running", new) + + +async def test_old_turns_without_run_id_in_meta_still_use_the_column(client): + conv = await _conversation(client, "老轮次") + run = await _run("interrupted", pending=True) + await _turn(client, conv, run_id=run, meta={"v": 1, "ms": 1200}) + item = (await _listed(client))[conv] + assert (item["last_status"], item["last_run_id"]) == ("waiting", run) + + +async def test_turns_carry_updated_at_for_the_same_staleness_clock(client): + """前端判断「建图断了」要和后端用同一只钟:后端按 updated_at 算。""" + conv = await _conversation(client, "带时间") + turn = await _turn(client, conv) + assert turn.get("updated_at"), turn + detail = (await client.get(f"/api/conversations/{conv}")).json() + assert detail["turns"][0]["updated_at"] diff --git a/backend/tests/test_copilot_scope.py b/backend/tests/test_copilot_scope.py index d0ed604e..5eb66696 100644 --- a/backend/tests/test_copilot_scope.py +++ b/backend/tests/test_copilot_scope.py @@ -170,6 +170,19 @@ async def test_a_scope_of_unknown_sources_is_refused_up_front(client, monkeypatc assert status == 400 detail = body[0]["detail"] assert "数据源" in detail and "no_such_source" not in detail.split(":")[0] + # 前端按机器码认,不按「限定的数据源」这几个字的前缀认:文案改了也不失灵。 + # detail 仍是一句话,老前端照旧能显示 + assert isinstance(detail, str) + assert body[0]["code"] == "datasource_scope_empty" + + +async def test_the_one_shot_generate_refuses_an_empty_scope_with_the_same_code(client, sources): + r = await client.post("/api/copilot/generate", json={ + "instruction": "订单多少", "datasource_ids": ["no_such_source"], + }) + assert r.status_code == 400, r.text + assert r.json()["code"] == "datasource_scope_empty" + assert isinstance(r.json()["detail"], str) async def test_the_one_shot_generate_honours_the_scope(client, monkeypatch, sources): diff --git a/backend/tests/test_datasource_preview.py b/backend/tests/test_datasource_preview.py index 7dcae041..9f0f592b 100644 --- a/backend/tests/test_datasource_preview.py +++ b/backend/tests/test_datasource_preview.py @@ -8,6 +8,8 @@ schema 把缓存换回来,而那一次要是失败,缓存和配置就对不 """ from __future__ import annotations +import re + import sqlite3 import pytest @@ -95,6 +97,8 @@ async def test_a_dry_run_that_finds_nothing_says_why_and_still_leaves_the_cache( preview = r.json() assert preview["dry_run"] is True and preview["table_count"] == 0 assert preview["schema_error"], "探失败了要说出来,不能看起来像「这个 schema 是空的」" + # 这句话原样画在数据源卡片上:不带驱动的异常类名(OperationalError: …) + assert not re.search(r"\b[A-Z]\w*(Error|Exception)\b", preview["schema_error"]), preview["schema_error"] assert "main" in preview["available_schemas"] assert await _cache(source["id"]) == before diff --git a/backend/tests/test_net_fake_ip.py b/backend/tests/test_net_fake_ip.py new file mode 100644 index 00000000..5d68eafd --- /dev/null +++ b/backend/tests/test_net_fake_ip.py @@ -0,0 +1,198 @@ +"""本机代理 fake-ip 模式下的 SSRF 检查。 + +Clash / mihomo 一类代理开 TUN + fake-ip 时,本机查任何域名都先拿到 198.18.0.0/15 +里的一个假地址,真正的连接由代理接管。Python 把这个网段算作私有地址,于是网页工具 +对所有外网地址都报「解析到内网地址,已拦截」。 + +不能简单放行这个网段:fake-ip 模式下内网域名同样被映射成 198.18 的假地址,放行 +等于关掉防护。做法是配置了 fake-ip 网段之后,落在网段里的解析结果改向公共 DNS +(DNS-over-HTTPS,不会被 TUN 劫持)核实真实地址:公网放行,内网照拦,核实不了按拦截算。 +""" + +from __future__ import annotations + +import asyncio +import json +import socket + +import httpx +import pytest + +from app.core.config import Settings, settings +from app.tools import net +from app.tools.net import UnsafeUrlError, assert_safe_url + +FAKE = "198.18.1.183" + + +@pytest.fixture(autouse=True) +def clean(monkeypatch): + net._real_ip_cache.clear() + monkeypatch.setattr(settings, "http_tool_allowlist", []) + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", []) + monkeypatch.setattr(settings, "http_tool_doh_urls", ["https://doh-a.test/resolve", "https://doh-b.test/dns-query"]) + yield + net._real_ip_cache.clear() + + +def resolves_to(monkeypatch, *ips): + async def fake_getaddrinfo(host, port, *args, **kwargs): + return [(socket.AF_INET, socket.SOCK_STREAM, 6, "", (ip, port)) for ip in ips] + loop = asyncio.get_running_loop() + monkeypatch.setattr(loop, "getaddrinfo", fake_getaddrinfo) + + +class DoH: + """假的公共 DNS:按 (resolver 主机, 记录类型) 返回;记下查了几次。""" + + def __init__(self, answers: dict[str, dict] | None = None, fail: set[str] | None = None): + self.answers = answers or {} + self.fail = fail or set() + self.calls: list[tuple[str, str, str]] = [] + + def handler(self, request: httpx.Request) -> httpx.Response: + host = request.url.host + name = request.url.params.get("name") + rtype = request.url.params.get("type") + self.calls.append((host, name, rtype)) + assert request.headers.get("accept") == "application/dns-json" + if host in self.fail: + raise httpx.ConnectError("resolver unreachable") + body = self.answers.get(f"{host}:{rtype}", {"Status": 0, "Answer": []}) + return httpx.Response(200, content=json.dumps(body)) + + def install(self, monkeypatch): + monkeypatch.setattr( + net, "_doh_client", + lambda: httpx.AsyncClient(transport=httpx.MockTransport(self.handler), timeout=5), + ) + + +def a_record(*ips, ttl=120, cname=None): + answers = [{"name": "x", "type": 5, "TTL": ttl, "data": cname}] if cname else [] + answers += [{"name": "x", "type": 1, "TTL": ttl, "data": ip} for ip in ips] + return {"Status": 0, "Answer": answers} + + +async def test_without_config_a_fake_ip_is_blocked_with_a_hint(monkeypatch): + resolves_to(monkeypatch, FAKE) + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("https://ir.example.com/page") + message = str(e.value) + assert "已拦截" in message + assert "fake-ip" in message and "AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES" in message + + +async def test_a_fake_ip_is_allowed_when_public_dns_says_the_host_is_public(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + doh = DoH({"doh-a.test:A": a_record("93.184.216.34", cname="edge.example.net")}) + doh.install(monkeypatch) + assert await assert_safe_url("https://ir.example.com/page") == "https://ir.example.com/page" + assert ("doh-a.test", "ir.example.com", "A") in doh.calls + + +async def test_a_fake_ip_hiding_an_intranet_address_is_still_blocked(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + DoH({"doh-a.test:A": a_record("10.0.0.5")}).install(monkeypatch) + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("http://wiki.corp.example/") + assert "10.0.0.5" in str(e.value) and "已拦截" in str(e.value) + + +async def test_an_ipv6_intranet_answer_is_blocked_too(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + DoH({ + "doh-a.test:A": a_record("93.184.216.34"), + "doh-a.test:AAAA": {"Status": 0, "Answer": [{"name": "x", "type": 28, "TTL": 60, "data": "fd00::1"}]}, + }).install(monkeypatch) + with pytest.raises(UnsafeUrlError): + await assert_safe_url("https://mixed.example.com/") + + +async def test_a_name_public_dns_does_not_know_is_blocked(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + DoH({"doh-a.test:A": {"Status": 3}, "doh-a.test:AAAA": {"Status": 3}}).install(monkeypatch) + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("http://build-server.internal/") + assert "查不到" in str(e.value) + + +async def test_when_no_resolver_answers_it_fails_closed(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + DoH(fail={"doh-a.test", "doh-b.test"}).install(monkeypatch) + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("https://ir.example.com/") + assert "核实" in str(e.value) + + +async def test_the_second_resolver_is_tried_when_the_first_is_down(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + DoH({"doh-b.test:A": a_record("93.184.216.34")}, fail={"doh-a.test"}).install(monkeypatch) + assert await assert_safe_url("https://ir.example.com/") + + +async def test_an_ip_literal_inside_the_fake_range_cannot_be_verified_and_is_blocked(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + doh = DoH() + doh.install(monkeypatch) + with pytest.raises(UnsafeUrlError): + await assert_safe_url(f"http://{FAKE}/") + assert doh.calls == [] + + +async def test_a_real_private_answer_is_blocked_without_asking_public_dns(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE, "192.168.1.10") + doh = DoH({"doh-a.test:A": a_record("93.184.216.34")}) + doh.install(monkeypatch) + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("https://split.example.com/") + assert "192.168.1.10" in str(e.value) + assert doh.calls == [] + + +async def test_verified_answers_are_cached_for_a_while(monkeypatch): + monkeypatch.setattr(settings, "http_tool_fake_ip_ranges", ["198.18.0.0/15"]) + resolves_to(monkeypatch, FAKE) + doh = DoH({"doh-a.test:A": a_record("93.184.216.34")}) + doh.install(monkeypatch) + await assert_safe_url("https://ir.example.com/a") + first = len(doh.calls) + await assert_safe_url("https://ir.example.com/b") + assert len(doh.calls) == first + + +async def test_public_and_private_answers_behave_as_before(monkeypatch): + resolves_to(monkeypatch, "93.184.216.34") + assert await assert_safe_url("https://www.example.com/") + resolves_to(monkeypatch, "10.1.2.3") + with pytest.raises(UnsafeUrlError) as e: + await assert_safe_url("https://intra.example.com/") + assert "fake-ip" not in str(e.value) + + +def test_list_settings_accept_comma_separated_env(monkeypatch): + monkeypatch.setenv("AGENTLAB_HTTP_TOOL_ALLOWLIST", "example.com, example.org") + monkeypatch.setenv("AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES", "198.18.0.0/15,fdfe:dcba:9876::/48") + s = Settings() + assert s.http_tool_allowlist == ["example.com", "example.org"] + assert s.http_tool_fake_ip_ranges == ["198.18.0.0/15", "fdfe:dcba:9876::/48"] + + +def test_a_malformed_fake_ip_range_is_rejected_at_startup(monkeypatch): + monkeypatch.setenv("AGENTLAB_HTTP_TOOL_FAKE_IP_RANGES", "198.18.0.0/99") + with pytest.raises(Exception): + Settings() + + +def test_the_default_resolver_order_puts_an_unpolluted_one_first(monkeypatch): + """境内公共 DNS 对被封锁的域名返回污染结果:维基百科的 AAAA 给 2001::1,被当成 + 内网拦掉。默认先问境外的,境内的只作兜底""" + monkeypatch.delenv("AGENTLAB_HTTP_TOOL_DOH_URLS", raising=False) + assert Settings().http_tool_doh_urls[0] == "https://1.1.1.1/dns-query" diff --git a/backend/tests/test_query_deadline.py b/backend/tests/test_query_deadline.py index 5a7030b2..92df4e5a 100644 --- a/backend/tests/test_query_deadline.py +++ b/backend/tests/test_query_deadline.py @@ -258,6 +258,12 @@ def _fake(monkeypatch, **kw: Any) -> _FakeEngine: return fake +def _budget(sql: str, prefix: str, scale: float = 1) -> float: + """下发的时限值。数据库拿到的是剩下的预算,取连接也算在里面,所以略小于整段时限。""" + assert sql.startswith(prefix), sql + return float(sql[len(prefix):]) * scale + + def _remote(kind: str, *, readonly: bool = True) -> Any: return types.SimpleNamespace(id=f"r_{kind}", name="shop", kind=kind, readonly=readonly, options={}, database="shop") @@ -266,7 +272,8 @@ def _remote(kind: str, *, readonly: bool = True) -> Any: async def test_postgres_gets_a_statement_timeout_for_this_transaction_only(monkeypatch): fake = _fake(monkeypatch) await run_query(_remote("postgres"), "SELECT 1", limits=QueryLimits(timeout_seconds=5)) - assert fake.log[:2] == ["SET LOCAL statement_timeout = 5000", "SELECT 1"], fake.log + assert 4900 <= _budget(fake.log[0], "SET LOCAL statement_timeout = ") <= 5000, fake.log + assert fake.log[1] == "SELECT 1", fake.log # SET LOCAL 随事务回滚作废,不用也不该再发一条恢复 assert not [s for s in fake.log[2:] if s.startswith("SET")] @@ -275,13 +282,14 @@ async def test_postgres_writes_are_bounded_too(monkeypatch): fake = _fake(monkeypatch) await run_query(_remote("postgresql", readonly=False), "UPDATE orders SET id = 1", limits=QueryLimits(timeout_seconds=5)) - assert fake.log[:2] == ["SET LOCAL statement_timeout = 5000", "UPDATE orders SET id = 1"] + assert 4900 <= _budget(fake.log[0], "SET LOCAL statement_timeout = ") <= 5000, fake.log + assert fake.log[1] == "UPDATE orders SET id = 1" async def test_mysql_gets_max_execution_time_and_it_is_put_back(monkeypatch): fake = _fake(monkeypatch) await run_query(_remote("mysql"), "SELECT 1", limits=QueryLimits(timeout_seconds=5)) - assert fake.log[0] == "SET SESSION max_execution_time = 5000" + assert 4900 <= _budget(fake.log[0], "SET SESSION max_execution_time = ") <= 5000, fake.log assert "SELECT 1" in fake.log # 会话级设置跟着连接回池子:用完恢复成服务器的缺省,探查结构这类长操作不受它牵连 assert fake.log[-1] == "SET SESSION max_execution_time = DEFAULT" @@ -290,14 +298,15 @@ async def test_mysql_gets_max_execution_time_and_it_is_put_back(monkeypatch): async def test_mariadb_uses_its_own_variable_in_seconds(monkeypatch): fake = _fake(monkeypatch, mariadb=True) await run_query(_remote("mysql"), "SELECT 1", limits=QueryLimits(timeout_seconds=5)) - assert fake.log[0] == "SET SESSION max_statement_time = 5" + assert 4900 <= _budget(fake.log[0], "SET SESSION max_statement_time = ", 1000) <= 5000, fake.log assert fake.log[-1] == "SET SESSION max_statement_time = DEFAULT" async def test_oracle_gets_a_call_timeout_and_it_is_put_back(monkeypatch): fake = _fake(monkeypatch) await run_query(_remote("oracle"), "SELECT 1 FROM DUAL", limits=QueryLimits(timeout_seconds=5)) - assert "call_timeout=5000" in fake.log, fake.log + sent = next(_budget(s, "call_timeout=") for s in fake.log if s.startswith("call_timeout=")) + assert 4900 <= sent <= 5000, fake.log assert fake.driver.call_timeout == 0, "call_timeout 跟着连接回池子,探查结构时也会被它掐" @@ -348,6 +357,81 @@ async def test_other_errors_are_not_mistaken_for_a_timeout(monkeypatch): await run_query(_remote("postgres"), "SELECT 1", limits=QueryLimits(timeout_seconds=5)) +# -------------------------------------------------------------------------- +# 取连接慢:数据库的时限和后端兜底从同一刻算起 +# -------------------------------------------------------------------------- + + +class _HonouringConn: + """一台守 statement_timeout 的「服务器」:从收到 SET LOCAL 那一刻起算,到点报超时。""" + + def __init__(self, log: list[tuple[float, str]], t0: float) -> None: + self.log, self.t0 = log, t0 + self.dialect = types.SimpleNamespace(is_mariadb=False) + + async def execute(self, clause): + self.log.append((time.monotonic() - self.t0, str(clause))) + return _Result([]) + + async def stream(self, clause): + self.log.append((time.monotonic() - self.t0, str(clause))) + set_at, sql = next((t, s) for t, s in self.log if s.startswith("SET LOCAL")) + ms = int(sql.rsplit("=", 1)[1]) + await asyncio.sleep(max(0.0, set_at + ms / 1000 - (time.monotonic() - self.t0))) + raise RuntimeError("canceling statement due to statement timeout") + + +class _SlowPool: + """取一个连接要等 wait 秒:冷启动的远程库、pool_recycle 之后重连、团队并行把池子占满。""" + + def __init__(self, wait: float) -> None: + self.wait = wait + self.log: list[tuple[float, str]] = [] + self.t0 = time.monotonic() + + @asynccontextmanager + async def connect(self): + await asyncio.sleep(self.wait) + yield _HonouringConn(self.log, self.t0) + + begin = connect + + +def _slow(monkeypatch, wait: float) -> _SlowPool: + pool = _SlowPool(wait) + + async def _get(_source): + pool.t0 = time.monotonic() + return pool + + monkeypatch.setattr(engines, "get", _get) + return pool + + +async def test_a_slow_connection_does_not_let_the_backstop_beat_the_database(monkeypatch): + """取连接花掉的时间也算在时限里:数据库拿到的是剩下的预算,于是它先停下语句、 + 报出「超过 Ns 被中断」;后端兜底只在数据层也卡住时才出面。以前兜底从取连接之前 + 算起、数据库却拿到整段时限,取连接一慢,兜底就抢在数据库前面把语句取消了—— + PG 的连接照样被占到「连上的时刻 + 时限」。""" + pool = _slow(monkeypatch, 0.7) + with pytest.raises(SqlRejected) as caught: + await run_query(_remote("postgres"), "SELECT 1", limits=QueryLimits(timeout_seconds=1)) + sent = next(int(s.rsplit("=", 1)[1]) for _t, s in pool.log if s.startswith("SET LOCAL")) + assert 0 < sent < 1000, f"数据库拿到的该是剩下的预算,实际是 {sent}ms" + assert not isinstance(caught.value.__cause__, TimeoutError), \ + "该是数据库按时限停下的那条路(deadline.stopped),不是后端兜底的 TimeoutError" + assert "查询超过 1s 被中断" in str(caught.value) + + +async def test_a_budget_spent_waiting_for_a_connection_sends_nothing(monkeypatch): + """取到连接时时限已经用完:直接按超时报,一条语句也不发给数据库。""" + pool = _slow(monkeypatch, 0.4) + with pytest.raises(SqlRejected) as caught: + await run_query(_remote("postgres"), "SELECT 1", limits=QueryLimits(timeout_seconds=0.3)) + assert pool.log == [], pool.log + assert "查询超过 0.3s 被中断" in str(caught.value) + + # -------------------------------------------------------------------------- # 接口:按源配置的时限 # -------------------------------------------------------------------------- diff --git a/backend/tests/test_runs_api.py b/backend/tests/test_runs_api.py index 96bf1750..52dbd22f 100644 --- a/backend/tests/test_runs_api.py +++ b/backend/tests/test_runs_api.py @@ -214,6 +214,19 @@ async def test_pending_approvals_carry_their_context_newest_first(client): assert a["resolved_by"] is None and a["resolved_at"] is None +async def test_a_run_without_a_workflow_is_named_by_the_glossary(client): + # 画布没保存就跑、问数据当场搭的:以前记成「临时图」,运行和审批上原样露给人看。 + # 术语表里「图」只在技术细节里出现,这里叫「未保存的工作流」 + run_id = (await client.post("/api/runs", json={ + "graph": GATED, "input": {"question": "q"}})).json()["id"] + await _wait(run_id, ("interrupted",)) + + assert (await client.get(f"/api/runs/{run_id}")).json()["workflow_name"] == "未保存的工作流" + [pending] = (await client.get("/api/approvals", params={"run_id": run_id})).json() + assert pending["workflow_id"] is None + assert pending["workflow_name"] == "未保存的工作流" + + async def test_resolution_records_who_signed_and_when(client): run_id = (await client.post("/api/runs", json={ "graph": GATED, "input": {"question": "q"}})).json()["id"] diff --git a/backend/tests/test_sandbox_errors.py b/backend/tests/test_sandbox_errors.py new file mode 100644 index 00000000..52240209 --- /dev/null +++ b/backend/tests/test_sandbox_errors.py @@ -0,0 +1,111 @@ +"""沙箱起不来时的报错:说原因,不带 Python 异常类名(SPEC §3.1)。 + +四个后端起进程、连 VM 失败时以前都写 f"{type(e).__name__}: {e}",代码节点再把它 +拼进首行,界面上的红字就成了「代码执行失败(exit=0):FileNotFoundError: [Errno 2] +No such file or directory: …」。原始异常留在日志里,排查时照样找得到。 +""" +from __future__ import annotations + +import asyncio +import re +import types + +import pytest + +from app.engine.context import NodeContext, NodeError, RunContext +from app.engine.nodes.tools import run_code +from app.engine.schema import GraphNode, GraphSpec +from app.sandbox import interpreter +from app.sandbox.bubblewrap_sandbox import BubblewrapSandbox +from app.sandbox.local_sandbox import LocalSandbox +from app.sandbox.microvm_sandbox import MicroVMSandbox +from app.sandbox.seatbelt_sandbox import SeatbeltSandbox + +_CLASS_NAME = re.compile(r"\b[A-Z]\w*(?:Error|Exception)\b") + + +def _broken_interpreter(tmp_path) -> str: + """一个存在、可执行,但 shebang 指向不存在的解释器的文件:which 找得到,exec 起不来。""" + fake = tmp_path / "python-broken" + fake.write_text("#!/nonexistent/interpreter\n") + fake.chmod(0o755) + return str(fake) + + +def test_a_code_node_whose_interpreter_cannot_start_says_why(tmp_path, monkeypatch) -> None: + import app.engine.nodes.tools as tools + + monkeypatch.setattr(interpreter, "python_argv", lambda: [_broken_interpreter(tmp_path)]) + local = LocalSandbox() + + class _Manager: + async def run(self, code, *, backend=None, **kwargs): # noqa: ANN001, ANN003, ANN201 + return await local.run(code, **kwargs) + + monkeypatch.setattr(tools, "sandbox_manager", _Manager()) + node = GraphNode(id="calc", type="code", + data={"label": "计算", "config": {"language": "python", "code": "print(1)", + "isolation": "fast"}}) + ctx = NodeContext(node=node, run=RunContext(run_id="r1", thread_id="t1", + spec=GraphSpec(nodes=[node], edges=[]))) + + with pytest.raises(NodeError) as caught: + asyncio.run(run_code({"vars": {}}, ctx)) + text = str(caught.value) + assert text.startswith("代码执行失败"), text + assert not _CLASS_NAME.search(text), text + + +async def _boom(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + raise PermissionError(13, "Permission denied", "/usr/bin/sandbox-exec") + + +@pytest.mark.parametrize("backend", [LocalSandbox, SeatbeltSandbox, BubblewrapSandbox]) +def test_a_process_that_cannot_spawn_has_no_class_name(backend, monkeypatch) -> None: + if backend is not LocalSandbox: + monkeypatch.setattr(backend, "available", staticmethod(lambda: True)) + monkeypatch.setattr(asyncio, "create_subprocess_exec", _boom) + + result = asyncio.run(backend().run("print(1)")) + assert not result.ok + assert result.error and not _CLASS_NAME.search(result.error), result.error + + +def _microvm(monkeypatch) -> MicroVMSandbox: + async def nothing(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + return None + + monkeypatch.setattr(MicroVMSandbox, "available", staticmethod(lambda: True)) + monkeypatch.setattr(MicroVMSandbox, "_reap_idle", nothing) + monkeypatch.setattr(MicroVMSandbox, "_destroy", nothing) + return MicroVMSandbox() + + +def test_a_microvm_that_cannot_boot_has_no_class_name(monkeypatch) -> None: + async def no_vm(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + raise RuntimeError("虚拟化框架拒绝了这次启动") + + vm = _microvm(monkeypatch) + monkeypatch.setattr(MicroVMSandbox, "_lease", no_vm) + result = asyncio.run(vm.run("print(1)")) + assert result.error and result.error.startswith("microVM 启动失败"), result.error + assert not _CLASS_NAME.search(result.error), result.error + + +def test_a_microvm_that_drops_mid_exec_has_no_class_name(monkeypatch) -> None: + async def write(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + return None + + async def gone(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + raise ConnectionResetError(54, "Connection reset by peer") + + lease = types.SimpleNamespace(vm=types.SimpleNamespace(fs=types.SimpleNamespace(write=write, mkdir=write), + exec=gone)) + + async def leased(*args, **kwargs): # noqa: ANN002, ANN003, ANN202 + return lease + + vm = _microvm(monkeypatch) + monkeypatch.setattr(MicroVMSandbox, "_lease", leased) + result = asyncio.run(vm.run("print(1)")) + assert result.error and not _CLASS_NAME.search(result.error), result.error diff --git a/backend/tests/test_tabular.py b/backend/tests/test_tabular.py index 29a034d5..dd381d18 100644 --- a/backend/tests/test_tabular.py +++ b/backend/tests/test_tabular.py @@ -282,3 +282,17 @@ async def test_upload_will_not_hijack_a_real_database(client): resp = await _upload(client, "tab_real", xlsx({"s": [["a"], [1]]})) assert resp.status_code == 409 assert "换个名字" in resp.json()["detail"] + + +def test_broken_excel_message_has_no_exception_class_name(): + """坏掉的 .xlsx:报错说人话,不带 Python 异常类名(BadZipFile、InvalidFileException…)。 + + 这句话原样进上传的 400 detail,界面上是红字首行。 + """ + from app.data.tabular import read_tables + + with pytest.raises(UnsupportedTable) as info: + read_tables(b"not really an xlsx", "orders.xlsx") + text = str(info.value) + assert text.startswith("这个 Excel 读不开") + assert "BadZipFile" not in text and "Error" not in text and "Exception" not in text diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 91be0f5e..0c617c95 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,4 +1,4 @@ -import { useEffect, useRef, useState, useSyncExternalStore } from 'react' +import { useEffect, useRef, useState } from 'react' import type { ReactNode, RefObject } from 'react' import { Link, NavLink, Navigate, Route, Routes, useLocation, useNavigate } from 'react-router-dom' import { Bell, BellOff, Moon, RotateCw, Sun, UserRound } from 'lucide-react' @@ -33,6 +33,8 @@ import { } from './lib/notify' import type { Attention, FaviconDot } from './lib/notify' import { useLeaveBlocker } from './lib/leave' +import { useLocalActor } from './lib/actor' +import { runName } from './lib/terms' export default function App() { const loaded = useCatalog((s) => s.loaded) @@ -383,27 +385,10 @@ function ThemeToggle() { ) } -const ACTOR_KEY = 'agentlab_actor' - -function readActor(): string { - try { - return localStorage.getItem(ACTOR_KEY)?.trim() ?? '' - } catch { - return '' - } -} - -function subscribeActor(cb: () => void): () => void { - // 设置页在同一个标签页里改署名不会触发 storage 事件;它若派发 agentlab:actor - // 就立刻跟上,否则下一次导航重绘时也会重新读到 - const events = ['storage', 'agentlab:actor', 'focus'] - events.forEach((e) => window.addEventListener(e, cb)) - return () => events.forEach((e) => window.removeEventListener(e, cb)) -} - /** 操作者署名的首字:发布、审批、正式运行都记在这个名下,得一直看得见是谁 */ function ActorButton() { - const actor = useSyncExternalStore(subscribeActor, readActor, () => '') + const actor = useLocalActor() + // 兜底:绕开 setLocalActor 直接写 localStorage 的地方不会通知,导航重绘时也重读一次 useLocation() const initial = actor ? Array.from(actor)[0].toUpperCase() : '' return ( @@ -605,6 +590,7 @@ function TelemetryPanel({ onClose, anchor, stalled }: { const secs = down && retryAt ? Math.max(0, Math.ceil((retryAt - now) / 1000)) : null const retry = async () => { + if (busy) return setBusy(true) try { const ok = await useCatalog.getState().checkBackend() @@ -676,7 +662,10 @@ function TelemetryPanel({ onClose, anchor, stalled }: { )}
-
@@ -905,8 +894,8 @@ function watchStudio(go: Go): () => void { } const w = watch watch = null - if (!w || w.runId !== id || s.trace.lastReplay || Date.now() - w.since < MIN_LIVE_MS) return - const name = s.workflow?.name || s.run?.workflow_name || '工作流' + if (!w || w.runId !== id || s.trace?.lastReplay || Date.now() - w.since < MIN_LIVE_MS) return + const name = s.workflow?.name || (s.run?.workflow_name && runName(s.run)) || '工作流' // 人多半还停在这张画布上:点通知回来就行,不跳走 const here = s.workflow && window.location.pathname.startsWith(`/studio/${s.workflow.id}`) const to = here ? null : `/runs/${id}` @@ -980,7 +969,7 @@ function watchApprovals(go: Go): () => void { for (const a of fresh) { notifyInBackground({ title: `新的待审批:${a.title || '有一步在等你处理'}`, - body: [a.workflow_name, a.node_label].filter(Boolean).join(' · ') || undefined, + body: [a.workflow_name && runName(a), a.node_label].filter(Boolean).join(' · ') || undefined, tag: `approval:${a.id}`, onClick: () => go(`/runs/${a.run_id}`), }) diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index 05f5b776..a21ec818 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -1,8 +1,9 @@ import type { - Approval, Conversation, ConversationDetail, ConversationTurn, GraphSpec, + Approval, Conversation, ConversationDetail, ConversationTurn, CustomTool, DataSource, GraphSpec, KbDocument, MemoryItem, Provider, ReviewResult, Run, RunEvent, RunStatus, Skill, ToolChange, ToolInfo, ValidationIssue, VarIssue, Variable, Workflow, WorkflowVersion, } from '../types' +import { localActor } from '../lib/actor' const BASE = '/api' @@ -22,11 +23,16 @@ export class ApiError extends Error { raw?: string /** 超时断开时等了多久 */ timeoutMs?: number + /** + * 后端的机读码(app/api/coded.py 的 {detail, code},比如 datasource_scope_empty)。 + * detail 是给人看的话,随时可能改写;要按错误种类分支的认这个 + */ + code?: string constructor( public status: number, message: string, - opts?: { kind?: ApiErrorKind; detail?: unknown; raw?: string; timeoutMs?: number }, + opts?: { kind?: ApiErrorKind; detail?: unknown; raw?: string; timeoutMs?: number; code?: string }, ) { super(message) this.name = 'ApiError' @@ -34,6 +40,7 @@ export class ApiError extends Error { this.detail = opts?.detail this.raw = opts?.raw this.timeoutMs = opts?.timeoutMs + this.code = opts?.code } } @@ -56,14 +63,10 @@ function report(reachable: boolean, error?: ApiError) { } function actorHeader(): Record { - try { - const actor = localStorage.getItem('agentlab_actor') - // 请求头只能是 Latin-1:中文署名原样放进去,fetch 直接抛错、整个请求发不出去。 - // 后端 runs.actor_of 解码,纯 ASCII 的老署名编码前后一样 - return actor ? { 'X-Actor': encodeURIComponent(actor) } : {} - } catch { - return {} - } + const actor = localActor() + // 请求头只能是 Latin-1:中文署名原样放进去,fetch 直接抛错、整个请求发不出去。 + // 后端 runs.actor_of 解码,纯 ASCII 的老署名编码前后一样 + return actor ? { 'X-Actor': encodeURIComponent(actor) } : {} } /** FastAPI 的 422 是 [{loc, msg, type}] 数组,直接 String() 会变成 [object Object] */ @@ -135,6 +138,12 @@ async function request(path: string, init?: RequestInit & { timeoutMs?: numbe return res.json() } +/** 后端 {detail, code} 里的机读码;没有就是 undefined */ +const codeOf = (body: unknown): string | undefined => { + const code = body && typeof body === 'object' ? (body as { code?: unknown }).code : undefined + return typeof code === 'string' && code ? code : undefined +} + /** 非 2xx 的响应 → ApiError,顺带报告连接状态。fetch 和 XHR 两条路共用 */ function failure(status: number, statusText: string, text: string): ApiError { let body: any @@ -152,6 +161,7 @@ function failure(status: number, statusText: string, text: string): ApiError { const detail = body?.detail ?? body return new ApiError(status, describeDetail(detail), { detail, raw: typeof body?.raw === 'string' ? body.raw : `${status} ${text.slice(0, 2000)}`, + code: codeOf(body), }) } const message = status >= 500 @@ -296,7 +306,8 @@ export interface TableSchema { table: string /** 给模型看的那段文本 */ detail: string - found: boolean + /** 缓存里找没找到这张表。老后端没有这个字段:只有明确的 false 才算找不到 */ + found?: boolean qualified: string | null kind: 'table' | 'view' | null comment: string | null @@ -418,7 +429,7 @@ export const api = { // ---- 运行 ---- datasources: { - list: () => get('/datasources'), + list: (opts?: RequestOptions) => get('/datasources', opts), kinds: () => get('/datasources/kinds'), create: (body: any) => post('/datasources', body), update: (id: string, body: any) => patch(`/datasources/${id}`, body), @@ -528,9 +539,11 @@ export const api = { post(`/tools/${name}/run`, opts?.confirm ? { args, confirm: true } : { args }), }, customTools: { - list: () => get('/custom-tools'), - create: (body: any) => post('/custom-tools', body), - update: (id: string, body: any) => patch(`/custom-tools/${id}`, body), + /** 每行带 problem:库里存着的参数定义写坏了时是一句中文,绑了它的节点一定失败 */ + list: () => get('/custom-tools'), + /** 参数定义写坏了回 422,detail 是一句中文(ApiError.message),显示在参数字段下面 */ + create: (body: any) => post('/custom-tools', body), + update: (id: string, body: any) => patch(`/custom-tools/${id}`, body), remove: (id: string) => del(`/custom-tools/${id}`), test: (id: string, args: Record) => post(`/custom-tools/${id}/test`, { args }), /** 试跑一份还没保存的配置,不落库。失败时回 {ok:false, error, hint, detail, duration_ms} */ @@ -658,9 +671,12 @@ export const api = { // ---- 会话 ---- conversations: { - list: (kind: 'chat' | 'canvas' = 'chat', workflowId?: string) => + /** includeArchived:连回收站里的一起取(每行的 archived 区分),回收站视图要它 */ + list: (kind: 'chat' | 'canvas' = 'chat', workflowId?: string, opts?: { includeArchived?: boolean }) => get( - `/conversations?kind=${kind}` + (workflowId ? `&workflow_id=${workflowId}` : '')), + `/conversations?kind=${kind}` + + (workflowId ? `&workflow_id=${encodeURIComponent(workflowId)}` : '') + + (opts?.includeArchived ? '&include_archived=true' : '')), create: (body: { kind?: 'chat' | 'canvas'; workflow_id?: string; title?: string }) => post('/conversations', body), get: (id: string) => get(`/conversations/${id}`), @@ -722,7 +738,8 @@ export function streamCopilot( }, // final 操作里带 tool_changes(ToolChange[]):改图回执要显式列出工具绑定的变化 onOp: (op: any) => void, - onEnd: (error?: string) => void, + // 开流之前就被拒(4xx/5xx)时第二个参数带状态码和后端的机读码({detail, code}),调用方按码分支 + onEnd: (error?: string, info?: { status?: number; code?: string }) => void, ): () => void { const controller = new AbortController() void (async () => { @@ -746,7 +763,7 @@ export function streamCopilot( report(true) onEnd(isJson ? describeDetail(body?.detail ?? body) : res.status >= 500 ? `后端出错了(${res.status}),详情看服务日志` - : `请求没有成功(${res.status} ${res.statusText})`) + : `请求没有成功(${res.status} ${res.statusText})`, { status: res.status, code: isJson ? codeOf(body) : undefined }) return } report(true) diff --git a/frontend/src/canvas/FlowCanvas.tsx b/frontend/src/canvas/FlowCanvas.tsx index aa3f9bfe..56c1ce8b 100644 --- a/frontend/src/canvas/FlowCanvas.tsx +++ b/frontend/src/canvas/FlowCanvas.tsx @@ -451,7 +451,8 @@ function CanvasInner() { let seq = 0 let timer: ReturnType | null = null const unsub = useStudio.subscribe((s, prev) => { - if (s.runPhase === prev.runPhase || s.trace.lastReplay || s.replayAt != null) return + // trace 可能被脚本、热更新短暂置空:订阅回调在 setState 里抛,崩的是调用 setState 的那一方 + if (s.runPhase === prev.runPhase || s.trace?.lastReplay || s.replayAt != null) return let kind: 'start' | 'success' | 'failed' | null = null if ((prev.runPhase === 'idle' || prev.runPhase === 'queued') && s.runPhase === 'running') { // 大图的开场点亮会变成一场烟花,跳过 @@ -463,7 +464,7 @@ function CanvasInner() { if (!kind || now - last < 1000) return last = now seq += 1 - const failedId = s.trace.failedNodeId + const failedId = s.trace?.failedNodeId const origin = kind === 'failed' && failedId ? topology({ nodes: s.nodes, edges: s.edges }).rank[failedId] ?? 0 : 0 setMoment({ kind, seq, origin }) if (timer) clearTimeout(timer) @@ -720,9 +721,9 @@ function CanvasInner() { let raf = 0 let pending: string[] = [] const unsub = useStudio.subscribe((s, prev) => { - if (s.trace === prev.trace || !s.follow || s.replayAt != null || s.trace.lastReplay) return + if (s.trace === prev.trace || !s.trace || !s.follow || s.replayAt != null || s.trace.lastReplay) return for (const [id, n] of Object.entries(s.trace.nodes)) { - if (n.state === 'running' && !n.looping && n.count > (prev.trace.nodes[id]?.count ?? 0)) pending.push(id) + if (n.state === 'running' && !n.looping && n.count > (prev.trace?.nodes[id]?.count ?? 0)) pending.push(id) } if (!pending.length || raf) return raf = requestAnimationFrame(() => { @@ -821,7 +822,7 @@ function CanvasInner() { return } if (useStudio.getState().copilot.active) { - toast.info('助手正在改这张图,等这一轮结束再加节点') + toast.info('助手正在改画布,等这一轮结束再加节点') return } const r = box.current?.getBoundingClientRect() @@ -885,8 +886,10 @@ function CanvasInner() { openInspector(node.id) return } - actions.select(node.id) + // 先请右栏滚过去、再选中:右栏接手时会先收起盖在它上面的属性面板(select(null)), + // 顺序反过来的话刚点的这个节点就被取消选中,「…的配置」入口也跟着没了 revealStep(node.id) + actions.select(node.id) }} onNodeDoubleClick={(_, node) => openInspector(node.id)} onPaneClick={() => actions.select(null)} diff --git a/frontend/src/canvas/Inspector.tsx b/frontend/src/canvas/Inspector.tsx index e100a4b8..b8e27d7b 100644 --- a/frontend/src/canvas/Inspector.tsx +++ b/frontend/src/canvas/Inspector.tsx @@ -7,7 +7,7 @@ import { fieldOfIssue, unboundToolOf, withToolBound, type FieldRef } from './iss import { hintOf } from './shortcuts' import { isActivePhase } from '../run/trace' import { EDIT_LOCK_TEXT, useEditLock, useStudio } from '../store/studio' -import { useCatalog, modelOptions } from '../store/catalog' +import { datasourceTools, modelOptions, useCatalog, useDatasources } from '../store/catalog' import { api } from '../api/client' import { IconButton, JsonInput, Modal, isComposing } from '../components/ui' import { formatShortcut } from '../lib/keys' @@ -19,68 +19,88 @@ type FieldIssue = ValidationIssue & { at: FieldRef | null } /** * 运行默认值(设置 · 运行默认值)。检查器里「留空 = 跟随默认」的字段要把实际会用 - * 哪个写出来,否则「留空」是个黑箱。整个会话取一次就够:这两项很少改 + * 哪个写出来,否则「留空」是个黑箱。整个会话取一次就够:这两项很少改。 + * 只有用得上的字段(记忆范围、知识库)才取:取回来时每个订阅的字段都要重渲染一次, + * 取回来之后再挂上的直接用缓存 */ -let runDefaults: Promise<{ default_collection?: string; default_memory_scope?: string }> | null = null -function useRunDefaults() { - const [value, setValue] = useState<{ default_collection?: string; default_memory_scope?: string }>({}) +type RunDefaults = { default_collection?: string; default_memory_scope?: string } +let runDefaults: Promise | null = null +let runDefaultsValue: RunDefaults | null = null +function useRunDefaults(active: boolean): RunDefaults { + const [value, setValue] = useState(() => runDefaultsValue ?? {}) useEffect(() => { - runDefaults ??= api.settings.get().then((s) => s?.run ?? {}).catch(() => { + if (!active || runDefaultsValue) return + runDefaults ??= api.settings.get().then((s) => (runDefaultsValue = s?.run ?? {})).catch(() => { runDefaults = null // 这次没取到,下次打开再试 return {} }) let alive = true void runDefaults.then((v) => { if (alive) setValue(v) }) return () => { alive = false } - }, []) - return value + }, [active]) + return runDefaultsValue ?? value } interface ToolOption { value: string; label: string; hint?: string; danger?: boolean; group?: string } /** - * 数据源的查询工具(db_query__<源> / db_schema__<源>)。/tools 的列表只有内置、自定义和 MCP, - * 以前检查器里挑不到它们:校验说「提示词要求用 db_query__x,把它加进工具里」,界面上却做不到。 - * 30 秒内复用上一次的结果:每点一个节点都去问一遍没必要,可刚在数据页加的源也不能一直看不见 + * 节点能绑的全部工具:目录里的,加上数据源的查询工具(db_query__<源> / db_schema__<源>)。 + * 后者不在 /tools 里,以前检查器里挑不到它们:校验说「提示词要求用 db_query__x,把它加进 + * 工具里」,界面上却做不到。数据源读 catalog 的那一份(问数据页、助手用的也是它), + * 只有挂着工具选择器的地方订阅——别的字段不跟着目录重渲染 */ -let sourceTools: { at: number; list: Promise } | null = null -function useSourceTools(): ToolOption[] { - const [value, setValue] = useState([]) - useEffect(() => { - if (!sourceTools || Date.now() - sourceTools.at > 30_000) { - sourceTools = { - at: Date.now(), - list: api.datasources.list().then((rows) => rows - .filter((r) => r && r.enabled !== false) - .flatMap((r) => (Array.isArray(r.tools) ? r.tools as string[] : []).map((t) => ({ - value: t, label: t, group: '数据源', - hint: `${t.startsWith('db_schema__') ? '查表结构' : '执行 SQL'} · 数据源「${r.name}」`, - // 可写的源上,写语句要人确认(运行时的审批关卡认它) - danger: t.startsWith('db_query__') && r.readonly === false, - })))) - .catch(() => { sourceTools = null; return [] }), - } - } - let alive = true - void sourceTools?.list.then((v) => { if (alive) setValue(v) }) - return () => { alive = false } - }, []) - return value -} - -/** 节点能绑的全部工具:目录里的,加上数据源的 */ function useToolOptions(): ToolOption[] { const tools = useCatalog((s) => s.tools) - const sources = useSourceTools() + // 超过 30 秒没取过时挂上就后台重拉一次:刚在数据页加的源不能一直看不见 + const { list: sources } = useDatasources() return useMemo(() => { const known = new Set(tools.map((t) => t.id)) + const fromSources: ToolOption[] = sources + .filter((r) => r.enabled !== false) + .flatMap((r) => datasourceTools(r).map((t) => ({ + value: t, label: t, group: '数据源', + hint: `${t.startsWith('db_schema__') ? '查表结构' : '执行 SQL'} · 数据源「${r.name}」`, + // 可写的源上,写语句要人确认(运行时的审批关卡认它) + danger: t.startsWith('db_query__') && r.readonly === false, + }))) return [ ...tools.map((t) => ({ value: t.id, label: t.name, hint: t.description, danger: t.dangerous, group: t.category })), - ...sources.filter((o) => !known.has(o.value)), + ...fromSources.filter((o) => !known.has(o.value)), ] }, [tools, sources]) } +/** + * 工具字段。单独一个组件:只有它订阅工具目录和数据源,别的字段(提示词、模型、条件……) + * 不因为目录刷新、数据源取回来而跟着重渲染 + */ +function ToolsInput({ id, single, value, invalid, aria, onChange }: { + id: string; single: boolean; value: any; invalid: boolean + aria: { 'aria-invalid'?: boolean; 'aria-describedby'?: string }; onChange: (v: any) => void +}) { + const options = useToolOptions() + if (single) { + return ( + + ) + } + return +} + +/** 不需要某张目录表的字段拿到的都是这一个空数组:选择器结果不变,就不重渲染 */ +const NO_ROWS: never[] = [] + /** 属性面板。所有字段都由 nodeDefs 的声明驱动渲染,加节点类型不用改这里。 */ export function Inspector() { const selectedId = useStudio((s) => s.selectedId) @@ -363,9 +383,12 @@ function FieldInput({ field, id, nodeId, syntax, value, config, invalid, describ config: Record; invalid: boolean; describedBy?: string issues: FieldIssue[]; onChange: (v: any) => void }) { - const catalog = useCatalog() - const defaults = useRunDefaults() - const toolOptions = useToolOptions() + // 目录只按这个字段用得上的那一张订阅。以前每个字段都订阅整个 catalog:连接心跳、 + // 待审批轮询每跳一次,检查器里十几个字段全跟着重渲染 + const providers = useCatalog((s) => (field.type === 'model' ? s.providers : NO_ROWS)) + const collections = useCatalog((s) => (field.type === 'collection' ? s.collections : NO_ROWS)) + const skills = useCatalog((s) => (field.type === 'skills' ? s.skills : NO_ROWS)) + const defaults = useRunDefaults(field.key === 'scope' || field.type === 'collection') const aria = { 'aria-invalid': invalid || undefined, 'aria-describedby': describedBy } switch (field.type) { @@ -444,7 +467,7 @@ function FieldInput({ field, id, nodeId, syntax, value, config, invalid, describ : case 'model': { - const options = modelOptions(catalog.providers) + const options = modelOptions(providers) const groups = [...new Set(options.map((o) => o.group))] return ( onChange(e.target.value)}> - - {[...new Set(options.map((o) => o.group))].map((g) => ( - - {options.filter((o) => o.group === g).map((o) => ( - - ))} - - ))} - - ) - } - return ( - - ) - } + return case 'ioFields': return @@ -653,7 +656,8 @@ function MultiPick({ options, value, onChange, empty }: { })} {!value.length && 未选择} - {open && ( @@ -709,11 +713,13 @@ function Row({ children, onRemove, removeLabel, tone, item }: { } /** 行内的小标签:填满之后还分得清哪个框是什么 */ -function Sub({ label, htmlFor, children, syntax, className }: { +function Sub({ label, htmlFor, children, syntax, className, sub }: { label: string; htmlFor: string; children: React.ReactNode; syntax?: FieldSyntax; className?: string + /** 这一栏在项里的键(condition、value…):定位按 [data-item] [data-sub] 落到这儿、光标放进来 */ + sub?: string }) { return ( -
+
{syntax && } @@ -740,20 +746,20 @@ function IoFieldList({ nodeId, value, issues, onChange }: { x.level === 'error') ? 'error' : own.length ? 'warning' : undefined} onRemove={() => onChange(value.filter((_, idx) => idx !== i))}> - + update(i, { name: e.target.value })} /> {isOutput ? ( // 成果字段是写 {{ }} 最多的地方,以前却是普通输入框,敲 {{ 没有任何弹出 - + update(i, { value: v })} /> ) : ( <> - + update(i, { description: e.target.value })} /> @@ -763,7 +769,7 @@ function IoFieldList({ nodeId, value, issues, onChange }: { onChange={(e) => update(i, { required: e.target.checked })} /> 必填 - + update(i, { default: e.target.value })} /> @@ -862,7 +868,7 @@ function CaseList({ nodeId, mode, value, issues, onChange }: { onChange(value.filter((_, idx) => idx !== i))}>
- + - + update(i, { label: e.target.value })} /> @@ -899,7 +905,7 @@ function CaseList({ nodeId, mode, value, issues, onChange }: { )} {/* 让模型分类时条件不参与判断,别让人以为要填 */} {!byModel && ( - + update(i, { condition: v })} /> @@ -936,20 +942,20 @@ function MetricList({ nodeId, value, issues, onChange }: { tone={own.some((x) => x.level === 'error') ? 'error' : own.length ? 'warning' : undefined} onRemove={() => onChange(value.filter((_, idx) => idx !== i))}>
- + update(i, { id: e.target.value })} /> - + update(i, { name: e.target.value })} /> - + update(i, { unit: e.target.value })} />
- + update(i, { expression: v })} /> @@ -993,17 +999,17 @@ function AgentList({ value, issues, config, onChange }: { tone={own.some((x) => x.level === 'error') ? 'error' : own.length ? 'warning' : undefined} onRemove={() => onChange(value.filter((_, idx) => idx !== i))}>
- + update(i, { name: e.target.value })} /> - + update(i, { max_steps: e.target.value === '' ? undefined : Number(e.target.value) })} />
- + update(i, { description: e.target.value })} /> diff --git a/frontend/src/canvas/InspectorSheet.tsx b/frontend/src/canvas/InspectorSheet.tsx index db70c9d0..c0ac50b0 100644 --- a/frontend/src/canvas/InspectorSheet.tsx +++ b/frontend/src/canvas/InspectorSheet.tsx @@ -4,12 +4,13 @@ import clsx from 'clsx' import { create } from 'zustand' import { useStudio } from '../store/studio' import { StatusBadge } from '../components/ui' -import { formatClock } from '../lib/format' +import { formatOffset } from '../lib/format' import { isTypingTarget } from '../lib/keys' import { statusMeta } from '../lib/status' import { useRunGlance } from '../run/RunHud' import { isActivePhase } from '../run/trace' import { Inspector } from './Inspector' +import { parseFieldPath, type FieldRef } from './issues' type StudioSnapshot = ReturnType @@ -25,7 +26,7 @@ export const useSheet = create<{ open: string | null }>(() => ({ open: null })) */ export function stepsFirst(id: string, s: StudioSnapshot = useStudio.getState()): boolean { if (!isActivePhase(s.runPhase) && s.replayAt == null) return false - const n = s.trace.nodes[id] + const n = s.trace?.nodes[id] return !!n && (n.count > 0 || n.state !== 'idle') } @@ -36,6 +37,48 @@ export function openInspector(id: string): void { useStudio.getState().select(id) } +/** + * 光标落到哪:先找能填的——输入框、下拉,或控件自己点名的入口(data-reveal-focus,比如工具 + * 多选的「添加」)——按文档顺序取第一个;一个都没有才退到按钮,而且不落在「移除」「删除」上。 + * 从「工具被去掉了」点定位过来的人是要把工具加回去的:光标停在已绑工具芯片的 × 上, + * 顺手一个回车又解绑一个 + */ +const FILLABLE = '[data-reveal-focus]:not([disabled]), input:not([type="hidden"]):not([disabled]):not([tabindex="-1"]), textarea:not([disabled]), select:not([disabled])' +const PRESSABLE = 'button:not([disabled]):not([aria-label^="移除"]):not([aria-label^="删除"])' + +/** + * 落到检查器里的某一栏:选中节点、画布取景、打开属性面板、滚到那一栏;focus 时把光标放进去。 + * 问题面板的定位、助手自查问题的「定位」都走这里——只选中节点的话,人还得在十几个字段里 + * 自己找是第几个分支的条件、哪个成员的工具。 + * + * field 是后端给的路径('cases[1].condition'、'agents[0].tools')或解析好的 FieldRef。 + * 能落到第几项、项里的哪一栏就落到那儿,落不到就退一层;认不出来(老后端没给 field) + * 就只选中、取景,不乱抢焦点。运行中也打开面板:要改的就是那一栏 + */ +export function revealField(nodeId: string, field?: FieldRef | string | null, opts: { focus?: boolean } = {}): void { + const s = useStudio.getState() + if (!s.nodes.some((n) => n.id === nodeId)) return + openInspector(nodeId) + s.focusNode(nodeId) + const at = typeof field === 'string' ? parseFieldPath(field) : field ?? null + if (!at) return + // 面板跟着选中挂上:等它渲染出来再找 + requestAnimationFrame(() => requestAnimationFrame(() => { + const sheet = document.querySelector('[data-inspector-sheet]') ?? document + const box = sheet.querySelector(`[data-field="${CSS.escape(at.key)}"]`) + const item = at.index != null ? box?.querySelector(`[data-item="${at.index}"]`) : null + const part = at.sub ? item?.querySelector(`[data-sub="${CSS.escape(at.sub)}"]`) : null + const target = part ?? item ?? box + if (!target) return + const still = window.matchMedia('(prefers-reduced-motion: reduce)').matches + target.scrollIntoView({ block: 'center', behavior: still ? 'auto' : 'smooth' }) + if (opts.focus) { + const to = target.querySelector(FILLABLE) ?? target.querySelector(PRESSABLE) + to?.focus({ preventScroll: true }) + } + })) +} + // 选中 → 面板开不开。放在模块级:选中可能来自别处(问题面板定位、发布弹窗、快捷键), // 规则只写这一份 useStudio.subscribe((s, prev) => { @@ -132,7 +175,7 @@ function LiveStripBody({ onBack }: { onBack: () => void }) { {g.label} {g.headline} {isActivePhase(g.phase) && ( - {formatClock(g.elapsedMs)} + {formatOffset(g.elapsedMs)} )} diff --git a/frontend/src/canvas/NodeCard.tsx b/frontend/src/canvas/NodeCard.tsx index 654ef42c..3f7f6505 100644 --- a/frontend/src/canvas/NodeCard.tsx +++ b/frontend/src/canvas/NodeCard.tsx @@ -13,7 +13,7 @@ import { edgeKey, topology } from '../run/derive' import { api } from '../api/client' import { isComposing, StatusBadge, toast } from '../components/ui' import { explainRunError } from '../lib/explain' -import { formatClock, formatDuration, formatNumber, formatTokens, NONE } from '../lib/format' +import { formatDuration, formatLapse, formatNumber, formatTokens, NONE } from '../lib/format' import { statusMeta } from '../lib/status' import { issuanceLabel, RUN_CLASS_LABEL } from '../lib/terms' import { ApprovalCard } from '../run/RunPanel' @@ -520,7 +520,7 @@ function readingOf({ state, view, type, config, skewMs, timed, fanIn, facts, sin return { main: loop('stopped'), side: {formatDuration(timed ? loopSpan(n, at) : undefined)} } } return { - main: n?.startedAt != null && n.endedAt != null && timed ? `停在 ${formatClock(n.endedAt - n.startedAt)}` : '', + main: n?.startedAt != null && n.endedAt != null && timed ? `停在 ${formatLapse(n.endedAt - n.startedAt)}` : '', note: n?.count ? '' : '没有开始', } case 'suspended': diff --git a/frontend/src/canvas/Palette.tsx b/frontend/src/canvas/Palette.tsx index 2a3c2174..05f50288 100644 --- a/frontend/src/canvas/Palette.tsx +++ b/frontend/src/canvas/Palette.tsx @@ -1,11 +1,11 @@ -import { useState } from 'react' +import { useId, useState } from 'react' import { createPortal } from 'react-dom' import { Lock, PanelLeftClose, PanelLeftOpen } from 'lucide-react' import clsx from 'clsx' import { NODE_CATEGORIES, NODE_DEFS, type NodeDef } from './nodeDefs' import { hintOf } from './shortcuts' import { EDIT_LOCK_TEXT, useEditLock, useStudio } from '../store/studio' -import { IconButton } from '../components/ui' +import { IconButton, toast } from '../components/ui' import type { NodeType } from '../types' /** 节点库搜索框的 id:「/」要把焦点送过来 */ @@ -28,8 +28,18 @@ export function Palette({ collapsed, onToggle }: { collapsed: boolean; onToggle: // 助手在改、正式运行在跑:点了、拖了都落不下来,整块置灰并说清为什么 const lock = useEditLock() const locked = lock != null + const noteId = useId() + // 锁着时卡片照样能 Tab 到、能按:按了说为什么没放上。以前整块 pointer-events:none, + // aria-disabled 挂在外层 div 上读屏听不到,键盘用户按了回车什么都没发生、也没人告诉他 + const add = (type: NodeType) => { + if (lock) { + toast.warn(EDIT_LOCK_TEXT[lock], { key: 'studio:readonly' }) + return + } + addNode(type) + } - if (collapsed) return addNode(t)} lock={lock} /> + if (collapsed) return const q = query.trim().toLowerCase() const defs = Object.values(NODE_DEFS).filter( @@ -42,14 +52,16 @@ export function Palette({ collapsed, onToggle }: { collapsed: boolean; onToggle: setQuery(e.target.value)} onKeyDown={(e) => { - // 回车直接加第一个:搜索 → 添加一气呵成,不用再去点 - if (e.key === 'Enter' && defs[0] && !locked && !e.nativeEvent.isComposing) { + // 回车直接加第一个:搜索 → 添加一气呵成,不用再去点。锁着时一样说为什么 + if (e.key === 'Enter' && defs[0] && !e.nativeEvent.isComposing) { e.preventDefault() - addNode(defs[0].type as NodeType) + add(defs[0].type as NodeType) } else if (e.key === 'Escape') { setQuery('') ;(e.target as HTMLInputElement).blur() @@ -59,8 +71,7 @@ export function Palette({ collapsed, onToggle }: { collapsed: boolean; onToggle: } />
-
+
{NODE_CATEGORIES.map((category) => { const items = defs.filter((d) => d.category === category) if (!items.length) return null @@ -74,14 +85,19 @@ export function Palette({ collapsed, onToggle }: { collapsed: boolean; onToggle: @@ -185,7 +204,14 @@ function Rail({ onToggle, onAdd, lock }: {
{tip.def.label}
{tip.def.description}
-
点一下放在视野中间 · 或拖到画布上
+ {lock ? ( +
+ + {EDIT_LOCK_TEXT[lock]} +
+ ) : ( +
点一下放在视野中间 · 或拖到画布上
+ )}
, document.body, diff --git a/frontend/src/canvas/PublishDialog.tsx b/frontend/src/canvas/PublishDialog.tsx index b82ac871..68cf0132 100644 --- a/frontend/src/canvas/PublishDialog.tsx +++ b/frontend/src/canvas/PublishDialog.tsx @@ -6,6 +6,7 @@ import { api } from '../api/client' import { diffGraphs, toFlow, useStudio, type GraphDiff } from '../store/studio' import { Modal, Spinner, toast } from '../components/ui' import { WORKFLOW_STATUS_HINT } from '../lib/terms' +import { setLocalActor, useLocalActor } from '../lib/actor' import type { Workflow } from '../types' type Level = 'published' | 'governed' @@ -16,12 +17,6 @@ const LEVEL_DETAIL: Record = { + '至少一个「成果」节点声明出具契约;Agent 的危险工具至少要人工审批', } -/** 署名只存在这台浏览器里(和请求头 X-Actor 是同一份) */ -const ACTOR_KEY = 'agentlab_actor' -const readActor = () => { - try { return localStorage.getItem(ACTOR_KEY)?.trim() ?? '' } catch { return '' } -} - /** * 发布弹窗。 * @@ -41,7 +36,11 @@ export function PublishDialog({ workflow, onClose, onDone, onLocate }: { const [level, setLevel] = useState(workflow.status === 'governed' ? 'governed' : 'published') const [busy, setBusy] = useState(false) const [issues, setIssues] = useState(null) - const [actor, setActor] = useState(readActor) + // 署名只存在这台浏览器里(和请求头 X-Actor 是同一份,见 lib/actor)。存不进去(隐私模式) + // 时这一次弹窗里先记着,照样写得进发布提示 + const stored = useLocalActor() + const [unsaved, setUnsaved] = useState(null) + const actor = stored ?? unsaved ?? '' const [signing, setSigning] = useState('') const [delta, setDelta] = useState(null) const published = workflow.published_version @@ -61,8 +60,8 @@ export function PublishDialog({ workflow, onClose, onDone, onLocate }: { const sign = () => { const name = signing.trim() if (!name) return - try { localStorage.setItem(ACTOR_KEY, name) } catch { /* 隐私模式:只这一次有效 */ } - setActor(name) + // 写完会广播:导航底部的首字、别处的署名跟着变,不用等下一次获得焦点 + if (!setLocalActor(name)) setUnsaved(name) } const publish = async () => { diff --git a/frontend/src/canvas/RunTimeline.tsx b/frontend/src/canvas/RunTimeline.tsx index fba1c7ad..1c29415e 100644 --- a/frontend/src/canvas/RunTimeline.tsx +++ b/frontend/src/canvas/RunTimeline.tsx @@ -3,7 +3,7 @@ import { ChevronDown, ChevronUp, FoldHorizontal, Pause, Play, Radio } from 'luci import clsx from 'clsx' import { create } from 'zustand' import { StatusBadge } from '../components/ui' -import { formatClock, formatDuration, formatTokens, NONE } from '../lib/format' +import { formatClock, formatDuration, formatLapse, formatOffset, formatSpan, formatTokens, NONE } from '../lib/format' import { statusMeta } from '../lib/status' import { topology, type GraphLike } from '../run/derive' import { @@ -58,19 +58,28 @@ export interface RunTimelineProps { className?: string } +// 排版尺寸。导出的几个是给坞分高度的人用的(记录页的航迹页签):照抄的话这边一改, +// 两边就对不上——泳道被裁掉半行,或者底下空出一截 const COLLAPSED = 30 -const MIN_H = 132 +/** 坞能拖到的最矮:刻度行和整次运行那一条还在,泳道在坞里滚 */ +export const MIN_H = 132 +/** 坞头(航迹 · 实时/回放 · 播放……那一行) */ +export const DOCK_HEAD_H = 34 const LABEL_W = 136 const SUM_W = 116 -const ROW_H = 22 -const SUB_H = 18 +/** 一个节点一条泳道 */ +export const ROW_H = 22 +/** 协作团队展开的子泳道:调度者一条,每个成员一条 */ +export const SUB_H = 18 const AXIS_H = 22 /** 游标头在刻度行里占 2–20px */ const CURSOR_TOP = 20 const PAR_H = 26 const RUN_H = 22 /** 吸顶的三行(刻度、并行度、运行本身)一共多高:泳道从它下面开始 */ -const HEAD_H = AXIS_H + PAR_H + RUN_H +export const STICKY_H = AXIS_H + PAR_H + RUN_H +/** .tl 的上边框(surface.css)。坞的 height 按 border-box 算,这 1px 占的是泳道的地方 */ +export const DOCK_BORDER_H = 1 const FOLD_MIN_MS = 120_000 const FOLD_PX = 48 /** 超过这么多泳道只画看得见的那些 */ @@ -136,37 +145,49 @@ interface Scale { ticks: { t: number; x: number; label: string }[] } +const HOUR = 3_600_000 +const DAY = 86_400_000 +// 挂了几天的运行不压缩空档时,最粗也得排得下:以前止于 2 小时一格,九天的轴上 +// 刻度一格几像素,200 个数字叠成一团 const STEPS = [100, 200, 500, 1000, 2000, 5000, 10_000, 15_000, 30_000, 60_000, 120_000, 300_000, - 600_000, 900_000, 1_800_000, 3_600_000, 7_200_000] + 600_000, 900_000, 1_800_000, HOUR, 2 * HOUR, 6 * HOUR, 12 * HOUR, DAY, 2 * DAY, 7 * DAY] const pad2 = (n: number) => String(n).padStart(2, '0') -/** 刻度上的相对时刻:「00:05」「1:02:00」,步长不到一秒时带十分位 */ +/** + * 刻度上的相对时刻:「00:05」「1:02:00」,步长不到一秒时带十分位。过了一天写 + * 「9 天」「9 天 06:00」,和游标读数(formatOffset)同一种写法 + */ function relLabel(ms: number, fine: boolean): string { if (fine) return formatClock(ms) const s = Math.round(ms / 1000) const h = Math.floor(s / 3600) const m = Math.floor(s / 60) % 60 + if (ms >= DAY) { + const d = Math.floor(s / 86_400) + return h % 24 || m ? `${d} 天 ${pad2(h % 24)}:${pad2(m)}` : `${d} 天` + } return h > 0 ? `${h}:${pad2(m)}:${pad2(s % 60)}` : `${pad2(m)}:${pad2(s % 60)}` } /** - * 窄处的时长:一分钟以内照常(「14.3 s」),以上写钟面(「1:28」「1:02:05」)。 + * 窄处的时长:一分钟以内照常(「14.3 s」),一小时以内写钟面(「1:28」),再长只写最大的 + * 单位(「3 小时」「9 天」,和记录页列表的「已等 9 天」同一种写法),完整的在 title 里。 * trunc:还在走的数和计时器一样截断——四舍五入的话同一刻这里写 3.8、计时器写 00:03.7 */ function span(ms: number, trunc = false): string { if (ms < 60_000) return trunc ? `${(Math.floor(ms / 100) / 10).toFixed(1)} s` : formatDuration(ms) + if (ms >= HOUR) return formatSpan(ms, { coarse: true }) const s = trunc ? Math.floor(ms / 1000) : Math.round(ms / 1000) - const h = Math.floor(s / 3600) - const m = Math.floor(s / 60) % 60 - return h > 0 ? `${h}:${pad2(m)}:${pad2(s % 60)}` : `${m}:${pad2(s % 60)}` + return `${Math.floor(s / 60)}:${pad2(s % 60)}` } /** - * 折叠处的小标签只有 48px:写整数分钟 / 小时,完整时长在 title 里。 + * 折叠处的小标签只有 48px:写整数分钟 / 小时 / 天,完整时长在 title 里。 * 不再两头加「⋯」——11px 下它们放不下、被截成半个,斜纹本身已经说明这里折起来了 */ function foldLabel(ms: number): string { + if (ms >= DAY) return formatSpan(ms, { coarse: true }) const m = Math.round(ms / 60_000) return m < 60 ? `${m} 分` : `${Math.floor(m / 60)} 时 ${pad2(m % 60)}` } @@ -253,7 +274,10 @@ interface Row { segs: Segment[] state: NodeState count: number + /** 右边那一列:窄,一小时以上的时长只写最大的单位 */ summary: string + /** 同一句的完整写法(「等 9 天 03 小时」):悬停和读屏用 */ + detail: string /** * 只执行过一段的节点,用后端量的耗时(事件时间戳之间还夹着转发的延迟)。 * 段上的数字和右边的摘要都用它,同一行不出现两个数 @@ -278,10 +302,17 @@ function measuredOf(n: NodeTrace | undefined, at: number): number | undefined { } /** - * 一条泳道右侧的摘要:执行了几次、一共多久、等了多久、用了多少 token。 - * tokens 回放时是游标那一刻的读数(投影给的),实时是累计 + * 摘要那一列只有 116px:一小时以上的时长只写最大的单位(「等 9 天」「3 小时」), + * 「3.7 s · 等 9 天 03 小时」会被截成半截、偏偏截掉的是等了多久。完整的写法放悬停和读屏 */ -function summarize(n: NodeTrace | undefined, state: NodeState, at: number, tokens?: number): string { +const brief = (ms: number | undefined, full: boolean): string => + (ms != null && ms >= HOUR && !full ? formatSpan(ms, { coarse: true }) : formatSpan(ms)) + +/** + * 一条泳道右侧的摘要:执行了几次、一共多久、等了多久、用了多少 token。 + * tokens 回放时是游标那一刻的读数(投影给的),实时是累计。full 给悬停用 + */ +function summarize(n: NodeTrace | undefined, state: NodeState, at: number, tokens?: number, full = false): string { if (!n || state === 'idle' || state === 'queued') return state === 'queued' ? '排队' : NONE if (state === 'blocked') return '阻断' if (state === 'unreached') return '未到达' @@ -297,8 +328,8 @@ function summarize(n: NodeTrace | undefined, state: NodeState, at: number, token const parts: string[] = [] if (n.count > 1) parts.push(`×${n.count}`) const measured = measuredOf(n, at) - if (run > 0 || state === 'done') parts.push(formatDuration(measured ?? (run || n.lastDurationMs))) - if (wait > 0) parts.push(`等 ${formatClock(wait).replace(/\.\d$/, '')}`) + if (run > 0 || state === 'done') parts.push(brief(measured ?? (run || n.lastDurationMs), full)) + if (wait > 0) parts.push(`等 ${wait >= HOUR ? brief(wait, full) : formatLapse(wait, false)}`) const tok = tokens ?? n.tokensIn + n.tokensOut if (tok > 0 && parts.length < 3) parts.push(formatTokens(tok, { compact: true })) return parts.join(' · ') || NONE @@ -319,11 +350,13 @@ function buildRows(trace: Trace, graph: TimelineGraph, at: number, labels: Map s.kind === 'run' || s.kind === 'wait' || s.kind === 'retry'), state, count: n?.count ?? 0, measuredMs: measuredOf(n, at), - summary: summarize(n, state, at, states ? (p?.tokensIn ?? 0) + (p?.tokensOut ?? 0) : undefined), + summary: summarize(n, state, at, tokens), + detail: summarize(n, state, at, tokens, true), note: state === 'blocked' ? (failedLabel ? `阻断:上游「${failedLabel}」失败` : '阻断:上游失败') : state === 'unreached' ? '未到达' : undefined, name: label, top, height: ROW_H, @@ -338,7 +371,8 @@ function buildRows(trace: Trace, graph: TimelineGraph, at: number, labels: Map acc + Math.max(0, Math.min(s.end ?? at, at) - s.start), 0) rows.push({ key: `${id}::${agent}`, kind: 'member', nodeId: id, label: agent, segs, state, - count: segs.length, summary: `${segs.length > 1 ? `×${segs.length} · ` : ''}${formatDuration(total)}`, + count: segs.length, summary: `${segs.length > 1 ? `×${segs.length} · ` : ''}${brief(total, false)}`, + detail: `${segs.length > 1 ? `×${segs.length} · ` : ''}${formatSpan(total)}`, name: `${label} · ${agent}`, top, height: SUB_H, }) top += SUB_H @@ -359,6 +394,27 @@ function buildRows(trace: Trace, graph: TimelineGraph, at: number, labels: Map n.id), ...Object.keys(trace.nodes)]).size * ROW_H + for (const n of Object.values(trace.nodes)) { + if (n.segments.some((s) => s.kind === 'dispatch')) h += SUB_H + h += new Set(n.segments.filter((s) => s.kind === 'member' && s.agent).map((s) => s.agent)).size * SUB_H + } + return h +} + +/** + * 泳道一行不裁时坞要多高,直接当 ui.height 用。给坞分高度的人用这一个,别自己拼那几个 + * 常量:少算上边框那 1px,最后一条泳道就被裁掉 1px + */ +export function dockHeightFor(trace: Trace, graph: TimelineGraph): number { + return DOCK_BORDER_H + DOCK_HEAD_H + STICKY_H + lanesHeight(trace, graph) +} + /** 所有有意义的时刻:折叠空档时,只有这些之间的空白才算"什么都没发生" */ function stampsOf(trace: Trace): number[] { const out: number[] = [] @@ -420,8 +476,8 @@ function segTitle(row: Row, s: Segment, t0: number, at: number): string { return [ `${row.label}${s.iteration != null ? ` · 第 ${s.iteration} ${row.kind === 'node' ? '轮' : '轮协作'}` : ''}`, `${what}${s.handle && s.kind === 'run' ? ` → ${s.handle}` : ''}`, - `开始 T+${formatClock(s.start - t0)}${s.end == null ? ' · 进行中' : ''}`, - s.kind === 'retry' ? '' : `耗时 ${formatDuration(end - s.start)}`, + `开始 T+${formatOffset(s.start - t0)}${s.end == null ? ' · 进行中' : ''}`, + s.kind === 'retry' ? '' : `耗时 ${formatSpan(end - s.start)}`, ].filter(Boolean).join('\n') } @@ -613,7 +669,7 @@ export function RunTimeline({ // 目标可能在可见区外(虚拟化时还没画出来):先滚过去,吸顶的三行会盖住最上面那截 const el = scroller.current if (!el) return - const room = el.clientHeight - HEAD_H + const room = el.clientHeight - STICKY_H if (next.top < el.scrollTop) el.scrollTop = next.top else if (next.top + next.height > el.scrollTop + room) el.scrollTop = next.top + next.height - room if (rows.length > VIRTUAL_AFTER) setView({ top: el.scrollTop, height: el.clientHeight }) @@ -636,8 +692,8 @@ export function RunTimeline({ const failed = trace.phase === 'failed' const phaseMeta = statusMeta(trace.phase === 'idle' ? 'idle' : trace.phase) const cursorLabel = live - ? (running ? `实时 ${formatClock(cursor - t0)}` : `结束 ${formatClock(tEnd - t0)}`) - : `回放 ${formatClock(cursor - t0)}` + ? (running ? `实时 ${formatOffset(cursor - t0)}` : `结束 ${formatOffset(tEnd - t0)}`) + : `回放 ${formatOffset(cursor - t0)}` const peak = trace.parallelSeries.reduce((m, [, v]) => Math.max(m, v), 0) // 实时在跑时和游标、胶囊用同一种写法(mm:ss.s),数字才对得上;有等人就两段都写, // 用紧凑的钟面写法,不然「1 分 28 秒 · 等 25 分 00 秒」塞不进这一列。还在走的那一段截断 @@ -646,7 +702,7 @@ export function RunTimeline({ const wait = trace.waits[trace.waits.length - 1] const runSum = proj.waitMs > 0 ? `${span(proj.activeMs, liveRun && !!drive && drive[1] == null)} · 等 ${span(proj.waitMs, liveRun && !!wait && wait[1] == null)}` - : liveRun ? formatClock(proj.activeMs) : formatDuration(proj.activeMs) + : liveRun ? formatLapse(proj.activeMs) : formatSpan(proj.activeMs) // 停在哪个节点、已经等了多久:和胶囊、面板、泳道、运行那一行同一个数(见 waitedMs) const waitedNow = trace.phase === 'waiting' && trace.waitingNodeId ? waitedMs(trace, trace.waitingNodeId, liveNow) : null @@ -692,7 +748,8 @@ export function RunTimeline({ onKeyDown={onGripKey} onPointerDown={onGripDown} onPointerMove={onGripMove} onPointerUp={onGripUp} onPointerCancel={onGripUp} /> -
+ {/* 高度写在这里不写在 CSS:DOCK_HEAD_H 是给坞分高度的人读的那一份 */} +
航迹
)} @@ -743,7 +800,7 @@ export function RunTimeline({
-
+
{/* 刻度 + 并行度 + 运行本身:拖这三行就是拖游标 */}
@@ -756,7 +813,7 @@ export function RunTimeline({ ))} {scale.folds.map((f) => ( + title={`这 ${formatSpan(f.b - f.a)} 里没有任何事件,已压缩`}> {foldLabel(f.b - f.a)} ))} @@ -794,7 +851,7 @@ export function RunTimeline({ const x0 = scale.x(a) const w = Math.max(2, scale.x(b ?? drawAt) - x0) // 宽度按 200ms 一格排,字按时钟走:还开着的这一段和右边、游标写同一个数 - const text = b == null && running && live ? formatClock(liveNow - a) : formatDuration((b ?? drawAt) - a) + const text = b == null && running && live ? formatLapse(liveNow - a) : formatSpan((b ?? drawAt) - a) return ( {w > 70 && 执行 {text}} @@ -805,7 +862,7 @@ export function RunTimeline({ const x0 = scale.x(a) const w = Math.max(2, scale.x(b ?? drawAt) - x0) // 还开着的这一段和执行段一样按时钟写:和坞头「已等」、右边合计、胶囊同一个数 - const text = b == null && liveRun ? formatClock(liveNow - a) : formatDuration((b ?? drawAt) - a) + const text = b == null && liveRun ? formatLapse(liveNow - a) : formatSpan((b ?? drawAt) - a) return ( @@ -815,10 +872,10 @@ export function RunTimeline({ })} {isTerminal(trace.phase) && trace.endedAt != null && ( + title={`${phaseMeta.label} · T+${formatOffset(trace.endedAt - t0)}`} /> )}
-
0 ? ` · 等人 ${formatDuration(proj.waitMs)}` : ''}`}> +
0 ? ` · 等人 ${formatSpan(proj.waitMs)}` : ''}`}> {runSum}
@@ -830,7 +887,7 @@ export function RunTimeline({ )} {/* 竖线从游标头下沿开始:回放时游标头是描边的,线穿过去会划掉上面的数字 */}
+ style={{ top: CURSOR_TOP, transform: `translateX(${LABEL_W + cursorX}px)`, height: STICKY_H - CURSOR_TOP }} />
@@ -846,14 +903,14 @@ export function RunTimeline({ {/* 折叠的空档:斜纹贯穿所有泳道——整张图在这段时间里都停着 */} {scale.folds.map((f) => ( + style={{ left: LABEL_W + f.x0, width: f.x1 - f.x0, height: STICKY_H + totalH }} /> ))} {!live && ( + style={{ left: LABEL_W + cursorX, width: Math.max(0, scale.width - cursorX), top: STICKY_H, height: totalH }} /> )}
+ style={{ top: STICKY_H, transform: `translateX(${LABEL_W + cursorX}px)`, height: totalH }} />
@@ -898,7 +955,7 @@ function Lane({ row, scale, at, t0, hovered, tabbable, waitNow, onHover, onPick, data-lane={row.key} role="button" tabIndex={tabbable ? 0 : -1} - aria-label={`${row.name}:${statusMeta(row.state).label}${row.summary !== NONE ? ` · ${row.summary}` : ''}`} + aria-label={`${row.name}:${statusMeta(row.state).label}${row.detail !== NONE ? ` · ${row.detail}` : ''}`} onMouseEnter={() => onHover?.(row.nodeId)} onMouseLeave={() => onHover?.(null)} onFocus={() => { onTake(row.key); onHover?.(row.nodeId) }} @@ -927,10 +984,10 @@ function Lane({ row, scale, at, t0, hovered, tabbable, waitNow, onHover, onPick, const w = Math.max(3, scale.x(end) - x0) const ms = s.kind === 'run' && s.end != null && row.measuredMs != null ? row.measuredMs : end - s.start const text = s.kind === 'wait' - ? `等待审批 ${s.end == null && waitNow != null ? formatClock(waitNow) : formatClock(end - s.start).replace(/\.\d$/, '')}` + ? `等待审批 ${s.end == null && waitNow != null ? formatLapse(waitNow) : formatLapse(end - s.start, false)}` : s.kind === 'dispatch' - ? `调度 ${formatDuration(end - s.start)}${s.estimated ? ' · 推算' : ''}` - : `${s.iteration != null && row.kind === 'node' ? `#${s.iteration} · ` : ''}${formatDuration(ms)}` + ? `调度 ${formatSpan(end - s.start)}${s.estimated ? ' · 推算' : ''}` + : `${s.iteration != null && row.kind === 'node' ? `#${s.iteration} · ` : ''}${formatSpan(ms)}` return ( @@ -939,7 +996,7 @@ function Lane({ row, scale, at, t0, hovered, tabbable, waitNow, onHover, onPick, ) })}
-
{row.summary}
+
{row.summary}
) } diff --git a/frontend/src/canvas/TeamMatrix.tsx b/frontend/src/canvas/TeamMatrix.tsx index 27dfd359..2dff7458 100644 --- a/frontend/src/canvas/TeamMatrix.tsx +++ b/frontend/src/canvas/TeamMatrix.tsx @@ -1,19 +1,21 @@ import { memo } from 'react' import clsx from 'clsx' import { StatusBadge } from '../components/ui' -import { formatClock, formatDuration, NONE } from '../lib/format' +import { formatDuration, formatLapse, NONE } from '../lib/format' import { statusMeta } from '../lib/status' import type { TeamMemberEx } from '../run/decode' import type { NodeTrace, Segment } from '../run/trace' import { useRunClock } from '../run/useRunClock' import type { TeamMember, TeamRound, TeamRun } from '../types' + /** * 实时计时:「01:14.3」。只有它订阅时钟,所在的卡片、矩阵不跟着每 100ms 重画。 * * from 是服务端时钟的毫秒时间戳,skewMs 是客户端减服务端的偏差(见 trace.liveAt)。 * coarse 只到秒:成员行、等待时长这些地方十分位只会让一排数字一直在抖。 * 十分位单独包一层,系统关了动效时由 CSS 藏掉(那时时钟也只 1 秒走一次)。 + * 过了一小时按 formatLapse 换成「3 小时 05 分」,那时已经没有十分位了。 */ export function LiveClock({ from, skewMs = 0, coarse = false }: { from: number @@ -21,7 +23,7 @@ export function LiveClock({ from, skewMs = 0, coarse = false }: { coarse?: boolean }) { const now = useRunClock(true) - const text = formatClock(Math.max(0, now - skewMs - from)) + const text = formatLapse(Math.max(0, now - skewMs - from)) const dot = text.lastIndexOf('.') if (dot < 0) return {text} return ( @@ -34,7 +36,7 @@ export function LiveClock({ from, skewMs = 0, coarse = false }: { /** 回放时的定值计时:和 LiveClock 的 coarse 一样只到秒,拿不到就是「—」 */ export const stillClock = (ms: number | undefined): string => - (ms == null ? NONE : formatClock(Math.max(0, ms)).replace(/\.\d$/, '')) + (ms == null ? NONE : formatLapse(Math.max(0, ms), false)) /** * 协作矩阵:supervisor 节点在卡片内部摊开的那块东西。 @@ -312,9 +314,14 @@ function TeamMatrixImpl({ let headRight = '' /** 表头右边这句的语气:用完轮数没完成时失败是红、降档是琥珀,别的安静 */ let headTone: 'err' | 'warn' | '' = '' - if (!team) headRight = maxParallel ? `并发上限 ${maxParallel}` : '' - else if (live) { + // 一轮都还没派(第一次刚开始;接着跑时 reduceTeam 把上一次清空了,rounds 为空)就是还没有 + // 数据:只写配置里的并发上限,别按有过几轮的样子说「等调度者」「已收尾」。调度者正在想的 + // 照说;收场(用完轮数、收尾判定)以事件为准,回放到上一次的收场时照样说 + const started = !!team?.rounds.length + const idle = maxParallel ? `并发上限 ${maxParallel}` : '' + if (live) { headRight = thinking ? closing ? verdictText({ done: false, reason: '', open: true }) : '调度中' + : !started ? idle : width > 1 ? runningNow ? `本轮 ${width} 人并行 · ${runningNow} 人在跑` : `本轮 ${width} 人已交回` : runningNow ? '串行推进' : '等调度者' } else if (ending?.exhausted) { @@ -323,6 +330,8 @@ function TeamMatrixImpl({ } else if (verdict && !verdict.open) { headRight = verdictText(verdict) headTone = verdict.done ? '' : 'warn' + } else if (!started) { + headRight = idle } else { headRight = unsettledNote(rows.filter((r) => r.active && r.member) .map((r) => ({ ...r.member!, status: r.status! }))) diff --git a/frontend/src/canvas/VariablesDrawer.tsx b/frontend/src/canvas/VariablesDrawer.tsx index 122959fd..48e055fd 100644 --- a/frontend/src/canvas/VariablesDrawer.tsx +++ b/frontend/src/canvas/VariablesDrawer.tsx @@ -209,7 +209,7 @@ function VarDetail({ variable, onClose }: { variable: Variable; onClose: () => v )) : (
- 没有任何地方引用它。改图改了一半的话这很正常 + 没有任何地方引用它。工作流改了一半的话这很正常
)} diff --git a/frontend/src/canvas/WorkflowPicker.tsx b/frontend/src/canvas/WorkflowPicker.tsx index 32609dc3..ecef3ff4 100644 --- a/frontend/src/canvas/WorkflowPicker.tsx +++ b/frontend/src/canvas/WorkflowPicker.tsx @@ -8,6 +8,7 @@ import { useStudio } from '../store/studio' import { EmptyState, IconButton, Modal, confirmDialog, promptDialog, toast } from '../components/ui' import { formatDateTime, formatTime, parseServerTime } from '../lib/format' import { formatShortcut } from '../lib/keys' +import { leavePass, registerLeaveGuard } from '../lib/leave' import { WORKFLOW_STATUS_LABEL } from '../lib/terms' import type { GraphSpec, Workflow } from '../types' @@ -22,9 +23,12 @@ export function defaultWorkflowName(now = new Date()): string { return `未命名工作流 ${stamp(now)}` } -/** 选择器已经问过「放弃改动吗」:带着这个标记换图,画布那边不再问第二遍 */ +/** + * 已经问过「放弃改动吗」:带着这个标记换图,画布那边不再问第二遍。leavePass 让外壳的 + * 离开守卫(见下面的 discardGuard)也放行这一跳 + */ type Go = (to: string, opts?: { replace?: boolean; state?: unknown }) => void -const DISCARDED = { state: { discard: true } } +const DISCARDED = leavePass({ state: { discard: true } }) const BLANK: GraphSpec = { nodes: [ @@ -45,15 +49,71 @@ const BLANK: GraphSpec = { * 返回 true 表示可以换。 */ export async function confirmDiscard(): Promise { - if (!useStudio.getState().dirty) return true + const { dirty, workflow } = useStudio.getState() + if (!dirty) return true return confirmDialog({ - title: '放弃画布上未保存的改动?', - consequences: ['切换之后这些改动和撤销记录都会丢失', `要留着的话,先取消、按 ${formatShortcut('Mod+S')} 保存`], + // 可能是在别的页上问的(记录页打开另一张工作流):说出是哪一张的改动 + title: workflow ? `放弃「${workflow.name}」未保存的改动?` : '放弃画布上未保存的改动?', + consequences: ['切换之后这些改动和撤销记录都会丢失', `要留着的话,先取消,回到画布按 ${formatShortcut('Mod+S')} 保存`], confirmLabel: '放弃并切换', danger: true, }) } +/** + * 守卫里人已经说了「放弃并切换」的那一跳。地址落到那儿之后编排页的 URL→画布不再问 + * 第二遍:takeDiscarded(pathname) 取一次就清掉。 + * + * 先建再跳的(canLeave('/studio/') 问过,建完 navigate(`/studio/${新 id}`, leavePass())) + * 问的时候还没有新 id,记下的只是 '/studio/':它认接下来打开的任何一张。只认完全相同的 + * 路径的话,照着这个写法做反而要问两遍——第二遍点取消,刚建的那张就成了孤儿 + */ +const ANY_WORKFLOW = '/studio/' +let discardedFor: string | null = null +export function takeDiscarded(pathname: string): boolean { + const hit = discardedFor === pathname || (discardedFor === ANY_WORKFLOW && pathname.startsWith(ANY_WORKFLOW)) + if (hit) discardedFor = null + return hit +} + +/** + * 画布有没保存的改动时,换到另一张工作流先问——在地址跳之前问。以前是编排页的 URL→画布 + * 事后才问:浏览器后退、⌘K、记录页的「在画布中打开」已经把地址换成了那一张,取消时再 + * replace 回来,从记录页过来的连 ?run= 也丢了。 + * + * 跟着 dirty 登记在模块级,不是编排页挂着时才登记:画布在 store 里,离开编排页它也还在, + * 从别的页打开另一张工作流一样会把它换掉。去别的页不拦(只认 /studio/<别的 id>);关页、 + * 刷新由 lib/leave 让浏览器问一句。要先建东西再跳的(从问数据页建一张再打开),先 + * canLeave('/studio/') 问过、跳的时候带 leavePass(),整条路只问这一遍(见 takeDiscarded) + */ +const discardGuard = (): (() => void) => registerLeaveGuard({ + blocks: (next) => { + const id = useStudio.getState().workflow?.id + return next != null && next.pathname.startsWith('/studio/') && next.pathname !== `/studio/${id}` + }, + confirm: async (next) => { + const ok = await confirmDiscard() + // 这一问说了取消,就别让上一问记下的还作数 + discardedFor = ok && next ? next.pathname : null + return ok + }, +}) +let unguard: (() => void) | null = null +const stopWatching = useStudio.subscribe((s) => { + if (s.dirty === (unguard != null)) return + if (s.dirty) { + unguard = discardGuard() + } else { + unguard?.() + unguard = null + discardedFor = null + } +}) +// 热更新换上这个模块时画布可能已经带着没存的改动:订阅要等下一次变化才登记,先补上 +if (useStudio.getState().dirty) unguard = discardGuard() +// 热更新换掉这个模块时撤掉旧的那道:两道守卫会把同一句问两遍 +import.meta.hot?.dispose(() => { stopWatching(); unguard?.() }) + /** * 新建工作流。起点可以是空白(输入 → 成果),也可以是一张模板。 * @@ -122,7 +182,9 @@ type Filter = 'all' | 'mine' | 'templates' * ↑↓ 移动、⏎ 打开。复制和删除常驻(淡色),不再只在悬停时出现。 */ export function WorkflowPicker({ open, onClose }: { open: boolean; onClose: () => void }) { - const { workflows, refresh } = useCatalog() + // 逐个取:整个 catalog 订阅下来,连接心跳每跳一次开着的选择器都要重算一遍列表 + const workflows = useCatalog((s) => s.workflows) + const refresh = useCatalog((s) => s.refresh) const navigate = useNavigate() const current = useStudio((s) => s.workflow) const [query, setQuery] = useState('') diff --git a/frontend/src/canvas/copilotMerge.ts b/frontend/src/canvas/copilotMerge.ts index 24428965..676e5e82 100644 --- a/frontend/src/canvas/copilotMerge.ts +++ b/frontend/src/canvas/copilotMerge.ts @@ -148,3 +148,46 @@ export function describeToolChange(c: ToolChange): string { const list = (xs: string[]) => (xs.length ? xs.join('、') : '空') return `${who}:${list(c.before)} → ${list(c.after)}` } + +/** 后端的 tools_dropped 提醒里用得上的那两个字段(check.warnings / final.issues 的一条) */ +export interface DropWarning { node_id?: string | null; field?: string | null } + +/** + * 变少了的工具绑定分两组:后端点了名(tools_dropped,同节点同字段)的是「这一轮没让删」, + * 其余是按要求删的。改图回执(toast)和右栏的卡片都按这一条分,免得两处说法不一 + */ +export function splitShrunk(changes: ToolChange[], warnings: DropWarning[]): { unasked: ToolChange[]; asked: ToolChange[] } { + const shrunk = shrunkTools(changes) + // 老后端的提醒不带 field:同一个节点的就算 + const warned = (c: ToolChange) => warnings.some((w) => w.node_id === c.node_id && (w.field == null || w.field === c.field)) + return { unasked: shrunk.filter(warned), asked: shrunk.filter((c) => !warned(c)) } +} + +/** + * 改图回执:一轮 final 落定之后那条 toast 写什么、什么色、要不要常驻。 + * + * 工具绑定变了画布上看不出来,逐条写明前后。变少了的分两组:后端点了名(tools_dropped, + * 同节点同字段)的是「这一轮没让删」,warn 色、常驻到人看过——没工具的 agent 照样能跑, + * 跑出来的是模型「假设」查过库的答案;其余是按要求删的,另列一组、不催。以前整轮只要有 + * 一条提醒,所有变少的都列在「没让删」底下,按要求删的也被说成改漏了,要紧的那句被冲淡 + */ +export function copilotReceipt(r: { + total: number; left: number; missing: number; toolChanges: ToolChange[]; toolWarnings: DropWarning[] +}): { text: string; kind: 'ok' | 'warn'; sticky: boolean; detail?: string } { + const { unasked, asked } = splitShrunk(r.toolChanges, r.toolWarnings) + const shrunk = [...unasked, ...asked] + const head = r.left ? `已放到画布,但还有 ${r.left} 处问题要你处理` + : r.missing ? `已应用 ${r.total} 处改动,但有 ${r.missing} 步没放上` + : `已应用 ${r.total} 处改动` + const lines = [ + ...(unasked.length ? ['工具绑定变少了,这一轮没让删,确认一下是不是改漏了:', ...unasked.map(describeToolChange)] : []), + ...(asked.length ? ['工具绑定变少了(按要求):', ...asked.map(describeToolChange)] : []), + ] + return { + text: [r.toolChanges.length && !shrunk.length ? `${head} · 工具绑定变了 ${r.toolChanges.length} 处` : head, ...lines].join('\n'), + kind: r.left || r.missing || unasked.length ? 'warn' : 'ok', + sticky: unasked.length > 0, + // 加了、换了的那些不在正文里:放进详情 + ...(r.toolChanges.length > shrunk.length ? { detail: r.toolChanges.map(describeToolChange).join('\n') } : {}), + } +} diff --git a/frontend/src/canvas/surface.css b/frontend/src/canvas/surface.css index 1d46386c..d207f81b 100644 --- a/frontend/src/canvas/surface.css +++ b/frontend/src/canvas/surface.css @@ -744,9 +744,11 @@ } .sf-metric-v { margin-top: 1px; + overflow: hidden; font-family: var(--font-mono); font-size: var(--text-base); font-weight: 600; + text-overflow: ellipsis; white-space: nowrap; } .sf-metric-u { @@ -909,6 +911,7 @@ display: flex; flex: none; flex-direction: column; + /* 改粗细要跟着改 RunTimeline 的 DOCK_BORDER_H:它算在坞的高度里 */ border-top: 1px solid var(--border); background: var(--bg-panel); font-size: var(--text-2xs); @@ -1010,7 +1013,7 @@ flex: none; align-items: center; gap: 6px; - height: 34px; + /* 高度见 RunTimeline 的 DOCK_HEAD_H(行内写的) */ padding: 0 8px 0 12px; border-bottom: 1px solid var(--hairline); white-space: nowrap; diff --git a/frontend/src/components/CommandPalette.tsx b/frontend/src/components/CommandPalette.tsx index 508a61b8..871ad7de 100644 --- a/frontend/src/components/CommandPalette.tsx +++ b/frontend/src/components/CommandPalette.tsx @@ -19,7 +19,7 @@ import type { ThemePref } from '../lib/theme' import { isMac } from '../lib/keys' import { formatDateTime, formatTime, parseServerTime, shortId } from '../lib/format' import { statusLabel } from '../lib/status' -import { WORKFLOW_STATUS_LABEL, runClassLabel } from '../lib/terms' +import { WORKFLOW_STATUS_LABEL, runClassLabel, runName } from '../lib/terms' import { errorMessage } from '../lib/errors' import { disableNotify, enableNotify, notifySupported, useSignals } from '../lib/notify' import { canLeave, leavePass } from '../lib/leave' @@ -51,7 +51,7 @@ export interface PageDef { // ⌥ + 数字切页:不和浏览器的 ⌘1–9(切标签页,页面拦不住)撞,也不和画布上的 // Backspace / Delete 以及各处输入框打架——「g c」这类两键序列就是栽在这上面 export const PAGES: PageDef[] = [ - { to: '/chat', label: '问数据', hint: '说需求,自动接数据源、建流程、跑出结论', icon: MessageSquare, shortcut: 'Alt+1', keywords: 'chat ask 对话 提问 首页' }, + { to: '/chat', label: '问数据', hint: '说需求,自动接数据源、搭工作流、跑出结论', icon: MessageSquare, shortcut: 'Alt+1', keywords: 'chat ask 对话 提问 首页' }, { to: '/studio', label: '编排', hint: '在画布上搭工作流、调试、发布', icon: FlaskConical, shortcut: 'Alt+2', keywords: 'studio canvas 画布 工作流 workflow' }, { to: '/runs', label: '记录', hint: '每次运行的过程、成果和待审批', icon: History, shortcut: 'Alt+3', keywords: 'runs history 运行 运行记录 历史 审批' }, { to: '/data', label: '数据', hint: '接入数据库和表格,问数据和工作流从这里取数', icon: Database, shortcut: 'Alt+4', keywords: 'data datasource 数据源 数据库 表格 excel csv' }, @@ -247,6 +247,10 @@ function score(c: Command, tokens: string[]): number { return total } +/** 面板以外的模态框(离开前确认、各页的弹窗) */ +const OTHER_MODAL = '[aria-modal="true"]:not([data-command-palette])' +const otherModal = () => !!document.querySelector(OTHER_MODAL) + export function CommandPalette() { const open = useShell((s) => s.palette) return open ? : null @@ -274,22 +278,34 @@ function PaletteView() { useEffect(() => { inputRef.current?.focus() return () => { - // 焦点还给打开前的那个元素;选中的命令已经把焦点带去别处(跳了页、开了弹窗)就不抢 + // 焦点还给打开前的那个元素;选中的命令已经把焦点带去别处(跳了页、开了弹窗)就不抢。 + // 别的模态框开着时也不还:焦点该在它里面,还给 opener 就落到了它外面 const now = document.activeElement + if (otherModal()) return if (opener?.isConnected && (!now || now === document.body)) opener.focus({ preventScroll: true }) } }, [opener]) // 开着时焦点只在面板里:刚跳过去的页面挂载时会自动聚焦(画布助手的输入框), - // 焦点一被抢走,接着打的字和 Esc 就都落到了面板底下 + // 焦点一被抢走,接着打的字和 Esc 就都落到了面板底下。落进别的模态框(离开前确认) + // 的不拉回:那是更要紧的问题,拉回来人就答不了它 useEffect(() => { const onFocusIn = (e: FocusEvent) => { - if (e.target instanceof Node && !panelRef.current?.contains(e.target)) inputRef.current?.focus({ preventScroll: true }) + if (!(e.target instanceof Element) || panelRef.current?.contains(e.target)) return + if (e.target.closest(OTHER_MODAL)) return + inputRef.current?.focus({ preventScroll: true }) } document.addEventListener('focusin', onFocusIn) return () => document.removeEventListener('focusin', onFocusIn) }, []) + // 浏览器后退、前进(侧键、触控板手势、⌘[)时先收起面板:离开前确认的框要弹出来, + // 面板压在它上面(z 更高)就看不见,焦点也被拉回搜索框,人只能对着面板按键 + useEffect(() => { + window.addEventListener('popstate', closeCommandPalette) + return () => window.removeEventListener('popstate', closeCommandPalette) + }, []) + // 最近运行、最近会话是打开面板时才取:常驻轮询它们不值得 useEffect(() => { if (backend === 'down') return @@ -314,7 +330,7 @@ function PaletteView() { list.push({ id: `approval:${a.id}`, group: 'approvals', label: a.title || '待审批', // 同一个审批节点跑过几次,标题会一模一样:带上运行的短 id 才分得开 - hint: [a.workflow_name, a.node_label, shortId(a.run_id)].filter(Boolean).join(' · '), + hint: [a.workflow_name && runName(a), a.node_label, shortId(a.run_id)].filter(Boolean).join(' · '), keywords: `审批 approval 待办 ${a.run_id}`, icon: , meta: waited && 已等 {waited}, @@ -388,7 +404,7 @@ function PaletteView() { for (const r of runs ?? []) { const pendingHere = r.status === 'interrupted' ? hasPendingApproval(approvals, r.id) : undefined list.push({ - id: `run:${r.id}`, group: 'runs', label: r.workflow_name || '未命名工作流', + id: `run:${r.id}`, group: 'runs', label: runName(r) || '未命名工作流', hint: `${statusLabel(r.status, { pendingApproval: pendingHere })} · ${runClassLabel(r.run_class, r.version)} · ${shortId(r.id)}`, keywords: `run 运行 ${r.id}`, icon: , diff --git a/frontend/src/components/ui.tsx b/frontend/src/components/ui.tsx index 6dfd2f20..ba8db855 100644 --- a/frontend/src/components/ui.tsx +++ b/frontend/src/components/ui.tsx @@ -30,17 +30,21 @@ export function isComposing(e: ReactKeyboardEvent | KeyboardEvent): boolean { } /** - * 页面级错误边界。没有它,任何一个组件渲染时抛错,React 会卸掉整棵树——整站 - * 白屏,导航栏也没了,用户只能刷新,没保存的编辑跟着丢。 + * 错误边界。没有它,任何一个组件渲染时抛错,React 会卸掉整棵树——整站白屏, + * 导航栏也没了,用户只能刷新,没保存的编辑跟着丢。 * - * 包在路由外面:导航栏还在,换一页(resetKey 变了)就自动恢复。编辑中的图在 - * store 里、不在组件树上,点「重试」重新渲染时它还在。 + * scope 说明兜的是哪一层: + * - page(默认):App 里包在路由外面,出错只换掉内容区,导航还在,换一页(resetKey + * 变了)就自动恢复; + * - shell:main.tsx 里包着整个 App,这时导航也没了,文案不能再说「这一页」。 + * title 可以再覆盖标题。编辑中的图在 store 里、不在组件树上,点「重试」重新渲染时它还在。 * * 技术信息(error.message)收进「技术细节」折叠区并能复制:对用户是噪音,对 - * 排障是全部线索。 + * 排障是全部线索。role=alert 只包标题和那句说明:按钮和技术细节也在里面的话, + * 读屏会把「重试 刷新页面 技术细节…」连同堆栈摘要一起当成警报念出来。 */ export class ErrorBoundary extends Component< - { resetKey?: string; children: ReactNode }, { error: Error | null } + { resetKey?: string; scope?: 'page' | 'shell'; title?: string; children: ReactNode }, { error: Error | null } > { state: { error: Error | null } = { error: null } @@ -63,11 +67,17 @@ export class ErrorBoundary extends Component< const raw = error.stack?.includes(error.message) ? error.stack : `${error.name}: ${error.message}${error.stack ? `\n\n${error.stack}` : ''}` + const shell = this.props.scope === 'shell' return ( -
+
-
这一页出错了
-
没保存的编辑还在内存里:先点「重试」,恢复了就尽快保存。
+
+
{this.props.title ?? (shell ? '界面出错了' : '这一页出错了')}
+
+ {shell ? '导航和页面都停了。' : ''}没保存的编辑还在内存里:先点「重试」,恢复了就尽快保存。 +
+
@@ -81,12 +91,12 @@ export class ErrorBoundary extends Component< /** 「技术细节」折叠区:原文给运维复制用,默认收起 */ export function TechDetails({ raw, summary, className }: { raw: string; summary?: string; className?: string }) { return ( -
+
技术细节{summary ? · {summary.length > 60 ? `${summary.slice(0, 60)}…` : summary} : null}
-
+        
           {raw}
         
@@ -242,7 +252,7 @@ export function ToastHost({ children }: { children?: ReactNode }) {
{hidden > 0 && (
{expanded && items.length > TOAST_VISIBLE && (
{item.detail && ( -
+
详情 -
+            
               {item.detail}
             
@@ -732,7 +742,7 @@ function DialogView({ req }: { req: DialogRequest }) { >
{(opts.body || opts.consequences?.length) && ( -
+
{opts.body &&
{opts.body}
} {!!opts.consequences?.length && (
    @@ -978,7 +988,7 @@ export function OfflineBanner({ className }: { className?: string }) {
    setOpen(!open)} aria-expanded={open} - className="flex items-center gap-1.5 text-[11px] font-semibold uppercase tracking-wide text-faint hover:text-dim" + className="flex items-center gap-1.5 text-2xs font-semibold uppercase tracking-wide text-faint hover:text-dim" > › {title} @@ -1355,7 +1365,7 @@ export function StatusPill({ status, pendingApproval, short = false, plain = fal return ( {error}
    + ?
    {error}
    : hint - ?
    {hint}
    + ?
    {hint}
    : null}
) } -/** 受控的 JSON 编辑框:输入过程中允许非法 JSON,失焦或合法时才回写。 */ -export function JsonInput({ value, onChange, rows = 5, placeholder, id }: { +/** + * 受控的 JSON 编辑框:输入过程中允许非法 JSON,失焦或合法时才回写。 + * + * aria-describedby / aria-invalid 照 Field 的 render-prop 原样传进来:外面(比如后端 + * 422)说这一项有错时,框要标成出错、描红,读屏聚焦到框上就念出那句原因 + */ +export function JsonInput({ value, onChange, rows = 5, placeholder, id, 'aria-describedby': describedBy, 'aria-invalid': invalid }: { value: any; onChange: (v: any) => void; rows?: number; placeholder?: string; id?: string + 'aria-describedby'?: string; 'aria-invalid'?: boolean }) { const [text, setText] = useState(() => (value == null ? '' : JSON.stringify(value, null, 2))) const [bad, setBad] = useState(false) const touched = useRef(false) + const autoId = useId() + const badId = `${id ?? `json${autoId.replace(/[^a-zA-Z0-9_-]/g, '')}`}-json` useEffect(() => { if (touched.current) return @@ -1489,12 +1507,13 @@ export function JsonInput({ value, onChange, rows = 5, placeholder, id }: {