feat(roundtable): Step2 提速四件套 + 方案总结报告意图对齐
Step2 提速: - 每席位推理深度覆盖(seat_mode): 业务链条逐席位可配 flash/thinking/pro/ultra, 覆盖链条级 seatMode;前台三处 dispatch + 后台 job 透传, run_seat 用 _SEAT_MODE_PARAMS 解析 - recommend 后端批内并行: engine._run_recommend 由串行 for 改 asyncio.gather(对齐前端) - 研讨前并行取数两段式(gather_first, 业务链条 opt-in): 研讨前全席位并行只取数, 产出作为共享资料注入研讨轮(_seat_message gathered + 前台 runGatherPhase); 新增 gather_first 列(migration 20260620_02 + idempotent SQL) - 削减重复广播: suppressPreBroadcast 扩到 recommend(round>=2)/chain(i>0)/chain收口, 保留首轮背景打底,省 N 次读写大 thread 方案总结报告效果: - summary 加"意图对齐+缺口核对+防幻觉护栏": SOUL + 后端 build_summary_prompt + 前端 buildSummaryPrompt 三处对齐; 推断标注(综合推断)、缺真实信息标注待补充交给用户、绝不凭空编 Tests: test_roundtable_seat_modes / test_roundtable_gather_phase / test_roundtable_summary_prompt Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
9a1b674950
commit
3ab674e438
25 files changed
+985
-44
No files matched your search
+142
-18
@@ -80,6 +80,7 @@ async def run_orchestration(
|
||||
intent_text: str = "",
|
||||
enable_report: bool = True,
|
||||
plan: dict | None = None,
|
||||
gather_first: bool = False,
|
||||
) -> OrchestrationResult:
|
||||
"""运行一次完整编排(循环 → 共识 → 报告绘制)。
|
||||
|
||||
@@ -97,23 +98,32 @@ async def run_orchestration(
|
||||
可解析出非空 stages 时走 ``_run_dag``;否则(dag 但 plan 缺失/为空)回退 recommend。
|
||||
enable_report: 是否在收口后执行 Step3(方案总结报告 + 结果绘制)。False 时只跑完
|
||||
Step2 研讨即收尾(step3=None)。两段产物各自故障隔离,详见 ``_run_step3``。
|
||||
gather_first: 是否在研讨前先跑一轮**全席位并行『取数』**(见 ``_run_gather_phase``),结果作为
|
||||
共享资料注入各研讨轮席位任务。业务链条逐条 opt-in(默认 False)。三种模式通用——尤其让
|
||||
chain(串行)的技能延迟前置并行、研讨段提速。
|
||||
"""
|
||||
intent = (intent_text or seed_message or "").strip()
|
||||
try:
|
||||
await progress.begin()
|
||||
await progress.diag(
|
||||
stage="step2_orchestration", level="info", event="begin",
|
||||
message=f"会商编排启动(mode={mode},{len(agents)} 个席位)",
|
||||
detail={"mode": mode, "agents": [a.agent_id for a in agents]},
|
||||
message=f"会商编排启动(mode={mode},{len(agents)} 个席位{',研讨前并行取数' if gather_first else ''})",
|
||||
detail={"mode": mode, "agents": [a.agent_id for a in agents], "gather_first": gather_first},
|
||||
)
|
||||
# 研讨前并行取数(opt-in):全席位并行只取数,产出作为共享资料注入后续研讨。失败/为空安全降级。
|
||||
gathered = (
|
||||
await _run_gather_phase(gateway, progress, agents, thread_ids, model, intent)
|
||||
if gather_first
|
||||
else {}
|
||||
)
|
||||
dag_plan = parse_dag_plan(plan) if mode == "dag" else None
|
||||
if mode == "dag" and dag_plan is not None:
|
||||
outcome = await _run_dag(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent, dag_plan)
|
||||
outcome = await _run_dag(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent, dag_plan, gathered=gathered)
|
||||
elif mode == "chain":
|
||||
outcome = await _run_chain(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent)
|
||||
outcome = await _run_chain(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent, gathered=gathered)
|
||||
else:
|
||||
# recommend,或 dag 但 plan 缺失/为空 → 回退总控自由派活(绝不静默跑错语义)。
|
||||
outcome = await _run_recommend(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent)
|
||||
outcome = await _run_recommend(gateway, progress, agents, thread_ids, coordinator_name, model, seed_message, intent, gathered=gathered)
|
||||
|
||||
if outcome.kind == "clarification":
|
||||
question = outcome.question or "总控需要补充信息,请补充后继续。"
|
||||
@@ -199,11 +209,30 @@ def _deliveries_block(deliveries: dict[str, str], name_by_id: dict[str, str]) ->
|
||||
return "\n\n".join(parts)
|
||||
|
||||
|
||||
def _seat_message(intent_text: str, deliveries: dict[str, str], name_by_id: dict[str, str], task: str) -> str:
|
||||
"""把任务背景 + 前序交付 + 防提问约束拼进席位任务(替代 thread 广播)。"""
|
||||
def _seat_message(
|
||||
intent_text: str,
|
||||
deliveries: dict[str, str],
|
||||
name_by_id: dict[str, str],
|
||||
task: str,
|
||||
*,
|
||||
gathered: dict[str, str] | None = None,
|
||||
) -> str:
|
||||
"""把任务背景 + (可选)研讨前并行收集的资料 + 前序交付 + 防提问约束拼进席位任务(替代 thread 广播)。
|
||||
|
||||
``gathered``(可选)= 研讨前「并行取数阶段」各席位收集回来的**原始资料/事实**(见
|
||||
``_run_gather_phase``),与 ``deliveries``(研讨阶段的结论性交付)分块、各自标题不同:
|
||||
资料供席位直接引用以**减少重复检索**,结论供席位承接。两者都为空则都不拼。
|
||||
"""
|
||||
parts: list[str] = []
|
||||
if intent_text.strip():
|
||||
parts.append(f"【本次研讨任务背景】\n{intent_text.strip()}")
|
||||
if gathered:
|
||||
gblock = _deliveries_block(gathered, name_by_id)
|
||||
if gblock:
|
||||
parts.append(
|
||||
"【研讨前各席位已并行收集的资料/事实,供你直接引用——相关内容已在此,"
|
||||
"尽量避免重复检索;确有缺口可再补充检索】\n" + gblock
|
||||
)
|
||||
block = _deliveries_block(deliveries, name_by_id)
|
||||
if block:
|
||||
parts.append("【前序各席位已完成的交付,请在此基础上承接、补充、不要重复或推翻】\n" + block)
|
||||
@@ -212,6 +241,72 @@ def _seat_message(intent_text: str, deliveries: dict[str, str], name_by_id: dict
|
||||
return "\n\n---\n\n".join(parts)
|
||||
|
||||
|
||||
# ── 研讨前「并行取数」阶段(可选,业务链条逐条 opt-in)──────────────────────────
|
||||
#
|
||||
# 各席位**只调技能/凭专业把相关信息收集回来、不研讨**,全席位 ``asyncio.gather`` 并行跑一轮,
|
||||
# 结果作为「共享资料」注入后续研讨轮(``_seat_message(gathered=...)``)。这样最慢的技能延迟只在
|
||||
# 这一次、并行发生;后续研讨段(哪怕 chain 串行)每席位基本变成一次纯推理调用,大幅缩短第二步
|
||||
# 总耗时。研讨阶段是否还再调技能不作限制(按用户设定)。
|
||||
|
||||
_GATHER_TASK = (
|
||||
"【资料收集阶段——只取数、不研讨】\n"
|
||||
"现在是正式研讨**之前**的并行资料收集阶段。请你**只负责把与本次任务、与你这个席位职责相关的"
|
||||
"真实信息/数据收集、整理出来**(优先用你配置的技能去检索/获取真实信息,没有技能可凭专业知识梳理),"
|
||||
"为后续正式研讨打底。\n"
|
||||
"**这一步不要做分析评估、不要给方案、不要下结论**——把判断与方案留到研讨阶段。"
|
||||
"请把你收集到的关键信息整理成条理清晰的事实/要点清单输出。"
|
||||
)
|
||||
|
||||
|
||||
async def _run_gather_phase(
|
||||
gateway: RoundtableGateway,
|
||||
progress: JobProgressWriter,
|
||||
agents: list[SeatRef],
|
||||
thread_ids: dict[str, str],
|
||||
model: str | None,
|
||||
intent_text: str,
|
||||
) -> dict[str, str]:
|
||||
"""研讨前并行『取数』:所有席位并行只取数(不研讨),返回 {agent_id: 收集到的资料}。
|
||||
|
||||
复用 ``_run_dag`` 同款 ``asyncio.gather`` + ``gateway.run_seat``;各席位独立 thread,进程内并行
|
||||
安全。某席位取数失败/为空不阻塞其它(其 gathered 项缺省即不注入)。结果由调用方传给后续研讨轮的
|
||||
``_seat_message(gathered=...)``。
|
||||
"""
|
||||
name_by_id = {a.agent_id: a.name for a in agents}
|
||||
gathered: dict[str, str] = {}
|
||||
await progress.diag(
|
||||
stage="step2_orchestration", level="info", event="gather_begin",
|
||||
message=f"研讨前并行资料收集阶段启动({len(agents)} 个席位并行取数)",
|
||||
detail={"agents": [a.agent_id for a in agents]},
|
||||
)
|
||||
|
||||
async def _gather_one(seat: SeatRef) -> None:
|
||||
await progress.seat_active(seat.agent_id)
|
||||
seat_msg = _seat_message(intent_text, {}, name_by_id, _GATHER_TASK)
|
||||
try:
|
||||
seat_turn = await gateway.run_seat(thread_ids=thread_ids, agent_id=seat.agent_id, task=seat_msg, model=model)
|
||||
except Exception: # noqa: BLE001 — 单席位取数失败不拖垮整阶段;其 gathered 缺省即可
|
||||
logger.warning("gather phase seat %s failed", seat.agent_id, exc_info=True)
|
||||
await progress.seat_done(seat.agent_id, 0)
|
||||
return
|
||||
text = (seat_turn.final_text or "").strip()
|
||||
if text:
|
||||
gathered[seat.agent_id] = text
|
||||
await progress.add_seat_dialogue(
|
||||
seat.agent_id, name_by_id.get(seat.agent_id, seat.agent_id), seat_turn.final_text, 0,
|
||||
tool_calls=seat_turn.tool_calls, thread_id=thread_ids.get(seat.agent_id),
|
||||
)
|
||||
await progress.seat_done(seat.agent_id, 0)
|
||||
|
||||
await progress.dispatching(0)
|
||||
await asyncio.gather(*(_gather_one(seat) for seat in agents))
|
||||
await progress.diag(
|
||||
stage="step2_orchestration", level="info", event="gather_done",
|
||||
message=f"资料收集阶段完成({len(gathered)}/{len(agents)} 个席位有产出)",
|
||||
)
|
||||
return gathered
|
||||
|
||||
|
||||
async def _run_recommend(
|
||||
gateway: RoundtableGateway,
|
||||
progress: JobProgressWriter,
|
||||
@@ -221,6 +316,8 @@ async def _run_recommend(
|
||||
model: str | None,
|
||||
seed_message: str,
|
||||
intent_text: str,
|
||||
*,
|
||||
gathered: dict[str, str] | None = None,
|
||||
) -> _LoopOutcome:
|
||||
deliveries: dict[str, str] = {}
|
||||
last_leader = ""
|
||||
@@ -246,24 +343,35 @@ async def _run_recommend(
|
||||
if turn.is_consensus:
|
||||
return _LoopOutcome("consensus", last_leader_content=last_leader, deliveries=deliveries)
|
||||
|
||||
# **顺序**派活 —— 不要并行;每个席位带上「背景 + 前序交付」上下文
|
||||
# 批内**并行**派活(与前端 runOrchestration「总控一轮派多席位=判定相互独立→并行」一致,
|
||||
# 2026-06-20 由串行改并行):总控一轮派出的多个席位彼此独立,并发跑可大幅缩短本轮耗时。
|
||||
# 每个席位带上「背景 +(可选)研讨前并行取数资料 + 前序交付」上下文。各席位独立 thread,进程内
|
||||
# gather 安全;后端用户级信号量(_BACKGROUND_SLOTS_PER_USER)仍限制实际并发,保护 sqlite 锁。
|
||||
# 批内交付在本轮结束后统一并入 deliveries(同前端:批内不互相看,下一轮总控才看到全部)。
|
||||
await progress.dispatching(cycle)
|
||||
for agent_id, task in turn.dispatched:
|
||||
# 派活前对照快照(批内各席位看到的「前序交付」一致,不受批内执行顺序影响 → 并行无副作用)。
|
||||
prior_snapshot = dict(deliveries)
|
||||
batch: dict[str, str] = {}
|
||||
|
||||
async def _run_one(agent_id: str, task: str, cyc: int = cycle) -> None:
|
||||
await progress.seat_active(agent_id)
|
||||
seat_msg = _seat_message(intent_text, deliveries, name_by_id, task)
|
||||
seat_msg = _seat_message(intent_text, prior_snapshot, name_by_id, task, gathered=gathered)
|
||||
seat = await gateway.run_seat(thread_ids=thread_ids, agent_id=agent_id, task=seat_msg, model=model)
|
||||
deliveries[agent_id] = seat.final_text
|
||||
batch[agent_id] = seat.final_text
|
||||
if not (seat.final_text or "").strip():
|
||||
await progress.diag(
|
||||
stage="step2_seat", level="warning", event="seat_empty_delivery",
|
||||
message=f"席位「{name_by_id.get(agent_id, agent_id)}」本轮交付为空(可能模型未产出或被截断)",
|
||||
agent_id=agent_id, agent_name=name_by_id.get(agent_id, agent_id), cycle=cycle,
|
||||
agent_id=agent_id, agent_name=name_by_id.get(agent_id, agent_id), cycle=cyc,
|
||||
)
|
||||
await progress.add_seat_dialogue(
|
||||
agent_id, name_by_id.get(agent_id, agent_id), seat.final_text, cycle,
|
||||
agent_id, name_by_id.get(agent_id, agent_id), seat.final_text, cyc,
|
||||
tool_calls=seat.tool_calls, thread_id=thread_ids.get(agent_id),
|
||||
)
|
||||
await progress.seat_done(agent_id, cycle)
|
||||
await progress.seat_done(agent_id, cyc)
|
||||
|
||||
await asyncio.gather(*(_run_one(agent_id, task) for agent_id, task in turn.dispatched))
|
||||
deliveries.update(batch)
|
||||
|
||||
await progress.bump_consensus()
|
||||
# 续轮:把各席位本轮交付喂给总控,让它据实判断(总控 SOUL 依赖看到交付)
|
||||
@@ -287,6 +395,8 @@ async def _run_chain(
|
||||
model: str | None,
|
||||
seed_message: str,
|
||||
intent_text: str,
|
||||
*,
|
||||
gathered: dict[str, str] | None = None,
|
||||
) -> _LoopOutcome:
|
||||
deliveries: dict[str, str] = {}
|
||||
last_leader = ""
|
||||
@@ -323,9 +433,10 @@ async def _run_chain(
|
||||
|
||||
task = pick_chain_task(turn.dispatched, turn.final_text, seat.agent_id, seat.name)
|
||||
|
||||
# (b) 当前席位交付(顺序,不并行);带上「背景 + 前序交付 + 别提问」上下文
|
||||
# (b) 当前席位交付(顺序,不并行);带上「背景 +(可选)研讨前并行取数资料 + 前序交付 + 别提问」上下文。
|
||||
# chain 严格串行(seat B 看 seat A 交付),但有 gathered 时各席位已带共享资料,不必各自从零检索 → 提速。
|
||||
await progress.seat_active(seat.agent_id)
|
||||
seat_msg = _seat_message(intent_text, deliveries, name_by_id, task)
|
||||
seat_msg = _seat_message(intent_text, deliveries, name_by_id, task, gathered=gathered)
|
||||
seat_turn = await gateway.run_seat(thread_ids=thread_ids, agent_id=seat.agent_id, task=seat_msg, model=model)
|
||||
deliveries[seat.agent_id] = seat_turn.final_text
|
||||
if not (seat_turn.final_text or "").strip():
|
||||
@@ -376,6 +487,8 @@ async def _run_dag(
|
||||
seed_message: str,
|
||||
intent_text: str,
|
||||
plan: DagPlan,
|
||||
*,
|
||||
gathered: dict[str, str] | None = None,
|
||||
) -> _LoopOutcome:
|
||||
"""分层 DAG 编排:每个 stage 一轮总控派活(钉死本批席位)→ 批内席位**并行**执行
|
||||
(``asyncio.gather``)→ 下一 stage 总控再派;全部 stage 完成后由总控收口综合。
|
||||
@@ -429,9 +542,9 @@ async def _run_dag(
|
||||
for seat in stage_seats:
|
||||
await progress.seat_active(seat.agent_id)
|
||||
|
||||
async def _run_one(seat: SeatRef) -> None:
|
||||
async def _run_one(seat: SeatRef, _gathered: dict[str, str] | None = gathered) -> None:
|
||||
task = pick_dag_seat_task(turn.dispatched, seat.agent_id, seat.name, goal=stage.goal)
|
||||
seat_msg = _seat_message(intent_text, deliveries, name_by_id, task)
|
||||
seat_msg = _seat_message(intent_text, deliveries, name_by_id, task, gathered=_gathered)
|
||||
seat_turn = await gateway.run_seat(thread_ids=thread_ids, agent_id=seat.agent_id, task=seat_msg, model=model)
|
||||
deliveries[seat.agent_id] = seat_turn.final_text
|
||||
if not (seat_turn.final_text or "").strip():
|
||||
@@ -693,6 +806,17 @@ def build_summary_prompt(
|
||||
lines.append("# 三、总控最终共识结论")
|
||||
lines.append((consensus_text or "").strip() or "(未提供)")
|
||||
lines.append("")
|
||||
# 意图对齐 + 缺口核对 + 防幻觉护栏(弱席位场景的质量兜底)。即便部署里的 SOUL 未重新 seed,
|
||||
# 这段也保证后台总结会主动扣用户意图、标注推断/缺口,而非简单拼接各席位交付。
|
||||
lines.append(
|
||||
"【动笔前必做:意图对齐与缺口核对】各席位可能由能力较弱的模型产出,未必扣住用户意图、未必充分。"
|
||||
"你是这份报告的质量兜底,不能只把各席位交付简单拼接。请先把上面的「任务意图」(目标/约束/关键假设)"
|
||||
"拆成用户的核心诉求清单(编排提示对最终产出的要求也并入),逐条核对各席位交付+共识是否覆盖、够不够、"
|
||||
"有无跑题或矛盾;再据此组织报告并按护栏补强:① 能从已有原料重组/推理补上的→直接补全讲透;"
|
||||
"② 属于你自己的推断/建议→写,但显式标注「(综合推断)」;③ 缺真实信息、靠现有原料补不了的→**绝不凭空编**,"
|
||||
"用一行 `> ⚠️ 待补充:<具体缺什么>。可在对话里让我补全` 标出,把球交给用户。"
|
||||
"最终报告要明显比「各席位交付的简单拼接」更扣用户意图。"
|
||||
)
|
||||
lines.append(
|
||||
"请严格遵循你的职责设定:纯 Markdown 文本(不画 HTML / 图表)、全程简体中文。"
|
||||
"报告结构:默认用叙事型结构(一句话结论 → 背景目标 → 各席位观点 → 综合分析 → 最终共识方案 → 执行路线);"
|
||||
|
||||
Reference in new issue
Block a user