codebee 0.1.66 → 0.1.68

package/app/core/market_remote.py

@@ -24,6 +24,7 @@ import os
 import ipaddress
 import json
 import re
+import secrets
 import shutil
 import socket
 import subprocess
@@ -343,11 +344,13 @@ def _entries_from_cache(cache=None):
     return entries
 
 
-def view(offset=0, limit=_PAGE_LIMIT, source=None, q=None):
+def view(offset=0, limit=_PAGE_LIMIT, source=None, q=None, installed=None):
     """外部目录视图（服务端过滤 + 分页）。缓存全在本地，对全量条目过滤再切页
     零成本——搜索/来源筛选不再受「已加载页」限制，滚动翻页逛完全部目录。
+    installed=真值时只看已安装（「已安装 N」入口的过滤器）；installed_total
+    始终是**未过滤前**的全量已装数（徽章计数与过滤条件无关）。
     返回 {sources, entries(本页), total(过滤后全量), offset, has_more,
-    categories}。"""
+    categories, installed_total}。"""
     cache = _load_cache()
     entries = _entries_from_cache(cache)
     sources = []
@@ -360,6 +363,9 @@ def view(offset=0, limit=_PAGE_LIMIT, source=None, q=None):
     for e in entries:
         if e["category"] and e["category"] not in cats:
             cats.append(e["category"])
+    installed_total = sum(1 for e in entries if e["installed"])
+    if installed:
+        entries = [e for e in entries if e["installed"]]
     if source:
         entries = [e for e in entries if e["source_id"] == source]
     qq = str(q or "").strip().lower()
@@ -372,7 +378,7 @@ def view(offset=0, limit=_PAGE_LIMIT, source=None, q=None):
     page = entries[offset:offset + limit]
     return {"sources": sources, "entries": page, "total": len(entries),
             "offset": offset, "has_more": offset + limit < len(entries),
-            "categories": cats}
+            "categories": cats, "installed_total": installed_total}
 
 
 def _fetch_clawhub_catalog():
@@ -659,7 +665,9 @@ def _safe_extract(zf, dest):
 
 
 def _download_zip(entry, tmp):
-    """下载 zip（校验 sha256）→ 安全解包 → 返回插件根目录。"""
+    """下载 zip（校验 sha256）→ 安全解包 → 返回 (插件根目录, 完整性说明)。
+    完整性：清单带 sha256 且校验通过 = verified；清单没带 = unverified
+    （靠 https 传输 + 解包后的纯技能白名单兜底，如实告知不装懂）。"""
     data = _fetch(entry["install"]["url"], cap=_CAP_DOWNLOAD)
     want = (entry["install"].get("sha256") or "").lower()
     if want:
@@ -667,7 +675,7 @@ def _download_zip(entry, tmp):
         if got != want:
             raise ValueError("sha256 校验不符（期望 %s，实际 %s）" % (want[:12], got[:12]))
     dest = _safe_extract(zipfile.ZipFile(io.BytesIO(data)), tmp / "unzip")
-    return _plugin_root(dest)
+    return _plugin_root(dest), ("verified" if want else "unverified")
 
 
 def _gh_split(url):
@@ -870,7 +878,7 @@ def _download_clawhub(entry, tmp):
         _CLAWHUB_BASE, q(inst["slug"], safe=""), q(inst["reference"] or inst["slug"], safe=""))
     data = _fetch(url, cap=_CAP_DOWNLOAD)
     dest = _safe_extract(zipfile.ZipFile(io.BytesIO(data)), tmp / "clawhub")
-    return _plugin_root(dest)
+    return _plugin_root(dest), "unverified"
 
 
 def _plugin_root(base):
@@ -961,9 +969,20 @@ def build_files(entry, root):
     return out, None, stripped
 
 
-def install_remote(entry_id):
-    """安装外部目录插件：下载 → 纯技能检查 → 转换 → 复用 market 安装通道。
-    返回 (结果 dict, 错误)。"""
+def _fetch_root(entry, tmp):
+    """按来源下载并解包，返回 (插件根目录, 完整性说明)。
+    verified=zip 带 sha256 且校验通过；unverified=直链无哈希（https+白名单兜底）；
+    git-ref/git-head=git 类来源按 ref/HEAD 取树。"""
+    kind = entry["install"]["kind"]
+    if kind == "zip":
+        return _download_zip(entry, tmp)
+    if kind == "clawhub":
+        return _download_clawhub(entry, tmp)
+    return _download_git_any(entry, tmp), \
+        ("git-ref" if entry["install"].get("ref") else "git-head")
+
+
+def _resolve_entry(entry_id):
     entries = _entries_from_cache()
     entry = next((e for e in entries if e["id"] == entry_id), None)
     if not entry:
@@ -972,35 +991,114 @@ def install_remote(entry_id):
         return None, entry["block_reason"] or "该插件不适配 CodeBee"
     if entry["install"]["kind"] == "unsupported":
         return None, "来源类型不支持（仅支持 zip 直链、git 子目录与 ClawHub）"
+    return entry, None
+
+
+# 预览→确认安装两阶段之间的已检内容缓存：token 一次性、TTL 10 分钟、最多 8 份
+# （files 是纯文本 dict、总量有 _CAP_TOTAL_TEXT 上限，缓存占用有界）。
+_PREVIEW_TTL = 600
+_PREVIEW_MAX = 8
+_PREVIEW_CACHE = {}
+
+
+def _preview_purge():
+    now = time.time()
+    for k in [k for k, v in _PREVIEW_CACHE.items() if now - v["ts"] > _PREVIEW_TTL]:
+        _PREVIEW_CACHE.pop(k, None)
+    while len(_PREVIEW_CACHE) > _PREVIEW_MAX:
+        _PREVIEW_CACHE.pop(min(_PREVIEW_CACHE, key=lambda k: _PREVIEW_CACHE[k]["ts"]))
+
+
+def _skill_names_from_files(files, entry):
+    """从转换后的 files 键推技能名：market-<id>.md 是主技能（用条目名），
+    market-<id>__<名>.md 是多技能包里的其余技能（用目录名）。"""
+    names = []
+    for k in files:
+        if "/" in k or not k.endswith(".md") or not k.startswith("market-"):
+            continue
+        base = k[len("market-"):-3]
+        names.append("__" in base and base.split("__", 1)[1] or entry["title"])
+    return sorted(set(names))
+
+
+def preview_remote(entry_id):
+    """安装前预览（先看后装）：下载 → 剥离式检查 → 转换，但**不落盘安装**。
+    返回 (预览 dict, 错误)。dict 带 token，确认安装时把 token 传回
+    install_remote 即安装这份已检内容，不重复下载。"""
+    entry, err = _resolve_entry(entry_id)
+    if err:
+        return None, err
     tmp = Path(tempfile.mkdtemp(prefix="codebee-mkt-"))
     try:
-        kind = entry["install"]["kind"]
-        if kind == "zip":
-            root = _download_zip(entry, tmp)
-        elif kind == "clawhub":
-            root = _download_clawhub(entry, tmp)
-        else:
-            root = _download_git_any(entry, tmp)
+        root, integrity = _fetch_root(entry, tmp)
         files, blocked, stripped = build_files(entry, root)
         if blocked:
             return None, blocked
-        res, err = market.install_files(entry_id, entry["title"], files, extra={
-            "remote": {"source": entry["source_id"], "name": entry["name"],
-                       "version": entry["version"], "homepage": entry["homepage"]},
-        })
-        if err:
-            return None, err
-        res["skills"] = sum(1 for k in files if k.endswith(".md") and "/" not in k)
-        res["stripped"] = sorted(stripped)
-        return res, None
+        _preview_purge()
+        token = secrets.token_hex(12)
+        _PREVIEW_CACHE[token] = {"entry_id": entry_id, "files": files,
+                                 "stripped": stripped, "ts": time.time()}
+        file_list = sorted(files.items(), key=lambda kv: kv[0])
+        return {
+            "token": token, "id": entry_id, "title": entry["title"],
+            "source": entry["source_name"], "version": entry["version"],
+            "homepage": entry["homepage"], "integrity": integrity,
+            "skills": _skill_names_from_files(files, entry),
+            "files_total": len(files),
+            "total_chars": sum(len(v) for v in files.values()),
+            "file_list": [{"path": k, "chars": len(v)} for k, v in file_list[:60]],
+            "stripped": sorted(stripped)[:40], "stripped_total": len(stripped),
+            "expires_in": _PREVIEW_TTL,
+        }, None
     except ValueError as e:
         return None, str(e)
-    except Exception as e:   # 网络/解包等意外错误也要兜成用户可读的一句话
+    except Exception as e:
         return None, "下载或解析插件失败: %s" % e
     finally:
         shutil.rmtree(tmp, ignore_errors=True)
 
 
+def install_remote(entry_id, token=""):
+    """安装外部目录插件：下载 → 纯技能检查 → 转换 → 复用 market 安装通道。
+    token 非空且命中预览缓存时直接安装那份已检内容（不重复下载）；token
+    一次性（装成功即焚，防重放）。返回 (结果 dict, 错误)。"""
+    entry, err = _resolve_entry(entry_id)
+    if err:
+        return None, err
+    cached = None
+    if token:
+        _preview_purge()
+        c = _PREVIEW_CACHE.get(str(token))
+        if c and c["entry_id"] == entry_id:
+            cached = c
+    if cached:
+        files, stripped = cached["files"], cached["stripped"]
+    else:
+        tmp = Path(tempfile.mkdtemp(prefix="codebee-mkt-"))
+        try:
+            root, _integrity = _fetch_root(entry, tmp)
+            files, blocked, stripped = build_files(entry, root)
+            if blocked:
+                return None, blocked
+        except ValueError as e:
+            return None, str(e)
+        except Exception as e:   # 网络/解包等意外错误也要兜成用户可读的一句话
+            return None, "下载或解析插件失败: %s" % e
+        finally:
+            shutil.rmtree(tmp, ignore_errors=True)
+    res, err = market.install_files(entry_id, entry["title"], files, extra={
+        "remote": {"source": entry["source_id"], "name": entry["name"],
+                   "version": entry["version"], "homepage": entry["homepage"]},
+    })
+    if err:
+        return None, err
+    if cached:
+        _PREVIEW_CACHE.pop(str(token), None)
+    res["skills"] = sum(1 for k in files if k.endswith(".md") and "/" not in k)
+    res["stripped"] = sorted(stripped)
+    return res, None
+
+
 def remove_remote(entry_id):
     """卸载外部插件：记账与标记齐全时走 market 既有卸载；否则报错。"""
     return market.remove(entry_id)

package/app/core/mocks.py

@@ -1,64 +1,64 @@
-# -*- coding: utf-8 -*-
-"""内置演示/测试智能体（mock）：不消耗任何配额即可跑通全流程。"""
-from __future__ import annotations
-
-import hashlib
-
-
-def _seed(agent_id):
-    return int(hashlib.sha256(agent_id.encode("utf-8")).hexdigest()[:6], 16)
-
-
-def draft_manuscript(task, round_no):
-    """生成一份示例稿件（mock 起草/修订直接落盘的内容）。"""
-    title = task.get("title") or "未命名章节"
-    goal = task.get("goal") or ""
-    return (
-        "# {title}\n\n"
-        "这是第 {r} 轮 mock 草稿（演示用，不消耗模型配额）。\n\n"
-        "## 任务目标\n{goal}\n\n"
-        "## 正文\n"
-        "夜色沿着山脊线缓慢退去，主角终于看清了石门上的刻痕——那不是文字，"
-        "而是一段被反复涂抹又反复显影的名字。他伸手触碰的瞬间，耳边响起的"
-        "却是自己昨夜说过的话。{extra}\n\n"
-        "（本轮修订关注：{focus}）\n"
-    ).format(
-        title=title, r=round_no, goal=goal,
-        extra="这一段在第 2 轮修订中补充了人物动机的伏笔。" if round_no >= 2 else "",
-        focus="节奏与悬念铺排" if round_no == 1 else "人物弧光与首尾呼应",
-    )
-
-
-def implement_note(task):
-    return "（mock 实现）已在目标目录写入 mock-impl.txt 作为变更占位。"
-
-
-def critique(agent_id, round_no, dims, threshold):
-    """确定性评分：第 1 轮略低于阈值，第 2 轮达标，用于验证发布门禁逻辑。"""
-    s = _seed(agent_id)
-    scores = {}
-    for i, d in enumerate(dims):
-        jitter = ((s >> i) % 5) * 0.1
-        scores[d] = round(min(9.5, 4.8 + 1.2 * round_no + jitter), 1)
-    passed = all(v >= threshold for v in scores.values())
-    issues = []
-    if round_no == 1:
-        issues = [
-            {"dim": dims[0], "severity": "major", "note": "开篇信息密度偏低，钩子出现太晚（mock 意见）"},
-            {"dim": dims[-1], "severity": "minor", "note": "段落长短交替不够，读感偏平（mock 意见）"},
-        ]
-    return {
-        "scores": scores,
-        "issues": issues,
-        "summary": "mock 总评：第 %d 轮稿件%s发布阈值" % (round_no, "已达到" if passed else "尚未达到"),
-    }
-
-
-def review(task, verify_passed):
-    return {
-        "pass": bool(verify_passed),
-        "scores": {"正确性": 8.0 if verify_passed else 5.0, "可维护性": 8.0, "安全": 8.5},
-        "issues": [] if verify_passed else [
-            {"severity": "major", "title": "验证命令未通过", "detail": "请检查测试输出（mock 意见）"}],
-        "summary": "mock 代码评审：%s" % ("通过" if verify_passed else "未通过"),
-    }
+# -*- coding: utf-8 -*-
+"""内置演示/测试智能体（mock）：不消耗任何配额即可跑通全流程。"""
+from __future__ import annotations
+
+import hashlib
+
+
+def _seed(agent_id):
+    return int(hashlib.sha256(agent_id.encode("utf-8")).hexdigest()[:6], 16)
+
+
+def draft_manuscript(task, round_no):
+    """生成一份示例稿件（mock 起草/修订直接落盘的内容）。"""
+    title = task.get("title") or "未命名章节"
+    goal = task.get("goal") or ""
+    return (
+        "# {title}\n\n"
+        "这是第 {r} 轮 mock 草稿（演示用，不消耗模型配额）。\n\n"
+        "## 任务目标\n{goal}\n\n"
+        "## 正文\n"
+        "夜色沿着山脊线缓慢退去，主角终于看清了石门上的刻痕——那不是文字，"
+        "而是一段被反复涂抹又反复显影的名字。他伸手触碰的瞬间，耳边响起的"
+        "却是自己昨夜说过的话。{extra}\n\n"
+        "（本轮修订关注：{focus}）\n"
+    ).format(
+        title=title, r=round_no, goal=goal,
+        extra="这一段在第 2 轮修订中补充了人物动机的伏笔。" if round_no >= 2 else "",
+        focus="节奏与悬念铺排" if round_no == 1 else "人物弧光与首尾呼应",
+    )
+
+
+def implement_note(task):
+    return "（mock 实现）已在目标目录写入 mock-impl.txt 作为变更占位。"
+
+
+def critique(agent_id, round_no, dims, threshold):
+    """确定性评分：第 1 轮略低于阈值，第 2 轮达标，用于验证发布门禁逻辑。"""
+    s = _seed(agent_id)
+    scores = {}
+    for i, d in enumerate(dims):
+        jitter = ((s >> i) % 5) * 0.1
+        scores[d] = round(min(9.5, 4.8 + 1.2 * round_no + jitter), 1)
+    passed = all(v >= threshold for v in scores.values())
+    issues = []
+    if round_no == 1:
+        issues = [
+            {"dim": dims[0], "severity": "major", "note": "开篇信息密度偏低，钩子出现太晚（mock 意见）"},
+            {"dim": dims[-1], "severity": "minor", "note": "段落长短交替不够，读感偏平（mock 意见）"},
+        ]
+    return {
+        "scores": scores,
+        "issues": issues,
+        "summary": "mock 总评：第 %d 轮稿件%s发布阈值" % (round_no, "已达到" if passed else "尚未达到"),
+    }
+
+
+def review(task, verify_passed):
+    return {
+        "pass": bool(verify_passed),
+        "scores": {"正确性": 8.0 if verify_passed else 5.0, "可维护性": 8.0, "安全": 8.5},
+        "issues": [] if verify_passed else [
+            {"severity": "major", "title": "验证命令未通过", "detail": "请检查测试输出（mock 意见）"}],
+        "summary": "mock 代码评审：%s" % ("通过" if verify_passed else "未通过"),
+    }

package/app/core/modelhub.py

@@ -29,6 +29,7 @@ anthropic/openai 可注入到 CLI；google 仅登记（当前无对应 CLI 可
 from __future__ import annotations
 
 import copy
+import hashlib
 import ipaddress
 import json
 import os
@@ -759,6 +760,34 @@ def providers():
         return _load().get("providers", [])
 
 
+def connection_identity(provider_id, key_id="") -> dict:
+    """Resolve provider/credential identity without exposing credential values.
+
+    A provider definition (protocol + normalized host), provider instance (the
+    configured provider id), account/key identity and credential id are kept as
+    separate fields for run snapshots.  The existing provider store remains the
+    source of truth; this helper only supplies stable, redacted references.
+    """
+    provider_id = str(provider_id or "").strip()
+    key_id = str(key_id or "").strip()
+    prov = next((p for p in providers() if str(p.get("id") or "") == provider_id), {})
+    from . import upstream
+    host = upstream.normalize_upstream(prov.get("base_url") or "")
+    protocol = str(prov.get("protocol") or "")[:24]
+    definition_key = "%s|%s" % (protocol, host)
+    definition_id = "conn-def-" + hashlib.sha256(definition_key.encode("utf-8")).hexdigest()[:16]
+    account_id = key_id or "provider-default"
+    return {
+        "connection_id": provider_id,
+        "definition_id": definition_id,
+        "instance_id": provider_id,
+        "account_id": account_id,
+        "credential_id": account_id,
+        "protocol": protocol,
+        "upstream": host,
+    }
+
+
 def bindings():
     with _LOCK:
         return _load().get("bindings", {})
@@ -2390,9 +2419,19 @@ def bindable_protocols(agent_kind_or_id):
         return ("openai",)
     if agent_kind_or_id in ("claude-code", "claude"):
         return ("anthropic",)
+    if agent_kind_or_id in _LOCAL_CRED_ONLY_TARGETS:
+        return ()
     return tuple(_BINDABLE_PROTOCOLS)
 
 
+# 只吃 CLI 本机凭据、不吃 Tutti 两种 wire env 的目标：gemini 本尊只认
+# GOOGLE_API_KEY/GEMINI_API_KEY（Google AI 协议，Tutti 无此协议面）；codebuddy
+# （claude 兼容系）与 trae-agent 的凭据 env 语义未实机验证。注入它们不认的 env
+# 只会造出「链显示活着、实际走 CLI 默认模型」的静默假绑定——宁可返回空协议集，
+# 链上条目全跳过、回落 CLI 本机登录态（recommend_binding 同口径，返回 None）。
+_LOCAL_CRED_ONLY_TARGETS = ("gemini-cli", "codebuddy", "trae-agent")
+
+
 def binding_dead_msg(cli_id):
     """死链失败/告警文案（pipeline 死链闸门与本模块 sync 共用）：说明为什么
     不回落本机默认 + 该 CLI 需要什么协议的供应商。"""
@@ -2400,12 +2439,15 @@ def binding_dead_msg(cli_id):
         protos = bindable_protocols(cli_id)
     except Exception:
         protos = ()
-    hint = ("该 CLI 仅接受 %s 协议的已启用供应商；" % "、".join(protos)) if protos else ""
+    if not protos:
+        return ("该 CLI 暂不支持绑定链（凭据注入尚未适配，使用 CLI 本机登录态与"
+                "默认模型）；请勿为其配置供应商链")
+    hint = "该 CLI 仅接受 %s 协议的已启用供应商；" % "、".join(protos)
     return ("绑定链全部失效（链上供应商已停用/删除/无密钥，或模型已停用），"
             "本步判失败、不回落 CLI 本机默认——%s请在「模型调度（可选）」页为该 CLI 指定已启用的供应商" % hint)
 
 
-def resolve_binding(agent_kind_or_id, difficulty="default"):
+def resolve_binding(agent_kind_or_id, difficulty="default"):
     """返回 {env:{}, model:..., model_fallbacks:[...], codex_provider:..., call_chain:[...]} 或 None。
 
     call_chain 是跨厂商降级链（唯一真源）：每条 {model, env, provider, [codex_provider]}，
@@ -2413,7 +2455,13 @@ def resolve_binding(agent_kind_or_id, difficulty="default"):
     → 整体回落 CLI 默认（None）。纯链条目（无供应商）不注入 env，只传 -m。
     难度路由只在无显式链时生效。
     """
-    b = _binding_for(agent_kind_or_id)
+    # Local-credential-only CLIs must never expose a binding, including legacy
+    # model-only entries that have no provider_id.  The generic runner cannot
+    # inject those model names, so returning a partial chain would make the UI
+    # report a bound model while the CLI silently uses its own default.
+    if agent_kind_or_id in _LOCAL_CRED_ONLY_TARGETS:
+        return None
+    b = _binding_for(agent_kind_or_id)
     chain = _binding_chain(b)
     provs = {p.get("id"): p for p in providers()}
     routing = bool(b.get("difficulty_routing"))