From 04d9a0bf78f419964e21bb22496afb382a9e4ad3 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Thu, 25 Jun 2026 21:22:23 +0800
Subject: [PATCH] =?UTF-8?q?docs(=E2=91=A2):=20=E8=A7=A3=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=94=B9=E3=80=8CP0=20=E6=9C=80=E9=AB=98?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E6=8F=92=E9=98=9F=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=AD=E6=96=AD=E5=9C=A8=E9=80=94=E3=80=8D=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E5=BC=83=E7=94=A8=E7=9C=9F=E6=8A=A2=E5=8D=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

按用户决定（2026-06-25）：解冲突补救任务以 P0 入队、rankByScore 即排队首、
名额空出时优先领取，但绝不 SIGTERM 在途 worker（维持 No-preemption 架构）。
代码本就如此（ensureMergeRemediationTask 建 P0 任务、orchestrator 无抢占逻辑），
本提交仅修正文档此前「优先抢占」的过度描述；附带修正 conflict 模型档过时表述
（已是项目可配置 + 默认 opus-4.8，非 fable-5）。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 docs/optimization-plan.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/optimization-plan.html b/docs/optimization-plan.html
index 9f42b85..c2da4be 100644
--- a/docs/optimization-plan.html
+++ b/docs/optimization-plan.html
@@ -514,9 +514,9 @@
         <td>合并冲突→建 P0 easy 补救任务；按 score 排队等领取</td>
         <td class="dim-now">
           触发不变（自动建补救任务，幂等）<br>
-          调度改为<strong>优先抢占</strong>：conflict run 插队，先于普通 executor 领取
+          调度按<strong>最高优先级（P0）插队</strong>：补救任务以 P0 入队，rankByScore 即排队首、名额空出时优先领取；<strong>不中断在途任务</strong>（维持 No-preemption 架构）
         </td>
-        <td><span class="tag tag-changed">改进</span></td>
+        <td><span class="tag tag-approved">✅ 维持</span></td>
       </tr>
       <tr>
         <td class="dim-label">执行流程</td>
@@ -571,11 +571,11 @@
     </div>
     <div class="cat-card">
       <div class="label">models.ts</div>
-      <div class="value new">ModelRole 加 'conflict'；pickModel for conflict 直返 fable-5</div>
+      <div class="value new">ModelRole 加 'conflict'；可按项目配置，默认 opus-4.8（fable-5 已移出内置默认）</div>
     </div>
     <div class="cat-card">
       <div class="label">orchestrator.ts</div>
-      <div class="value new">conflict 补救任务优先抢占（claimOne 按 runKind=conflict 优先）</div>
+      <div class="value">无需改：补救任务 P0 入队，rankByScore 即排队首；不中断在途（No-preemption 不变）</div>
     </div>
     <div class="cat-card">
       <div class="label">store.ts · ensureMergeRemediationTask</div>
@@ -767,7 +767,7 @@
   <div class="flow-row">
     <span class="st gate">exec_review</span>
     <span class="arrow">→(approve but 冲突)</span>
-    <span class="st attn">conflict run 抢占</span>
+    <span class="st attn">conflict run (P0 插队)</span>
     <span class="arrow">→(解决+复审)</span>
     <span class="st gate">exec_review</span>
     <span class="arrow">→(approve)</span>
@@ -1067,7 +1067,7 @@
     </div>
     <div class="cat-card">
       <div class="label">第三批（③ 解冲突类）</div>
-      <div class="value">protocol.ts runKind+conflict → pipeline.ts conflict分支 → runner.ts buildConflictPrompt → models.ts conflict角色 → orchestrator.ts 优先抢占</div>
+      <div class="value">protocol.ts runKind+conflict → pipeline.ts conflict分支 → runner.ts buildConflictPrompt → models.ts conflict角色（默认opus-4.8）；调度无需改：补救任务 P0 插队、不中断在途</div>
     </div>
     <div class="cat-card">
       <div class="label">第四批（DB schema migration）</div>