codebee 0.1.15 → 0.1.16

package/app/core/publish/browser.py

@@ -139,14 +139,21 @@ class Browser:
         except OSError as e:
             raise BrowserError("浏览器启动失败：%s" % e)
         if not self._wait_ready(15.0):
-            # Edge 对已有实例的 profile：新进程转交参数后秒退，调试端口是
-            # 老实例自己的（甚至自选的，真机实测指定 59852 实际跑 56394）。
-            # 等自己指定的端口必然超时——扫进程命令行找该 profile 的真端口接管。
+            # Edge 对已有实例的 profile：新进程转交参数后秒退（stdout 会打
+            # 「正在现有浏览器会话中打开」），调试端口是老实例自己的（甚至
+            # 自选的，真机实测指定 59852 实际跑 56394）。等自己指定的端口必然
+            # 超时——先扫进程命令行找该 profile 的真端口接管（含隐藏的后台
+            # 常驻实例：Edge「启动加速/后台运行」的进程锁着 profile 不可见）。
             for p in _debug_ports_for_profile(self.user_data_dir):
                 if p != self.port and port_alive(p, timeout=2.0):
                     self.port = p
                     self.proc = None         # 老实例不是本对象起的：close 不杀它
                     return
+            if self.proc.poll() == 0:
+                raise BrowserError(
+                    "浏览器把启动请求转给了已在运行的会话（该平台浏览器有隐藏的"
+                    "后台实例占着档案）——请在任务管理器结束所有 Edge 进程，"
+                    "或重启电脑后重试；登录态不受影响")
             raise BrowserError(
                 "浏览器调试端口 15 秒内没就绪：该平台可能已有浏览器实例在跑但"
                 "端口探测不到——关掉它的所有窗口后重试，或重启电脑后首次连接")
@@ -447,25 +454,32 @@ class Page:
             raise BrowserError("点击失败：%s" % ((r or {}).get("err") or sel))
         return True
 
-    def real_click_text(self, text, scope="", contains=True, exact_fallback=True):
+    def real_click_text(self, text, scope="", contains=True, exact_fallback=True,
+                        y_min=None, y_max=None):
         """按文本真实点击：JS 定位元素中心坐标 → CDP Input 派发鼠标事件序列。
 
         qm-btn 一类自定义按钮只认真实事件序列（mousedown/mouseup/focus），
         el.click() 对它们无效——建书「确认创建」/发章「立即发布」都栽在这。
+        y_min/y_max 限定元素纵向范围（区分同名 select、限制弹层内点击）。
         返回 {ok, tag?, via}；找不到元素返回 {ok: False, err}。"""
         r = self.call(
-            "(t,scope,c)=>{"
-            "const els=[...document.querySelectorAll(scope||'button,a,[role=button],span,li,[class*=btn]')];"
+            "(t,scope,c,y0,y1)=>{"
+            "const vis=e=>e.getBoundingClientRect().width>0;"
+            "const els=[...document.querySelectorAll(scope||'button,a,[role=button],span,li,[class*=btn]')].filter(vis);"
             "let cands=els.filter(e=>{const x=(e.innerText||'').trim();"
             "return x&&(c?x.includes(t):x===t);});"
             "if(!cands.length&&c){cands=els.filter(e=>(e.innerText||'').trim()===t);}"
+            "if(y0!==null)cands=cands.filter(e=>e.getBoundingClientRect().y>=y0);"
+            "if(y1!==null)cands=cands.filter(e=>e.getBoundingClientRect().y<=y1);"
             "if(!cands.length)return{ok:false,err:'nf'};"
             "cands.sort((a,b)=>((a.innerText||'').trim().length)-((b.innerText||'').trim().length));"
             "const el=cands[0];el.scrollIntoView({block:'center'});"
             "const rc=el.getBoundingClientRect();"
             "return{ok:true,x:Math.round(rc.x+rc.width/2),y:Math.round(rc.y+rc.height/2),"
             "tag:el.tagName,cls:(el.className||'').toString().slice(0,30)};}",
-            str(text), scope or "", bool(contains))
+            str(text), scope or "", bool(contains),
+            int(y_min) if y_min is not None else None,
+            int(y_max) if y_max is not None else None)
         if not (r or {}).get("ok"):
             return {"ok": False, "err": "页面上找不到文本为「%s」的可点元素" % text}
         x, y = r["x"], r["y"]

package/app/core/publish/fanqie.py

@@ -75,15 +75,29 @@ FLOWS = {"create_book": CREATE_BOOK, "upload_chapter": UPLOAD_CHAPTER,
          "check_login": CHECK_LOGIN, "probe_form": PROBE_FORM}
 
 
+def _first(meta, key):
+    v = meta.get(key)
+    return str(v[0]).strip() if isinstance(v, list) and v else str(v or "").strip()
+
+
 def values_create_book(meta):
-    """bookmeta 字段 → 建书表单值。标签/分类逐项点击由流程按 values.tags 展开
-    （manager 组装时把 tags 列表拍平成 click_text 步骤追加）。"""
+    """bookmeta 字段 → 建书表单值。标签弹层的分区点选用单值字段
+    （每组选 1 个最稳：番茄主题/角色/情节各≤2、内容组各有上限），
+    数组全量点选由 tag_groups 路径兼容。"""
     return {
         "title": (meta.get("book_name") or "").strip(),
         "summary": (meta.get("summary") or "").strip(),
         "protagonist": (meta.get("protagonist_1") or "").strip(),
+        "protagonist2": (meta.get("protagonist_2") or "").strip(),
         "signing_mode": (meta.get("signing_mode") or "连载模式").strip(),
         "category": (meta.get("category") or "").strip(),
+        "target_reader": (meta.get("target_reader") or "男频").strip(),
+        "tag_theme": _first(meta, "tags_theme"),
+        "tag_role": _first(meta, "tags_role"),
+        "tag_plot": _first(meta, "tags_plot"),
+        "tag_content_emotion": _first(meta, "content_emotion"),
+        "tag_content_character": _first(meta, "content_character"),
+        "tag_content_world": _first(meta, "content_world"),
     }
 
 

package/app/core/publish/flow.py

@@ -146,6 +146,8 @@ def run_flow(page, steps, values=None, config=None, auto_submit=False,
                 # 真实鼠标事件点击（CDP Input 派发）：qm-btn 等自定义按钮
                 # 只认真实事件序列，el.click() 无效。发布确认链全靠它。
                 text = str(st.get("text") or "")
+                for k, v in (values or {}).items():   # {target_reader} 等动态值
+                    text = text.replace("{%s}" % k, str(v))
                 for k, v in (values or {}).items():
                     text = text.replace("{%s}" % k, str(v))
                 if not text:
@@ -154,7 +156,9 @@ def run_flow(page, steps, values=None, config=None, auto_submit=False,
                 r = None
                 for _try in range(int(st.get("tries") or 25)):
                     r = page.real_click_text(text, st.get("scope") or
-                                             "a,button,[class*=btn]")
+                                             "a,button,[class*=btn]",
+                                             y_min=st.get("y_min"),
+                                             y_max=st.get("y_max"))
                     if (r or {}).get("ok"):
                         break
                     time.sleep(0.4)
@@ -334,6 +338,26 @@ def run_flow(page, steps, values=None, config=None, auto_submit=False,
                     note(i, "提交 %s" % st.get("sel") or "")
                     page.wait_for(st["sel"], timeout=8)
                     page.click(st["sel"])
+            elif act == "sleep":
+                # 固定等待（SPA 水合/动画缓冲）：比 wait 更钝但最可靠
+                time.sleep(float(st.get("s") or 1.0))
+                note(i, "等待 %.1fs" % float(st.get("s") or 1.0))
+            elif act == "wait_gone":
+                # 等元素消失（弹层关闭动画对齐）：连发点击被关闭动画的
+                # mask 吞掉是多层弹窗流程的经典竞态
+                sel = st["sel"]
+                note(i, "等待 %s 消失" % sel)
+                deadline = time.time() + float(st.get("timeout") or 10)
+                while time.time() < deadline:
+                    try:
+                        if not page.exists(sel, timeout=1.0):
+                            break
+                    except BrowserError:
+                        break
+                    time.sleep(0.4)
+                else:
+                    raise FlowError("等待 %s 消失超时" % sel)
+                note(i, "已消失")
             elif act == "verify":
                 # 上线验证：导航到验证页断言文本在场——防「流程完成但平台
                 # 静默未发布」的假成功（0 字草稿案）。url/any 支持 values 占位。

package/app/core/publish/flows-fanqie-calibrated.json

@@ -1,37 +1,324 @@
-{
-  "_note": "番茄真机校准（2026-09-19 凌晨实测编辑器全结构；登录态随浏览器崩溃丢失，发布按钮链最后一步待登录后复验）：编辑器=/main/writer/<book_id>/publish/ 直达；章节号=input.serial-input（纯数字）；标题=div.serial-editor-input-hint input（≥5字，30字上限）；正文=.ProseMirror（ProseMirror 编辑器，≥1000字）；「下一步」=button（保存+校验，右侧箭头展开下拉菜单含「定时发布」）；建书入口=book-manage 页「创建新书」（表单未实测）。",
-  "check_login": [
-    {"do": "navigate", "url": "{home}"},
-    {"do": "url_any", "any": ["fanqienovel.com"]}
-  ],
-  "upload_chapter": [
-    {"do": "navigate", "url": "about:blank"},
-    {"do": "navigate", "url": "{editor_url}"},
-    {"do": "url_any", "any": ["fanqienovel.com"]},
-    {"do": "wait", "sel": ".ProseMirror", "timeout": 20},
-    {"do": "fill", "sel": "input.serial-input, input.byte-input", "key": "chapter_no"},
-    {"do": "fill", "sel": "div.serial-editor-input-hint input", "key": "chapter_title"},
-    {"do": "fill", "sel": ".ProseMirror", "key": "chapter_body"},
-    {"do": "shot", "name": "chapter-filled"},
-    {"do": "click_real", "text": "下一步", "scope": "button", "tries": 15},
-    {"do": "click_arrow", "note": "展开下一步下拉（箭头在按钮组右缘）"},
-    {"do": "click_real", "text": "定时发布", "tries": 12, "optional": True},
-    {"do": "click_real", "text": "发布", "tries": 12, "optional": True},
-    {"do": "verify", "url": "{chapter_manage_url}", "any": ["{chapter_title}"], "settle": 6}
-  ],
-  "probe_form": [
-    {"do": "navigate", "url": "about:blank"},
-    {"do": "navigate", "url": "https://fanqienovel.com/main/writer/book-manage"},
-    {"do": "url_any", "any": ["fanqienovel.com"]},
-    {"do": "click_text", "text": "创建新书", "contains": true},
-    {"do": "probe", "note": "建书表单（待登录后校准）"}
-  ],
-  "create_book": [
-    {"do": "navigate", "url": "about:blank"},
-    {"do": "navigate", "url": "https://fanqienovel.com/main/writer/book-manage"},
-    {"do": "url_any", "any": ["fanqienovel.com"]},
-    {"do": "click_text", "text": "创建新书", "contains": true},
-    {"do": "probe", "note": "建书表单"},
-    {"do": "shot", "name": "create-book-form"}
-  ]
-}
+{
+ "_note": "番茄真机校准（2026-09-19 定稿，建书+发章结构全部实测）：编辑器=/main/writer/<book_id>/publish/ 直达（章节号 input.serial-input 纯数字；标题 div.serial-editor-input-hint input ≥5字/30上限；正文 .ProseMirror ≥1000字；「下一步」保存校验后按钮组右缘箭头展开下拉含「定时发布」）。建书=/main/writer/create 直达表单：radio 签约模式/目标读者（label 真实点击）→ 阅读标签 select（y<430）弹层 arco-anchor 切主分类/主题/角色/情节 + 标签云点击 + 确认 → 内容标签 select（y>430）弹层 情感/人设/世界观 同构 → 名称/主角1/主角2/简介 → 立即创建 → 跳 book-info/<id>。",
+ "check_login": [
+  {
+   "do": "navigate",
+   "url": "about:blank"
+  },
+  {
+   "do": "navigate",
+   "url": "{home}"
+  },
+  {
+   "do": "url_any",
+   "any": [
+    "fanqienovel.com"
+   ]
+  }
+ ],
+ "upload_chapter": [
+  {
+   "do": "navigate",
+   "url": "about:blank"
+  },
+  {
+   "do": "navigate",
+   "url": "{editor_url}"
+  },
+  {
+   "do": "url_any",
+   "any": [
+    "fanqienovel.com"
+   ]
+  },
+  {
+   "do": "wait",
+   "sel": ".ProseMirror",
+   "timeout": 20
+  },
+  {
+   "do": "fill",
+   "sel": "input.serial-input, input.byte-input",
+   "key": "chapter_no"
+  },
+  {
+   "do": "fill",
+   "sel": "div.serial-editor-input-hint input",
+   "key": "chapter_title"
+  },
+  {
+   "do": "fill",
+   "sel": ".ProseMirror",
+   "key": "chapter_body"
+  },
+  {
+   "do": "shot",
+   "name": "chapter-filled"
+  },
+  {
+   "do": "click_real",
+   "text": "下一步",
+   "scope": "button",
+   "tries": 15
+  },
+  {
+   "do": "click_arrow",
+   "target": "下一步"
+  },
+  {
+   "do": "click_real",
+   "text": "定时发布",
+   "tries": 12,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "发布",
+   "tries": 12,
+   "optional": true
+  },
+  {
+   "do": "verify",
+   "url": "{chapter_manage_url}",
+   "any": [
+    "{chapter_title}"
+   ],
+   "settle": 6
+  }
+ ],
+ "probe_form": [
+  {
+   "do": "navigate",
+   "url": "about:blank"
+  },
+  {
+   "do": "navigate",
+   "url": "https://fanqienovel.com/main/writer/create"
+  },
+  {
+   "do": "url_any",
+   "any": [
+    "fanqienovel.com"
+   ]
+  },
+  {
+   "do": "wait",
+   "sel": "input[placeholder='请输入作品名称']",
+   "timeout": 20
+  },
+  {
+   "do": "probe",
+   "note": "建书表单"
+  }
+ ],
+ "create_book": [
+  {
+   "do": "navigate",
+   "url": "about:blank"
+  },
+  {
+   "do": "navigate",
+   "url": "https://fanqienovel.com/main/writer/create"
+  },
+  {
+   "do": "url_any",
+   "any": [
+    "fanqienovel.com"
+   ]
+  },
+  {
+   "do": "wait",
+   "sel": "input[placeholder='请输入作品名称']",
+   "timeout": 20
+  },
+  {
+   "do": "sleep",
+   "s": 3
+  },
+  {
+   "do": "click_real",
+   "text": "{signing_mode}",
+   "scope": "label.arco-radio,span.arco-radio,[class*=serial-radio]",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{target_reader}",
+   "scope": "label.arco-radio,span.arco-radio,[class*=serial-radio]",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "知道了",
+   "scope": "button",
+   "tries": 4,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "请选择作品标签",
+   "scope": "[class*=select-view],div,span",
+   "y_max": 430,
+   "tries": 10
+  },
+  {
+   "do": "click_real",
+   "text": "{category}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "主题",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_theme}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "角色",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_role}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "情节",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_plot}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "确认",
+   "scope": ".category-modal button",
+   "tries": 8
+  },
+  {
+   "do": "wait_gone",
+   "sel": ".category-modal",
+   "timeout": 25
+  },
+  {
+   "do": "click_real",
+   "text": "请选择作品标签",
+   "scope": "[class*=select-view],div,span",
+   "tries": 15
+  },
+  {
+   "do": "click_real",
+   "text": "情感",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_content_emotion}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "人设",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_content_character}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "世界观",
+   "scope": ".category-modal .arco-anchor-link",
+   "tries": 8
+  },
+  {
+   "do": "click_real",
+   "text": "{tag_content_world}",
+   "scope": ".category-modal span,.category-modal div,.category-modal li",
+   "y_min": 140,
+   "tries": 8,
+   "optional": true
+  },
+  {
+   "do": "click_real",
+   "text": "确认",
+   "scope": ".category-modal button",
+   "tries": 8
+  },
+  {
+   "do": "wait_gone",
+   "sel": ".category-modal",
+   "timeout": 25
+  },
+  {
+   "do": "fill",
+   "sel": "input[placeholder='请输入作品名称']",
+   "key": "title"
+  },
+  {
+   "do": "fill",
+   "sel": "input[placeholder='请输入主角名1']",
+   "key": "protagonist"
+  },
+  {
+   "do": "fill",
+   "sel": "input[placeholder='请输入主角名2']",
+   "key": "protagonist2"
+  },
+  {
+   "do": "fill",
+   "sel": "textarea[placeholder*='请输入50-500字']",
+   "key": "summary"
+  },
+  {
+   "do": "shot",
+   "name": "create-book-filled"
+  },
+  {
+   "do": "click_real",
+   "text": "立即创建",
+   "scope": "button",
+   "tries": 10
+  },
+  {
+   "do": "wait",
+   "sel": "body",
+   "timeout": 10
+  },
+  {
+   "do": "url_any",
+   "any": [
+    "book-info"
+   ]
+  }
+ ]
+}

package/app/core/publish/manager.py

@@ -322,15 +322,27 @@ def create_book_async(task_id, plat, auto_submit=False):
             b, page = _open_page(plat)
             values = mod.values_create_book(data)
             steps = _with_tag_steps(load_flow(plat, "create_book"),
-                                    mod.tag_groups(data), values)
+                                    mod.tag_groups(data), values, mod)
             flow.run_flow(page, steps, values=values, config=mod.CONFIG,
                           auto_submit=auto_submit,
                           shot=lambda n: page.screenshot(ledger.shot_path(plat, task_id, n)),
                           log=logs.append)
+            # book_id：创建成功后平台跳书籍详情/编辑器，从 URL 提取
+            # （番茄 book-info/<id>；七猫 information?id=<id>）。
+            # 提取不到就先用书名登记，发章按书名找书。
+            book_id = ""
+            try:
+                m_url = re.search(r"book-info/(\d+)|information\?id=(\d+)",
+                                  str(page.url() or ""))
+                if m_url:
+                    book_id = m_url.group(1) or m_url.group(2)
+            except Exception:
+                pass
             ledger.record(plat, "create_book", task_id=task_id, title=book_name,
-                          ok=True, shot=str(ledger.shot_path(plat, task_id, "")))
-            # book_id 拿不到（DOM 深链未知）：先用书名登记，发章按书名找书
-            ledger.save_book(task_id, plat, {"book_id": "", "title": book_name})
+                          book_id=book_id, ok=True,
+                          error="\n".join(logs)[:2000],
+                          shot=str(ledger.shot_path(plat, task_id, "")))
+            ledger.save_book(task_id, plat, {"book_id": book_id, "title": book_name})
             _set(plat, status="connected", error="")
         except Exception as e:
             _set(plat, status="error", error="建书失败：%s" % e)
@@ -345,14 +357,16 @@ def create_book_async(task_id, plat, auto_submit=False):
     return True, ""
 
 
-def _with_tag_steps(steps, groups, values):
+def _with_tag_steps(steps, groups, values, mod=None):
     """标签走数据驱动：清单进 values["_tags"]（[组名, 标签] 对），由 flow 的
-    "tags" 步骤按组切换点选。组显示名映射来自平台模块 TAG_GROUP_LABELS
-    （缺省平台无映射时退化为纯标签）。兼容旧流程表（无 tags 步骤时插桩）。"""
-    from . import qimao as _qm
+    "tags" 步骤按组切换点选。组显示名映射来自**对应平台模块**的
+    TAG_GROUP_LABELS（曾硬编码 qimao——番茄任务 key 撞名被套上七猫组名，
+    插桩 text 变 list repr）。兼容旧流程表（无 tags 步骤时插桩）；流程表
+    已用 {tag_x} 占位（番茄式 click_real）时不插桩——占位由 values 自答。"""
     flat = []
+    labels = getattr(mod, "TAG_GROUP_LABELS", {}) if mod else {}
     for key, tags in groups or []:
-        grp = getattr(_qm, "TAG_GROUP_LABELS", {}).get(key, "")
+        grp = labels.get(key, "")
         flat.extend([grp, str(t)] if grp and str(t).strip() else str(t)
                     for t in tags if str(t).strip())
     if not flat:
@@ -360,6 +374,8 @@ def _with_tag_steps(steps, groups, values):
     if any(st.get("do") == "tags" for st in steps):
         values["_tags"] = flat
         return steps
+    if any("{tag_" in str(st.get("text") or "") for st in steps if st.get("text")):
+        return steps                  # 流程表自带标签占位（番茄式）：values 已就绪
     tag_steps = [{"do": "click_text", "text": str(t), "contains": False,
                   "scope": "[class*=tag] li,span,label,[class*=label]"}
                  for t in flat]

package/app/core/publish/qimao.py

@@ -77,13 +77,28 @@ TAG_GROUP_LABELS = {"tags_style": "风格", "tags_role": "角色",
 
 
 def values_create_book(meta):
+    from .. import bookmeta_catalog as cat
+    target_reader = (meta.get("target_reader") or "").strip()
+    category_main = (meta.get("category_main") or "").strip()
+    category_sub = (meta.get("category_sub") or "").strip()
+    # 旧数据兜底：二级有值但一级空/与二级不自洽（如女生专属的「现实故事」
+    # 配了男生频道）会让一级 click_text 静默跳过、死在流程中段——按官方
+    # 目录跨频道反查对齐，频道与一级跟着二级走
+    if category_sub and not (category_main and
+                             category_sub in (cat.QIMAO_CATS.get(target_reader)
+                                              or {}).get(category_main, [])):
+        loc = cat.qimao_locate_sub(category_sub)
+        if loc:
+            target_reader, category_main = loc
+        else:
+            category_sub = ""
     return {
         "title": (meta.get("book_name") or "").strip(),
         "summary": (meta.get("summary") or "").strip(),
         "protagonist": (meta.get("protagonist_1") or "").strip(),
-        "target_reader": (meta.get("target_reader") or "").strip(),
-        "category_main": (meta.get("category_main") or "").strip(),
-        "category_sub": (meta.get("category_sub") or "").strip(),
+        "target_reader": target_reader,
+        "category_main": category_main,
+        "category_sub": category_sub,
         "status": (meta.get("status") or "连载中").strip(),
     }
 

package/app/core/runner.py

@@ -90,8 +90,12 @@ def _npm_shim_bypass(argv):
 
 
 def _kill_tree(pid):
-    """杀整棵进程树。Windows 用 taskkill /T；POSIX 靠 spawn 时的
-    start_new_session（子进程自成一个进程组，pgid==pid）用 killpg 连孙带杀。"""
+    """杀整棵进程树。Windows：先 TerminateProcess 直接杀根进程（毫秒级，绝不
+    挂），再 taskkill /T 兜底扫子孙（短等待，卡死即放弃——真实案例 2026-09-19：
+    某些机器状态下 taskkill /F /T 对普通进程也挂死 30s+，等满 15s 超时会让每次
+    超时杀进程都卡 20s，看门狗/超时全被拖死；漏杀的孙进程由启动孤儿清扫兜底）。
+    POSIX 靠 spawn 时的 start_new_session（子进程自成一个进程组，pgid==pid）
+    用 killpg 连孙带杀。"""
     if os.name != "nt":
         try:
             os.killpg(pid, signal.SIGKILL)
@@ -103,10 +107,21 @@ def _kill_tree(pid):
         except Exception:
             pass
         return
+    # Windows 没有 signal.SIGKILL（直接引用会 AttributeError）；os.kill 带任意
+    # 信号值都走 TerminateProcess，用 SIGTERM
     try:
-        subprocess.run(
+        os.kill(pid, signal.SIGTERM)   # Windows 语义 = TerminateProcess，只杀根进程
+    except OSError:
+        pass                           # 根进程可能已被 taskkill 抢先杀掉
+    except Exception:
+        pass
+    try:
+        tk = subprocess.Popen(
             ["taskkill", "/F", "/T", "/PID", str(pid)],
-            capture_output=True, creationflags=CREATE_NO_WINDOW, timeout=15)
+            stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL, close_fds=True,   # 不继承被杀进程的管道句柄，否则 EOF 永不来、drain 烧满超时
+            creationflags=CREATE_NO_WINDOW)
+        tk.wait(timeout=1.2)           # 健康机器 <1s；卡死就不再陪等（后台自行结束）
     except Exception:
         pass
 

package/app/core/settings.py

@@ -18,7 +18,7 @@ _FILE = paths.DATA_DIR / "settings.json"
 # 成功发章上限、平台连续失败几次后暂停自动发布（publish/auto.py 读取）
 DEFAULTS = {"max_concurrent_jobs": 6, "default_workdir": "", "hooks_token": "",
             "telemetry_errors": True, "publish_daily_cap": 10,
-            "publish_fail_streak": 3, "notify_webhook": ""}
+            "publish_fail_streak": 3, "notify_webhook": "", "notify_base_url": ""}
 # 并发上限 12：worker 只是拉起 CLI 子进程的调度位，跨任务无共享资源；
 # 同任务单飞守卫在 jobs 层。默认 6 对齐「多任务并行不排队」的使用预期。
 MIN_WORKERS, MAX_WORKERS = 1, 12
@@ -101,6 +101,8 @@ def save(patch):
                 return cur, "publish_fail_streak 必须是 1-10 的整数"
         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]
         _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")