codebee 0.1.69 → 0.1.71

package/app/core/env_scrub.py

@@ -1,86 +1,86 @@
-# -*- coding: utf-8 -*-
-"""环境变量净化：剥离含 KEY/SECRET/TOKEN/PASSWORD 等密钥名的变量。
-
-设计稿：docs/migration/01-defense-patterns.md §5A。
-参考 dsh：docs/defensive-patterns.zh.md 第 31 行（"绝不将环境变量或可预测路径暴露给不可信输出"）。
-"""
-from __future__ import annotations
-
-import logging
-import re
-
-log = logging.getLogger(__name__)
-
-# 黑名单：环境变量名含这些子串（不区分大小写）即剥离。
-_DENY_RE = re.compile(r"(KEY|SECRET|TOKEN|PASSWORD|PASSWD|CREDENTIAL)", re.IGNORECASE)
-
-# 白名单：精确匹配（不分大小写），用于覆盖黑名单。
-_ALLOW_EXACT = frozenset({
-    # 系统/环境（TEMP/TMP/PATHEXT 等是 Windows 名，TMPDIR 是 macOS 每用户
-    # 临时目录——三边各留各的，多出的名字在别的平台上不存在、无副作用）
-    "PATH", "PATHEXT", "SYSTEMROOT", "TEMP", "TMP", "TMPDIR",
-    "USERPROFILE", "USERDNSDOMAIN", "HOMEPATH", "HOMEDRIVE",
-    "LANG", "LC_ALL", "LC_CTYPE",
-    "HOME", "SHELL", "TERM", "PYTHONIOENCODING",
-    "PYTHONPATH", "PYTHONUNBUFFERED",
-    "COMSPEC", "WINDIR",
-    # Tutti / DSH 内部
-    "DSH_HOME", "TUTTI_HOME", "ALLINONE_HOME",
-    # Claude CLI 自有（不是密钥本身，是配置）
-    "CLAUDE_CODE_ENTRYPOINT", "CLAUDE_CODE_SSE_PORT",
-    # PowerShell / Windows
-    "PSMODULEPATH", "PROMPT",
-})
-
-# 白名单前缀（区分大小写以匹配 Windows 习惯）；含前缀视为放行。
-_ALLOW_PREFIX = (
-    "CODEX_", "CLAUDE_CODE_", "OPENAI_", "ANTHROPIC_",
-    "QWEN_", "AIDER_", "OPENCODE_", "GEMINI_",
-    "TUTTI_", "ALLINONE_", "DSH_",
-    "LANG", "LC_",  # locale 系列
-    "PYTHON",       # PYTHONPATH / PYTHONIOENCODING 等
-    "XDG_",         # XDG_CONFIG_HOME 等（macOS/Linux CLI 认它找配置/缓存落点）
-    "CHROME", "EDGE", "PLAYWRIGHT",  # 本机测试工具
-)
-
-
-def _should_keep(k: str) -> bool:
-    if k in _ALLOW_EXACT:
-        return True
-    for p in _ALLOW_PREFIX:
-        if k.startswith(p):
-            return True
-    return False
-
-
-def scrub_env(env: dict, *, mode: str = "drop") -> dict:
-    """返回净化后的 env 副本（原 dict 不修改）。
-
-    Args:
-        env: 原始环境变量字典
-        mode:
-          "drop" - 直接删除命中黑名单的 key（默认）
-          "stub" - 把值替换为 "__REDACTED__"（子进程若检查值类型可能崩）
-          "off"  - 完全不过滤（用于测试 / 排查）
-    """
-    if mode == "off":
-        return dict(env)
-    out: dict = {}
-    dropped: list = []
-    stubbed: list = []
-    for k, v in env.items():
-        if _should_keep(k):
-            out[k] = v
-        elif _DENY_RE.search(k):
-            if mode == "stub":
-                out[k] = "__REDACTED__"
-                stubbed.append(k)
-            else:
-                dropped.append(k)
-        else:
-            out[k] = v
-    if dropped:
-        log.info("env-scrub dropped %d keys: %s", len(dropped), dropped[:20])
-    if stubbed:
-        log.info("env-scrub stubbed %d keys: %s", len(stubbed), stubbed[:20])
+# -*- coding: utf-8 -*-
+"""环境变量净化：剥离含 KEY/SECRET/TOKEN/PASSWORD 等密钥名的变量。
+
+设计稿：docs/migration/01-defense-patterns.md §5A。
+参考 dsh：docs/defensive-patterns.zh.md 第 31 行（"绝不将环境变量或可预测路径暴露给不可信输出"）。
+"""
+from __future__ import annotations
+
+import logging
+import re
+
+log = logging.getLogger(__name__)
+
+# 黑名单：环境变量名含这些子串（不区分大小写）即剥离。
+_DENY_RE = re.compile(r"(KEY|SECRET|TOKEN|PASSWORD|PASSWD|CREDENTIAL)", re.IGNORECASE)
+
+# 白名单：精确匹配（不分大小写），用于覆盖黑名单。
+_ALLOW_EXACT = frozenset({
+    # 系统/环境（TEMP/TMP/PATHEXT 等是 Windows 名，TMPDIR 是 macOS 每用户
+    # 临时目录——三边各留各的，多出的名字在别的平台上不存在、无副作用）
+    "PATH", "PATHEXT", "SYSTEMROOT", "TEMP", "TMP", "TMPDIR",
+    "USERPROFILE", "USERDNSDOMAIN", "HOMEPATH", "HOMEDRIVE",
+    "LANG", "LC_ALL", "LC_CTYPE",
+    "HOME", "SHELL", "TERM", "PYTHONIOENCODING",
+    "PYTHONPATH", "PYTHONUNBUFFERED",
+    "COMSPEC", "WINDIR",
+    # Tutti / DSH 内部
+    "DSH_HOME", "TUTTI_HOME", "ALLINONE_HOME",
+    # Claude CLI 自有（不是密钥本身，是配置）
+    "CLAUDE_CODE_ENTRYPOINT", "CLAUDE_CODE_SSE_PORT",
+    # PowerShell / Windows
+    "PSMODULEPATH", "PROMPT",
+})
+
+# 白名单前缀（区分大小写以匹配 Windows 习惯）；含前缀视为放行。
+_ALLOW_PREFIX = (
+    "CODEX_", "CLAUDE_CODE_", "OPENAI_", "ANTHROPIC_",
+    "QWEN_", "AIDER_", "OPENCODE_", "GEMINI_",
+    "TUTTI_", "ALLINONE_", "DSH_",
+    "LANG", "LC_",  # locale 系列
+    "PYTHON",       # PYTHONPATH / PYTHONIOENCODING 等
+    "XDG_",         # XDG_CONFIG_HOME 等（macOS/Linux CLI 认它找配置/缓存落点）
+    "CHROME", "EDGE", "PLAYWRIGHT",  # 本机测试工具
+)
+
+
+def _should_keep(k: str) -> bool:
+    if k in _ALLOW_EXACT:
+        return True
+    for p in _ALLOW_PREFIX:
+        if k.startswith(p):
+            return True
+    return False
+
+
+def scrub_env(env: dict, *, mode: str = "drop") -> dict:
+    """返回净化后的 env 副本（原 dict 不修改）。
+
+    Args:
+        env: 原始环境变量字典
+        mode:
+          "drop" - 直接删除命中黑名单的 key（默认）
+          "stub" - 把值替换为 "__REDACTED__"（子进程若检查值类型可能崩）
+          "off"  - 完全不过滤（用于测试 / 排查）
+    """
+    if mode == "off":
+        return dict(env)
+    out: dict = {}
+    dropped: list = []
+    stubbed: list = []
+    for k, v in env.items():
+        if _should_keep(k):
+            out[k] = v
+        elif _DENY_RE.search(k):
+            if mode == "stub":
+                out[k] = "__REDACTED__"
+                stubbed.append(k)
+            else:
+                dropped.append(k)
+        else:
+            out[k] = v
+    if dropped:
+        log.info("env-scrub dropped %d keys: %s", len(dropped), dropped[:20])
+    if stubbed:
+        log.info("env-scrub stubbed %d keys: %s", len(stubbed), stubbed[:20])
     return out

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: "上游余额或调用额度不足",

package/app/core/errorlog.py

@@ -1,137 +1,137 @@
-# -*- coding: utf-8 -*-
-"""错误台账：把分散在各处的失败（步骤失败/超时/看门狗击杀、CLI 启动失败）
-统一落成结构化记录——「客户遇到了问题我们根本不知道」的第一块拼图。
-
-落盘：data/errors/errors-YYYYMM.jsonl（按月分文件，append-only，一行一记录）。
-与 usage.py 同一套纪律：
-- record() 任何异常都吞掉——埋点失败绝不能影响任务执行；
-- 落盘前先脱敏（scrub_text）：密钥/令牌/绝对路径/超长文本一概不进台账。
-
-隐私红线（上传侧在 telemetry.py 再兜一道底）：
-1. API KEY / 凭据绝不入台账；
-2. 任务正文 / 章节内容（用户版权内容）绝不入台账——detail 只允许失败原因摘录；
-3. 绝对路径剥成相对片段。
-"""
-from __future__ import annotations
-
-import json
-import threading
-import time
-import uuid
-
-from . import paths
-from .redact import scrub_text
-
-LOCK = threading.RLock()
-
-FIELDS = ("id", "ts", "day", "category", "reason", "detail", "provider",
-          "model", "tool", "role", "run_id", "task_id", "step",
-          "exit_code", "app_version", "os")
-
-# detail 摘录上限（字符）：失败原因足够，不要变成日志搬运
-DETAIL_LIMIT = 600
-
-
-# ---------------------------------------------------------------- 脱敏
-
-def _coerce_str(v, limit):
-    return str(v or "")[:limit]
-
-
-def _os_tag():
-    import sys
-    return {"win32": "windows", "darwin": "macos"}.get(sys.platform, sys.platform)
-
-
-def _version():
-    try:
-        from . import selfupdate
-        return str(selfupdate.package_version() or "dev")
-    except Exception:
-        return "dev"
-
-
-def record(category="", reason="", detail="", provider="", model="", tool="",
-           role="", run_id="", task_id="", step=0, exit_code=None, source=""):
-    """追加一条错误记录。缺省字段留空；任何异常都吞掉（埋点不拖垮业务）。
-
-    category: step / run / launch / service（枚举放宽，未知值原样入库）
-    reason:   失败原因码（error_codes.ErrorCode 的字符串值优先，如 TIMEOUT）
-    detail:   失败摘录（内部先过 scrub_text，绝不存原文）
-    """
-    try:
-        rec = {
-            "id": "%s-%s" % (time.strftime("%Y-%m-%d %H:%M:%S"),
-                             uuid.uuid4().hex[:8]),
-            "ts": time.strftime("%Y-%m-%d %H:%M:%S"),
-            "day": time.strftime("%Y-%m-%d"),
-            "category": _coerce_str(category, 24) or "step",
-            "reason": _coerce_str(reason, 40) or "UNKNOWN",
-            "detail": scrub_text(detail),
-            "provider": _coerce_str(provider, 60),
-            "model": _coerce_str(model, 80),
-            "tool": _coerce_str(tool, 24),
-            "role": _coerce_str(role, 40),
-            "run_id": _coerce_str(run_id, 64),
-            "task_id": _coerce_str(task_id, 64),
-            "step": int(step or 0),
-            "exit_code": exit_code,
-            "app_version": _version()[:24],
-            "os": _os_tag(),
-        }
-        line = json.dumps(rec, ensure_ascii=False)
-        day = rec["day"]
-        with LOCK:
-            paths.ERRORS_DIR.mkdir(parents=True, exist_ok=True)
-            with open(paths.ERRORS_DIR / ("errors-%s.jsonl" % day[:7].replace("-", "")),
-                      "a", encoding="utf-8") as f:
-                f.write(line + "\n")
-    except Exception:
-        pass
-
-
-def iter_records(days=0):
-    """按时间范围读取台账（days=0 表示全部）。返回按写入顺序的记录列表。"""
-    out = []
-    try:
-        files = sorted(paths.ERRORS_DIR.glob("errors-*.jsonl")) if paths.ERRORS_DIR.is_dir() else []
-    except Exception:
-        return out
-    since_day = ""
-    if days:
-        import datetime
-        since_day = (datetime.date.today()
-                     - datetime.timedelta(days=int(days) - 1)).isoformat()
-    for p in files:
-        try:
-            for line in p.read_text(encoding="utf-8", errors="replace").splitlines():
-                line = line.strip()
-                if not line.startswith("{"):
-                    continue
-                try:
-                    r = json.loads(line)
-                except Exception:
-                    continue
-                if not isinstance(r, dict):
-                    continue
-                if since_day and str(r.get("day", "")) < since_day:
-                    continue
-                out.append(r)
-        except Exception:
-            continue
-    return out
-
-
-def pending_since(cursor, limit=200):
-    """取 cursor（上次上传到的记录 id）之后的记录，最多 limit 条。
-
-    id 以时间开头、uuid 尾巴保证唯一且字典序≈时间序；返回 (records, new_cursor)。
-    """
-    try:
-        recs = [r for r in iter_records(0) if str(r.get("id") or "") > str(cursor or "")]
-        recs.sort(key=lambda r: str(r.get("id") or ""))
-        batch = recs[:max(1, int(limit))]
-        new_cursor = str(batch[-1].get("id")) if batch else str(cursor or "")
-        return batch, new_cursor
-    except Exception:
-        return [], str(cursor or "")
+# -*- coding: utf-8 -*-
+"""错误台账：把分散在各处的失败（步骤失败/超时/看门狗击杀、CLI 启动失败）
+统一落成结构化记录——「客户遇到了问题我们根本不知道」的第一块拼图。
+
+落盘：data/errors/errors-YYYYMM.jsonl（按月分文件，append-only，一行一记录）。
+与 usage.py 同一套纪律：
+- record() 任何异常都吞掉——埋点失败绝不能影响任务执行；
+- 落盘前先脱敏（scrub_text）：密钥/令牌/绝对路径/超长文本一概不进台账。
+
+隐私红线（上传侧在 telemetry.py 再兜一道底）：
+1. API KEY / 凭据绝不入台账；
+2. 任务正文 / 章节内容（用户版权内容）绝不入台账——detail 只允许失败原因摘录；
+3. 绝对路径剥成相对片段。
+"""
+from __future__ import annotations
+
+import json
+import threading
+import time
+import uuid
+
+from . import paths
+from .redact import scrub_text
+
+LOCK = threading.RLock()
+
+FIELDS = ("id", "ts", "day", "category", "reason", "detail", "provider",
+          "model", "tool", "role", "run_id", "task_id", "step",
+          "exit_code", "app_version", "os")
+
+# detail 摘录上限（字符）：失败原因足够，不要变成日志搬运
+DETAIL_LIMIT = 600
+
+
+# ---------------------------------------------------------------- 脱敏
+
+def _coerce_str(v, limit):
+    return str(v or "")[:limit]
+
+
+def _os_tag():
+    import sys
+    return {"win32": "windows", "darwin": "macos"}.get(sys.platform, sys.platform)
+
+
+def _version():
+    try:
+        from . import selfupdate
+        return str(selfupdate.package_version() or "dev")
+    except Exception:
+        return "dev"
+
+
+def record(category="", reason="", detail="", provider="", model="", tool="",
+           role="", run_id="", task_id="", step=0, exit_code=None, source=""):
+    """追加一条错误记录。缺省字段留空；任何异常都吞掉（埋点不拖垮业务）。
+
+    category: step / run / launch / service（枚举放宽，未知值原样入库）
+    reason:   失败原因码（error_codes.ErrorCode 的字符串值优先，如 TIMEOUT）
+    detail:   失败摘录（内部先过 scrub_text，绝不存原文）
+    """
+    try:
+        rec = {
+            "id": "%s-%s" % (time.strftime("%Y-%m-%d %H:%M:%S"),
+                             uuid.uuid4().hex[:8]),
+            "ts": time.strftime("%Y-%m-%d %H:%M:%S"),
+            "day": time.strftime("%Y-%m-%d"),
+            "category": _coerce_str(category, 24) or "step",
+            "reason": _coerce_str(reason, 40) or "UNKNOWN",
+            "detail": scrub_text(detail),
+            "provider": _coerce_str(provider, 60),
+            "model": _coerce_str(model, 80),
+            "tool": _coerce_str(tool, 24),
+            "role": _coerce_str(role, 40),
+            "run_id": _coerce_str(run_id, 64),
+            "task_id": _coerce_str(task_id, 64),
+            "step": int(step or 0),
+            "exit_code": exit_code,
+            "app_version": _version()[:24],
+            "os": _os_tag(),
+        }
+        line = json.dumps(rec, ensure_ascii=False)
+        day = rec["day"]
+        with LOCK:
+            paths.ERRORS_DIR.mkdir(parents=True, exist_ok=True)
+            with open(paths.ERRORS_DIR / ("errors-%s.jsonl" % day[:7].replace("-", "")),
+                      "a", encoding="utf-8") as f:
+                f.write(line + "\n")
+    except Exception:
+        pass
+
+
+def iter_records(days=0):
+    """按时间范围读取台账（days=0 表示全部）。返回按写入顺序的记录列表。"""
+    out = []
+    try:
+        files = sorted(paths.ERRORS_DIR.glob("errors-*.jsonl")) if paths.ERRORS_DIR.is_dir() else []
+    except Exception:
+        return out
+    since_day = ""
+    if days:
+        import datetime
+        since_day = (datetime.date.today()
+                     - datetime.timedelta(days=int(days) - 1)).isoformat()
+    for p in files:
+        try:
+            for line in p.read_text(encoding="utf-8", errors="replace").splitlines():
+                line = line.strip()
+                if not line.startswith("{"):
+                    continue
+                try:
+                    r = json.loads(line)
+                except Exception:
+                    continue
+                if not isinstance(r, dict):
+                    continue
+                if since_day and str(r.get("day", "")) < since_day:
+                    continue
+                out.append(r)
+        except Exception:
+            continue
+    return out
+
+
+def pending_since(cursor, limit=200):
+    """取 cursor（上次上传到的记录 id）之后的记录，最多 limit 条。
+
+    id 以时间开头、uuid 尾巴保证唯一且字典序≈时间序；返回 (records, new_cursor)。
+    """
+    try:
+        recs = [r for r in iter_records(0) if str(r.get("id") or "") > str(cursor or "")]
+        recs.sort(key=lambda r: str(r.get("id") or ""))
+        batch = recs[:max(1, int(limit))]
+        new_cursor = str(batch[-1].get("id")) if batch else str(cursor or "")
+        return batch, new_cursor
+    except Exception:
+        return [], str(cursor or "")