codebee 0.1.101 → 0.1.103

package/app/core/settings.py

@@ -1,215 +1,215 @@
-# -*- coding: utf-8 -*-
-"""运行设置（data/settings.json）：并发 worker 数 + 默认保存路径。"""
-from __future__ import annotations
-
-import json
-import threading
-from pathlib import Path
-
-from . import paths
-
-_LOCK = threading.RLock()
-_FILE = paths.DATA_DIR / "settings.json"
-
-# default_workdir 为空表示未自定义，用 builtin_workdir() 回落；
-# telemetry_errors：匿名错误回传开关（默认开；关掉后版本 ping/错误上传/诊断包遥测部分全部停发，
-# 「导出诊断包」是用户手动操作不受此开关限制）
-# publish_daily_cap / publish_fail_streak / publish_fail_window_h：自动发布护栏——
-# 每任务每平台每日成功发章上限、平台连续失败几次后暂停自动发布、连败只统计
-# 最近多少小时内的失败（跨天旧失败不进「连续」口径）（publish/auto.py 读取）
-# pet_enabled / pet_mode：桌面蜜蜂（app/pet.py）开关与显示模式（默认关，设置页
-# 可开）。关闭后看护线程不再拉起、在岗蜜蜂轮询到 false 自行退出；mode=always
-# 不再拉起、在岗蜜蜂轮询到 false 自行退出；mode=always 常驻，tasks_only 仅任务
-# 运行时出现（空闲 90s 隐身）。
-# cleanup_enabled / cleanup_retention_days：每日垃圾清理（core/cleanup.py）——
-# 运行过程日志/发布截图/bak 残留等超期自动清理；retention 为保留天数。
-# 个人推送通道（core/notify.py 读取）：Bark（iOS）/ ntfy（自托管友好）/
-# Server酱（微信）/ Telegram Bot。密钥只存本机 settings.json，不出网（推送
-# 时才带着发给对应服务）。bark_server 留空回落官方 api.day.app。
-DEFAULTS = {"max_concurrent_jobs": 12, "default_workdir": "", "hooks_token": "",
-            "hooks_signing_secret": "",
-            "telemetry_errors": True, "publish_daily_cap": 10,
-            "publish_fail_streak": 3, "publish_fail_window_h": 12,
-            "notify_webhook": "", "notify_base_url": "",
-            "notify_bark_server": "", "notify_bark_key": "",
-            "notify_ntfy_topic": "", "notify_serverchan_key": "",
-            "notify_telegram_token": "", "notify_telegram_chat_id": "",
-            # 评测台定时回归（evalbench.fire_due，automation tick 调用）：
-            # enabled=False 关；days 间隔天数控节流；mcp_servers=内置智能体的
-            # MCP 服务器清单（JSON 数组字符串，stdio 形态）
-            "bench_auto_enabled": False, "bench_auto_days": 7,
-            # 评测反哺：实测分软信号进绑定链排序（dispatch 读 benchstore.bonus_for，
-            # ±4.5 封顶翻不动硬约束）。默认开——评测了就该去影响；关=纯榜单展示
-            "bench_feedback_enabled": True,
-            "mcp_servers": "",
-            # 备份远程通道（remotesync）：导出成功后自动 PUT 到 WebDAV/S3 兼容
-            # 端点（Basic auth）；密钥只存本机
-            "backup_remote_enabled": False, "backup_remote_url": "",
-            "backup_remote_user": "", "backup_remote_pass": "",
-            "pet_enabled": False, "pet_mode": "always", "pet_skin": "plush",
-            "cleanup_enabled": True, "cleanup_retention_days": 14,
-            # claude_config_sync：打开/运行前防线是否直写 ~/.claude/settings.json。
-            # 关闭后交互 claude 配置归用户手动管理（cc-switch 等），编排步骤经
-            # runner 一次性 --settings 注入绑定链，路由不受影响（manager 读取）
-            "claude_config_sync": True}
-# 桌宠形象白名单（与 app/pet.py 的 SKINS 对齐；这里不 import pet 模块，避免
-# core 反向依赖 app 根目录脚本）
-PET_SKINS = ("plush", "robot")
-SECRET_KEYS = frozenset({"hooks_token", "hooks_signing_secret", "notify_webhook",
-                         "notify_bark_key", "notify_ntfy_topic", "notify_serverchan_key",
-                         "notify_telegram_token", "notify_telegram_chat_id", "backup_remote_pass"})
-
-
-def public_view(value=None):
-    """Return settings suitable for API responses without credential material."""
-    source = dict(value if isinstance(value, dict) else load())
-    for key in SECRET_KEYS:
-        if key in source:
-            source[key] = "***" if source[key] else ""
-    return source
-# 并发保护上限 24：编排任务有空位即直接启动，满载回滚 queued 排队自动补跑，
-# 不秒判失败；同任务单飞守卫在 jobs 层。该上限保护的是本机资源（CLI 子进程
-# 数），与各 API 厂商的限流无关；direct 对话走 jobs 轻量池不占此额度。
-MIN_WORKERS, MAX_WORKERS = 1, 24
-
-
-def builtin_workdir():
-    """内置默认保存路径：数据目录内的 workspace/（CodeBee 自己的地盘，
-    启动 ensure_dirs 即创建；老版本落在数据目录同级——Windows 上是
-    AppData\\Roaming\\workspace，平时不存在点开即报错，已废弃）。"""
-    return str(paths.DATA_DIR / "workspace")
-
-
-def default_workdir():
-    """当前生效的默认保存路径（自定义优先，回落内置值）。"""
-    raw = str(load().get("default_workdir") or "").strip()
-    return raw if raw else builtin_workdir()
-
-
-def _norm_workdir(v):
-    """展开 ~ 并转绝对路径；空值合法（回落内置）。返回 (标准化串, 错误)。"""
-    v = str(v or "").strip()
-    if not v:
-        return "", None
-    if v.startswith("~"):
-        v = str(Path(v).expanduser())
-    p = Path(v)
-    if not p.is_absolute():
-        return "", "默认保存路径必须是绝对路径"
-    return str(p), None
-
-
-def load():
-    with _LOCK:
-        try:
-            data = json.loads(_FILE.read_text(encoding="utf-8"))
-        except Exception:
-            data = {}
-    out = dict(DEFAULTS)
-    if isinstance(data, dict):
-        out.update({k: v for k, v in data.items() if k in DEFAULTS})
-    try:
-        out["max_concurrent_jobs"] = max(MIN_WORKERS, min(MAX_WORKERS, int(out["max_concurrent_jobs"])))
-    except Exception:
-        out["max_concurrent_jobs"] = DEFAULTS["max_concurrent_jobs"]
-    wd, _ = _norm_workdir(out.get("default_workdir"))
-    out["default_workdir"] = wd
-    out["default_workdir_effective"] = wd if wd else builtin_workdir()
-    return out
-
-
-def save(patch):
-    """合并保存。返回 (view, 错误)。"""
-    if not isinstance(patch, dict):
-        return load(), "payload 必须是对象"
-    with _LOCK:
-        cur = load()
-        if "max_concurrent_jobs" in patch:
-            try:
-                cur["max_concurrent_jobs"] = int(patch["max_concurrent_jobs"])
-            except Exception:
-                return cur, "max_concurrent_jobs 必须是整数"
-            if not MIN_WORKERS <= cur["max_concurrent_jobs"] <= MAX_WORKERS:
-                return cur, "max_concurrent_jobs 取值 %d-%d" % (MIN_WORKERS, MAX_WORKERS)
-        if "default_workdir" in patch:
-            wd, err = _norm_workdir(patch.get("default_workdir"))
-            if err:
-                return cur, err
-            cur["default_workdir"] = wd
-        if "hooks_token" in patch:
-            cur["hooks_token"] = str(patch.get("hooks_token") or "").strip()[:128]
-        if "hooks_signing_secret" in patch:
-            cur["hooks_signing_secret"] = str(patch.get("hooks_signing_secret") or "").strip()[:256]
-        if "telemetry_errors" in patch:
-            cur["telemetry_errors"] = bool(patch.get("telemetry_errors"))
-        if "publish_daily_cap" in patch:
-            try:
-                v = int(patch.get("publish_daily_cap"))
-            except (TypeError, ValueError):
-                return cur, "publish_daily_cap 必须是 0-50 的整数（0=不限制）"
-            cur["publish_daily_cap"] = max(0, min(50, v))
-        if "publish_fail_streak" in patch:
-            try:
-                cur["publish_fail_streak"] = max(1, min(10, int(patch.get("publish_fail_streak"))))
-            except (TypeError, ValueError):
-                return cur, "publish_fail_streak 必须是 1-10 的整数"
-        if "publish_fail_window_h" in patch:
-            try:
-                cur["publish_fail_window_h"] = max(1, min(168, float(patch.get("publish_fail_window_h"))))
-            except (TypeError, ValueError):
-                return cur, "publish_fail_window_h 必须是 1-168 的数字"
-        if "notify_webhook" in patch:
-            cur["notify_webhook"] = str(patch.get("notify_webhook") or "").strip()[:300]
-        if "notify_base_url" in patch:
-            cur["notify_base_url"] = str(patch.get("notify_base_url") or "").strip()[:200]
-        for _nk, _nmax in (("notify_bark_server", 200), ("notify_bark_key", 128),
-                           ("notify_ntfy_topic", 200), ("notify_serverchan_key", 128),
-                           ("notify_telegram_token", 128), ("notify_telegram_chat_id", 64)):
-            if _nk in patch:
-                cur[_nk] = str(patch.get(_nk) or "").strip()[:_nmax]
-        if "bench_auto_enabled" in patch:
-            cur["bench_auto_enabled"] = bool(patch.get("bench_auto_enabled"))
-        if "bench_auto_days" in patch:
-            try:
-                cur["bench_auto_days"] = max(1, min(90, int(patch.get("bench_auto_days"))))
-            except (TypeError, ValueError):
-                return cur, "bench_auto_days 必须是 1-90 的整数"
-        if "bench_feedback_enabled" in patch:
-            cur["bench_feedback_enabled"] = bool(patch.get("bench_feedback_enabled"))
-        if "mcp_servers" in patch:
-            cur["mcp_servers"] = str(patch.get("mcp_servers") or "").strip()[:4000]
-        if "backup_remote_enabled" in patch:
-            cur["backup_remote_enabled"] = bool(patch.get("backup_remote_enabled"))
-        for _rk, _rmax in (("backup_remote_url", 300), ("backup_remote_user", 128),
-                           ("backup_remote_pass", 128)):
-            if _rk in patch:
-                cur[_rk] = str(patch.get(_rk) or "").strip()[:_rmax]
-        if "pet_enabled" in patch:
-            cur["pet_enabled"] = bool(patch.get("pet_enabled"))
-        if "pet_mode" in patch:
-            pm = str(patch.get("pet_mode") or "").strip()
-            if pm not in ("always", "tasks_only"):
-                return cur, "pet_mode 只能是 always 或 tasks_only"
-            cur["pet_mode"] = pm
-        if "pet_skin" in patch:
-            ps = str(patch.get("pet_skin") or "").strip()
-            if ps not in PET_SKINS:
-                return cur, "pet_skin 只能是 %s 之一" % "/".join(PET_SKINS)
-            cur["pet_skin"] = ps
-        if "cleanup_enabled" in patch:
-            cur["cleanup_enabled"] = bool(patch.get("cleanup_enabled"))
-        if "claude_config_sync" in patch:
-            cur["claude_config_sync"] = bool(patch.get("claude_config_sync"))
-        if "cleanup_retention_days" in patch:
-            try:
-                cur["cleanup_retention_days"] = int(patch.get("cleanup_retention_days"))
-            except (TypeError, ValueError):
-                return cur, "cleanup_retention_days 必须是整数"
-            if not 1 <= cur["cleanup_retention_days"] <= 365:
-                return cur, "cleanup_retention_days 取值 1-365"
-        _FILE.parent.mkdir(parents=True, exist_ok=True)
-        tmp = _FILE.with_suffix(".tmp")
-        tmp.write_text(json.dumps(cur, ensure_ascii=False, indent=2), encoding="utf-8")
-        tmp.replace(_FILE)
-    cur["default_workdir_effective"] = cur["default_workdir"] if cur["default_workdir"] else builtin_workdir()
-    return cur, None
+# -*- coding: utf-8 -*-
+"""运行设置（data/settings.json）：并发 worker 数 + 默认保存路径。"""
+from __future__ import annotations
+
+import json
+import threading
+from pathlib import Path
+
+from . import paths
+
+_LOCK = threading.RLock()
+_FILE = paths.DATA_DIR / "settings.json"
+
+# default_workdir 为空表示未自定义，用 builtin_workdir() 回落；
+# telemetry_errors：匿名错误回传开关（默认开；关掉后版本 ping/错误上传/诊断包遥测部分全部停发，
+# 「导出诊断包」是用户手动操作不受此开关限制）
+# publish_daily_cap / publish_fail_streak / publish_fail_window_h：自动发布护栏——
+# 每任务每平台每日成功发章上限、平台连续失败几次后暂停自动发布、连败只统计
+# 最近多少小时内的失败（跨天旧失败不进「连续」口径）（publish/auto.py 读取）
+# pet_enabled / pet_mode：桌面蜜蜂（app/pet.py）开关与显示模式（默认关，设置页
+# 可开）。关闭后看护线程不再拉起、在岗蜜蜂轮询到 false 自行退出；mode=always
+# 不再拉起、在岗蜜蜂轮询到 false 自行退出；mode=always 常驻，tasks_only 仅任务
+# 运行时出现（空闲 90s 隐身）。
+# cleanup_enabled / cleanup_retention_days：每日垃圾清理（core/cleanup.py）——
+# 运行过程日志/发布截图/bak 残留等超期自动清理；retention 为保留天数。
+# 个人推送通道（core/notify.py 读取）：Bark（iOS）/ ntfy（自托管友好）/
+# Server酱（微信）/ Telegram Bot。密钥只存本机 settings.json，不出网（推送
+# 时才带着发给对应服务）。bark_server 留空回落官方 api.day.app。
+DEFAULTS = {"max_concurrent_jobs": 12, "default_workdir": "", "hooks_token": "",
+            "hooks_signing_secret": "",
+            "telemetry_errors": True, "publish_daily_cap": 10,
+            "publish_fail_streak": 3, "publish_fail_window_h": 12,
+            "notify_webhook": "", "notify_base_url": "",
+            "notify_bark_server": "", "notify_bark_key": "",
+            "notify_ntfy_topic": "", "notify_serverchan_key": "",
+            "notify_telegram_token": "", "notify_telegram_chat_id": "",
+            # 评测台定时回归（evalbench.fire_due，automation tick 调用）：
+            # enabled=False 关；days 间隔天数控节流；mcp_servers=内置智能体的
+            # MCP 服务器清单（JSON 数组字符串，stdio 形态）
+            "bench_auto_enabled": False, "bench_auto_days": 7,
+            # 评测反哺：实测分软信号进绑定链排序（dispatch 读 benchstore.bonus_for，
+            # ±4.5 封顶翻不动硬约束）。默认开——评测了就该去影响；关=纯榜单展示
+            "bench_feedback_enabled": True,
+            "mcp_servers": "",
+            # 备份远程通道（remotesync）：导出成功后自动 PUT 到 WebDAV/S3 兼容
+            # 端点（Basic auth）；密钥只存本机
+            "backup_remote_enabled": False, "backup_remote_url": "",
+            "backup_remote_user": "", "backup_remote_pass": "",
+            "pet_enabled": False, "pet_mode": "always", "pet_skin": "plush",
+            "cleanup_enabled": True, "cleanup_retention_days": 14,
+            # claude_config_sync：打开/运行前防线是否直写 ~/.claude/settings.json。
+            # 关闭后交互 claude 配置归用户手动管理（cc-switch 等），编排步骤经
+            # runner 一次性 --settings 注入绑定链，路由不受影响（manager 读取）
+            "claude_config_sync": True}
+# 桌宠形象白名单（与 app/pet.py 的 SKINS 对齐；这里不 import pet 模块，避免
+# core 反向依赖 app 根目录脚本）
+PET_SKINS = ("plush", "robot")
+SECRET_KEYS = frozenset({"hooks_token", "hooks_signing_secret", "notify_webhook",
+                         "notify_bark_key", "notify_ntfy_topic", "notify_serverchan_key",
+                         "notify_telegram_token", "notify_telegram_chat_id", "backup_remote_pass"})
+
+
+def public_view(value=None):
+    """Return settings suitable for API responses without credential material."""
+    source = dict(value if isinstance(value, dict) else load())
+    for key in SECRET_KEYS:
+        if key in source:
+            source[key] = "***" if source[key] else ""
+    return source
+# 并发保护上限 24：编排任务有空位即直接启动，满载回滚 queued 排队自动补跑，
+# 不秒判失败；同任务单飞守卫在 jobs 层。该上限保护的是本机资源（CLI 子进程
+# 数），与各 API 厂商的限流无关；direct 对话走 jobs 轻量池不占此额度。
+MIN_WORKERS, MAX_WORKERS = 1, 24
+
+
+def builtin_workdir():
+    """内置默认保存路径：数据目录内的 workspace/（CodeBee 自己的地盘，
+    启动 ensure_dirs 即创建；老版本落在数据目录同级——Windows 上是
+    AppData\\Roaming\\workspace，平时不存在点开即报错，已废弃）。"""
+    return str(paths.DATA_DIR / "workspace")
+
+
+def default_workdir():
+    """当前生效的默认保存路径（自定义优先，回落内置值）。"""
+    raw = str(load().get("default_workdir") or "").strip()
+    return raw if raw else builtin_workdir()
+
+
+def _norm_workdir(v):
+    """展开 ~ 并转绝对路径；空值合法（回落内置）。返回 (标准化串, 错误)。"""
+    v = str(v or "").strip()
+    if not v:
+        return "", None
+    if v.startswith("~"):
+        v = str(Path(v).expanduser())
+    p = Path(v)
+    if not p.is_absolute():
+        return "", "默认保存路径必须是绝对路径"
+    return str(p), None
+
+
+def load():
+    with _LOCK:
+        try:
+            data = json.loads(_FILE.read_text(encoding="utf-8"))
+        except Exception:
+            data = {}
+    out = dict(DEFAULTS)
+    if isinstance(data, dict):
+        out.update({k: v for k, v in data.items() if k in DEFAULTS})
+    try:
+        out["max_concurrent_jobs"] = max(MIN_WORKERS, min(MAX_WORKERS, int(out["max_concurrent_jobs"])))
+    except Exception:
+        out["max_concurrent_jobs"] = DEFAULTS["max_concurrent_jobs"]
+    wd, _ = _norm_workdir(out.get("default_workdir"))
+    out["default_workdir"] = wd
+    out["default_workdir_effective"] = wd if wd else builtin_workdir()
+    return out
+
+
+def save(patch):
+    """合并保存。返回 (view, 错误)。"""
+    if not isinstance(patch, dict):
+        return load(), "payload 必须是对象"
+    with _LOCK:
+        cur = load()
+        if "max_concurrent_jobs" in patch:
+            try:
+                cur["max_concurrent_jobs"] = int(patch["max_concurrent_jobs"])
+            except Exception:
+                return cur, "max_concurrent_jobs 必须是整数"
+            if not MIN_WORKERS <= cur["max_concurrent_jobs"] <= MAX_WORKERS:
+                return cur, "max_concurrent_jobs 取值 %d-%d" % (MIN_WORKERS, MAX_WORKERS)
+        if "default_workdir" in patch:
+            wd, err = _norm_workdir(patch.get("default_workdir"))
+            if err:
+                return cur, err
+            cur["default_workdir"] = wd
+        if "hooks_token" in patch:
+            cur["hooks_token"] = str(patch.get("hooks_token") or "").strip()[:128]
+        if "hooks_signing_secret" in patch:
+            cur["hooks_signing_secret"] = str(patch.get("hooks_signing_secret") or "").strip()[:256]
+        if "telemetry_errors" in patch:
+            cur["telemetry_errors"] = bool(patch.get("telemetry_errors"))
+        if "publish_daily_cap" in patch:
+            try:
+                v = int(patch.get("publish_daily_cap"))
+            except (TypeError, ValueError):
+                return cur, "publish_daily_cap 必须是 0-50 的整数（0=不限制）"
+            cur["publish_daily_cap"] = max(0, min(50, v))
+        if "publish_fail_streak" in patch:
+            try:
+                cur["publish_fail_streak"] = max(1, min(10, int(patch.get("publish_fail_streak"))))
+            except (TypeError, ValueError):
+                return cur, "publish_fail_streak 必须是 1-10 的整数"
+        if "publish_fail_window_h" in patch:
+            try:
+                cur["publish_fail_window_h"] = max(1, min(168, float(patch.get("publish_fail_window_h"))))
+            except (TypeError, ValueError):
+                return cur, "publish_fail_window_h 必须是 1-168 的数字"
+        if "notify_webhook" in patch:
+            cur["notify_webhook"] = str(patch.get("notify_webhook") or "").strip()[:300]
+        if "notify_base_url" in patch:
+            cur["notify_base_url"] = str(patch.get("notify_base_url") or "").strip()[:200]
+        for _nk, _nmax in (("notify_bark_server", 200), ("notify_bark_key", 128),
+                           ("notify_ntfy_topic", 200), ("notify_serverchan_key", 128),
+                           ("notify_telegram_token", 128), ("notify_telegram_chat_id", 64)):
+            if _nk in patch:
+                cur[_nk] = str(patch.get(_nk) or "").strip()[:_nmax]
+        if "bench_auto_enabled" in patch:
+            cur["bench_auto_enabled"] = bool(patch.get("bench_auto_enabled"))
+        if "bench_auto_days" in patch:
+            try:
+                cur["bench_auto_days"] = max(1, min(90, int(patch.get("bench_auto_days"))))
+            except (TypeError, ValueError):
+                return cur, "bench_auto_days 必须是 1-90 的整数"
+        if "bench_feedback_enabled" in patch:
+            cur["bench_feedback_enabled"] = bool(patch.get("bench_feedback_enabled"))
+        if "mcp_servers" in patch:
+            cur["mcp_servers"] = str(patch.get("mcp_servers") or "").strip()[:4000]
+        if "backup_remote_enabled" in patch:
+            cur["backup_remote_enabled"] = bool(patch.get("backup_remote_enabled"))
+        for _rk, _rmax in (("backup_remote_url", 300), ("backup_remote_user", 128),
+                           ("backup_remote_pass", 128)):
+            if _rk in patch:
+                cur[_rk] = str(patch.get(_rk) or "").strip()[:_rmax]
+        if "pet_enabled" in patch:
+            cur["pet_enabled"] = bool(patch.get("pet_enabled"))
+        if "pet_mode" in patch:
+            pm = str(patch.get("pet_mode") or "").strip()
+            if pm not in ("always", "tasks_only"):
+                return cur, "pet_mode 只能是 always 或 tasks_only"
+            cur["pet_mode"] = pm
+        if "pet_skin" in patch:
+            ps = str(patch.get("pet_skin") or "").strip()
+            if ps not in PET_SKINS:
+                return cur, "pet_skin 只能是 %s 之一" % "/".join(PET_SKINS)
+            cur["pet_skin"] = ps
+        if "cleanup_enabled" in patch:
+            cur["cleanup_enabled"] = bool(patch.get("cleanup_enabled"))
+        if "claude_config_sync" in patch:
+            cur["claude_config_sync"] = bool(patch.get("claude_config_sync"))
+        if "cleanup_retention_days" in patch:
+            try:
+                cur["cleanup_retention_days"] = int(patch.get("cleanup_retention_days"))
+            except (TypeError, ValueError):
+                return cur, "cleanup_retention_days 必须是整数"
+            if not 1 <= cur["cleanup_retention_days"] <= 365:
+                return cur, "cleanup_retention_days 取值 1-365"
+        _FILE.parent.mkdir(parents=True, exist_ok=True)
+        tmp = _FILE.with_suffix(".tmp")
+        tmp.write_text(json.dumps(cur, ensure_ascii=False, indent=2), encoding="utf-8")
+        tmp.replace(_FILE)
+    cur["default_workdir_effective"] = cur["default_workdir"] if cur["default_workdir"] else builtin_workdir()
+    return cur, None