codebee 0.1.10 → 0.1.12

package/app/core/settings.py

@@ -14,9 +14,14 @@ _FILE = paths.DATA_DIR / "settings.json"
 # default_workdir 为空表示未自定义，用 builtin_workdir() 回落；
 # telemetry_errors：匿名错误回传开关（默认开；关掉后版本 ping/错误上传/诊断包遥测部分全部停发，
 # 「导出诊断包」是用户手动操作不受此开关限制）
-DEFAULTS = {"max_concurrent_jobs": 3, "default_workdir": "", "hooks_token": "",
-            "telemetry_errors": True}
-MIN_WORKERS, MAX_WORKERS = 1, 6
+# publish_daily_cap / publish_fail_streak：自动发布护栏——每任务每平台每日
+# 成功发章上限、平台连续失败几次后暂停自动发布（publish/auto.py 读取）
+DEFAULTS = {"max_concurrent_jobs": 6, "default_workdir": "", "hooks_token": "",
+            "telemetry_errors": True, "publish_daily_cap": 10,
+            "publish_fail_streak": 3}
+# 并发上限 12：worker 只是拉起 CLI 子进程的调度位，跨任务无共享资源；
+# 同任务单飞守卫在 jobs 层。默认 6 对齐「多任务并行不排队」的使用预期。
+MIN_WORKERS, MAX_WORKERS = 1, 12
 
 
 def builtin_workdir():
@@ -84,6 +89,16 @@ def save(patch):
             cur["hooks_token"] = str(patch.get("hooks_token") or "").strip()[:128]
         if "telemetry_errors" in patch:
             cur["telemetry_errors"] = bool(patch.get("telemetry_errors"))
+        if "publish_daily_cap" in patch:
+            try:
+                cur["publish_daily_cap"] = max(1, min(50, int(patch.get("publish_daily_cap"))))
+            except (TypeError, ValueError):
+                return cur, "publish_daily_cap 必须是 1-50 的整数"
+        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 的整数"
         _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")

package/app/core/store.py

@@ -299,6 +299,26 @@ def set_book_meta(task_id, platform, entry):
     return True
 
 
+def set_auto_publish(task_id, ap):
+    """写任务的定时发布配置（auto.py 每日到点读它触发批量发布）。
+
+    校验在 publish/auto.norm_auto_publish（路由层先归一再落这里）；存 None
+    表示清除。bump_state 同 set_book_meta：前端卡片即时反映开关态。"""
+    if not _valid_id(task_id):
+        return False
+    with LOCK:
+        task = _TASKS.get(task_id)
+        if not task:
+            return False
+        if ap is None:
+            task.pop("auto_publish", None)
+        else:
+            task["auto_publish"] = ap
+        _save_json(paths.TASKS_DIR / (task_id + ".json"), task)
+    bump_state()
+    return True
+
+
 def get_task(task_id):
     if not _valid_id(task_id):
         return None
@@ -586,9 +606,11 @@ def update_run(run_id, expected_status=None, **fields):
             return None
         run.update(fields)
         _save_json(paths.RUNS_DIR / run_id / "run.json", run)
-        # 终态回填：运行结束（成功/失败/取消）时同步任务状态，否则任务永远停在 queued
+        # 状态回填：起跑与结束都同步任务状态。只回填终态的话，run 在跑、
+        # 任务永远显示「排队中」（2026-09-18 实案：「# 重写·续」run 已 running
+        # 写了一小时，任务卡 queued，用户以为卡死连点重试）。
         st = fields.get("status")
-        if st in ("done", "failed", "cancelled"):
+        if st in ("running", "done", "failed", "cancelled"):
             tid = run.get("task_id")
             task = _TASKS.get(tid) if tid else None
             if task:

package/app/main.py

@@ -334,6 +334,23 @@ class Handler(BaseHTTPRequestHandler):
                 if not task:
                     return self._json(404, {"error": "not found"})
                 return self._json(200, {"book_meta": task.get("book_meta") or {}})
+            if path == "/api/publish":
+                # 一键发布：平台连接状态 + 最近台账（详情页发布面板）
+                from core.publish import manager as pub
+                view = pub.view()
+                view["history"] = pub.history(limit=30)
+                return self._json(200, view)
+            m = re.match(r"^/api/publish/task/([^/]+)/history$", path)
+            if m:
+                from core.publish import manager as pub
+                from core.publish import ledger as pub_ledger
+                return self._json(200, {"history": pub.history(task_id=m.group(1), limit=50),
+                                        "books": pub_ledger.load_books().get(m.group(1)) or {}})
+            m = re.match(r"^/api/publish/task/([^/]+)/pending$", path)
+            if m:
+                # 自动发布视图：待发清单统计 + 护栏状态 + 批量发布进度
+                from core.publish import auto as pub_auto
+                return self._json(200, pub_auto.status(m.group(1)))
             m = re.match(r"^/api/tasks/([^/]+)/git$", path)
             if m:
                 # GIT 工作台全貌（详情页「版本」页签）：仓库状态聚合 + 任务隔离态
@@ -467,6 +484,8 @@ class Handler(BaseHTTPRequestHandler):
                 return deny
         if path == "/api/tasks":
             return self._api_create_task()
+        if path == "/api/tasks/clarify":
+            return self._api_task_clarify()
         if path == "/api/hooks/run":
             return self._api_hook_run()
         if path == "/api/health/op":
@@ -561,6 +580,15 @@ class Handler(BaseHTTPRequestHandler):
         m = re.match(r"^/api/tasks/([^/]+)/book-meta$", path)
         if m:
             return self._api_book_meta_generate(m.group(1))
+        m = re.match(r"^/api/publish/(fanqie|qimao)/(connect|disconnect|probe)$", path)
+        if m:
+            return self._api_publish_platform_op(m.group(1), m.group(2))
+        m = re.match(r"^/api/publish/task/([^/]+)/(create-book|chapter|auto-publish)$", path)
+        if m:
+            return self._api_publish_task_op(m.group(1), m.group(2))
+        m = re.match(r"^/api/publish/task/([^/]+)/publish-all$", path)
+        if m:
+            return self._api_publish_auto(m.group(1))
         m = re.match(r"^/api/tasks/([^/]+)/(git-merge|git-discard)$", path)
         if m:
             return self._api_git_verdict(m.group(1), m.group(2))
@@ -1003,6 +1031,89 @@ class Handler(BaseHTTPRequestHandler):
                          args=(task_id, platform, author)).start()
         return self._json(200, {"ok": True, "started": True})
 
+    def _api_publish_platform_op(self, platform, op):
+        """平台会话操作：connect 开浏览器等扫码 / disconnect 关 / probe 探测表单。"""
+        from core.publish import manager as pub
+        if op == "connect":
+            ok, err = pub.connect(platform)
+        elif op == "disconnect":
+            ok, err = pub.disconnect(platform), ""
+        else:
+            ok, err = pub.probe_form_async(platform)
+        if not ok:
+            return self._json(400, {"error": err or "操作失败"})
+        return self._json(200, {"ok": True})
+
+    def _api_publish_task_op(self, task_id, op):
+        """发布动作：create-book（按作品信息建书）/ chapter（发一章）。
+
+        章节文件必须在任务工作目录内（防穿越，同 /api/dir/file 口径）；
+        auto_submit=false 时流程填好表单即停，提交权留给用户人工确认。"""
+        from pathlib import Path as _P
+        from core import store
+        from core.publish import manager as pub
+        task = store.get_task(task_id)
+        if not task:
+            return self._json(404, {"error": "任务不存在"})
+        body = self._body() or {}
+        platform = (body.get("platform") or "").strip()
+        if platform not in ("fanqie", "qimao"):
+            return self._json(400, {"error": "platform 必须是 fanqie 或 qimao"})
+        auto_submit = bool(body.get("auto_submit"))
+        if op == "create-book":
+            ok, err = pub.create_book_async(task_id, platform, auto_submit)
+        elif op == "auto-publish":
+            # 定时发布配置（P2.5）：enabled=false 也落（保留 time 供再开）；
+            # 校验/归一在 auto.norm_auto_publish，语义见 auto.py 头注
+            from core.publish import auto as pub_auto
+            body["platform"] = platform
+            if body.get("enabled"):
+                ap, ap_err = pub_auto.norm_auto_publish(body)
+                if not ap:
+                    return self._json(400, {"error": ap_err})
+            else:
+                ap, ap_err = pub_auto.norm_auto_publish(body)
+                if not ap:
+                    return self._json(400, {"error": ap_err})
+                ap["enabled"] = False
+            ok, err = store.set_auto_publish(task_id, ap), ""
+            if ok:
+                return self._json(200, {"ok": True, "auto_publish": ap})
+        else:
+            f = str(body.get("file") or "").strip()
+            if not f:
+                return self._json(400, {"error": "file 必填（章节文件路径）"})
+            wd = task.get("workdir") or ""
+            try:
+                fp = _P(f) if _P(f).is_absolute() else _P(wd) / f
+                fp = fp.resolve()
+                fp.relative_to(_P(wd).resolve())
+            except (OSError, ValueError):
+                return self._json(400, {"error": "章节文件必须在任务工作目录内"})
+            ok, err = pub.upload_chapter_async(task_id, platform, str(fp), auto_submit)
+        if not ok:
+            return self._json(400, {"error": err or "操作失败"})
+        return self._json(200, {"ok": True, "started": True})
+
+    def _api_publish_auto(self, task_id):
+        """批量发布全部待发章节（publish/auto.py）。
+
+        护栏（每日上限/连败退避/幂等/单飞）在 auto 层，每章发起前复查；
+        auto_submit 默认 false——每章表单填好后停，提交权留给用户。"""
+        from core import store
+        from core.publish import auto as pub_auto
+        if not store.get_task(task_id):
+            return self._json(404, {"error": "任务不存在"})
+        body = self._body() or {}
+        platform = (body.get("platform") or "").strip()
+        if platform not in ("fanqie", "qimao"):
+            return self._json(400, {"error": "platform 必须是 fanqie 或 qimao"})
+        ok, err = pub_auto.publish_pending_async(
+            task_id, platform, auto_submit=bool(body.get("auto_submit")))
+        if not ok:
+            return self._json(400, {"error": err or "操作失败"})
+        return self._json(200, {"ok": True, "started": True})
+
     def _api_task_side(self, task_id):
         """任务检查器（右缘停靠列）的轻量聚合端点。聚合逻辑在 store.task_side
         （可单测、单实例状态）；这里只做 404 转换。"""
@@ -1610,6 +1721,59 @@ class Handler(BaseHTTPRequestHandler):
         status, resp = self._create_and_start(self._body())
         return self._json(status, resp)
 
+    def _api_task_clarify(self):
+        """需求拷问（借鉴 grill-me-skill）：goal 过短/模糊时生成澄清问题。
+
+        POST /api/tasks/clarify，体 {goal, type, context?}。内置智能体单次调用
+        产出 1-3 个问题（每题 2-4 个选项+可自由补充）；失败/超时静默返回
+        {questions: []}——采访态是增强不是闸门，绝不挡创建。"""
+        body = self._body()
+        goal = str(body.get("goal") or "").strip()
+        ttype = str(body.get("type") or "direct").strip()[:40]
+        context = str(body.get("context") or "").strip()[:2000]
+        # 短路：goal 够具体（≥12 字符）或带背景就不打扰
+        if len(goal) >= 12 or context:
+            return self._json(200, {"questions": []})
+        try:
+            from core import builtin_agent
+            bi = builtin_agent.resolve()
+        except Exception:
+            return self._json(200, {"questions": []})
+        prompt = ("用户想用「%s」任务让 AI 做这件事：%s\n"
+                  "这件事的描述比较模糊。请提出最多 3 个最关键的澄清问题（能自答的不要问），"
+                  "每个问题给出 2-4 个最常见的选项。只输出 JSON 数组，不要输出其他内容：\n"
+                  '[{"q": "问题", "options": ["选项1", "选项2"]}]' % (ttype, goal[:200]))
+        try:
+            res = builtin_agent.run(bi, prompt, os.getcwd() if hasattr(os, "getcwd") else ".",
+                                    timeout=60)
+            import json as _json
+            arr = None
+            text = (res.get("text") or "").strip()
+            try:
+                arr = _json.loads(text)
+            except Exception:
+                import re as _re
+                m = _re.search(r"\[[\s\S]*\]", text)
+                if m:
+                    try:
+                        arr = _json.loads(m.group(0))
+                    except Exception:
+                        arr = None
+            if not isinstance(arr, list):
+                return self._json(200, {"questions": []})
+            questions = []
+            for it in arr[:3]:
+                if not isinstance(it, dict):
+                    continue
+                q = str(it.get("q") or "").strip()[:200]
+                opts = [str(o).strip()[:80] for o in (it.get("options") or [])
+                        if str(o).strip()][:4]
+                if q and len(opts) >= 2:
+                    questions.append({"q": q, "options": opts})
+            return self._json(200, {"questions": questions})
+        except Exception:
+            return self._json(200, {"questions": []})
+
     def _api_hook_run(self):
         """外部触发开任务（webhook，借鉴 emdash/mission-control 的外部集成面）。
 
@@ -1707,6 +1871,9 @@ def _state_payload(client_id="", ver=None):
         "control": remote.control_view(client_id),
         # 供应商健康/告警（顶栏横幅数据源；有告警时 bump_state 会推给所有端）
         "health": health.snapshot(),
+        # 任务队列观测（worker 池目标/存活 + 队列深度）：排队问题排障一眼定位
+        # 是「并发满载在等」还是「job 蒸发没人管」（后者由看门狗 2 分钟自愈）
+        "jobs": jobs.workers_info(),
     }
 
 
@@ -1817,6 +1984,13 @@ def main():
     n_bo = bookmeta.recover_orphans()  # 作品信息生成线程同样会被重启杀掉，遗留 running 收尸
     if n_bo:
         print("[CodeBee] 崩溃恢复：%d 条作品信息生成中断标记为 failed（可点重试）" % n_bo)
+    try:
+        from core.publish import manager as publish_mgr
+        n_pb = publish_mgr.recover_orphans()  # 发布线程同款收尸：waiting_login/busy 改判 error
+        if n_pb:
+            print("[CodeBee] 崩溃恢复：%d 条平台发布中断标记为可重试" % n_pb)
+    except Exception:
+        pass
     try:
         from core import settings_schema
         settings_schema.register_default_namespaces()  # budget/cascade/compaction 配置就绪（幂等）