fix(online-agent): close automatic execution loop

active-runtime/app/agent_event_bus.py

@@ -64,7 +64,6 @@ class AgentEventBus:
             conversation_id=(payload.get('conversation_id') if isinstance(payload, dict) else None),
             task_id=(payload.get('task_id') if isinstance(payload, dict) else None),
             run_id=(payload.get('run_id') if isinstance(payload, dict) else None),
-            correlation_id=(payload.get('correlation_id') if isinstance(payload, dict) else None),
             causation_id=(payload.get('causation_id') if isinstance(payload, dict) else None),
             sequence=(payload.get('sequence') if isinstance(payload, dict) else None),
             idempotency_key=(payload.get('idempotency_key') if isinstance(payload, dict) else None),

active-runtime/app/agent_event_observability_bridge.py

@@ -7,7 +7,7 @@ class AgentEventObservabilityBridge:
     def __init__(self, hooks: AgentObservabilityHooks | None = None):
         self.hooks = hooks or AgentObservabilityHooks()
 
-    def consume(self, event: dict, *, actor=None, trace=None):
+    def consume(self, event: dict):
         kind = event.get("kind")
         payload = event.get("payload", {})
         if kind == "agent_started":
@@ -16,8 +16,6 @@ class AgentEventObservabilityBridge:
                 visible_scope=payload.get("scope", "self"),
                 entry_agent=payload.get("agent", "unknown"),
                 execution_id=event.get("id"),
-                actor=actor,
-                trace=trace,
             )
         if kind == "agent_delegated":
             return self.hooks.delegate(event["execution_id"], payload.get("agent", "unknown"))

active-runtime/app/agent_observability.py

@@ -31,18 +31,6 @@ class AgentExecutionRecord:
     status: str = "completed"
     started_at: str = field(default_factory=utc_now)
     ended_at: str = field(default_factory=utc_now)
-    trace_id: str | None = None
-    span_id: str | None = None
-    parent_span_id: str | None = None
-    correlation_id: str | None = None
-    causation_id: str | None = None
-    tenant_id: str | None = None
-    project_id: str | None = None
-    conversation_id: str | None = None
-    task_id: str | None = None
-    claim_id: str | None = None
-    run_id: str | None = None
-    message_id: str | None = None
 
     def to_dict(self):
         return asdict(self)

active-runtime/app/agent_observability_api.py

@@ -9,49 +9,25 @@ try:
 except Exception:
     APIRouter = None
 
-from .agent_observability import AgentExecutionRecord, AgentObservability
+from .agent_observability import AgentExecutionRecord
 from .agent_observability_dashboard import AgentObservabilityDashboard
 from .agent_observability_store import AgentObservabilityStore
-from .trace_tool_credential_governance import GovernanceActor, TraceContext, authorize_scope
 
 store = AgentObservabilityStore()
 dashboard = AgentObservabilityDashboard(store.load())
 
 
-def record_agent_execution(payload: dict[str, Any], *, actor: GovernanceActor | dict[str, Any] | None = None, trace: TraceContext | None = None):
-    scoped = any(payload.get(name) is not None for name in (
-        "trace_id", "span_id", "tenant_id", "project_id", "conversation_id", "task_id", "run_id"
-    ))
-    values = dict(payload)
-    if scoped:
-        if actor is None or trace is None:
-            raise RuntimeError("TRACE_ACTOR_CONTEXT_REQUIRED")
-        trusted = GovernanceActor.from_value(actor)
-        authorize_scope(trusted, trace.scope)
-        bound = {
-            "trace_id": trace.trace_id, "span_id": trace.span_id,
-            "parent_span_id": trace.parent_span_id, "correlation_id": trace.correlation_id,
-            "causation_id": trace.causation_id, "tenant_id": trace.scope.tenant_id,
-            "user_id": trace.scope.user_id, "project_id": trace.scope.project_id,
-            "conversation_id": trace.scope.conversation_id, "task_id": trace.task_id,
-            "claim_id": trace.claim_id, "run_id": trace.scope.run_id, "message_id": trace.message_id,
-        }
-        for name, authoritative in bound.items():
-            if values.get(name) not in (None, authoritative):
-                raise RuntimeError("TRACE_SCOPE_MISMATCH_DENY:" + name)
-            values[name] = authoritative
-    record = AgentExecutionRecord(**values)
+def record_agent_execution(payload: dict[str, Any]):
+    record = AgentExecutionRecord(**payload)
     return {"status": "ok", "record": store.append(record)}
 
 
-def get_agent_observability(user_id: str | None = None, group_id: str | None = None, role: str = "user", *, actor: GovernanceActor | dict[str, Any] | None = None):
-    records = store.query(user_id, group_id, role, actor=actor)
-    visible = AgentObservability()
-    visible.records = [AgentExecutionRecord(**record) for record in records]
+def get_agent_observability(user_id: str | None = None, group_id: str | None = None, role: str = "user"):
+    records = store.query(user_id, group_id, role)
     return {
         "status": "ok",
         "records": records,
-        "summary": visible.summary(None),
+        "summary": store.load().summary(user_id if role != "owner" else None),
     }
 
 

active-runtime/app/agent_observability_hooks.py

@@ -14,11 +14,6 @@ from uuid import uuid4
 
 from .agent_observability import AgentExecutionRecord
 from .agent_observability_store import AgentObservabilityStore
-from .trace_tool_credential_governance import (
-    GovernanceActor,
-    TraceContext,
-    authorize_scope,
-)
 
 
 def utc_now() -> str:
@@ -41,7 +36,6 @@ class AgentRunContext:
     input_tokens: int = 0
     output_tokens: int = 0
     status: str = "running"
-    trace: TraceContext | None = None
 
     def delegate(self, agent_name: str) -> None:
         if agent_name not in self.path:
@@ -65,19 +59,7 @@ class AgentObservabilityHooks:
         visible_scope: str,
         entry_agent: str,
         execution_id: str | None = None,
-        *,
-        actor: GovernanceActor | dict[str, Any] | None = None,
-        trace: TraceContext | None = None,
     ) -> dict[str, Any]:
-        if execution_id is not None and execution_id in self.active:
-            raise RuntimeError("OBSERVABILITY_EXECUTION_CONFLICT")
-        if trace is not None:
-            if actor is None:
-                raise RuntimeError("TRACE_ACTOR_CONTEXT_REQUIRED")
-            trusted_actor = GovernanceActor.from_value(actor)
-            authorize_scope(trusted_actor, trace.scope)
-            if trace.scope.user_id is not None and trace.scope.user_id != user_id:
-                raise RuntimeError("TRACE_SCOPE_MISMATCH_DENY:user_id")
         run = AgentRunContext(
             execution_id=execution_id or f"exec_{uuid4().hex[:12]}",
             user_id=user_id,
@@ -85,7 +67,6 @@ class AgentObservabilityHooks:
             entry_agent=entry_agent,
             path=[entry_agent],
             used_hermes=entry_agent.lower() == "hermes",
-            trace=trace,
         )
         self.active[run.execution_id] = run
         return {"status": "started", "execution_id": run.execution_id, "run": run.__dict__}
@@ -125,18 +106,6 @@ class AgentObservabilityHooks:
             status=status,
             started_at=run.started_at,
             ended_at=ended_at,
-            trace_id=run.trace.trace_id if run.trace else None,
-            span_id=run.trace.span_id if run.trace else None,
-            parent_span_id=run.trace.parent_span_id if run.trace else None,
-            correlation_id=run.trace.correlation_id if run.trace else None,
-            causation_id=run.trace.causation_id if run.trace else None,
-            tenant_id=run.trace.scope.tenant_id if run.trace else None,
-            project_id=run.trace.scope.project_id if run.trace else None,
-            conversation_id=run.trace.scope.conversation_id if run.trace else None,
-            task_id=run.trace.task_id if run.trace else None,
-            claim_id=run.trace.claim_id if run.trace else None,
-            run_id=run.trace.scope.run_id if run.trace else None,
-            message_id=run.trace.message_id if run.trace else None,
         )
         return {"status": "stored", "record": self.store.append(record)}
 

active-runtime/app/agent_observability_store.py

@@ -12,12 +12,6 @@ from pathlib import Path
 from typing import Any
 
 from .agent_observability import AgentExecutionRecord, AgentObservability
-from .trace_tool_credential_governance import (
-    GovernanceActor,
-    GovernanceError,
-    GovernanceScope,
-    authorize_scope,
-)
 
 
 class AgentObservabilityStore:
@@ -29,11 +23,6 @@ class AgentObservabilityStore:
     def append(self, record: AgentExecutionRecord) -> dict[str, Any]:
         path = self.records_dir / f"{record.execution_id}.json"
         data = record.to_dict()
-        if path.exists():
-            existing = json.loads(path.read_text(encoding="utf-8"))
-            if existing == data:
-                return existing
-            raise RuntimeError("OBSERVABILITY_EXECUTION_CONFLICT")
         path.write_text(json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8")
         return data
 
@@ -44,36 +33,8 @@ class AgentObservabilityStore:
             observability.records.append(AgentExecutionRecord(**raw))
         return observability
 
-    def query(self, user_id: str | None = None, group_id: str | None = None, role: str = "user", *, actor: GovernanceActor | dict[str, Any] | None = None) -> list[dict[str, Any]]:
+    def query(self, user_id: str | None = None, group_id: str | None = None, role: str = "user") -> list[dict[str, Any]]:
         records = [record.to_dict() for record in self.load().records]
-        scoped = [record for record in records if record.get("tenant_id") is not None]
-        legacy = [record for record in records if record.get("tenant_id") is None]
-        if actor is not None:
-            trusted = GovernanceActor.from_value(actor)
-            visible: list[dict[str, Any]] = []
-            for record in scoped:
-                try:
-                    authorize_scope(
-                        trusted,
-                        GovernanceScope(
-                            "tenant",
-                            tenant_id=record.get("tenant_id"),
-                            user_id=record.get("user_id"),
-                            project_id=record.get("project_id"),
-                            conversation_id=record.get("conversation_id"),
-                            run_id=record.get("run_id"),
-                        ),
-                    )
-                except GovernanceError:
-                    continue
-                visible.append(record)
-            if trusted.privileged:
-                visible.extend(legacy)
-            else:
-                visible.extend(record for record in legacy if record.get("user_id") == trusted.scope.user_id)
-            return visible
-        # Caller-supplied role remains a legacy compatibility path only.
-        records = legacy
         if role == "owner":
             return records
         if role == "group_admin" and group_id:

active-runtime/app/aios_chatgpt_bridge_v2.py

@@ -12,6 +12,8 @@ BRIDGE_OPERATIONS = (
     "getRuntimeStatus",
     "getGovernedWriteCapabilities",
     "createGovernedTask",
+    "projectOnlineAgentExecution",
+    "registerOnlineAgentExecutionPlan",
     "acquireWriterLease",
     "bootstrapWriterLease",
     "renewWriterLease",
@@ -32,6 +34,11 @@ BRIDGE_OPERATIONS = (
 
 OPERATION_REQUIRED_FIELDS = {
     "createGovernedTask": ("task_id", "repository", "base_oid", "target_branch", "risk", "description", "idempotency_key"),
+    "projectOnlineAgentExecution": ("task_id",),
+    "registerOnlineAgentExecutionPlan": (
+        "schema", "task_id", "job_id", "source_head_oid", "generation",
+        "idempotency_key", "execution",
+    ),
     "acquireWriterLease": ("schema", "task_id", "repository", "branch_mode", "base_oid", "expected_branch_oid", "target_branch", "generation", "lease_seconds"),
     "bootstrapWriterLease": ("schema", "task_id", "repository", "branch_mode", "base_oid", "expected_branch_oid", "target_branch", "generation", "lease_seconds"),
     "renewWriterLease": ("schema", "task_id", "repository", "branch_mode", "base_oid", "expected_branch_oid", "target_branch", "generation", "lease_seconds"),
@@ -51,6 +58,25 @@ OPERATION_REQUIRED_FIELDS = {
 }
 
 BRIDGE_OPERATION_CONTRACTS = {
+    "projectOnlineAgentExecution": {
+        "method": "POST",
+        "path": "/v2/execution-envelope",
+        "required_fields": OPERATION_REQUIRED_FIELDS["projectOnlineAgentExecution"],
+        "response_fields": (
+            "schema", "task_id", "job_id", "repository", "base_oid",
+            "expected_branch_oid", "target_branch", "branch_mode", "generation",
+            "idempotency_key", "action", "execution_digest",
+        ),
+    },
+    "registerOnlineAgentExecutionPlan": {
+        "method": "POST",
+        "path": "/v2/execution-plan",
+        "required_fields": OPERATION_REQUIRED_FIELDS["registerOnlineAgentExecutionPlan"],
+        "response_fields": (
+            "schema", "task_id", "job_id", "source_head_oid", "generation",
+            "idempotency_key", "plan_digest", "execution", "execution_digest",
+        ),
+    },
     "acquireWriterLease": {
         "method": "POST",
         "path": "/v2/writer-lease",
@@ -205,6 +231,8 @@ class BridgeV2Adapter:
         return handler(dict(request))
 
     def createGovernedTask(self, request: Mapping[str, Any]) -> Any: return self._call("createGovernedTask", request)
+    def projectOnlineAgentExecution(self, request: Mapping[str, Any]) -> Any: return self._call("projectOnlineAgentExecution", request)
+    def registerOnlineAgentExecutionPlan(self, request: Mapping[str, Any]) -> Any: return self._call("registerOnlineAgentExecutionPlan", request)
     def acquireWriterLease(self, request: Mapping[str, Any]) -> Any: return self._call("acquireWriterLease", request)
     def bootstrapWriterLease(self, request: Mapping[str, Any]) -> Any: return self._call("bootstrapWriterLease", request)
     def renewWriterLease(self, request: Mapping[str, Any]) -> Any: return self._call("renewWriterLease", request)

active-runtime/app/aios_chatgpt_bridge_v2_server.py

@@ -1,9 +1,10 @@
 """Loopback-only governed Bridge v2 HTTP gateway with durable handlers."""
 from __future__ import annotations
 
-from dataclasses import dataclass, replace
+from dataclasses import asdict, dataclass, replace
 from datetime import datetime, timedelta, timezone
 import base64
+import hmac
 import json
 import os
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
@@ -12,6 +13,8 @@ import re
 import sqlite3
 import threading
 from typing import Any, Mapping
+import urllib.error
+import urllib.request
 
 from aios_authority_git_executor import AuthorityGitExecutor
 from aios_chatgpt_bridge_v2 import BridgeV2Adapter, BridgeV2Error, OPERATION_REQUIRED_FIELDS
@@ -19,7 +22,9 @@ from aios_continuation_executor import AuthorityGitAdapter, ContinuationCommit,
 from aios_continuation_lease import WriterLeaseRequestV2
 from aios_control_plane_snapshot import build_control_plane_snapshot
 from aios_gitops_job_controller import GitOpsJobController, JobError, JobState, JobStore
-from aios_governed_task_bootstrap import BootstrapError, GovernedTaskBootstrap
+from aios_governed_task_bootstrap import BootstrapError, GovernedTaskBinding, GovernedTaskBootstrap, _legacy_safe, _task_key
+from aios_online_agent_execution import ExecutionProjectionError, OnlineTaskProjectionClient
+from aios_online_agent_plan_store import ExecutionPlanError, ExecutionPlanStore
 from governed_production_release import build_executor_config
 
 MAX_BODY = 2 * 1024 * 1024
@@ -27,6 +32,8 @@ ROUTES = {
     "/v2/runtime": "getRuntimeStatus",
     "/v2/capabilities": "getGovernedWriteCapabilities",
     "/v2/governed-task": "createGovernedTask",
+    "/v2/execution-envelope": "projectOnlineAgentExecution",
+    "/v2/execution-plan": "registerOnlineAgentExecutionPlan",
     "/v2/writer-lease": "acquireWriterLease",
     "/v2/writer-lease/bootstrap": "bootstrapWriterLease",
     "/v2/writer-lease/renew": "renewWriterLease",
@@ -62,6 +69,9 @@ class RuntimeConfig:
     registry_root: Path = Path("/var/lib/aios-gitops/runtime/registry-projection")
     baseline_path: Path = Path("/var/lib/aios-gitops-runtime-anchor/baseline/current.json")
     health_url: str = "http://127.0.0.1:18927/health"
+    agent_task_api_url: str = "http://127.0.0.1:18940"
+    agent_task_control_token_path: Path = Path("/run/credentials/aios-chatgpt-bridge-v2-staging.service/agent_task_control_token")
+    online_task_projection_enabled: bool = False
 
 
 def _safe(value: str) -> str:
@@ -74,6 +84,16 @@ class GovernedRuntime:
         config.state_root.mkdir(parents=True, exist_ok=True)
         self.authority = AuthorityGitExecutor(config.authoritative_git_dir, config.state_root / "worktrees")
         self.bootstrap = GovernedTaskBootstrap(self.authority, config.state_root, remote_name=config.remote_name, token_path=config.token_path, ssh_key_path=config.ssh_key_path, api_base=config.api_base)
+        self.online_task_projector = (
+            OnlineTaskProjectionClient(config.agent_task_api_url, config.agent_task_control_token_path)
+            if config.online_task_projection_enabled
+            else None
+        )
+        self.projection_outbox_root = config.state_root / "online-task-projection-outbox"
+        self.projection_outbox_root.mkdir(parents=True, exist_ok=True)
+        self.execution_plan_store = ExecutionPlanStore(config.state_root / "online-agent-execution-plans")
+        self._projection_locks_guard = threading.Lock()
+        self._projection_locks: dict[str, threading.RLock] = {}
         self.runtimes: dict[tuple[str, int], tuple[Any, GitOpsJobController, ContinuationExecutor]] = {}
         self.controllers: dict[str, GitOpsJobController] = {}
         self._recovery_lock = threading.RLock()
@@ -93,6 +113,54 @@ class GovernedRuntime:
             askpass.write_text('#!/bin/sh\ncase "$1" in *Username*) printf "%s\\n" "$GITEA_MACHINE_ACTOR" ;; *) cat "$CREDENTIAL_FILE" ;; esac\n', encoding="utf-8")
             askpass.chmod(0o700)
         os.environ.setdefault("GIT_ASKPASS", str(askpass)); os.environ.setdefault("GIT_ASKPASS_REQUIRE", "force"); os.environ.setdefault("GIT_TERMINAL_PROMPT", "0"); os.environ.setdefault("GITEA_MACHINE_ACTOR", "aios-autonomy-agent")
+        if self.online_task_projector is not None:
+            threading.Thread(target=self._projection_reconciler, name="online-task-projection-reconciler", daemon=True).start()
+
+    def _projection_lock(self, task_id: str) -> threading.RLock:
+        guard = getattr(self, "_projection_locks_guard", None)
+        if guard is None:
+            guard = threading.Lock()
+            self._projection_locks_guard = guard
+            self._projection_locks = {}
+        with guard:
+            return self._projection_locks.setdefault(task_id, threading.RLock())
+
+    def _projection_outbox_path(self, task_id: str) -> Path:
+        return self.projection_outbox_root / (_task_key(task_id) + ".json")
+
+    def _write_projection_outbox(self, task_id: str, projection: Mapping[str, Any], binding: Any) -> Path:
+        path = self._projection_outbox_path(task_id)
+        temporary = path.with_name(path.name + f".{os.getpid()}.{threading.get_ident()}.tmp")
+        temporary.write_text(json.dumps({"task": dict(projection), "binding": asdict(binding)}, sort_keys=True, separators=(",", ":")), encoding="utf-8")
+        temporary.replace(path)
+        return path
+
+    def _deliver_projection_outbox(self, path: Path) -> dict[str, Any]:
+        value = json.loads(path.read_text(encoding="utf-8"))
+        if not isinstance(value, Mapping) or not isinstance(value.get("task"), Mapping) or not isinstance(value.get("binding"), Mapping):
+            raise RuntimeError("ONLINE_TASK_PROJECTION_OUTBOX_INVALID")
+        binding = self.bootstrap.execution_binding(GovernedTaskBinding(**dict(value["binding"])))
+        if self.online_task_projector is None:
+            raise RuntimeError("ONLINE_TASK_PROJECTION_CONTROL_UNAVAILABLE")
+        created = self.online_task_projector.create(dict(value["task"]), binding=binding)
+        path.unlink(missing_ok=True)
+        return created
+
+    def _projection_reconciler(self) -> None:
+        while True:
+            for path in sorted(self.projection_outbox_root.glob("*.json")):
+                try:
+                    value = json.loads(path.read_text(encoding="utf-8"))
+                    binding = value.get("binding") if isinstance(value, Mapping) else None
+                    task_id = str(binding.get("task_id") or "") if isinstance(binding, Mapping) else ""
+                    if not task_id:
+                        continue
+                    with self._projection_lock(task_id):
+                        if path.exists():
+                            self._deliver_projection_outbox(path)
+                except Exception:
+                    continue
+            threading.Event().wait(5)
 
     def runtime_status(self) -> dict[str, Any]:
         return {
@@ -113,7 +181,10 @@ class GovernedRuntime:
         }
 
     def _job_root(self, task_id: str) -> Path:
-        return self.config.state_root / "jobs" / _safe(task_id)
+        parent = self.config.state_root / "jobs"
+        keyed = parent / _task_key(task_id)
+        legacy = parent / _legacy_safe(task_id)
+        return keyed if keyed.exists() or not legacy.exists() else legacy
 
     def _build_runtime(
         self,
@@ -443,7 +514,77 @@ class GovernedRuntime:
         return result
 
     def create_task(self, request: Mapping[str, Any]) -> dict[str, Any]:
-        result = self.bootstrap.create(request); self.bindings[result["task_id"]] = result; return result
+        online_request = request.get("online_task")
+        if online_request is not None and not isinstance(online_request, Mapping):
+            raise ValueError("ONLINE_TASK_REQUEST_INVALID")
+        execution_request = request.get("execution")
+        if execution_request is not None and not isinstance(execution_request, Mapping):
+            raise ValueError("EXECUTION_REQUEST_INVALID")
+        online_task_projector = getattr(self, "online_task_projector", None)
+        projection_required = online_request is not None or execution_request is not None or request.get("require_online_task_projection") is True
+        if online_task_projector is None and projection_required:
+            raise RuntimeError("ONLINE_TASK_PROJECTION_CONTROL_UNAVAILABLE")
+        result = self.bootstrap.create(request)
+        self.bindings[result["task_id"]] = result
+        if online_task_projector is None:
+            return result
+        online = dict(online_request or {})
+        online.setdefault("goal", str(request.get("description") or "Governed engineering task"))
+        online.setdefault("instructions", "Execute only the exact governed binding and return server-verifiable evidence.")
+        online.setdefault("success_criteria", [{"id": "governed", "description": "Complete the exact governed task lifecycle."}])
+        online.setdefault("required_capabilities", ["git.read", "git.test", "governed.write.branch", "governed.write.file"])
+        online.setdefault("priority", int(request.get("priority") or 0))
+        online.setdefault("max_attempts", int(request.get("max_attempts") or 10))
+        projection = self.bootstrap.online_task_projection(
+            result["task_id"],
+            online,
+            execution_request,
+            expected_job_id=str(result.get("job_id") or "") or None,
+        )
+        durable_binding = self.bootstrap.get_binding(result["task_id"])
+        with self._projection_lock(result["task_id"]):
+            path = self._write_projection_outbox(result["task_id"], projection, durable_binding)
+            created = self._deliver_projection_outbox(path)
+        return {
+            **result,
+            "online_task_projection": {
+                "status": "PROJECTED",
+                "task_id": created["task_id"],
+                "job_id": result["job_id"],
+                "task_status": created["status"],
+                "execution_digest": projection["metadata"]["execution"]["execution_digest"],
+            },
+        }
+
+    def project_online_agent_execution(self, request: Mapping[str, Any]) -> dict[str, Any]:
+        capabilities = request.get("required_capabilities") or []
+        if not isinstance(capabilities, list) or not all(isinstance(item, str) for item in capabilities):
+            raise ValueError("CAPABILITY_SCOPE_INVALID")
+        execution = request.get("execution")
+        if execution is not None and not isinstance(execution, Mapping):
+            raise ValueError("EXECUTION_REQUEST_INVALID")
+        task_id = str(request["task_id"])
+        durable = self.bootstrap.get_binding(task_id)
+        binding = self.bootstrap.execution_binding(durable)
+        expected_job_id = str(request.get("job_id") or "") or None
+        if expected_job_id and expected_job_id != binding.job_id:
+            raise BootstrapError("JOB_BINDING_CONFLICT")
+        if execution is None:
+            planned = self.execution_plan_store.resolve(binding)
+            if planned is not None:
+                execution = planned["execution"]
+        return self.bootstrap.execution_envelope(
+            task_id,
+            execution,
+            required_capabilities=tuple(capabilities),
+            expected_job_id=expected_job_id,
+        )
+
+    def register_online_agent_execution_plan(self, request: Mapping[str, Any]) -> dict[str, Any]:
+        task_id = str(request["task_id"])
+        durable = self.bootstrap.get_binding(task_id)
+        binding = self.bootstrap.execution_binding(durable)
+        return self.execution_plan_store.register(binding, request)
 
     def acquire_lease(self, request: Mapping[str, Any]) -> dict[str, Any]:
         binding, controller, _ = self._runtime(request)
@@ -1340,7 +1481,19 @@ class GovernedRuntime:
         controller = self._controller_for_job(job_id)
         row = controller.store.read(job_id)
         if action == "get":
-            return controller.store._receipt(row, duplicate=True).as_dict()
+            response = controller.store._receipt(row, duplicate=True).as_dict()
+            try:
+                with controller.store._connect() as connection:
+                    connection.row_factory = sqlite3.Row
+                    leases = connection.execute(
+                        "SELECT lease_id,job_id,branch,lineage_anchor_oid,current_head_oid,generation,"
+                        "lease_expires_at,state,revision FROM branch_leases WHERE job_id=? ORDER BY revision DESC",
+                        (job_id,),
+                    ).fetchall()
+            except sqlite3.Error as exc:
+                raise RuntimeError("JOB_DB_UNAVAILABLE") from exc
+            response["branch_leases"] = [dict(item) for item in leases]
+            return response
         if action == "resume":
             return controller.resume(job_id).as_dict()
         return self._executor_from_row(row, controller).reconcile(job_id)
@@ -1405,6 +1558,8 @@ class GovernedRuntime:
     def handlers(self) -> dict[str, Any]:
         return {
             "createGovernedTask": self.create_task,
+            "projectOnlineAgentExecution": self.project_online_agent_execution,
+            "registerOnlineAgentExecutionPlan": self.register_online_agent_execution_plan,
             "acquireWriterLease": self.acquire_lease,
             "bootstrapWriterLease": self.bootstrap_writer_lease,
             "renewWriterLease": self.renew_writer_lease,
@@ -1434,6 +1589,8 @@ class _HTTPError(RuntimeError): pass
 
 class BridgeHandler(BaseHTTPRequestHandler):
     adapter: BridgeV2Adapter | None = None
+    control_token: str | None = None
+    agent_task_api_url: str = "http://127.0.0.1:18940"
     def log_message(self, *_args: Any) -> None: return
     def _json(self, value: Any, status: int = 200) -> None:
         raw = json.dumps(value, sort_keys=True, separators=(",", ":")).encode(); self.send_response(status); self.send_header("Content-Type", "application/json"); self.send_header("Content-Length", str(len(raw))); self.end_headers(); self.wfile.write(raw)
@@ -1451,7 +1608,50 @@ class BridgeHandler(BaseHTTPRequestHandler):
         allowed = set(OPERATION_REQUIRED_FIELDS[operation]) | {"schema", "job_id", "lease_seconds", "create_target_branch", "worktree_mode", "cas_ref_update_required", "expected_branch_oid", "generation", "branch_mode"}
         if operation == "commitFilesGoverned": allowed.add("files")
         allowed.update({"owner_approval", "execute"})
+        if operation == "projectOnlineAgentExecution":
+            allowed.update({"execution", "required_capabilities"})
+        if operation == "registerOnlineAgentExecutionPlan":
+            allowed.update({"execution", "source_head_oid", "expected_previous_plan_digest"})
+        if operation == "createGovernedTask":
+            allowed.update({"online_task", "execution", "require_online_task_projection", "priority", "max_attempts", "parent_task_id", "parent_job_id"})
         if set(body) - allowed: raise _HTTPError("UNKNOWN_FIELDS")
+    def _authorized(self, operation: str, body: Mapping[str, Any]) -> bool:
+        header = self.headers.get("Authorization", "")
+        if not header.startswith("Bearer "):
+            return False
+        supplied = header[7:]
+        if self.control_token and hmac.compare_digest(supplied, self.control_token):
+            return True
+        poll = urllib.request.Request(
+            self.agent_task_api_url.rstrip("/") + "/v1/tasks/poll",
+            method="POST",
+            data=b'{"limit":1}',
+            headers={"Authorization": header, "Content-Type": "application/json", "Accept": "application/json"},
+        )
+        try:
+            with urllib.request.urlopen(poll, timeout=5) as response:
+                principal = json.loads(response.read().decode("utf-8"))
+        except (OSError, urllib.error.URLError, urllib.error.HTTPError, ValueError):
+            return False
+        agent_id = str(principal.get("agent_id") or "") if isinstance(principal, Mapping) else ""
+        if not agent_id:
+            return False
+        claim_bound = {"acquireWriterLease", "bootstrapWriterLease", "renewWriterLease", "commitFileGoverned", "commitFilesGoverned"}
+        if operation not in claim_bound:
+            return operation in {"projectOnlineAgentExecution", "getGitOpsJob"}
+        task_id = str(body.get("task_id") or "")
+        if not task_id:
+            return False
+        task_request = urllib.request.Request(
+            self.agent_task_api_url.rstrip("/") + "/v1/tasks/" + task_id,
+            headers={"Authorization": header, "Accept": "application/json"},
+        )
+        try:
+            with urllib.request.urlopen(task_request, timeout=5) as response:
+                task = json.loads(response.read().decode("utf-8"))
+        except (OSError, urllib.error.URLError, urllib.error.HTTPError, ValueError):
+            return False
+        return isinstance(task, Mapping) and task.get("task_id") == task_id and task.get("claimed_by") == agent_id and task.get("status") in {"CLAIMED", "RUNNING"}
     def do_GET(self) -> None:
         if self.adapter is None: self._json({"error": "RUNTIME_UNAVAILABLE"}, 503); return
         if self.path == "/v2/runtime": self._json(self.adapter.getRuntimeStatus()); return
@@ -1462,14 +1662,23 @@ class BridgeHandler(BaseHTTPRequestHandler):
         operation = ROUTES.get(self.path)
         if operation is None or operation in ("getRuntimeStatus", "getGovernedWriteCapabilities") or self.adapter is None: self._json({"error": "NOT_FOUND"}, 404); return
         try:
-            body = self._body(); self._allowed(operation, body); self._json(getattr(self.adapter, operation)(body))
+            body = self._body()
+        except _HTTPError as exc: self._json({"error": str(exc)}, 413 if str(exc) == "REQUEST_TOO_LARGE" else 400); return
+        if not self._authorized(operation, body): self._json({"error": "BRIDGE_CALLER_UNAUTHORIZED"}, 401); return
+        try:
+            self._allowed(operation, body); self._json(getattr(self.adapter, operation)(body))
         except _HTTPError as exc: self._json({"error": str(exc)}, 413 if str(exc) == "REQUEST_TOO_LARGE" else 400)
-        except (BootstrapError, ValueError, BridgeV2Error) as exc: self._json({"error": str(exc)}, 409 if "CONFLICT" in str(exc) else 400)
+        except (BootstrapError, ExecutionProjectionError, ExecutionPlanError, ValueError, BridgeV2Error) as exc: self._json({"error": str(exc)}, 409 if any(token in str(exc) for token in ("CONFLICT", "DRIFT", "CAS")) else 400)
         except Exception as exc: self._json({"error": str(exc) or type(exc).__name__}, 409 if any(token in str(exc) for token in ("CONFLICT", "EXPECTATION", "MONOTONIC")) else 503)
 
 
-def serve(adapter: BridgeV2Adapter, host: str = "127.0.0.1", port: int = 18892) -> None:
-    BridgeHandler.adapter = adapter; ThreadingHTTPServer((host, port), BridgeHandler).serve_forever()
+def serve(adapter: BridgeV2Adapter, host: str = "127.0.0.1", port: int = 18892, *, control_token_path: Path, agent_task_api_url: str) -> None:
+    if not control_token_path.is_file() or control_token_path.is_symlink():
+        raise RuntimeError("BRIDGE_CONTROL_CREDENTIAL_UNAVAILABLE")
+    control_token = control_token_path.read_text(encoding="utf-8").strip()
+    if len(control_token) < 32:
+        raise RuntimeError("BRIDGE_CONTROL_CREDENTIAL_INVALID")
+    BridgeHandler.adapter = adapter; BridgeHandler.control_token = control_token; BridgeHandler.agent_task_api_url = agent_task_api_url; ThreadingHTTPServer((host, port), BridgeHandler).serve_forever()
 
 
 def main() -> None:
@@ -1488,11 +1697,21 @@ def main() -> None:
         remote_name=os.environ.get("AIOS_GITEA_REMOTE", "gitea-http"),
         api_base=os.environ.get("AIOS_GITEA_API_BASE", "https://g.cnnetmkt.top/git/api/v1"),
         target_version=os.environ.get("AIOS_CONTROL_PLANE_TARGET_VERSION", "V2R2C1"),
+        agent_task_api_url=os.environ.get("AIOS_AGENT_TASK_API_URL", "http://127.0.0.1:18940"),
+        agent_task_control_token_path=Path(
+            os.environ.get(
+                "AIOS_AGENT_TASK_CONTROL_TOKEN_FILE",
+                str(Path(os.environ.get("CREDENTIALS_DIRECTORY", "/run/credentials/aios-chatgpt-bridge-v2-staging.service")) / "agent_task_control_token"),
+            )
+        ),
+        online_task_projection_enabled=os.environ.get("AIOS_ONLINE_TASK_PROJECTION_ENABLED", "1") == "1",
     )
     runtime = GovernedRuntime(config)
     serve(
         BridgeV2Adapter(runtime_status=runtime.runtime_status(), handlers=runtime.handlers()),
         port=int(os.environ.get("AIOS_BRIDGE_V2_PORT", "18892")),
+        control_token_path=config.agent_task_control_token_path,
+        agent_task_api_url=config.agent_task_api_url,
     )
 
 

active-runtime/app/aios_continuation_executor.py

@@ -157,7 +157,7 @@ class DetachedGitWorkspace:
     def materialize_files(self, files: Mapping[str, bytes]) -> None:
         dirty = self._dirty_paths()
         expected_paths = set(files)
-        if dirty and dirty != expected_paths:
+        if dirty and not dirty.issubset(expected_paths):
             raise ContinuationExecutionError("WORKTREE_DIRTY_SCOPE_MISMATCH")
         for relative, content in files.items():
             target = (self.path / relative).resolve()
@@ -499,7 +499,19 @@ class ContinuationExecutor:
         current = self.controller.store.read(binding.job_id)
         current_state = JobState(current["state"])
         if current_state == JobState.COMPLETED:
-            return self.controller.store._receipt(current, duplicate=True).as_dict()
+            cycle = self.controller.begin_continuation_cycle(
+                binding.job_id,
+                idempotency_key=commit.idempotency_key,
+                expected_head_oid=binding.request.expected_branch_oid,
+                generation=binding.request.generation,
+                expected_revision=int(current["revision"]),
+            )
+            if cycle.get("completed"):
+                return self.controller.store._receipt(
+                    self.controller.store.read(binding.job_id), duplicate=True
+                ).as_dict()
+            current = self.controller.store.read(binding.job_id)
+            current_state = JobState(current["state"])
         if current_state == JobState.REMOTE_VERIFIED:
             receipt = json.loads(str(current["receipt_json"] or "{}"))
             commit_oid = str(receipt.get("authority_oid") or "")
@@ -507,12 +519,18 @@ class ContinuationExecutor:
                 raise ContinuationExecutionError("GOVERNED_COMMIT_OID_INVALID")
             if before_complete is not None:
                 before_complete(commit_oid)
-            return self.controller.advance(
+            result = self.controller.advance(
                 binding.job_id,
                 JobState.COMPLETED,
                 side_effect_state="REMOTE_VERIFIED",
                 receipt=receipt,
             ).as_dict()
+            self.controller.complete_continuation_cycle(
+                binding.job_id,
+                idempotency_key=commit.idempotency_key,
+                commit_oid=commit_oid,
+            )
+            return result
         self._validate_preflight(binding, job_id=binding.job_id)
         request = binding.request
         projected = False
@@ -576,12 +594,19 @@ class ContinuationExecutor:
                     self.remote.push_exact(request.target_branch, request.expected_branch_oid, new_oid)
             except Exception:
                 return self._remote_pending(binding.job_id, authority_oid, new_oid)
-            return self._finish_remote_verification(
+            result = self._finish_remote_verification(
                 binding.job_id,
                 authority_oid,
                 new_oid,
                 before_complete=before_complete,
             )
+            if str(result.get("state") or "") == JobState.COMPLETED.value:
+                self.controller.complete_continuation_cycle(
+                    binding.job_id,
+                    idempotency_key=commit.idempotency_key,
+                    commit_oid=new_oid,
+                )
+            return result
         finally:
             if projected:
                 self.credential.revoke()

active-runtime/app/aios_credential_broker.py

@@ -6,7 +6,6 @@ from datetime import datetime, timedelta, timezone
 import os
 from pathlib import Path
 import secrets
-import re
 from typing import Any, Callable, Mapping
 
 
@@ -22,14 +21,9 @@ class CredentialLease:
     scopes: tuple[str, ...]
     provider: str
     state: str = "ACTIVE"
-    scope_type: str = "system"
-    tenant_id: str | None = None
-    user_id: str | None = None
-    project_id: str | None = None
-    run_id: str | None = None
 
     def as_dict(self) -> dict[str, Any]:
-        return {"lease_id": self.lease_id, "task_id": self.task_id, "repository": self.repository, "target_branch": self.target_branch, "generation": self.generation, "issued_at": self.issued_at, "expires_at": self.expires_at, "scopes": list(self.scopes), "provider": self.provider, "state": self.state, "scope_type": self.scope_type, "tenant_id": self.tenant_id, "user_id": self.user_id, "project_id": self.project_id, "run_id": self.run_id}
+        return {"lease_id": self.lease_id, "task_id": self.task_id, "repository": self.repository, "target_branch": self.target_branch, "generation": self.generation, "issued_at": self.issued_at, "expires_at": self.expires_at, "scopes": list(self.scopes), "provider": self.provider, "state": self.state}
 
 
 class FileCredentialProvider:
@@ -49,19 +43,11 @@ class CredentialBroker:
         self.now = now or (lambda: datetime.now(timezone.utc))
         self._leases: dict[str, CredentialLease] = {}
 
-    def issue(self, *, task_id: str, repository: str, target_branch: str, generation: int, scopes: tuple[str, ...] = ("git:push", "gitea:read"), lease_seconds: int = 900, scope_type: str = "system", tenant_id: str | None = None, user_id: str | None = None, project_id: str | None = None, run_id: str | None = None) -> dict[str, Any]:
+    def issue(self, *, task_id: str, repository: str, target_branch: str, generation: int, scopes: tuple[str, ...] = ("git:push", "gitea:read"), lease_seconds: int = 900) -> dict[str, Any]:
         if repository != "aios/aios" or not target_branch.startswith("agent/") or generation < 1 or not 1 <= lease_seconds <= 86400:
             raise ValueError("CREDENTIAL_LEASE_BINDING_INVALID")
-        if scope_type == "tenant":
-            if not tenant_id:
-                raise ValueError("CREDENTIAL_SCOPE_DENY")
-        elif scope_type in {"system", "global"}:
-            if any((tenant_id, user_id, project_id, run_id)):
-                raise ValueError("CREDENTIAL_SCOPE_DENY")
-        else:
-            raise ValueError("CREDENTIAL_SCOPE_DENY")
         now = self.now().astimezone(timezone.utc)
-        lease = CredentialLease("lease-" + secrets.token_hex(16), task_id, repository, target_branch, generation, now.isoformat(), (now + timedelta(seconds=lease_seconds)).isoformat(), tuple(scopes), type(self.provider).__name__, "ACTIVE", scope_type, tenant_id, user_id, project_id, run_id)
+        lease = CredentialLease("lease-" + secrets.token_hex(16), task_id, repository, target_branch, generation, now.isoformat(), (now + timedelta(seconds=lease_seconds)).isoformat(), tuple(scopes), type(self.provider).__name__)
         self._leases[lease.lease_id] = lease
         return lease.as_dict()
 
@@ -78,39 +64,7 @@ class CredentialBroker:
         lease = self._get(lease_id)
         if lease.state != "ACTIVE":
             raise RuntimeError("CREDENTIAL_LEASE_NOT_ACTIVE")
-        environment = self.provider.environment(lease)
-        for key, value in environment.items():
-            upper = str(key).upper()
-            if not isinstance(value, str):
-                raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-            sensitive = any(marker in upper for marker in ("CREDENTIAL", "TOKEN", "SECRET", "PASSWORD", "PRIVATE_KEY", "API_KEY"))
-            if re.search(r"(?i)bearer\s+\S+|(?:token|secret|password|api[_-]?key)\s*[:=]", value):
-                raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-            if sensitive and upper.endswith("_FILE"):
-                candidate = Path(value)
-                credential_root = Path("/run/credentials")
-                try:
-                    resolved = candidate.resolve(strict=False)
-                except OSError as exc:
-                    raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY") from exc
-                if not candidate.is_absolute() or not (resolved == credential_root or credential_root in resolved.parents):
-                    raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-            elif sensitive and upper.endswith("_REFERENCE"):
-                if re.fullmatch(r"(?:systemd-credential|vault|secret-manager):[A-Za-z0-9][A-Za-z0-9._:/#-]{0,255}", value) is None:
-                    raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-            elif sensitive:
-                raise RuntimeError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-        return environment
-
-    def authorize(self, lease_id: str, *, task_id: str, operation: str, scope_type: str = "system", tenant_id: str | None = None, user_id: str | None = None, project_id: str | None = None, run_id: str | None = None) -> Mapping[str, str]:
-        lease = self._get(lease_id)
-        if lease.state != "ACTIVE" or lease.task_id != task_id or operation not in lease.scopes:
-            raise RuntimeError("CREDENTIAL_SCOPE_DENY")
-        requested = (scope_type, tenant_id, user_id, project_id, run_id)
-        actual = (lease.scope_type, lease.tenant_id, lease.user_id, lease.project_id, lease.run_id)
-        if requested != actual:
-            raise RuntimeError("CREDENTIAL_SCOPE_DENY")
-        return self.environment(lease_id)
+        return self.provider.environment(lease)
 
     def status(self, lease_id: str) -> dict[str, Any]:
         return self._get(lease_id).as_dict()

active-runtime/app/aios_gitops_job_controller.py

@@ -230,7 +230,15 @@ class JobStore:
                       kind TEXT NOT NULL, digest TEXT NOT NULL, payload_json TEXT NOT NULL,
                       created_at TEXT NOT NULL, FOREIGN KEY(job_id) REFERENCES jobs(job_id)
                     );
-                    INSERT OR REPLACE INTO metadata(key, value) VALUES('schema_version', '1');
+                    CREATE TABLE IF NOT EXISTS continuation_cycles (
+                      job_id TEXT NOT NULL, idempotency_key TEXT NOT NULL,
+                      sequence INTEGER NOT NULL, expected_head_oid TEXT NOT NULL,
+                      generation INTEGER NOT NULL, state TEXT NOT NULL,
+                      commit_oid TEXT, created_at TEXT NOT NULL, updated_at TEXT NOT NULL,
+                      PRIMARY KEY(job_id,idempotency_key), UNIQUE(job_id,sequence),
+                      FOREIGN KEY(job_id) REFERENCES jobs(job_id)
+                    );
+                    INSERT OR REPLACE INTO metadata(key, value) VALUES('schema_version', '2');
                     """
                 )
         except sqlite3.Error as exc:
@@ -531,6 +539,183 @@ class GitOpsJobController:
         except sqlite3.Error as exc:
             raise ServiceUnavailable("JOB_DB_UNAVAILABLE") from exc
 
+    def begin_continuation_cycle(
+        self,
+        job_id: str,
+        *,
+        idempotency_key: str,
+        expected_head_oid: str,
+        generation: int,
+        expected_revision: int,
+    ) -> dict[str, Any]:
+        if (
+            not idempotency_key
+            or len(idempotency_key) > 128
+            or not all(character.isalnum() or character in "._:-" for character in idempotency_key)
+            or len(expected_head_oid) != 40
+            or any(character not in "0123456789abcdef" for character in expected_head_oid)
+            or generation < 1
+        ):
+            raise JobError("CONTINUATION_CYCLE_BINDING_INVALID")
+        try:
+            with self.store._connect() as connection:
+                connection.execute("BEGIN IMMEDIATE")
+                row = connection.execute("SELECT * FROM jobs WHERE job_id=?", (job_id,)).fetchone()
+                if row is None:
+                    raise JobError("JOB_NOT_FOUND")
+                existing = connection.execute(
+                    "SELECT * FROM continuation_cycles WHERE job_id=? AND idempotency_key=?",
+                    (job_id, idempotency_key),
+                ).fetchone()
+                if existing is not None:
+                    if str(existing["expected_head_oid"]) != expected_head_oid or int(existing["generation"]) != generation:
+                        raise JobError("CONTINUATION_CYCLE_BINDING_CONFLICT")
+                    if str(existing["state"]) == "COMPLETED":
+                        connection.commit()
+                        return {"completed": True, "commit_oid": str(existing["commit_oid"] or ""), "idempotent": True}
+                    if str(row["state"]) == JobState.COMPLETED.value:
+                        receipt = json.loads(str(row["receipt_json"] or "{}"))
+                        commit_oid = str(receipt.get("authority_oid") or "")
+                        lease = connection.execute(
+                            "SELECT current_head_oid FROM branch_leases WHERE job_id=? AND generation=? AND state='ACTIVE'",
+                            (job_id, generation),
+                        ).fetchall()
+                        if (
+                            len(lease) == 1
+                            and len(commit_oid) == 40
+                            and str(lease[0]["current_head_oid"] or "") == commit_oid
+                            and receipt.get("remote_verified") is True
+                        ):
+                            now = utc_now()
+                            connection.execute(
+                                "UPDATE continuation_cycles SET state='COMPLETED',commit_oid=?,updated_at=? "
+                                "WHERE job_id=? AND idempotency_key=? AND state='ACTIVE'",
+                                (commit_oid, now, job_id, idempotency_key),
+                            )
+                            connection.commit()
+                            return {"completed": True, "commit_oid": commit_oid, "idempotent": True}
+                        raise JobError("CONTINUATION_CYCLE_RECOVERY_REQUIRED")
+                    connection.commit()
+                    return {"completed": False, "commit_oid": None, "idempotent": True}
+                if int(row["revision"]) != expected_revision:
+                    raise JobError("REVISION_CAS_CONFLICT")
+                if str(row["state"]) != JobState.COMPLETED.value:
+                    raise JobError("CONTINUATION_CYCLE_JOB_STATE_INVALID")
+                if str(row["branch"]) in {"main", "master"} or str(row["branch"]).startswith(("refs/", "tags/")):
+                    raise JobError("PROTECTED_BRANCH_REJECTED")
+                receipt = json.loads(str(row["receipt_json"] or "{}"))
+                if receipt.get("remote_verified") is not True or any(
+                    str(receipt.get(field) or "") != expected_head_oid
+                    for field in ("authority_oid", "api_branch_oid", "git_remote_oid")
+                ):
+                    raise JobError("CONTINUATION_CYCLE_RECEIPT_INVALID")
+                leases = connection.execute(
+                    "SELECT * FROM branch_leases WHERE job_id=? AND branch=? AND generation=? AND state='ACTIVE'",
+                    (job_id, str(row["branch"]), generation),
+                ).fetchall()
+                if len(leases) != 1 or str(leases[0]["current_head_oid"] or "") != expected_head_oid:
+                    raise JobError("CONTINUATION_CYCLE_LEASE_INVALID")
+                if connection.execute(
+                    "SELECT 1 FROM continuation_cycles WHERE job_id=? AND state='ACTIVE' LIMIT 1",
+                    (job_id,),
+                ).fetchone() is not None:
+                    raise JobError("CONTINUATION_CYCLE_ACTIVE_CONFLICT")
+                sequence = int(connection.execute(
+                    "SELECT COALESCE(MAX(sequence),0)+1 FROM continuation_cycles WHERE job_id=?",
+                    (job_id,),
+                ).fetchone()[0])
+                now = utc_now()
+                connection.execute(
+                    "INSERT INTO continuation_cycles(job_id,idempotency_key,sequence,expected_head_oid,generation,state,commit_oid,created_at,updated_at) "
+                    "VALUES(?,?,?,?,?,'ACTIVE',NULL,?,?)",
+                    (job_id, idempotency_key, sequence, expected_head_oid, generation, now, now),
+                )
+                next_revision = expected_revision + 1
+                updated = connection.execute(
+                    "UPDATE jobs SET state=?,side_effect_state=?,revision=?,updated_at=? WHERE job_id=? AND revision=?",
+                    (JobState.LEASED.value, "CONTINUATION_LEASED", next_revision, now, job_id, expected_revision),
+                )
+                if updated.rowcount != 1:
+                    raise JobError("REVISION_CAS_CONFLICT")
+                connection.execute(
+                    "INSERT INTO state_transitions(job_id,from_state,to_state,revision,side_effect_state,created_at) VALUES(?,?,?,?,?,?)",
+                    (job_id, JobState.COMPLETED.value, JobState.LEASED.value, next_revision, "CONTINUATION_LEASED", now),
+                )
+                cycle_receipt = {
+                    "idempotency_key": idempotency_key,
+                    "expected_head_oid": expected_head_oid,
+                    "generation": generation,
+                    "sequence": sequence,
+                }
+                connection.execute(
+                    "INSERT INTO receipts(receipt_id,job_id,kind,digest,payload_json,created_at) VALUES(?,?,?,?,?,?)",
+                    (
+                        f"receipt-{job_id}-{next_revision}",
+                        job_id,
+                        "CONTINUATION_LEASED",
+                        hashlib.sha256(canonical_json(cycle_receipt)).hexdigest(),
+                        json.dumps(cycle_receipt, sort_keys=True),
+                        now,
+                    ),
+                )
+                result = dict(connection.execute("SELECT * FROM jobs WHERE job_id=?", (job_id,)).fetchone())
+                connection.commit()
+        except (JobError, BindingConflict):
+            raise
+        except sqlite3.Error as exc:
+            raise ServiceUnavailable("JOB_DB_UNAVAILABLE") from exc
+        result["request"] = json.loads(result["request_json"])
+        self.store._mirror(result)
+        return {"completed": False, "commit_oid": None, "idempotent": False}
+
+    def complete_continuation_cycle(self, job_id: str, *, idempotency_key: str, commit_oid: str) -> bool:
+        if len(commit_oid) != 40 or any(character not in "0123456789abcdef" for character in commit_oid):
+            raise JobError("CONTINUATION_CYCLE_COMMIT_OID_INVALID")
+        try:
+            with self.store._connect() as connection:
+                connection.execute("BEGIN IMMEDIATE")
+                cycle = connection.execute(
+                    "SELECT * FROM continuation_cycles WHERE job_id=? AND idempotency_key=?",
+                    (job_id, idempotency_key),
+                ).fetchone()
+                if cycle is None:
+                    connection.commit()
+                    return False
+                if str(cycle["state"]) == "COMPLETED":
+                    if str(cycle["commit_oid"] or "") != commit_oid:
+                        raise JobError("CONTINUATION_CYCLE_COMMIT_CONFLICT")
+                    connection.commit()
+                    return True
+                row = connection.execute("SELECT * FROM jobs WHERE job_id=?", (job_id,)).fetchone()
+                leases = connection.execute(
+                    "SELECT current_head_oid FROM branch_leases WHERE job_id=? AND generation=? AND state='ACTIVE'",
+                    (job_id, int(cycle["generation"])),
+                ).fetchall()
+                receipt = json.loads(str(row["receipt_json"] or "{}")) if row is not None else {}
+                if (
+                    row is None
+                    or str(row["state"]) != JobState.COMPLETED.value
+                    or receipt.get("remote_verified") is not True
+                    or str(receipt.get("authority_oid") or "") != commit_oid
+                    or len(leases) != 1
+                    or str(leases[0]["current_head_oid"] or "") != commit_oid
+                ):
+                    raise JobError("CONTINUATION_CYCLE_COMPLETION_EVIDENCE_INVALID")
+                now = utc_now()
+                updated = connection.execute(
+                    "UPDATE continuation_cycles SET state='COMPLETED',commit_oid=?,updated_at=? "
+                    "WHERE job_id=? AND idempotency_key=? AND state='ACTIVE'",
+                    (commit_oid, now, job_id, idempotency_key),
+                )
+                if updated.rowcount != 1:
+                    raise JobError("CONTINUATION_CYCLE_CAS_CONFLICT")
+                connection.commit()
+                return True
+        except (JobError, BindingConflict):
+            raise
+        except sqlite3.Error as exc:
+            raise ServiceUnavailable("JOB_DB_UNAVAILABLE") from exc
+
     def advance(self, job_id: str, state: JobState, *, side_effect_state: str, receipt: Mapping[str, Any] | None = None, expected_revision: int | None = None) -> JobReceipt:
         return self._advance(
             job_id,

active-runtime/app/aios_governed_task_bootstrap.py

@@ -2,6 +2,8 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, asdict
+from contextlib import contextmanager
+import fcntl
 import hashlib
 import json
 from pathlib import Path
@@ -9,6 +11,11 @@ import re
 from typing import Any, Mapping
 
 from aios_gitops_job_controller import GitOpsJobController, JobStore
+from aios_online_agent_execution import (
+    GovernedExecutionBinding,
+    project_execution_envelope,
+    project_online_task,
+)
 
 OID_RE = re.compile(r"^[0-9a-f]{40}$")
 BRANCH_RE = re.compile(r"^agent/[A-Za-z0-9][A-Za-z0-9._/-]{2,179}$")
@@ -36,35 +43,161 @@ class GovernedTaskBinding:
         return {"task_id": self.task_id, "repository": self.repository, "base_oid": self.base_oid, "target_branch": self.target_branch, "expected_branch_oid": self.expected_branch_oid, "generation": self.generation, "branch_mode": self.branch_mode, "create_target_branch": self.branch_mode == "CREATE_NEW", "worktree_mode": "detached_at_base_oid" if self.branch_mode == "CREATE_NEW" else "detached_at_expected_head", "cas_ref_update_required": True, "idempotent": idempotent, "state": "BOUND", "job_id": self.job_id}
 
 
-def _safe(value: str) -> str:
+def _legacy_safe(value: str) -> str:
     return re.sub(r"[^A-Za-z0-9_.-]+", "-", value).strip("-")[:120] or "task"
 
 
+def _task_key(value: str) -> str:
+    readable = _legacy_safe(value)[:72]
+    return f"{readable}-{hashlib.sha256(value.encode('utf-8')).hexdigest()[:24]}"
+
+
 class GovernedTaskBootstrap:
     def __init__(self, authority: Any, root: Path, *, remote_name: str, token_path: Path, ssh_key_path: Path, api_base: str = "https://g.cnnetmkt.top/git/api/v1") -> None:
-        self.authority = authority; self.root = Path(root); self.remote_name = remote_name; self.token_path = Path(token_path); self.ssh_key_path = Path(ssh_key_path); self.api_base = api_base; self.task_meta_root = self.root / "task-bindings"; self.job_root = self.root / "jobs"; self.task_meta_root.mkdir(parents=True, exist_ok=True); self.job_root.mkdir(parents=True, exist_ok=True)
+        self.authority = authority; self.root = Path(root); self.remote_name = remote_name; self.token_path = Path(token_path); self.ssh_key_path = Path(ssh_key_path); self.api_base = api_base; self.task_meta_root = self.root / "task-bindings"; self.job_root = self.root / "jobs"; self.lock_root = self.root / "task-locks"; self.task_meta_root.mkdir(parents=True, exist_ok=True); self.job_root.mkdir(parents=True, exist_ok=True); self.lock_root.mkdir(parents=True, exist_ok=True)
 
     def _store(self, task_id: str) -> tuple[JobStore, GitOpsJobController]:
-        root = self.job_root / _safe(task_id); store = JobStore(root, payload_root=root / "payloads"); return store, GitOpsJobController(store)
+        legacy = self.job_root / _legacy_safe(task_id)
+        keyed = self.job_root / _task_key(task_id)
+        root = legacy if legacy.is_dir() and not keyed.exists() else keyed
+        store = JobStore(root, payload_root=root / "payloads"); return store, GitOpsJobController(store)
 
     def _metadata(self, task_id: str) -> Path:
-        return self.task_meta_root / (_safe(task_id) + ".json")
+        return self.task_meta_root / (_task_key(task_id) + ".json")
+
+    def _legacy_metadata(self, task_id: str) -> Path:
+        return self.task_meta_root / (_legacy_safe(task_id) + ".json")
+
+    @contextmanager
+    def _task_lock(self, task_id: str):
+        path = self.lock_root / (_task_key(task_id) + ".lock")
+        with path.open("a+b") as handle:
+            fcntl.flock(handle.fileno(), fcntl.LOCK_EX)
+            try:
+                yield
+            finally:
+                fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
+
+    @contextmanager
+    def _branch_lock(self, repository: str, target_branch: str):
+        key = hashlib.sha256((repository + "\0" + target_branch).encode("utf-8")).hexdigest()
+        path = self.lock_root / ("branch-" + key + ".lock")
+        with path.open("a+b") as handle:
+            fcntl.flock(handle.fileno(), fcntl.LOCK_EX)
+            try:
+                yield
+            finally:
+                fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
 
     def _read_existing(self, task_id: str) -> GovernedTaskBinding | None:
         path = self._metadata(task_id)
+        if not path.exists():
+            path = self._legacy_metadata(task_id)
         if not path.is_file() or path.is_symlink(): return None
-        return GovernedTaskBinding(**json.loads(path.read_text(encoding="utf-8")))
+        binding = GovernedTaskBinding(**json.loads(path.read_text(encoding="utf-8")))
+        if binding.task_id != task_id:
+            raise BootstrapError("TASK_BINDING_KEY_COLLISION")
+        return binding
+
+    def get_binding(self, task_id: str) -> GovernedTaskBinding:
+        """Return the exact durable binding; never synthesize missing lineage."""
+        existing = self._read_existing(str(task_id))
+        if existing is None or not existing.job_id:
+            raise BootstrapError("TASK_EXECUTION_PROJECTION_MISSING")
+        return existing
+
+    def execution_binding(self, binding: GovernedTaskBinding) -> GovernedExecutionBinding:
+        expected = binding.expected_branch_oid
+        mode = binding.branch_mode
+        if mode == "CREATE_NEW":
+            current = self.authority.read_ref("refs/heads/" + binding.target_branch)
+            if current is not None:
+                store, _ = self._store(binding.task_id)
+                with store._connect() as connection:
+                    rows = connection.execute(
+                        "SELECT current_head_oid,generation,state,lineage_anchor_oid "
+                        "FROM branch_leases WHERE job_id=? AND branch=? AND state='ACTIVE' "
+                        "ORDER BY revision DESC",
+                        (binding.job_id, binding.target_branch),
+                    ).fetchall()
+                if len(rows) != 1:
+                    raise BootstrapError("SAME_JOB_CONTINUATION_LEASE_INVALID")
+                row = rows[0]
+                if (
+                    str(row["current_head_oid"] or "") != current
+                    or int(row["generation"] or 0) != binding.generation
+                    or str(row["lineage_anchor_oid"] or "") != binding.base_oid
+                ):
+                    raise BootstrapError("SAME_JOB_CONTINUATION_BINDING_INVALID")
+                expected = current
+                mode = "CONTINUE_EXISTING"
+        return GovernedExecutionBinding.from_mapping(
+            {
+                "task_id": binding.task_id,
+                "job_id": binding.job_id,
+                "repository": binding.repository,
+                "base_oid": binding.base_oid,
+                "expected_branch_oid": expected,
+                "target_branch": binding.target_branch,
+                "branch_mode": mode,
+                "generation": binding.generation,
+                "idempotency_key": binding.idempotency_key,
+            }
+        )
+
+    def execution_envelope(
+        self,
+        task_id: str,
+        execution_request: Mapping[str, Any] | None = None,
+        *,
+        required_capabilities: tuple[str, ...] = (),
+        expected_job_id: str | None = None,
+    ) -> dict[str, Any]:
+        binding = self.get_binding(task_id)
+        if expected_job_id and binding.job_id != expected_job_id:
+            raise BootstrapError("JOB_BINDING_CONFLICT")
+        return project_execution_envelope(
+            self.execution_binding(binding),
+            execution_request,
+            required_capabilities=required_capabilities,
+        )
+
+    def online_task_projection(
+        self,
+        task_id: str,
+        task_request: Mapping[str, Any],
+        execution_request: Mapping[str, Any] | None = None,
+        *,
+        expected_job_id: str | None = None,
+    ) -> dict[str, Any]:
+        binding = self.get_binding(task_id)
+        if expected_job_id and binding.job_id != expected_job_id:
+            raise BootstrapError("JOB_BINDING_CONFLICT")
+        return project_online_task(self.execution_binding(binding), task_request, execution_request)
 
     def _write(self, binding: GovernedTaskBinding) -> None:
         path = self._metadata(binding.task_id); temporary = path.with_suffix(".tmp"); temporary.write_text(json.dumps(asdict(binding), sort_keys=True), encoding="utf-8"); temporary.replace(path)
 
     def create(self, request: Mapping[str, Any]) -> dict[str, Any]:
+        task_id = str(request.get("task_id") or "")
+        if not task_id:
+            raise BootstrapError("TASK_BINDING_INVALID")
+        repository = str(request.get("repository") or "")
+        target_branch = str(request.get("target_branch") or "")
+        with self._task_lock(task_id):
+            with self._branch_lock(repository, target_branch):
+                return self._create_locked(request)
+
+    def _create_locked(self, request: Mapping[str, Any]) -> dict[str, Any]:
         values = {key: str(request[key]) for key in ("task_id", "repository", "base_oid", "target_branch", "risk", "description", "idempotency_key")}
         if values["repository"] != "aios/aios" or not OID_RE.fullmatch(values["base_oid"]): raise BootstrapError("TASK_BINDING_INVALID")
         if not BRANCH_RE.fullmatch(values["target_branch"]): raise BootstrapError("TARGET_BRANCH_INVALID")
         existing = self._read_existing(values["task_id"])
         if existing is not None:
-            if any(getattr(existing, key) != values[key] for key in ("repository", "base_oid", "target_branch", "risk", "description")): raise BootstrapError("TASK_BINDING_CONFLICT")
+            if any(getattr(existing, key) != values[key] for key in ("repository", "base_oid", "target_branch", "risk", "description", "idempotency_key")): raise BootstrapError("TASK_BINDING_CONFLICT")
+            optional = {"expected_branch_oid": existing.expected_branch_oid, "branch_mode": existing.branch_mode, "generation": existing.generation}
+            for key, durable in optional.items():
+                if key in request and str(request[key]) != str(durable): raise BootstrapError("TASK_BINDING_CONFLICT")
             return existing.response(idempotent=True)
         if not self.authority.commit_exists(values["base_oid"]): raise BootstrapError("BASE_COMMIT_NOT_FOUND")
         current = self.authority.read_ref("refs/heads/" + values["target_branch"])
@@ -74,8 +207,24 @@ class GovernedTaskBootstrap:
             if expected != values["base_oid"]: raise BootstrapError("EXPECTED_BASE_CONFLICT")
         else:
             if expected != current: raise BootstrapError("EXISTING_BRANCH_OID_CONFLICT")
-            mode, generation = "CONTINUE_EXISTING", int(request.get("generation", 2))
-            if generation < 1: raise BootstrapError("GENERATION_INVALID")
+            parent_task_id = str(request.get("parent_task_id") or "")
+            parent_job_id = str(request.get("parent_job_id") or "")
+            if not parent_task_id or not parent_job_id:
+                raise BootstrapError("EXISTING_BRANCH_OWNERSHIP_REQUIRED")
+            parent = self._read_existing(parent_task_id)
+            if parent is None or parent.job_id != parent_job_id or parent.repository != values["repository"] or parent.target_branch != values["target_branch"]:
+                raise BootstrapError("EXISTING_BRANCH_OWNERSHIP_CONFLICT")
+            store, _ = self._store(parent_task_id)
+            with store._connect() as connection:
+                rows = connection.execute(
+                    "SELECT current_head_oid,generation,state FROM branch_leases WHERE job_id=? AND branch=? AND state='ACTIVE' ORDER BY revision DESC",
+                    (parent_job_id, values["target_branch"]),
+                ).fetchall()
+            if len(rows) != 1 or str(rows[0]["current_head_oid"] or "") != current:
+                raise BootstrapError("EXISTING_BRANCH_OWNERSHIP_CONFLICT")
+            mode, generation = "CONTINUE_EXISTING", int(rows[0]["generation"]) + 1
+            if "generation" in request and int(request["generation"]) != generation:
+                raise BootstrapError("GENERATION_BINDING_CONFLICT")
         payload = json.dumps(values, sort_keys=True, separators=(",", ":")).encode()
         _, controller = self._store(values["task_id"])
         receipt = controller.submit({"idempotency_key": values["idempotency_key"], "campaign_id": values["task_id"], "task_id": values["task_id"], "repository": values["repository"], "operation": "GOVERNED_TASK_CREATE", "branch": values["target_branch"], "expected_branch_oid": expected, "payload_digest": hashlib.sha256(payload).hexdigest(), "lineage_anchor_oid": values["base_oid"]}, payload=payload)

active-runtime/app/aios_online_agent_checkpoint.py

@@ -1,301 +0,0 @@
-"""Durable checkpoint journal for the generic Online Agent worker.
-
-The JSON task state remains a fast cache.  This SQLite journal is the durable,
-append-only evidence used for restart/resume/replay decisions.
-"""
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import datetime, timezone
-import hashlib
-import json
-from pathlib import Path
-import sqlite3
-from typing import Any, Mapping
-
-PHASE_ORDER = {
-    "claimed": 10,
-    "workspace_prepared": 20,
-    "verification_passed": 30,
-    "source_capture_done": 40,
-    "commit_done": 40,
-    "reconciliation_required": 45,
-    "result_pending": 50,
-    "result_submitted": 60,
-}
-
-
-class CheckpointError(RuntimeError):
-    pass
-
-
-def canonical(value: object) -> bytes:
-    return json.dumps(value, sort_keys=True, separators=(",", ":"), ensure_ascii=False, default=str).encode("utf-8")
-
-
-def sha256_json(value: object) -> str:
-    return hashlib.sha256(canonical(value)).hexdigest()
-
-
-def now() -> str:
-    return datetime.now(timezone.utc).isoformat()
-
-
-@dataclass(frozen=True)
-class CheckpointBinding:
-    task_id: str
-    attempt: int
-    execution_digest: str
-    job_id: str
-    repository: str
-    base_oid: str
-    expected_branch_oid: str
-    target_branch: str
-    generation: int
-
-    def material(self) -> dict[str, Any]:
-        return {
-            "task_id": self.task_id,
-            "attempt": self.attempt,
-            "execution_digest": self.execution_digest,
-            "job_id": self.job_id,
-            "repository": self.repository,
-            "base_oid": self.base_oid,
-            "expected_branch_oid": self.expected_branch_oid,
-            "target_branch": self.target_branch,
-            "generation": self.generation,
-        }
-
-    @property
-    def binding_sha256(self) -> str:
-        return sha256_json(self.material())
-
-
-class CheckpointStore:
-    def __init__(self, path: Path) -> None:
-        self.path = Path(path)
-        self.path.parent.mkdir(parents=True, exist_ok=True)
-        with self._connect() as connection:
-            connection.executescript(
-                """
-                CREATE TABLE IF NOT EXISTS checkpoints(
-                  task_id TEXT NOT NULL,
-                  attempt INTEGER NOT NULL,
-                  sequence INTEGER NOT NULL,
-                  phase TEXT NOT NULL,
-                  phase_order INTEGER NOT NULL,
-                  execution_digest TEXT NOT NULL,
-                  job_id TEXT NOT NULL,
-                  repository TEXT NOT NULL,
-                  base_oid TEXT NOT NULL,
-                  expected_branch_oid TEXT NOT NULL,
-                  target_branch TEXT NOT NULL,
-                  generation INTEGER NOT NULL,
-                  binding_sha256 TEXT NOT NULL,
-                  payload_json TEXT NOT NULL,
-                  payload_sha256 TEXT NOT NULL,
-                  created_at TEXT NOT NULL,
-                  PRIMARY KEY(task_id, attempt, sequence)
-                );
-                CREATE INDEX IF NOT EXISTS idx_checkpoints_task_latest
-                  ON checkpoints(task_id, attempt DESC, sequence DESC);
-                CREATE UNIQUE INDEX IF NOT EXISTS idx_checkpoints_exact_replay
-                  ON checkpoints(task_id, attempt, phase, payload_sha256);
-                CREATE TABLE IF NOT EXISTS checkpoint_heads(
-                  task_id TEXT PRIMARY KEY,
-                  attempt INTEGER NOT NULL,
-                  sequence INTEGER NOT NULL,
-                  phase TEXT NOT NULL,
-                  phase_order INTEGER NOT NULL,
-                  execution_digest TEXT NOT NULL,
-                  binding_sha256 TEXT NOT NULL,
-                  payload_sha256 TEXT NOT NULL,
-                  updated_at TEXT NOT NULL
-                );
-                """
-            )
-
-    def _connect(self) -> sqlite3.Connection:
-        connection = sqlite3.connect(self.path, timeout=30.0)
-        connection.row_factory = sqlite3.Row
-        connection.execute("PRAGMA foreign_keys=ON")
-        connection.execute("PRAGMA journal_mode=WAL")
-        connection.execute("PRAGMA synchronous=FULL")
-        connection.execute("PRAGMA busy_timeout=30000")
-        return connection
-
-    @staticmethod
-    def _phase_order(phase: str) -> int:
-        try:
-            return PHASE_ORDER[phase]
-        except KeyError as exc:
-            raise CheckpointError("CHECKPOINT_PHASE_INVALID") from exc
-
-    def append(
-        self,
-        binding: CheckpointBinding,
-        phase: str,
-        payload: Mapping[str, Any],
-    ) -> dict[str, Any]:
-        order = self._phase_order(phase)
-        payload_value = dict(payload)
-        payload_sha = sha256_json(payload_value)
-        with self._connect() as connection:
-            connection.execute("BEGIN IMMEDIATE")
-            replay = connection.execute(
-                """
-                SELECT * FROM checkpoints
-                 WHERE task_id=? AND attempt=? AND phase=? AND payload_sha256=?
-                """,
-                (binding.task_id, binding.attempt, phase, payload_sha),
-            ).fetchone()
-            if replay is not None:
-                connection.commit()
-                return dict(replay)
-
-            head = connection.execute(
-                "SELECT * FROM checkpoint_heads WHERE task_id=?",
-                (binding.task_id,),
-            ).fetchone()
-            if head is not None:
-                head_attempt = int(head["attempt"])
-                head_order = int(head["phase_order"])
-                if binding.attempt < head_attempt:
-                    raise CheckpointError("CHECKPOINT_ATTEMPT_REGRESSION")
-                if binding.attempt == head_attempt:
-                    if head["execution_digest"] != binding.execution_digest:
-                        raise CheckpointError("CHECKPOINT_EXECUTION_DIGEST_CONFLICT")
-                    if head["binding_sha256"] != binding.binding_sha256:
-                        raise CheckpointError("CHECKPOINT_SCOPE_MISMATCH_DENY")
-                    if order < head_order and phase != "reconciliation_required":
-                        raise CheckpointError("CHECKPOINT_PHASE_REGRESSION")
-                    sequence = int(head["sequence"]) + 1
-                else:
-                    sequence = 1
-            else:
-                sequence = 1
-
-            created_at = now()
-            connection.execute(
-                """
-                INSERT INTO checkpoints(
-                  task_id,attempt,sequence,phase,phase_order,execution_digest,job_id,
-                  repository,base_oid,expected_branch_oid,target_branch,generation,
-                  binding_sha256,payload_json,payload_sha256,created_at
-                ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-                """,
-                (
-                    binding.task_id,
-                    binding.attempt,
-                    sequence,
-                    phase,
-                    order,
-                    binding.execution_digest,
-                    binding.job_id,
-                    binding.repository,
-                    binding.base_oid,
-                    binding.expected_branch_oid,
-                    binding.target_branch,
-                    binding.generation,
-                    binding.binding_sha256,
-                    canonical(payload_value).decode("utf-8"),
-                    payload_sha,
-                    created_at,
-                ),
-            )
-            connection.execute(
-                """
-                INSERT INTO checkpoint_heads(
-                  task_id,attempt,sequence,phase,phase_order,execution_digest,
-                  binding_sha256,payload_sha256,updated_at
-                ) VALUES (?,?,?,?,?,?,?,?,?)
-                ON CONFLICT(task_id) DO UPDATE SET
-                  attempt=excluded.attempt,
-                  sequence=excluded.sequence,
-                  phase=excluded.phase,
-                  phase_order=excluded.phase_order,
-                  execution_digest=excluded.execution_digest,
-                  binding_sha256=excluded.binding_sha256,
-                  payload_sha256=excluded.payload_sha256,
-                  updated_at=excluded.updated_at
-                """,
-                (
-                    binding.task_id,
-                    binding.attempt,
-                    sequence,
-                    phase,
-                    order,
-                    binding.execution_digest,
-                    binding.binding_sha256,
-                    payload_sha,
-                    created_at,
-                ),
-            )
-            connection.commit()
-            row = connection.execute(
-                "SELECT * FROM checkpoints WHERE task_id=? AND attempt=? AND sequence=?",
-                (binding.task_id, binding.attempt, sequence),
-            ).fetchone()
-            return dict(row)
-
-    def latest(self, task_id: str) -> dict[str, Any] | None:
-        with self._connect() as connection:
-            row = connection.execute(
-                """
-                SELECT * FROM checkpoints
-                 WHERE task_id=?
-                 ORDER BY attempt DESC, sequence DESC
-                 LIMIT 1
-                """,
-                (task_id,),
-            ).fetchone()
-            if row is None:
-                return None
-            value = dict(row)
-            value["payload"] = json.loads(value.pop("payload_json"))
-            return value
-
-    def latest_for_attempt(self, task_id: str, attempt: int) -> dict[str, Any] | None:
-        with self._connect() as connection:
-            row = connection.execute(
-                """
-                SELECT * FROM checkpoints
-                 WHERE task_id=? AND attempt=?
-                 ORDER BY sequence DESC
-                 LIMIT 1
-                """,
-                (task_id, attempt),
-            ).fetchone()
-            if row is None:
-                return None
-            value = dict(row)
-            value["payload"] = json.loads(value.pop("payload_json"))
-            return value
-
-    def verify_latest_binding(self, binding: CheckpointBinding) -> dict[str, Any] | None:
-        value = self.latest(binding.task_id)
-        if value is None:
-            return None
-        if int(value["attempt"]) > binding.attempt:
-            raise CheckpointError("CHECKPOINT_FUTURE_ATTEMPT")
-        # A previous attempt may be reused only when the immutable execution/scope binding matches.
-        if value["execution_digest"] != binding.execution_digest:
-            return None
-        expected = CheckpointBinding(
-            task_id=value["task_id"],
-            attempt=int(value["attempt"]),
-            execution_digest=value["execution_digest"],
-            job_id=value["job_id"],
-            repository=value["repository"],
-            base_oid=value["base_oid"],
-            expected_branch_oid=value["expected_branch_oid"],
-            target_branch=value["target_branch"],
-            generation=int(value["generation"]),
-        )
-        current_scope = binding.material()
-        historical_scope = expected.material()
-        current_scope.pop("attempt", None)
-        historical_scope.pop("attempt", None)
-        if sha256_json(current_scope) != sha256_json(historical_scope):
-            raise CheckpointError("CHECKPOINT_SCOPE_MISMATCH_DENY")
-        return value

active-runtime/app/aios_online_agent_worker.py

@@ -39,11 +39,6 @@ from aios_online_agent_execution import (
     ExecutionProjectionError,
     validate_execution_envelope,
 )
-from aios_online_agent_checkpoint import (
-    CheckpointBinding,
-    CheckpointError,
-    CheckpointStore,
-)
 
 
 API_BASE = os.environ.get("AIOS_AGENT_TASK_API_URL", "http://127.0.0.1:18940").rstrip("/")
@@ -52,7 +47,7 @@ AGENT_ID = os.environ.get(
     "AIOS_AGENT_ID", "online-engineering-worker-cn-network-mkt-generic-20260815"
 )
 AGENT_TYPE = os.environ.get("AIOS_AGENT_TYPE", "trusted-online-engineering-worker")
-AGENT_VERSION = os.environ.get("AIOS_AGENT_VERSION", "2026-08-17.2-durable")
+AGENT_VERSION = os.environ.get("AIOS_AGENT_VERSION", "2026-08-15.3-generic")
 AUTHORITY_GIT_DIR = Path(
     os.environ.get("AIOS_AUTHORITY_GIT_DIR", "/data/aios-gitops/repo.git")
 )
@@ -65,7 +60,6 @@ WORKSPACE_ROOT = Path(
     )
 )
 GIT_CONFIG_GLOBAL = STATE_ROOT / "gitconfig"
-CHECKPOINT_DB = Path(os.environ.get("AIOS_WORKER_CHECKPOINT_DB", str(STATE_ROOT / "checkpoints.sqlite3")))
 POLL_SECONDS = int(os.environ.get("AIOS_WORKER_POLL_SECONDS", "5"))
 HEARTBEAT_SECONDS = int(os.environ.get("AIOS_WORKER_HEARTBEAT_SECONDS", "20"))
 LEASE_SECONDS = int(os.environ.get("AIOS_WORKER_LEASE_SECONDS", "300"))
@@ -911,137 +905,6 @@ def save_task_state(task_id: str, value: Mapping[str, Any]) -> None:
     atomic_json(task_state_path(task_id), value)
 
 
-def checkpoint_binding(envelope: ExecutionEnvelope, attempt: int) -> CheckpointBinding:
-    return CheckpointBinding(
-        task_id=envelope.task_id,
-        attempt=attempt,
-        execution_digest=envelope.digest,
-        job_id=envelope.job_id,
-        repository=envelope.repository,
-        base_oid=envelope.base_oid,
-        expected_branch_oid=envelope.expected_branch_oid,
-        target_branch=envelope.target_branch,
-        generation=envelope.generation,
-    )
-
-
-_CHECKPOINT_STORE: CheckpointStore | None = None
-
-
-def checkpoint_store() -> CheckpointStore:
-    global _CHECKPOINT_STORE
-    if _CHECKPOINT_STORE is None:
-        _CHECKPOINT_STORE = CheckpointStore(CHECKPOINT_DB)
-    return _CHECKPOINT_STORE
-
-
-def save_checkpoint(
-    task_id: str,
-    state: Mapping[str, Any],
-    envelope: ExecutionEnvelope,
-    attempt: int,
-) -> dict[str, Any]:
-    phase = str(state.get("phase") or "")
-    try:
-        return checkpoint_store().append(
-            checkpoint_binding(envelope, attempt),
-            phase,
-            dict(state),
-        )
-    except CheckpointError as exc:
-        raise WorkerError(str(exc), phase="checkpoint") from exc
-
-
-def latest_reusable_checkpoint(
-    envelope: ExecutionEnvelope,
-    attempt: int,
-) -> dict[str, Any] | None:
-    try:
-        return checkpoint_store().verify_latest_binding(
-            checkpoint_binding(envelope, attempt)
-        )
-    except CheckpointError as exc:
-        raise WorkerError(str(exc), phase="checkpoint") from exc
-
-
-def result_idempotency_key(
-    task_id: str,
-    attempt: int,
-    envelope: ExecutionEnvelope,
-    result: Mapping[str, Any],
-) -> str:
-    governed = result.get("governed")
-    commit_key = (
-        governed.get("commit_idempotency_key")
-        if isinstance(governed, Mapping)
-        else None
-    )
-    material = {
-        "task_id": task_id,
-        "attempt": attempt,
-        "execution_digest": envelope.digest,
-        "commit_idempotency_key": commit_key,
-    }
-    readable = re.sub(r"[^A-Za-z0-9._:-]+", "-", task_id).strip("-")[:72] or "task"
-    return f"{readable}-a{attempt}-result-{digest_json(material)[:24]}"
-
-
-def submit_result_replay_safe(
-    client: AgentTaskClient,
-    task_id: str,
-    lease_token: str,
-    result_key: str,
-    result: Mapping[str, Any],
-) -> tuple[int, dict[str, Any]]:
-    expected_digest = digest_json(result)
-    delay = 0.5
-    last_status = 599
-    last_response: dict[str, Any] = {"error": "SERVICE_UNAVAILABLE"}
-    for _ in range(4):
-        status, response = client.result(task_id, lease_token, result_key, result)
-        last_status, last_response = status, response
-        if 200 <= status < 300:
-            return status, response
-        if status == 409 and response.get("error") == "IDEMPOTENCY_CONFLICT":
-            get_status, current = client.get(task_id)
-            current_result = current.get("result") if isinstance(current, Mapping) else None
-            if (
-                get_status == 200
-                and isinstance(current_result, Mapping)
-                and digest_json(current_result) == expected_digest
-                and current.get("status") in {"VERIFYING", "SUCCEEDED"}
-            ):
-                return 200, {
-                    "idempotent": True,
-                    "reconciled": True,
-                    "status": current.get("status"),
-                }
-            return status, response
-        if status != 599 and status < 500:
-            return status, response
-        time.sleep(delay)
-        delay = min(delay * 2.0, 4.0)
-    return last_status, last_response
-
-
-def recover_stale_workspaces() -> int:
-    if not WORKSPACE_ROOT.is_dir() or WORKSPACE_ROOT.is_symlink():
-        return 0
-    removed = 0
-    for path in sorted(WORKSPACE_ROOT.glob("task-*")):
-        if path.is_symlink() or not path.is_dir():
-            continue
-        resolved = path.resolve(strict=False)
-        root = WORKSPACE_ROOT.resolve()
-        if resolved == root or root not in resolved.parents:
-            raise WorkerError("WORKSPACE_RECOVERY_SCOPE_INVALID", phase="startup")
-        shutil.rmtree(resolved)
-        removed += 1
-    if removed:
-        audit("WORKSPACE_RECOVERY_CLEANUP", removed=removed)
-    return removed
-
-
 def new_run_root() -> Path:
     ensure_roots()
     root = Path(tempfile.mkdtemp(prefix="task-", dir=str(WORKSPACE_ROOT)))
@@ -1232,70 +1095,6 @@ def _verify_converged_job(
         raise WorkerError("WRITER_LEASE_CURRENT_HEAD_MISMATCH", phase="verification")
 
 
-def acquire_writer_lease_replay_safe(
-    envelope: ExecutionEnvelope,
-    bridge: BridgeClient,
-    heartbeat: LeaseHeartbeat,
-) -> dict[str, Any]:
-    governance = envelope.governance
-    body = {
-        "schema": "aios.task-writer-lease.v2",
-        "task_id": envelope.task_id,
-        "job_id": envelope.job_id,
-        "repository": envelope.repository,
-        "branch_mode": envelope.branch_mode,
-        "base_oid": envelope.base_oid,
-        "expected_branch_oid": envelope.expected_branch_oid,
-        "target_branch": envelope.target_branch,
-        "generation": envelope.generation,
-        "lease_seconds": int(governance.get("lease_seconds") or 900),
-    }
-    delay = 0.5
-    last_status = 599
-    last_response: dict[str, Any] = {"error": "SERVICE_UNAVAILABLE"}
-    for attempt_index in range(4):
-        heartbeat.ensure()
-        status, response = bridge.call("/v2/writer-lease", body)
-        last_status, last_response = status, response
-        if 200 <= status < 300:
-            if (
-                response.get("job_id") != envelope.job_id
-                or response.get("task_id") != envelope.task_id
-                or response.get("repository") != envelope.repository
-                or response.get("base_oid") != envelope.base_oid
-                or response.get("expected_branch_oid") != envelope.expected_branch_oid
-                or response.get("branch_mode") != envelope.branch_mode
-                or int(response.get("generation") or 0) != envelope.generation
-                or response.get("target_branch") != envelope.target_branch
-                or response.get("state") not in {None, "ACTIVE"}
-            ):
-                raise WorkerError(
-                    "WRITER_LEASE_RESPONSE_BINDING_INVALID",
-                    phase="committing",
-                )
-            if attempt_index:
-                audit(
-                    "WRITER_LEASE_RECOVERED",
-                    task_id=envelope.task_id,
-                    job_id=envelope.job_id,
-                    attempts=attempt_index + 1,
-                    lease_id=response.get("lease_id"),
-                )
-            return response
-        if status != 599 and status < 500:
-            break
-        time.sleep(delay)
-        delay = min(delay * 2.0, 4.0)
-    raise WorkerError(
-        "WRITER_LEASE_ACQUIRE_FAILED",
-        phase="committing",
-        details={
-            "api_status": last_status,
-            "error": last_response.get("error"),
-        },
-    )
-
-
 def governed_commit(envelope: ExecutionEnvelope, worktree: Path, bridge: BridgeClient, heartbeat: LeaseHeartbeat) -> dict[str, Any]:
     governance = envelope.governance
     if governance.get("task_id") != envelope.task_id or governance.get("job_id") != envelope.job_id:
@@ -1303,11 +1102,32 @@ def governed_commit(envelope: ExecutionEnvelope, worktree: Path, bridge: BridgeC
     generation = envelope.generation
     expected_branch_oid = envelope.expected_branch_oid
     branch_mode = envelope.branch_mode
-    lease_response = acquire_writer_lease_replay_safe(
-        envelope,
-        bridge,
-        heartbeat,
-    )
+    lease_body = {
+        "schema": "aios.task-writer-lease.v2",
+        "task_id": envelope.task_id,
+        "job_id": envelope.job_id,
+        "repository": envelope.repository,
+        "branch_mode": branch_mode,
+        "base_oid": envelope.base_oid,
+        "expected_branch_oid": expected_branch_oid,
+        "target_branch": envelope.target_branch,
+        "generation": generation,
+        "lease_seconds": int(governance.get("lease_seconds") or 900),
+    }
+    status, lease_response = bridge.call("/v2/writer-lease", lease_body)
+    if not 200 <= status < 300:
+        raise WorkerError("WRITER_LEASE_ACQUIRE_FAILED", phase="committing", details={"api_status": status, "error": lease_response.get("error")})
+    if (
+        lease_response.get("job_id") != envelope.job_id
+        or lease_response.get("task_id") != envelope.task_id
+        or lease_response.get("repository") != envelope.repository
+        or lease_response.get("base_oid") != envelope.base_oid
+        or lease_response.get("expected_branch_oid") != expected_branch_oid
+        or lease_response.get("branch_mode") != branch_mode
+        or int(lease_response.get("generation") or 0) != generation
+        or lease_response.get("target_branch") != envelope.target_branch
+    ):
+        raise WorkerError("WRITER_LEASE_RESPONSE_BINDING_INVALID", phase="committing")
     heartbeat.ensure()
     files: dict[str, str] = {}
     paths = governance.get("allowed_files") or [item["path"] for item in envelope.change_set]
@@ -1491,358 +1311,86 @@ class WorkerSupervisor:
         envelope: ExecutionEnvelope,
     ) -> None:
         task_id = str(claim.get("task_id") or task.get("task_id") or "")
-        attempt = int(claim.get("attempt") or 0)
-        if attempt < 1:
-            raise WorkerError("TASK_ATTEMPT_INVALID", phase="claim")
         lease_token = claim.get("lease_token")
         if not isinstance(lease_token, str) or len(lease_token) < 24:
             raise WorkerError("LEASE_TOKEN_NOT_RETURNED", phase="claim")
-        audit("TASK_CLAIMED", task_id=task_id, attempt=attempt, revision=claim.get("revision"))
+        audit("TASK_CLAIMED", task_id=task_id, attempt=claim.get("attempt"), revision=claim.get("revision"))
         heartbeat = LeaseHeartbeat(self.agent, task_id, lease_token)
-        state: dict[str, Any] = {
-            "task_id": task_id,
-            "execution_digest": envelope.digest,
-            "attempt": attempt,
-            "phase": "claimed",
-            "job_id": envelope.job_id,
-        }
         try:
             heartbeat.first()
             heartbeat.set_stage("started")
             heartbeat.start()
-            audit("TASK_STARTED", task_id=task_id, attempt=attempt)
+            audit("TASK_STARTED", task_id=task_id, attempt=claim.get("attempt"))
             status, current_task = self.agent.get(task_id)
             if status != 200:
-                raise WorkerError(
-                    "TASK_READ_AFTER_CLAIM_FAILED",
-                    phase="claim",
-                    details={"api_status": status},
-                )
+                raise WorkerError("TASK_READ_AFTER_CLAIM_FAILED", phase="claim", details={"api_status": status})
             current_envelope, _ = self.resolve_envelope(current_task)
             if current_envelope.digest != envelope.digest or current_envelope.job_id != envelope.job_id:
                 raise WorkerError("TASK_PAYLOAD_DRIFT", phase="claim")
-
-            cached = load_task_state(
+            state = load_task_state(
                 task_id,
                 envelope.digest,
-                attempt=attempt,
-                continuation_head_oid=(
-                    envelope.expected_branch_oid
-                    if envelope.branch_mode == "CONTINUE_EXISTING"
-                    else None
-                ),
+                attempt=int(claim.get("attempt") or 0),
+                continuation_head_oid=envelope.expected_branch_oid if envelope.branch_mode == "CONTINUE_EXISTING" else None,
                 continuation_job_id=envelope.job_id,
-                commit_idempotency_key=str(
-                    envelope.governance.get("commit_idempotency_key") or ""
-                ),
-            )
-            durable = latest_reusable_checkpoint(envelope, attempt)
-            if cached is None and isinstance(durable, Mapping):
-                payload = durable.get("payload")
-                if isinstance(payload, Mapping):
-                    cached = dict(payload)
-                    cached["recovered_from_checkpoint"] = True
-                    audit(
-                        "TASK_CHECKPOINT_RECOVERED",
-                        task_id=task_id,
-                        checkpoint_attempt=durable.get("attempt"),
-                        checkpoint_phase=durable.get("phase"),
-                        checkpoint_sequence=durable.get("sequence"),
-                    )
-            if cached is not None:
-                state = dict(cached)
-                state["task_id"] = task_id
-                state["execution_digest"] = envelope.digest
-                state["job_id"] = envelope.job_id
-                previous_attempt = int(state.get("attempt") or 0)
-                state["resume_from_attempt"] = previous_attempt or None
-                state["attempt"] = attempt
-
-            current_attempt_checkpoint = checkpoint_store().latest_for_attempt(task_id, attempt)
-            if current_attempt_checkpoint is None:
-                save_checkpoint(
-                    task_id,
-                    {
-                        "task_id": task_id,
-                        "execution_digest": envelope.digest,
-                        "job_id": envelope.job_id,
-                        "attempt": attempt,
-                        "phase": "claimed",
-                        "resume_from_phase": state.get("phase"),
-                    },
-                    envelope,
-                    attempt,
-                )
-
-            governed = (
-                state.get("governed")
-                if isinstance(state.get("governed"), Mapping)
-                else None
-            )
-            phase = str(state.get("phase") or "claimed")
-            result: Mapping[str, Any] | None = None
-
-            # Read-only source capture is safe to reuse across official attempts when the exact
-            # execution/scope digest is unchanged.  This is the key restart/retry fast path.
-            if envelope.action == "source_capture" and phase in {
-                "source_capture_done",
-                "result_pending",
-                "result_submitted",
-            }:
-                candidate = state.get("result")
-                if isinstance(candidate, Mapping):
-                    result = dict(candidate)
-                    audit(
-                        "TASK_RESUMED_FROM_SOURCE_CAPTURE",
-                        task_id=task_id,
-                        previous_attempt=state.get("resume_from_attempt"),
-                        attempt=attempt,
-                        phase=phase,
-                    )
-            if (
-                result is None
-                and envelope.action == "source_capture"
-                and phase == "verification_passed"
-                and isinstance(state.get("execution"), Mapping)
-            ):
-                result = build_source_capture_result(
-                    task_id, envelope, state["execution"]
-                )
-                state.update({"phase": "source_capture_done", "result": result})
-                save_task_state(task_id, state)
-                save_checkpoint(task_id, state, envelope, attempt)
-                audit(
-                    "TASK_RESUMED_AFTER_SOURCE_CAPTURE_VERIFICATION",
-                    task_id=task_id,
-                    attempt=attempt,
-                )
-
-            if (
-                result is None
-                and envelope.action == "deterministic"
-                and isinstance(governed, Mapping)
-                and isinstance(governed.get("commit_oid"), str)
-                and OID_RE.fullmatch(governed["commit_oid"])
-            ):
-                if (
-                    governed.get("job_id") != envelope.job_id
-                    or governed.get("target_branch") != envelope.target_branch
-                    or int(governed.get("generation") or 0) != envelope.generation
-                    or not isinstance(governed.get("receipt"), Mapping)
-                ):
-                    raise WorkerError(
-                        "RECOVERY_EVIDENCE_BINDING_INVALID", phase="recovery"
-                    )
-                job_status, job_receipt = self.bridge.call(
-                    "/v2/job", {"job_id": envelope.job_id}
-                )
+                commit_idempotency_key=str(envelope.governance.get("commit_idempotency_key") or ""),
+            ) or {"task_id": task_id, "execution_digest": envelope.digest, "phase": "claimed"}
+            governed = state.get("governed") if isinstance(state.get("governed"), Mapping) else None
+            if envelope.action == "deterministic" and isinstance(governed, Mapping) and isinstance(governed.get("commit_oid"), str) and OID_RE.fullmatch(governed["commit_oid"]):
+                if governed.get("job_id") != envelope.job_id or governed.get("target_branch") != envelope.target_branch or int(governed.get("generation") or 0) != envelope.generation or not isinstance(governed.get("receipt"), Mapping):
+                    raise WorkerError("RECOVERY_EVIDENCE_BINDING_INVALID", phase="recovery")
+                job_status, job_receipt = self.bridge.call("/v2/job", {"job_id": envelope.job_id})
                 if not 200 <= job_status < 300:
-                    raise WorkerError(
-                        "RECOVERY_RECEIPT_UNVERIFIED",
-                        phase="recovery",
-                        details={"api_status": job_status},
-                    )
-                _verify_converged_job(
-                    job_receipt, envelope, str(governed["commit_oid"])
-                )
-                probe = subprocess.run(
-                    [
-                        "/usr/bin/git",
-                        "--git-dir",
-                        str(AUTHORITY_GIT_DIR),
-                        "rev-parse",
-                        "--verify",
-                        f"refs/heads/{envelope.target_branch}",
-                    ],
-                    text=True,
-                    capture_output=True,
-                    check=False,
-                    env={
-                        "PATH": "/usr/bin:/bin",
-                        "LC_ALL": "C.UTF-8",
-                        "GIT_CONFIG_GLOBAL": str(GIT_CONFIG_GLOBAL),
-                    },
-                    timeout=30,
-                )
-                if (
-                    probe.returncode != 0
-                    or probe.stdout.strip() != governed["commit_oid"]
-                ):
+                    raise WorkerError("RECOVERY_RECEIPT_UNVERIFIED", phase="recovery", details={"api_status": job_status})
+                _verify_converged_job(job_receipt, envelope, str(governed["commit_oid"]))
+                probe = subprocess.run(["/usr/bin/git", "--git-dir", str(AUTHORITY_GIT_DIR), "rev-parse", "--verify", f"refs/heads/{envelope.target_branch}"], text=True, capture_output=True, check=False, env={"PATH": "/usr/bin:/bin", "LC_ALL": "C.UTF-8", "GIT_CONFIG_GLOBAL": str(GIT_CONFIG_GLOBAL)}, timeout=30)
+                if probe.returncode != 0 or probe.stdout.strip() != governed["commit_oid"]:
                     raise WorkerError("RECOVERY_HEAD_UNVERIFIED", phase="recovery")
-                candidate = state.get("result")
-                if isinstance(candidate, Mapping):
-                    result = dict(candidate)
-                else:
-                    result = {
-                        "status": "SUCCEEDED",
-                        "verification_state": "VERIFIED_BY_WORKER_PENDING_SERVER_REVIEW",
-                        "task_id": task_id,
-                        "execution_digest": envelope.digest,
-                        "governed": dict(governed),
-                        "recovered_without_duplicate_commit": True,
-                        "direct_main_write": False,
-                        "production_write": False,
-                        "force_push": False,
-                        "protected_ref_bypass": False,
-                    }
-                audit(
-                    "TASK_RECOVERED_COMMIT",
-                    task_id=task_id,
-                    commit_oid=governed["commit_oid"],
-                    duplicate_commit=False,
-                )
-
-            if result is None:
-                # Any pre-commit crash is replay-safe: rebuild a clean detached worktree and
-                # re-run deterministic verification.  No external side effect exists yet.
+                result = state.get("result")
+                if not isinstance(result, Mapping):
+                    result = {"status": "SUCCEEDED", "verification_state": "VERIFIED_BY_WORKER_PENDING_SERVER_REVIEW", "task_id": task_id, "execution_digest": envelope.digest, "governed": dict(governed), "recovered_without_duplicate_commit": True, "direct_main_write": False, "production_write": False, "force_push": False, "protected_ref_bypass": False}
+                audit("TASK_RECOVERED_COMMIT", task_id=task_id, commit_oid=governed["commit_oid"], duplicate_commit=False)
+            else:
                 run_root = new_run_root()
                 try:
                     worktree = prepare_worktree(run_root, envelope)
-                    state.update(
-                        {
-                            "phase": "workspace_prepared",
-                            "execution_digest": envelope.digest,
-                            "attempt": attempt,
-                            "job_id": envelope.job_id,
-                        }
-                    )
+                    state.update({"phase": "workspace_prepared", "execution_digest": envelope.digest, "attempt": claim.get("attempt")})
                     save_task_state(task_id, state)
-                    save_checkpoint(task_id, state, envelope, attempt)
                     adapter = adapter_for(envelope.adapter)
                     execution = adapter.execute(envelope, worktree)
-                    state.update(
-                        {
-                            "phase": "verification_passed",
-                            "execution": execution,
-                            "attempt": attempt,
-                        }
-                    )
+                    state.update({"phase": "verification_passed", "execution": execution})
                     save_task_state(task_id, state)
-                    save_checkpoint(task_id, state, envelope, attempt)
                     heartbeat.ensure()
                     if envelope.action == "source_capture":
-                        result = build_source_capture_result(
-                            task_id, envelope, execution
-                        )
-                        state.update(
-                            {
-                                "phase": "source_capture_done",
-                                "result": result,
-                                "attempt": attempt,
-                            }
-                        )
+                        result = build_source_capture_result(task_id, envelope, execution)
+                        state.update({"phase": "source_capture_done", "result": result})
                     else:
                         heartbeat.set_stage("committing")
-                        governed = governed_commit(
-                            envelope, worktree, self.bridge, heartbeat
-                        )
-                        result = build_result(
-                            task_id, envelope, execution, governed
-                        )
-                        state.update(
-                            {
-                                "phase": "commit_done",
-                                "governed": governed,
-                                "result": result,
-                                "attempt": attempt,
-                            }
-                        )
+                        governed = governed_commit(envelope, worktree, self.bridge, heartbeat)
+                        result = build_result(task_id, envelope, execution, governed)
+                        state.update({"phase": "commit_done", "governed": governed, "result": result})
                     save_task_state(task_id, state)
-                    save_checkpoint(task_id, state, envelope, attempt)
                 finally:
                     cleanup_run_root(run_root)
-                    audit(
-                        "WORKSPACE_CLEANED",
-                        task_id=task_id,
-                        cleanup="PASS",
-                    )
-
-            if not isinstance(result, Mapping):
-                raise WorkerError("TASK_RESULT_MISSING", phase="result")
+                    audit("WORKSPACE_CLEANED", task_id=task_id, cleanup="PASS")
             heartbeat.ensure()
             heartbeat.set_stage("result")
-            result = dict(result)
-            result_key = result_idempotency_key(
-                task_id, attempt, envelope, result
-            )
-            state.update(
-                {
-                    "phase": "result_pending",
-                    "attempt": attempt,
-                    "result": result,
-                    "result_idempotency_key": result_key,
-                    "result_sha256": digest_json(result),
-                }
-            )
-            save_task_state(task_id, state)
-            save_checkpoint(task_id, state, envelope, attempt)
-
-            status, response = submit_result_replay_safe(
-                self.agent, task_id, lease_token, result_key, result
-            )
+            result_key = str(result.get("governed", {}).get("commit_idempotency_key") or f"{task_id}-result-{envelope.digest[:16]}")
+            status, response = self.agent.result(task_id, lease_token, result_key, result)
             if not 200 <= status < 300:
-                raise WorkerError(
-                    "TASK_RESULT_SUBMIT_FAILED",
-                    phase="result",
-                    details={
-                        "api_status": status,
-                        "error": response.get("error"),
-                        "result_idempotency_key": result_key,
-                    },
-                )
-            state.update(
-                {
-                    "phase": "result_submitted",
-                    "attempt": attempt,
-                    "result_idempotency_key": result_key,
-                    "result_submit_api_status": status,
-                    "result_submit_reconciled": bool(response.get("reconciled")),
-                }
-            )
-            save_task_state(task_id, state)
-            save_checkpoint(task_id, state, envelope, attempt)
-            audit(
-                "TASK_RESULT_SUBMITTED",
-                task_id=task_id,
-                attempt=attempt,
-                api_status=status,
-                result_idempotency_key=result_key,
-                commit_oid=result.get("governed", {}).get("commit_oid"),
-                replay_reconciled=bool(response.get("reconciled")),
-            )
+                raise WorkerError("TASK_RESULT_SUBMIT_FAILED", phase="result", details={"api_status": status, "error": response.get("error")})
+            audit("TASK_RESULT_SUBMITTED", task_id=task_id, api_status=status, result_idempotency_key=result_key, commit_oid=result.get("governed", {}).get("commit_oid"))
         except WorkerError as exc:
-            audit(
-                "TASK_FAILED",
-                task_id=task_id,
-                attempt=attempt,
-                error=exc.code,
-                phase=exc.phase,
-                details=exc.details,
-            )
+            audit("TASK_FAILED", task_id=task_id, error=exc.code, phase=exc.phase, details=exc.details)
             if exc.code == "RECONCILIATION_REQUIRED":
-                state = {
-                    "task_id": task_id,
-                    "execution_digest": envelope.digest,
-                    "phase": "reconciliation_required",
-                    "attempt": attempt,
-                    "job_id": envelope.job_id,
-                    "details": exc.details,
-                }
-                save_task_state(task_id, state)
-                save_checkpoint(task_id, state, envelope, attempt)
-                audit(
-                    "TASK_RECONCILIATION_REQUIRED",
-                    task_id=task_id,
-                    job_id=envelope.job_id,
-                    details=exc.details,
-                )
+                save_task_state(task_id, {"task_id": task_id, "execution_digest": envelope.digest, "phase": "reconciliation_required", "attempt": claim.get("attempt"), "job_id": envelope.job_id, "details": exc.details})
+                audit("TASK_RECONCILIATION_REQUIRED", task_id=task_id, job_id=envelope.job_id, details=exc.details)
                 return
-            failure_key = f"{task_id}-attempt-{attempt}-failure"
+            failure_key = f"{task_id}-attempt-{claim.get('attempt', 0)}-failure"
             failure = {
                 "status": "FAILED",
                 "verification_state": "UNVERIFIED",
                 "task_id": task_id,
-                "attempt": attempt,
                 "execution_backend": "generic-online-agent-worker-v2",
                 "error": exc.code,
                 "phase": exc.phase,
@@ -1854,27 +1402,10 @@ class WorkerSupervisor:
                 "secret_material_exposed": False,
             }
             try:
-                status, response = submit_result_replay_safe(
-                    self.agent,
-                    task_id,
-                    lease_token,
-                    failure_key,
-                    failure,
-                )
-                audit(
-                    "TASK_FAILURE_RESULT_SUBMITTED",
-                    task_id=task_id,
-                    attempt=attempt,
-                    api_status=status,
-                    error=response.get("error"),
-                )
+                status, response = self.agent.result(task_id, lease_token, failure_key, failure)
+                audit("TASK_FAILURE_RESULT_SUBMITTED", task_id=task_id, api_status=status, error=response.get("error"))
             except Exception as submit_exc:  # pragma: no cover - defensive runtime guard
-                audit(
-                    "TASK_FAILURE_RESULT_SUBMIT_FAILED",
-                    task_id=task_id,
-                    attempt=attempt,
-                    error=type(submit_exc).__name__,
-                )
+                audit("TASK_FAILURE_RESULT_SUBMIT_FAILED", task_id=task_id, error=type(submit_exc).__name__)
         finally:
             heartbeat.close()
 
@@ -1915,9 +1446,7 @@ class WorkerSupervisor:
 
     def run_forever(self) -> int:
         ensure_roots()
-        recover_stale_workspaces()
-        checkpoint_store()
-        audit("WORKER_STARTED", task_agnostic=True, api_base=API_BASE, bridge_base=BRIDGE_BASE, adapter_names=["isolated-deterministic", "source_capture", "codex", "hermes"], runtime_only_credentials=True, isolated_executor=True, durable_checkpoint=True)
+        audit("WORKER_STARTED", task_agnostic=True, api_base=API_BASE, bridge_base=BRIDGE_BASE, adapter_names=["isolated-deterministic", "source_capture", "codex", "hermes"], runtime_only_credentials=True, isolated_executor=True)
         while True:
             self.once()
             time.sleep(POLL_SECONDS)

active-runtime/app/message_handoff.py

@@ -5,7 +5,6 @@ import datetime as dt
 import hashlib
 import json
 import sqlite3
-import re
 from pathlib import Path
 from typing import Any, Iterable, Mapping
 
@@ -78,29 +77,6 @@ def _tuple_scope(value: Iterable[str] | str | None) -> tuple[str, ...]:
     return tuple(sorted({str(item).strip() for item in value if str(item).strip()}))
 
 
-_SECRET_KEY = re.compile(r"(?i)(?:token|secret|password|private[_-]?key|api[_-]?key)")
-_SECRET_VALUE = re.compile(r"(?i)bearer\s+[A-Za-z0-9._~+/-]{8,}|(?:token|secret|password|api[_-]?key)\s*[:=]\s*\S+")
-_SAFE_REFERENCE = re.compile(r"^(?:systemd-credential|vault|secret-manager):[A-Za-z0-9][A-Za-z0-9._:/#-]{0,255}$")
-
-
-def assert_payload_secret_safe(value: Any, *, key: str = "") -> None:
-    if isinstance(value, Mapping):
-        for child_key, child in value.items():
-            assert_payload_secret_safe(child, key=str(child_key))
-        return
-    if isinstance(value, (list, tuple)):
-        for child in value:
-            assert_payload_secret_safe(child, key=key)
-        return
-    if isinstance(value, (bytes, bytearray)):
-        raise ValueError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-    if isinstance(value, str):
-        if _SECRET_VALUE.search(value):
-            raise ValueError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-        if _SECRET_KEY.search(key) and value and _SAFE_REFERENCE.fullmatch(value) is None:
-            raise ValueError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-
-
 @dataclasses.dataclass(frozen=True)
 class DeliveryContext:
     tenant_id: str | None = None
@@ -144,7 +120,6 @@ class MessageEnvelope:
     conversation_id: str | None = None
     task_id: str | None = None
     run_id: str | None = None
-    correlation_id: str | None = None
     causation_id: str | None = None
     capability_scope: tuple[str, ...] = ()
     confidentiality_scope: str = "private"
@@ -153,9 +128,8 @@ class MessageEnvelope:
     envelope_id: str = ""
 
     def __post_init__(self) -> None:
-        assert_payload_secret_safe(self.payload)
         for field in ("source", "target", "message_type", "idempotency_key", "tenant_id", "user_id",
-                      "project_id", "conversation_id", "task_id", "run_id", "correlation_id", "causation_id"):
+                      "project_id", "conversation_id", "task_id", "run_id", "causation_id"):
             object.__setattr__(self, field, _clean(getattr(self, field)) if field not in {
                 "source", "target", "message_type", "idempotency_key"
             } else (_clean(getattr(self, field)) or ""))
@@ -181,8 +155,7 @@ class MessageEnvelope:
             source=self.source, target=self.target, message_type=self.message_type, payload=self.payload,
             tenant_id=self.tenant_id, user_id=self.user_id, project_id=self.project_id,
             conversation_id=self.conversation_id, task_id=self.task_id, run_id=self.run_id,
-            correlation_id=self.correlation_id, causation_id=self.causation_id,
-            sequence=self.sequence, idempotency_key=self.idempotency_key,
+            causation_id=self.causation_id, sequence=self.sequence, idempotency_key=self.idempotency_key,
         )
         if self.envelope_id and self.envelope_id != expected:
             raise ValueError("MESSAGE_ENVELOPE_ID_MISMATCH")
@@ -210,8 +183,7 @@ class MessageEnvelope:
             "target": self.target, "message_type": self.message_type, "payload_json": _canonical(self.payload),
             "payload_sha256": self.payload_sha256, "tenant_id": self.tenant_id, "user_id": self.user_id,
             "project_id": self.project_id, "conversation_id": self.conversation_id, "task_id": self.task_id,
-            "run_id": self.run_id, "correlation_id": self.correlation_id,
-            "causation_id": self.causation_id, "sequence": self.sequence,
+            "run_id": self.run_id, "causation_id": self.causation_id, "sequence": self.sequence,
             "capability_scope_json": _canonical(self.capability_scope),
             "confidentiality_scope": self.confidentiality_scope, "idempotency_key": self.idempotency_key,
             "expires_at": self.expires_at, "created_at": self.created_at,
@@ -221,20 +193,14 @@ class MessageEnvelope:
 def stable_event_id(*, source: Any, target: Any, message_type: Any, payload: Any,
                     tenant_id: Any = None, user_id: Any = None, project_id: Any = None,
                     conversation_id: Any = None, task_id: Any = None, run_id: Any = None,
-                    correlation_id: Any = None, causation_id: Any = None,
-                    sequence: Any = None, idempotency_key: Any = None) -> str:
-    assert_payload_secret_safe(payload)
-    material = {
+                    causation_id: Any = None, sequence: Any = None, idempotency_key: Any = None) -> str:
+    return _sha({
         "source": _clean(source), "target": _clean(target), "message_type": _clean(message_type),
         "payload_sha256": _sha(payload), "tenant_id": _clean(tenant_id), "user_id": _clean(user_id),
         "project_id": _clean(project_id), "conversation_id": _clean(conversation_id),
         "task_id": _clean(task_id), "run_id": _clean(run_id), "causation_id": _clean(causation_id),
         "sequence": sequence, "idempotency_key": _clean(idempotency_key),
-    }
-    # Preserve historical envelope IDs for legacy rows that predate correlation_id.
-    if _clean(correlation_id) is not None:
-        material["correlation_id"] = _clean(correlation_id)
-    return _sha(material)
+    })
 
 
 def bind_envelope_scope(envelope: MessageEnvelope, actor: Any) -> MessageEnvelope:
@@ -294,7 +260,6 @@ CREATE TABLE IF NOT EXISTS message_handoff (
   conversation_id TEXT,
   task_id TEXT,
   run_id TEXT,
-  correlation_id TEXT,
   causation_id TEXT,
   sequence INTEGER NOT NULL CHECK(sequence >= 1),
   capability_scope_json TEXT NOT NULL,
@@ -321,13 +286,6 @@ class DurableHandoffStore:
         self.path.parent.mkdir(parents=True, exist_ok=True)
         with self._connect() as conn:
             conn.executescript(_SCHEMA)
-            columns = {str(row[1]) for row in conn.execute("PRAGMA table_info(message_handoff)")}
-            if "correlation_id" not in columns:
-                conn.execute("ALTER TABLE message_handoff ADD COLUMN correlation_id TEXT")
-            conn.execute(
-                "CREATE INDEX IF NOT EXISTS idx_message_handoff_lineage "
-                "ON message_handoff(correlation_id, causation_id)"
-            )
 
     def _connect(self) -> sqlite3.Connection:
         conn = sqlite3.connect(self.path, timeout=30.0)
@@ -342,8 +300,7 @@ class DurableHandoffStore:
             source=row["source"], target=row["target"], message_type=row["message_type"],
             payload=json.loads(row["payload_json"]), tenant_id=row["tenant_id"], user_id=row["user_id"],
             project_id=row["project_id"], conversation_id=row["conversation_id"], task_id=row["task_id"],
-            run_id=row["run_id"], correlation_id=row["correlation_id"],
-            causation_id=row["causation_id"], sequence=int(row["sequence"]),
+            run_id=row["run_id"], causation_id=row["causation_id"], sequence=int(row["sequence"]),
             capability_scope=tuple(json.loads(row["capability_scope_json"])),
             confidentiality_scope=row["confidentiality_scope"], idempotency_key=row["idempotency_key"],
             expires_at=row["expires_at"], created_at=row["created_at"], envelope_id=row["envelope_id"],

active-runtime/app/search_agent_adapter.py

@@ -11,7 +11,6 @@ from dataclasses import asdict, dataclass, field
 from typing import Any
 
 from .search_gateway_orchestrator import SearchGatewayOrchestrator
-from .trace_tool_credential_governance import GovernanceActor, TraceContext
 
 
 @dataclass(frozen=True)
@@ -44,9 +43,6 @@ class SearchGatewayAgentAdapter:
         domain_profiles: list[str] | None = None,
         user_scope: str = "public",
         correlation_id: str | None = None,
-        *,
-        actor: GovernanceActor | dict[str, Any] | None = None,
-        trace: TraceContext | None = None,
     ) -> dict[str, Any]:
         payload = {
             "query": query,
@@ -63,11 +59,7 @@ class SearchGatewayAgentAdapter:
             "session_profile": context.session_profile,
             "correlation_id": correlation_id,
         }
-        if actor is None and trace is None:
-            # Preserve adapter compatibility; the governed orchestrator itself
-            # still fails closed when trusted context is absent.
-            return self.orchestrator.execute(payload)
-        return self.orchestrator.execute(payload, actor=actor, trace=trace)
+        return self.orchestrator.execute(payload)
 
 
 class OpenClawSearchClient(SearchGatewayAgentAdapter):

active-runtime/app/search_gateway.py

@@ -13,18 +13,10 @@ from __future__ import annotations
 
 from dataclasses import asdict, dataclass, field
 from datetime import datetime, timezone
-import hashlib
-import json
 from typing import Any, Protocol
 from uuid import uuid4
 
 from .search_profile_resolver import DomainQueryProfileRegistry, SearchProfile, SearchProfileResolver
-from .trace_tool_credential_governance import (
-    GovernanceActor,
-    GovernanceError,
-    GovernanceStore,
-    TraceContext,
-)
 
 
 def utc_now() -> str:
@@ -164,25 +156,13 @@ class SearchPolicyGuard:
 
 
 class SearchGateway:
-    def __init__(self, providers: list[SearchProvider] | None = None, *, governance_store: GovernanceStore | None = None):
+    def __init__(self, providers: list[SearchProvider] | None = None):
         self.providers = providers or []
-        self.governance_store = governance_store
         self.profile_resolver = SearchProfileResolver()
         self.planner = QueryPlanner()
         self.guard = SearchPolicyGuard()
 
-    def search(self, request: SearchRequest, *, actor: GovernanceActor | dict[str, Any] | None = None, trace: TraceContext | None = None) -> SearchResponse:
-        trusted_actor: GovernanceActor | None = None
-        if self.governance_store is not None:
-            if actor is None or trace is None:
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-            trusted_actor = GovernanceActor.from_value(actor)
-            if request.requester != trusted_actor.identity:
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY", field="requester")
-            if request.correlation_id is not None and request.correlation_id not in {
-                trace.trace_id, trace.correlation_id
-            }:
-                raise GovernanceError("TOOL_SCOPE_PROPAGATION", field="correlation_id")
+    def search(self, request: SearchRequest) -> SearchResponse:
         request_id = request.correlation_id or f"search_{uuid4().hex[:12]}"
         profile = self.profile_resolver.resolve(request.group_profile, request.user_profile, request.session_profile)
         expanded_queries = self.planner.expand(request, profile)
@@ -204,60 +184,14 @@ class SearchGateway:
         attempts: list[SearchProviderAttempt] = []
         providers = self._ordered_providers(profile)
         for provider in providers:
-            if request.authorized_sources and provider.name not in request.authorized_sources:
-                attempts.append(SearchProviderAttempt(provider=provider.name, status="denied", reason="SOURCE_AUTHZ_DENY"))
-                continue
-            if request.user_scope != "public" and provider.name not in request.authorized_sources:
-                attempts.append(SearchProviderAttempt(provider=provider.name, status="denied", reason="SOURCE_AUTHZ_REQUIRED"))
-                continue
             try:
-                if self.governance_store is not None:
-                    assert trusted_actor is not None and trace is not None
-                    input_digest = hashlib.sha256(
-                        json.dumps(
-                            {"query": request.query, "intent": request.intent, "provider": provider.name},
-                            sort_keys=True, separators=(",", ":"), ensure_ascii=False,
-                        ).encode("utf-8")
-                    ).hexdigest()
-                    invocation_key = hashlib.sha256(
-                        f"{trace.trace_id}:{trace.span_id}:{provider.name}:{input_digest}".encode("utf-8")
-                    ).hexdigest()
-                    authorization = self.governance_store.authorize_tool(
-                        actor=trusted_actor,
-                        tool_name=f"search.{provider.name}",
-                        trace=trace,
-                        requested_scope=trace.scope,
-                        input_digest=input_digest,
-                        invocation_key=invocation_key,
-                    )
-                    if authorization.get("idempotent"):
-                        raise GovernanceError("TOOL_INVOCATION_REPLAY")
                 provider_evidence, attempt = provider.search(request, expanded_queries)
-                if self.governance_store is not None:
-                    result_digest = hashlib.sha256(
-                        json.dumps(
-                            {
-                                "evidence": [item.to_dict() for item in provider_evidence],
-                                "attempt": attempt.to_dict(),
-                            },
-                            sort_keys=True, separators=(",", ":"), ensure_ascii=False,
-                        ).encode("utf-8")
-                    ).hexdigest()
-                    self.governance_store.record_tool_receipt(
-                        invocation_key=invocation_key,
-                        result_digest=result_digest,
-                        actor=trusted_actor,
-                        trace=trace,
-                    )
                 evidence.extend(provider_evidence)
                 attempts.append(attempt)
                 if provider_evidence:
                     break
-            except GovernanceError:
-                raise
-            except Exception:
-                # Provider exceptions may contain URLs, tokens, or local paths.
-                attempts.append(SearchProviderAttempt(provider=getattr(provider, "name", "unknown"), status="failed", reason="PROVIDER_FAILURE"))
+            except Exception as exc:
+                attempts.append(SearchProviderAttempt(provider=getattr(provider, "name", "unknown"), status="failed", reason=str(exc)))
 
         if evidence:
             return SearchResponse(

active-runtime/app/search_gateway_api.py

@@ -7,29 +7,27 @@ try:
 except Exception:
     APIRouter = None
 
-from .search_gateway import SearchRequest
-from .search_gateway_orchestrator import SearchGatewayOrchestrator
-from .trace_tool_credential_governance import GovernanceActor, TraceContext
+from .search_gateway import SearchGateway, SearchRequest
 from .search_gateway_dashboard import SearchGatewayDashboard
 
 
-orchestrator = SearchGatewayOrchestrator()
+gateway = SearchGateway()
 dashboard = SearchGatewayDashboard()
 
 
-def search_gateway_request(payload: dict[str, Any], *, actor: GovernanceActor | dict[str, Any] | None = None, trace: TraceContext | None = None) -> dict[str, Any]:
-    return orchestrator.execute(payload, actor=actor, trace=trace)
+def search_gateway_request(payload: dict[str, Any]) -> dict[str, Any]:
+    request = SearchRequest(**payload)
+    return gateway.search(request).to_dict()
 
 
 def get_search_gateway_status() -> dict[str, Any]:
     return {
         "module": "search-gateway",
         "status": "ready",
-        "providers_configured": len(orchestrator.gateway.providers),
+        "providers_configured": len(gateway.providers),
         "policy_guard": "enabled",
         "profile_customization": "enabled",
         "fallback_required_when_provider_unavailable": True,
-        "governance": "required",
     }
 
 

active-runtime/app/search_gateway_orchestrator.py

@@ -3,49 +3,24 @@
 from __future__ import annotations
 
 from typing import Any
-import os
 
 from .search_audit_store import SearchAuditStore
 from .search_event_bridge import SearchEventBridge
 from .search_gateway import SearchGateway, SearchRequest
 from .search_provider_registry import SearchProviderRegistry
-from .trace_tool_credential_governance import (
-    GovernanceActor,
-    GovernanceScope,
-    GovernanceStore,
-    ToolDescriptor,
-    TraceContext,
-)
 
 
 class SearchGatewayOrchestrator:
-    def __init__(self, *, governance_store: GovernanceStore | None = None):
+    def __init__(self):
         self.registry = SearchProviderRegistry()
         self.audit = SearchAuditStore()
         self.events = SearchEventBridge()
-        self.governance = governance_store or GovernanceStore(
-            os.environ.get("AIOS_SEARCH_GOVERNANCE_DB", "runtime/search-governance.sqlite3")
-        )
-        registrar = GovernanceActor(
-            "search-runtime-bootstrap", GovernanceScope("system"), ("system.admin",)
-        )
-        for provider in self.registry.ordered():
-            self.governance.register_tool(
-                ToolDescriptor(
-                    f"search.{provider.name}", "tool", GovernanceScope("global"), ("tool.search",)
-                ),
-                registrar,
-            )
-        self.gateway = SearchGateway(self.registry.ordered(), governance_store=self.governance)
+        self.gateway = SearchGateway(self.registry.ordered())
 
-    def execute(self, payload: dict[str, Any], *, actor: GovernanceActor | dict[str, Any] | None = None, trace: TraceContext | None = None) -> dict[str, Any]:
-        if actor is None or trace is None:
-            from .trace_tool_credential_governance import GovernanceError
-            raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-        self.governance.record_trace(trace, actor)
+    def execute(self, payload: dict[str, Any]) -> dict[str, Any]:
         request = SearchRequest(**payload)
         self.events.search_started(request.to_dict())
-        response = self.gateway.search(request, actor=actor, trace=trace)
+        response = self.gateway.search(request)
         result = response.to_dict()
         for attempt in result.get("attempts", []):
             self.events.provider_attempted(result["request_id"], attempt)
@@ -60,7 +35,6 @@ class SearchGatewayOrchestrator:
             "registry": self.registry.status(),
             "audit": "enabled",
             "events": "enabled",
-            "governance": "required",
         }
 
 

active-runtime/app/trace_tool_credential_governance.py

@@ -1,759 +0,0 @@
-"""Scope-bound governance for traces, Tool/MCP calls, and credentials.
-
-This module deliberately stores references and audit metadata only.  Secret
-material remains in the configured credential provider boundary.
-"""
-
-from __future__ import annotations
-
-from dataclasses import asdict, dataclass, field
-from datetime import datetime, timezone
-from contextlib import contextmanager
-import hashlib
-import json
-import re
-import sqlite3
-from pathlib import Path
-from typing import Any, Iterable, Mapping
-
-
-SCOPE_FIELDS = ("tenant_id", "user_id", "project_id", "conversation_id", "run_id")
-PRIVILEGED_CAPABILITIES = frozenset({"*", "admin", "system.admin", "governance.admin"})
-REFERENCE_RE = re.compile(r"^(systemd-credential|vault|secret-manager):[A-Za-z0-9][A-Za-z0-9._:/#-]{0,255}$")
-IDENTIFIER_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._:-]{0,179}$")
-
-
-class GovernanceError(RuntimeError):
-    def __init__(self, code: str, *, field: str | None = None) -> None:
-        super().__init__(code if field is None else f"{code}:{field}")
-        self.code = code
-        self.field = field
-
-
-def _clean(value: Any) -> str | None:
-    if value is None:
-        return None
-    text = str(value).strip()
-    return text or None
-
-
-def _scope_tuple(value: Iterable[str] | str | None) -> tuple[str, ...]:
-    if value is None:
-        return ()
-    if isinstance(value, str):
-        value = value.split(",")
-    return tuple(sorted({_clean(item) for item in value if _clean(item)}))
-
-
-def _canonical(value: Any) -> str:
-    return json.dumps(value, sort_keys=True, separators=(",", ":"), ensure_ascii=False, default=str)
-
-
-def _sha(value: Any) -> str:
-    return hashlib.sha256(_canonical(value).encode("utf-8")).hexdigest()
-
-
-def _now() -> str:
-    return datetime.now(timezone.utc).isoformat()
-
-
-def _identifier(value: Any, code: str) -> str:
-    text = _clean(value)
-    if text is None or IDENTIFIER_RE.fullmatch(text) is None:
-        raise GovernanceError(code)
-    return text
-
-
-@dataclass(frozen=True)
-class GovernanceScope:
-    """Explicit resource scope; system/global resources never get fake tenants."""
-
-    scope_type: str
-    tenant_id: str | None = None
-    user_id: str | None = None
-    project_id: str | None = None
-    conversation_id: str | None = None
-    run_id: str | None = None
-
-    def __post_init__(self) -> None:
-        object.__setattr__(self, "scope_type", (_clean(self.scope_type) or "").lower())
-        for name in SCOPE_FIELDS:
-            object.__setattr__(self, name, _clean(getattr(self, name)))
-        if self.scope_type == "tenant":
-            if self.tenant_id is None:
-                raise GovernanceError("GOVERNANCE_TENANT_ID_REQUIRED")
-        elif self.scope_type in {"system", "global"}:
-            if any(getattr(self, name) is not None for name in SCOPE_FIELDS):
-                raise GovernanceError("GOVERNANCE_NON_TENANT_SCOPE_INVALID")
-        elif self.scope_type == "legacy":
-            if any(getattr(self, name) is not None for name in SCOPE_FIELDS):
-                raise GovernanceError("GOVERNANCE_LEGACY_SCOPE_INVALID")
-        else:
-            raise GovernanceError("GOVERNANCE_SCOPE_TYPE_INVALID")
-
-    @classmethod
-    def from_value(cls, value: Any) -> "GovernanceScope":
-        def get(name: str) -> Any:
-            return value.get(name) if isinstance(value, Mapping) else getattr(value, name, None)
-
-        declared = _clean(get("scope_type"))
-        tenant_id = _clean(get("tenant_id"))
-        return cls(
-            scope_type=declared or ("tenant" if tenant_id else "legacy"),
-            tenant_id=tenant_id,
-            user_id=get("user_id"),
-            project_id=get("project_id"),
-            conversation_id=get("conversation_id"),
-            run_id=get("run_id"),
-        )
-
-    def as_dict(self) -> dict[str, Any]:
-        return asdict(self)
-
-
-@dataclass(frozen=True)
-class GovernanceActor:
-    identity: str
-    scope: GovernanceScope
-    capabilities: tuple[str, ...] = ()
-
-    def __post_init__(self) -> None:
-        object.__setattr__(self, "identity", _identifier(self.identity, "GOVERNANCE_ACTOR_INVALID"))
-        object.__setattr__(self, "capabilities", _scope_tuple(self.capabilities))
-
-    @classmethod
-    def from_value(cls, value: Any) -> "GovernanceActor":
-        if isinstance(value, cls):
-            return value
-        if not isinstance(value, Mapping):
-            raise GovernanceError("GOVERNANCE_ACTOR_INVALID")
-        return cls(
-            identity=value.get("identity") or value.get("actor_id") or value.get("user_id"),
-            scope=GovernanceScope.from_value(value),
-            capabilities=_scope_tuple(value.get("capabilities") or value.get("capability_scope")),
-        )
-
-    @property
-    def privileged(self) -> bool:
-        return bool(set(self.capabilities) & PRIVILEGED_CAPABILITIES)
-
-
-def authorize_scope(actor: GovernanceActor | Mapping[str, Any], resource: GovernanceScope | Mapping[str, Any]) -> None:
-    actor = GovernanceActor.from_value(actor)
-    resource = resource if isinstance(resource, GovernanceScope) else GovernanceScope.from_value(resource)
-    if actor.privileged:
-        return
-    if resource.scope_type in {"system", "global"}:
-        raise GovernanceError("GOVERNANCE_SYSTEM_SCOPE_AUTHZ_DENY")
-    if resource.scope_type == "legacy":
-        if actor.scope.scope_type != "legacy":
-            raise GovernanceError("GOVERNANCE_LEGACY_SCOPE_AUTHZ_DENY")
-        return
-    if actor.scope.scope_type != "tenant":
-        raise GovernanceError("GOVERNANCE_SCOPE_MISMATCH_DENY", field="scope_type")
-    for name in SCOPE_FIELDS:
-        expected = getattr(resource, name)
-        actual = getattr(actor.scope, name)
-        if expected is not None and expected != actual:
-            raise GovernanceError("GOVERNANCE_SCOPE_MISMATCH_DENY", field=name)
-
-
-@dataclass(frozen=True)
-class TraceContext:
-    trace_id: str
-    span_id: str
-    scope: GovernanceScope
-    parent_span_id: str | None = None
-    correlation_id: str | None = None
-    causation_id: str | None = None
-    task_id: str | None = None
-    claim_id: str | None = None
-    message_id: str | None = None
-
-    def __post_init__(self) -> None:
-        object.__setattr__(self, "trace_id", _identifier(self.trace_id, "TRACE_ID_INVALID"))
-        object.__setattr__(self, "span_id", _identifier(self.span_id, "TRACE_SPAN_ID_INVALID"))
-        for name in ("parent_span_id", "correlation_id", "causation_id", "task_id", "claim_id", "message_id"):
-            value = _clean(getattr(self, name))
-            if value is not None and IDENTIFIER_RE.fullmatch(value) is None:
-                raise GovernanceError("TRACE_LINEAGE_IDENTIFIER_INVALID", field=name)
-            object.__setattr__(self, name, value)
-
-    def child(self, *, span_id: str, actor: GovernanceActor | Mapping[str, Any], **lineage: Any) -> "TraceContext":
-        authorize_scope(actor, self.scope)
-        for name in ("trace_id", "task_id", "claim_id", "message_id", "correlation_id"):
-            supplied = _clean(lineage.get(name))
-            expected = getattr(self, name)
-            if supplied is not None and expected is not None and supplied != expected:
-                raise GovernanceError("TRACE_LINEAGE_CONTINUITY", field=name)
-        requested_scope = lineage.pop("scope", self.scope)
-        requested_scope = requested_scope if isinstance(requested_scope, GovernanceScope) else GovernanceScope.from_value(requested_scope)
-        if requested_scope != self.scope:
-            raise GovernanceError("TRACE_SCOPE_MISMATCH_DENY")
-        return TraceContext(
-            trace_id=self.trace_id,
-            span_id=span_id,
-            parent_span_id=self.span_id,
-            correlation_id=self.correlation_id,
-            causation_id=_clean(lineage.get("causation_id")) or self.span_id,
-            task_id=self.task_id,
-            claim_id=self.claim_id,
-            message_id=self.message_id,
-            scope=self.scope,
-        )
-
-    def as_dict(self) -> dict[str, Any]:
-        return {
-            "trace_id": self.trace_id,
-            "span_id": self.span_id,
-            "parent_span_id": self.parent_span_id,
-            "correlation_id": self.correlation_id,
-            "causation_id": self.causation_id,
-            "task_id": self.task_id,
-            "claim_id": self.claim_id,
-            "message_id": self.message_id,
-            **self.scope.as_dict(),
-        }
-
-
-def bind_trace_lineage(
-    *,
-    actor: GovernanceActor | Mapping[str, Any],
-    task: Any,
-    message: Any,
-    trace_id: str,
-    span_id: str,
-    parent: TraceContext | None = None,
-) -> TraceContext:
-    actor = GovernanceActor.from_value(actor)
-    task_scope = GovernanceScope.from_value(task)
-    message_scope = GovernanceScope.from_value(message)
-    if task_scope != message_scope:
-        raise GovernanceError("TRACE_SCOPE_MISMATCH_DENY")
-    authorize_scope(actor, task_scope)
-
-    def get(value: Any, name: str) -> Any:
-        return value.get(name) if isinstance(value, Mapping) else getattr(value, name, None)
-
-    task_id = _clean(get(task, "task_id"))
-    message_task = _clean(get(message, "task_id"))
-    if task_id and message_task and task_id != message_task:
-        raise GovernanceError("TRACE_LINEAGE_CONTINUITY", field="task_id")
-    context = TraceContext(
-        trace_id=trace_id,
-        span_id=span_id,
-        parent_span_id=parent.span_id if parent else None,
-        correlation_id=_clean(get(task, "correlation_id")) or _clean(get(message, "correlation_id")),
-        causation_id=_clean(get(message, "causation_id")) or (parent.span_id if parent else None),
-        task_id=task_id or message_task,
-        claim_id=_clean(get(task, "claim_id")) or _clean(get(message, "claim_id")),
-        message_id=_clean(get(message, "envelope_id")) or _clean(get(message, "id")),
-        scope=task_scope,
-    )
-    if parent is not None:
-        if parent.trace_id != context.trace_id or parent.scope != context.scope:
-            raise GovernanceError("TRACE_LINEAGE_CONTINUITY")
-        if parent.task_id and context.task_id and parent.task_id != context.task_id:
-            raise GovernanceError("TRACE_LINEAGE_CONTINUITY", field="task_id")
-    return context
-
-
-@dataclass(frozen=True)
-class ToolDescriptor:
-    name: str
-    kind: str
-    scope: GovernanceScope
-    required_capabilities: tuple[str, ...] = ()
-    credential_ref: str | None = None
-
-    def __post_init__(self) -> None:
-        object.__setattr__(self, "name", _identifier(self.name, "TOOL_NAME_INVALID"))
-        object.__setattr__(self, "kind", (_clean(self.kind) or "").lower())
-        if self.kind not in {"tool", "mcp"}:
-            raise GovernanceError("TOOL_KIND_INVALID")
-        object.__setattr__(self, "required_capabilities", _scope_tuple(self.required_capabilities))
-        if self.credential_ref is not None and REFERENCE_RE.fullmatch(self.credential_ref) is None:
-            raise GovernanceError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-
-
-@dataclass(frozen=True)
-class CredentialGrant:
-    grant_id: str
-    credential_ref: str
-    scope: GovernanceScope
-    operations: tuple[str, ...]
-    task_id: str | None = None
-    tool_name: str | None = None
-    expires_at: str | None = None
-
-    def __post_init__(self) -> None:
-        object.__setattr__(self, "grant_id", _identifier(self.grant_id, "CREDENTIAL_GRANT_ID_INVALID"))
-        if REFERENCE_RE.fullmatch(self.credential_ref or "") is None:
-            raise GovernanceError("CREDENTIAL_SECRET_EXPOSURE_DENY")
-        object.__setattr__(self, "operations", _scope_tuple(self.operations))
-        if not self.operations:
-            raise GovernanceError("CREDENTIAL_OPERATIONS_REQUIRED")
-        if self.expires_at is not None:
-            parsed = datetime.fromisoformat(self.expires_at.replace("Z", "+00:00"))
-            if parsed.tzinfo is None:
-                raise GovernanceError("CREDENTIAL_EXPIRY_INVALID")
-
-    def authorize(
-        self,
-        actor: GovernanceActor | Mapping[str, Any],
-        *,
-        operation: str,
-        task_id: str | None = None,
-        tool_name: str | None = None,
-        now: datetime | None = None,
-    ) -> str:
-        try:
-            authorize_scope(actor, self.scope)
-        except GovernanceError as exc:
-            raise GovernanceError("CREDENTIAL_SCOPE_DENY", field=exc.field) from exc
-        if operation not in self.operations:
-            raise GovernanceError("CREDENTIAL_SCOPE_DENY", field="operation")
-        if self.task_id is not None and self.task_id != _clean(task_id):
-            raise GovernanceError("CREDENTIAL_SCOPE_DENY", field="task_id")
-        if self.tool_name is not None and self.tool_name != _clean(tool_name):
-            raise GovernanceError("CREDENTIAL_SCOPE_DENY", field="tool_name")
-        if self.expires_at is not None:
-            current = (now or datetime.now(timezone.utc)).astimezone(timezone.utc)
-            expiry = datetime.fromisoformat(self.expires_at.replace("Z", "+00:00")).astimezone(timezone.utc)
-            if current >= expiry:
-                raise GovernanceError("CREDENTIAL_SCOPE_DENY", field="expires_at")
-        return self.credential_ref
-
-    def public(self) -> dict[str, Any]:
-        return {
-            "grant_id": self.grant_id,
-            "credential_ref": self.credential_ref,
-            "operations": list(self.operations),
-            "task_id": self.task_id,
-            "tool_name": self.tool_name,
-            "expires_at": self.expires_at,
-            **self.scope.as_dict(),
-        }
-
-
-_SCHEMA = """
-CREATE TABLE IF NOT EXISTS governance_schema_metadata (
-  singleton INTEGER PRIMARY KEY CHECK(singleton=1),
-  schema_version INTEGER NOT NULL
-);
-CREATE TABLE IF NOT EXISTS governed_tools (
-  name TEXT PRIMARY KEY,
-  kind TEXT NOT NULL,
-  scope_json TEXT NOT NULL,
-  required_capabilities_json TEXT NOT NULL,
-  credential_ref TEXT,
-  descriptor_sha256 TEXT NOT NULL
-);
-CREATE TABLE IF NOT EXISTS governed_trace_spans (
-  trace_id TEXT NOT NULL,
-  span_id TEXT NOT NULL,
-  parent_span_id TEXT,
-  context_json TEXT NOT NULL,
-  context_sha256 TEXT NOT NULL,
-  created_at TEXT NOT NULL,
-  PRIMARY KEY(trace_id, span_id)
-);
-CREATE TABLE IF NOT EXISTS governed_credential_grants (
-  grant_id TEXT PRIMARY KEY,
-  grant_json TEXT NOT NULL,
-  grant_sha256 TEXT NOT NULL,
-  created_at TEXT NOT NULL
-);
-CREATE TABLE IF NOT EXISTS governed_tool_invocations (
-  invocation_key TEXT PRIMARY KEY,
-  request_sha256 TEXT NOT NULL,
-  tool_name TEXT NOT NULL,
-  task_id TEXT NOT NULL,
-  claim_id TEXT NOT NULL,
-  trace_id TEXT NOT NULL,
-  span_id TEXT NOT NULL,
-  status TEXT NOT NULL,
-  receipt_sha256 TEXT,
-  created_at TEXT NOT NULL,
-  updated_at TEXT NOT NULL
-);
-CREATE TABLE IF NOT EXISTS governance_audit_evidence (
-  sequence INTEGER PRIMARY KEY AUTOINCREMENT,
-  evidence_id TEXT NOT NULL UNIQUE,
-  action TEXT NOT NULL,
-  actor_identity TEXT NOT NULL,
-  trace_id TEXT,
-  span_id TEXT,
-  resource_id TEXT NOT NULL,
-  outcome TEXT NOT NULL,
-  details_json TEXT NOT NULL,
-  previous_sha256 TEXT NOT NULL,
-  evidence_sha256 TEXT NOT NULL,
-  created_at TEXT NOT NULL
-);
-"""
-
-
-class GovernanceStore:
-    def __init__(self, path: str | Path) -> None:
-        self.path = Path(path)
-        self.path.parent.mkdir(parents=True, exist_ok=True)
-        with self._connection() as connection:
-            has_metadata = connection.execute(
-                "SELECT 1 FROM sqlite_master WHERE type='table' AND name='governance_schema_metadata'"
-            ).fetchone()
-            if has_metadata:
-                row = connection.execute(
-                    "SELECT schema_version FROM governance_schema_metadata WHERE singleton=1"
-                ).fetchone()
-                if row is not None and int(row[0]) != 1:
-                    raise GovernanceError("GOVERNANCE_SCHEMA_VERSION_UNSUPPORTED")
-            connection.executescript(_SCHEMA)
-            row = connection.execute(
-                "SELECT schema_version FROM governance_schema_metadata WHERE singleton=1"
-            ).fetchone()
-            if row is None:
-                connection.execute(
-                    "INSERT INTO governance_schema_metadata(singleton,schema_version) VALUES(1,1)"
-                )
-            connection.commit()
-
-    def _connect(self) -> sqlite3.Connection:
-        connection = sqlite3.connect(self.path, timeout=30.0)
-        connection.row_factory = sqlite3.Row
-        connection.execute("PRAGMA foreign_keys=ON")
-        connection.execute("PRAGMA busy_timeout=30000")
-        return connection
-
-    @contextmanager
-    def _connection(self):
-        connection = self._connect()
-        try:
-            yield connection
-            connection.commit()
-        except Exception:
-            connection.rollback()
-            raise
-        finally:
-            connection.close()
-
-    def _audit(
-        self,
-        connection: sqlite3.Connection,
-        *,
-        action: str,
-        actor: GovernanceActor,
-        resource_id: str,
-        outcome: str,
-        trace: TraceContext | None,
-        details: Mapping[str, Any],
-    ) -> dict[str, Any]:
-        previous = connection.execute(
-            "SELECT evidence_sha256 FROM governance_audit_evidence ORDER BY sequence DESC LIMIT 1"
-        ).fetchone()
-        previous_sha = str(previous[0]) if previous else ""
-        created_at = _now()
-        material = {
-            "action": action,
-            "actor_identity": actor.identity,
-            "trace_id": trace.trace_id if trace else None,
-            "span_id": trace.span_id if trace else None,
-            "resource_id": resource_id,
-            "outcome": outcome,
-            "details": dict(details),
-            "previous_sha256": previous_sha,
-            "created_at": created_at,
-        }
-        digest = _sha(material)
-        evidence_id = "gev-" + digest[:32]
-        connection.execute(
-            """INSERT INTO governance_audit_evidence
-               (evidence_id,action,actor_identity,trace_id,span_id,resource_id,outcome,
-                details_json,previous_sha256,evidence_sha256,created_at)
-               VALUES (?,?,?,?,?,?,?,?,?,?,?)""",
-            (
-                evidence_id, action, actor.identity, material["trace_id"], material["span_id"],
-                resource_id, outcome, _canonical(material["details"]), previous_sha, digest, created_at,
-            ),
-        )
-        return {"evidence_id": evidence_id, "evidence_sha256": digest, **material}
-
-    def record_trace(self, trace: TraceContext, actor: GovernanceActor | Mapping[str, Any]) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        authorize_scope(actor, trace.scope)
-        context = trace.as_dict()
-        digest = _sha(context)
-        with self._connection() as connection:
-            existing = connection.execute(
-                "SELECT context_sha256 FROM governed_trace_spans WHERE trace_id=? AND span_id=?",
-                (trace.trace_id, trace.span_id),
-            ).fetchone()
-            if existing is not None and existing[0] != digest:
-                raise GovernanceError("TRACE_LINEAGE_CONFLICT")
-            if existing is not None:
-                return {"context": context, "context_sha256": digest, "idempotent": True}
-            if trace.parent_span_id:
-                parent = connection.execute(
-                    "SELECT context_json FROM governed_trace_spans WHERE trace_id=? AND span_id=?",
-                    (trace.trace_id, trace.parent_span_id),
-                ).fetchone()
-                if parent is None:
-                    raise GovernanceError("TRACE_LINEAGE_CONTINUITY", field="parent_span_id")
-                parent_context = json.loads(parent[0])
-                if GovernanceScope.from_value(parent_context) != trace.scope:
-                    raise GovernanceError("TRACE_SCOPE_MISMATCH_DENY")
-            connection.execute(
-                "INSERT OR IGNORE INTO governed_trace_spans VALUES (?,?,?,?,?,?)",
-                (trace.trace_id, trace.span_id, trace.parent_span_id, _canonical(context), digest, _now()),
-            )
-            evidence = self._audit(
-                connection, action="TRACE_RECORDED", actor=actor,
-                resource_id=f"{trace.trace_id}:{trace.span_id}", outcome="ALLOW", trace=trace,
-                details={"context_sha256": digest},
-            )
-        return {"context": context, "context_sha256": digest, "evidence": evidence}
-
-    def register_tool(self, descriptor: ToolDescriptor, actor: GovernanceActor | Mapping[str, Any]) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        if not actor.privileged:
-            raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-        public = {
-            "name": descriptor.name,
-            "kind": descriptor.kind,
-            "required_capabilities": list(descriptor.required_capabilities),
-            "credential_ref": descriptor.credential_ref,
-            **descriptor.scope.as_dict(),
-        }
-        digest = _sha(public)
-        with self._connection() as connection:
-            existing = connection.execute(
-                "SELECT descriptor_sha256 FROM governed_tools WHERE name=?", (descriptor.name,)
-            ).fetchone()
-            if existing is not None and existing[0] != digest:
-                raise GovernanceError("TOOL_DESCRIPTOR_CONFLICT")
-            if existing is not None:
-                return {"descriptor": public, "descriptor_sha256": digest, "idempotent": True}
-            connection.execute(
-                "INSERT OR IGNORE INTO governed_tools VALUES (?,?,?,?,?,?)",
-                (descriptor.name, descriptor.kind, _canonical(descriptor.scope.as_dict()),
-                 _canonical(descriptor.required_capabilities), descriptor.credential_ref, digest),
-            )
-            evidence = self._audit(
-                connection, action="TOOL_REGISTERED", actor=actor, resource_id=descriptor.name,
-                outcome="ALLOW", trace=None, details={"descriptor_sha256": digest},
-            )
-        return {"descriptor": public, "descriptor_sha256": digest, "evidence": evidence}
-
-    def authorize_tool(
-        self,
-        *,
-        actor: GovernanceActor | Mapping[str, Any],
-        tool_name: str,
-        trace: TraceContext,
-        requested_scope: GovernanceScope | Mapping[str, Any],
-        input_digest: str,
-        invocation_key: str,
-    ) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        invocation_key = _identifier(invocation_key, "TOOL_INVOCATION_KEY_INVALID")
-        if not re.fullmatch(r"[0-9a-f]{64}", input_digest):
-            raise GovernanceError("TOOL_INPUT_DIGEST_INVALID")
-        if trace.task_id is None or trace.claim_id is None:
-            raise GovernanceError("TOOL_MCP_AUTHZ_DENY", field="active_claim")
-        requested_scope = requested_scope if isinstance(requested_scope, GovernanceScope) else GovernanceScope.from_value(requested_scope)
-        if requested_scope != trace.scope:
-            raise GovernanceError("TOOL_SCOPE_PROPAGATION")
-        authorize_scope(actor, requested_scope)
-        with self._connection() as connection:
-            persisted_trace = connection.execute(
-                "SELECT context_sha256 FROM governed_trace_spans WHERE trace_id=? AND span_id=?",
-                (trace.trace_id, trace.span_id),
-            ).fetchone()
-            if persisted_trace is None or persisted_trace[0] != _sha(trace.as_dict()):
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY", field="trace")
-            row = connection.execute("SELECT * FROM governed_tools WHERE name=?", (tool_name,)).fetchone()
-            if row is None:
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-            descriptor_scope = GovernanceScope.from_value(json.loads(row["scope_json"]))
-            if descriptor_scope.scope_type == "tenant" and descriptor_scope != requested_scope:
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-            required = set(json.loads(row["required_capabilities_json"]))
-            if not required.issubset(set(actor.capabilities)):
-                raise GovernanceError("TOOL_MCP_AUTHZ_DENY")
-            request_sha = _sha({
-                "tool_name": tool_name, "input_digest": input_digest,
-                "task_id": trace.task_id, "claim_id": trace.claim_id,
-                "trace_id": trace.trace_id, "span_id": trace.span_id,
-                "scope": requested_scope.as_dict(),
-            })
-            replay = connection.execute(
-                "SELECT * FROM governed_tool_invocations WHERE invocation_key=?",
-                (invocation_key,),
-            ).fetchone()
-            if replay is not None:
-                if replay["request_sha256"] != request_sha:
-                    raise GovernanceError("TOOL_INVOCATION_IDEMPOTENCY_CONFLICT")
-                if replay["status"] != "VERIFIED":
-                    raise GovernanceError("TOOL_INVOCATION_RECONCILIATION_REQUIRED")
-                return {
-                    "tool_name": tool_name, "trace_id": trace.trace_id,
-                    "span_id": trace.span_id, "invocation_key": invocation_key,
-                    "status": "VERIFIED", "receipt_sha256": replay["receipt_sha256"],
-                    "idempotent": True,
-                }
-            created_at = _now()
-            connection.execute(
-                """INSERT INTO governed_tool_invocations
-                   (invocation_key,request_sha256,tool_name,task_id,claim_id,trace_id,span_id,
-                    status,receipt_sha256,created_at,updated_at)
-                   VALUES(?,?,?,?,?,?,?,?,?,?,?)""",
-                (invocation_key, request_sha, tool_name, trace.task_id, trace.claim_id,
-                 trace.trace_id, trace.span_id, "AUTHORIZED", None, created_at, created_at),
-            )
-            evidence = self._audit(
-                connection, action="TOOL_AUTHORIZED", actor=actor, resource_id=tool_name,
-                outcome="ALLOW", trace=trace,
-                details={"input_sha256": input_digest, "scope_sha256": _sha(requested_scope.as_dict()),
-                         "invocation_key": invocation_key},
-            )
-        return {
-            "tool_name": tool_name,
-            "trace_id": trace.trace_id,
-            "span_id": trace.span_id,
-            "invocation_key": invocation_key,
-            "status": "AUTHORIZED",
-            "credential_required": row["credential_ref"] is not None,
-            "evidence": evidence,
-        }
-
-    def record_tool_receipt(
-        self,
-        *,
-        invocation_key: str,
-        result_digest: str,
-        actor: GovernanceActor | Mapping[str, Any],
-        trace: TraceContext,
-    ) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        invocation_key = _identifier(invocation_key, "TOOL_INVOCATION_KEY_INVALID")
-        if not re.fullmatch(r"[0-9a-f]{64}", result_digest):
-            raise GovernanceError("TOOL_RECEIPT_DIGEST_INVALID")
-        authorize_scope(actor, trace.scope)
-        with self._connection() as connection:
-            row = connection.execute(
-                "SELECT * FROM governed_tool_invocations WHERE invocation_key=?",
-                (invocation_key,),
-            ).fetchone()
-            if row is None or row["trace_id"] != trace.trace_id or row["span_id"] != trace.span_id:
-                raise GovernanceError("TOOL_RECEIPT_BINDING_INVALID")
-            if row["status"] == "VERIFIED":
-                if row["receipt_sha256"] != result_digest:
-                    raise GovernanceError("TOOL_RECEIPT_CONFLICT")
-                return {"invocation_key": invocation_key, "status": "VERIFIED", "idempotent": True}
-            if row["status"] != "AUTHORIZED":
-                raise GovernanceError("TOOL_INVOCATION_RECONCILIATION_REQUIRED")
-            connection.execute(
-                "UPDATE governed_tool_invocations SET status='VERIFIED',receipt_sha256=?,updated_at=? "
-                "WHERE invocation_key=? AND status='AUTHORIZED'",
-                (result_digest, _now(), invocation_key),
-            )
-            evidence = self._audit(
-                connection, action="TOOL_RESULT_VERIFIED", actor=actor,
-                resource_id=row["tool_name"], outcome="ALLOW", trace=trace,
-                details={"invocation_key": invocation_key, "result_sha256": result_digest},
-            )
-        return {"invocation_key": invocation_key, "status": "VERIFIED", "evidence": evidence}
-
-    def store_grant(self, grant: CredentialGrant, actor: GovernanceActor | Mapping[str, Any]) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        if not actor.privileged:
-            raise GovernanceError("CREDENTIAL_SCOPE_DENY")
-        public = grant.public()
-        digest = _sha(public)
-        with self._connection() as connection:
-            existing = connection.execute(
-                "SELECT grant_sha256 FROM governed_credential_grants WHERE grant_id=?", (grant.grant_id,)
-            ).fetchone()
-            if existing is not None and existing[0] != digest:
-                raise GovernanceError("CREDENTIAL_GRANT_CONFLICT")
-            connection.execute(
-                "INSERT OR IGNORE INTO governed_credential_grants VALUES (?,?,?,?)",
-                (grant.grant_id, _canonical(public), digest, _now()),
-            )
-            evidence = self._audit(
-                connection, action="CREDENTIAL_GRANT_STORED", actor=actor,
-                resource_id=grant.grant_id, outcome="ALLOW", trace=None,
-                details={"grant_sha256": digest},
-            )
-        return {"grant": public, "grant_sha256": digest, "evidence": evidence}
-
-    def authorize_credential(
-        self,
-        *,
-        grant_id: str,
-        actor: GovernanceActor | Mapping[str, Any],
-        trace: TraceContext,
-        operation: str,
-        task_id: str | None,
-        tool_name: str | None,
-        now: datetime | None = None,
-    ) -> dict[str, Any]:
-        actor = GovernanceActor.from_value(actor)
-        with self._connection() as connection:
-            row = connection.execute(
-                "SELECT grant_json FROM governed_credential_grants WHERE grant_id=?", (grant_id,)
-            ).fetchone()
-            if row is None:
-                raise GovernanceError("CREDENTIAL_SCOPE_DENY")
-            raw = json.loads(row[0])
-            grant = CredentialGrant(
-                grant_id=raw["grant_id"], credential_ref=raw["credential_ref"],
-                scope=GovernanceScope.from_value(raw), operations=tuple(raw["operations"]),
-                task_id=raw.get("task_id"), tool_name=raw.get("tool_name"),
-                expires_at=raw.get("expires_at"),
-            )
-            if trace.scope != grant.scope:
-                raise GovernanceError("CREDENTIAL_SCOPE_DENY", field="trace_scope")
-            reference = grant.authorize(
-                actor, operation=operation, task_id=task_id, tool_name=tool_name, now=now
-            )
-            evidence = self._audit(
-                connection, action="CREDENTIAL_AUTHORIZED", actor=actor,
-                resource_id=grant_id, outcome="ALLOW", trace=trace,
-                details={"operation": operation, "task_id": task_id, "tool_name": tool_name,
-                         "credential_ref_sha256": _sha(reference)},
-            )
-        return {"credential_ref": reference, "evidence": evidence}
-
-    def verify_audit_chain(self, required_actions: Iterable[str] = ()) -> bool:
-        ordered_actions: list[str] = []
-        previous = ""
-        with self._connection() as connection:
-            rows = connection.execute("SELECT * FROM governance_audit_evidence ORDER BY sequence").fetchall()
-        for row in rows:
-            details = json.loads(row["details_json"])
-            material = {
-                "action": row["action"], "actor_identity": row["actor_identity"],
-                "trace_id": row["trace_id"], "span_id": row["span_id"],
-                "resource_id": row["resource_id"], "outcome": row["outcome"],
-                "details": details, "previous_sha256": row["previous_sha256"],
-                "created_at": row["created_at"],
-            }
-            if row["previous_sha256"] != previous or row["evidence_sha256"] != _sha(material):
-                return False
-            previous = row["evidence_sha256"]
-            ordered_actions.append(row["action"])
-        position = 0
-        for required in required_actions:
-            try:
-                position = ordered_actions.index(required, position) + 1
-            except ValueError:
-                return False
-        return True
-
-
-__all__ = [
-    "CredentialGrant", "GovernanceActor", "GovernanceError", "GovernanceScope",
-    "GovernanceStore", "ToolDescriptor", "TraceContext", "authorize_scope",
-    "bind_trace_lineage",
-]

deploy/systemd/aios-chatgpt-bridge-v2-agent-task-projection.conf

@@ -0,0 +1,5 @@
+[Service]
+LoadCredential=agent_task_control_token:/etc/aios-gitops/agent-task-control.token
+Environment=AIOS_AGENT_TASK_API_URL=http://127.0.0.1:18940
+Environment=AIOS_ONLINE_TASK_PROJECTION_ENABLED=1
+Environment=AIOS_AGENT_TASK_CONTROL_TOKEN_FILE=%d/agent_task_control_token

deploy/systemd/aios-online-agent-worker.service

@@ -14,12 +14,11 @@ Environment=AIOS_AGENT_TASK_API_URL=http://127.0.0.1:18940
 Environment=AIOS_GOVERNED_WRITE_API_URL=http://127.0.0.1:18892
 Environment=AIOS_AGENT_ID=online-engineering-worker
 Environment=AIOS_AGENT_TYPE=trusted-online-engineering-worker
-Environment=AIOS_AGENT_VERSION=2026-08-17.2-durable
+Environment=AIOS_AGENT_VERSION=2026-08-17.1-dynamic
 Environment=AIOS_WORKER_CAPABILITIES=git.read,git.test,governed.write.branch,governed.write.file
 Environment=AIOS_AUTHORITY_GIT_DIR=/data/aios-gitops/repo.git
 Environment=AIOS_ISOLATED_EXECUTOR_ROOT=/var/lib/aios-online-agent-executor
 Environment=AIOS_WORKER_STATE_ROOT=/var/lib/aios-online-agent-worker
-Environment=AIOS_WORKER_CHECKPOINT_DB=/var/lib/aios-online-agent-worker/checkpoints.sqlite3
 Environment=AIOS_WORKER_WORKSPACE_ROOT=/var/lib/aios-online-agent-worker/workspaces
 ExecStart=/usr/bin/python3 -B /opt/aios/current/active-runtime/app/aios_online_agent_worker.py
 Restart=always

deploy/systemd/aios-online-engineering-consumer.service

@@ -0,0 +1,45 @@
+[Unit]
+Description=AIOS trusted dynamic engineering consumer
+After=aios-agent-task-api.service aios-chatgpt-bridge-v2-staging.service
+Wants=aios-agent-task-api.service aios-chatgpt-bridge-v2-staging.service
+
+[Service]
+Type=simple
+User=aios-engineering-worker
+Group=aios-engineering-worker
+SupplementaryGroups=gitops aios-executor-exchange
+LoadCredentialEncrypted=agent_token:/etc/credstore.encrypted/aios-online-engineering-20260815/agent_token
+Environment=PYTHONUNBUFFERED=1
+Environment=AIOS_AGENT_TASK_API_URL=http://127.0.0.1:18940
+Environment=AIOS_GOVERNED_WRITE_API_URL=http://127.0.0.1:18892
+Environment=AIOS_AGENT_ID=online-engineering-consumer
+Environment=AIOS_AGENT_TYPE=trusted-online-engineering-worker
+Environment=AIOS_AGENT_VERSION=2026-08-17.1-dynamic
+Environment=AIOS_WORKER_CAPABILITIES=git.read,git.test,governed.write.branch,governed.write.file
+Environment=AIOS_AUTHORITY_GIT_DIR=/data/aios-gitops/repo.git
+Environment=AIOS_ISOLATED_EXECUTOR_ROOT=/var/lib/aios-online-agent-executor
+Environment=AIOS_WORKER_STATE_ROOT=/var/lib/aios-online-engineering-consumer
+Environment=AIOS_WORKER_WORKSPACE_ROOT=/var/lib/aios-online-engineering-consumer/workspaces
+ExecStart=/usr/bin/python3 -B /opt/aios/current/active-runtime/app/aios_online_agent_worker.py
+Restart=always
+RestartSec=5
+TimeoutStopSec=20
+NoNewPrivileges=true
+PrivateTmp=true
+ProtectSystem=strict
+ProtectHome=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+LockPersonality=true
+RestrictSUIDSGID=true
+RestrictRealtime=true
+RestrictNamespaces=true
+MemoryDenyWriteExecute=true
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+ReadOnlyPaths=/data/aios-gitops/repo.git
+ReadWritePaths=/var/lib/aios-online-engineering-consumer
+UMask=0027
+
+[Install]
+WantedBy=multi-user.target

docs/superpowers/specs/2026-08-17-online-agent-auto-claim-design.md

@@ -0,0 +1,134 @@
+# Online Agent Automatic Claim Infrastructure
+
+## Status and fixed boundary
+
+This candidate targets `p0-claim-online-agent-auto-execution-20260817` on governed Job
+`job-2031a9e5682a4238f98e3ac7aee8a593`, base
+`a642b045775b9154a00ae78543037fbef4fb447b`, target branch
+`agent/p0-claim-online-agent-auto-execution-20260817`, generation 1.
+
+It does not authorize protected-main, Production, tag, baseline, raw Git, Task DB, or
+credential mutations.
+
+## Considered approaches
+
+1. Require every caller to write `metadata.execution`. This is simple but preserves the
+   current operational gap: a valid governed Job can still project an unexecutable Online
+   Task.
+2. Let workers infer repository and WriterLease coordinates from natural-language Task
+   fields. This removes the skip but violates fail-closed lineage and can bind the wrong Job,
+   branch, base, or generation.
+3. Use a canonical server-side projector plus a task-agnostic worker resolver. This is the
+   selected approach. The governed binding remains the only authority for repository, Job,
+   branch, base, expected head, generation, and idempotency. Producers can persist the
+   projected envelope when creating the Online Task. A worker may recover an omitted envelope
+   only from the same canonical projector and durable binding; it never guesses coordinates.
+
+## Components
+
+### Canonical execution contract
+
+`aios_online_agent_execution.py` owns schema `aios.online-agent.execution.v2`. It validates
+the complete governed lineage and supports two explicit actions:
+
+- `deterministic`: a hash-bound change set, verification commands, and governed commit;
+- `source_capture`: a read-only first attempt that returns `NEEDS_REWORK_SOURCE_CAPTURE` and
+  cannot acquire WriterLease or mutate Git.
+
+Wrong task, Job, repository, base, expected head, branch, generation, capability scope, or
+governance policy fails closed with a canonical diagnostic.
+
+### Governed Job to Online Task projection
+
+`GovernedTaskBootstrap` exposes an exact durable binding lookup and builds Online Task
+projection data through the canonical contract. When the Bridge is configured with the
+official Agent Task control credential reference, governed Job creation submits that complete
+projection through the official Task HTTP API. The Bridge also exposes a loopback envelope
+projection operation used for recovery. The persisted projection includes the versioned
+envelope rather than relying on manual metadata edits.
+
+Projection delivery is a durable outbox, not a best-effort tail call. The outbox record is
+written before HTTP delivery and a Bridge reconciler retries it after transient API failure or
+process restart. A response is accepted only when its complete execution envelope equals the
+submitted projection. Requests that explicitly require projection are rejected before governed
+bootstrap when the projection principal is unavailable.
+
+Loopback is not treated as an identity boundary. Every POST route requires an exact
+runtime-principal bearer credential supplied by systemd credential projection; unauthenticated
+local callers are denied before request dispatch. The control-plane credential used to create
+Online Tasks remains a separate Bridge-only reference and is never projected into the worker.
+
+For legacy Online Tasks with an omitted envelope, the generic worker asks the same Bridge
+operation for a read-only `source_capture` envelope. Projection succeeds only when the exact
+durable binding exists. An omitted envelope is therefore recoverable; an invalid envelope is
+never replaced or weakened.
+
+Persisted envelopes are also reprojected through the Bridge before claim and compared by exact
+digest and Job lineage. A self-consistent client-generated envelope is therefore not authority.
+
+### Dynamic worker and trusted consumer
+
+The repository gains a deployable generic worker and systemd unit definitions as governed
+source files. The worker validates or
+resolves an envelope before claim, revalidates after atomic claim, starts heartbeat, and then
+executes the selected action. The trusted engineering consumer uses this same task-agnostic
+entrypoint. No compiled worker contains a Task ID, base OID, branch, generation, or plan path.
+
+Skip observability distinguishes:
+
+- `TASK_SKIPPED_PROJECTION_MISSING`;
+- `TASK_SKIPPED_ENVELOPE_INVALID`;
+- `TASK_SKIPPED_CAPABILITY_MISMATCH`;
+- `TASK_SKIPPED_POLICY_DENY`;
+- `TASK_POLL_FAILED` / worker unavailable.
+
+## State flow
+
+```text
+Governed Job BOUND
+  -> canonical durable binding
+  -> Online Task projection with execution.v2
+  -> capability-filtered poll
+  -> envelope and lineage validation
+  -> atomic claim
+  -> initial heartbeat/start
+  -> refetch Task and re-resolve envelope
+  -> compare execution digest and Job
+  -> source capture OR deterministic governed execution
+  -> result construction
+  -> result submission
+  -> external server-side verification gate
+```
+
+Legacy omission uses `binding -> source_capture projection` between poll and validation. It
+does not write Task metadata and does not convert a malformed envelope into a valid one.
+
+## Recovery and safety
+
+- Projection is deterministic and digest-bound.
+- Governed Task creation is serialized by a cross-process, Task-ID-digest lock. Durable paths
+  use collision-resistant exact Task keys while retaining read compatibility with verified
+  legacy bindings.
+- A new Task cannot adopt an existing branch from caller-selected generation data. It must name
+  an exact durable parent Task/Job whose single ACTIVE lease owns the branch head; generation is
+  then derived from that lease.
+- Claim is attempted only after validation; claimed payload drift is denied.
+- Source capture has no WriterLease or commit path.
+- Deterministic execution retains detached worktree, exact WriterLease, governed commit,
+  durable current-head CAS, and receipt convergence.
+- Local deterministic recovery is keyed by Task and execution digest; live acceptance must
+  independently reconverge Job, lease, receipt, and branch OIDs before verification.
+- An ambiguous commit transport or server outcome becomes `RECONCILIATION_REQUIRED`; the
+  worker does not submit a canonical failure until exact Job receipt and head evidence is
+  observed.
+- A completed read-only `source_capture` state is ignored when a later attempt has a changed
+  digest and no governed state exists; all other digest drift is denied.
+- Protected refs are never worker targets.
+
+## Acceptance
+
+The implementation must pass the named projection, schema, claimability, dynamic-binding,
+wrong-lineage, capability, P0-A, and P0-B tests. Runtime acceptance additionally requires a
+real Online Task to be claimed and heartbeated without per-task worker or systemd plan
+injection, plus governed receipt/OID/CAS convergence for this implementation Task.
+Unit tests and deployable unit definitions do not by themselves satisfy runtime acceptance.

docs/superpowers/specs/2026-08-17-p0-claim-scheme-a-followup.md

@@ -0,0 +1,56 @@
+# P0-CLAIM Scheme A follow-up
+
+This follow-up continues the existing candidate `71523aef6e48b1e2fa516c456ca189b7a039104b`.
+It does not create a replacement Task, Job, branch or generation.
+
+## Retry extension
+
+A versioned Owner-controlled loopback API provides
+`POST /v1/tasks/{task_id}/retry-extension`.
+
+The request binds FAILED status, revision, exhausted attempt/max_attempts, next max attempts,
+previous verification SHA256, Owner authorization ID and idempotency key. The service performs one
+SQLite `BEGIN IMMEDIATE` transaction containing the CAS update, durable retry-extension record and
+Task event. Each authorization extends the boundary by exactly one attempt.
+
+## Same-Job continuation
+
+The durable GovernedTask binding remains the lineage anchor. After the first CREATE_NEW commit,
+`execution_binding()` may normalize that SAME Job to `CONTINUE_EXISTING` only when exactly one
+ACTIVE WriterLease for the Job owns the current authority branch head, generation and lineage
+anchor. The lineage `base_oid` stays unchanged; only `expected_branch_oid` becomes the current head.
+
+GovernedTask creation is also serialized by a branch-digest lock, preventing sibling continuation
+tasks from racing generation admission.
+
+## Projection and recovery
+
+Natural-language source signals are normalized server-side to at most 16 unique 512-byte values.
+Malformed persisted envelopes still fail closed.
+
+Fresh commits and recovery require a COMPLETED Job, `remote_verified=true`, exact
+authority/API/remote receipt OIDs, and exactly one ACTIVE WriterLease whose durable current head
+matches the commit. Delayed local ref visibility becomes `RECONCILIATION_REQUIRED`, not a terminal
+canonical failure.
+
+## Credential isolation
+
+The credentialed Coordinator performs only Task/Bridge coordination and governed commit. All
+deterministic repository modification and test commands run in
+`aios-online-agent-isolated-executor` under a separate system user with:
+
+- no Agent/Owner credential projection;
+- no gitops supplementary group;
+- `PrivateNetwork=true`;
+- `RestrictAddressFamilies=AF_UNIX AF_INET`, with `IPAddressDeny=any` and
+  `IPAddressAllow=localhost`, so regression tests may use an isolated loopback
+  HTTP server without gaining host or external network reachability;
+- `InaccessiblePaths=/run/credentials`.
+
+The executor receives a hash-bound source archive and deterministic change set through a filesystem
+exchange and returns only changed file bytes/hashes plus command evidence. The Coordinator validates
+that response before materializing exact allowed files and calling the governed Bridge.
+
+Codex/Hermes mutation adapters remain disabled until a separately audited uncredentialed planner
+backend exists. Under the current operating model, implementation code is authored before Online
+Agent execution and is carried as a deterministic plan.

docs/superpowers/specs/2026-08-17-r42-p0c-trace-tool-credential-governance.md

@@ -1,90 +0,0 @@
-# R4.2 P0-C Trace / Tool-MCP / Credential Governance
-
-## Status boundary
-
-This change is a candidate implementation on the governed P0-C branch. It does
-not promote protected `main`, deploy Production, or assert that all R4.2 target
-architecture is complete.
-
-## Scope model
-
-Governance resources use an explicit `scope_type`:
-
-- `tenant` requires `tenant_id` and may narrow to user, project,
-  conversation, and run;
-- `system` and `global` prohibit tenant ownership fields;
-- `legacy` preserves unscoped historical records without inventing ownership.
-
-System and global tools therefore never receive a synthetic tenant merely to
-satisfy a tenant-oriented schema.
-
-## Trace lineage
-
-`TaskPlan` and `MessageEnvelope` scope is bound to a `TraceContext`. The trace
-records `trace_id`, `span_id`, parent span, correlation, causation, task,
-message, and the canonical P0-A scope. Child spans must keep the parent's trace,
-task, and scope. Privileged visibility does not permit cross-scope trace
-splicing.
-
-`MessageEnvelope.correlation_id` is persisted and identity-bound. Existing
-handoff databases are upgraded in place with an idempotent column migration;
-legacy rows retain their prior event IDs because a null correlation field is
-not added to the historical identity material.
-
-Observability keeps its legacy presentation fields, but new governed records
-also carry immutable trace and scope fields. Scoped records require a trusted
-server actor for queries. A repeated execution ID is an idempotent replay only
-when the complete record matches; conflicting overwrites are denied.
-
-## Tool and MCP governance
-
-`ToolDescriptor` binds a tool or MCP server to:
-
-- an explicit resource scope;
-- required actor capabilities;
-- an optional credential reference.
-
-Invocation authorization requires exact propagation of the trace scope and a
-capability superset. Unknown tools, cross-tenant calls, scope substitution, and
-non-privileged access to system/global resources fail closed. Every successful
-registration and invocation appends hash-chained audit evidence.
-
-## Credential governance
-
-Credentials are represented only by references whose schemes are
-`systemd-credential`, `vault`, or `secret-manager`. Raw bearer tokens, passwords,
-and arbitrary values are rejected. Grants are bound to scope, operation, task,
-tool, and expiry. Public/audit records contain a reference hash where disclosure
-is unnecessary; secret material is never persisted by this module.
-
-The existing runtime credential broker remains backward compatible for system
-leases, adds explicit tenant/system/global invariants, and rejects providers
-that attempt to return raw token/secret/password environment values instead of
-file/reference indirection.
-
-## Durable evidence
-
-The SQLite governance store is restart-safe and idempotently initializes four
-tables: governed tools, trace spans, credential grants, and audit evidence.
-Audit entries form a SHA-256 chain. Acceptance requires the chain to verify and
-contain the required actions; missing evidence is not treated as success.
-
-## Acceptance tests
-
-The candidate must pass:
-
-- `TRACE_LINEAGE_CONTINUITY`;
-- `TRACE_SCOPE_MISMATCH_DENY`;
-- `TOOL_MCP_AUTHZ_DENY`;
-- `TOOL_SCOPE_PROPAGATION`;
-- `CREDENTIAL_SCOPE_DENY`;
-- `CREDENTIAL_SECRET_EXPOSURE_DENY`;
-- `AUDIT_EVIDENCE_COMPLETENESS`;
-- P0-A scope and P0-B handoff regression suites;
-- Python compilation, `git diff --check`, and a diff-scoped secret scan.
-
-The repository-wide baseline currently has seven unrelated failures in the
-isolated host environment (five stale continuation-contract fixtures and two
-host-permission fixtures). The same seven failures reproduce at the untouched
-`a642b045775b9154a00ae78543037fbef4fb447b` base; they are not suppressed or
-modified by P0-C.

docs/superpowers/specs/2026-08-17-r42-p1-durable-execution.md

@@ -1,75 +0,0 @@
-# R4.2 P1 — Durable Online Agent Execution
-
-Status: candidate implementation. This document does not imply protected-main promotion or Production deployment.
-
-## State model
-
-The generic worker uses two local durable layers:
-
-1. `tasks/<task_id>.json`: atomic fast-state cache for compatibility and quick restart.
-2. `checkpoints.sqlite3`: append-only attempt/phase journal with `synchronous=FULL`.
-
-Checkpoint identity is bound to:
-
-- task_id
-- attempt
-- execution_digest
-- job_id
-- repository
-- base_oid
-- expected_branch_oid
-- target_branch
-- generation
-
-A checkpoint from another repository/branch/generation is never reused.
-
-Phases are monotonic within an attempt:
-
-`claimed → workspace_prepared → verification_passed → source_capture_done|commit_done → result_pending → result_submitted`
-
-`reconciliation_required` is an explicit recovery phase.
-
-## Attempt-aware result idempotency
-
-Result submission idempotency keys include the official Task attempt and the execution digest. The same
-attempt reuses the same key after a timeout/restart; a later official attempt cannot collide with an
-earlier result.
-
-Before submitting a result the worker durably writes `result_pending`, including the result hash and
-idempotency key. After a successful or exact-idempotency-reconciled API response it writes
-`result_submitted`.
-
-A 409 is accepted only if the Task API already contains the exact same result body and the Task is
-VERIFYING/SUCCEEDED. A conflicting result remains a hard failure.
-
-## Resume rules
-
-- `source_capture_done` and `result_pending` may be reused across later official attempts only when the
-  execution/scope binding is identical. This avoids repeating read-only source capture.
-- A deterministic task that crashed before governed commit replays from a new clean detached worktree.
-  This is safe because there is no external side effect yet.
-- `commit_done` is never recommitted. Recovery requires exact Job receipt OID convergence plus exactly
-  one ACTIVE WriterLease whose `current_head_oid` equals the governed commit.
-- delayed Git visibility remains `RECONCILIATION_REQUIRED`, preserving an explicit recovery entry.
-
-## Crash cleanup
-
-On worker startup, stale `task-*` workspaces under the configured workspace root are removed before
-polling begins. The path boundary is verified before deletion.
-
-## Contracts
-
-P1 gates include:
-
-- CHECKPOINT_DURABLE_WRITE
-- RESUME_FROM_CHECKPOINT
-- RETRY_IDEMPOTENT_NO_DUPLICATE_SIDE_EFFECT
-- CRASH_RECOVERY_CONVERGENCE
-- WORKER_RESTART_RESUME
-- CHECKPOINT_SCOPE_ISOLATION
-- RESULT_SUBMISSION_REPLAY_SAFE
-- WORKSPACE_CLEANUP_RECOVERY
-- LEASE_RENEWAL_RECOVERY
-
-WriterLease and governed Job authority remain in the existing Bridge/GitOps durable stores; the worker
-checkpoint DB is not a competing authority for Git state.

tests/test_bridge_v2_governed_http_bootstrap.py

@@ -77,7 +77,7 @@ def test_slash_branch_uses_paginated_collection():
 
 def test_http_route_contract_is_complete():
     expected = {
-        "/v2/runtime", "/v2/capabilities", "/v2/governed-task",
+            "/v2/runtime", "/v2/capabilities", "/v2/governed-task", "/v2/execution-envelope", "/v2/execution-plan",
         "/v2/writer-lease", "/v2/writer-lease/bootstrap", "/v2/writer-lease/renew", "/v2/commit-file", "/v2/commit-files",
         "/v2/job", "/v2/job/resume", "/v2/job/reconcile",
         "/v2/tag/approval-request",
@@ -203,6 +203,19 @@ def test_http_allows_omitted_job_id_for_durable_server_resolution():
     )
 
 
+def test_http_mutation_routes_require_exact_runtime_principal():
+    handler = BridgeHandler.__new__(BridgeHandler)
+    runtime_principal = "runtime-" "agent-principal-token-1234"
+    handler.control_token = runtime_principal
+    handler.agent_task_api_url = "http://127.0.0.1:1"
+    handler.headers = {"Authorization": f"Bearer {runtime_principal}"}
+    assert handler._authorized("createGovernedTask", {}) is True
+    handler.headers = {"Authorization": "Bearer wrong-runtime-principal-token"}
+    assert handler._authorized("createGovernedTask", {}) is False
+    handler.headers = {}
+    assert handler._authorized("createGovernedTask", {}) is False
+
+
 def test_capability_contracts_return_exact_job_id_lineage():
     contracts = BridgeV2Adapter(runtime_status={}).getGovernedWriteCapabilities()["operation_contracts"]
     for operation in ("acquireWriterLease", "bootstrapWriterLease", "renewWriterLease"):

tests/test_online_agent_auto_claim.py

@@ -0,0 +1,524 @@
+from __future__ import annotations
+
+import hashlib
+import json
+from pathlib import Path
+import sys
+from types import SimpleNamespace
+
+import pytest
+
+
+ROOT = Path(__file__).resolve().parents[1]
+APP = ROOT / "active-runtime" / "app"
+sys.path.insert(0, str(APP))
+
+from aios_chatgpt_bridge_v2 import (  # noqa: E402
+    BRIDGE_OPERATION_CONTRACTS,
+    BridgeV2Adapter,
+)
+from aios_chatgpt_bridge_v2_server import GovernedRuntime  # noqa: E402
+from aios_governed_task_bootstrap import BootstrapError, GovernedTaskBinding, GovernedTaskBootstrap, _task_key  # noqa: E402
+from aios_online_agent_execution import (  # noqa: E402
+    ExecutionProjectionError,
+    GovernedExecutionBinding,
+    OnlineTaskProjectionClient,
+    project_execution_envelope,
+    project_online_task,
+    validate_execution_envelope,
+)
+import aios_online_agent_worker as worker_module  # noqa: E402
+from aios_online_agent_worker import ExecutionEnvelope, WorkerError, WorkerSupervisor, governed_commit, load_task_state  # noqa: E402
+
+
+BASE = "a642b045775b9154a00ae78543037fbef4fb447b"
+TASK = "p0-claim-online-agent-auto-execution-20260817"
+JOB = "job-2031a9e5682a4238f98e3ac7aee8a593"
+BRANCH = "agent/p0-claim-online-agent-auto-execution-20260817"
+
+
+def binding() -> GovernedExecutionBinding:
+    return GovernedExecutionBinding.from_mapping(
+        {
+            "task_id": TASK,
+            "job_id": JOB,
+            "repository": "aios/aios",
+            "base_oid": BASE,
+            "expected_branch_oid": BASE,
+            "target_branch": BRANCH,
+            "branch_mode": "CREATE_NEW",
+            "generation": 1,
+            "idempotency_key": "p0-claim-online-agent-auto-execution-v1",
+        }
+    )
+
+
+def task_without_envelope() -> dict:
+    return {
+        "task_id": TASK,
+        "goal": "make governed Online Tasks automatically executable",
+        "instructions": "project, claim, heartbeat, and preserve exact lineage",
+        "required_capabilities": ["git.read", "git.test"],
+        "metadata": {},
+    }
+
+
+def test_project_online_task_builds_execution_metadata_from_binding() -> None:
+    projected = project_online_task(binding(), task_without_envelope())
+    execution = projected["metadata"]["execution"]
+    assert execution["schema"] == "aios.online-agent.execution.v2"
+    assert execution["job_id"] == JOB
+    assert execution["task_id"] == TASK
+    assert execution["repository"] == "aios/aios"
+    assert execution["base_oid"] == BASE
+    assert execution["expected_branch_oid"] == BASE
+    assert execution["target_branch"] == BRANCH
+    assert execution["generation"] == 1
+    assert projected["metadata"]["execution_projection"]["execution_digest"] == execution["execution_digest"]
+
+
+def test_job_to_task_execution_projection(tmp_path: Path) -> None:
+    exact = binding()
+    durable = GovernedTaskBinding(
+        task_id=exact.task_id,
+        job_id=exact.job_id,
+        repository=exact.repository,
+        base_oid=exact.base_oid,
+        expected_branch_oid=exact.expected_branch_oid,
+        target_branch=exact.target_branch,
+        branch_mode=exact.branch_mode,
+        generation=exact.generation,
+        idempotency_key=exact.idempotency_key,
+        risk="engineering",
+        description="automatic claim infrastructure",
+    )
+
+    class Bootstrap:
+        def create(self, _request: dict) -> dict:
+            return durable.response()
+
+        def online_task_projection(self, _task_id: str, online: dict, execution: dict | None, **_kwargs: object) -> dict:
+            return project_online_task(exact, online, execution)
+
+        def get_binding(self, _task_id: str) -> GovernedTaskBinding:
+            return durable
+
+        def execution_binding(self, _binding: GovernedTaskBinding) -> GovernedExecutionBinding:
+            return exact
+
+    class Projector:
+        def __init__(self) -> None:
+            self.calls = 0
+
+        def create(self, projected: dict, *, binding: GovernedExecutionBinding) -> dict:
+            self.calls += 1
+            assert binding == exact
+            return {**projected, "status": "QUEUED"}
+
+    runtime = GovernedRuntime.__new__(GovernedRuntime)
+    runtime.bootstrap = Bootstrap()
+    runtime.bindings = {}
+    runtime.online_task_projector = Projector()
+    runtime.projection_outbox_root = tmp_path / "projection-outbox"
+    runtime.projection_outbox_root.mkdir()
+    response = GovernedRuntime.create_task(
+        runtime,
+        {
+            "task_id": TASK,
+            "repository": "aios/aios",
+            "base_oid": BASE,
+            "target_branch": BRANCH,
+            "risk": "engineering",
+            "description": "automatic claim infrastructure",
+            "idempotency_key": exact.idempotency_key,
+            "online_task": task_without_envelope(),
+        },
+    )
+    assert response["online_task_projection"]["status"] == "PROJECTED"
+    assert response["online_task_projection"]["task_status"] == "QUEUED"
+    assert runtime.online_task_projector.calls == 1
+
+
+def test_execution_envelope_schema_validation() -> None:
+    envelope = project_execution_envelope(binding())
+    validate_execution_envelope(envelope, binding=binding())
+    malformed = dict(envelope)
+    malformed["schema"] = "aios.online-agent.execution.v1"
+    with pytest.raises(ExecutionProjectionError, match="EXECUTION_ENVELOPE_SCHEMA_VALIDATION"):
+        validate_execution_envelope(malformed, binding=binding())
+
+
+def test_projection_response_must_equal_submitted_execution(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    submitted = project_online_task(binding(), task_without_envelope(), {"action": "source_capture", "source_signals": ["submitted"]})
+    returned = project_online_task(binding(), task_without_envelope(), {"action": "source_capture", "source_signals": ["different"]})
+    returned.update({"status": "QUEUED"})
+
+    class Response:
+        status = 201
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, *_args: object) -> None:
+            return None
+
+        def read(self) -> bytes:
+            return json.dumps(returned).encode("utf-8")
+
+    monkeypatch.setattr("aios_online_agent_execution.urllib.request.urlopen", lambda *_args, **_kwargs: Response())
+    token = tmp_path / "control.token"
+    token.write_text("x" * 40, encoding="utf-8")
+    with pytest.raises(ExecutionProjectionError, match="ONLINE_TASK_PROJECTION_RESPONSE_BINDING_INVALID"):
+        OnlineTaskProjectionClient("http://127.0.0.1:1", token).create(submitted, binding=binding())
+
+
+class _ProjectedBridge:
+    def __init__(self, value: dict) -> None:
+        self.value = value
+        self.calls = 0
+
+    def project_execution(self, _task: dict, _execution: dict | None = None) -> tuple[int, dict]:
+        self.calls += 1
+        return 200, self.value
+
+
+class _FakeAgent:
+    def __init__(self, tasks: list[dict]) -> None:
+        self.tasks = tasks
+        self.claimed: list[str] = []
+
+    def poll(self) -> list[dict]:
+        return self.tasks
+
+    def claim(self, task_id: str) -> tuple[int, dict]:
+        self.claimed.append(task_id)
+        return 200, {"task_id": task_id, "lease_token": "x" * 32, "attempt": 1, "revision": 2}
+
+
+def test_task_visible_to_worker_claimable(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    monkeypatch.setattr(worker_module, "STATE_ROOT", tmp_path)
+    supervisor = WorkerSupervisor("runtime-token-not-secret")
+    supervisor.bridge = _ProjectedBridge(project_execution_envelope(binding()))
+    envelope, source = supervisor.resolve_envelope(task_without_envelope())
+    assert source == "recovered_projection"
+    assert envelope.task_id == TASK
+    assert envelope.job_id == JOB
+    assert envelope.action == "source_capture"
+
+
+def test_task_claim_after_projection(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    monkeypatch.setattr(worker_module, "STATE_ROOT", tmp_path)
+    supervisor = WorkerSupervisor("runtime-token-not-secret")
+    fake_agent = _FakeAgent([task_without_envelope()])
+    supervisor.agent = fake_agent
+    supervisor.bridge = _ProjectedBridge(project_execution_envelope(binding()))
+    processed: list[tuple[str, str]] = []
+    supervisor.process_claim = lambda task, claim, envelope: processed.append((task["task_id"], envelope.execution_digest if hasattr(envelope, "execution_digest") else envelope.digest))  # type: ignore[method-assign]
+    assert supervisor.once() == 0
+    assert fake_agent.claimed == [TASK]
+    assert processed and processed[0][0] == TASK
+
+
+def test_claim_heartbeat_source_capture_and_result_lifecycle(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    execution = project_execution_envelope(binding(), {"action": "source_capture", "source_signals": ["agent"]})
+    task = task_without_envelope()
+    task["metadata"] = {"execution": execution}
+
+    class Agent:
+        def __init__(self) -> None:
+            self.heartbeats: list[str] = []
+            self.results: list[dict] = []
+
+        def heartbeat(self, _task_id: str, _lease_token: str, stage: str) -> tuple[int, dict]:
+            self.heartbeats.append(stage)
+            return 200, {}
+
+        def get(self, _task_id: str) -> tuple[int, dict]:
+            return 200, task
+
+        def result(self, _task_id: str, _lease_token: str, _key: str, result: dict) -> tuple[int, dict]:
+            self.results.append(result)
+            return 200, {}
+
+    worktree = tmp_path / "worktree"
+    source = worktree / "active-runtime" / "app" / "agent_auto_fixture.py"
+    source.parent.mkdir(parents=True)
+    source.write_text("VALUE = 1\n", encoding="utf-8")
+    monkeypatch.setattr(worker_module, "STATE_ROOT", tmp_path / "state")
+    monkeypatch.setattr(worker_module, "new_run_root", lambda: tmp_path / "run")
+    monkeypatch.setattr(worker_module, "prepare_worktree", lambda *_args, **_kwargs: worktree)
+    monkeypatch.setattr(worker_module, "cleanup_run_root", lambda *_args, **_kwargs: None)
+    agent = Agent()
+    supervisor = WorkerSupervisor("runtime-token-not-secret")
+    supervisor.agent = agent
+    supervisor.bridge = _ProjectedBridge(execution)
+    envelope, _ = supervisor.resolve_envelope(task)
+    supervisor.process_claim(task, {"task_id": TASK, "lease_token": "l" * 32, "attempt": 2, "revision": 8}, envelope)
+    assert agent.heartbeats and agent.heartbeats[0] == "claimed"
+    assert len(agent.results) == 1
+    assert agent.results[0]["status"] == "SUCCEEDED"
+    assert agent.results[0]["classification"] == "NEEDS_REWORK_SOURCE_CAPTURE"
+
+
+def test_dynamic_task_binding_no_hardcoded_task_id() -> None:
+    worker = (APP / "aios_online_agent_worker.py").read_text(encoding="utf-8")
+    assert TASK not in worker
+    assert BASE not in worker
+    for name in ("aios-online-agent-worker.service", "aios-online-engineering-consumer.service"):
+        unit = (ROOT / "deploy" / "systemd" / name).read_text(encoding="utf-8")
+        assert TASK not in unit
+        assert JOB not in unit
+        assert BASE not in unit
+        assert BRANCH not in unit
+        assert "AIOS_ENGINEERING_PLAN_FILE" not in unit
+        assert "aios_online_agent_worker.py" in unit
+    projection = (ROOT / "deploy" / "systemd" / "aios-chatgpt-bridge-v2-agent-task-projection.conf").read_text(encoding="utf-8")
+    assert "AIOS_ONLINE_TASK_PROJECTION_ENABLED=1" in projection
+    assert "LoadCredential=agent_task_control_token:" in projection
+    assert "LoadCredentialEncrypted=" not in projection
+    assert "Bearer " not in projection
+
+
+def test_durable_task_key_has_collision_resistant_exact_identity() -> None:
+    assert _task_key("task:a") != _task_key("task-a")
+    assert _task_key("x" * 140 + "a") != _task_key("x" * 140 + "b")
+
+
+def test_existing_binding_rejects_idempotency_head_and_generation_drift(tmp_path: Path) -> None:
+    class Authority:
+        @staticmethod
+        def commit_exists(_oid: str) -> bool:
+            return True
+
+        @staticmethod
+        def read_ref(_ref: str) -> None:
+            return None
+
+    bootstrap = GovernedTaskBootstrap(Authority(), tmp_path, remote_name="origin", token_path=tmp_path / "token", ssh_key_path=tmp_path / "key")
+    request = {
+        "task_id": TASK,
+        "repository": "aios/aios",
+        "base_oid": BASE,
+        "target_branch": BRANCH,
+        "risk": "engineering",
+        "description": "automatic claim infrastructure",
+        "idempotency_key": "p0-claim-online-agent-auto-execution-v1",
+        "expected_branch_oid": BASE,
+        "generation": 1,
+    }
+    bootstrap.create(request)
+    for drift in (
+        {"idempotency_key": "p0-claim-online-agent-auto-execution-v2"},
+        {"expected_branch_oid": "b" * 40},
+        {"generation": 2},
+    ):
+        with pytest.raises(BootstrapError, match="TASK_BINDING_CONFLICT"):
+            bootstrap.create({**request, **drift})
+
+
+def test_existing_branch_without_durable_parent_ownership_is_denied(tmp_path: Path) -> None:
+    class Authority:
+        @staticmethod
+        def commit_exists(_oid: str) -> bool:
+            return True
+
+        @staticmethod
+        def read_ref(_ref: str) -> str:
+            return BASE
+
+    bootstrap = GovernedTaskBootstrap(Authority(), tmp_path, remote_name="origin", token_path=tmp_path / "token", ssh_key_path=tmp_path / "key")
+    with pytest.raises(BootstrapError, match="EXISTING_BRANCH_OWNERSHIP_REQUIRED"):
+        bootstrap.create({
+            "task_id": TASK,
+            "repository": "aios/aios",
+            "base_oid": BASE,
+            "target_branch": BRANCH,
+            "risk": "engineering",
+            "description": "automatic claim infrastructure",
+            "idempotency_key": "p0-claim-online-agent-auto-execution-v1",
+            "expected_branch_oid": BASE,
+            "generation": 2,
+        })
+
+
+@pytest.mark.parametrize(
+    ("field", "value", "error"),
+    [
+        ("repository", "other/repo", "WRONG_REPOSITORY_ENVELOPE_DENY"),
+        ("target_branch", "agent/wrong-branch", "WRONG_BRANCH_ENVELOPE_DENY"),
+        ("generation", 2, "WRONG_GENERATION_ENVELOPE_DENY"),
+    ],
+)
+def test_wrong_lineage_envelope_deny(field: str, value: object, error: str) -> None:
+    envelope = project_execution_envelope(binding())
+    envelope[field] = value
+    with pytest.raises(ExecutionProjectionError, match=error):
+        validate_execution_envelope(envelope, binding=binding())
+
+
+def test_capability_mismatch_deny() -> None:
+    envelope = project_execution_envelope(
+        binding(),
+        {"action": "source_capture", "capability_scope": ["git.read", "governed.write.file"]},
+    )
+    with pytest.raises(ExecutionProjectionError, match="CAPABILITY_MISMATCH_DENY"):
+        validate_execution_envelope(envelope, binding=binding(), worker_capabilities=["git.read"])
+
+
+def test_governance_lineage_override_deny() -> None:
+    envelope = project_execution_envelope(binding())
+    envelope["governance"] = {**envelope["governance"], "job_id": "job-wrong-lineage"}
+    with pytest.raises(ExecutionProjectionError, match="JOB_BINDING_CONFLICT"):
+        validate_execution_envelope(envelope, binding=binding())
+
+
+def test_malformed_persisted_envelope_does_not_fallback() -> None:
+    task = task_without_envelope()
+    task["metadata"] = {"execution": {"schema": "broken"}}
+    bridge = _ProjectedBridge(project_execution_envelope(binding()))
+    supervisor = WorkerSupervisor("runtime-token-not-secret")
+    supervisor.bridge = bridge
+    with pytest.raises(WorkerError, match="EXECUTION_ENVELOPE_SCHEMA_VALIDATION"):
+        supervisor.resolve_envelope(task)
+    assert bridge.calls == 0
+
+
+def test_self_consistent_persisted_wrong_lineage_is_denied_by_authority() -> None:
+    task = task_without_envelope()
+    wrong = binding()
+    wrong = GovernedExecutionBinding.from_mapping({**wrong.public(), "job_id": "job-00000000000000000000000000000000"})
+    task["metadata"] = {"execution": project_execution_envelope(wrong)}
+    supervisor = WorkerSupervisor("runtime-token-not-secret")
+    supervisor.bridge = _ProjectedBridge(project_execution_envelope(binding()))
+    with pytest.raises(WorkerError, match="TASK_PERSISTED_BINDING_CONFLICT"):
+        supervisor.resolve_envelope(task)
+
+
+def test_projection_control_missing_denies_before_governed_side_effect() -> None:
+    class Bootstrap:
+        called = False
+
+        def create(self, _request: dict) -> dict:
+            self.called = True
+            raise AssertionError("must not create governed state")
+
+    runtime = GovernedRuntime.__new__(GovernedRuntime)
+    runtime.bootstrap = Bootstrap()
+    runtime.online_task_projector = None
+    with pytest.raises(RuntimeError, match="ONLINE_TASK_PROJECTION_CONTROL_UNAVAILABLE"):
+        GovernedRuntime.create_task(runtime, {"task_id": TASK, "require_online_task_projection": True})
+    assert runtime.bootstrap.called is False
+
+
+def test_source_capture_projection_cannot_write() -> None:
+    envelope = project_execution_envelope(binding())
+    assert envelope["action"] == "source_capture"
+    assert envelope["change_set"] == []
+    assert envelope["verification"] == []
+    assert envelope["governance"]["writer_lease"] is False
+    assert all(envelope["governance"][field] is False for field in ("main_write", "production_write", "tag_write", "baseline_write", "force_push", "protected_ref_bypass"))
+
+
+def test_source_capture_state_allows_next_attempt_deterministic_digest(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    monkeypatch.setattr(worker_module, "STATE_ROOT", tmp_path)
+    state_path = tmp_path / "tasks" / f"{TASK}.json"
+    state_path.parent.mkdir(parents=True)
+    state_path.write_text(json.dumps({"task_id": TASK, "execution_digest": "a" * 64, "phase": "source_capture_done"}), encoding="utf-8")
+    assert load_task_state(TASK, "b" * 64) is None
+
+
+def test_bridge_exposes_controlled_projection_operation() -> None:
+    seen: list[dict] = []
+    adapter = BridgeV2Adapter(
+        runtime_status={},
+        handlers={"projectOnlineAgentExecution": lambda request: seen.append(dict(request)) or project_execution_envelope(binding())},
+    )
+    response = adapter.projectOnlineAgentExecution({"task_id": TASK})
+    assert response["job_id"] == JOB
+    assert seen == [{"task_id": TASK}]
+    assert BRIDGE_OPERATION_CONTRACTS["projectOnlineAgentExecution"]["path"] == "/v2/execution-envelope"
+
+
+def test_execution_digest_is_canonical() -> None:
+    envelope = project_execution_envelope(binding())
+    material = {key: value for key, value in envelope.items() if key != "execution_digest"}
+    expected = hashlib.sha256(json.dumps(material, ensure_ascii=False, sort_keys=True, separators=(",", ":")).encode()).hexdigest()
+    assert envelope["execution_digest"] == expected
+
+
+def test_governed_commit_uses_existing_exact_job_without_recreating(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    execution = project_execution_envelope(
+        binding(),
+        {
+            "action": "deterministic",
+            "change_set": [{"operation": "write_file", "path": "result.txt", "content": "ok\n"}],
+            "governance": {"allowed_files": ["result.txt"]},
+        },
+    )
+    envelope = ExecutionEnvelope.from_task({"task_id": TASK, "metadata": {"execution": execution}})
+    (tmp_path / "result.txt").write_text("ok\n", encoding="utf-8")
+    commit_oid = "b" * 40
+
+    class Bridge:
+        def __init__(self) -> None:
+            self.routes: list[str] = []
+
+        def call(self, route: str, body: dict) -> tuple[int, dict]:
+            self.routes.append(route)
+            if route == "/v2/job":
+                assert body == {"job_id": JOB}
+            else:
+                assert body["task_id"] == TASK
+                assert body["job_id"] == JOB
+            if route == "/v2/writer-lease":
+                return 200, {
+                    "task_id": TASK,
+                    "job_id": JOB,
+                    "repository": "aios/aios",
+                    "base_oid": BASE,
+                    "expected_branch_oid": BASE,
+                    "branch_mode": "CREATE_NEW",
+                    "generation": 1,
+                    "target_branch": BRANCH,
+                }
+            if route == "/v2/commit-files":
+                return 200, {
+                    "job_id": JOB,
+                    "target_branch": BRANCH,
+                    "generation": 1,
+                    "branch_mode": "CONTINUE_EXISTING",
+                    "commit_oid": commit_oid,
+                    "commit_visible": True,
+                    "receipt": {
+                        "remote_verified": True,
+                        "authority_oid": commit_oid,
+                        "api_branch_oid": commit_oid,
+                        "git_remote_oid": commit_oid,
+                    },
+                }
+            if route == "/v2/job":
+                return 200, {
+                    "state": "COMPLETED",
+                    "receipt": {
+                        "remote_verified": True,
+                        "authority_oid": commit_oid,
+                        "api_branch_oid": commit_oid,
+                        "git_remote_oid": commit_oid,
+                    },
+                    "branch_leases": [{
+                        "job_id": JOB,
+                        "branch": BRANCH,
+                        "state": "ACTIVE",
+                        "generation": 1,
+                        "current_head_oid": commit_oid,
+                    }],
+                }
+            raise AssertionError(route)
+
+    bridge = Bridge()
+    monkeypatch.setattr(worker_module.subprocess, "run", lambda *args, **kwargs: SimpleNamespace(returncode=0, stdout=commit_oid + "\n", stderr=""))
+    heartbeat = SimpleNamespace(ensure=lambda: None)
+    result = governed_commit(envelope, tmp_path, bridge, heartbeat)
+    assert bridge.routes == ["/v2/writer-lease", "/v2/commit-files", "/v2/job"]
+    assert result["job_id"] == JOB
+    assert result["commit_oid"] == commit_oid

tests/test_online_agent_durable_checkpoint.py

@@ -1,216 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-import json
-import sys
-
-import pytest
-
-ROOT=Path(__file__).resolve().parents[1]
-APP=ROOT/"active-runtime/app"
-sys.path.insert(0,str(APP))
-
-from aios_online_agent_checkpoint import (
-    CheckpointBinding,
-    CheckpointError,
-    CheckpointStore,
-)
-import aios_online_agent_worker as worker
-
-
-def binding(attempt: int = 1, *, tenant_head: str = "b"*40):
-    return CheckpointBinding(
-        task_id="task-p1-a",
-        attempt=attempt,
-        execution_digest="d"*64,
-        job_id="job-p1-a",
-        repository="aios/aios",
-        base_oid="a"*40,
-        expected_branch_oid=tenant_head,
-        target_branch="agent/task-p1-a",
-        generation=1,
-    )
-
-
-def test_CHECKPOINT_DURABLE_WRITE(tmp_path):
-    store=CheckpointStore(tmp_path/"checkpoints.sqlite3")
-    first=store.append(binding(), "claimed", {"phase":"claimed","attempt":1})
-    second=store.append(binding(), "workspace_prepared", {"phase":"workspace_prepared","attempt":1})
-    assert first["sequence"] == 1
-    assert second["sequence"] == 2
-    latest=store.latest("task-p1-a")
-    assert latest["phase"]=="workspace_prepared"
-    assert latest["payload"]["attempt"]==1
-
-
-def test_CHECKPOINT_SCOPE_ISOLATION(tmp_path):
-    store=CheckpointStore(tmp_path/"checkpoints.sqlite3")
-    store.append(binding(), "claimed", {"phase":"claimed"})
-    changed=CheckpointBinding(
-        task_id="task-p1-a",attempt=1,execution_digest="d"*64,job_id="job-p1-a",
-        repository="aios/other",base_oid="a"*40,expected_branch_oid="b"*40,
-        target_branch="agent/task-p1-a",generation=1,
-    )
-    with pytest.raises(CheckpointError,match="CHECKPOINT_SCOPE_MISMATCH_DENY"):
-        store.append(changed,"workspace_prepared",{"phase":"workspace_prepared"})
-
-
-def test_RESUME_FROM_CHECKPOINT_across_attempt_same_binding(tmp_path):
-    store=CheckpointStore(tmp_path/"checkpoints.sqlite3")
-    store.append(binding(1), "source_capture_done", {
-        "phase":"source_capture_done",
-        "attempt":1,
-        "result":{"status":"SUCCEEDED","classification":"NEEDS_REWORK_SOURCE_CAPTURE"},
-    })
-    resumed=store.verify_latest_binding(binding(2))
-    assert resumed is not None
-    assert resumed["attempt"]==1
-    assert resumed["phase"]=="source_capture_done"
-
-
-def test_checkpoint_new_attempt_can_start_from_claimed(tmp_path):
-    store=CheckpointStore(tmp_path/"checkpoints.sqlite3")
-    store.append(binding(1),"result_submitted",{"phase":"result_submitted"})
-    cp=store.append(binding(2),"claimed",{"phase":"claimed"})
-    assert cp["attempt"]==2
-    assert cp["sequence"]==1
-
-
-def envelope():
-    return worker.ExecutionEnvelope(
-        task_id="task-p1-a",
-        job_id="job-p1-a",
-        repository="aios/aios",
-        base_oid="a"*40,
-        expected_branch_oid="b"*40,
-        target_branch="agent/task-p1-a",
-        branch_mode="CONTINUE_EXISTING",
-        generation=1,
-        idempotency_key="governed-p1-a",
-        action="source_capture",
-        adapter="source_capture",
-        capability_scope=("git.read","git.test"),
-        source_signals=(),
-        change_set=(),
-        verification=(),
-        governance={"task_id":"task-p1-a","job_id":"job-p1-a"},
-        workspace={},
-        digest="d"*64,
-    )
-
-
-def test_RESULT_SUBMISSION_REPLAY_SAFE_attempt_aware_key():
-    env=envelope()
-    result={"status":"SUCCEEDED","execution_digest":env.digest}
-    one=worker.result_idempotency_key(env.task_id,1,env,result)
-    two=worker.result_idempotency_key(env.task_id,2,env,result)
-    assert one != two
-    assert "-a1-result-" in one
-    assert "-a2-result-" in two
-    assert one == worker.result_idempotency_key(env.task_id,1,env,result)
-
-
-class RetryClient:
-    def __init__(self):
-        self.calls=[]
-    def result(self,task_id,lease_token,key,result):
-        self.calls.append((task_id,key,dict(result)))
-        return (599,{"error":"SERVICE_UNAVAILABLE"}) if len(self.calls)==1 else (201,{"status":"VERIFYING"})
-    def get(self,task_id):
-        return 500,{}
-
-
-def test_RETRY_IDEMPOTENT_NO_DUPLICATE_SIDE_EFFECT_reuses_same_key(monkeypatch):
-    client=RetryClient()
-    monkeypatch.setattr(worker.time,"sleep",lambda _:None)
-    status,response=worker.submit_result_replay_safe(
-        client,"task-p1-a","lease-token-"+"x"*32,"stable-key",{"status":"SUCCEEDED"}
-    )
-    assert status==201
-    assert [item[1] for item in client.calls]==["stable-key","stable-key"]
-
-
-class ConflictClient:
-    def __init__(self,result):
-        self.result_value=result
-    def result(self,*args):
-        return 409,{"error":"IDEMPOTENCY_CONFLICT"}
-    def get(self,task_id):
-        return 200,{"status":"VERIFYING","result":dict(self.result_value)}
-
-
-def test_RESULT_SUBMISSION_REPLAY_SAFE_reconciles_exact_result():
-    result={"status":"SUCCEEDED","value":1}
-    status,response=worker.submit_result_replay_safe(
-        ConflictClient(result),"task-p1-a","lease-token-"+"x"*32,"stable-key",result
-    )
-    assert status==200
-    assert response["idempotent"] is True
-    assert response["reconciled"] is True
-
-
-def test_RESULT_SUBMISSION_REPLAY_SAFE_rejects_conflicting_result():
-    status,response=worker.submit_result_replay_safe(
-        ConflictClient({"status":"SUCCEEDED","value":2}),
-        "task-p1-a","lease-token-"+"x"*32,"stable-key",
-        {"status":"SUCCEEDED","value":1},
-    )
-    assert status==409
-    assert response["error"]=="IDEMPOTENCY_CONFLICT"
-
-
-def test_WORKSPACE_CLEANUP_RECOVERY(tmp_path,monkeypatch):
-    root=tmp_path/"workspaces"; root.mkdir()
-    stale=root/"task-old"; stale.mkdir(); (stale/"x").write_text("x")
-    monkeypatch.setattr(worker,"WORKSPACE_ROOT",root)
-    monkeypatch.setattr(worker,"STATE_ROOT",tmp_path/"state")
-    removed=worker.recover_stale_workspaces()
-    assert removed==1
-    assert not stale.exists()
-
-
-class LeaseBridge:
-    def __init__(self):
-        self.calls=0
-    def call(self,route,body):
-        assert route=="/v2/writer-lease"
-        self.calls+=1
-        if self.calls==1:
-            return 599,{"error":"SERVICE_UNAVAILABLE"}
-        return 200,{
-            "lease_id":"lease-p1-a",
-            "job_id":"job-p1-a",
-            "task_id":"task-p1-a",
-            "repository":"aios/aios",
-            "base_oid":"a"*40,
-            "expected_branch_oid":"b"*40,
-            "branch_mode":"CONTINUE_EXISTING",
-            "generation":1,
-            "target_branch":"agent/task-p1-a",
-            "state":"ACTIVE",
-        }
-
-
-class LeaseHeartbeatStub:
-    def ensure(self):
-        return None
-
-
-def test_LEASE_RENEWAL_RECOVERY_retries_same_binding(monkeypatch):
-    env=envelope()
-    env=worker.ExecutionEnvelope(
-        task_id=env.task_id,job_id=env.job_id,repository=env.repository,
-        base_oid=env.base_oid,expected_branch_oid=env.expected_branch_oid,
-        target_branch=env.target_branch,branch_mode=env.branch_mode,generation=env.generation,
-        idempotency_key=env.idempotency_key,action=env.action,adapter=env.adapter,
-        capability_scope=env.capability_scope,source_signals=env.source_signals,
-        change_set=env.change_set,verification=env.verification,
-        governance={"task_id":env.task_id,"job_id":env.job_id,"lease_seconds":900},
-        workspace=env.workspace,digest=env.digest,
-    )
-    bridge=LeaseBridge()
-    monkeypatch.setattr(worker.time,"sleep",lambda _:None)
-    monkeypatch.setattr(worker,"STATE_ROOT",Path("/tmp")/"aios-p1-test-state")
-    response=worker.acquire_writer_lease_replay_safe(env,bridge,LeaseHeartbeatStub())
-    assert response["lease_id"]=="lease-p1-a"
-    assert bridge.calls==2

tests/test_online_agent_scheme_a.py

@@ -0,0 +1,245 @@
+from __future__ import annotations
+
+from pathlib import Path
+from types import SimpleNamespace
+import json
+import sys
+
+import pytest
+
+ROOT=Path(__file__).resolve().parents[1]
+APP=ROOT/"active-runtime/app"
+sys.path.insert(0,str(APP))
+
+from aios_online_agent_execution import GovernedExecutionBinding, project_execution_envelope
+from aios_governed_task_bootstrap import GovernedTaskBinding, GovernedTaskBootstrap
+from aios_gitops_job_controller import GitOpsJobController, JobState, JobStore
+from aios_continuation_executor import ContinuationExecutionError, DetachedGitWorkspace
+from aios_online_agent_worker import (
+    BridgeClient,
+    IsolatedDeterministicExecutor,
+    load_task_state,
+    _claim_order,
+    _isolated_executor_wait_seconds,
+    _verify_converged_job,
+    WorkerError,
+)
+
+
+BASE="a642b045775b9154a00ae78543037fbef4fb447b"
+HEAD="71523aef6e48b1e2fa516c456ca189b7a039104b"
+TASK="p0-claim-online-agent-auto-execution-20260817"
+JOB="job-2031a9e5682a4238f98e3ac7aee8a593"
+BRANCH="agent/p0-claim-online-agent-auto-execution-20260817"
+
+
+def test_source_signals_are_bounded_by_projection():
+    binding=GovernedExecutionBinding.from_mapping({
+      "task_id":TASK,"job_id":JOB,"repository":"aios/aios","base_oid":BASE,
+      "expected_branch_oid":BASE,"target_branch":BRANCH,"branch_mode":"CREATE_NEW",
+      "generation":1,"idempotency_key":"p0-claim-online-agent-auto-execution-a642b04-v1",
+    })
+    execution=project_execution_envelope(binding,{
+      "action":"source_capture",
+      "source_signals":["x"*5000,"x"*5000,"trace credential tool "*100],
+    })
+    assert len(execution["source_signals"]) <= 16
+    assert all(0 < len(item) <= 512 for item in execution["source_signals"])
+
+
+def test_same_job_create_new_binding_normalizes_to_current_head():
+    binding=GovernedTaskBinding(
+      task_id=TASK,job_id=JOB,repository="aios/aios",base_oid=BASE,
+      expected_branch_oid=BASE,target_branch=BRANCH,branch_mode="CREATE_NEW",
+      generation=1,idempotency_key="p0-claim-online-agent-auto-execution-a642b04-v1",
+      risk="engineering",description="automatic claim",
+    )
+    bootstrap=GovernedTaskBootstrap.__new__(GovernedTaskBootstrap)
+    bootstrap.authority=SimpleNamespace(read_ref=lambda ref: HEAD)
+    class Connection:
+        def __enter__(self): return self
+        def __exit__(self,*a): return False
+        def execute(self,*a,**k):
+            return SimpleNamespace(fetchall=lambda:[{
+              "current_head_oid":HEAD,"generation":1,"state":"ACTIVE","lineage_anchor_oid":BASE
+            }])
+    bootstrap._store=lambda _task:(SimpleNamespace(_connect=lambda:Connection()),None)
+    normalized=bootstrap.execution_binding(binding)
+    assert normalized.base_oid == BASE
+    assert normalized.expected_branch_oid == HEAD
+    assert normalized.branch_mode == "CONTINUE_EXISTING"
+    assert normalized.generation == 1
+
+
+def test_recovery_receipt_requires_exact_oid_and_active_lease():
+    envelope=SimpleNamespace(job_id=JOB,target_branch=BRANCH,generation=1)
+    response={
+      "state":"COMPLETED",
+      "receipt":{"remote_verified":True,"authority_oid":HEAD,"api_branch_oid":HEAD,"git_remote_oid":HEAD},
+      "branch_leases":[{
+        "job_id":JOB,"branch":BRANCH,"state":"ACTIVE","generation":1,"current_head_oid":HEAD
+      }],
+    }
+    _verify_converged_job(response,envelope,HEAD)
+    bad={**response,"receipt":{**response["receipt"],"git_remote_oid":BASE}}
+    with pytest.raises(WorkerError,match="GOVERNED_RECEIPT_OID_MISMATCH"):
+        _verify_converged_job(bad,envelope,HEAD)
+
+
+def test_executor_unit_is_uncredentialed():
+    unit=(ROOT/"deploy/systemd/aios-online-agent-isolated-executor.service").read_text()
+    assert "PrivateNetwork=true" in unit
+    assert "RestrictAddressFamilies=AF_UNIX AF_INET" in unit
+    assert "IPAddressDeny=any" in unit
+    assert "IPAddressAllow=localhost" in unit
+    assert "InaccessiblePaths=/run/credentials" in unit
+    assert "LoadCredential" not in unit
+    assert "SupplementaryGroups=gitops" not in unit
+
+
+def test_isolated_executor_wait_budget_includes_safety_margin():
+    assert _isolated_executor_wait_seconds(({"timeout_seconds":1200},)) == 1230
+
+
+def test_prepared_deterministic_plan_precedes_source_capture_at_same_priority():
+    deterministic=SimpleNamespace(action="deterministic",task_id="task-deterministic")
+    source_capture=SimpleNamespace(action="source_capture",task_id="task-source-capture")
+    task={"priority":100,"created_at":"2026-08-17T00:00:00Z"}
+    ordered=sorted(((task,source_capture),(task,deterministic)),key=_claim_order)
+    assert ordered[0][1] is deterministic
+
+
+def test_plan_registry_gets_precedence_when_task_has_no_execution(monkeypatch):
+    client=BridgeClient("agent-token-placeholder")
+    seen=[]
+    monkeypatch.setattr(client,"call",lambda route,body:(seen.append((route,body)) or (200,{})))
+    task={"task_id":TASK,"required_capabilities":["git.read"]}
+    client.project_execution(task)
+    assert seen == [("/v2/execution-envelope",{"task_id":TASK,"required_capabilities":["git.read"]})]
+    client.project_execution(task,{"action":"source_capture","source_signals":["trace"]})
+    assert seen[-1][1]["execution"]["action"] == "source_capture"
+
+
+def test_executor_exchange_files_are_group_readable_and_directories_setgid(tmp_path):
+    request=tmp_path/"request.json"
+    IsolatedDeterministicExecutor._atomic(request,b"{}")
+    assert request.stat().st_mode & 0o777 == 0o640
+    tmpfiles=(ROOT/"deploy/tmpfiles.d/aios-online-agent-executor.conf").read_text()
+    assert tmpfiles.count(" 2770 ") == 5
+
+
+def test_precommit_state_recovery_requires_a_later_official_attempt(monkeypatch,tmp_path):
+    import aios_online_agent_worker as worker_module
+    monkeypatch.setattr(worker_module,"STATE_ROOT",tmp_path)
+    state_path=tmp_path/"tasks"/f"{TASK}.json"
+    state_path.parent.mkdir(parents=True)
+    state_path.write_text(json.dumps({"task_id":TASK,"execution_digest":"a"*64,"phase":"workspace_prepared"}))
+    assert load_task_state(TASK,"b"*64) is None
+    state_path.write_text(json.dumps({"task_id":TASK,"execution_digest":"a"*64,"phase":"verification_passed","attempt":16}))
+    with pytest.raises(WorkerError,match="TASK_PAYLOAD_DRIFT"):
+        load_task_state(TASK,"b"*64,attempt=16)
+    assert load_task_state(TASK,"b"*64,attempt=17) is None
+
+
+def test_reconciliation_state_recovery_requires_later_attempt_and_same_job(monkeypatch,tmp_path):
+    import aios_online_agent_worker as worker_module
+    monkeypatch.setattr(worker_module,"STATE_ROOT",tmp_path)
+    state_path=tmp_path/"tasks"/f"{TASK}.json"
+    state_path.parent.mkdir(parents=True)
+    state_path.write_text(json.dumps({
+        "task_id":TASK,
+        "execution_digest":"a"*64,
+        "phase":"reconciliation_required",
+        "attempt":18,
+        "job_id":JOB,
+        "details":{"api_status":503,"error":"WORKTREE_DIRTY_SCOPE_MISMATCH"},
+    }))
+    with pytest.raises(WorkerError,match="TASK_PAYLOAD_DRIFT"):
+        load_task_state(TASK,"b"*64,attempt=18,continuation_job_id=JOB,continuation_head_oid=HEAD)
+    assert load_task_state(TASK,"b"*64,attempt=19,continuation_job_id=JOB,continuation_head_oid=HEAD) is None
+    with pytest.raises(WorkerError,match="TASK_PAYLOAD_DRIFT"):
+        load_task_state(TASK,"b"*64,attempt=19,continuation_job_id="job-other",continuation_head_oid=HEAD)
+
+
+def test_legacy_dirty_scope_reconciliation_state_is_exactly_bounded(monkeypatch,tmp_path):
+    import aios_online_agent_worker as worker_module
+    monkeypatch.setattr(worker_module,"STATE_ROOT",tmp_path)
+    state_path=tmp_path/"tasks"/f"{TASK}.json"
+    state_path.parent.mkdir(parents=True)
+    state_path.write_text(json.dumps({
+        "task_id":TASK,
+        "execution_digest":"a"*64,
+        "phase":"reconciliation_required",
+        "job_id":JOB,
+        "details":{"api_status":503,"error":"WORKTREE_DIRTY_SCOPE_MISMATCH"},
+    }))
+    assert load_task_state(TASK,"b"*64,attempt=19,continuation_job_id=JOB,continuation_head_oid=HEAD) is None
+    with pytest.raises(WorkerError,match="TASK_PAYLOAD_DRIFT"):
+        load_task_state(TASK,"b"*64,attempt=19,continuation_job_id=JOB,continuation_head_oid="not-an-oid")
+
+
+def test_completed_same_job_begins_one_idempotent_continuation_cycle(tmp_path):
+    controller=GitOpsJobController(JobStore(tmp_path/"jobs",payload_root=tmp_path/"payloads"))
+    submitted=controller.submit({
+        "idempotency_key":"same-job-continuation-test",
+        "campaign_id":TASK,
+        "task_id":TASK,
+        "repository":"aios/aios",
+        "operation":"GOVERNED_TASK_CREATE",
+        "branch":BRANCH,
+        "expected_branch_oid":HEAD,
+        "payload_digest":"a"*64,
+    })
+    job_id=submitted.job_id
+    controller.advance(job_id,JobState.AUTHORIZED,side_effect_state="AUTHORIZED",expected_revision=0)
+    controller.lease_job(
+        job_id,
+        lease_id="lease-"+job_id,
+        lineage_anchor_oid=BASE,
+        current_head_oid=HEAD,
+        generation=1,
+        lease_expires_at="2099-01-01T00:00:00+00:00",
+        expected_revision=1,
+    )
+    controller.advance(job_id,JobState.WORKTREE_READY,side_effect_state="WORKTREE_READY",expected_revision=2)
+    controller.advance(job_id,JobState.EXECUTING,side_effect_state="IN_PROGRESS",expected_revision=3)
+    controller.advance(job_id,JobState.LOCAL_VERIFIED,side_effect_state="LOCAL_VERIFIED",receipt={"authority_oid":HEAD},expected_revision=4)
+    controller.advance(job_id,JobState.REMOTE_SYNCING,side_effect_state="IN_PROGRESS",expected_revision=5)
+    receipt={
+        "remote_verified":True,
+        "commit_visible":True,
+        "authority_oid":HEAD,
+        "api_branch_oid":HEAD,
+        "git_remote_oid":HEAD,
+    }
+    controller.advance(job_id,JobState.REMOTE_VERIFIED,side_effect_state="REMOTE_VERIFIED",receipt=receipt,expected_revision=6)
+    controller.advance(job_id,JobState.COMPLETED,side_effect_state="REMOTE_VERIFIED",receipt=receipt,expected_revision=7)
+    first=controller.begin_continuation_cycle(
+        job_id,
+        idempotency_key="same-job-continuation-commit-v1",
+        expected_head_oid=HEAD,
+        generation=1,
+        expected_revision=8,
+    )
+    assert first == {"completed":False,"commit_oid":None,"idempotent":False}
+    assert controller.store.read(job_id)["state"] == "LEASED"
+    replay=controller.begin_continuation_cycle(
+        job_id,
+        idempotency_key="same-job-continuation-commit-v1",
+        expected_head_oid=HEAD,
+        generation=1,
+        expected_revision=8,
+    )
+    assert replay == {"completed":False,"commit_oid":None,"idempotent":True}
+
+
+def test_deterministic_materialization_recovers_only_an_in_scope_dirty_subset(monkeypatch,tmp_path):
+    workspace=object.__new__(DetachedGitWorkspace)
+    workspace.path=tmp_path
+    monkeypatch.setattr(DetachedGitWorkspace,"_dirty_paths",lambda _self:{"old.py"})
+    workspace.materialize_files({"old.py":b"new-old\n","new.py":b"new\n"})
+    assert (tmp_path/"old.py").read_bytes() == b"new-old\n"
+    assert (tmp_path/"new.py").read_bytes() == b"new\n"
+    monkeypatch.setattr(DetachedGitWorkspace,"_dirty_paths",lambda _self:{"outside.py"})
+    with pytest.raises(ContinuationExecutionError,match="WORKTREE_DIRTY_SCOPE_MISMATCH"):
+        workspace.materialize_files({"old.py":b"again\n"})

tests/test_trace_tool_credential_governance.py

@@ -1,487 +0,0 @@
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-
-import pytest
-
-from active_runtime.app.aios_credential_broker import CredentialBroker
-from active_runtime.app.agent_observability_hooks import AgentObservabilityHooks
-from active_runtime.app.message_handoff import DurableHandoffStore, MessageEnvelope
-from active_runtime.app.search_gateway import (
-    SearchEvidence,
-    SearchGateway,
-    SearchProviderAttempt,
-    SearchRequest,
-)
-from active_runtime.app.search_gateway_orchestrator import SearchGatewayOrchestrator
-from active_runtime.app.trace_tool_credential_governance import (
-    CredentialGrant,
-    GovernanceActor,
-    GovernanceError,
-    GovernanceScope,
-    GovernanceStore,
-    ToolDescriptor,
-    TraceContext,
-    bind_trace_lineage,
-)
-
-
-TENANT_SCOPE = GovernanceScope(
-    "tenant",
-    tenant_id="tenant-a",
-    user_id="user-a",
-    project_id="project-a",
-    conversation_id="conversation-a",
-    run_id="run-a",
-)
-
-
-def actor(*capabilities: str, tenant_id: str = "tenant-a") -> GovernanceActor:
-    return GovernanceActor(
-        "actor-a",
-        GovernanceScope(
-            "tenant",
-            tenant_id=tenant_id,
-            user_id="user-a",
-            project_id="project-a",
-            conversation_id="conversation-a",
-            run_id="run-a",
-        ),
-        tuple(capabilities),
-    )
-
-
-def owner() -> GovernanceActor:
-    return GovernanceActor("owner-control", GovernanceScope("system"), ("system.admin",))
-
-
-def message(**changes):
-    values = dict(
-        source="task-plane",
-        target="worker-a",
-        message_type="tool.invoke",
-        payload={"query": "safe"},
-        sequence=1,
-        idempotency_key="message-a-1",
-        tenant_id="tenant-a",
-        user_id="user-a",
-        project_id="project-a",
-        conversation_id="conversation-a",
-        task_id="task-a",
-        run_id="run-a",
-        confidentiality_scope="run",
-    )
-    values.update(changes)
-    return MessageEnvelope(**values)
-
-
-def task(**changes):
-    value = {
-        "task_id": "task-a",
-        "claim_id": "claim-a",
-        "correlation_id": "correlation-a",
-        "scope_type": "tenant",
-        "tenant_id": "tenant-a",
-        "user_id": "user-a",
-        "project_id": "project-a",
-        "conversation_id": "conversation-a",
-        "run_id": "run-a",
-    }
-    value.update(changes)
-    return value
-
-
-def root_trace():
-    return bind_trace_lineage(
-        actor=actor("tool.search"),
-        task=task(),
-        message=message(),
-        trace_id="trace-a",
-        span_id="span-root",
-    )
-
-
-def test_trace_lineage_continuity_and_durable_restart(tmp_path: Path) -> None:
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    root = root_trace()
-    child = root.child(span_id="span-tool", actor=actor("tool.search"))
-    store.record_trace(root, actor("tool.search"))
-    store.record_trace(child, actor("tool.search"))
-
-    reopened = GovernanceStore(tmp_path / "governance.sqlite3")
-    assert reopened.verify_audit_chain(("TRACE_RECORDED",))
-    assert child.trace_id == root.trace_id
-    assert child.parent_span_id == root.span_id
-    assert child.task_id == "task-a"
-    assert child.claim_id == "claim-a"
-
-
-def test_trace_lineage_continuity_rejects_task_change() -> None:
-    with pytest.raises(GovernanceError, match="TRACE_LINEAGE_CONTINUITY"):
-        bind_trace_lineage(
-            actor=actor("tool.search"),
-            task=task(task_id="task-b"),
-            message=message(),
-            trace_id="trace-a",
-            span_id="span-root",
-        )
-
-
-def test_trace_scope_mismatch_deny() -> None:
-    with pytest.raises(GovernanceError, match="TRACE_SCOPE_MISMATCH_DENY"):
-        bind_trace_lineage(
-            actor=actor("tool.search"),
-            task=task(),
-            message=message(tenant_id="tenant-b"),
-            trace_id="trace-a",
-            span_id="span-root",
-        )
-
-
-def test_message_correlation_is_identity_bound() -> None:
-    first = message(correlation_id="correlation-a")
-    second = message(correlation_id="correlation-b")
-    assert first.envelope_id != second.envelope_id
-    assert first.as_record()["correlation_id"] == "correlation-a"
-
-
-def test_message_handoff_legacy_schema_migrates_without_changing_id(tmp_path: Path) -> None:
-    import sqlite3
-
-    path = tmp_path / "legacy.sqlite3"
-    legacy = message()
-    record = legacy.as_record()
-    record.pop("correlation_id")
-    with sqlite3.connect(path) as connection:
-        connection.executescript(
-            """
-            CREATE TABLE message_handoff (
-              envelope_id TEXT PRIMARY KEY, stream_key TEXT NOT NULL, source TEXT NOT NULL,
-              target TEXT NOT NULL, message_type TEXT NOT NULL, payload_json TEXT NOT NULL,
-              payload_sha256 TEXT NOT NULL, tenant_id TEXT, user_id TEXT, project_id TEXT,
-              conversation_id TEXT, task_id TEXT, run_id TEXT, causation_id TEXT,
-              sequence INTEGER NOT NULL, capability_scope_json TEXT NOT NULL,
-              confidentiality_scope TEXT NOT NULL, idempotency_key TEXT NOT NULL,
-              expires_at TEXT, created_at TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'PENDING',
-              delivered_at TEXT, acked_at TEXT,
-              UNIQUE(stream_key,idempotency_key), UNIQUE(stream_key,sequence)
-            );
-            """
-        )
-        columns = tuple(record)
-        connection.execute(
-            f"INSERT INTO message_handoff ({','.join(columns)}) VALUES ({','.join('?' for _ in columns)})",
-            tuple(record[name] for name in columns),
-        )
-    store = DurableHandoffStore(path)
-    loaded = store.get(
-        legacy.envelope_id,
-        actor={
-            "tenant_id": "tenant-a", "user_id": "user-a", "project_id": "project-a",
-            "conversation_id": "conversation-a", "run_id": "run-a",
-            "capabilities": [],
-        },
-    )
-    assert loaded.envelope_id == legacy.envelope_id
-    assert loaded.correlation_id is None
-
-
-def test_message_handoff_rejects_raw_credential_material(tmp_path: Path) -> None:
-    with pytest.raises(ValueError, match="CREDENTIAL_SECRET_EXPOSURE_DENY"):
-        message(payload={"value": "Bearer " + "x" * 24})
-    DurableHandoffStore(tmp_path / "handoff.sqlite3")
-    import sqlite3
-    with sqlite3.connect(tmp_path / "handoff.sqlite3") as connection:
-        assert connection.execute("SELECT count(*) FROM message_handoff").fetchone()[0] == 0
-
-
-def test_tool_mcp_authz_deny_and_scope_propagation(tmp_path: Path) -> None:
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    store.register_tool(
-        ToolDescriptor("mcp.search", "mcp", TENANT_SCOPE, ("tool.search",)),
-        owner(),
-    )
-    trace = root_trace()
-    store.record_trace(trace, actor("tool.search"))
-
-    with pytest.raises(GovernanceError, match="TOOL_MCP_AUTHZ_DENY"):
-        store.authorize_tool(
-            actor=actor(), tool_name="mcp.search", trace=trace,
-            requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-            invocation_key="invoke-deny-capability",
-        )
-    with pytest.raises(GovernanceError, match="TOOL_SCOPE_PROPAGATION"):
-        store.authorize_tool(
-            actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-            requested_scope=GovernanceScope("tenant", tenant_id="tenant-b"),
-            input_digest="a" * 64, invocation_key="invoke-deny-scope",
-        )
-
-    invocation = store.authorize_tool(
-        actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-        requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-        invocation_key="invoke-search-a",
-    )
-    assert invocation["trace_id"] == "trace-a"
-    assert invocation["evidence"]["action"] == "TOOL_AUTHORIZED"
-
-
-def test_tool_requires_recorded_trace_and_receipt_is_idempotent(tmp_path: Path) -> None:
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    store.register_tool(
-        ToolDescriptor(
-            "mcp.search", "mcp", TENANT_SCOPE, ("tool.search",),
-            credential_ref="systemd-credential:search-provider-a",
-        ),
-        owner(),
-    )
-    trace = root_trace()
-    with pytest.raises(GovernanceError, match="TOOL_MCP_AUTHZ_DENY:trace"):
-        store.authorize_tool(
-            actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-            requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-            invocation_key="invoke-unrecorded",
-        )
-    store.record_trace(trace, actor("tool.search"))
-    authorized = store.authorize_tool(
-        actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-        requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-        invocation_key="invoke-replay-a",
-    )
-    assert authorized["credential_required"] is True
-    assert "credential_ref" not in authorized
-    receipt = store.record_tool_receipt(
-        invocation_key="invoke-replay-a", result_digest="b" * 64,
-        actor=actor("tool.search"), trace=trace,
-    )
-    assert receipt["status"] == "VERIFIED"
-    replay = store.authorize_tool(
-        actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-        requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-        invocation_key="invoke-replay-a",
-    )
-    assert replay["idempotent"] is True
-    assert replay["receipt_sha256"] == "b" * 64
-    assert store.verify_audit_chain(
-        ("TRACE_RECORDED", "TOOL_AUTHORIZED", "TOOL_RESULT_VERIFIED")
-    )
-
-
-def test_system_and_global_resources_do_not_use_fake_tenants(tmp_path: Path) -> None:
-    with pytest.raises(GovernanceError, match="GOVERNANCE_NON_TENANT_SCOPE_INVALID"):
-        GovernanceScope("system", tenant_id="fake-tenant")
-
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    descriptor = ToolDescriptor("system.health", "tool", GovernanceScope("global"), ("system.admin",))
-    registered = store.register_tool(descriptor, owner())
-    assert registered["descriptor"]["scope_type"] == "global"
-    assert registered["descriptor"]["tenant_id"] is None
-
-
-def test_credential_scope_and_secret_exposure_deny(tmp_path: Path) -> None:
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    grant = CredentialGrant(
-        "grant-search-a",
-        "systemd-credential:search-provider-a",
-        TENANT_SCOPE,
-        ("search.invoke",),
-        task_id="task-a",
-        tool_name="mcp.search",
-        expires_at=(datetime.now(timezone.utc) + timedelta(minutes=5)).isoformat(),
-    )
-    stored = store.store_grant(grant, owner())
-    assert "secret" not in stored["grant"]
-    trace = root_trace()
-    store.record_trace(trace, actor("tool.search"))
-
-    with pytest.raises(GovernanceError, match="CREDENTIAL_SCOPE_DENY"):
-        store.authorize_credential(
-            grant_id=grant.grant_id,
-            actor=actor("tool.search", tenant_id="tenant-b"),
-            trace=trace,
-            operation="search.invoke",
-            task_id="task-a",
-            tool_name="mcp.search",
-        )
-    with pytest.raises(GovernanceError, match="CREDENTIAL_SECRET_EXPOSURE_DENY"):
-        CredentialGrant("grant-raw", "Bearer raw-secret", TENANT_SCOPE, ("search.invoke",))
-
-    authorized = store.authorize_credential(
-        grant_id=grant.grant_id,
-        actor=actor("tool.search"),
-        trace=trace,
-        operation="search.invoke",
-        task_id="task-a",
-        tool_name="mcp.search",
-    )
-    assert authorized["credential_ref"] == "systemd-credential:search-provider-a"
-    assert "credential_ref" not in authorized["evidence"]["details"]
-
-
-def test_audit_evidence_completeness_and_tamper_detection(tmp_path: Path) -> None:
-    path = tmp_path / "governance.sqlite3"
-    store = GovernanceStore(path)
-    trace = root_trace()
-    store.record_trace(trace, actor("tool.search"))
-    store.register_tool(
-        ToolDescriptor("mcp.search", "mcp", TENANT_SCOPE, ("tool.search",)), owner()
-    )
-    store.authorize_tool(
-        actor=actor("tool.search"), tool_name="mcp.search", trace=trace,
-        requested_scope=TENANT_SCOPE, input_digest="a" * 64,
-        invocation_key="invoke-audit-a",
-    )
-    assert store.verify_audit_chain(("TRACE_RECORDED", "TOOL_REGISTERED", "TOOL_AUTHORIZED"))
-    assert not store.verify_audit_chain(("CREDENTIAL_AUTHORIZED",))
-
-    import sqlite3
-
-    with sqlite3.connect(path) as connection:
-        connection.execute(
-            "UPDATE governance_audit_evidence SET outcome='DENY' WHERE sequence=1"
-        )
-    assert not GovernanceStore(path).verify_audit_chain()
-
-
-def test_observability_record_carries_governed_trace(tmp_path: Path) -> None:
-    from active_runtime.app.agent_observability_store import AgentObservabilityStore
-
-    hooks = AgentObservabilityHooks(AgentObservabilityStore(tmp_path / "observability"))
-    trace = root_trace()
-    started = hooks.start(
-        "user-a", "project-a", "openclaw",
-        actor=actor("tool.search"), trace=trace,
-    )
-    record = hooks.finish(started["execution_id"])["record"]
-    assert record["trace_id"] == "trace-a"
-    assert record["tenant_id"] == "tenant-a"
-    assert record["task_id"] == "task-a"
-    assert record["message_id"] == message().envelope_id
-
-
-def test_active_runtime_credential_broker_scope_and_raw_secret_deny() -> None:
-    class Provider:
-        def environment(self, lease):
-            return {"ACCESS_TOKEN": "raw-secret"}
-
-    broker = CredentialBroker(Provider())
-    lease = broker.issue(
-        task_id="task-a", repository="aios/aios", target_branch="agent/task-a",
-        generation=1, scopes=("tool.invoke",), scope_type="tenant",
-        tenant_id="tenant-a", user_id="user-a", project_id="project-a", run_id="run-a",
-    )
-    with pytest.raises(RuntimeError, match="CREDENTIAL_SCOPE_DENY"):
-        broker.authorize(
-            lease["lease_id"], task_id="task-a", operation="tool.invoke",
-            scope_type="tenant", tenant_id="tenant-b", user_id="user-a",
-            project_id="project-a", run_id="run-a",
-        )
-    with pytest.raises(RuntimeError, match="CREDENTIAL_SECRET_EXPOSURE_DENY"):
-        broker.authorize(
-            lease["lease_id"], task_id="task-a", operation="tool.invoke",
-            scope_type="tenant", tenant_id="tenant-a", user_id="user-a",
-            project_id="project-a", run_id="run-a",
-        )
-
-
-def test_search_gateway_uses_governed_tool_boundary(tmp_path: Path) -> None:
-    class Provider:
-        name = "official_site"
-        called = False
-
-        def search(self, request, queries):
-            self.called = True
-            return (
-                [SearchEvidence("Official", "https://example.test", self.name, "safe")],
-                SearchProviderAttempt(self.name, "ok", 1),
-            )
-
-    store = GovernanceStore(tmp_path / "governance.sqlite3")
-    store.register_tool(
-        ToolDescriptor("search.official_site", "tool", TENANT_SCOPE, ("tool.search",)),
-        owner(),
-    )
-    provider = Provider()
-    gateway = SearchGateway([provider], governance_store=store)
-    trace = root_trace()
-    store.record_trace(trace, actor("tool.search"))
-    response = gateway.search(
-        SearchRequest(
-            query="AIOS", requester="actor-a", correlation_id="trace-a",
-            authorized_sources=["official_site"],
-        ),
-        actor=actor("tool.search"),
-        trace=trace,
-    )
-    assert response.status == "found"
-    assert provider.called is True
-    assert store.verify_audit_chain(
-        ("TOOL_REGISTERED", "TRACE_RECORDED", "TOOL_AUTHORIZED", "TOOL_RESULT_VERIFIED")
-    )
-
-    with pytest.raises(GovernanceError, match="TOOL_MCP_AUTHZ_DENY"):
-        gateway.search(
-            SearchRequest(query="AIOS", requester="forged", correlation_id="trace-a"),
-            actor=actor("tool.search"),
-            trace=trace,
-        )
-
-
-def test_search_gateway_redacts_provider_exception() -> None:
-    class Provider:
-        name = "general_web"
-
-        def search(self, request, queries):
-            raise RuntimeError("Bearer should-not-leak")
-
-    response = SearchGateway([Provider()]).search(SearchRequest(query="AIOS", requester="legacy"))
-    assert response.attempts[0].reason == "PROVIDER_FAILURE"
-    assert "should-not-leak" not in str(response.to_dict())
-
-
-def test_search_runtime_default_path_requires_governance(tmp_path: Path) -> None:
-    orchestrator = SearchGatewayOrchestrator(
-        governance_store=GovernanceStore(tmp_path / "search-governance.sqlite3")
-    )
-    assert orchestrator.status()["governance"] == "required"
-    with pytest.raises(GovernanceError, match="TOOL_MCP_AUTHZ_DENY"):
-        orchestrator.execute({"query": "AIOS", "requester": "actor-a"})
-
-
-def test_governance_newer_schema_fails_closed(tmp_path: Path) -> None:
-    import sqlite3
-    path = tmp_path / "newer.sqlite3"
-    with sqlite3.connect(path) as connection:
-        connection.execute(
-            "CREATE TABLE governance_schema_metadata(singleton INTEGER PRIMARY KEY, schema_version INTEGER NOT NULL)"
-        )
-        connection.execute(
-            "INSERT INTO governance_schema_metadata(singleton,schema_version) VALUES(1,999)"
-        )
-    with pytest.raises(GovernanceError, match="GOVERNANCE_SCHEMA_VERSION_UNSUPPORTED"):
-        GovernanceStore(path)
-
-
-def test_changed_production_files_have_no_embedded_secret_material() -> None:
-    import re
-    root = Path(__file__).resolve().parents[1]
-    paths = (
-        "active-runtime/app/agent_event_bus.py",
-        "active-runtime/app/agent_event_observability_bridge.py",
-        "active-runtime/app/agent_observability.py",
-        "active-runtime/app/agent_observability_api.py",
-        "active-runtime/app/agent_observability_hooks.py",
-        "active-runtime/app/agent_observability_store.py",
-        "active-runtime/app/aios_credential_broker.py",
-        "active-runtime/app/message_handoff.py",
-        "active-runtime/app/search_agent_adapter.py",
-        "active-runtime/app/search_gateway.py",
-        "active-runtime/app/search_gateway_api.py",
-        "active-runtime/app/search_gateway_orchestrator.py",
-        "active-runtime/app/trace_tool_credential_governance.py",
-    )
-    patterns = (
-        re.compile(r"BEGIN (?:RSA|OPENSSH|EC) PRIVATE KEY"),
-        re.compile(r"Bearer\s+[A-Za-z0-9._~+/-]{24,}"),
-    )
-    hits = [path for path in paths for pattern in patterns if pattern.search((root / path).read_text(encoding="utf-8"))]
-    assert hits == []