Skip to content
Merged
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
99 changes: 75 additions & 24 deletions loopx/capabilities/native_chat/steward_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
TARGET = "steward-portfolio-watch"
FOLLOWUP_TARGET_PREFIX = "steward-monitor-followup:"
ADVANCEMENT_PRECOMMIT_RETRY_COOLDOWN_SECONDS = 60
ADVANCEMENT_ADMISSION_RETRY_SUFFIX = ".admission-retry"
ADVANCEMENT_PRECOMMIT_RETRY_SUFFIX = ".precommit-retry"
_LOG = logging.getLogger(__name__)

Expand Down Expand Up @@ -71,23 +72,43 @@ def advancement_turn_id(todo: dict[str, Any]) -> str:
[todo["todo_id"], stamp], sort_keys=True).encode()).hexdigest()[:40]


def _is_precommit_retryable_advancement_turn(
def _zero_write_advancement_response(
turn: Mapping[str, Any],
*,
now: float | None = None,
) -> bool:
"""Allow one delayed retry only when zero kernel/Steward writes occurred."""
) -> Mapping[str, Any] | None:
"""Return native_loopx payload only when a completed Turn wrote zero Steward outputs and passed cooldown."""
from .steward_turn import _iso_timestamp_seconds

if turn.get("status") != "completed":
return False
return None
resp = turn.get("response")
if not isinstance(resp, Mapping):
return False
return None
if (resp.get("steward_owner_report_queued")
or resp.get("context_handoff")
or resp.get("steward_user_action_receipts")):
return None
nl = resp.get("native_loopx")
if not isinstance(nl, Mapping):
return False
if nl.get("ok") is not False or nl.get("status") != "failed":
if not isinstance(nl, Mapping) or nl.get("ok") is not False:
return None
completed_ts = _iso_timestamp_seconds(turn.get("completed_at"))
if completed_ts is None:
return None
current_ts = time.time() if now is None else now
if current_ts - completed_ts < ADVANCEMENT_PRECOMMIT_RETRY_COOLDOWN_SECONDS:
return None
return nl


def _is_precommit_retryable_advancement_turn(
turn: Mapping[str, Any],
*,
now: float | None = None,
) -> bool:
"""Allow one delayed retry only when zero kernel/Steward writes occurred."""
nl = _zero_write_advancement_response(turn, now=now)
if nl is None or nl.get("status") != "failed":
return False
if nl.get("result_kind") not in {"validation_failed", "host_failure"}:
return False
Expand All @@ -98,19 +119,32 @@ def _is_precommit_retryable_advancement_turn(
return False
if not (commit_eligibility.get("writeback") is False or effects.get("state_written") is False):
return False
if (effects.get("state_written") is True
or effects.get("quota_spent") is True
or effects.get("scheduler_acknowledged") is True):
return not (
effects.get("state_written") is True
or effects.get("quota_spent") is True
or effects.get("scheduler_acknowledged") is True
)


def _is_zero_effect_selection_deferred_advancement_turn(
turn: Mapping[str, Any],
*,
now: float | None = None,
) -> bool:
"""Allow bounded retry only for zero-effect pre-host selection deferrals."""
nl = _zero_write_advancement_response(turn, now=now)
if nl is None or nl.get("error_code") != "turn_todo_selection_deferred":
return False
if (resp.get("steward_owner_report_queued")
or resp.get("context_handoff")
or resp.get("steward_user_action_receipts")):
refusal = nl.get("selection_rejection")
if not isinstance(refusal, Mapping) or refusal.get("state") != "deferred":
return False
completed_ts = _iso_timestamp_seconds(turn.get("completed_at"))
if completed_ts is None:
effects = nl.get("effects")
if not isinstance(effects, Mapping):
return False
current_ts = time.time() if now is None else now
return current_ts - completed_ts >= ADVANCEMENT_PRECOMMIT_RETRY_COOLDOWN_SECONDS
return not any(
effects.get(key) is not False
for key in ("host_invoked", "state_written", "quota_spent", "scheduler_acknowledged")
)


def resolve_advancement_turn_id(
Expand All @@ -120,7 +154,7 @@ def resolve_advancement_turn_id(
*,
now: float | None = None,
) -> str | None:
"""Resolve the active attempt id or at most one post-cooldown pre-commit retry."""
"""Resolve the active attempt id or bounded post-cooldown deferral/pre-commit retries."""
from .steward_turn import native_steward_client_id

base = advancement_turn_id(todo)
Expand All @@ -130,15 +164,32 @@ def resolve_advancement_turn_id(
)
if existing is None:
return base
primary_token = base
if _is_zero_effect_selection_deferred_advancement_turn(existing, now=now):
primary_token = base + ADVANCEMENT_ADMISSION_RETRY_SUFFIX
existing = store.turn_for_client(
actor["session_id"],
native_steward_client_id(actor, primary_token),
)
if existing is None:
return primary_token
if not _is_precommit_retryable_advancement_turn(existing, now=now):
return None
retry_token = base + ADVANCEMENT_PRECOMMIT_RETRY_SUFFIX
if store.turn_for_client(
retry_token = primary_token + ADVANCEMENT_PRECOMMIT_RETRY_SUFFIX
retry_existing = store.turn_for_client(
actor["session_id"],
native_steward_client_id(actor, retry_token),
) is not None:
return None
return retry_token
)
if retry_existing is None:
return retry_token
if _is_zero_effect_selection_deferred_advancement_turn(retry_existing, now=now):
retry_admission_token = retry_token + ADVANCEMENT_ADMISSION_RETRY_SUFFIX
if store.turn_for_client(
actor["session_id"],
native_steward_client_id(actor, retry_admission_token),
) is None:
return retry_admission_token
return None


def _github_repo_slug(task_repository: Any) -> str | None:
Expand Down
Loading
Loading