codebee 0.1.69 → 0.1.70

package/app/core/catalog.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 
 import copy
 import json
+import os
 import re
 import sys
 import threading
@@ -430,7 +431,12 @@ def load(force=False):
             entries = json.loads(paths.CATALOG_FILE.read_text(encoding="utf-8"))
         except Exception:
             entries = copy.deepcopy(DEFAULT_CATALOG)
-        _merge_new_defaults(entries)
+        # TUTTI_TEST_NO_DEFAULT_CATALOG：e2e 测试隔离开关——种盘的 catalog.json
+        # 就是全部条目。默认合并会把真实 CLI 条目带进测试服务，一键升级这类
+        # 「遍历全 catalog」的接口会把真机的 npm/winget 升级真跑一遍（2026-09-26
+        # e2e_upgrade_all 实弹案：codex 被真升）。
+        if not os.environ.get("TUTTI_TEST_NO_DEFAULT_CATALOG"):
+            _merge_new_defaults(entries)
         _apply_resume_patch(entries)
         _apply_launch_patch(entries)
         _apply_config_patch(entries)

package/app/core/dispatch.py

@@ -119,6 +119,20 @@ def _online_model_bonus(entry, task_type, role):
         return 0.0, ""
 
 
+def _bench_bonus(entry):
+    """评测基准台实测分软信号（promptfoo 式样题榜单；14 天新鲜度，过期记 0）。
+
+    与在线信号同理念：软加减分，硬约束（健康/冷却/协议）仍由调用方负责；
+    无数据不猜分——没上过评测台的候选保持原排序。
+    """
+    try:
+        from . import benchstore
+        return benchstore.bonus_for(entry.get("provider_id") or "",
+                                    entry.get("model") or "")
+    except Exception:
+        return 0.0, ""
+
+
 def score_model_entry(entry, providers, pricing, difficulty, task_type="", role=""):
     """给已通过硬约束的模型链条目评分，返回 (score, explanation)。"""
     provider = (providers or {}).get(entry.get("provider_id")) \
@@ -146,11 +160,14 @@ def score_model_entry(entry, providers, pricing, difficulty, task_type="", role=
     if dim == "vision":
         vision_score = 24.0 if meta.get("image_in") else -24.0
     online_score, online_reason = _online_model_bonus(entry, task_type, role)
-    total = quality + tier_score + price_score + strength_score + vision_score + online_score
-    reason = ("质量 %+.1f，档位 %s %+.1f，%s，能力 %s %+.1f%s%s"
+    bench_score, bench_reason = _bench_bonus(entry)
+    total = (quality + tier_score + price_score + strength_score + vision_score
+             + online_score + bench_score)
+    reason = ("质量 %+.1f，档位 %s %+.1f，%s，能力 %s %+.1f%s%s%s%s"
               % (quality, tier, tier_score, price_reason, dim,
                  strength_score + vision_score,
-                 "，" if online_reason else "", online_reason))
+                 "，" if online_reason else "", online_reason,
+                 "，" if bench_reason else "", bench_reason))
     return round(total, 2), reason
 
 

package/app/core/error_codes.py

@@ -55,6 +55,9 @@ FATAL_CODES = frozenset({
 _MISSING_CREDENTIAL = (
     "no api key", "missing api key", "api key not found", "api key is required",
     "missing environment variable", "missing env var",
+    # claude CLI 登录闸门：无 OAuth/Key 时 -p 模式只吐一行提示即退出（exit 0/1
+    # 都见过），不产生 result 事件——绑定链 env 未注入或本机未登录时必现
+    "not logged in", "please run /login",
 )
 _AUTH = (
     "invalid api key", "invalid_api_key", "api key is invalid", "incorrect api key",
@@ -64,13 +67,19 @@ _AUTH = (
     "status code 401",
 )
 _FORBIDDEN = ("forbidden", "request not allowed", "permission denied", "access denied")
+# 「request rejected」是智谱网关 429 的固定措辞（Request rejected (429)）：
+# 裸 (429) 不带 http/status-code 前缀，正则分支匹配不到，只能靠词面
+# （2026-09-27 七天上限案：分类不出 → 换将闸门当终态收工，备用 KEY 永不上场）
 _RATE_LIMIT = ("rate limit", "rate_limit", "too many requests", "http 429", "status code 429",
+               "request rejected",
                "concurrent limit", "concurrency limit", "too many concurrent",
                "并发限制", "并发超限", "限流")
 _QUOTA = ("insufficient balance", "insufficient quota", "insufficient credit",
           "quota", "balance is insufficient", "credit balance", "billing", "arrears",
           "payment required", "http 402", "status code 402", "欠费", "余额", "额度",
-          "usage limit", "limit exceeded", "quota exhausted")
+          "usage limit", "limit exceeded", "quota exhausted",
+          # 周期性用量上限（七天/五小时窗口）：部分上游文案不带 429 字样
+          "使用上限", "用量上限")
 _SERVER = ("unexpected server error", "internal server error", "server error",
            "overloaded", "temporarily", "unavailable", "service unavailable",
            "internal error", "no available channel", "unknown model")
@@ -180,7 +189,7 @@ _SAFE_ERROR_SUMMARIES = {
     ErrorCode.EMPTY: "模型未返回内容",
     ErrorCode.NETWORK: "网络连接或数据流中断",
     ErrorCode.UPSTREAM_SERVER: "上游服务端异常",
-    ErrorCode.MISSING_CREDENTIAL: "所选路由未找到可用 API 凭据",
+    ErrorCode.MISSING_CREDENTIAL: "未找到可用凭据（CLI 未登录或未配置 API Key）",
     ErrorCode.AUTH: "API 凭据认证失败",
     ErrorCode.FORBIDDEN: "上游拒绝账号、模型或请求权限",
     ErrorCode.QUOTA: "上游余额或调用额度不足",