feat: Step 5 引擎接入 + H1-H3/S3 修复 + 审计 D1/D2/D5 修复
引擎接入(dispatcher/spawner/ticker → handler 统一路由): - dispatcher: guardrail/on_checks_passed/on_complete → handler 查询 - spawner: _build_prompt/_build_api_section → handler.build_prompt - ticker: 虚拟项目扫描/assignee/claimed/review/幻觉门控 → handler 判断 Handler 缺陷修复: - H1: _mark_task_status 加 3 次重试(防 DB 锁) - H2: review @mention 加 comment_type='review' - H3: review 非 approved 保持 review 状态(不标 working) - S3: 通知链接改 Gitea(PR/Issue/Commit) 审计修复: - D1: pre_spawn 返回值未检查 → 加 if not 抛 RuntimeError - D2: PromptContext 缺 from_agent/mail_type → 从 must_haves 解析 - D5: _check_reply 查错表 → 恢复查 tasks 表找 in_reply_to 旧方法保留未删(deprecated),确认稳定后再清理。
This commit is contained in:
@@ -185,6 +185,51 @@ class TaskHandler(BaseTaskHandler):
|
||||
|
||||
# === 子类实现 ===
|
||||
|
||||
def post_complete(self, task_id: str, agent_id: str,
|
||||
outcome: str, db_path: Path) -> None:
|
||||
"""Task on_complete:区分 executor 和 review。
|
||||
|
||||
executor: 基类统一流程(crash → verify → mark review)
|
||||
review: handle_review_complete(读 verdict → done/keep review)
|
||||
"""
|
||||
# crash 处理(所有类型共用)
|
||||
if outcome in self.CRASH_OUTCOMES:
|
||||
self._rollback_current_agent(db_path, task_id, agent_id)
|
||||
return
|
||||
|
||||
# 检查当前任务状态:如果是 review 状态 → review 完成流程
|
||||
try:
|
||||
conn = get_connection(db_path)
|
||||
try:
|
||||
row = conn.execute(
|
||||
"SELECT status FROM tasks WHERE id=?", (task_id,)
|
||||
).fetchone()
|
||||
task_status = row["status"] if row else "unknown"
|
||||
finally:
|
||||
conn.close()
|
||||
except Exception:
|
||||
task_status = "unknown"
|
||||
|
||||
if task_status == "review":
|
||||
# review 完成流程:只处理正常 outcome
|
||||
if outcome in ("completed", "session_revived"):
|
||||
self.handle_review_complete(task_id, db_path)
|
||||
else:
|
||||
logger.warning(
|
||||
"Task %s: review agent %s abnormal outcome=%s, keeping review",
|
||||
task_id, agent_id, outcome)
|
||||
else:
|
||||
# executor 完成流程:基类统一 verify → mark
|
||||
result = self.verify_completion(task_id, db_path)
|
||||
if result.passed:
|
||||
self._mark_task_status(db_path, task_id, self.target_success_status())
|
||||
logger.info("Task %s: verify passed (%s), marked %s",
|
||||
task_id, result.reason, self.target_success_status())
|
||||
else:
|
||||
logger.info(
|
||||
"Task %s: verify not passed (%s), leaving working",
|
||||
task_id, result.reason)
|
||||
|
||||
def target_success_status(self) -> str:
|
||||
"""task 类型验证通过后进 review。"""
|
||||
return "review"
|
||||
@@ -309,19 +354,18 @@ class TaskHandler(BaseTaskHandler):
|
||||
task_id, reviewer)
|
||||
else:
|
||||
# 非 approved:通过 blackboard comment @mention assignee
|
||||
# 保持 review 状态,让 assignee 自行决定下一步
|
||||
conn.execute(
|
||||
"INSERT INTO comments (task_id, author, content) "
|
||||
"VALUES (?, 'system', ?)",
|
||||
"INSERT INTO comments (task_id, author, content, comment_type) "
|
||||
"VALUES (?, 'system', ?, 'review')",
|
||||
(task_id,
|
||||
f"@{assignee} review 未通过 (verdict={verdict}, "
|
||||
f"reviewer={reviewer}): {review_comment}")
|
||||
)
|
||||
conn.commit()
|
||||
# 回到 working 让 assignee 重新处理
|
||||
self._mark_task_status(db_path, task_id, "working")
|
||||
logger.info(
|
||||
"Task %s: review not approved (%s by %s), "
|
||||
"@mentioned assignee %s, back to working",
|
||||
"@mentioned assignee %s, keeping review status",
|
||||
task_id, verdict, reviewer, assignee
|
||||
)
|
||||
finally:
|
||||
|
||||
Reference in New Issue
Block a user