From 8353ba38fea0bdd4580ea00f48a41d1e999101aa Mon Sep 17 00:00:00 2001 From: cflmy Date: Fri, 16 Oct 2026 17:33:24 +0800 Subject: [PATCH] Add Streamable HTTP MCP and harden web /v1 invoke auth. agent_mcp_serve gains http transport; invoke injects Bearer/X-Api-Key and maps unauthorized to 401; openai/agent field access prefers json.get over footnotes. Co-authored-by: Cursor --- doc/design/ext-web-artifact.md | 4 +- ext/ai/agent.mq.md | 74 ++-- ext/ai/llm.mq.md | 25 +- ext/ai/llm/openai.mq.md | 25 +- plugins/agent/src/mcp_server.rs | 377 ++++++++++++++++-- plugins/web/internal/httpx/helpers.go | 65 ++- plugins/web/internal/httpx/routes_artifact.go | 41 +- plugins/web/internal/httpx/routes_invoke.go | 26 ++ 8 files changed, 525 insertions(+), 112 deletions(-) diff --git a/doc/design/ext-web-artifact.md b/doc/design/ext-web-artifact.md index 2eb8fb1..6af1311 100644 --- a/doc/design/ext-web-artifact.md +++ b/doc/design/ext-web-artifact.md @@ -120,8 +120,8 @@ import data:ext/data/db.mq.md | `path` | `路径` | URL | | `method` | `方法` | GET/POST/… | | `request` | `请求` | `json` / `form` / `none` | -| `response` | `响应` | `json` / `text` / `html` | -| `auth` | `鉴权` | 角色名或 `none` | +| `response` | `响应` | `json` / `text` / `html` / `sse`(`text/event-stream`) | +| `auth` | `鉴权` | 角色名或 `none`;`bearer` / `api_key` = 不要求 cookie,把 `Authorization` / `X-Api-Key` 注入 payload 由 `# main` 校验 | 正文在请求时执行;返回值按 `response` 序列化。Result 协议见 §8。 diff --git a/ext/ai/agent.mq.md b/ext/ai/agent.mq.md index c6b2ced..a283eef 100644 --- a/ext/ai/agent.mq.md +++ b/ext/ai/agent.mq.md @@ -66,14 +66,14 @@ One LLM turn via the semantic surface (`ask` / `stream`+`collect`). Returns `{te **err = None** **calls = 1** 1. not `text` - **e0 = [1](evs)** + **e0 = > at value=`evs` index=0** **err = > json.get value=`e0` key="message"** 1. `err` **calls = 0** 2. * **r = > model.ask prompt=`prompt`** - **text = [text](r)** - **tokens = [tokens](r)** + **text = > json.get value=`r` key="text"** + **tokens = > json.get value=`r` key="tokens"** **err = > json.get value=`r` key="error"** **fin = > json.get value=`r` key="finish"** 1. `tokens` @@ -181,7 +181,7 @@ Allowlist check, then invoke the runbook `##` via `lib/subtask` (`spawn fn=` → Build a runnable workbook. `skeleton=single` (default): one worker `step`. `skeleton=dual`: research then write agents. On success the parent chooses DONE; runtime `agent_workbook_solidify` freezes the answer. **q = > json.quote text=`goal`** -**esc = > json.parse text={"h":"---\ntitle: agent workbook\nimport llm:ext/ai/llm.mq.md\nimport agent:ext/ai/agent.mq.md\nimport json:lib/json.mq.md\nimport sys:lib/sys.mq.md\nimport wb:lib/writeback.mq.md\nimport subtask:lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > table.empty_list \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. tools=[] means never CALL. Finish the task with a direct final answer; do not invent tools. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 stream=True \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 stream=True \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 stream=True \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"}** +**esc = > json.parse text={"h":"---\ntitle: agent workbook\nimport llm:ext/ai/llm.mq.md\nimport agent:ext/ai/agent.mq.md\nimport json:lib/json.mq.md\nimport sys:lib/sys.mq.md\nimport wb:lib/writeback.mq.md\nimport subtask:lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > table.empty_list \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. tools=[] means never CALL. Finish the task with a direct final answer; do not invent tools. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 stream=False \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 stream=False \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 stream=False \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"}** **h = > json.get value=`esc` key="h"** **s1 = > json.get value=`esc` key="s1"** **s2 = > json.get value=`esc` key="s2"** @@ -281,8 +281,8 @@ Opt-in CoW trial (O1): open → optional upper write → optional run → diff Host tree unchanged until a successful commit. Return map is a GFM table (link-index readable). **sb = sandbox.open root=`root` profile=`profile`** -**id = [id](sb)** -**prof = [profile](sb)** +**id = > json.get value=`sb` key="id"** +**prof = > json.get value=`sb` key="profile"** **ok = True** **stdout = ""** **stderr = ""** @@ -297,14 +297,14 @@ Host tree unchanged until a successful commit. Return map is a GFM table (link-i 1. `source` **ret = sandbox.run id=`id` source=`source`** - **ok = [ok](ret)** - **stdout = [stdout](ret)** - **stderr = [stderr](ret)** + **ok = > json.get value=`ret` key="ok"** + **stdout = > json.get value=`ret` key="stdout"** + **stderr = > json.get value=`ret` key="stderr"** 2. `path` **ret = sandbox.run id=`id` path=`path`** - **ok = [ok](ret)** - **stdout = [stdout](ret)** - **stderr = [stderr](ret)** + **ok = > json.get value=`ret` key="ok"** + **stdout = > json.get value=`ret` key="stdout"** + **stderr = > json.get value=`ret` key="stderr"** 3. * **_ = 1** @@ -360,9 +360,9 @@ With `sandbox=True`, run via `## trial` first (commit on ok); host unchanged unt 1. `sandbox` **tr = trial path=`path` root=`sandbox_root` profile=`sandbox_profile` commit=True** - **ok = [ok](tr)** - **stdout = [stdout](tr)** - **stderr = [stderr](tr)** + **ok = > json.get value=`tr` key="ok"** + **stdout = > json.get value=`tr` key="stdout"** + **stderr = > json.get value=`tr` key="stderr"** 1. `ok` **code = 0** 2. * @@ -379,10 +379,10 @@ With `sandbox=True`, run via `## trial` first (commit on ok); host unchanged unt 2. * **id = subtask.spawn path=`path`** **waited = subtask.wait id=`id`** - **code = [code](waited)** - **value = [value](waited)** - **stdout = [stdout](waited)** - **stderr = [stderr](waited)** + **code = > json.get value=`waited` key="code"** + **value = > json.get value=`waited` key="value"** + **stdout = > json.get value=`waited` key="stdout"** + **stderr = > json.get value=`waited` key="stderr"** **obs = inspect_workbook path=`path` exit_code=`code` value=`value` stdout=`stdout` stderr=`stderr`** **out = ** @@ -1595,7 +1595,7 @@ LLM Plan → CALL/READ/DECISION loop. Returns `{decision,reply,observation,event **evs = > model.stream prompt=`ctx` echo=`echo`** **last_reply = > llm.collect events=`evs`** **evs_all = > plan_merge_deltas events=`evs_all` from=`evs` stream=`stream`** - **e0 = [1](evs)** + **e0 = > at value=`evs` index=0** **terr = > json.get value=`e0` key="message"** **etype = > json.get value=`e0` key="type"** 1. `etype` == "error" @@ -1903,7 +1903,7 @@ Optional `step_kind=` (O3) selects backend via module `## step_route` before the 1. `step_kind` **sr = step_route kind=`step_kind`** - **backend = [backend](sr)** + **backend = > json.get value=`sr` key="backend"** 2. * **_ = 1** @@ -2054,9 +2054,9 @@ Primary author entry (v2 + P4): Adaptive `route` → execute (policy/kb skill) o **path = > json.get value=`routed` key="resource"** 1. `path` **aw = await_workbook path=`path` sandbox=`sandbox` sandbox_profile=`sandbox_profile`** - **code = [code](aw)** - **child_val = [value](aw)** - **last_obs = [observation](aw)** + **code = > json.get value=`aw` key="code"** + **child_val = > json.get value=`aw` key="value"** + **last_obs = > json.get value=`aw` key="observation"** 1. `code` == 0 > agent_kb_record_hit kb_dir=`kb_dir` goal=`task` improve_every=`improve_every` **lf = > json.get value=`routed` key="llm_free"** @@ -2094,9 +2094,9 @@ Primary author entry (v2 + P4): Adaptive `route` → execute (policy/kb skill) o 1. `am` **path = > json.get value=`applied` key="resource"** **aw = await_workbook path=`path` sandbox=`sandbox` sandbox_profile=`sandbox_profile`** - **code = [code](aw)** - **child_val = [value](aw)** - **last_obs = [observation](aw)** + **code = > json.get value=`aw` key="code"** + **child_val = > json.get value=`aw` key="value"** + **last_obs = > json.get value=`aw` key="observation"** 1. `code` == 0 **exec_mode = "routed"** **sk = > json.get value=`applied` key="skill"** @@ -2153,9 +2153,9 @@ Primary author entry (v2 + P4): Adaptive `route` → execute (policy/kb skill) o 1. `llm_free` **path = > json.get value=`resolved` key="resource"** **aw = await_workbook path=`path` sandbox=`sandbox` sandbox_profile=`sandbox_profile`** - **code = [code](aw)** - **child_val = [value](aw)** - **last_obs = [observation](aw)** + **code = > json.get value=`aw` key="code"** + **child_val = > json.get value=`aw` key="value"** + **last_obs = > json.get value=`aw` key="observation"** 1. `code` == 0 > agent_kb_record_hit kb_dir=`kb_dir` goal=`task` improve_every=`improve_every` **exec_mode = "compiled"** @@ -2977,7 +2977,7 @@ Deterministic success stop (loop engineering): when the child already returned a # mcp_server + `name`=marqdo -Minimal MCP Server host (stdio JSON-RPC). Tools point at entry-module `lib.member` functions (same bridge as `ext/web` invoke). Evidence/results may carry `authority=workbook`. +Minimal MCP Server host (stdio JSON-RPC / Streamable HTTP). Tools point at entry-module `lib.member` functions (same bridge as `ext/web` invoke). Evidence/results may carry `authority=workbook`. **p = > plugin.native_path name="agent"** 1. `p` @@ -2986,11 +2986,12 @@ Minimal MCP Server host (stdio JSON-RPC). Tools point at entry-module `lib.membe > print text=ext/ai/agent: native agent plugin not found (build marqdo_plugin_agent or marqdo ext add agent) > sys.exit code=1 +**tools0 = > table.empty_list** `h` = | _type | tools | name | |-------|-------|------| -| mcp_server | [] | `name` | +| mcp_server | `tools0` | `name` | *h* @@ -3002,6 +3003,8 @@ Minimal MCP Server host (stdio JSON-RPC). Tools point at entry-module `lib.membe Register one tool. `fn` must be `lib.member` imported on the entry workbook. **tools = > json.get value=`self` key="tools"** +1. not `tools` + **tools = > table.empty_list** `row` = | name | fn | description | @@ -3014,9 +3017,12 @@ Register one tool. `fn` must be `lib.member` imported on the entry workbook. ## serve + `transport`=stdio + + `host`="127.0.0.1" + + `port`=7434 + + `path`="/mcp" -Block on stdio MCP (`initialize` / `tools/list` / `tools/call`). HTTP transport is H4b. +Block on MCP: `stdio` (line JSON-RPC) or `http` / `streamable-http` (Streamable HTTP, POST JSON-RPC + optional GET SSE). Spec 2025-03-26. **name = > json.get value=`self` key="name"** **tools = > json.get value=`self` key="tools"** -*> agent_mcp_serve name=`name` tools=`tools` transport=`transport`* +*> agent_mcp_serve name=`name` tools=`tools` transport=`transport` host=`host` port=`port` path=`path`* diff --git a/ext/ai/llm.mq.md b/ext/ai/llm.mq.md index 2afb127..5177dd2 100644 --- a/ext/ai/llm.mq.md +++ b/ext/ai/llm.mq.md @@ -26,14 +26,14 @@ Collapse a stream event list to final answer text (`done.result` or `error.messa **answer = ""** - [ev](events) - **t = [type](ev)** + **t = > json.get value=`ev` key="type"** 1. `t` == "done" - **answer = [result](ev)** + **answer = > json.get value=`ev` key="result"** 2. `t` == "error" - **answer = [message](ev)** + **answer = > json.get value=`ev` key="message"** 3. `t` == "delta" 4. `t` == "text" - **chunk = [text](ev)** + **chunk = > json.get value=`ev` key="text"** 1. `chunk` **answer = answer + chunk** 2. * @@ -168,7 +168,8 @@ Module convenience: create a default handle and return **answer text**. Pass `pa **m = > create model=`model` base_url=`base_url` api_key=`api_key`** **r = > m.ask prompt=`p`** -*[text](r)* +**_ret = > json.get value=`r` key="text"** +*_ret* # llm + `model`=None @@ -306,11 +307,11 @@ Hoist receiver fields before the result table — table cells can shadow `self` column names (`model`, `usage`), so `[model](self)` / `[total_tokens](usage)` inside the table is unsafe. -**mdl = [model](self)** -**b = [backend](self)** -**nm = [name](self)** +**mdl = > json.get value=`self` key="model"** +**b = > json.get value=`self` key="backend"** +**nm = > json.get value=`self` key="name"** 1. `usage` - **tt = [total_tokens](usage)** + **tt = > json.get value=`usage` key="total_tokens"** 2. * **tt = 0** 1. not `tt` @@ -369,10 +370,12 @@ Internal / compatibility primitive. Prefer `ask` / `stream` in new code. 1. `stream` **pack = > self.complete_result prompt=`prompt` stream=True echo=`echo`** - *[events](pack)* + **_ret = > json.get value=`pack` key="events"** +*_ret* 2. * **pack = > self.complete_result prompt=`prompt` stream=False echo=`echo`** - *[text](pack)* + **_ret = > json.get value=`pack` key="text"** +*_ret* ## chat + `prompt` diff --git a/ext/ai/llm/openai.mq.md b/ext/ai/llm/openai.mq.md index 9680863..8dad67c 100644 --- a/ext/ai/llm/openai.mq.md +++ b/ext/ai/llm/openai.mq.md @@ -104,8 +104,9 @@ POST `/chat/completions` (or stream SSE). Prefers `plugins/llm` ABI (`llm_chat_c **req = > table.put in=`req` at="stream" value=True** **body = > json.stringify value=`req`** **resp = > net.http_post_sse url=`url` body=`body` headers=`headers` echo=`echo`** - 1. [status](resp) == 200 - **evs = [events](resp)** + **st = > json.get value=`resp` key="status"** + 1. `st` == 200 + **evs = > json.get value=`resp` key="events"** `pack` = @@ -116,11 +117,10 @@ POST `/chat/completions` (or stream SSE). Prefers `plugins/llm` ABI (`llm_chat_c *pack* 2. * Soft transport / HTTP failure — structured pack, never abort the VM. - **st = [status](resp)** **msg = "HTTP " + `st`** - **evs = [events](resp)** + **evs = > json.get value=`resp` key="events"** 1. `evs` - **e0 = [1](evs)** + **e0 = > at value=`evs` index=0** **m2 = > json.get value=`e0` key="message"** 1. `m2` **msg = `m2`** @@ -134,16 +134,20 @@ POST `/chat/completions` (or stream SSE). Prefers `plugins/llm` ABI (`llm_chat_c 2. * **body = > json.stringify value=`req`** **resp = > net.http_post url=`url` body=`body` headers=`headers`** - 1. [status](resp) == 200 - **data = > json.parse text=[body](resp)** - **msg = [message]([1]([choices](data)))** + **st = > json.get value=`resp` key="status"** + 1. `st` == 200 + **raw = > json.get value=`resp` key="body"** + **data = > json.parse text=`raw`** + **choices = > json.get value=`data` key="choices"** + **choice0 = > at value=`choices` index=0** + **msg = > json.get value=`choice0` key="message"** **text = > json.get value=`msg` key="content"** 1. not `text` **text = ""** 2. * **_ = 1** **usage = > usage_from data=`data`** - **fr = > json.get value=[1]([choices](data)) key="finish_reason"** + **fr = > json.get value=`choice0` key="finish_reason"** 1. not `fr` **fr = "stop"** 2. * @@ -159,8 +163,7 @@ POST `/chat/completions` (or stream SSE). Prefers `plugins/llm` ABI (`llm_chat_c *pack* 2. * Soft transport / HTTP failure — structured pack, never abort the VM. - **st = [status](resp)** - **raw = [body](resp)** + **raw = > json.get value=`resp` key="body"** **msg = "HTTP " + `st`** 1. `raw` **msg = `msg` + ": " + `raw`** diff --git a/plugins/agent/src/mcp_server.rs b/plugins/agent/src/mcp_server.rs index 9b8502f..679a33d 100644 --- a/plugins/agent/src/mcp_server.rs +++ b/plugins/agent/src/mcp_server.rs @@ -1,9 +1,14 @@ -//! Minimal MCP Server (stdio JSON-RPC) — tools map to `lib.member` via host `call_lib_path`. +//! Minimal MCP Server — stdio JSON-RPC + Streamable HTTP (spec 2025-03-26). use serde_json::{json, Map, Value}; use std::ffi::CStr; -use std::io::{BufRead, BufReader, Write}; +use std::io::{BufRead, BufReader, Read, Write}; +use std::net::{TcpListener, TcpStream}; use std::os::raw::{c_char, c_int}; +use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::Arc; +use std::thread; +use std::time::{SystemTime, UNIX_EPOCH}; use crate::{host_query_json_args, parse_args, set_err, set_out}; @@ -98,6 +103,40 @@ fn call_tool(tools: &[Value], name: &str, arguments: &Value) -> Result Option { + let id = msg.get("id").cloned().unwrap_or(Value::Null); + let method = msg.get("method").and_then(|v| v.as_str()).unwrap_or(""); + let params = msg.get("params").cloned().unwrap_or(json!({})); + + if matches!(id, Value::Null) && method.starts_with("notifications/") { + return None; + } + + Some(match method { + "initialize" => rpc_result( + &id, + json!({ + "protocolVersion": "2025-03-26", + "capabilities": { "tools": {} }, + "serverInfo": { "name": name, "version": "0.1.0" } + }), + ), + "tools/list" | "list_tools" => rpc_result(&id, tools_list(tools)), + "tools/call" | "call_tool" => { + let tname = params.get("name").and_then(|v| v.as_str()).unwrap_or(""); + let args = params.get("arguments").cloned().unwrap_or(json!({})); + match call_tool(tools, tname, &args) { + Ok(r) => rpc_result(&id, r), + Err(e) => rpc_error(&id, -32000, &e), + } + } + "ping" => rpc_result(&id, json!({})), + "" => rpc_error(&id, -32600, "missing method"), + other => rpc_error(&id, -32601, &format!("method not found: {other}")), + }) +} + /// Blocking stdio MCP loop. `tools` is a JSON array of `{name, fn, description}`. pub fn serve_stdio(name: &str, tools: Vec) -> Result { let stdin = std::io::stdin(); @@ -106,41 +145,274 @@ pub fn serve_stdio(name: &str, tools: Vec) -> Result { let Some(msg) = read_line_message(&mut reader)? else { break; }; - let id = msg.get("id").cloned().unwrap_or(Value::Null); - let method = msg.get("method").and_then(|v| v.as_str()).unwrap_or(""); - let params = msg.get("params").cloned().unwrap_or(json!({})); - - if matches!(id, Value::Null) && method.starts_with("notifications/") { - continue; + if let Some(reply) = dispatch_rpc(name, &tools, &msg) { + write_message(&reply)?; } - - let reply_msg = match method { - "initialize" => rpc_result( - &id, - json!({ - "protocolVersion": "2024-11-05", - "capabilities": { "tools": {} }, - "serverInfo": { "name": name, "version": "0.1.0" } - }), - ), - "tools/list" | "list_tools" => rpc_result(&id, tools_list(&tools)), - "tools/call" | "call_tool" => { - let tname = params.get("name").and_then(|v| v.as_str()).unwrap_or(""); - let args = params.get("arguments").cloned().unwrap_or(json!({})); - match call_tool(&tools, tname, &args) { - Ok(r) => rpc_result(&id, r), - Err(e) => rpc_error(&id, -32000, &e), - } - } - "ping" => rpc_result(&id, json!({})), - "" => rpc_error(&id, -32600, "missing method"), - other => rpc_error(&id, -32601, &format!("method not found: {other}")), - }; - write_message(&reply_msg)?; } Ok(json!({ "ok": true, "transport": "stdio" })) } +fn new_session_id() -> String { + static SEQ: AtomicU64 = AtomicU64::new(1); + let n = SEQ.fetch_add(1, Ordering::Relaxed); + let ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|d| d.as_millis()) + .unwrap_or(0); + format!("mcp-{ms}-{n}") +} + +fn read_http_request( + reader: &mut BufReader, +) -> Result<(String, String, Vec<(String, String)>, Vec), String> { + let mut request_line = String::new(); + reader + .read_line(&mut request_line) + .map_err(|e| format!("read request: {e}"))?; + let parts: Vec<&str> = request_line.trim().split_whitespace().collect(); + if parts.len() < 2 { + return Err("bad request line".into()); + } + let method = parts[0].to_string(); + let path = parts[1].to_string(); + let mut headers = Vec::new(); + let mut content_length = 0usize; + loop { + let mut line = String::new(); + reader + .read_line(&mut line) + .map_err(|e| format!("read header: {e}"))?; + let line = line.trim_end_matches(['\r', '\n']); + if line.is_empty() { + break; + } + if let Some((k, v)) = line.split_once(':') { + let key = k.trim().to_string(); + let val = v.trim().to_string(); + if key.eq_ignore_ascii_case("content-length") { + content_length = val.parse().unwrap_or(0); + } + headers.push((key, val)); + } + } + let mut body = vec![0u8; content_length]; + if content_length > 0 { + reader + .read_exact(&mut body) + .map_err(|e| format!("read body: {e}"))?; + } + Ok((method, path, headers, body)) +} + +fn header_get<'a>(headers: &'a [(String, String)], name: &str) -> Option<&'a str> { + headers + .iter() + .find(|(k, _)| k.eq_ignore_ascii_case(name)) + .map(|(_, v)| v.as_str()) +} + +fn write_http( + stream: &mut TcpStream, + status: u16, + reason: &str, + content_type: &str, + body: &[u8], + extra: &[(&str, &str)], +) -> Result<(), String> { + let mut head = format!( + "HTTP/1.1 {status} {reason}\r\nContent-Type: {content_type}\r\nContent-Length: {}\r\nConnection: close\r\n", + body.len() + ); + for (k, v) in extra { + head.push_str(k); + head.push_str(": "); + head.push_str(v); + head.push_str("\r\n"); + } + head.push_str("\r\n"); + stream + .write_all(head.as_bytes()) + .map_err(|e| e.to_string())?; + stream.write_all(body).map_err(|e| e.to_string())?; + stream.flush().map_err(|e| e.to_string())?; + Ok(()) +} + +fn path_matches(req_path: &str, endpoint: &str) -> bool { + let base = req_path.split('?').next().unwrap_or(req_path); + base == endpoint || base.trim_end_matches('/') == endpoint.trim_end_matches('/') +} + +fn handle_http_conn( + stream: TcpStream, + name: &str, + tools: &[Value], + endpoint: &str, +) -> Result<(), String> { + let mut reader = BufReader::new(stream); + let (method, path, headers, body) = read_http_request(&mut reader)?; + let mut stream = reader.into_inner(); + if !path_matches(&path, endpoint) { + write_http( + &mut stream, + 404, + "Not Found", + "application/json", + br#"{"error":"not_found"}"#, + &[], + )?; + return Ok(()); + } + + if method.eq_ignore_ascii_case("GET") { + // Optional SSE stream — empty keepalive then close (clients may 405). + let accept = header_get(&headers, "Accept").unwrap_or(""); + if accept.contains("text/event-stream") { + let body = b": mcp streamable-http ready\n\n"; + write_http( + &mut stream, + 200, + "OK", + "text/event-stream", + body, + &[("Cache-Control", "no-cache")], + )?; + } else { + write_http( + &mut stream, + 405, + "Method Not Allowed", + "application/json", + br#"{"error":"use_post_for_jsonrpc"}"#, + &[("Allow", "POST, GET")], + )?; + } + return Ok(()); + } + + if method.eq_ignore_ascii_case("DELETE") { + write_http(&mut stream, 200, "OK", "application/json", b"{}", &[])?; + return Ok(()); + } + + if !method.eq_ignore_ascii_case("POST") { + write_http( + &mut stream, + 405, + "Method Not Allowed", + "application/json", + br#"{"error":"method_not_allowed"}"#, + &[("Allow", "POST, GET, DELETE")], + )?; + return Ok(()); + } + + let text = String::from_utf8_lossy(&body); + let msg: Value = serde_json::from_str(text.trim()).map_err(|e| format!("json-rpc: {e}"))?; + let is_init = msg.get("method").and_then(|v| v.as_str()) == Some("initialize"); + let existing_sid = header_get(&headers, "Mcp-Session-Id") + .or_else(|| header_get(&headers, "MCP-Session-Id")) + .map(|s| s.to_string()); + + // Notifications → 202 Accepted, empty body. + if msg.get("id").is_none() || msg.get("id") == Some(&Value::Null) { + if let Some(m) = msg.get("method").and_then(|v| v.as_str()) { + if m.starts_with("notifications/") { + write_http( + &mut stream, + 202, + "Accepted", + "application/json", + b"", + &[], + )?; + return Ok(()); + } + } + } + + let reply = match dispatch_rpc(name, tools, &msg) { + Some(r) => r, + None => { + write_http( + &mut stream, + 202, + "Accepted", + "application/json", + b"", + &[], + )?; + return Ok(()); + } + }; + + let body = serde_json::to_vec(&reply).map_err(|e| e.to_string())?; + let mut extras: Vec<(&str, String)> = Vec::new(); + if is_init { + let sid = existing_sid.unwrap_or_else(new_session_id); + extras.push(("Mcp-Session-Id", sid)); + } else if let Some(sid) = existing_sid { + extras.push(("Mcp-Session-Id", sid)); + } + let extra_refs: Vec<(&str, &str)> = extras.iter().map(|(k, v)| (*k, v.as_str())).collect(); + write_http( + &mut stream, + 200, + "OK", + "application/json", + &body, + &extra_refs, + )?; + Ok(()) +} + +/// Streamable HTTP MCP (POST JSON-RPC + optional GET SSE). Spec 2025-03-26. +pub fn serve_http( + name: &str, + tools: Vec, + host: &str, + port: u16, + path: &str, +) -> Result { + let addr = format!("{host}:{port}"); + let listener = TcpListener::bind(&addr).map_err(|e| format!("bind {addr}: {e}"))?; + let name = Arc::new(name.to_string()); + let tools = Arc::new(tools); + let endpoint = Arc::new(if path.is_empty() { + "/mcp".to_string() + } else if path.starts_with('/') { + path.to_string() + } else { + format!("/{path}") + }); + eprintln!( + "mcp streamable-http listening on http://{addr}{} (POST JSON-RPC)", + &*endpoint + ); + for conn in listener.incoming() { + match conn { + Ok(stream) => { + let name = Arc::clone(&name); + let tools = Arc::clone(&tools); + let endpoint = Arc::clone(&endpoint); + thread::spawn(move || { + if let Err(e) = handle_http_conn(stream, &name, &tools, &endpoint) { + eprintln!("mcp http conn: {e}"); + } + }); + } + Err(e) => eprintln!("mcp http accept: {e}"), + } + } + Ok(json!({ + "ok": true, + "transport": "http", + "host": host, + "port": port, + "path": *endpoint + })) +} + pub fn tools_from_value(v: &Value) -> Vec { if let Some(arr) = v.as_array() { return arr.clone(); @@ -180,13 +452,6 @@ pub unsafe extern "C" fn agent_mcp_serve( .get("transport") .and_then(|v| v.as_str()) .unwrap_or("stdio"); - if transport != "stdio" { - set_err( - err_msg, - &format!("mcp serve: transport `{transport}` not implemented yet (use stdio)"), - ); - return 1; - } let name = args .get("name") .and_then(|v| v.as_str()) @@ -195,7 +460,38 @@ pub unsafe extern "C" fn agent_mcp_serve( .get("tools") .map(tools_from_value) .unwrap_or_default(); - match serve_stdio(name, tools) { + + let result = match transport { + "stdio" => serve_stdio(name, tools), + "http" | "streamable-http" | "sse" => { + let host = args + .get("host") + .and_then(|v| v.as_str()) + .unwrap_or("127.0.0.1"); + let port = args + .get("port") + .and_then(|v| { + v.as_u64() + .or_else(|| v.as_i64().map(|n| n as u64)) + .or_else(|| v.as_str().and_then(|s| s.parse().ok())) + }) + .unwrap_or(7434) as u16; + let path = args + .get("path") + .and_then(|v| v.as_str()) + .unwrap_or("/mcp"); + serve_http(name, tools, host, port, path) + } + other => { + set_err( + err_msg, + &format!("mcp serve: transport `{other}` not supported (use stdio|http)"), + ); + return 1; + } + }; + + match result { Ok(v) => { set_out(out_json, &v.to_string()); 0 @@ -207,6 +503,5 @@ pub unsafe extern "C" fn agent_mcp_serve( } } -// Silence unused import if CStr unused in this module. #[allow(dead_code)] fn _unused(_: &CStr) {} diff --git a/plugins/web/internal/httpx/helpers.go b/plugins/web/internal/httpx/helpers.go index 1b19fa9..b6c25e0 100644 --- a/plugins/web/internal/httpx/helpers.go +++ b/plugins/web/internal/httpx/helpers.go @@ -3,6 +3,7 @@ package httpx import ( "encoding/json" "fmt" + "io" "net/http" "net/url" "strings" @@ -118,12 +119,74 @@ func jsonWrapInvokeValue(value any) (int, map[string]any, error) { } switch t := value.(type) { case map[string]any: - return http.StatusOK, t, nil + code := http.StatusOK + if ok, has := t["ok"]; has { + if b, isBool := ok.(bool); isBool && !b { + if errMsg, _ := t["error"].(string); strings.EqualFold(errMsg, "unauthorized") || + strings.Contains(strings.ToLower(errMsg), "unauthorized") { + code = http.StatusUnauthorized + } + } + } + return code, t, nil default: return http.StatusOK, map[string]any{"ok": true, "result": value}, nil } } +// writeSSE writes OpenAI-compatible (or generic) Server-Sent Events. +// value may be a string body, or a map with key "sse" / "body" / "chunks". +func writeSSE(w http.ResponseWriter, value any) { + w.Header().Set("Content-Type", "text/event-stream; charset=utf-8") + w.Header().Set("Cache-Control", "no-cache") + w.Header().Set("Connection", "keep-alive") + w.WriteHeader(http.StatusOK) + flusher, _ := w.(http.Flusher) + + writeChunk := func(s string) { + if s == "" { + return + } + if !strings.HasSuffix(s, "\n") { + s += "\n" + } + _, _ = io.WriteString(w, s) + if flusher != nil { + flusher.Flush() + } + } + + switch t := value.(type) { + case string: + writeChunk(t) + case map[string]any: + if s, ok := t["sse"].(string); ok { + writeChunk(s) + return + } + if s, ok := t["body"].(string); ok { + writeChunk(s) + return + } + if chunks, ok := t["chunks"].([]any); ok { + for _, c := range chunks { + writeChunk(fmt.Sprint(c)) + } + return + } + b, err := json.Marshal(t) + if err != nil { + writeChunk("data: {\"error\":\"sse_encode\"}\n\n") + return + } + writeChunk("data: " + string(b) + "\n\n") + writeChunk("data: [DONE]\n\n") + default: + writeChunk("data: " + fmt.Sprint(value) + "\n\n") + writeChunk("data: [DONE]\n\n") + } +} + func invokeArgsFromPayload(payload map[string]any) map[string]any { args := map[string]any{} for k, v := range payload { diff --git a/plugins/web/internal/httpx/routes_artifact.go b/plugins/web/internal/httpx/routes_artifact.go index c2babb6..61e361f 100644 --- a/plugins/web/internal/httpx/routes_artifact.go +++ b/plugins/web/internal/httpx/routes_artifact.go @@ -17,8 +17,8 @@ type artifactRoute struct { Path string File string Request string // json | form | none | query - Response string // json | text | html - Auth string // role name or "" / "none" + Response string // json | text | html | sse + Auth string // role name or "" / "none" | "bearer" } func parseArtifactRoute(v any) artifactRoute { @@ -57,16 +57,21 @@ func (st *state) mountArtifactRoutes(mux *http.ServeMux) { func (st *state) handleArtifact(w http.ResponseWriter, r *http.Request, route artifactRoute) { if route.Auth != "" && !strings.EqualFold(route.Auth, "none") { - cookie := r.Header.Get("Cookie") - user := session.UsernameFromCookie(cookie) - if user == "" { - jsonErr(w, http.StatusUnauthorized, "auth required") - return - } - role := session.RoleFromCookie(cookie) - if role != "" && role != route.Auth && role != "admin" && role != "superadmin" { - jsonErr(w, http.StatusForbidden, "forbidden") - return + if strings.EqualFold(route.Auth, "bearer") || strings.EqualFold(route.Auth, "api_key") { + // Bearer / API-key auth is enforced inside the Endpoint `# main` + // (payload carries authorization / api_key). Do not require cookies. + } else { + cookie := r.Header.Get("Cookie") + user := session.UsernameFromCookie(cookie) + if user == "" { + jsonErr(w, http.StatusUnauthorized, "auth required") + return + } + role := session.RoleFromCookie(cookie) + if role != "" && role != route.Auth && role != "admin" && role != "superadmin" { + jsonErr(w, http.StatusForbidden, "forbidden") + return + } } } @@ -115,6 +120,16 @@ func (st *state) handleArtifact(w http.ResponseWriter, r *http.Request, route ar payload[name] = v } } + if auth := strings.TrimSpace(r.Header.Get("Authorization")); auth != "" { + if _, exists := payload["authorization"]; !exists { + payload["authorization"] = auth + } + } + if key := strings.TrimSpace(r.Header.Get("X-Api-Key")); key != "" { + if _, exists := payload["api_key"]; !exists { + payload["api_key"] = key + } + } value, err := plugin.RunArtifact(route.File, payload) if err != nil { @@ -131,6 +146,8 @@ func (st *state) handleArtifact(w http.ResponseWriter, r *http.Request, route ar w.Header().Set("Content-Type", "text/html; charset=utf-8") w.WriteHeader(http.StatusOK) _, _ = io.WriteString(w, fmt.Sprint(value)) + case "sse", "event-stream", "text/event-stream": + writeSSE(w, value) default: code, body, err := jsonWrapInvokeValue(value) if err != nil { diff --git a/plugins/web/internal/httpx/routes_invoke.go b/plugins/web/internal/httpx/routes_invoke.go index 733cde3..0e62bc4 100644 --- a/plugins/web/internal/httpx/routes_invoke.go +++ b/plugins/web/internal/httpx/routes_invoke.go @@ -102,6 +102,18 @@ func (st *state) handleInvoke(w http.ResponseWriter, r *http.Request, route invo } } + // Bind common auth / client headers for OpenAI-compatible and API-key surfaces. + if auth := strings.TrimSpace(r.Header.Get("Authorization")); auth != "" { + if _, exists := payload["authorization"]; !exists { + payload["authorization"] = auth + } + } + if key := strings.TrimSpace(r.Header.Get("X-Api-Key")); key != "" { + if _, exists := payload["api_key"]; !exists { + payload["api_key"] = key + } + } + args := invokeArgsFromPayload(payload) value, err := plugin.CallLibPath(route.FnPath, args) if err != nil { @@ -114,10 +126,22 @@ func (st *state) handleInvoke(w http.ResponseWriter, r *http.Request, route invo strings.Contains(msg, "no active host") { code = http.StatusBadRequest } + if strings.Contains(msg, "unauthorized") || strings.Contains(msg, "Unauthorized") { + code = http.StatusUnauthorized + } jsonErr(w, code, msg) return } + // OpenAI-compatible handlers may return `{sse: "..."}` to force event-stream + // even when the route's declared return mode is json. + if m, ok := value.(map[string]any); ok { + if s, ok := m["sse"].(string); ok && strings.TrimSpace(s) != "" { + writeSSE(w, m) + return + } + } + switch route.ReturnMode { case "text", "html", "text/html": if value == nil { @@ -135,6 +159,8 @@ func (st *state) handleInvoke(w http.ResponseWriter, r *http.Request, route invo w.Header().Set("Content-Type", ct) w.WriteHeader(http.StatusOK) _, _ = io.WriteString(w, text) + case "sse", "event-stream", "text/event-stream": + writeSSE(w, value) case "status": if value == nil { jsonErr(w, http.StatusInternalServerError, "null result")