codebee 0.1.56 → 0.1.57

package/app/core/branching.py

@@ -83,12 +83,7 @@ def _append_audit(workdir, chapter, branches, pick):
     if not workdir:
         return
     try:
-        p = os.path.abspath(os.path.join(str(workdir), ".codebee",
-                                         "branch-plans.md"))
-        root = os.path.abspath(str(workdir))
-        if root not in p.split(os.sep)[:-len([".codebee", "branch-plans.md"])]:
-            if not p.startswith(root + os.sep):
-                return
+        p = _audit_path(workdir)
         os.makedirs(os.path.dirname(p), exist_ok=True)
         with open(p, "a", encoding="utf-8") as f:
             if f.tell() == 0:
@@ -103,3 +98,33 @@ def _append_audit(workdir, chapter, branches, pick):
             f.write("\n")
     except Exception:
         pass
+
+
+def _audit_path(workdir):
+    """审计文件路径（越界拒绝：workdir 必须存在的目录）。"""
+    from pathlib import Path
+    root = Path(workdir).resolve()
+    if not root.is_dir():
+        raise ValueError("workdir 必须是已存在的目录")
+    return root / ".codebee" / "branch-plans.md"
+
+
+def mark_stale(workdir, chapter):
+    """正史重写后旧推演标过期（inkos 借鉴：分支计划随正史失效）。
+
+    修订步骤改写章稿后，本章的分支计划节头追加「（已过期，正史已重写）」——
+    防止后续翻看审计时把旧推演当成当前正史的来源。失败静默。"""
+    if not workdir:
+        return
+    try:
+        p = _audit_path(workdir)
+        if not p.is_file():
+            return
+        txt = p.read_text(encoding="utf-8", errors="replace")
+        header = "## 第 %d 章\n" % chapter
+        stale_header = "## 第 %d 章（已过期，正史已重写）\n" % chapter
+        if header in txt and stale_header not in txt:
+            p.write_text(txt.replace(header, stale_header, 1),
+                         encoding="utf-8")
+    except Exception:
+        pass

package/app/core/jobs.py

@@ -260,10 +260,10 @@ def wait_for_idle(timeout=10):
 
 
 def begin_restart_drain():
-    """升级任务已退出执行位且没有用户任务时，原子停止接单。"""
+    """升级任务已退出执行位且没有用户任务或 direct 对话时，原子停止接单。"""
     global _restart_drain
     with _pool_lock:
-        if _restart_drain or _alive != 0:
+        if _restart_drain or _alive != 0 or _chat_alive != 0:
             return False
         _restart_drain = True
         return True
@@ -921,7 +921,7 @@ def _do_selfupgrade(job, ev):
     if ev.is_set() or (store.get_run(run_id) or {}).get("status") != "running":
         return
     store.finish_step(run_id, step["n"], "done" if res["ok"] else "failed",
-                      summary="升级完成，点「重启」生效" if res["ok"]
+                      summary="升级完成，服务将自动重启生效" if res["ok"]
                       else ("升级失败: " + res["error"][:300]),
                       exit_code=res.get("exit_code"))
     # expected_status 守卫：用户已强制终止的运行保持 cancelled，不被改写