codebee 0.1.48 → 0.1.50

package/app/core/builtin_agent.py

@@ -5,7 +5,8 @@
 进程与框架开销，且 CLI 的事件流日志（启动命令、提示词回显、重连报错）会污染
 对话视图。内置智能体直接打 chat API + 工具循环：
   - 模型选择：编排者配置（resolve_orchestrator）优先；未启用时扫首个可用供应商；
-  - 工具：list_files / read_file / write_file，全部锁死在工作目录内；
+  - 工具：list_files / read_file / write_file（锁死工作目录内）+ run_command
+    （本机全权执行命令，产品定位全信任，与 codex/claude 全权沙箱同档）；
   - 协议：anthropic / openai 走原生工具循环；google 无工具协议（纯文本直答）。
 密钥冷却/多 KEY 展开复用 modelhub 既有记账（note_key_ok / note_key_error）。
 """
@@ -17,9 +18,12 @@ import json
 import mimetypes
 import os
 import threading
+import time
+import urllib.parse
+import urllib.request
 from pathlib import Path
 
-from . import modelhub, runner
+from . import modelhub, runner, tlsctx
 
 MAX_TOOL_ITERS = 16          # 单步工具循环上限（防模型打转）
 READ_MAX_BYTES = 64 * 1024   # read_file 单次读取上限
@@ -30,6 +34,13 @@ MAX_IMAGES = 8                 # 单次最多随消息传几张图（请求体
 IMAGE_MAX_EDGE = 1568          # 长边上限（视觉模型通行建议值，超出等比缩）
 IMAGE_JPEG_BYTES = 3500 * 1024   # 缩放后仍超此大小 → 转 JPEG q85
 IMAGE_MAX_BYTES = 5 * 1024 * 1024   # 单张最终字节硬上限（超出剔除并日志）
+THINK_MAX_CHARS = 20000        # 单次生成保留的思考正文上限（防超长思维链撑爆 run.json）
+STREAM_MAX_CHARS = 20000       # 运行中实时回答的保留上限（与 THINK_MAX_CHARS 同口径）
+
+CMD_DEFAULT_TIMEOUT = 600    # run_command 默认超时（与 CLI 停滞看门狗同口径）
+CMD_MAX_TIMEOUT = 1800       # 上限：模型传 timeout_sec 超过即钳到这
+CMD_OUT_HEAD = 24 * 1024     # 回灌给模型的输出：头 24K + 尾 8K（报错常在尾部）
+CMD_OUT_TAIL = 8 * 1024
 
 _SYSTEM_PROMPT = """你是 CodeBee 的内置执行智能体，直接完成用户交代的任务。用户的目标、背景与工作目录内的附件就是全部输入。
 
@@ -37,6 +48,9 @@ _SYSTEM_PROMPT = """你是 CodeBee 的内置执行智能体，直接完成用户
 - 需要读文件、看目录、写文件时调用工具；所有路径都是工作目录内的相对路径。
 - read_file 只能读文本文件；图片、压缩包等二进制文件读不了，如实告知用户即可，不要反复尝试。
 - 用户消息中的图片附件会直接出现在对话里，可直接看图作答，无需用工具读取。
+- run_command 直接在用户的电脑上执行命令并回传退出码与输出：诊断、修复、改配置、重启服务等操作会真实生效。命令跑完看输出再决定下一步，不要一次性罗列步骤让用户自己敲。
+- Windows 上需要管理员权限的命令（flushdns、winsock reset、防火墙、系统服务等），用 powershell -Command "Start-Process <程序> -ArgumentList '<参数>' -Verb RunAs -Wait" 触发 UAC——用户屏幕会弹窗，点允许即提权执行；提权进程的输出拿不到，之后要用普通命令复核效果。macOS/Linux 用 sudo 并在输出里提示用户输密码不可行时改写临时脚本让用户跑。
+- 避免跑长驻/交互式命令（ping -t、top、要按键应答的安装器），它们会拖满超时被强杀。
 - 产出文件一律 UTF-8 编码。
 - 回答用户的语言与用户一致（默认中文）。直接给结论和内容，不要输出任何机器标记或协议行。"""
 
@@ -329,6 +343,47 @@ def _tool_write_file(workdir, args):
     return "已写入 %s（%d 字符，UTF-8）" % (rel, len(content))
 
 
+def _tool_run_command(workdir, args, cancel_event=None):
+    """本机执行一条 shell 命令，返回 (退出码, 合并输出)。
+
+    薄适配层：执行/杀树/取消/解码全部复用 runner.run_process（shell_cmd 分支
+    → cmd /c 或 /bin/sh -c），仓库唯一的 shell 落点，不另起炉灶。全信任档
+    （用户拍板 2026-09-22）：无白名单无确认闸，与 codex/claude 全权沙箱同档。
+    提权靠模型自己包 Start-Process -Verb RunAs——UAC 必须人点，绕不过也不该绕。
+    输出按字符头尾截断（解码已在 run_process 完成，无残缺多字节问题）。"""
+    cmdline = str(args.get("command") or "").strip()
+    if not cmdline:
+        return "（命令为空，未执行）"
+    try:
+        timeout = int(float(args.get("timeout_sec") or CMD_DEFAULT_TIMEOUT))
+    except (TypeError, ValueError):
+        timeout = CMD_DEFAULT_TIMEOUT
+    r = runner.run_process(shell_cmd=cmdline, cwd=os.path.abspath(workdir or "."),
+                           timeout=max(5, min(timeout, CMD_MAX_TIMEOUT)),
+                           cancel_event=cancel_event)
+    out = runner.clean_cli_text(
+        (r.get("stdout") or "") + (("\n" + r["stderr"]) if r.get("stderr") else ""))
+    limit = CMD_OUT_HEAD + CMD_OUT_TAIL
+    if not out.strip():
+        body = "（无输出）"
+    elif len(out) <= limit:
+        body = out
+    else:
+        body = (out[:CMD_OUT_HEAD]
+                + "\n…（中段省略 %d 字符；头 %dK + 尾 %dK 保留）\n" % (
+                    len(out) - limit, CMD_OUT_HEAD // 1024, CMD_OUT_TAIL // 1024)
+                + out[-CMD_OUT_TAIL:])
+    if r.get("cancelled"):
+        note = "已取消，进程树已终止"
+    elif r.get("timed_out"):
+        note = "超时 %d 秒，进程树已强制终止" % timeout
+    else:
+        note = ""
+    prefix = ("（%s）\n" % note) if note else ""
+    code = r.get("exit_code")
+    return "%s退出码: %s\n%s" % (prefix, "未知" if code is None else code, body)
+
+
 TOOLS_SPEC = [
     {"name": "list_files", "description": "列出工作目录（或其子目录）下的文件",
      "args": {"path": "子目录相对路径，留空=根目录"}},
@@ -336,17 +391,23 @@ TOOLS_SPEC = [
      "args": {"path": "文件相对路径"}},
     {"name": "write_file", "description": "把文本内容写入工作目录内一个文件（UTF-8，父目录自动创建）",
      "args": {"path": "文件相对路径", "content": "完整文本内容"}},
+    {"name": "run_command",
+     "description": "在本机执行一条 shell 命令，返回退出码与合并输出。诊断、修复、改配置、重启服务等操作真实生效；先跑命令看结果再定下一步。默认超时 600 秒，可用 timeout_sec 调整（5~1800）。Windows 需要管理员权限的命令（flushdns/防火墙/系统服务等）用 powershell -Command \"Start-Process <程序> -ArgumentList '<参数>' -Verb RunAs -Wait\" 触发 UAC（用户点允许后提权执行；提权进程输出拿不到，事后用普通命令复核）。避免长驻/交互式命令（ping -t、top、按键应答的安装器）。",
+     "args": {"command": "完整命令行（shell 语法，本机直接执行）",
+              "timeout_sec": "可选，超时秒数"}},
 ]
 
 _TOOL_IMPL = {"list_files": _tool_list_files, "read_file": _tool_read_file,
-              "write_file": _tool_write_file}
+              "write_file": _tool_write_file, "run_command": _tool_run_command}
 
 
-def _exec_tool(workdir, name, args):
+def _exec_tool(workdir, name, args, cancel_event=None):
     fn = _TOOL_IMPL.get(name or "")
     if fn is None:
         return "（未知工具: %s）" % name
     try:
+        if name == "run_command":
+            return fn(workdir, args or {}, cancel_event=cancel_event)
         return fn(workdir, args or {})
     except Exception as e:
         return "工具执行失败: %s" % (e)
@@ -404,6 +465,272 @@ def _post_interruptible(url, headers, body, allow_private, timeout, cancel_event
     return box.get("r") or (0, None, "无响应")
 
 
+# ---------------------------------------------------------------- 思考过程（流式）
+# 用户诉求（2026-09-22）：「把思考过程打印出来」——直连对话此前整轮只有三点
+# 打字动画，模型的思维链（DeepSeek/vLLM 系 reasoning_content、Anthropic
+# thinking 块）被 _sse_parse 明确丢弃。这里自带一份「认思考」的增量解析：
+# 边收边把思考与正文分别攒起来，交给调用方实时落盘 + 结束后存进步骤记录。
+
+def _reason_from_delta(proto, obj):
+    """从一条流式事件里取「思考增量」。三协议字段各异，取不到返回空串。
+
+    openai 兼容面最杂：reasoning_content（DeepSeek/vLLM/云知声实测）、
+    reasoning（部分网关）、reasoning_details[].text（OpenRouter 系）。
+    anthropic 是 thinking_delta（另有 redacted_thinking 不文本化，跳过）。"""
+    if proto == "openai":
+        total = ""
+        for ch in obj.get("choices") or []:
+            d = ch.get("delta") or {}
+            for k in ("reasoning_content", "reasoning"):
+                v = d.get(k)
+                if isinstance(v, str):
+                    total += v
+            for det in (d.get("reasoning_details") or []):
+                if isinstance(det, dict) and isinstance(det.get("text"), str):
+                    total += det["text"]
+        return total
+    if proto == "anthropic" and obj.get("type") == "content_block_delta":
+        d = obj.get("delta") or {}
+        if d.get("type") == "thinking_delta":
+            return d.get("thinking") or ""
+        return ""
+    if proto == "google":
+        total = ""
+        for cand in obj.get("candidates") or []:
+            for p in ((cand.get("content") or {}).get("parts") or []):
+                if isinstance(p, dict) and p.get("thought"):
+                    total += p.get("text") or ""
+        return total
+    return ""
+
+
+def _reason_from_message(proto, data):
+    """非流式响应里的思考字段（网关不支持流式时的兜底）。"""
+    if not isinstance(data, dict):
+        return ""
+    if proto == "anthropic":
+        return "\n".join(b.get("thinking", "") for b in (data.get("content") or [])
+                         if isinstance(b, dict) and b.get("type") == "thinking")
+    if proto == "google":
+        total = ""
+        for cand in data.get("candidates") or []:
+            for p in ((cand.get("content") or {}).get("parts") or []):
+                if isinstance(p, dict) and p.get("thought"):
+                    total += p.get("text") or ""
+        return total
+    msg = ((data.get("choices") or [{}])[0].get("message") or {})
+    total = ""
+    for k in ("reasoning_content", "reasoning"):
+        v = msg.get(k)
+        if isinstance(v, str):
+            total += v
+    for det in (msg.get("reasoning_details") or []):
+        if isinstance(det, dict) and isinstance(det.get("text"), str):
+            total += det["text"]
+    return total
+
+
+def _stream_accumulate(proto, obj, acc):
+    """把一条 SSE 事件并入累加器（就地改写 acc）。返回是否有「有意义的进展」。
+
+    acc = {text, reasoning, tools, usage}；工具参数按 index 归并——openai 的
+    function.arguments 与 anthropic 的 input_json_delta 都是分片到达的。"""
+    progress = False
+    if proto == "anthropic":
+        t = obj.get("type")
+        if t == "content_block_start":
+            blk = obj.get("content_block") or {}
+            if blk.get("type") == "tool_use":
+                idx = int(obj.get("index") or 0)
+                acc["tools"][idx] = {"id": blk.get("id") or "",
+                                     "name": blk.get("name") or "", "raw": ""}
+                progress = True
+        elif t == "content_block_delta":
+            d = obj.get("delta") or {}
+            if d.get("type") == "text_delta" and d.get("text"):
+                acc["text"] += d["text"]
+                progress = True
+            elif d.get("type") == "input_json_delta":
+                idx = int(obj.get("index") or 0)
+                slot = acc["tools"].setdefault(idx, {"id": "", "name": "", "raw": ""})
+                slot["raw"] += d.get("partial_json") or ""
+                progress = True
+        elif t == "message_start":
+            u = (obj.get("message") or {}).get("usage") or obj.get("usage") or {}
+            acc["usage"].update({"input": int(u.get("input_tokens") or 0),
+                                 "output": int(u.get("output_tokens") or 0),
+                                 "cached": (int(u.get("cache_read_input_tokens") or 0)
+                                            + int(u.get("cache_creation_input_tokens") or 0))})
+        elif t == "message_delta":
+            u = obj.get("usage") or {}
+            if u.get("output_tokens"):
+                acc["usage"]["output"] = int(u["output_tokens"])
+    elif proto == "google":
+        for cand in obj.get("candidates") or []:
+            for p in ((cand.get("content") or {}).get("parts") or []):
+                if not isinstance(p, dict):
+                    continue
+                if p.get("thought"):
+                    acc["reasoning"] += p.get("text") or ""
+                    progress = True
+                elif p.get("functionCall"):
+                    fc = p["functionCall"]
+                    acc["tools"][len(acc["tools"])] = {
+                        "id": "call_%d" % (len(acc["tools"]) + 1),
+                        "name": fc.get("name") or "",
+                        "raw": json.dumps(fc.get("args") or {}, ensure_ascii=False)}
+                    progress = True
+                elif p.get("text"):
+                    acc["text"] += p["text"]
+                    progress = True
+        u = obj.get("usageMetadata")
+        if isinstance(u, dict):
+            acc["usage"].update({"input": int(u.get("promptTokenCount") or 0),
+                                 "output": int(u.get("candidatesTokenCount") or 0),
+                                 "total": int(u.get("totalTokenCount") or 0)})
+    else:
+        for ch in obj.get("choices") or []:
+            d = ch.get("delta") or {}
+            if isinstance(d.get("content"), str) and d["content"]:
+                acc["text"] += d["content"]
+                progress = True
+            for i, tc in enumerate(d.get("tool_calls") or []):
+                if not isinstance(tc, dict):
+                    continue
+                idx = int(tc.get("index") if tc.get("index") is not None else i)
+                slot = acc["tools"].setdefault(idx, {"id": "", "name": "", "raw": ""})
+                if tc.get("id"):
+                    slot["id"] = tc["id"]
+                fn = tc.get("function") or {}
+                if fn.get("name"):
+                    slot["name"] = fn["name"]
+                if fn.get("arguments"):
+                    slot["raw"] += fn["arguments"]
+                progress = True
+        u = obj.get("usage")
+        if isinstance(u, dict):
+            acc["usage"].update({"input": int(u.get("prompt_tokens") or 0),
+                                 "output": int(u.get("completion_tokens") or 0),
+                                 "total": int(u.get("total_tokens") or 0),
+                                 "cached": int(((u.get("prompt_tokens_details") or {})
+                                                .get("cached_tokens")) or 0)})
+    return progress
+
+
+def _calls_from_acc(acc):
+    """累加器里的工具分片 → [{id, name, args}]（参数 JSON 解析失败给空对象）。"""
+    out = []
+    for idx in sorted(acc["tools"].keys()):
+        slot = acc["tools"][idx]
+        name = slot.get("name") or ""
+        if not name:
+            continue
+        try:
+            args = json.loads(slot.get("raw") or "{}")
+        except Exception:
+            args = {}
+        if not isinstance(args, dict):
+            args = {}
+        out.append({"id": slot.get("id") or ("call_%d" % (idx + 1)),
+                    "name": name, "args": args})
+    return out
+
+
+def _post_sse_stream(url, headers, body, allow_private, timeout, proto,
+                     on_reason=None, on_text=None, on_tick=None, cancel_event=None):
+    """流式（SSE）模型调用 → dict(status/text/reasoning/calls/usage/error/events)。
+
+    与 _post_interruptible 同款的可打断语义：读取放守护线程，cancel_event 置位
+    即刻放弃等待（socket 随线程结束释放）。三个回调：on_reason 每收到一段思考
+    增量（调用方据此实时打印「思考过程」），on_text 收到**累计**正文（只在真的
+    变长时触发，运行中直接当正文预览），on_tick 是无文本进展时的心跳。
+    events=0 表示网关根本没按流回（多半忽略了 stream 字段）——调用方据此回落
+    非流式；events>0 而正文为空则是模型真没说话，不该重发（白烧一次生成）。"""
+    acc = {"text": "", "reasoning": "", "tools": {}, "usage": {}}
+    box = {"status": 0, "err": "", "events": 0, "sent_text": None}
+    lock = threading.Lock()
+
+    def _emit(cb, payload):
+        if cb is None:
+            return
+        try:
+            cb(payload)
+        except Exception:
+            pass
+ 
+    def _go():
+        try:
+            parsed = urllib.parse.urlsplit(url)
+            if parsed.scheme not in ("http", "https"):
+                box["err"] = "协议必须是 http/https"
+                return
+            host, herr = modelhub._validate_host(url, allow_private)
+            if host is None:
+                box["err"] = herr
+                return
+            req = urllib.request.Request(
+                url, method="POST",
+                headers=dict(headers, **{"Content-Type": "application/json",
+                                         "Accept": "text/event-stream"}),
+                data=json.dumps(body).encode("utf-8"))
+            with modelhub._opener().open(req, timeout=timeout) as resp:
+                box["status"] = resp.status
+                if not 200 <= resp.status < 300:
+                    raw = resp.read(65536).decode("utf-8", "replace")
+                    box["err"] = "HTTP %s %s" % (resp.status, raw[:200])
+                    return
+                for raw in resp:
+                    line = raw.decode("utf-8", "replace").strip()
+                    if not line.startswith("data:"):
+                        continue
+                    payload = line[5:].strip()
+                    if not payload or payload == "[DONE]":
+                        continue
+                    try:
+                        obj = json.loads(payload)
+                    except Exception:
+                        continue          # 半行/坏行静默跳过，不中断整流
+                    if not isinstance(obj, dict):
+                        continue
+                    box["events"] += 1
+                    reason = _reason_from_delta(proto, obj)
+                    with lock:
+                        if reason:
+                            acc["reasoning"] += reason
+                        moved = _stream_accumulate(proto, obj, acc)
+                        text_now = acc["text"]
+                    if reason:
+                        _emit(on_reason, reason)
+                    if text_now != box["sent_text"]:
+                        box["sent_text"] = text_now
+                        _emit(on_text, text_now)     # 累计正文（运行中实时打印）
+                    elif moved and not reason:
+                        _emit(on_tick, None)         # 只有工具/用量在推进的心跳
+                    if sum(len(x) for x in (acc["text"], acc["reasoning"])) > 4 * 1024 * 1024:
+                        break             # 防失控
+        except Exception as e:
+            box["err"] = box["err"] or tlsctx.humanize(repr(e)[:300])
+
+    th = threading.Thread(target=_go, daemon=True)
+    th.start()
+    if cancel_event is None:
+        th.join(timeout + 10)
+    else:
+        while th.is_alive() and not cancel_event.wait(0.5):
+            pass
+    with lock:
+        out = {"status": box["status"], "text": acc["text"],
+               "reasoning": acc["reasoning"], "usage": dict(acc["usage"]),
+               "calls": _calls_from_acc(acc), "events": box["events"],
+               "error": box["err"]}
+    if cancel_event is not None and cancel_event.is_set():
+        out["error"], out["status"] = "已取消", 0
+        return out
+    if th.is_alive():
+        out["error"], out["status"] = "响应超时", 0
+    return out
+
+
 def _m_openai(m):
     """内部消息 → openai 消息。tool_results: [(call_id, 结果文本)]。"""
     if m["role"] == "assistant":
@@ -450,14 +777,20 @@ def _m_anthropic(m):
     return {"role": "user", "content": [{"type": "text", "text": m.get("content") or ""}]}
 
 
-def _build_request(proto, base, use_key, model, system, msgs, with_tools):
-    """按协议构造 (url, headers, body)。msgs 为内部统一形状。"""
+def _build_request(proto, base, use_key, model, system, msgs, with_tools, stream=False):
+    """按协议构造 (url, headers, body)。msgs 为内部统一形状。
+
+    stream=True 时按协议打开流式：google 换 :streamGenerateContent?alt=sse，
+    openai/anthropic 置 stream 字段（openai 另要 include_usage，否则收尾
+    chunk 不带 usage，这一步的 token 记账会凭空少一截）。"""
     base = (base or "").rstrip("/")
     if proto == "google":
         if base.endswith("/v1beta"):
-            url = base + "/models/%s:generateContent" % model
+            prefix = base + "/models/%s"
         else:
-            url = base + "/v1beta/models/%s:generateContent" % model
+            prefix = base + "/v1beta/models/%s"
+        url = (prefix + (":streamGenerateContent?alt=sse" if stream
+                         else ":generateContent")) % model
         headers = {"x-goog-api-key": use_key}
         contents = []
         for m in msgs:
@@ -480,6 +813,8 @@ def _build_request(proto, base, use_key, model, system, msgs, with_tools):
                 "messages": [_m_anthropic(m) for m in msgs]}
         if with_tools:
             body["tools"] = _anthropic_tools()
+        if stream:
+            body["stream"] = True
         return url, headers, body
     headers = {"Authorization": "Bearer " + use_key}
     # tool_results 消息展开成多条 role=tool（_m_openai 对它返回列表，不能嵌套）
@@ -494,6 +829,9 @@ def _build_request(proto, base, use_key, model, system, msgs, with_tools):
             "messages": [{"role": "system", "content": system}] + msgs_wire}
     if with_tools:
         body["tools"] = _openai_tools()
+    if stream:
+        body["stream"] = True
+        body["stream_options"] = {"include_usage": True}
     return url, headers, body
 
 
@@ -546,14 +884,34 @@ def _parse_reply(proto, data):
 
 # ---------------------------------------------------------------- 主循环
 
-def run(bi, prompt, workdir, timeout=180, cancel_event=None, log=None, images=None):
+def _norm_usage(usage):
+    """三协议 usage → {input, output, cached, total}（缺 total 用三项相加补齐）。"""
+    out = {"input": 0, "output": 0, "cached": 0, "total": 0}
+    for k in out:
+        try:
+            out[k] = int((usage or {}).get(k) or 0)
+        except Exception:
+            out[k] = 0
+    if not out["total"]:
+        out["total"] = out["input"] + out["output"] + out["cached"]
+    return out
+
+
+def run(bi, prompt, workdir, timeout=180, cancel_event=None, log=None, images=None,
+        on_reason=None, on_stream=None, on_activity=None, stream=True):
     """跑一次内置智能体（内部自带工具循环直到给出最终回答）。
 
     bi: resolve() 的返回；prompt: 本轮完整输入（目标/续轮块由 pipeline 拼）；
     images: 用户随本轮消息提供的图片绝对路径列表（任务附件/对话追话）；
     log: 追加一行日志的回调（步骤日志）。返回 runner 风格统一结果：
-    {ok, text, usage, error, model, provider_name, provider_id, iterations, cost_usd}。
-    """
+    {ok, text, usage, error, model, provider_name, provider_id, iterations,
+     cost_usd, reasoning}。
+
+    思考过程可视化（2026-09-22 用户诉求「把思考过程打印出来」）：stream=True 走
+    SSE，模型的思维链（reasoning_content / thinking 块）边收边经 on_reason 回调，
+    正文增量经 on_stream（累计值），工具活动经 on_activity——调用方据此在对话
+    时间线上实时打印，不再让用户干看三点打字动画。网关忽略 stream（零事件）时
+    自动回落非流式，思考字段仍从响应体兜底抽取（on_reason 补发一次）。"""
     prov = bi["prov"]
     model = bi["model"]
     allow_private = bool(prov.get("allow_private"))
@@ -575,48 +933,103 @@ def run(bi, prompt, workdir, timeout=180, cancel_event=None, log=None, images=No
     iters = 0
     last_err = ""
     ok = False
+    reasons = []            # 各迭代的思考正文（按迭代顺序拼接，供步骤记录展示）
+
+    def _fire(cb, *cb_args):
+        if cb is None:
+            return
+        try:
+            cb(*cb_args)
+        except Exception:
+            pass        # 可视化是增强：回调炸了不能拖垮生成
+
+    def _take_reason(reason):
+        """收一段思考：攒进本轮正文并实时回调（限长，防超长思维链撑爆 run.json）。"""
+        if not reason:
+            return
+        if not reasons:
+            reasons.append("")
+        if len(reasons[-1]) < THINK_MAX_CHARS:
+            reasons[-1] += reason
+        _fire(on_reason, reason)
 
     def _fail(err):
         return {"ok": False, "text": "", "usage": dict(total_usage), "error": err,
                 "model": model, "provider_name": bi["provider_name"],
-                "provider_id": bi["provider_id"], "iterations": iters, "cost_usd": 0.0}
+                "provider_id": bi["provider_id"], "iterations": iters, "cost_usd": 0.0,
+                "reasoning": "\n\n".join(r for r in reasons if r)[:THINK_MAX_CHARS]}
 
     for it in range(1, MAX_TOOL_ITERS + 1):
         if cancel_event is not None and cancel_event.is_set():
             return _fail("已取消")
+        reasons.append("")   # 每轮迭代各占一段思考（跨轮拼接时分段，join 时滤空段）
         done = False
         for proto, pbase in candidates:
             keys = modelhub._chain_keys(prov) or [{"key": prov.get("api_key") or "", "id": ""}]
             for kk in keys:
                 url, headers, body = _build_request(proto, pbase, kk["key"], model,
                                                     system, msgs, tools_ok)
+                sbody = None
+                if stream:
+                    # 流式体单独构造（+stream / include_usage）；非流式体留给回落重发
+                    _, _, sbody = _build_request(proto, pbase, kk["key"], model,
+                                                 system, msgs, tools_ok, stream=True)
                 effort = str(bi.get("reasoning_effort") or "").strip().lower()
                 # reasoning_effort 是 OpenAI wire 字段；Anthropic thinking 使用
                 # 另一套对象结构，向兼容网关硬塞该字段会直接得到 400。
                 if effort in ("low", "medium", "high") and proto == "openai":
                     body["reasoning_effort"] = effort
-                status, data, err = _post_interruptible(url, headers, body,
-                                                        allow_private, timeout,
-                                                        cancel_event)
-                if cancel_event is not None and cancel_event.is_set():
-                    # 取消先于一切记账：健康 KEY 不能因被放弃的请求背上冷却
-                    return _fail("已取消")
-                if status == 0 or not (200 <= status < 300):
-                    msg = ""
-                    if isinstance(data, dict):
-                        e = data.get("error")
-                        msg = e.get("message", "") if isinstance(e, dict) else str(e)
-                    last_err = err or ("HTTP %s %s" % (status, str(msg)[:200]))
-                    try:
-                        modelhub.note_key_error(bi["provider_id"], kk.get("id") or "", last_err)
-                    except Exception:
-                        pass
-                    continue
+                    if sbody is not None:
+                        sbody["reasoning_effort"] = effort
+                text, calls, usage = "", [], {}
+                streamed = False
+                if sbody is not None:
+                    part = _post_sse_stream(
+                        url, headers, sbody, allow_private, timeout, proto,
+                        on_reason=_take_reason, on_text=on_stream,
+                        cancel_event=cancel_event)
+                    if part["error"] == "已取消":
+                        return _fail("已取消")
+                    if not part["error"] and part["events"]:
+                        # 网关确实按流回了：正文/工具取增量累加结果
+                        text, calls = part["text"], part["calls"]
+                        usage = part["usage"]
+                        streamed = True
+                        if not reasons or not reasons[-1]:
+                            # 调用方没挂实时回调（无可视化诉求）时思考只在
+                            # 累加器里：这里兜底收进结果，落库口径一致
+                            _take_reason(part["reasoning"])
+                    else:
+                        # 零事件（网关忽略 stream）或流式这一步失败（不认 stream 参数、
+                        # 断流等）：都退回同一条 wire 的非流式重发——比直接判死这家
+                        # 供应商稳妥；非流式也失败才走下面的记账/换链。
+                        last_err = part["error"]
+                if not streamed:
+                    status, data, err = _post_interruptible(url, headers, body,
+                                                            allow_private, timeout,
+                                                            cancel_event)
+                    if cancel_event is not None and cancel_event.is_set():
+                        # 取消先于一切记账：健康 KEY 不能因被放弃的请求背上冷却
+                        return _fail("已取消")
+                    if status == 0 or not (200 <= status < 300):
+                        msg = ""
+                        if isinstance(data, dict):
+                            e = data.get("error")
+                            msg = e.get("message", "") if isinstance(e, dict) else str(e)
+                        last_err = err or ("HTTP %s %s" % (status, str(msg)[:200]))
+                        try:
+                            modelhub.note_key_error(bi["provider_id"], kk.get("id") or "", last_err)
+                        except Exception:
+                            pass
+                        continue
+                    text, calls, usage = _parse_reply(proto, data)
+                    # 非流式响应里的思考字段：补发一次，可视化与流式路径同形
+                    _take_reason(_reason_from_message(proto, data))
                 try:
                     modelhub.note_key_ok(bi["provider_id"], kk.get("id") or "")
                 except Exception:
                     pass
-                text, calls, usage = _parse_reply(proto, data)
+                usage = _norm_usage(usage)
                 for k in total_usage:
                     total_usage[k] += int(usage.get(k) or 0)
                 iters = it
@@ -624,12 +1037,16 @@ def run(bi, prompt, workdir, timeout=180, cancel_event=None, log=None, images=No
                     if log:
                         log("[迭代 %d] %s 请求工具: %s" % (
                             it, model, ", ".join(c["name"] for c in calls)))
+                    _fire(on_activity, "请求工具: " + "、".join(c["name"] for c in calls))
                     results = []
                     for c in calls:
-                        out = _exec_tool(workdir, c["name"], c["args"])
+                        out = _exec_tool(workdir, c["name"], c["args"], cancel_event)
                         if log:
                             brief = out if len(out) <= 120 else out[:120] + "…"
                             log("[工具] %s → %s" % (c["name"], brief.replace("\n", " ⏎ ")))
+                        _fire(on_activity, "%s %s" % (
+                            c["name"], str(c["args"].get("path")
+                                           or c["args"].get("command") or "")[:80]))
                         results.append((c["id"], out))
                     msgs.append({"role": "assistant", "content": text, "tool_calls": calls})
                     msgs.append({"role": "tool_results", "tool_results": results})
@@ -654,4 +1071,5 @@ def run(bi, prompt, workdir, timeout=180, cancel_event=None, log=None, images=No
         return _fail(last_err or "工具循环达上限仍无最终回答")
     return {"ok": True, "text": (text or "").strip(), "usage": dict(total_usage),
             "error": "", "model": model, "provider_name": bi["provider_name"],
-            "provider_id": bi["provider_id"], "iterations": iters, "cost_usd": 0.0}
+            "provider_id": bi["provider_id"], "iterations": iters, "cost_usd": 0.0,
+            "reasoning": "\n\n".join(r for r in reasons if r)[:THINK_MAX_CHARS]}