Enterprise-Knowledge-Base

Weknora/Enterprise-Knowledge-Base

Fork 0

Commit Graph

Author	SHA1	Message	Date
wizardchen	cb99736d72	feat: scope API MCP OAuth by principal	2026-06-30 20:01:05 +08:00
wizardchen	6d0f09d75f	fix(agent): 加固 MCP 工具人审批的跨实例与并发语义 - 跨实例 Resolve 通过 Redis reply channel 接收 owning 实例的 ack （ok / not_found / tenant_mismatch / user_mismatch / already_resolved）， HTTP 不再静默 200，超时退化为 NotFound。 - PendingRequest 增加 UserID，Resolve 校验会话所有者，避免同租户其他用户越权批准/篡改参数。 - 新增 ErrAlreadyResolved，timer/ctx 命中后再次 Resolve 返回 400 而不是静默成功；waiter.deliver 暴露胜出语义。 - NeedsApproval 默认 fail-close（DB 故障要求审批），可经 WEKNORA_AGENT_TOOL_APPROVAL_FAIL_OPEN=true 回退。 - Pub/Sub 增加 OriginID 自过滤、退避重连、namespace 后缀，避免自回环噪声与多部署串扰。 - 工具执行超时常量统一通过 ToolExecContext.ExecTimeout 注入， mcp_tool.go 不再硬编码 60s。 - handler 修正 path 二次解码、错误用 errors.Is、modified_args=null 的静默清空、ListMCPToolApprovals 的 404/500 误判。 - repository 用 clause.OnConflict 做原子 upsert，消除并发 500。 - 增加 NotFound / TenantMismatch / UserMismatch / AlreadyResolved / Race 等用例。	2026-05-10 22:57:12 +08:00
wizardchen	5510ea8f5a	feat(agent): human-in-the-loop approval for MCP tool calls (#1173 ) Add an opt-in human approval gate so Agent runs pause before executing MCP tools that operators flag as dangerous, surface an approval card in the chat UI, and only resume after the user approves (optionally with edited args) or rejects. Backend - New mcp_tool_approvals table + repo/service to mark per-tool approval required (PG migration 000042 + sqlite init). - approval.Gate coordinates RequestAndWait / Resolve with sync.Once delivery, configurable timeout, and Redis Pub/Sub fan-out so multi- replica deployments work without sticky sessions. - MCPTool.Execute integrates the gate; uses a round-level ApprovalCtx (without the per-tool 60s timeout) for the wait, and re-derives a fresh 60s exec ctx after approval so CallTool keeps a full window. - New SSE response types (tool_approval_required / _resolved) and EventBus events plumb approval state to AgentStreamDisplay. - REST: list/set per-tool approval flag, resolve pending approval. - Configurable via agent.tool_approval_timeout_seconds (yaml) or WEKNORA_AGENT_TOOL_APPROVAL_TIMEOUT env (accepts seconds or Go duration). Frontend - MCP settings: per-tool "require approval" switch on the test panel. - Chat: ToolApprovalCard renders the pause point with editable JSON args, validation feedback, mm:ss countdown that turns warning/danger near deadline, and a resolved state that retains context. - i18n strings added for zh-CN / en-US / ko-KR / ru-RU. Docs - docs/zh/mcp-approval.md covering behavior, config, API, deployment considerations (Redis cross-instance, restart limitations).	2026-05-10 22:57:12 +08:00

Author

SHA1

Message

Date

wizardchen

cb99736d72

feat: scope API MCP OAuth by principal

2026-06-30 20:01:05 +08:00

wizardchen

6d0f09d75f

fix(agent): 加固 MCP 工具人审批的跨实例与并发语义

- 跨实例 Resolve 通过 Redis reply channel 接收 owning 实例的 ack
  （ok / not_found / tenant_mismatch / user_mismatch / already_resolved），
  HTTP 不再静默 200，超时退化为 NotFound。
- PendingRequest 增加 UserID，Resolve 校验会话所有者，避免同租户
  其他用户越权批准/篡改参数。
- 新增 ErrAlreadyResolved，timer/ctx 命中后再次 Resolve 返回 400 而
  不是静默成功；waiter.deliver 暴露胜出语义。
- NeedsApproval 默认 fail-close（DB 故障要求审批），可经
  WEKNORA_AGENT_TOOL_APPROVAL_FAIL_OPEN=true 回退。
- Pub/Sub 增加 OriginID 自过滤、退避重连、namespace 后缀，避免自回
  环噪声与多部署串扰。
- 工具执行超时常量统一通过 ToolExecContext.ExecTimeout 注入，
  mcp_tool.go 不再硬编码 60s。
- handler 修正 path 二次解码、错误用 errors.Is、modified_args=null 的
  静默清空、ListMCPToolApprovals 的 404/500 误判。
- repository 用 clause.OnConflict 做原子 upsert，消除并发 500。
- 增加 NotFound / TenantMismatch / UserMismatch / AlreadyResolved /
  Race 等用例。

2026-05-10 22:57:12 +08:00

wizardchen

5510ea8f5a

feat(agent): human-in-the-loop approval for MCP tool calls (#1173 )

Add an opt-in human approval gate so Agent runs pause before executing
MCP tools that operators flag as dangerous, surface an approval card in
the chat UI, and only resume after the user approves (optionally with
edited args) or rejects.

Backend
- New mcp_tool_approvals table + repo/service to mark per-tool approval
  required (PG migration 000042 + sqlite init).
- approval.Gate coordinates RequestAndWait / Resolve with sync.Once
  delivery, configurable timeout, and Redis Pub/Sub fan-out so multi-
  replica deployments work without sticky sessions.
- MCPTool.Execute integrates the gate; uses a round-level ApprovalCtx
  (without the per-tool 60s timeout) for the wait, and re-derives a
  fresh 60s exec ctx after approval so CallTool keeps a full window.
- New SSE response types (tool_approval_required / _resolved) and
  EventBus events plumb approval state to AgentStreamDisplay.
- REST: list/set per-tool approval flag, resolve pending approval.
- Configurable via agent.tool_approval_timeout_seconds (yaml) or
  WEKNORA_AGENT_TOOL_APPROVAL_TIMEOUT env (accepts seconds or Go
  duration).

Frontend
- MCP settings: per-tool "require approval" switch on the test panel.
- Chat: ToolApprovalCard renders the pause point with editable JSON
  args, validation feedback, mm:ss countdown that turns warning/danger
  near deadline, and a resolved state that retains context.
- i18n strings added for zh-CN / en-US / ko-KR / ru-RU.

Docs
- docs/zh/mcp-approval.md covering behavior, config, API, deployment
  considerations (Redis cross-instance, restart limitations).

2026-05-10 22:57:12 +08:00

3 Commits