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
25 changes: 24 additions & 1 deletion loopx/cli_commands/quota_presentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,19 @@ def compose_quota_work_contract(payload: dict[str, object], args: argparse.Names
scheduler_context: Mapping[str, object] | SchedulerExecutionContextResolution | None,
capture_directory: Path | None,
record_capture: Callable[[dict[str, object], str], None] | None = None) -> dict[str, object]:
"""Compose every decided should-run source once before capture and display."""
"""Compose Complete Turn sources before capture and display."""
if args.quota_command != "should-run" or not isinstance(payload.get("interaction_contract"), Mapping):
return payload
if (
args.format == "json"
and scheduler_context is None
and not any(getattr(args, option, None) for option in (
"complete_turn", "turn_envelope", "codex_context_dir", "codex_context_root",
"prepared_capture_reference", "defer_context_presentation", "decision_handoff_socket",
))
):
# Undeclared JSON callers use the currently qualified public quota packet.
return payload
from ..control_plane.effect_runtime import EffectRuntimeRemoteError, EffectRuntimeStartupError
from ..control_plane.quota.error_codes import QuotaDecisionTransportError
from ..control_plane.quota.turn_envelope import compose_turn_decision
Expand Down Expand Up @@ -121,6 +131,7 @@ def _project_quota_cli_payload(
from ..control_plane.quota.cli_projection import (
compact_quota_monitor_poll_cli_payload,
compact_quota_plan_cli_payload,
compact_quota_should_run_cli_payload,
)

reject_retired_quota_format(payload)
Expand All @@ -138,6 +149,18 @@ def _project_quota_cli_payload(
# its unavailable runtime. Decided refusals still need signed views.
# Keep the decided diagnostic, including its original recovery/receipt.
return payload
if args.quota_command == "should-run":
if captured_decision_path is not None and "vision" not in detail_sections:
from ..control_plane.quota.turn_envelope import project_captured_replan_cli_view

payload = project_captured_replan_cli_view(payload, captured_decision_path=captured_decision_path)
return compact_quota_should_run_cli_payload(
payload,
include_todo_summary_detail="agent-todos" in detail_sections,
include_user_todo_summary_detail="user-todos" in detail_sections,
include_goal_boundary_detail="goal-boundary" in detail_sections,
include_vision_detail="vision" in detail_sections,
)
if args.quota_command in {"status", "plan"}:
return compact_quota_plan_cli_payload(payload, detail_sections=detail_sections)
if args.quota_command == "monitor-poll":
Expand Down
4 changes: 2 additions & 2 deletions loopx/cli_commands/quota_registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def register_quota_command(
"--turn-envelope",
action="store_true",
help=(
"Compatibility alias: quota should-run already returns the complete v1 work contract. "
"Select the complete v1 work contract for quota should-run. "
"Context and Delta delivery remain independent."
),
)
turn_view.add_argument("--complete-turn", action="store_true",
help="Compatibility alias: quota should-run already returns the complete v1 work contract "
help="Select the complete v1 work contract for JSON quota should-run "
"and its shared exact-Turn settlement. Context and Delta delivery remain independent.")
capture_group = quota_parser.add_mutually_exclusive_group()
capture_group.add_argument(
Expand Down
14 changes: 7 additions & 7 deletions loopx/control_plane/testing/cli_output_budget.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class CliOutputCommandClassification:
),
CliOutputBudgetSpec(
surface_id="quota_should_run",
command="quota should-run --context-delivery off",
command="quota should-run --turn-envelope --context-delivery off",
owner="quota guard",
consumer_action="inspect the complete inline quota policy",
qualification_policy="absolute_hot_path",
Expand Down Expand Up @@ -418,7 +418,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_scheduler_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail scheduler",
command="quota should-run --turn-envelope --context-delivery off --include-detail scheduler",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand All @@ -429,7 +429,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_todo_summary_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail agent-todos",
command="quota should-run --turn-envelope --context-delivery off --include-detail agent-todos",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand All @@ -440,7 +440,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_user_todo_summary_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail user-todos",
command="quota should-run --turn-envelope --context-delivery off --include-detail user-todos",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand All @@ -451,7 +451,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_goal_boundary_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail goal-boundary",
command="quota should-run --turn-envelope --context-delivery off --include-detail goal-boundary",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand All @@ -462,7 +462,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_vision_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail vision",
command="quota should-run --turn-envelope --context-delivery off --include-detail vision",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand All @@ -475,7 +475,7 @@ class CliOutputCommandClassification:
CliOutputModeVariantSpec(
variant_id="quota_should_run_all_detail",
parent_surface_id="quota_should_run",
command="quota should-run --context-delivery off --include-detail all",
command="quota should-run --turn-envelope --context-delivery off --include-detail all",
output_formats=("json", "markdown"),
semantic_json_keys=("schema_version", "contract_binding", "interaction_contract", "scheduler_hint", "selected_todo"),
markdown_anchor="# LoopX Turn Envelope",
Expand Down
2 changes: 1 addition & 1 deletion loopx/control_plane/work_items/interaction_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ def _successor_replan_required_cli_actions(
goal_id: str,
lifecycle_actor_args: str,
typed_quota_guard: str,
settlement_plan: Mapping[str, object],
settlement_plan: Mapping[str, object] | None,
scheduler_args: str,
settlement_args: str,
scoped_cli_args: str,
Expand Down
39 changes: 34 additions & 5 deletions tests/control_plane/test_cli_output_budget.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import shlex
import shutil
import tempfile
from dataclasses import dataclass
from dataclasses import dataclass, replace
from datetime import datetime, timezone
from pathlib import Path

Expand Down Expand Up @@ -365,9 +365,10 @@ def _surface_commands(
state_file: Path,
output_format: str,
context_delivery: str | None = "off",
complete_quota: bool = True,
) -> dict[str, list[str]]:
# These ceilings characterize the complete inline policy, not its shorter
# file-navigation descriptor. Qualify default progressive recovery below.
# Keep the Complete Turn budget workload on its declared carrier.
quota_view = ["--turn-envelope"] if complete_quota else []
delivery = ["--context-delivery", context_delivery] if context_delivery else []
common = [
"--registry",
Expand Down Expand Up @@ -417,7 +418,7 @@ def _surface_commands(
GOAL_ID,
"--agent-id",
AGENT_IDS[0],
] + delivery,
] + quota_view + delivery,
"loopx_turn_plan": common
+ [
"turn",
Expand Down Expand Up @@ -612,7 +613,7 @@ def _mode_variant_commands(
"quota_should_run_goal_boundary_detail": quota + ["--include-detail", "goal-boundary"],
"quota_should_run_vision_detail": quota + ["--include-detail", "vision"],
"quota_should_run_all_detail": quota + ["--include-detail", "all"],
"quota_should_run_turn_envelope": quota + ["--turn-envelope"],
"quota_should_run_turn_envelope": quota,
"loopx_turn_plan_transaction_detail": common
+ [
"turn",
Expand Down Expand Up @@ -1045,6 +1046,34 @@ def test_quota_should_run_no_format_uses_machine_contract_json(
assert not markdown_text.lstrip().startswith("{")


@pytest.mark.parametrize("scenario", SCENARIOS, ids=lambda scenario: scenario.name)
def test_public_quota_packet_keeps_original_control_keys_and_output_budget(
tmp_path: Path, scenario: Scenario,
) -> None:
with _stable_budget_fixture_root(tmp_path / scenario.name) as stable_root:
project, runtime, registry_path, state_file = _write_fixture(stable_root, scenario)
import_fixture_authority(registry_path, GOAL_ID)
command = _surface_commands(
project=project, runtime=runtime, registry_path=registry_path, state_file=state_file,
output_format="json", complete_quota=False,
)["quota_should_run"]
exit_code, output = _invoke_cli(command)
assert exit_code == 0, output
measurement = _measure_context_output(output, output_format="json")

packet = _measured_payload(measurement)
assert packet.get("schema_version") is None
assert packet["goal_id"] == GOAL_ID
assert packet["interaction_contract"]["schema_version"] == "loopx_interaction_contract_v0"
spec = replace(
CLI_OUTPUT_BUDGET_BY_ID["quota_should_run"], output_contract_version=None,
semantic_json_keys=("interaction_contract", "scheduler_hint", "selected_todo"),
)
assert_cli_output_baseline(
spec, scenario=scenario.name, output_format="json", text=output, measurement=measurement,
)


def test_quota_cli_keeps_full_agent_todo_diagnostics_on_explicit_cold_path(
tmp_path: Path,
) -> None:
Expand Down
3 changes: 2 additions & 1 deletion tests/control_plane/test_refresh_settle_turn.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,11 @@ def unavailable(*args, **kwargs):
assert original_packet.get("schema_version") is None
assert failed["heartbeat_receipt"]["settlement_identity"] == original_packet["heartbeat_receipt"]["settlement_identity"]
assert _heartbeat_receipt_count(runtime, TURN_ID) == 1 and _spend_run_count(runtime) == 0
page_bytes = min(8000, len(original) // 2)
recovered_bytes, page_count = b"", 0
while True:
rc, page = _run_cli(registry, runtime, "quota", "context-read", "--capture-file", str(saved),
"--capture-sha256", hashlib.sha256(original).hexdigest(), "--page-bytes", "8000",
"--capture-sha256", hashlib.sha256(original).hexdigest(), "--page-bytes", str(page_bytes),
"--max-page-output-bytes", "12000", "--offset", str(len(recovered_bytes)), cwd=project)
assert rc == 0 and page["ok"], page
assert page["offset"] == len(recovered_bytes)
Expand Down
13 changes: 2 additions & 11 deletions tests/test_runtime_snapshot_publication.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,6 @@ def observe(source: Path) -> dict:
def test_release_probe_observes_real_default_without_model_or_active_goal():
from scripts.qualify_runtime_artifact import observe_default_contract

# The probe observes the real writer rather than inheriting the intended
# distribution profile. Main currently exercises C1, which remains outside
# the supported public scope until its original qualification is complete.
# Check the actual CLI output against the supported release contract.
observed = observe_default_contract(ROOT)
assert observed == {
"surface": "complete_turn",
"schema_version": "loopx_turn_envelope_v1",
"interaction_schema_version": "loopx_interaction_contract_v0",
}
assert observed != PUBLIC_DEFAULT_CONTRACT
with pytest.raises(ValueError, match="unqualified for public adoption"):
validate_default_contract(observed)
assert validate_default_contract(observed) == PUBLIC_DEFAULT_CONTRACT
1 change: 0 additions & 1 deletion tests/test_steward_generic_monitor_todo.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from datetime import datetime, timedelta, timezone
import json
from pathlib import Path
import pytest

from loopx.capabilities.native_chat.steward_monitor import (
StewardMonitor,
Expand Down