Fix the run-breaking tool-result order; e2e test runs the slice (M2.1, PR D)
CI / checks (push) Skipped
CI / checks (pull_request) Successful in 2m17s
CI / checks (push) Skipped
CI / checks (pull_request) Successful in 2m17s
The first live run of the new loop's e2e test found that a fact recorded while start_milestone was in flight landed between the tool call and its result; both API formats reject that, so every later request in the run failed. Views now keep each result right after its call. Scripted test models check the APIs' ordering rules, so this can't pass unit tests again. The e2e tests no longer depend on the sandbox's history: each run asks for a uniquely named function and works against a base branch of its own, deleted afterwards. The review step asks for a change that can't already be there. The scripted operator gives up after five fruitless answers, and each run keeps its state store for inspection. The driver's prompt says review fixes stay in the current milestone. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPQ14L3LikyefCMFBqEbKE
This commit is contained in:
1 parent
30ab5c9b9c
commit
37965aefca
11 files changed
+203
-37
No files matched your search
@@ -90,8 +90,9 @@ def project(events: list[StoredEvent], viewer: str) -> list[StoredEvent]:
|
||||
shown = _SHOWN.get(viewer)
|
||||
if shown is None:
|
||||
# A role with no view defined (the expert is stateless, the
|
||||
# classifier sees only an action) reads the log as it is.
|
||||
return list(events)
|
||||
# classifier sees only an action) reads the log as it is, with
|
||||
# results kept after their calls.
|
||||
return _results_follow_calls(list(events))
|
||||
results = {
|
||||
e.event.call_id: e.event for e in events if isinstance(e.event, ToolResult)
|
||||
}
|
||||
@@ -128,4 +129,30 @@ def project(events: list[StoredEvent], viewer: str) -> list[StoredEvent]:
|
||||
out.append(_said(stored, actor, line))
|
||||
elif isinstance(event, AssistantText) and event.text.strip():
|
||||
out.append(_said(stored, actor, event.text.strip()))
|
||||
return out
|
||||
return _results_follow_calls(out)
|
||||
|
||||
|
||||
def _results_follow_calls(events: list[StoredEvent]) -> list[StoredEvent]:
|
||||
"""Keep each tool result right after its call, as both API formats
|
||||
require: anything recorded while a call was in flight (a fact the
|
||||
harness wrote while handling it, say) moves to just after the results.
|
||||
A call with no result yet keeps its place; the renderer answers it."""
|
||||
out: list[StoredEvent] = []
|
||||
pending: set[str] = set()
|
||||
held: list[StoredEvent] = []
|
||||
for stored in events:
|
||||
event = stored.event
|
||||
if isinstance(event, ToolCall):
|
||||
pending.add(event.call_id)
|
||||
out.append(stored)
|
||||
elif isinstance(event, ToolResult) and event.call_id in pending:
|
||||
pending.discard(event.call_id)
|
||||
out.append(stored)
|
||||
if not pending:
|
||||
out.extend(held)
|
||||
held = []
|
||||
elif pending:
|
||||
held.append(stored)
|
||||
else:
|
||||
out.append(stored)
|
||||
return out + held
|
||||
Reference in new issue
Block a user