Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions loopx/control_plane/turn_driver/codex_execution_preparation.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

from ...command_invocation import command_argv, current_loopx_cli_argv
from ...turn_identity import mint_turn_instance_id, normalize_turn_instance_id
from ..agents.capability_gate import runtime_capabilities_for_cli_projection
from ..content_digest import BARE_SHA256_PATTERN


Expand Down Expand Up @@ -49,7 +50,7 @@ class NativePreparationTurnUnavailable(ValueError):
def compact_execution_preparation_request(
payload: Mapping[str, Any], *, claim_source_sha256: str | None = None,
) -> dict[str, Any] | None:
"""Retain only the exact Host-executable action beside a private capture."""
"""Retain the exact Host claim and same-Turn readiness inputs."""

preparation = payload.get("execution_preparation")
selected = payload.get("selected_todo")
Expand Down Expand Up @@ -86,6 +87,10 @@ def compact_execution_preparation_request(
return None
receipt = payload.get("heartbeat_receipt")
goal_ref = payload.get("goal_ref")
identity = payload.get("agent_identity")
runtime_capabilities = runtime_capabilities_for_cli_projection(
identity.get("runtime_available_capabilities") if isinstance(identity, Mapping) else None
)
turn_instance_id = (
str(receipt.get("turn_instance_id") or "").strip()
if isinstance(receipt, Mapping)
Expand All @@ -110,6 +115,7 @@ def compact_execution_preparation_request(
},
**({"turn_instance_id": turn_instance_id} if turn_instance_id else {}),
**({"goal_ref": dict(goal_ref)} if isinstance(goal_ref, Mapping) else {}),
**({"runtime_available_capabilities": runtime_capabilities} if runtime_capabilities else {}),
**claim_binding,
}

Expand Down Expand Up @@ -394,6 +400,7 @@ def _native_context_argv(scenario: str, directory: Path, *, progressive_enabled:
def _native_readiness_guard(
goal: str, agent: str, todo: str, turn: str, *, context_argv: Sequence[str],
goal_ref: Mapping[str, Any] | None = None,
runtime_available_capabilities: Any = None,
) -> list[str]:
instance = []
if goal_ref is not None:
Expand All @@ -403,6 +410,11 @@ def _native_readiness_guard(
instance = ["--goal-instance-id", instance_id]
return [
"quota", "should-run", "--goal-id", goal, "--agent-id", agent,
*[
word
for capability in runtime_capabilities_for_cli_projection(runtime_available_capabilities)
for word in ("--available-capability", capability)
],
*context_argv, "--defer-context-presentation",
"--todo-id", todo, "--turn-instance-id", turn,
*instance,
Expand Down Expand Up @@ -545,7 +557,8 @@ def codex_execution_preparation_readback_context(
goal_ref = request.get("goal_ref")
facts["readiness_command"] = shlex.join([
*base, *_native_readiness_guard(goal, agent, todo, turn, context_argv=guard_context,
goal_ref=goal_ref if isinstance(goal_ref, Mapping) else None),
goal_ref=goal_ref if isinstance(goal_ref, Mapping) else None,
runtime_available_capabilities=request.get("runtime_available_capabilities")),
"--decision-output-dir", str(staged), "--prepared-capture-reference",
])
facts["ready_context_command_template"] = shlex.join([
Expand Down Expand Up @@ -684,6 +697,7 @@ def execute_codex_execution_preparation(
goal_id, agent_id, todo_id, turn_instance_id,
context_argv=_native_context_argv(scenario, context_directory, progressive_enabled=progressive_enabled),
goal_ref=goal_ref,
runtime_available_capabilities=request.get("runtime_available_capabilities"),
),
"--decision-output-dir", str(capture_directory), "--prepared-capture-reference",
]
Expand Down
20 changes: 19 additions & 1 deletion tests/control_plane/test_codex_execution_preparation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

import json
import shlex
from pathlib import Path
import subprocess
from types import SimpleNamespace
Expand Down Expand Up @@ -107,7 +108,13 @@ def read(runtime_root, *, goal_id, agent_id, todo_id, turn_instance_id, **kwargs

@pytest.mark.parametrize("scenario", ["codex_app_heartbeat", "codex_app_ssh_goal"])
def test_executor_claims_then_proves_same_turn_ready(tmp_path: Path, monkeypatch, open_turn, scenario: str) -> None:
request = _bound_request(tmp_path)
packet = _packet(tmp_path)
packet["agent_identity"] = {"runtime_available_capabilities": [
"filesystem_write", "external_evidence_poll", "production_access", "credentials",
]}
request = compact_execution_preparation_request(packet, claim_source_sha256=ORIGINAL_DIGEST)
assert request is not None
request["source_sha256"] = OBSERVED_DIGEST
capture, native = tmp_path / "ready", tmp_path / "native"
calls: list[list[str]] = []
timeouts = []
Expand Down Expand Up @@ -161,6 +168,17 @@ def runner(command, *, cwd, timeout):
assert call[call.index("--runtime-root") + 1] == str((tmp_path / "loopx-runtime-a").resolve())
assert calls[0][-len(request["claim_args"]):] == request["claim_args"]
assert calls[0][-2:] == ["--claim-operation-id", CLAIM]

guidance = codex_execution_preparation.codex_execution_preparation_readback_context(
request | {"readback_only": True}, scenario=scenario, context_directory=str(native),
progressive_enabled=True,
)
assert guidance is not None
resume = json.loads(guidance.rsplit("Receipt: ", 1)[1])
for guard in (calls[1], shlex.split(resume["readiness_command"])):
assert [
guard[index + 1] for index, item in enumerate(guard) if item == "--available-capability"
] == ["filesystem_write", "external_evidence_poll"]
assert calls[1][-12:] == [
"--context-delivery", "on", "--codex-context-dir", str(native), "--defer-context-presentation",
"--todo-id", TODO, "--turn-instance-id", "turn-example",
Expand Down
9 changes: 8 additions & 1 deletion tests/control_plane/test_quota_execution_preparation.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,12 @@ def test_native_hook_returns_readable_ready_source_and_original_claim(
event = {"session_id": "preparation-session", "cwd": str(tmp_path),
"hook_event_name": "SessionStart", "source": "startup"}
assert codex_context.codex_context_hook(str(native), event) == {}
original = {**_todo(), "text": "Deliver the complete synthetic request: 保留原文" + "。不可截断的验收条件" * 100,
original = {**_todo(), "required_capabilities": ["filesystem_write"],
"text": "Deliver the complete synthetic request: 保留原文" + "。不可截断的验收条件" * 100,
"note": "Preserve the original stop and once-only settlement."}
capture = tmp_path / "before-claim"
before = _run(tmp_path, monkeypatch, provider, [], "--runtime-profile", scenario,
"--available-capability", "filesystem_write", "--available-capability", "shell",
"--turn-instance-id", "preparation-turn", "--todo-id", TODO,
"--defer-context-presentation", "--codex-context-dir", str(native), "--decision-output-dir", str(capture),
todos=[original], context_delivery="on",
Expand Down Expand Up @@ -426,7 +428,9 @@ def test_native_hook_returns_readable_ready_source_and_original_claim(
if location == "root":
assert list(root.iterdir()) == [native]
read = shlex.split(ready["recovery"]["command"])
runtime_capabilities = "/agent_identity/runtime_available_capabilities"
pointers = ["/execution_preparation", "/selected_todo", "/heartbeat_receipt", "/interaction_contract/cli_channel",
runtime_capabilities,
"/interaction_contract/agent_channel/work_context", "/interaction_contract/agent_channel/required_reads"]
for pointer in pointers:
read.extend(("--select", pointer))
Expand All @@ -436,6 +440,7 @@ def test_native_hook_returns_readable_ready_source_and_original_claim(
assert page["eof"] is True and page["offset"] == 0
selected = {item["pointer"]: item["value"] for item in json.loads(page["content"])["selections"]}
assert selected["/execution_preparation"]["state"] == "ready"
assert selected[runtime_capabilities] == before["agent_identity"]["runtime_available_capabilities"]
assert selected["/heartbeat_receipt"]["turn_instance_id"] == "preparation-turn"
plan = selected["/interaction_contract/cli_channel"]["settlement_plan"]
assert plan["identity"]["todo_id"] == TODO and plan["identity"]["turn_instance_id"] == "preparation-turn"
Expand All @@ -446,6 +451,8 @@ def test_native_hook_returns_readable_ready_source_and_original_claim(
writeback, spend = [step for step in plan["ordered_steps"]
if step["kind"] in {"durable_writeback", "quota_spend"}]
assert "--settle-turn --settlement-receipt" in writeback["command_template"]
for capability in ("filesystem_write", "shell"):
assert f"--available-capability {capability}" in writeback["semantic_closeout_command_template"]
assert spend["owner"] == "runtime" and "command_template" not in spend
sources = selected["/interaction_contract/agent_channel/work_context"]["sources"]
task = next(item["content"]["todo"] for item in sources if item["source"] == "selected_todo")
Expand Down
Loading