codebee 0.1.3 → 0.1.5

package/app/core/manager.py

@@ -69,6 +69,52 @@ def detect_entry(entry):
     return {"installed": False, "detail": ""}
 
 
+def sweep_orphan_cli_processes():
+    """启动清扫：服务重启会孤儿化正在跑的 CLI 孙进程（外部只杀服务 PID，不带
+    /T），僵尸 opencode 更会劫持后续会话——opencode 是客户端-服务端架构，新
+    `opencode run` 连上僵尸实例后 shell 全在僵尸的项目根里跑（2026-09-17
+    mo-so 实测：agent 在 Temp 里找代码，汇报「工作目录没有源码」）。
+
+    按「Tutti 调用签名 + 父进程已死」双条件匹配，不误杀用户自己在用的 CLI：
+      opencode：命令行含 opencode + --model（同步写入的 provider 固定 orch）
+      codex：命令行含 codex + --skip-git-repo-check（Tutti 专属 flag 组合）
+    claude 不扫（签名与用户手动使用难区分）。返回清扫数量。"""
+    ps_exe = os.path.join(os.environ.get("SystemRoot", r"C:\Windows"),
+                          "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
+    if not os.path.isfile(ps_exe):
+        ps_exe = "powershell"
+    ps = ("Get-CimInstance Win32_Process | "
+          "Where-Object { $_.Name -match '^(opencode|codex|node|cmd)\\.exe$' } | "
+          "Select-Object ProcessId,ParentProcessId,CommandLine | ConvertTo-Json -Compress")
+    try:
+        r = subprocess.run([ps_exe, "-NoProfile", "-Command", ps],
+                           capture_output=True, creationflags=CREATE_NO_WINDOW, timeout=60)
+        import json as _json
+        raw = r.stdout.decode("utf-8", "replace").strip()
+        items = _json.loads(raw) if raw else []
+        if isinstance(items, dict):
+            items = [items]
+        live = {i.get("ProcessId") for i in items}
+        killed = 0
+        for i in items:
+            cl = str(i.get("CommandLine") or "").lower()
+            ppid = i.get("ParentProcessId")
+            is_ours = (("opencode" in cl and "--model" in cl)
+                       or ("codex" in cl and "--skip-git-repo-check" in cl))
+            if not is_ours or ppid in live or not i.get("ProcessId"):
+                continue
+            try:
+                subprocess.run(["taskkill", "/F", "/T", "/PID", str(i["ProcessId"])],
+                               capture_output=True, creationflags=CREATE_NO_WINDOW,
+                               timeout=15)
+                killed += 1
+            except Exception:
+                pass
+        return killed
+    except Exception:
+        return 0
+
+
 def detect_all(force=False):
     """检测全部条目。检测（慢磁盘 IO）在锁外跑：shutil.which/isfile 在
     Windows 上遇到断链的 PATH 项可能卡数秒，持锁会把所有并发请求堵死
@@ -1091,10 +1137,18 @@ def _sync_opencode_settings(entry, model, prov):
     全不存在时建 catalog 登记的那个。纯 JSON 走整体读改写；带注释的 JSONC 走
     文本级就地 patch（保留注释）。返回错误串或 None。"""
     npm = "@ai-sdk/anthropic" if prov.get("protocol") == "anthropic" else "@ai-sdk/openai-compatible"
+    base = prov.get("base_url") or ""
+    if prov.get("protocol") == "anthropic" and not base.rstrip("/").endswith("/v1"):
+        # @ai-sdk/anthropic 在 baseURL 后只拼 /messages（官方默认 baseURL 本身带
+        # /v1），而 models.json 里 anthropic 供应商的 base 不带 /v1（modelhub
+        # 发请求时自己补）——不补会打到 <host>/messages，网关回 "Not Allowed"
+        # （2026-09-17 公司Anthropic 实测）。
+        base = base.rstrip("/") + "/v1"
     block = {"npm": npm, "name": prov.get("name") or "CodeBee 绑定",
-             "options": {"baseURL": prov.get("base_url") or "",
+             "options": {"baseURL": base,
                          "apiKey": prov.get("api_key") or ""},
              "models": {model: {"name": model}} if model else {}}
+    top_perms = {"edit": "allow", "bash": "allow", "webfetch": "allow"}
     top_model = ("orch/" + model) if model else ""
     targets = [p for p in _opencode_config_candidates(entry) if os.path.isfile(p)] \
         or [_opencode_config_candidates(entry)[0]]
@@ -1130,6 +1184,10 @@ def _sync_opencode_settings(entry, model, prov):
                 data["provider"] = provs
                 if top_model:
                     data["model"] = top_model
+                # 无人值守必配：headless 下 opencode 工具调用默认要审批，全部被
+                # 拒（"The user rejected permission..."，2026-09-17 实测）——
+                # 按用户拍板的「默认给全部权限」写入放行段
+                data["permission"] = top_perms
                 new_text = json.dumps(data, ensure_ascii=False, indent=2) + "\n"
             else:  # JSONC（带注释）：文本级 patch
                 block_json = json.dumps(block, ensure_ascii=False)
@@ -1140,6 +1198,8 @@ def _sync_opencode_settings(entry, model, prov):
                 if top_model:
                     new_text, _ = _jsonc_set(new_text, ("model",),
                                              json.dumps(top_model))
+                new_text, _ = _jsonc_set(new_text, ("permission",),
+                                         json.dumps(top_perms))
             if os.path.isfile(path):
                 shutil.copyfile(path, path + ".bak")
             Path(path).write_bytes(new_text.encode("utf-8"))
@@ -1148,12 +1208,102 @@ def _sync_opencode_settings(entry, model, prov):
     return "；".join(errs) or None
 
 
+def _kimi_render(prov, model):
+    """渲染 kimi-code 的 CodeBee 托管块（顶层键在前，表在后——TOML 语义）。"""
+    import re as _re
+    ptype = "anthropic" if prov.get("protocol") == "anthropic" else "openai"
+    base = prov.get("base_url") or ""
+    alias = model or "default"
+    pname = (prov.get("name") or "CodeBee").replace("\"", "")
+    return (
+        "# >>> CodeBee managed (do not edit between markers) >>>\n"
+        "defaultProvider = \"orch\"\n"
+        "defaultModel = \"%s\"\n"
+        "yolo = true\n"
+        "defaultPermissionMode = \"yolo\"\n"
+        "\n"
+        "[providers.orch]\n"
+        "type = \"%s\"\n"
+        "name = \"%s\"\n"
+        "baseUrl = \"%s\"\n"
+        "apiKey = \"%s\"\n"
+        "\n"
+        "[models.\"%s\"]\n"
+        "provider = \"orch\"\n"
+        "model = \"%s\"\n"
+        "maxContextSize = 131072\n"
+        "displayName = \"%s · %s\"\n"
+        "# <<< CodeBee managed <<<\n"
+        % (alias, ptype, pname, base,
+           (prov.get("api_key") or "").replace("\"", ""),
+           alias, alias, pname, alias))
+
+
+def _sync_kimi_settings(entry, model, prov):
+    """kimi-code 专属：把绑定供应商写进 ~/.kimi-code/config.toml。
+
+    schema 从官方 bundle 反推（2026-09-17）：顶层 defaultProvider/defaultModel/
+    yolo/defaultPermissionMode（camelCase）+ [providers.<id>]（type/apiKey/
+    baseUrl）+ [models.<别名>]（provider/model/maxContextSize 必填）。无人值守
+    要 yolo——否则工具调用逐个要审批，headless 全被拒。文本级托管块（标记注释
+    之间）幂等重写，用户自有内容保留在外。"""
+    import re as _re
+    top_keys = ("defaultProvider", "defaultModel", "yolo", "defaultPermissionMode")
+    targets = [os.path.abspath(os.path.expanduser("~/.kimi-code/config.toml"))]
+    errs = []
+    for path in targets:
+        try:
+            Path(path).parent.mkdir(parents=True, exist_ok=True)
+            text = ""
+            if os.path.isfile(path):
+                text = open(path, encoding="utf-8", errors="replace", newline="").read()
+                shutil.copyfile(path, path + ".bak")
+            # 移除旧托管块与旧顶层键（防重复/防键落进别的表）
+            text = _re.sub(r"# >>> CodeBee managed.*?# <<< CodeBee managed <<<\n?",
+                           "", text, flags=_re.S)
+            for k in top_keys:
+                text = _re.sub(r"(?m)^%s\s*=.*$\n?" % k, "", text)
+            body = _re.sub(r"\n+$", "\n", text).lstrip("\n")
+            managed = _kimi_render(prov, model)
+            has_table = _re.search(r"(?m)^\[", body) is not None
+            top = "".join("%s\n" % ln for ln in managed.split("\n")
+                          if _re.match(r"^(%s)\s*=" % "|".join(top_keys), ln))
+            tables = "\n".join(ln for ln in managed.split("\n")
+                               if not _re.match(r"^(%s)\s*=" % "|".join(top_keys), ln))
+            if has_table:
+                new_text = top + "\n" + body + "\n" + tables
+            else:
+                new_text = (body + "\n" if body else "") + managed
+            Path(path).write_bytes(new_text.encode("utf-8"))
+        except Exception as e:
+            errs.append("%s: %r" % (path, e))
+    return "；".join(errs) or None
+
+
+def sync_cli_config_now(agent_id):
+    """运行期自愈：CLI 本体没配置（如 kimi「No model configured」）→ 立即把
+    绑定注入其自家配置，换将/下轮即可用。返回给日志的备注（空=无事发生）。"""
+    try:
+        from . import modelhub
+        entry = next((a for a in catalog.load() if a.get("id") == agent_id), None)
+        if not entry:
+            return ""
+        b = modelhub.bindings().get(agent_id) or {}
+        note = _sync_agent_injection(entry, b)
+        if note:
+            return "已自动注入 %s 配置：%s" % (agent_id, note)
+        return ""
+    except Exception as e:
+        return "自动注入失败: %r" % e
+
+
 # 打开前专属注入通道：{agent_id: (可注入协议, 注入器)}。交互 TUI 脱离编排链路，
 # 只认自家配置文件里的凭据，编排降级给的 env（ORCH_API_KEY 等）对它们无效。
 _AGENT_INJECTORS = {
     "claude-code": (("anthropic",), _sync_claude_settings),
     "opencode": (("anthropic", "openai"), _sync_opencode_settings),
     "qwencode": (("openai",), _sync_qwen_settings),
+    "kimi-code": (("openai", "anthropic"), _sync_kimi_settings),
 }
 
 # 无专属注入通道的专有协议 CLI：env 注入大概率无效，打开时明确告知而非静默废

package/app/core/modelhub.py

@@ -114,6 +114,22 @@ def _normalize_ids(data):
 _LITE = ("mini", "flash", "lite", "nano", "small", "tiny", "8b", "7b", "4b")
 _HEAVY = ("opus", "pro", "max", "ultra", "plus", "heavy", "codex")
 
+# 图片输入命名惯例：vision/omni 词段、glm-4v 式「数字+v」段；vl 子串另判
+# （qwen-vl / internvl2 / cogvlm 等视觉家族的通用命名根，文本模型名含 vl 的极罕见）
+_IMAGE_IN_RE = re.compile(
+    r"(?:^|[-_.])(?:vision|visual|omni)(?:[-_.0-9]|$)|[-_.]\dv(?:[-_.]|$)")
+
+
+def _auto_image_in(name):
+    """按模型名启发式预填「支持图片输入」。claude/gemini 全系原生多模态直接标；
+    其余只认显式命名（vision 词段、vl 子串、数字+v），宁缺勿滥——漏标的明模型
+    用户手动打开即可，误标只是运行时网关显式报错、开关改回即恢复。
+    仅用于新模型的初始声明。"""
+    n = (name or "").lower()
+    if n.startswith(("claude", "gemini")):
+        return True
+    return bool(_IMAGE_IN_RE.search(n)) or "vl" in n
+
 
 def _auto_priority(name):
     """按模型名启发式估强弱：分越高越强（优先级越靠前）。仅用于新模型的初始排序。"""
@@ -251,11 +267,14 @@ def refresh_models(provider_id):
                 # 保留 hidden：用户删掉的模型刷新时不能被重新带回
                 item = {"name": n, "enabled": bool(o.get("enabled", True)),
                         "priority": o.get("priority", 0),
-                        "hidden": bool(o.get("hidden"))}
+                        "hidden": bool(o.get("hidden")),
+                        # 模态声明同理：用户/预填设过的 image_in 刷新时不能被抹掉
+                        "image_in": bool(o.get("image_in"))}
                 (hidden if item["hidden"] else existing).append(item)
             else:
                 fresh.append({"name": n, "enabled": True,
-                              "auto": _auto_priority(n)})
+                              "auto": _auto_priority(n),
+                              "image_in": _auto_image_in(n)})
         # 已删除但本次未返回的条目也保留，否则下次拉取会当作新模型“复活”
         hidden += [dict(o) for n, o in old.items()
                    if o.get("hidden") and n not in names]
@@ -729,15 +748,48 @@ def note_key_ok(provider_id, key_id):
     with _LOCK:
         data = _load()
         prov = next((p for p in data.get("providers", []) if p.get("id") == provider_id), None)
-        if not prov or not isinstance(prov.get("keys"), list):
+        if not prov:
             return
-        target = next((k for k in prov["keys"] if str(k.get("id")) == str(key_id)), None)
+        target = next((k for k in (prov.get("keys") or []) if str(k.get("id")) == str(key_id)), None)
         if target is None or not target.get("last_error"):
             return
         target.pop("last_error", None)
         _save(data)
 
 
+def _is_codex_target(target):
+    return (target or "").strip().lower() in ("codex-cli", "codex", "codex-code")
+
+
+def note_codex_wire_dead(provider_id, minutes=30):
+    """codex 撞上 wire 不兼容的供应商 → 供应商级冷却（自动绕开的记账位）。
+
+    codex 0.154 起只支持 responses wire（chat 被官方移除），讯飞等只有
+    chat completions 的 MaaS 每次 404/启动即拒。runner 按 404+no Route
+    matched / wire_api no longer supported 特征自动调用本函数；链展开与
+    路由绑定加分据此自动绕开，无需人工改绑定（2026-09-17 mo-so 实测）。
+    """
+    import time as _t
+    if not provider_id:
+        return
+    with _LOCK:
+        data = _load()
+        prov = next((p for p in data.get("providers", []) if p.get("id") == provider_id), None)
+        if not prov:
+            return
+        prov["codex_wire_dead_until"] = _t.time() + max(1, int(minutes)) * 60
+        _save(data)
+
+
+def codex_wire_blocked(prov):
+    """该供应商是否处于 codex wire 不兼容冷却期。"""
+    import time as _t
+    try:
+        return float((prov or {}).get("codex_wire_dead_until") or 0) > _t.time()
+    except Exception:
+        return False
+
+
 def _is_private_host(url):
     """主机是私网/环回 IP 字面量或 localhost 时返回 True（自动放行内网网关）。"""
     import urllib.parse
@@ -1813,6 +1865,14 @@ def _model_bindable(prov, model):
     return True
 
 
+def _model_image_in(prov, model):
+    """模型是否声明支持图片输入：models[] 条目 image_in；缺省/查不到=False（纯文本）。"""
+    for m in ((prov or {}).get("models") or []):
+        if isinstance(m, dict) and m.get("name") == model:
+            return bool(m.get("image_in"))
+    return False
+
+
 def bind_agent(agent, difficulty="default"):
     """按绑定生成应用了供应商/模型覆盖的 agent 副本；无绑定时原样返回。"""
     r = resolve_binding(agent.get("id"), difficulty) or resolve_binding(agent.get("kind"), difficulty)
@@ -1958,6 +2018,8 @@ def resolve_binding(agent_kind_or_id, difficulty="default"):
                 continue  # 原生协议与适配过的 wire 都不匹配：跳过
             if prov.get("name") in down_set:
                 continue  # 健康监测判定 down：跳过，省掉无效等待
+            if _is_codex_target(agent_kind_or_id) and codex_wire_blocked(prov):
+                continue  # codex 撞过该供应商 wire 不兼容（chat-only）：冷却中自动绕开
             if model and not _model_bindable(prov, model):
                 continue  # 模型被停用/删除：该条跳过（2026-09-15 告警弹框「禁用该模型」）
             # 多 KEY：同一厂商按 KEY 展开成多条，顺序即调用顺序。欠费的 KEY 被
@@ -1993,6 +2055,8 @@ def resolve_binding(agent_kind_or_id, difficulty="default"):
     prov = provs.get(pid)
     if not prov or not prov.get("enabled", True) or not prov.get("api_key"):
         return None
+    if _is_codex_target(agent_kind_or_id) and codex_wire_blocked(prov):
+        return None  # codex wire 不兼容冷却中：解析为空 → 路由绑定分自动转负
     ep = _entry_endpoint(prov, allowed)
     if not ep:
         return None  # google 只登记；dsh 只接受 OpenAI 兼容端点；未适配的不硬塞
@@ -2173,6 +2237,24 @@ def reorder_models(provider_id, ordered_names):
         return None
 
 
+def set_model_caps(provider_id, name, image_in):
+    """声明单个模型的模态能力（当前仅 image_in 图片输入）。返回错误文案或 None。"""
+    with _LOCK:
+        data = _load()
+        prov = next((p for p in data.get("providers", []) if p.get("id") == provider_id), None)
+        if not prov:
+            return "供应商不存在"
+        target = next((m for m in (prov.get("models") or [])
+                       if m.get("name") == name), None)
+        if target is None:
+            return "模型不存在: %s" % name
+        image_in = bool(image_in)
+        if bool(target.get("image_in")) != image_in:   # 有差异才落盘
+            target["image_in"] = image_in
+            _save(data)
+    return None
+
+
 def _post_json_http(url, headers, body, allow_private, timeout=20):
     """带 SSRF 防护的 POST。返回 (status, json_obj|None, err)。"""
     import urllib.parse