fischer-agentkit

Commit Graph

Author	SHA1	Message	Date
chiguyong	c831e925b6	feat(experts): U4 用户干预通道 + 手动辩论触发建立 @team 执行期间的用户干预通道，支持 /stop、/debate <topic>、普通文本追加上下文。 ExpertTeam (src/agentkit/experts/team.py): - 新增 _interventions: asyncio.Queue (maxsize=64) 干预队列 - add_user_intervention(msg): 广播 + 入队 - consume_user_interventions(): 排空并返回待处理干预 - broadcast_user_message 现在同时入队干预队列 TeamOrchestrator (src/agentkit/experts/orchestrator.py): - 新增 _user_context: list[str] 累积普通文本干预 - 新增 _process_interventions(lead, plan) 在每层执行前调用： * /stop → 终止执行，广播 plan_update(stopped_by_user) * /debate <topic> → 动态插入 DEBATE phase（受 MAX_DEBATES 限制） * 普通文本 → 累积到 _user_context - _synthesize_results 将 _user_context 追加到 synthesis prompt WS 路由 (src/agentkit/server/routes/chat.py): - 模块级 _active_teams dict 跟踪每个 session 的活跃团队 - _execute_team_collab 执行前注册、finally 注销 - WS 消息循环：若 session 有活跃团队，message 路由为干预而非新任务 - 新增 team_intervention_ack 确认消息测试：tests/unit/experts/test_team_intervention.py（20 测试），覆盖队列基础、/stop、/debate、普通文本、混合消息、synthesis 影响。同步更新 test_orchestrator_debate.py 的干预通道兼容性测试（U4 已实现 consume_user_interventions）。全部 418 experts 测试 + 325 server 测试通过。	2026-06-24 12:17:09 +08:00
chiguyong	fbe08cb1e2	feat(experts): add debate phase executor to TeamOrchestrator (U2) Implement _execute_debate_phase() with Lead-facilitated structured debate: - Lead opens with divergence point + dependency context - Experts argue in parallel per round (asyncio.gather) - Lead summarizes each round, then adjudicates final verdict - Verdict produces decision (adopt/compromise/shelve/inconclusive) + conclusion - Conclusion written to SharedWorkspace for downstream phases Escape hatches: - debate_config.skip=true short-circuits with template text - MAX_DEBATE_ROUNDS=4 hard cap on rounds - User /stop intervention ends debate early (U4-compatible via getattr fallback) - LLM unavailable falls back to template verdict, no crash New events: debate_started, expert_argument, debate_round_summary, debate_resolved (plus existing phase_completed for consistency). Phase dispatcher (_execute_phase) routes by phase_type: EXECUTION to _execute_execution_phase, DEBATE to _execute_debate_phase. 36 new tests in test_orchestrator_debate.py covering happy path (2 rounds, 2 experts), max_rounds=1 boundary, empty participants, user stop, skip escape hatch, LLM unavailable, SharedWorkspace integration, event broadcasting, intervention channel compatibility, and helper methods. All 377 expert tests pass. Also includes planning artifacts (brainstorm requirements + implementation plan with 6 units U1-U6).	2026-06-24 10:54:51 +08:00

Author

SHA1

Message

Date

chiguyong

c831e925b6

feat(experts): U4 用户干预通道 + 手动辩论触发

建立 @team 执行期间的用户干预通道，支持 /stop、/debate <topic>、
普通文本追加上下文。

ExpertTeam (src/agentkit/experts/team.py):
- 新增 _interventions: asyncio.Queue (maxsize=64) 干预队列
- add_user_intervention(msg): 广播 + 入队
- consume_user_interventions(): 排空并返回待处理干预
- broadcast_user_message 现在同时入队干预队列

TeamOrchestrator (src/agentkit/experts/orchestrator.py):
- 新增 _user_context: list[str] 累积普通文本干预
- 新增 _process_interventions(lead, plan) 在每层执行前调用：
  * /stop → 终止执行，广播 plan_update(stopped_by_user)
  * /debate <topic> → 动态插入 DEBATE phase（受 MAX_DEBATES 限制）
  * 普通文本 → 累积到 _user_context
- _synthesize_results 将 _user_context 追加到 synthesis prompt

WS 路由 (src/agentkit/server/routes/chat.py):
- 模块级 _active_teams dict 跟踪每个 session 的活跃团队
- _execute_team_collab 执行前注册、finally 注销
- WS 消息循环：若 session 有活跃团队，message 路由为干预而非新任务
- 新增 team_intervention_ack 确认消息

测试：tests/unit/experts/test_team_intervention.py（20 测试），
覆盖队列基础、/stop、/debate、普通文本、混合消息、synthesis 影响。
同步更新 test_orchestrator_debate.py 的干预通道兼容性测试
（U4 已实现 consume_user_interventions）。

全部 418 experts 测试 + 325 server 测试通过。

2026-06-24 12:17:09 +08:00

chiguyong

fbe08cb1e2

feat(experts): add debate phase executor to TeamOrchestrator (U2)

Implement _execute_debate_phase() with Lead-facilitated structured debate:
- Lead opens with divergence point + dependency context
- Experts argue in parallel per round (asyncio.gather)
- Lead summarizes each round, then adjudicates final verdict
- Verdict produces decision (adopt/compromise/shelve/inconclusive) + conclusion
- Conclusion written to SharedWorkspace for downstream phases

Escape hatches:
- debate_config.skip=true short-circuits with template text
- MAX_DEBATE_ROUNDS=4 hard cap on rounds
- User /stop intervention ends debate early (U4-compatible via getattr fallback)
- LLM unavailable falls back to template verdict, no crash

New events: debate_started, expert_argument, debate_round_summary,
debate_resolved (plus existing phase_completed for consistency).

Phase dispatcher (_execute_phase) routes by phase_type:
EXECUTION to _execute_execution_phase, DEBATE to _execute_debate_phase.

36 new tests in test_orchestrator_debate.py covering happy path (2 rounds,
2 experts), max_rounds=1 boundary, empty participants, user stop, skip
escape hatch, LLM unavailable, SharedWorkspace integration, event
broadcasting, intervention channel compatibility, and helper methods.
All 377 expert tests pass.

Also includes planning artifacts (brainstorm requirements + implementation
plan with 6 units U1-U6).

2026-06-24 10:54:51 +08:00

2 Commits