From 51eb98e0ae824cc995982e6b45b39c52733b67a9 Mon Sep 17 00:00:00 2001
From: JianFeeeee <root@qq.com>
Date: Tue, 25 Aug 2026 18:58:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(mcp+adapter):=20=E6=B5=81=E5=BC=8F=20tool?=
 =?UTF-8?q?=5Fcalls=20=E8=A7=A3=E6=9E=90=E4=BF=AE=E5=A4=8D=20+=20MCP=20tra?=
 =?UTF-8?q?nsport=20=E8=B6=85=E6=97=B6=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

openai adapter transform_stream_chunk:
- OpenAI 流式分片是嵌套格式 function.{name,arguments}，原样透传后
  json.Unmarshal 到扁平 ToolCall{name,arguments} 时 name 恒为空，
  accumulateStream flushToolCall 因 acc.name=="" 静默丢弃整个工具调用
  （流式路径自上线起 tool_calls 全部丢失的根因）
- 现在正确解包 function.name → name，function.arguments → raw_arguments
  （保留原始 JSON 字符串分片，由 accumulateStream 按 index 拼接）
- 不按 name 过滤分片：OpenAI 流式续传块 name 为空但携带 arguments 分片

mcp stdio/sse transport:
- stdio Send() 无超时：server 进程卡死时插件加载永久阻塞
- sse http.Client 无超时：远程 server 网络抖动/无响应时永久阻塞，
  导致 webui 等后续插件全部无法启动（生产实例偶发启动卡死根因）
- stdio 加 60s 请求超时；sse client 加 30s 整体 + 10s 拨号超时
---
 .gitignore                       |  2 +-
 internal/lua/adapters/openai.lua | 23 ++++++++++++++++++++++-
 internal/plugins/mcp/sse.go      | 16 ++++++++++++++--
 internal/plugins/mcp/stdio.go    | 12 ++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8c7c18..e00fa9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ third_party/homeagent-sdk/example/
 codegraph.json
 
 # 运行时产物(不提交)
-adapters/
+/adapters/
 knowledge/
 memory/
 scripts/
diff --git a/internal/lua/adapters/openai.lua b/internal/lua/adapters/openai.lua
index 4ef5b6c..675b66a 100644
--- a/internal/lua/adapters/openai.lua
+++ b/internal/lua/adapters/openai.lua
@@ -99,7 +99,28 @@ function adapter.transform_stream_chunk(raw_chunk)
         unified.reasoning_content = delta.reasoning_content
     end
     if delta.tool_calls then
-        unified.tool_calls = delta.tool_calls
+        local tcs = {}
+        for _, tc in ipairs(delta.tool_calls) do
+            -- OpenAI 流式格式: {function:{name,arguments}, id, type, index}
+            -- homed StreamChunk.ToolCalls 期望扁平格式: {id, type, name, raw_arguments}
+            local fn = tc["function"]
+            local name = (type(fn) == "table" and fn.name) or tc.name or ""
+            local raw_args = ""
+            if type(fn) == "table" and type(fn.arguments) == "string" then
+                raw_args = fn.arguments
+            elseif type(tc.arguments) == "string" then
+                raw_args = tc.arguments
+            end
+            -- 不能按 name 过滤：OpenAI 流式分片中后续块 name 为空但携带 arguments
+            -- accumulateStream 按 index 累积并在 flushToolCall 时校验 name
+            table.insert(tcs, {
+                id = tc.id or "",
+                type = tc.type or "function",
+                name = name,
+                raw_arguments = raw_args
+            })
+        end
+        unified.tool_calls = tcs
     end
     return json.encode(unified)
 end
diff --git a/internal/plugins/mcp/sse.go b/internal/plugins/mcp/sse.go
index 41a2a06..bdccfb4 100644
--- a/internal/plugins/mcp/sse.go
+++ b/internal/plugins/mcp/sse.go
@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"strings"
+	"time"
 )
 
 // SSETransport 通过 HTTP POST 进行 JSON-RPC 通信。
@@ -18,9 +20,19 @@ type SSETransport struct {
 }
 
 func NewSSETransport(url string) *SSETransport {
+	// 必须带超时：远程 MCP server 网络抖动/无响应时，
+	// 无超时的 client 会让插件加载永久阻塞（webui 等后续插件全部起不来）
 	return &SSETransport{
-		url:    url,
-		client: &http.Client{},
+		url: url,
+		client: &http.Client{
+			Timeout: 30 * time.Second,
+			Transport: &http.Transport{
+				DialContext: (&net.Dialer{
+					Timeout:   10 * time.Second,
+					KeepAlive: 30 * time.Second,
+				}).DialContext,
+			},
+		},
 	}
 }
 
diff --git a/internal/plugins/mcp/stdio.go b/internal/plugins/mcp/stdio.go
index d3f0f6f..6341bc4 100644
--- a/internal/plugins/mcp/stdio.go
+++ b/internal/plugins/mcp/stdio.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"sync"
+	"time"
 )
 
 // StdioTransport 通过子进程 stdin/stdout 进行 JSON-RPC 通信
@@ -105,11 +106,22 @@ func (t *StdioTransport) Send(req *rpcRequest) (*rpcResponse, error) {
 		return nil, fmt.Errorf("write newline: %w", err)
 	}
 
+	// 超时保护：MCP server 进程启动慢/卡死不响应时，不能让插件加载永久阻塞
+	// （stdio server 冷启动如 npx 拉包可能数十秒，给 60s）
+	timeout := time.After(60 * time.Second)
 	select {
 	case resp := <-ch:
 		return resp, nil
 	case <-t.done:
+		t.mu.Lock()
+		delete(t.pending, req.ID)
+		t.mu.Unlock()
 		return nil, fmt.Errorf("mcp transport closed")
+	case <-timeout:
+		t.mu.Lock()
+		delete(t.pending, req.ID)
+		t.mu.Unlock()
+		return nil, fmt.Errorf("mcp request timeout (60s), method may be hung")
 	}
 }