fix(multi-agent-collaboration): compose TaskRunner bookkeeping instead of forking it

CollaborativeTaskRunner hand-rolled its own step loop instead of
composing runtime/task.py's TaskRunner as design.md D3 requires,
silently dropping Timeline recording, WorldModel wiring,
TaskMetadataStore sync, and the on_task_succeeded/skill-synthesis
hook. Now calls TaskRunner's shared _start_world_view/
_record_step_result helpers for that bookkeeping. Also fixes
pre_observation being reused stale across steps in a multi-step plan
instead of refreshing to the prior step's post-observation.

openspec: multi-agent-collaboration capability, archived change multi-agent-runtime
This commit is contained in:
2026-07-07 08:30:57 +08:00
parent 49ad589c2d
commit 031b929067
2 changed files with 176 additions and 30 deletions
+48 -30
View File
@@ -8,12 +8,13 @@ from agents.models import Observation, VerificationVerdict
from agents.observer import Observer
from agents.reflector import Reflector
from agents.verifier import Verifier
from core.models import Scene, Task, utc_now
from core.models import Scene, Task
from runtime.context import TaskContext
from runtime.executor import Executor
from runtime.planner import PlannedStep, Planner
from runtime.task import TaskRunner, TaskRunnerConfig
from semantic.llm_client import AnthropicSemanticClient
from world.model import TaskWorldView
logger = logging.getLogger(__name__)
@@ -40,12 +41,19 @@ class CollaborativeTaskRunner:
) -> None:
self.planner = planner or Planner()
self.executor = executor or Executor()
self.task_runner = task_runner
self.observer = observer or Observer()
self.verifier = verifier or Verifier(client=llm_client)
self.reflector = reflector or Reflector(client=llm_client)
self.config = config or CollaborativeTaskRunnerConfig()
self.collaboration_config = collaboration_config or load_config()
# Shared with `_run_plain`: also holds the Timeline/TaskMetadataStore/
# WorldModel/on_task_succeeded wiring that `_run_collaborative` reuses
# for its own per-step bookkeeping, so the two paths cannot drift apart.
self.task_runner = task_runner or TaskRunner(
planner=self.planner,
executor=self.executor,
config=TaskRunnerConfig(max_steps=self.config.max_steps),
)
def run(self, task: Task) -> Task:
if not self.collaboration_config.enabled:
@@ -53,17 +61,14 @@ class CollaborativeTaskRunner:
return self._run_collaborative(task)
def _run_plain(self, task: Task) -> Task:
runner = self.task_runner or TaskRunner(
planner=self.planner,
executor=self.executor,
config=TaskRunnerConfig(max_steps=self.config.max_steps),
)
return runner.run(task)
return self.task_runner.run(task)
def _run_collaborative(self, task: Task) -> Task:
context = TaskContext(task_id=task.id, goal=task.goal)
task.status = "running" # type: ignore[assignment]
task.updated_at = utc_now()
world_handle: TaskWorldView | None = self.task_runner._start_world_view(task.id)
if world_handle is not None:
context.world = world_handle.state
self.task_runner._update_task(task, status="running")
recovery_attempts = 0
for _ in range(self.config.max_steps):
@@ -85,15 +90,15 @@ class CollaborativeTaskRunner:
scene=scene,
context=context,
):
task.status = "completed" # type: ignore[assignment]
task.updated_at = utc_now()
task.completed_at = utc_now()
return task
return self.task_runner._complete_task(task)
for step in steps:
executable_step = self._step_for_device(step, task.device_id)
result = self.executor.execute(executable_step, context=context)
context.add_step_result(result)
self.task_runner._record_step_result(
world_handle, context, task, scene, step, result
)
post_scene = self._observe_scene(task.device_id)
post_observation = self.observer.observe(
@@ -108,18 +113,21 @@ class CollaborativeTaskRunner:
step_result=result,
)
# Refresh pre_observation for the *next* step in this plan (or
# the next outer-loop iteration) so it always reflects the
# most recent known device state, never the stale
# pre-whole-plan observation.
pre_observation = post_observation
if verdict.result == "achieved":
continue
if recovery_attempts >= self.collaboration_config.max_recovery_attempts:
task.status = "failed" # type: ignore[assignment]
task.updated_at = utc_now()
task.completed_at = utc_now()
task.failure_reason = (
return self._fail(
task,
f"Reflection recovery ceiling reached "
f"({self.collaboration_config.max_recovery_attempts} attempts)"
f"({self.collaboration_config.max_recovery_attempts} attempts)",
)
return task
outcome = self.reflector.reflect(
observation=post_observation,
@@ -143,19 +151,29 @@ class CollaborativeTaskRunner:
context=context,
)
context.add_step_result(recovery_result)
self.task_runner._record_step_result(
world_handle, context, task, post_scene, recovery_step, recovery_result
)
if not recovery_result.success:
task.status = "failed" # type: ignore[assignment]
task.updated_at = utc_now()
task.completed_at = utc_now()
task.failure_reason = (
f"Recovery action failed: {recovery_result.error}"
return self._fail(
task, f"Recovery action failed: {recovery_result.error}"
)
return task
task.status = "failed" # type: ignore[assignment]
task.updated_at = utc_now()
task.completed_at = utc_now()
task.failure_reason = f"max steps exceeded: {self.config.max_steps}"
recovery_scene = self._observe_scene(task.device_id)
pre_observation = self.observer.observe(
scene=recovery_scene,
world=context.world,
)
return self._fail(task, f"max steps exceeded: {self.config.max_steps}")
def _fail(self, task: Task, reason: str) -> Task:
self.task_runner._update_task(
task,
status="failed",
completed=True,
failure_reason=reason,
)
return task
def _observe_scene(self, device_id: str) -> Scene: