feat: 岗位会商命令幂等与圆桌后台作业租约调度

岗位会商写操作引入 command_id 幂等与版本锁,前端支持同键重试;圆桌后台作业改为 DB 租约 dispatcher、去重与草稿 outbox 补偿,并持久化 intent turns。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
董宏凯andCursor committed 2026-08-14 11:08:12 +08:00
1 parent 4f536d9b39
commit 75963c9ad9
51 files changed
+4449 -670

No files matched your search

@@ -50,3 +50,6 @@ class RoundtableTaskDraftRow(Base):
default=lambda: datetime.now(UTC),
onupdate=lambda: datetime.now(UTC),
)
# 乐观并发控制版本号:每次 update_draft 自增;传入 expected_version 时校验,命中
# 0 行即并发冲突(防 step2.runs 读-改-写丢失更新——多用户/多 worker 并发)。
version: Mapped[int] = mapped_column(Integer, nullable=False, default=0, server_default="0")
@@ -19,9 +19,10 @@ import re
from datetime import UTC, datetime
from typing import Any
from sqlalchemy import select
from sqlalchemy import case, select, update
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
from deerflow.persistence.roundtable_drafts.sql import DraftConcurrentWriteError
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
_UNSET = object()
@@ -77,6 +78,8 @@ class RoundtableTaskDraftRepository:
"task_id": row.task_id,
"title": row.title,
"furthest_step": row.furthest_step,
# 乐观锁版本号:列表也携带,供前端本地副本对账(冲突时重拉合并)。
"version": row.version,
# 所用业务链名(历史卡片展示用);无链条 → None → 前端显示「自由模式」。
"chain_title": _extract_chain_title(row.step2),
"created_at": row.created_at.isoformat() if isinstance(row.created_at, datetime) else row.created_at,
@@ -159,24 +162,52 @@ class RoundtableTaskDraftRepository:
step1=_UNSET,
step2=_UNSET,
step3=_UNSET,
expected_version: int | None = None,
) -> dict[str, Any] | None:
"""Partial update by id. ``user_id`` is ignored (signature-compat only)."""
"""Partial update by id (``user_id`` ignored — signature-compat only).
与个人草稿一致:原子条件 UPDATE,版本判定与写入在同一条 SQL 里,
多 worker 并发下无检查后竞争窗口。``rowcount == 0`` 时回读区分
「不存在」与「版本冲突」。
"""
values: dict[str, Any] = {
"version": RoundtableTaskDraftRow.version + 1,
"updated_at": datetime.now(UTC),
}
if title is not _UNSET and title is not None:
values["title"] = str(title).strip()
if furthest_step is not _UNSET and furthest_step is not None:
# furthest_step 单调不回退:迟到的自动保存不得把已推进的步骤拉回去。
step_value = int(furthest_step)
values["furthest_step"] = case(
(RoundtableTaskDraftRow.furthest_step >= step_value, RoundtableTaskDraftRow.furthest_step),
else_=step_value,
)
if step1 is not _UNSET:
values["step1"] = _dumps(step1)
if step2 is not _UNSET:
values["step2"] = _dumps(step2)
if step3 is not _UNSET:
values["step3"] = _dumps(step3)
where = [RoundtableTaskDraftRow.id == draft_id]
if expected_version is not None:
where.append(RoundtableTaskDraftRow.version == expected_version)
async with self._sf() as session:
row = await session.get(RoundtableTaskDraftRow, draft_id)
if row is None:
result = await session.execute(
update(RoundtableTaskDraftRow).where(*where).values(**values)
)
if result.rowcount == 0:
if expected_version is not None:
existing = await session.get(RoundtableTaskDraftRow, draft_id)
if existing is not None:
raise DraftConcurrentWriteError(
draft_id, expected=expected_version, actual=existing.version
)
return None
if title is not _UNSET and title is not None:
row.title = str(title).strip()
if furthest_step is not _UNSET and furthest_step is not None:
row.furthest_step = int(furthest_step)
if step1 is not _UNSET:
row.step1 = _dumps(step1)
if step2 is not _UNSET:
row.step2 = _dumps(step2)
if step3 is not _UNSET:
row.step3 = _dumps(step3)
row.updated_at = datetime.now(UTC)
await session.commit()
row = await session.get(RoundtableTaskDraftRow, draft_id)
await session.refresh(row)
return self._to_dict(row)