Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b90b0b9d26 | ||
|
|
a32c76a3c1 | ||
|
|
c128d6b01d | ||
|
|
d457ac3961 | ||
|
|
9fa7511bb5 |
@@ -1,156 +0,0 @@
|
|||||||
# V2R1 Gate 1 — Clean-Room Final Evidence
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
| Field | Value |
|
|
||||||
|---|---|
|
|
||||||
| Date | 2026-07-14 |
|
|
||||||
| Source commit | `502ef30642597fb0b70b90ae2e8a0b6af217d80e` |
|
|
||||||
| Source branch | `origin/work/v2r1-integration-quality-2000` |
|
|
||||||
| Result branch | `fix/v2r1-g1-cleanroom-final-evidence-r2-20260714` |
|
|
||||||
| Result commit reference | `HEAD` |
|
|
||||||
| Gate | `G1` |
|
|
||||||
| Variant | `openclaw-cleanroom` |
|
|
||||||
| Status | `PASS` |
|
|
||||||
|
|
||||||
The immutable report uses `HEAD` for post-commit verification. The resolved commit object ID is recorded by the external acceptance result after this file is committed; a Git commit cannot reliably embed its own object ID because changing the file changes the tree and commit identity.
|
|
||||||
|
|
||||||
## Machine-Readable Result
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
gate: G1
|
|
||||||
variant: openclaw-cleanroom
|
|
||||||
date: 2026-07-14
|
|
||||||
status: PASS
|
|
||||||
source_commit: 502ef30642597fb0b70b90ae2e8a0b6af217d80e
|
|
||||||
source_branch: origin/work/v2r1-integration-quality-2000
|
|
||||||
result_branch: fix/v2r1-g1-cleanroom-final-evidence-r2-20260714
|
|
||||||
result_commit_ref: HEAD
|
|
||||||
tests_total: 32
|
|
||||||
tests_passed: 32
|
|
||||||
tests_failed: 0
|
|
||||||
cleanup_scan: PASS
|
|
||||||
secret_scan: PASS
|
|
||||||
rollback_status: PASS
|
|
||||||
recovery_verified: true
|
|
||||||
workspace_clean_at_test_completion: true
|
|
||||||
merge_performed: false
|
|
||||||
tag_created: false
|
|
||||||
baseline_promoted: false
|
|
||||||
deployment_performed: false
|
|
||||||
```
|
|
||||||
|
|
||||||
## Evidence Provenance
|
|
||||||
|
|
||||||
The test, cleanup, secret-scan, rollback, and recovery results below are execution evidence supplied by OpenClaw for the Gate 1 run. This correction commit changes only the evidence report and does not claim that the GitOps API reran the suites.
|
|
||||||
|
|
||||||
## HMAC Test-Key Length Verification
|
|
||||||
|
|
||||||
| Test file | Variable | Test-only value | Length |
|
|
||||||
|---|---|---|---:|
|
|
||||||
| `tests/v2r1/test_runtime_wiring.py:24` | `internal_key` | `b"runtime-internal-context-key-is-32bytes"` | 39 bytes |
|
|
||||||
| `tests/v2r1/test_runtime_wiring.py:25` | `ingress_key` | `b"runtime-external-ingress-key-is-32bytes"` | 39 bytes |
|
|
||||||
|
|
||||||
Both values are test fixtures. The supplied evidence reports that no production secret was introduced.
|
|
||||||
|
|
||||||
## Test Results Supplied by OpenClaw
|
|
||||||
|
|
||||||
### V2R1 suite — 29 of 29 passed
|
|
||||||
|
|
||||||
```shell
|
|
||||||
PYTHONPATH=active-runtime/app python3 -m pytest \
|
|
||||||
tests/v2r1/test_hermes_fabric.py \
|
|
||||||
tests/v2r1/test_message_ledger_append.py \
|
|
||||||
tests/v2r1/test_router_isolation.py \
|
|
||||||
tests/v2r1/test_runtime_identity_binding.py \
|
|
||||||
tests/v2r1/test_runtime_wiring.py \
|
|
||||||
tests/v2r1/test_tenant_context.py -v
|
|
||||||
# Reported result: 29 passed, exit code 0
|
|
||||||
```
|
|
||||||
|
|
||||||
### Integration suite — 3 of 3 passed
|
|
||||||
|
|
||||||
```shell
|
|
||||||
PYTHONPATH=active-runtime/app python3 -m pytest tests/integration/test_runtime_ingress_flow.py -v
|
|
||||||
# Reported result: 3 passed, exit code 0
|
|
||||||
```
|
|
||||||
|
|
||||||
**Reported total: 32 of 32 passed.**
|
|
||||||
|
|
||||||
## Cleanup, Security, and Recovery Evidence
|
|
||||||
|
|
||||||
| Check | Supplied result |
|
|
||||||
|---|---|
|
|
||||||
| Conflict-marker scan | PASS |
|
|
||||||
| Cleanup scan | PASS |
|
|
||||||
| Secret scan | PASS |
|
|
||||||
| Legitimate hardcoded test keys | Two 39-byte fixtures in `test_runtime_wiring.py` |
|
|
||||||
| Rollback rehearsal | PASS; 13 of 13 core tests reported after rollback to `6077331` |
|
|
||||||
| Recovery verification | PASS |
|
|
||||||
|
|
||||||
## Deployment State
|
|
||||||
|
|
||||||
| Operation | Performed |
|
|
||||||
|---|---|
|
|
||||||
| Merge | No |
|
|
||||||
| Tag creation | No |
|
|
||||||
| Baseline promotion | No |
|
|
||||||
| Staging deployment | No |
|
|
||||||
| Production deployment | No |
|
|
||||||
|
|
||||||
## Post-Commit Verification
|
|
||||||
|
|
||||||
Run from the repository root after the commit is created:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
SOURCE=502ef30642597fb0b70b90ae2e8a0b6af217d80e
|
|
||||||
RESULT_FILE=.agent/results/openclaw/RESULT-V2R1-G1-OPENCLAW-FINAL-EVIDENCE-20260714.md
|
|
||||||
|
|
||||||
git rev-parse HEAD
|
|
||||||
|
|
||||||
test "$(git diff --name-only "$SOURCE" HEAD | wc -l | tr -d ' ')" = "1"
|
|
||||||
test "$(git diff --name-only "$SOURCE" HEAD)" = "$RESULT_FILE"
|
|
||||||
|
|
||||||
git ls-tree -r HEAD -- "$RESULT_FILE"
|
|
||||||
|
|
||||||
python3 - "$RESULT_FILE" <<'PY'
|
|
||||||
from pathlib import Path
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
|
|
||||||
path = Path(sys.argv[1])
|
|
||||||
text = path.read_text(encoding="utf-8")
|
|
||||||
|
|
||||||
encoded_tokens = [
|
|
||||||
[84, 66, 68],
|
|
||||||
[80, 69, 78, 68, 73, 78, 71],
|
|
||||||
[84, 79, 68, 79],
|
|
||||||
[70, 73, 88, 77, 69],
|
|
||||||
[91, 123, 99, 111, 109, 109, 105, 116, 125, 93],
|
|
||||||
]
|
|
||||||
tokens = ["".join(chr(value) for value in item) for item in encoded_tokens]
|
|
||||||
angle_token = re.compile(chr(60) + r"[^>\n]+" + chr(62))
|
|
||||||
|
|
||||||
hits = [token for token in tokens if token in text]
|
|
||||||
if angle_token.search(text):
|
|
||||||
hits.append("angle-delimited-token")
|
|
||||||
|
|
||||||
if hits:
|
|
||||||
print("TOKEN_SCAN=FAIL", hits)
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
print("TOKEN_SCAN=PASS")
|
|
||||||
PY
|
|
||||||
```
|
|
||||||
|
|
||||||
## Acceptance Conditions
|
|
||||||
|
|
||||||
Gate 1 is eligible to proceed only when the external acceptance record confirms all of the following against the resolved `HEAD` commit:
|
|
||||||
|
|
||||||
- the commit exists and has source commit `502ef30642597fb0b70b90ae2e8a0b6af217d80e` as its parent;
|
|
||||||
- exactly this one report file changed;
|
|
||||||
- the committed report contains no unresolved legacy token;
|
|
||||||
- the result tree is not identical to rejected commit `71239b4d187e683e05fd22fc9d5df8ae324e3390`;
|
|
||||||
- no merge, tag, baseline promotion, or deployment occurred.
|
|
||||||
@@ -11,7 +11,3 @@ runtime/tmp/
|
|||||||
runtime/cache/
|
runtime/cache/
|
||||||
logs/
|
logs/
|
||||||
config/test_write_perms
|
config/test_write_perms
|
||||||
/data/webops.sqlite3
|
|
||||||
/data/webops.sqlite3-wal
|
|
||||||
/data/webops.sqlite3-shm
|
|
||||||
/data/webops.sqlite3-journal
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
"""Canonical AIOS V2R1 runtime package."""
|
|
||||||
|
|
||||||
__version__ = "2.1.0-rc.1"
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
"""Append-only audit chain for AIOS V2R1."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import hashlib
|
|
||||||
import json
|
|
||||||
from pathlib import Path
|
|
||||||
import sqlite3
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from .tenant_context import canonical_json, isoformat, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
class AuditLog:
|
|
||||||
def __init__(self, database: str | Path) -> None:
|
|
||||||
self.database = str(database)
|
|
||||||
with sqlite3.connect(self.database) as db:
|
|
||||||
db.execute("PRAGMA journal_mode=WAL")
|
|
||||||
db.execute(
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS audit_events (
|
|
||||||
seq INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
trace_id TEXT NOT NULL,
|
|
||||||
event_type TEXT NOT NULL,
|
|
||||||
payload TEXT NOT NULL,
|
|
||||||
previous_hash TEXT NOT NULL,
|
|
||||||
event_hash TEXT NOT NULL UNIQUE,
|
|
||||||
created_at TEXT NOT NULL
|
|
||||||
)
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
def append(self, *, tenant_id: str, trace_id: str, event_type: str, payload: dict[str, Any]) -> str:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
trace_id = require_ident("trace_id", trace_id)
|
|
||||||
event_type = require_ident("event_type", event_type)
|
|
||||||
with sqlite3.connect(self.database) as db:
|
|
||||||
previous = db.execute(
|
|
||||||
"SELECT event_hash FROM audit_events ORDER BY seq DESC LIMIT 1"
|
|
||||||
).fetchone()
|
|
||||||
previous_hash = previous[0] if previous else "GENESIS"
|
|
||||||
body = {
|
|
||||||
"tenant_id": tenant_id,
|
|
||||||
"trace_id": trace_id,
|
|
||||||
"event_type": event_type,
|
|
||||||
"payload": payload,
|
|
||||||
"previous_hash": previous_hash,
|
|
||||||
"created_at": isoformat(),
|
|
||||||
}
|
|
||||||
digest = hashlib.sha256(
|
|
||||||
canonical_json(body)
|
|
||||||
).hexdigest()
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO audit_events VALUES(NULL,?,?,?,?,?,?,?)",
|
|
||||||
(
|
|
||||||
tenant_id,
|
|
||||||
trace_id,
|
|
||||||
event_type,
|
|
||||||
json.dumps(payload, ensure_ascii=False),
|
|
||||||
previous_hash,
|
|
||||||
digest,
|
|
||||||
body["created_at"],
|
|
||||||
),
|
|
||||||
)
|
|
||||||
return digest
|
|
||||||
|
|
||||||
def verify(self) -> bool:
|
|
||||||
previous = "GENESIS"
|
|
||||||
with sqlite3.connect(self.database) as db:
|
|
||||||
rows = db.execute(
|
|
||||||
"SELECT tenant_id,trace_id,event_type,payload,previous_hash,event_hash,created_at "
|
|
||||||
"FROM audit_events ORDER BY seq"
|
|
||||||
)
|
|
||||||
for row in rows:
|
|
||||||
body = {
|
|
||||||
"tenant_id": row[0],
|
|
||||||
"trace_id": row[1],
|
|
||||||
"event_type": row[2],
|
|
||||||
"payload": json.loads(row[3]),
|
|
||||||
"previous_hash": row[4],
|
|
||||||
"created_at": row[6],
|
|
||||||
}
|
|
||||||
if row[4] != previous:
|
|
||||||
return False
|
|
||||||
digest = hashlib.sha256(canonical_json(body)).hexdigest()
|
|
||||||
if digest != row[5]:
|
|
||||||
return False
|
|
||||||
previous = digest
|
|
||||||
return True
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
"""AIOS V2R1 Tenant Cell lifecycle CLI primitives."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
import json
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from .tenant_context import ValidationError, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class CellRecord:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
version: str
|
|
||||||
state: str
|
|
||||||
config_digest: str
|
|
||||||
created_at: str
|
|
||||||
|
|
||||||
|
|
||||||
class CellManager:
|
|
||||||
def __init__(self, registry: str | Path) -> None:
|
|
||||||
self.registry = Path(registry)
|
|
||||||
self.registry.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
if not self.registry.exists():
|
|
||||||
self.registry.write_text("{\"cells\":{}}\n", encoding="utf-8")
|
|
||||||
|
|
||||||
def _load(self) -> dict:
|
|
||||||
return json.loads(self.registry.read_text(encoding="utf-8"))
|
|
||||||
|
|
||||||
def _save(self, value: dict) -> None:
|
|
||||||
self.registry.write_text(
|
|
||||||
json.dumps(value, ensure_ascii=False, indent=2) + "\n",
|
|
||||||
encoding="utf-8",
|
|
||||||
)
|
|
||||||
|
|
||||||
def create(self, tenant_id: str, cell_id: str, version: str, digest: str) -> CellRecord:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
cell_id = require_ident("cell_id", cell_id)
|
|
||||||
data = self._load()
|
|
||||||
if tenant_id in data["cells"]:
|
|
||||||
raise ValidationError("tenant already has a cell")
|
|
||||||
record = CellRecord(
|
|
||||||
tenant_id,
|
|
||||||
cell_id,
|
|
||||||
version,
|
|
||||||
"created",
|
|
||||||
digest,
|
|
||||||
datetime.now(timezone.utc).isoformat(),
|
|
||||||
)
|
|
||||||
data["cells"][tenant_id] = record.__dict__
|
|
||||||
self._save(data)
|
|
||||||
return record
|
|
||||||
|
|
||||||
def status(self, tenant_id: str) -> CellRecord:
|
|
||||||
data = self._load()
|
|
||||||
item = data["cells"].get(tenant_id)
|
|
||||||
if not item:
|
|
||||||
raise ValidationError("unknown tenant")
|
|
||||||
return CellRecord(**item)
|
|
||||||
|
|
||||||
def transition(self, tenant_id: str, state: str) -> CellRecord:
|
|
||||||
allowed = {"created", "starting", "healthy", "upgrading", "rollback", "failed"}
|
|
||||||
if state not in allowed:
|
|
||||||
raise ValidationError("invalid cell state")
|
|
||||||
data = self._load()
|
|
||||||
item = data["cells"].get(tenant_id)
|
|
||||||
if not item:
|
|
||||||
raise ValidationError("unknown tenant")
|
|
||||||
item["state"] = state
|
|
||||||
self._save(data)
|
|
||||||
return CellRecord(**item)
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
"""The only V2R1 ingress adapter: verified context to routed ledger record."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime
|
|
||||||
from threading import RLock
|
|
||||||
from typing import Callable, Mapping, Any
|
|
||||||
|
|
||||||
from .message_ledger import LedgerRecord, MessageLedger
|
|
||||||
from .router import Route, TenantRouter
|
|
||||||
from .session_pool import SessionLease, SessionPool
|
|
||||||
from .tenant_context import CanonicalMessage, TenantContext, utc_now
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class IngressResult:
|
|
||||||
record: LedgerRecord
|
|
||||||
route: Route
|
|
||||||
session: SessionLease
|
|
||||||
|
|
||||||
|
|
||||||
class ChannelAdapter:
|
|
||||||
"""Fail-closed runtime ingress composition.
|
|
||||||
|
|
||||||
The adapter intentionally accepts no tenant or Cell authority outside the
|
|
||||||
signed context and TenantRouter. A process lock keeps rollback handling
|
|
||||||
deterministic for a single runtime while SQLite protects cross-process
|
|
||||||
ledger writes.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
router: TenantRouter,
|
|
||||||
ledger: MessageLedger,
|
|
||||||
session_pool: SessionPool,
|
|
||||||
signing_key: bytes,
|
|
||||||
clock: Callable[[], datetime] = utc_now,
|
|
||||||
) -> None:
|
|
||||||
self._router = router
|
|
||||||
self._ledger = ledger
|
|
||||||
self._session_pool = session_pool
|
|
||||||
self._signing_key = signing_key
|
|
||||||
self._clock = clock
|
|
||||||
self._lock = RLock()
|
|
||||||
|
|
||||||
def ingest(self, *, token: str, message: Mapping[str, Any]) -> IngressResult:
|
|
||||||
with self._lock:
|
|
||||||
context = TenantContext.verify(token, self._signing_key, now=self._clock())
|
|
||||||
canonical = CanonicalMessage.from_mapping(message)
|
|
||||||
canonical.assert_context(context)
|
|
||||||
route = self._router.assert_context_route(context)
|
|
||||||
self._router.assert_message_route(canonical)
|
|
||||||
self._session_pool.assert_available(context, route)
|
|
||||||
|
|
||||||
existed = self._ledger.matches(canonical)
|
|
||||||
record = self._ledger.append(canonical)
|
|
||||||
try:
|
|
||||||
lease = self._session_pool.acquire(context, route)
|
|
||||||
except Exception:
|
|
||||||
if not existed:
|
|
||||||
self._ledger.remove(record)
|
|
||||||
raise
|
|
||||||
return IngressResult(record=record, route=route, session=lease)
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
"""aios-cell command implementation for V2R1 Cell lifecycle."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from .cell_manager import CellManager
|
|
||||||
from .ingress_service import serve
|
|
||||||
|
|
||||||
|
|
||||||
def build_parser() -> argparse.ArgumentParser:
|
|
||||||
parser = argparse.ArgumentParser(prog="aios-cell")
|
|
||||||
parser.add_argument("registry")
|
|
||||||
sub = parser.add_subparsers(dest="command", required=True)
|
|
||||||
|
|
||||||
create = sub.add_parser("create")
|
|
||||||
create.add_argument("tenant_id")
|
|
||||||
create.add_argument("cell_id")
|
|
||||||
create.add_argument("version")
|
|
||||||
create.add_argument("digest")
|
|
||||||
|
|
||||||
status = sub.add_parser("status")
|
|
||||||
status.add_argument("tenant_id")
|
|
||||||
|
|
||||||
transition = sub.add_parser("transition")
|
|
||||||
transition.add_argument("tenant_id")
|
|
||||||
transition.add_argument("state")
|
|
||||||
|
|
||||||
return parser
|
|
||||||
|
|
||||||
|
|
||||||
def build_serve_parser() -> argparse.ArgumentParser:
|
|
||||||
parser = argparse.ArgumentParser(prog="aios-cell serve")
|
|
||||||
parser.add_argument("--host", default="127.0.0.1")
|
|
||||||
parser.add_argument("--port", type=int, default=18792)
|
|
||||||
return parser
|
|
||||||
|
|
||||||
|
|
||||||
def main(argv: list[str] | None = None) -> int:
|
|
||||||
values = list(sys.argv[1:] if argv is None else argv)
|
|
||||||
service_mode = (
|
|
||||||
bool(values)
|
|
||||||
and values[0] == "serve"
|
|
||||||
and (len(values) == 1 or values[1].startswith("-"))
|
|
||||||
)
|
|
||||||
if service_mode:
|
|
||||||
serve_args = build_serve_parser().parse_args(values[1:])
|
|
||||||
serve(serve_args.host, serve_args.port)
|
|
||||||
return 0
|
|
||||||
args = build_parser().parse_args(values)
|
|
||||||
manager = CellManager(args.registry)
|
|
||||||
if args.command == "create":
|
|
||||||
result = manager.create(args.tenant_id, args.cell_id, args.version, args.digest)
|
|
||||||
elif args.command == "status":
|
|
||||||
result = manager.status(args.tenant_id)
|
|
||||||
elif args.command == "transition":
|
|
||||||
result = manager.transition(args.tenant_id, args.state)
|
|
||||||
else:
|
|
||||||
return 2
|
|
||||||
print(json.dumps(result.__dict__, ensure_ascii=False, sort_keys=True))
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sys.exit(main())
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
"""OpenClaw Cell lifecycle adapter for AIOS V2R1."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import asdict, dataclass, field
|
|
||||||
import json
|
|
||||||
from pathlib import Path
|
|
||||||
import subprocess
|
|
||||||
from typing import Any, Mapping
|
|
||||||
|
|
||||||
from .tenant_context import ValidationError, V2R1Error, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class CellSpec:
|
|
||||||
tenant_id: str
|
|
||||||
image: str
|
|
||||||
runtime: str = "docker"
|
|
||||||
port: int | None = None
|
|
||||||
memory: str = "2g"
|
|
||||||
cpus: str = "2"
|
|
||||||
pids_limit: int = 512
|
|
||||||
network: str = "bridge"
|
|
||||||
env: tuple[str, ...] = field(default_factory=tuple)
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
if self.runtime not in {"docker", "podman"}:
|
|
||||||
raise ValidationError("unsupported runtime")
|
|
||||||
if not self.image:
|
|
||||||
raise ValidationError("image required")
|
|
||||||
|
|
||||||
|
|
||||||
class OpenClawFleet:
|
|
||||||
def __init__(self, binary: str = "openclaw") -> None:
|
|
||||||
self.binary = binary
|
|
||||||
|
|
||||||
def _run(self, args: list[str]) -> dict[str, Any]:
|
|
||||||
proc = subprocess.run(
|
|
||||||
[self.binary, *args],
|
|
||||||
check=False,
|
|
||||||
text=True,
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
stderr=subprocess.PIPE,
|
|
||||||
)
|
|
||||||
if proc.returncode:
|
|
||||||
raise V2R1Error(proc.stderr.strip() or "openclaw command failed")
|
|
||||||
data = json.loads(proc.stdout or "{}")
|
|
||||||
if isinstance(data, dict):
|
|
||||||
return data
|
|
||||||
return {"result": data}
|
|
||||||
|
|
||||||
def create(self, spec: CellSpec) -> dict[str, Any]:
|
|
||||||
return self._run([
|
|
||||||
"fleet", "create", spec.tenant_id,
|
|
||||||
"--image", spec.image,
|
|
||||||
"--runtime", spec.runtime,
|
|
||||||
"--json",
|
|
||||||
])
|
|
||||||
|
|
||||||
def status(self, tenant_id: str) -> dict[str, Any]:
|
|
||||||
require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
return self._run(["fleet", "status", tenant_id, "--json"])
|
|
||||||
|
|
||||||
def doctor(self, tenant_id: str | None = None) -> dict[str, Any]:
|
|
||||||
args = ["fleet", "doctor"]
|
|
||||||
if tenant_id:
|
|
||||||
require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
args.append(tenant_id)
|
|
||||||
args.append("--json")
|
|
||||||
return self._run(args)
|
|
||||||
|
|
||||||
def backup(self, tenant_id: str, output: str | Path) -> dict[str, Any]:
|
|
||||||
return self._run(["fleet", "backup", tenant_id, "--out", str(output), "--json"])
|
|
||||||
|
|
||||||
def restore(self, tenant_id: str, archive: str | Path) -> dict[str, Any]:
|
|
||||||
return self._run(["fleet", "restore", tenant_id, "--from", str(archive), "--json"])
|
|
||||||
|
|
||||||
def upgrade(self, tenant_id: str, image: str) -> dict[str, Any]:
|
|
||||||
return self._run(["fleet", "upgrade", tenant_id, "--image", image, "--json"])
|
|
||||||
|
|
||||||
|
|
||||||
def load_inventory(path: str | Path) -> list[CellSpec]:
|
|
||||||
raw = json.loads(Path(path).read_text(encoding="utf-8"))
|
|
||||||
if raw.get("schema_version") != "aios.cells.v1":
|
|
||||||
raise ValidationError("invalid inventory schema")
|
|
||||||
result: list[CellSpec] = []
|
|
||||||
seen: set[str] = set()
|
|
||||||
for item in raw.get("cells", []):
|
|
||||||
spec = CellSpec(
|
|
||||||
tenant_id=item["tenant_id"],
|
|
||||||
image=item["image"],
|
|
||||||
runtime=item.get("runtime", "docker"),
|
|
||||||
port=item.get("port"),
|
|
||||||
env=tuple(item.get("env", [])),
|
|
||||||
)
|
|
||||||
if spec.tenant_id in seen:
|
|
||||||
raise ValidationError("duplicate tenant")
|
|
||||||
seen.add(spec.tenant_id)
|
|
||||||
result.append(spec)
|
|
||||||
if not result:
|
|
||||||
raise ValidationError("no cells")
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
def inventory_as_dict(items: list[CellSpec]) -> dict[str, Any]:
|
|
||||||
return {"schema_version": "aios.cells.v1", "cells": [asdict(x) for x in items]}
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
"""Tenant-partitioned Hermes shared agent fabric primitives."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from contextlib import closing
|
|
||||||
from pathlib import Path
|
|
||||||
import sqlite3
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from .tenant_context import (
|
|
||||||
CanonicalMessage,
|
|
||||||
ConflictError,
|
|
||||||
ScopeError,
|
|
||||||
ValidationError,
|
|
||||||
isoformat,
|
|
||||||
require_ident,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class FabricJob:
|
|
||||||
job_id: str
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
profile_id: str
|
|
||||||
session_id: str
|
|
||||||
event_id: str
|
|
||||||
status: str = "queued"
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
for name in (
|
|
||||||
"job_id", "cell_id", "profile_id", "session_id", "event_id"
|
|
||||||
):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
if self.status not in {"queued", "running", "completed", "failed", "cancelled"}:
|
|
||||||
raise ValidationError("invalid job status")
|
|
||||||
|
|
||||||
|
|
||||||
class HermesFabric:
|
|
||||||
"""Shared scheduler storage with mandatory tenant partition keys."""
|
|
||||||
|
|
||||||
def __init__(self, database: str | Path) -> None:
|
|
||||||
self.database = str(database)
|
|
||||||
with closing(sqlite3.connect(self.database)) as connection, connection as db:
|
|
||||||
db.execute("PRAGMA journal_mode=WAL")
|
|
||||||
db.execute("PRAGMA synchronous=FULL")
|
|
||||||
db.execute(
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS fabric_jobs (
|
|
||||||
job_id TEXT PRIMARY KEY,
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
cell_id TEXT NOT NULL,
|
|
||||||
profile_id TEXT NOT NULL,
|
|
||||||
session_id TEXT NOT NULL,
|
|
||||||
event_id TEXT NOT NULL UNIQUE,
|
|
||||||
status TEXT NOT NULL,
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
updated_at TEXT NOT NULL
|
|
||||||
)
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
db.execute(
|
|
||||||
"CREATE INDEX IF NOT EXISTS idx_fabric_tenant_queue "
|
|
||||||
"ON fabric_jobs(tenant_id, cell_id, status)"
|
|
||||||
)
|
|
||||||
|
|
||||||
def enqueue(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
message: CanonicalMessage,
|
|
||||||
profile_id: str,
|
|
||||||
) -> FabricJob:
|
|
||||||
profile_id = require_ident("profile_id", profile_id)
|
|
||||||
if not message.command_capable:
|
|
||||||
raise ScopeError("non-command events cannot create execution jobs")
|
|
||||||
if not message.is_authenticated_human_command:
|
|
||||||
raise ScopeError("only authenticated human commands can create jobs")
|
|
||||||
job = FabricJob(
|
|
||||||
job_id=f"job-{message.event_id}",
|
|
||||||
tenant_id=message.tenant_id,
|
|
||||||
cell_id=message.cell_id,
|
|
||||||
profile_id=profile_id,
|
|
||||||
session_id=message.session_id,
|
|
||||||
event_id=message.event_id,
|
|
||||||
)
|
|
||||||
now = isoformat()
|
|
||||||
conflict: ConflictError | None = None
|
|
||||||
try:
|
|
||||||
with closing(sqlite3.connect(self.database)) as connection, connection as db:
|
|
||||||
db.execute("PRAGMA journal_mode=WAL")
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO fabric_jobs VALUES(?,?,?,?,?,?,?,?,?)",
|
|
||||||
(
|
|
||||||
job.job_id,
|
|
||||||
job.tenant_id,
|
|
||||||
job.cell_id,
|
|
||||||
job.profile_id,
|
|
||||||
job.session_id,
|
|
||||||
job.event_id,
|
|
||||||
job.status,
|
|
||||||
now,
|
|
||||||
now,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
except sqlite3.IntegrityError:
|
|
||||||
conflict = ConflictError(
|
|
||||||
"fabric event already exists or violates queue uniqueness"
|
|
||||||
)
|
|
||||||
if conflict is not None:
|
|
||||||
raise conflict
|
|
||||||
return job
|
|
||||||
|
|
||||||
def claim(self, tenant_id: str, cell_id: str, profile_id: str) -> FabricJob | None:
|
|
||||||
require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
require_ident("cell_id", cell_id)
|
|
||||||
require_ident("profile_id", profile_id)
|
|
||||||
with closing(sqlite3.connect(self.database)) as connection, connection as db:
|
|
||||||
db.execute("BEGIN IMMEDIATE")
|
|
||||||
row = db.execute(
|
|
||||||
"SELECT * FROM fabric_jobs WHERE tenant_id=? AND cell_id=? "
|
|
||||||
"AND profile_id=? AND status='queued' ORDER BY created_at LIMIT 1",
|
|
||||||
(tenant_id, cell_id, profile_id),
|
|
||||||
).fetchone()
|
|
||||||
if not row:
|
|
||||||
db.commit()
|
|
||||||
return None
|
|
||||||
db.execute(
|
|
||||||
"UPDATE fabric_jobs SET status='running', updated_at=? WHERE job_id=?",
|
|
||||||
(isoformat(), row[0]),
|
|
||||||
)
|
|
||||||
db.commit()
|
|
||||||
return FabricJob(*row[:7])
|
|
||||||
|
|
||||||
def health(self) -> dict[str, Any]:
|
|
||||||
with closing(sqlite3.connect(self.database)) as connection, connection as db:
|
|
||||||
count = db.execute("SELECT count(*) FROM fabric_jobs").fetchone()[0]
|
|
||||||
return {
|
|
||||||
"component": "hermes_fabric",
|
|
||||||
"jobs": count,
|
|
||||||
"checked_at": datetime.now(timezone.utc).isoformat(),
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
"""Hermes shared fabric profile isolation primitives."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from pathlib import Path
|
|
||||||
import os
|
|
||||||
|
|
||||||
from .tenant_context import ValidationError, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class HermesProfile:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
profile_id: str
|
|
||||||
hermes_home: Path
|
|
||||||
workspace: Path
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
for name in ("cell_id", "profile_id"):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
if not self.hermes_home.is_absolute() or not self.workspace.is_absolute():
|
|
||||||
raise ValidationError("profile paths must be absolute")
|
|
||||||
|
|
||||||
@property
|
|
||||||
def environment(self) -> dict[str, str]:
|
|
||||||
return {
|
|
||||||
"HERMES_HOME": str(self.hermes_home),
|
|
||||||
"HOME": str(self.hermes_home),
|
|
||||||
"AIOS_TENANT_ID": self.tenant_id,
|
|
||||||
"AIOS_CELL_ID": self.cell_id,
|
|
||||||
"AIOS_PROFILE_ID": self.profile_id,
|
|
||||||
}
|
|
||||||
|
|
||||||
def prepare(self) -> None:
|
|
||||||
self.hermes_home.mkdir(parents=True, exist_ok=True)
|
|
||||||
self.workspace.mkdir(parents=True, exist_ok=True)
|
|
||||||
os.chmod(self.hermes_home, 0o700)
|
|
||||||
os.chmod(self.workspace, 0o700)
|
|
||||||
|
|
||||||
def assert_path_allowed(self, path: str | Path) -> None:
|
|
||||||
target = Path(path).resolve()
|
|
||||||
for root in (self.hermes_home.resolve(), self.workspace.resolve()):
|
|
||||||
if target == root or root in target.parents:
|
|
||||||
return
|
|
||||||
raise ValidationError("path escapes profile isolation boundary")
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
"""Fail-closed identity binding for authenticated external ingress.
|
|
||||||
|
|
||||||
External payload claims are not authority. An HMAC-authenticated envelope is
|
|
||||||
the sole factory for :class:`AuthenticatedPrincipal`; the resolver then checks
|
|
||||||
every claim against the authoritative ``TenantRouter`` before the runtime signs
|
|
||||||
an internal ``TenantContext``.
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
import hashlib
|
|
||||||
import hmac
|
|
||||||
import re
|
|
||||||
from typing import Any, Mapping
|
|
||||||
|
|
||||||
from .router import Route, TenantRouter
|
|
||||||
from .tenant_context import ScopeError, ValidationError, canonical_json, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
_PROVENANCE = object()
|
|
||||||
_SIGNATURE_RE = re.compile(r"^[0-9a-f]{64}$")
|
|
||||||
_SCOPE_FIELDS = (
|
|
||||||
"principal_id", "tenant_id", "cell_id", "channel",
|
|
||||||
"channel_account_id", "session_id", "message",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class AuthenticationError(ValidationError):
|
|
||||||
"""Authentication or identity resolution failed without disclosing scope."""
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, init=False)
|
|
||||||
class AuthenticatedPrincipal:
|
|
||||||
"""A principal which only the verified envelope factory can create."""
|
|
||||||
|
|
||||||
principal_id: str
|
|
||||||
|
|
||||||
def __init__(self, principal_id: str, *, _provenance: object) -> None:
|
|
||||||
if _provenance is not _PROVENANCE:
|
|
||||||
raise TypeError("AuthenticatedPrincipal is created by authenticated ingress only")
|
|
||||||
object.__setattr__(self, "principal_id", require_ident("principal_id", principal_id))
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _verified(cls, principal_id: str) -> "AuthenticatedPrincipal":
|
|
||||||
return cls(principal_id, _provenance=_PROVENANCE)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class IdentityClaims:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
session_id: str
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
for field in ("cell_id", "channel", "channel_account_id", "session_id"):
|
|
||||||
require_ident(field, getattr(self, field))
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class AuthenticatedIngress:
|
|
||||||
principal: AuthenticatedPrincipal
|
|
||||||
claims: IdentityClaims
|
|
||||||
message: Mapping[str, Any]
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class RuntimeIdentity:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
principal_id: str
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
session_id: str
|
|
||||||
|
|
||||||
|
|
||||||
class IngressAuthenticator:
|
|
||||||
"""Verify a canonical HMAC envelope before any identity lookup occurs."""
|
|
||||||
|
|
||||||
def __init__(self, hmac_key: bytes) -> None:
|
|
||||||
if not isinstance(hmac_key, bytes) or len(hmac_key) < 32:
|
|
||||||
raise ValidationError("ingress HMAC key must be at least 32 bytes")
|
|
||||||
self._hmac_key = hmac_key
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _signed_payload(request: Mapping[str, Any]) -> dict[str, Any]:
|
|
||||||
if not isinstance(request, Mapping):
|
|
||||||
raise ValidationError("ingress request must be an object")
|
|
||||||
if set(request) != {*_SCOPE_FIELDS, "signature"}:
|
|
||||||
raise ValidationError("ingress request fields are invalid")
|
|
||||||
values = {field: request[field] for field in _SCOPE_FIELDS}
|
|
||||||
if not isinstance(values["message"], Mapping):
|
|
||||||
raise ValidationError("ingress message must be an object")
|
|
||||||
return values
|
|
||||||
|
|
||||||
def authenticate(self, request: Mapping[str, Any]) -> AuthenticatedIngress:
|
|
||||||
values = self._signed_payload(request)
|
|
||||||
signature = request["signature"]
|
|
||||||
if not isinstance(signature, str) or not _SIGNATURE_RE.fullmatch(signature):
|
|
||||||
raise AuthenticationError("invalid ingress signature")
|
|
||||||
expected = hmac.new(
|
|
||||||
self._hmac_key, canonical_json(values), hashlib.sha256
|
|
||||||
).hexdigest()
|
|
||||||
if not hmac.compare_digest(expected, signature):
|
|
||||||
raise AuthenticationError("invalid ingress signature")
|
|
||||||
return AuthenticatedIngress(
|
|
||||||
principal=AuthenticatedPrincipal._verified(values["principal_id"]),
|
|
||||||
claims=IdentityClaims(
|
|
||||||
tenant_id=values["tenant_id"],
|
|
||||||
cell_id=values["cell_id"],
|
|
||||||
channel=values["channel"],
|
|
||||||
channel_account_id=values["channel_account_id"],
|
|
||||||
session_id=values["session_id"],
|
|
||||||
),
|
|
||||||
message=dict(values["message"]),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class RuntimeIdentityResolver:
|
|
||||||
"""Resolve authenticated ingress identity through ``TenantRouter`` only."""
|
|
||||||
|
|
||||||
def __init__(self, router: TenantRouter) -> None:
|
|
||||||
self._router = router
|
|
||||||
|
|
||||||
def resolve(
|
|
||||||
self, principal: AuthenticatedPrincipal, claims: IdentityClaims
|
|
||||||
) -> RuntimeIdentity:
|
|
||||||
if not isinstance(principal, AuthenticatedPrincipal):
|
|
||||||
raise AuthenticationError("untrusted principal type")
|
|
||||||
try:
|
|
||||||
route: Route = self._router.resolve(
|
|
||||||
channel=claims.channel,
|
|
||||||
channel_account_id=claims.channel_account_id,
|
|
||||||
principal_id=principal.principal_id,
|
|
||||||
session_id=claims.session_id,
|
|
||||||
)
|
|
||||||
except (ScopeError, ValidationError) as exc:
|
|
||||||
raise AuthenticationError("identity is not registered") from None
|
|
||||||
expected = (
|
|
||||||
claims.tenant_id, claims.cell_id, claims.channel,
|
|
||||||
claims.channel_account_id, principal.principal_id, claims.session_id,
|
|
||||||
)
|
|
||||||
actual = (
|
|
||||||
route.tenant_id, route.cell_id, route.channel,
|
|
||||||
route.channel_account_id, route.principal_id, route.session_id,
|
|
||||||
)
|
|
||||||
if actual != expected:
|
|
||||||
raise AuthenticationError("identity claims do not match authoritative route")
|
|
||||||
return RuntimeIdentity(
|
|
||||||
tenant_id=route.tenant_id,
|
|
||||||
cell_id=route.cell_id,
|
|
||||||
principal_id=route.principal_id,
|
|
||||||
channel=route.channel,
|
|
||||||
channel_account_id=route.channel_account_id,
|
|
||||||
session_id=route.session_id or "",
|
|
||||||
)
|
|
||||||
@@ -1,512 +0,0 @@
|
|||||||
"""Fail-closed loopback HTTP shell for V2R1 ingress processors."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import ipaddress
|
|
||||||
import json
|
|
||||||
import socket
|
|
||||||
import threading
|
|
||||||
import time
|
|
||||||
from collections.abc import Callable, Mapping
|
|
||||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
|
||||||
from typing import Any
|
|
||||||
from urllib.parse import urlsplit
|
|
||||||
|
|
||||||
|
|
||||||
MAX_REQUEST_BYTES = 1024 * 1024
|
|
||||||
MAX_RESPONSE_BYTES = 4096
|
|
||||||
REQUEST_IO_TIMEOUT_SECONDS = 0.5
|
|
||||||
REQUEST_NETWORK_DEADLINE_SECONDS = 1.0
|
|
||||||
HEX_DIGITS = frozenset("0123456789abcdefABCDEF")
|
|
||||||
HEADER_NAME_BYTES = frozenset(
|
|
||||||
b"!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
|
|
||||||
)
|
|
||||||
INTERNAL_ERROR_BODY = b'{"status":"INTERNAL_ERROR"}'
|
|
||||||
MUTATION_ROUTES = frozenset(
|
|
||||||
{"/v1/ingress", "/v1/receipts/status", "/v1/outbound-receipts"}
|
|
||||||
)
|
|
||||||
Processor = Callable[[str, bytes], tuple[int, Mapping[str, Any]]]
|
|
||||||
|
|
||||||
|
|
||||||
class RequestRejected(Exception):
|
|
||||||
def __init__(self, status: int, payload_status: str) -> None:
|
|
||||||
super().__init__(payload_status)
|
|
||||||
self.status = status
|
|
||||||
self.payload_status = payload_status
|
|
||||||
|
|
||||||
|
|
||||||
class IngressHTTPServer(ThreadingHTTPServer):
|
|
||||||
"""Threaded loopback server with an optional externally supplied processor."""
|
|
||||||
|
|
||||||
daemon_threads = False
|
|
||||||
block_on_close = True
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
address: tuple[str, int],
|
|
||||||
handler: type[BaseHTTPRequestHandler],
|
|
||||||
processor: Processor | None,
|
|
||||||
) -> None:
|
|
||||||
self._closing = threading.Event()
|
|
||||||
self._lifecycle_lock = threading.RLock()
|
|
||||||
self._connections_lock = threading.Lock()
|
|
||||||
self._connections: set[socket.socket] = set()
|
|
||||||
self._server_close_lock = threading.Lock()
|
|
||||||
self.processor = processor
|
|
||||||
super().__init__(address, handler)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_closing(self) -> bool:
|
|
||||||
return self._closing.is_set()
|
|
||||||
|
|
||||||
def get_request(self) -> tuple[socket.socket, tuple[str, int]]:
|
|
||||||
"""Register each accepted socket before handler scheduling can begin."""
|
|
||||||
connection, client_address = super().get_request()
|
|
||||||
with self._lifecycle_lock:
|
|
||||||
if self._closing.is_set():
|
|
||||||
reject = True
|
|
||||||
else:
|
|
||||||
with self._connections_lock:
|
|
||||||
self._connections.add(connection)
|
|
||||||
reject = False
|
|
||||||
if reject:
|
|
||||||
self._shutdown_and_close_connection(connection)
|
|
||||||
raise OSError("server is closing")
|
|
||||||
return connection, client_address
|
|
||||||
|
|
||||||
def unregister_connection(self, connection: socket.socket) -> None:
|
|
||||||
with self._connections_lock:
|
|
||||||
self._connections.discard(connection)
|
|
||||||
|
|
||||||
def _shutdown_and_close_connection(self, connection: socket.socket) -> None:
|
|
||||||
try:
|
|
||||||
connection.shutdown(socket.SHUT_RDWR)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
connection.close()
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
finally:
|
|
||||||
self.unregister_connection(connection)
|
|
||||||
|
|
||||||
def _close_accepted_connections(self) -> None:
|
|
||||||
with self._connections_lock:
|
|
||||||
connections = tuple(self._connections)
|
|
||||||
for connection in connections:
|
|
||||||
self._shutdown_and_close_connection(connection)
|
|
||||||
|
|
||||||
def process_request(
|
|
||||||
self,
|
|
||||||
request: socket.socket,
|
|
||||||
client_address: tuple[str, int],
|
|
||||||
) -> None:
|
|
||||||
"""Linearize request admission with the transition to closing."""
|
|
||||||
with self._lifecycle_lock:
|
|
||||||
if self._closing.is_set():
|
|
||||||
reject = True
|
|
||||||
else:
|
|
||||||
reject = False
|
|
||||||
try:
|
|
||||||
super().process_request(request, client_address)
|
|
||||||
except Exception:
|
|
||||||
self._shutdown_and_close_connection(request)
|
|
||||||
raise
|
|
||||||
if reject:
|
|
||||||
self._shutdown_and_close_connection(request)
|
|
||||||
|
|
||||||
def shutdown_request(self, request: socket.socket) -> None:
|
|
||||||
try:
|
|
||||||
request.shutdown(socket.SHUT_RDWR)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
super().shutdown_request(request)
|
|
||||||
finally:
|
|
||||||
self.unregister_connection(request)
|
|
||||||
|
|
||||||
def call_processor(self, path: str, body: bytes) -> tuple[bool, Any]:
|
|
||||||
"""Start processing atomically with respect to server shutdown."""
|
|
||||||
with self._lifecycle_lock:
|
|
||||||
if self._closing.is_set() or self.processor is None:
|
|
||||||
return False, None
|
|
||||||
return True, self.processor(path, body)
|
|
||||||
|
|
||||||
def _begin_closing(self) -> None:
|
|
||||||
with self._lifecycle_lock:
|
|
||||||
self._closing.set()
|
|
||||||
|
|
||||||
def shutdown(self) -> None:
|
|
||||||
self._begin_closing()
|
|
||||||
self._close_accepted_connections()
|
|
||||||
super().shutdown()
|
|
||||||
|
|
||||||
def server_close(self) -> None:
|
|
||||||
"""Interrupt accepted sockets before the base class joins handlers."""
|
|
||||||
with self._server_close_lock:
|
|
||||||
self._begin_closing()
|
|
||||||
self._close_accepted_connections()
|
|
||||||
super().server_close()
|
|
||||||
|
|
||||||
def handle_error(
|
|
||||||
self,
|
|
||||||
request: socket.socket,
|
|
||||||
client_address: tuple[str, int],
|
|
||||||
) -> None:
|
|
||||||
"""Close unexpected handler failures without printing request data."""
|
|
||||||
try:
|
|
||||||
request.shutdown(socket.SHUT_RDWR)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class _ValidatingHeaderReader:
|
|
||||||
"""Validate raw header lines before the standard library normalizes them."""
|
|
||||||
|
|
||||||
def __init__(self, handler: "IngressRequestHandler", reader: Any) -> None:
|
|
||||||
self._handler = handler
|
|
||||||
self._reader = reader
|
|
||||||
|
|
||||||
def readline(self, limit: int = -1) -> bytes:
|
|
||||||
try:
|
|
||||||
line = self._reader.readline(limit)
|
|
||||||
except TimeoutError as exc:
|
|
||||||
raise RequestRejected(408, "REQUEST_TIMEOUT") from exc
|
|
||||||
self._handler._ensure_network_read_active()
|
|
||||||
self._validate(line)
|
|
||||||
return line
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _validate(line: bytes) -> None:
|
|
||||||
if line == b"\r\n":
|
|
||||||
return
|
|
||||||
if not line or not line.endswith(b"\r\n"):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
raw = line[:-2]
|
|
||||||
if not raw or raw[:1] in {b" ", b"\t"}:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
separator = raw.find(b":")
|
|
||||||
if separator <= 0:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
name = raw[:separator]
|
|
||||||
value = raw[separator + 1 :]
|
|
||||||
if any(byte not in HEADER_NAME_BYTES for byte in name):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
if any((byte < 0x20 and byte != 0x09) or byte == 0x7F for byte in value):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
if name.lower() == b"content-length":
|
|
||||||
numeric = value[1:] if value.startswith(b" ") else value
|
|
||||||
if not numeric or any(byte < 0x30 or byte > 0x39 for byte in numeric):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
|
|
||||||
|
|
||||||
class IngressRequestHandler(BaseHTTPRequestHandler):
|
|
||||||
"""Bounded JSON transport; application processing is injected later."""
|
|
||||||
|
|
||||||
server: IngressHTTPServer
|
|
||||||
|
|
||||||
def setup(self) -> None:
|
|
||||||
super().setup()
|
|
||||||
self.connection.settimeout(REQUEST_IO_TIMEOUT_SECONDS)
|
|
||||||
self._network_read_lock = threading.Lock()
|
|
||||||
self._network_read_expired = threading.Event()
|
|
||||||
self._network_read_deadline: float | None = None
|
|
||||||
self._network_read_timer: threading.Timer | None = None
|
|
||||||
self._network_read_active = False
|
|
||||||
|
|
||||||
def finish(self) -> None:
|
|
||||||
self._complete_network_read()
|
|
||||||
try:
|
|
||||||
super().finish()
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _start_network_read(self) -> None:
|
|
||||||
self._complete_network_read()
|
|
||||||
timer = threading.Timer(
|
|
||||||
REQUEST_NETWORK_DEADLINE_SECONDS,
|
|
||||||
self._expire_network_read,
|
|
||||||
)
|
|
||||||
timer.name = f"aios-ingress-read-deadline-{id(self)}"
|
|
||||||
timer.daemon = True
|
|
||||||
with self._network_read_lock:
|
|
||||||
self._network_read_expired.clear()
|
|
||||||
self._network_read_deadline = (
|
|
||||||
time.monotonic() + REQUEST_NETWORK_DEADLINE_SECONDS
|
|
||||||
)
|
|
||||||
self._network_read_active = True
|
|
||||||
self._network_read_timer = timer
|
|
||||||
timer.start()
|
|
||||||
|
|
||||||
def _expire_network_read(self) -> None:
|
|
||||||
with self._network_read_lock:
|
|
||||||
if not self._network_read_active:
|
|
||||||
return
|
|
||||||
self._network_read_expired.set()
|
|
||||||
self.close_connection = True
|
|
||||||
try:
|
|
||||||
self.connection.shutdown(socket.SHUT_RD)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _complete_network_read(self) -> None:
|
|
||||||
timer: threading.Timer | None
|
|
||||||
with getattr(self, "_network_read_lock", threading.Lock()):
|
|
||||||
self._network_read_active = False
|
|
||||||
self._network_read_deadline = None
|
|
||||||
timer = self._network_read_timer
|
|
||||||
self._network_read_timer = None
|
|
||||||
if timer is not None:
|
|
||||||
timer.cancel()
|
|
||||||
if timer is not threading.current_thread():
|
|
||||||
timer.join(timeout=REQUEST_IO_TIMEOUT_SECONDS)
|
|
||||||
|
|
||||||
def _ensure_network_read_active(self) -> None:
|
|
||||||
if self.server.is_closing:
|
|
||||||
raise RequestRejected(503, "SERVICE_UNAVAILABLE")
|
|
||||||
deadline = self._network_read_deadline
|
|
||||||
if self._network_read_expired.is_set() or (
|
|
||||||
deadline is not None and time.monotonic() >= deadline
|
|
||||||
):
|
|
||||||
self._network_read_expired.set()
|
|
||||||
raise RequestRejected(408, "REQUEST_TIMEOUT")
|
|
||||||
|
|
||||||
def parse_request(self) -> bool:
|
|
||||||
original_reader = self.rfile
|
|
||||||
self.rfile = _ValidatingHeaderReader(self, original_reader) # type: ignore[assignment]
|
|
||||||
try:
|
|
||||||
return super().parse_request()
|
|
||||||
finally:
|
|
||||||
self.rfile = original_reader
|
|
||||||
|
|
||||||
def handle_one_request(self) -> None:
|
|
||||||
self._start_network_read()
|
|
||||||
try:
|
|
||||||
super().handle_one_request()
|
|
||||||
except RequestRejected as rejection:
|
|
||||||
self.close_connection = True
|
|
||||||
self._send_safely(rejection.status, {"status": rejection.payload_status})
|
|
||||||
except TimeoutError:
|
|
||||||
self.close_connection = True
|
|
||||||
self._send_safely(408, {"status": "REQUEST_TIMEOUT"})
|
|
||||||
except (BrokenPipeError, ConnectionResetError, OSError):
|
|
||||||
self.close_connection = True
|
|
||||||
except Exception:
|
|
||||||
self.close_connection = True
|
|
||||||
self._send_safely(500, {"status": "INTERNAL_ERROR"})
|
|
||||||
finally:
|
|
||||||
self._complete_network_read()
|
|
||||||
|
|
||||||
def send_error(
|
|
||||||
self,
|
|
||||||
code: int,
|
|
||||||
message: str | None = None,
|
|
||||||
explain: str | None = None,
|
|
||||||
) -> None:
|
|
||||||
"""Replace BaseHTTPRequestHandler HTML errors with bounded JSON."""
|
|
||||||
self.close_connection = True
|
|
||||||
if code == 501:
|
|
||||||
self._method_not_allowed()
|
|
||||||
return
|
|
||||||
self._send(int(code), {"status": "HTTP_ERROR"})
|
|
||||||
|
|
||||||
def log_message(self, format: str, *args: object) -> None:
|
|
||||||
return
|
|
||||||
|
|
||||||
def _send_safely(self, status: int, payload: Mapping[str, Any]) -> None:
|
|
||||||
try:
|
|
||||||
self._send(status, payload)
|
|
||||||
except OSError:
|
|
||||||
self.close_connection = True
|
|
||||||
|
|
||||||
def _path(self) -> str:
|
|
||||||
target = self.path
|
|
||||||
if not target or any(
|
|
||||||
ord(character) < 0x20 or ord(character) == 0x7F for character in target
|
|
||||||
):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
for index, character in enumerate(target):
|
|
||||||
if character == "%" and (
|
|
||||||
index + 2 >= len(target)
|
|
||||||
or any(value not in HEX_DIGITS for value in target[index + 1 : index + 3])
|
|
||||||
):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
try:
|
|
||||||
parts = urlsplit(target)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST") from exc
|
|
||||||
if parts.fragment:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
if target.startswith("/"):
|
|
||||||
if parts.scheme or parts.netloc:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
elif parts.scheme in {"http", "https"} and parts.netloc:
|
|
||||||
if parts.hostname is None:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
try:
|
|
||||||
_ = parts.port
|
|
||||||
except ValueError as exc:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST") from exc
|
|
||||||
else:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
return parts.path or "/"
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _encoded_response(
|
|
||||||
status: object,
|
|
||||||
payload: object,
|
|
||||||
) -> tuple[int, bytes]:
|
|
||||||
if (
|
|
||||||
type(status) is not int
|
|
||||||
or not 200 <= status <= 599
|
|
||||||
or status in {204, 205, 304}
|
|
||||||
or not isinstance(payload, Mapping)
|
|
||||||
):
|
|
||||||
return 500, INTERNAL_ERROR_BODY
|
|
||||||
try:
|
|
||||||
body = json.dumps(
|
|
||||||
dict(payload),
|
|
||||||
ensure_ascii=False,
|
|
||||||
separators=(",", ":"),
|
|
||||||
sort_keys=True,
|
|
||||||
allow_nan=False,
|
|
||||||
).encode("utf-8")
|
|
||||||
except Exception:
|
|
||||||
return 500, INTERNAL_ERROR_BODY
|
|
||||||
if len(body) > MAX_RESPONSE_BYTES:
|
|
||||||
return 500, INTERNAL_ERROR_BODY
|
|
||||||
return status, body
|
|
||||||
|
|
||||||
def _send(self, status: int, payload: Mapping[str, Any]) -> None:
|
|
||||||
self._complete_network_read()
|
|
||||||
status, body = self._encoded_response(status, payload)
|
|
||||||
self.send_response(status)
|
|
||||||
self.send_header("Content-Type", "application/json")
|
|
||||||
self.send_header("Content-Length", str(len(body)))
|
|
||||||
self.send_header("Cache-Control", "no-store")
|
|
||||||
self.end_headers()
|
|
||||||
if getattr(self, "command", None) != "HEAD":
|
|
||||||
self.wfile.write(body)
|
|
||||||
|
|
||||||
def _method_not_allowed(self) -> None:
|
|
||||||
self._send(405, {"status": "METHOD_NOT_ALLOWED"})
|
|
||||||
|
|
||||||
def _reject(self, status: int, payload_status: str) -> None:
|
|
||||||
self.close_connection = True
|
|
||||||
self._send(status, {"status": payload_status})
|
|
||||||
|
|
||||||
def _content_length(self) -> int:
|
|
||||||
if self.headers.get_all("Transfer-Encoding", []):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
values = self.headers.get_all("Content-Length", [])
|
|
||||||
if len(values) > 1:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
if not values:
|
|
||||||
return 0
|
|
||||||
raw_length = values[0]
|
|
||||||
if (
|
|
||||||
not raw_length
|
|
||||||
or not raw_length.isascii()
|
|
||||||
or not raw_length.isdigit()
|
|
||||||
):
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
try:
|
|
||||||
length = int(raw_length)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST") from exc
|
|
||||||
if length > MAX_REQUEST_BYTES:
|
|
||||||
raise RequestRejected(413, "REQUEST_TOO_LARGE")
|
|
||||||
return length
|
|
||||||
|
|
||||||
def _read_exact_body(self, length: int) -> bytes:
|
|
||||||
try:
|
|
||||||
body = self.rfile.read(length)
|
|
||||||
except TimeoutError as exc:
|
|
||||||
raise RequestRejected(408, "REQUEST_TIMEOUT") from exc
|
|
||||||
self._ensure_network_read_active()
|
|
||||||
if len(body) != length:
|
|
||||||
raise RequestRejected(400, "BAD_REQUEST")
|
|
||||||
return body
|
|
||||||
|
|
||||||
def do_GET(self) -> None:
|
|
||||||
path = self._path()
|
|
||||||
if path == "/health/live":
|
|
||||||
self._send(200, {"status": "LIVE"})
|
|
||||||
elif path == "/health/ready":
|
|
||||||
if self.server.processor is None:
|
|
||||||
self._send(503, {"status": "SERVICE_NOT_CONFIGURED"})
|
|
||||||
else:
|
|
||||||
self._send(200, {"status": "READY"})
|
|
||||||
elif path in MUTATION_ROUTES:
|
|
||||||
self._method_not_allowed()
|
|
||||||
else:
|
|
||||||
self._send(404, {"status": "NOT_FOUND"})
|
|
||||||
|
|
||||||
def do_POST(self) -> None:
|
|
||||||
path = self._path()
|
|
||||||
if path not in MUTATION_ROUTES:
|
|
||||||
if path in {"/health/live", "/health/ready"}:
|
|
||||||
self._method_not_allowed()
|
|
||||||
else:
|
|
||||||
self._send(404, {"status": "NOT_FOUND"})
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
length = self._content_length()
|
|
||||||
except RequestRejected as rejection:
|
|
||||||
self._reject(rejection.status, rejection.payload_status)
|
|
||||||
return
|
|
||||||
processor = self.server.processor
|
|
||||||
if processor is None:
|
|
||||||
self._send(503, {"status": "SERVICE_NOT_CONFIGURED"})
|
|
||||||
return
|
|
||||||
if self.server.is_closing:
|
|
||||||
self._reject(503, "SERVICE_UNAVAILABLE")
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
body = self._read_exact_body(length)
|
|
||||||
except RequestRejected as rejection:
|
|
||||||
self._reject(rejection.status, rejection.payload_status)
|
|
||||||
return
|
|
||||||
self._complete_network_read()
|
|
||||||
try:
|
|
||||||
started, result = self.server.call_processor(path, body)
|
|
||||||
if not started:
|
|
||||||
self._reject(503, "SERVICE_UNAVAILABLE")
|
|
||||||
return
|
|
||||||
status, payload = result
|
|
||||||
except Exception:
|
|
||||||
self._send(500, {"status": "INTERNAL_ERROR"})
|
|
||||||
return
|
|
||||||
self._send(status, payload)
|
|
||||||
|
|
||||||
do_DELETE = _method_not_allowed
|
|
||||||
do_HEAD = _method_not_allowed
|
|
||||||
do_OPTIONS = _method_not_allowed
|
|
||||||
do_PATCH = _method_not_allowed
|
|
||||||
do_PUT = _method_not_allowed
|
|
||||||
|
|
||||||
|
|
||||||
def build_server(
|
|
||||||
host: str = "127.0.0.1",
|
|
||||||
port: int = 18792,
|
|
||||||
*,
|
|
||||||
processor: Processor | None = None,
|
|
||||||
) -> IngressHTTPServer:
|
|
||||||
"""Build a loopback-only HTTP server without starting it."""
|
|
||||||
try:
|
|
||||||
address = ipaddress.ip_address(host)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise ValueError("host must be a loopback IP address") from exc
|
|
||||||
if address.version != 4 or not address.is_loopback:
|
|
||||||
raise ValueError("host must be an IPv4 loopback address")
|
|
||||||
return IngressHTTPServer((host, port), IngressRequestHandler, processor)
|
|
||||||
|
|
||||||
|
|
||||||
def serve(host: str = "127.0.0.1", port: int = 18792) -> None:
|
|
||||||
"""Run the unconfigured loopback shell until interrupted."""
|
|
||||||
server = build_server(host, port)
|
|
||||||
try:
|
|
||||||
server.serve_forever()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
return
|
|
||||||
finally:
|
|
||||||
server.server_close()
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
"""Tenant-scoped memory namespace and access policy for AIOS V2R1."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from pathlib import PurePosixPath
|
|
||||||
from typing import Literal
|
|
||||||
|
|
||||||
from .tenant_context import ScopeError, ValidationError, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
MemoryKind = Literal["session", "profile", "cell", "tenant", "shared_artifact"]
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class MemoryScope:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
profile_id: str
|
|
||||||
session_id: str | None
|
|
||||||
kind: MemoryKind
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
for name in ("cell_id", "profile_id"):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
if self.session_id is not None:
|
|
||||||
require_ident("session_id", self.session_id)
|
|
||||||
if self.kind not in {"session", "profile", "cell", "tenant", "shared_artifact"}:
|
|
||||||
raise ValidationError("invalid memory kind")
|
|
||||||
if self.kind == "session" and self.session_id is None:
|
|
||||||
raise ValidationError("session memory requires session_id")
|
|
||||||
|
|
||||||
@property
|
|
||||||
def namespace(self) -> str:
|
|
||||||
parts = ["tenant", self.tenant_id, "cell", self.cell_id]
|
|
||||||
if self.kind in {"profile", "session"}:
|
|
||||||
parts.extend(["profile", self.profile_id])
|
|
||||||
if self.kind == "session":
|
|
||||||
parts.extend(["session", str(self.session_id)])
|
|
||||||
parts.extend(["memory", self.kind])
|
|
||||||
return str(PurePosixPath(*parts))
|
|
||||||
|
|
||||||
def assert_access(self, requested: "MemoryScope", *, write: bool = False) -> None:
|
|
||||||
if self.tenant_id != requested.tenant_id:
|
|
||||||
raise ScopeError("cross-tenant memory access denied")
|
|
||||||
if self.cell_id != requested.cell_id:
|
|
||||||
raise ScopeError("cross-cell memory access denied")
|
|
||||||
if requested.kind == "shared_artifact":
|
|
||||||
if write:
|
|
||||||
raise ScopeError("shared artifacts are immutable")
|
|
||||||
return
|
|
||||||
if self.profile_id != requested.profile_id and requested.kind in {"profile", "session"}:
|
|
||||||
raise ScopeError("cross-profile memory access denied")
|
|
||||||
if requested.kind == "session" and self.session_id != requested.session_id:
|
|
||||||
raise ScopeError("cross-session memory access denied")
|
|
||||||
|
|
||||||
|
|
||||||
def qualify_memory_key(scope: MemoryScope, key: str) -> str:
|
|
||||||
key = require_ident("memory_key", key)
|
|
||||||
return f"{scope.namespace}/{key}"
|
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
"""Tenant-scoped append-only message ledger and exact quote resolver."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import timedelta
|
|
||||||
from contextlib import closing
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
import sqlite3
|
|
||||||
from typing import Iterable
|
|
||||||
|
|
||||||
from .tenant_context import (
|
|
||||||
CanonicalMessage,
|
|
||||||
ConflictError,
|
|
||||||
ScopeError,
|
|
||||||
ValidationError,
|
|
||||||
isoformat,
|
|
||||||
normalize_message_id,
|
|
||||||
parse_time,
|
|
||||||
utc_now,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class LedgerRecord:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
peer_id: str
|
|
||||||
direction: str
|
|
||||||
message_id: str
|
|
||||||
event_id: str
|
|
||||||
body: str
|
|
||||||
occurred_at: str
|
|
||||||
expires_at: str
|
|
||||||
|
|
||||||
|
|
||||||
class MessageLedger:
|
|
||||||
"""Exact-ID ledger.
|
|
||||||
|
|
||||||
The resolver never uses time windows, prefixes, similarity, or nearest-message
|
|
||||||
fallbacks. Ambiguity and absence fail closed.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, database: str | Path, *, ttl_days: int = 7) -> None:
|
|
||||||
if not 1 <= ttl_days <= 365:
|
|
||||||
raise ValidationError("ttl_days must be between 1 and 365")
|
|
||||||
self.database = Path(database)
|
|
||||||
self.ttl_days = ttl_days
|
|
||||||
self.database.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
self._initialize()
|
|
||||||
try:
|
|
||||||
os.chmod(self.database, 0o600)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _connect(self) -> sqlite3.Connection:
|
|
||||||
db = sqlite3.connect(str(self.database), timeout=30)
|
|
||||||
db.row_factory = sqlite3.Row
|
|
||||||
db.execute("PRAGMA journal_mode=WAL")
|
|
||||||
db.execute("PRAGMA synchronous=FULL")
|
|
||||||
db.execute("PRAGMA busy_timeout=30000")
|
|
||||||
return db
|
|
||||||
|
|
||||||
def _initialize(self) -> None:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
db.executescript(
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS message_ledger (
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
cell_id TEXT NOT NULL,
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
channel_account_id TEXT NOT NULL,
|
|
||||||
peer_id TEXT NOT NULL,
|
|
||||||
direction TEXT NOT NULL CHECK(direction IN ('inbound','outbound','internal')),
|
|
||||||
message_id TEXT NOT NULL,
|
|
||||||
event_id TEXT NOT NULL,
|
|
||||||
body TEXT NOT NULL,
|
|
||||||
occurred_at TEXT NOT NULL,
|
|
||||||
expires_at TEXT NOT NULL,
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
PRIMARY KEY(
|
|
||||||
tenant_id, cell_id, channel, channel_account_id,
|
|
||||||
peer_id, direction, message_id
|
|
||||||
),
|
|
||||||
UNIQUE(tenant_id, cell_id, event_id)
|
|
||||||
);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_message_reply_lookup ON message_ledger(
|
|
||||||
tenant_id, cell_id, channel, channel_account_id,
|
|
||||||
peer_id, message_id, expires_at
|
|
||||||
);
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
def append(self, message: CanonicalMessage) -> LedgerRecord:
|
|
||||||
"""Append one exact message through the runtime write path.
|
|
||||||
|
|
||||||
This is intentionally the owner of validation, idempotency, and the
|
|
||||||
immediate SQLite transaction. Runtime callers must not depend on the
|
|
||||||
legacy ``remember`` compatibility name.
|
|
||||||
"""
|
|
||||||
message_id = normalize_message_id(message.message_id)
|
|
||||||
now = utc_now()
|
|
||||||
expires = isoformat(now + timedelta(days=self.ttl_days))
|
|
||||||
key = (
|
|
||||||
message.tenant_id,
|
|
||||||
message.cell_id,
|
|
||||||
message.channel,
|
|
||||||
message.channel_account_id,
|
|
||||||
message.peer_id,
|
|
||||||
message.direction,
|
|
||||||
message_id,
|
|
||||||
)
|
|
||||||
storage_error: ConflictError | None = None
|
|
||||||
try:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
db.execute("BEGIN IMMEDIATE")
|
|
||||||
existing = db.execute(
|
|
||||||
"SELECT event_id, body, occurred_at, expires_at FROM message_ledger "
|
|
||||||
"WHERE tenant_id=? AND cell_id=? AND channel=? AND channel_account_id=? "
|
|
||||||
"AND peer_id=? AND direction=? AND message_id=?",
|
|
||||||
key,
|
|
||||||
).fetchone()
|
|
||||||
if existing:
|
|
||||||
if existing["body"] != message.body:
|
|
||||||
db.rollback()
|
|
||||||
raise ConflictError("message ID collision with different content")
|
|
||||||
db.commit()
|
|
||||||
return LedgerRecord(
|
|
||||||
*key, existing["event_id"], existing["body"],
|
|
||||||
existing["occurred_at"], existing["expires_at"],
|
|
||||||
)
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO message_ledger VALUES(?,?,?,?,?,?,?,?,?,?,?,?)",
|
|
||||||
(*key, message.event_id, message.body, message.occurred_at, expires, isoformat(now)),
|
|
||||||
)
|
|
||||||
db.commit()
|
|
||||||
except sqlite3.Error:
|
|
||||||
storage_error = ConflictError("ledger storage unavailable")
|
|
||||||
if storage_error is not None:
|
|
||||||
# Raise outside the sqlite exception handler so callers cannot inspect
|
|
||||||
# a driver exception through __cause__ or __context__.
|
|
||||||
raise storage_error
|
|
||||||
return LedgerRecord(*key, message.event_id, message.body, message.occurred_at, expires)
|
|
||||||
|
|
||||||
def remember(self, message: CanonicalMessage) -> LedgerRecord:
|
|
||||||
"""Backward-compatible API wrapper for callers outside the runtime path."""
|
|
||||||
return self.append(message)
|
|
||||||
|
|
||||||
def matches(self, message: CanonicalMessage) -> bool:
|
|
||||||
"""Whether this exact message is already durably represented."""
|
|
||||||
message_id = normalize_message_id(message.message_id)
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
row = db.execute(
|
|
||||||
"SELECT event_id, body FROM message_ledger WHERE tenant_id=? AND "
|
|
||||||
"cell_id=? AND channel=? AND channel_account_id=? AND peer_id=? "
|
|
||||||
"AND direction=? AND message_id=?",
|
|
||||||
(
|
|
||||||
message.tenant_id, message.cell_id, message.channel,
|
|
||||||
message.channel_account_id, message.peer_id, message.direction,
|
|
||||||
message_id,
|
|
||||||
),
|
|
||||||
).fetchone()
|
|
||||||
return bool(row and row["event_id"] == message.event_id and row["body"] == message.body)
|
|
||||||
|
|
||||||
def remove(self, record: LedgerRecord) -> None:
|
|
||||||
"""Compensate a newly appended record if a later ingress step fails."""
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
db.execute(
|
|
||||||
"DELETE FROM message_ledger WHERE tenant_id=? AND cell_id=? AND "
|
|
||||||
"channel=? AND channel_account_id=? AND peer_id=? AND direction=? "
|
|
||||||
"AND message_id=? AND event_id=?",
|
|
||||||
(
|
|
||||||
record.tenant_id, record.cell_id, record.channel,
|
|
||||||
record.channel_account_id, record.peer_id, record.direction,
|
|
||||||
record.message_id, record.event_id,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
def resolve_quote(self, message: CanonicalMessage) -> str:
|
|
||||||
if message.quoted_body is not None:
|
|
||||||
return message.quoted_body
|
|
||||||
if message.reply_to_message_id is None:
|
|
||||||
raise ScopeError("quoted_text_unavailable")
|
|
||||||
reply_id = normalize_message_id(
|
|
||||||
message.reply_to_message_id,
|
|
||||||
field_name="reply_to_message_id",
|
|
||||||
)
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
rows = db.execute(
|
|
||||||
"SELECT direction, body, event_id FROM message_ledger "
|
|
||||||
"WHERE tenant_id=? AND cell_id=? AND channel=? AND channel_account_id=? "
|
|
||||||
"AND peer_id=? AND message_id=? AND expires_at>?",
|
|
||||||
(
|
|
||||||
message.tenant_id,
|
|
||||||
message.cell_id,
|
|
||||||
message.channel,
|
|
||||||
message.channel_account_id,
|
|
||||||
message.peer_id,
|
|
||||||
reply_id,
|
|
||||||
isoformat(),
|
|
||||||
),
|
|
||||||
).fetchall()
|
|
||||||
if len(rows) == 1:
|
|
||||||
return str(rows[0]["body"])
|
|
||||||
if len(rows) > 1:
|
|
||||||
raise ConflictError("ambiguous reply ID across message directions")
|
|
||||||
raise ScopeError("quoted_text_unavailable")
|
|
||||||
|
|
||||||
def purge_expired(self) -> int:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
cursor = db.execute(
|
|
||||||
"DELETE FROM message_ledger WHERE expires_at<=?", (isoformat(),)
|
|
||||||
)
|
|
||||||
return cursor.rowcount
|
|
||||||
|
|
||||||
def integrity_check(self) -> str:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
return str(db.execute("PRAGMA integrity_check").fetchone()[0])
|
|
||||||
|
|
||||||
def count(self) -> int:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
return int(db.execute("SELECT count(*) FROM message_ledger").fetchone()[0])
|
|
||||||
@@ -1,336 +0,0 @@
|
|||||||
"""Authoritative tenant registry and fail-closed message router."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from contextlib import contextmanager
|
|
||||||
from contextlib import closing
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
import sqlite3
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Callable, Iterator
|
|
||||||
|
|
||||||
from .tenant_context import (
|
|
||||||
CanonicalMessage,
|
|
||||||
ConflictError,
|
|
||||||
ScopeError,
|
|
||||||
TenantContext,
|
|
||||||
ValidationError,
|
|
||||||
isoformat,
|
|
||||||
parse_time,
|
|
||||||
require_ident,
|
|
||||||
utc_now,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class Route:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
principal_id: str
|
|
||||||
session_id: str | None
|
|
||||||
|
|
||||||
|
|
||||||
class TenantRouter:
|
|
||||||
"""SQLite-backed routing registry.
|
|
||||||
|
|
||||||
Channel accounts are authoritative tenant ownership boundaries. Principal and
|
|
||||||
session bindings may narrow a route, but can never move traffic to another
|
|
||||||
tenant or Cell.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self, database: str | Path, *, clock: Callable[[], datetime] = utc_now
|
|
||||||
) -> None:
|
|
||||||
self.database = str(database)
|
|
||||||
self._clock = clock
|
|
||||||
self._initialize()
|
|
||||||
|
|
||||||
def _connect(self) -> sqlite3.Connection:
|
|
||||||
connection = sqlite3.connect(self.database, timeout=30, isolation_level=None)
|
|
||||||
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
|
|
||||||
|
|
||||||
@contextmanager
|
|
||||||
def _transaction(self) -> Iterator[sqlite3.Connection]:
|
|
||||||
connection = self._connect()
|
|
||||||
try:
|
|
||||||
connection.execute("BEGIN IMMEDIATE")
|
|
||||||
yield connection
|
|
||||||
connection.execute("COMMIT")
|
|
||||||
except Exception:
|
|
||||||
connection.execute("ROLLBACK")
|
|
||||||
raise
|
|
||||||
finally:
|
|
||||||
connection.close()
|
|
||||||
|
|
||||||
def _initialize(self) -> None:
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
db.executescript(
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS tenants (
|
|
||||||
tenant_id TEXT PRIMARY KEY,
|
|
||||||
cell_id TEXT NOT NULL UNIQUE,
|
|
||||||
status TEXT NOT NULL CHECK(status IN ('active','suspended','retired')),
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
updated_at TEXT NOT NULL
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS channel_routes (
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
channel_account_id TEXT NOT NULL,
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
cell_id TEXT NOT NULL,
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
PRIMARY KEY(channel, channel_account_id),
|
|
||||||
FOREIGN KEY(tenant_id) REFERENCES tenants(tenant_id)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS principal_routes (
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
channel_account_id TEXT NOT NULL,
|
|
||||||
principal_id TEXT NOT NULL,
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
cell_id TEXT NOT NULL,
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
PRIMARY KEY(channel, channel_account_id, principal_id),
|
|
||||||
FOREIGN KEY(channel, channel_account_id)
|
|
||||||
REFERENCES channel_routes(channel, channel_account_id)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS session_bindings (
|
|
||||||
tenant_id TEXT NOT NULL,
|
|
||||||
session_id TEXT NOT NULL,
|
|
||||||
cell_id TEXT NOT NULL,
|
|
||||||
principal_id TEXT NOT NULL,
|
|
||||||
expires_at TEXT NOT NULL,
|
|
||||||
created_at TEXT NOT NULL,
|
|
||||||
PRIMARY KEY(tenant_id, session_id),
|
|
||||||
FOREIGN KEY(tenant_id) REFERENCES tenants(tenant_id)
|
|
||||||
);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_session_expiry
|
|
||||||
ON session_bindings(expires_at);
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
def register_tenant(self, tenant_id: str, cell_id: str) -> None:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
cell_id = require_ident("cell_id", cell_id)
|
|
||||||
now = isoformat(self._clock())
|
|
||||||
with self._transaction() as db:
|
|
||||||
row = db.execute(
|
|
||||||
"SELECT cell_id, status FROM tenants WHERE tenant_id=?", (tenant_id,)
|
|
||||||
).fetchone()
|
|
||||||
if row:
|
|
||||||
if row["cell_id"] != cell_id:
|
|
||||||
raise ConflictError("tenant already bound to another cell")
|
|
||||||
db.execute(
|
|
||||||
"UPDATE tenants SET status='active', updated_at=? WHERE tenant_id=?",
|
|
||||||
(now, tenant_id),
|
|
||||||
)
|
|
||||||
return
|
|
||||||
conflict = db.execute(
|
|
||||||
"SELECT tenant_id FROM tenants WHERE cell_id=?", (cell_id,)
|
|
||||||
).fetchone()
|
|
||||||
if conflict:
|
|
||||||
raise ConflictError("cell already belongs to another tenant")
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO tenants VALUES(?,?,?,?,?)",
|
|
||||||
(tenant_id, cell_id, "active", now, now),
|
|
||||||
)
|
|
||||||
|
|
||||||
def set_tenant_status(self, tenant_id: str, status: str) -> None:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
if status not in {"active", "suspended", "retired"}:
|
|
||||||
raise ValidationError("invalid tenant status")
|
|
||||||
with self._transaction() as db:
|
|
||||||
cursor = db.execute(
|
|
||||||
"UPDATE tenants SET status=?, updated_at=? WHERE tenant_id=?",
|
|
||||||
(status, isoformat(self._clock()), tenant_id),
|
|
||||||
)
|
|
||||||
if cursor.rowcount != 1:
|
|
||||||
raise ValidationError("unknown tenant")
|
|
||||||
|
|
||||||
def bind_channel(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
tenant_id: str,
|
|
||||||
channel: str,
|
|
||||||
channel_account_id: str,
|
|
||||||
) -> None:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
channel = require_ident("channel", channel)
|
|
||||||
channel_account_id = require_ident("channel_account_id", channel_account_id)
|
|
||||||
with self._transaction() as db:
|
|
||||||
tenant = db.execute(
|
|
||||||
"SELECT cell_id, status FROM tenants WHERE tenant_id=?", (tenant_id,)
|
|
||||||
).fetchone()
|
|
||||||
if not tenant or tenant["status"] != "active":
|
|
||||||
raise ValidationError("tenant is not active")
|
|
||||||
existing = db.execute(
|
|
||||||
"SELECT tenant_id, cell_id FROM channel_routes "
|
|
||||||
"WHERE channel=? AND channel_account_id=?",
|
|
||||||
(channel, channel_account_id),
|
|
||||||
).fetchone()
|
|
||||||
if existing:
|
|
||||||
if existing["tenant_id"] != tenant_id or existing["cell_id"] != tenant["cell_id"]:
|
|
||||||
raise ConflictError("channel account already belongs to another tenant")
|
|
||||||
return
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO channel_routes VALUES(?,?,?,?,?)",
|
|
||||||
(channel, channel_account_id, tenant_id, tenant["cell_id"], isoformat(self._clock())),
|
|
||||||
)
|
|
||||||
|
|
||||||
def bind_principal(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
tenant_id: str,
|
|
||||||
channel: str,
|
|
||||||
channel_account_id: str,
|
|
||||||
principal_id: str,
|
|
||||||
) -> None:
|
|
||||||
principal_id = require_ident("principal_id", principal_id)
|
|
||||||
route = self.resolve_channel(channel, channel_account_id)
|
|
||||||
if route.tenant_id != tenant_id:
|
|
||||||
raise ScopeError("principal cannot cross tenant boundary")
|
|
||||||
with self._transaction() as db:
|
|
||||||
existing = db.execute(
|
|
||||||
"SELECT tenant_id, cell_id FROM principal_routes WHERE "
|
|
||||||
"channel=? AND channel_account_id=? AND principal_id=?",
|
|
||||||
(channel, channel_account_id, principal_id),
|
|
||||||
).fetchone()
|
|
||||||
if existing:
|
|
||||||
if existing["tenant_id"] != tenant_id or existing["cell_id"] != route.cell_id:
|
|
||||||
raise ConflictError("principal route conflict")
|
|
||||||
return
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO principal_routes VALUES(?,?,?,?,?,?)",
|
|
||||||
(
|
|
||||||
channel,
|
|
||||||
channel_account_id,
|
|
||||||
principal_id,
|
|
||||||
tenant_id,
|
|
||||||
route.cell_id,
|
|
||||||
isoformat(self._clock()),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
def bind_session(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
tenant_id: str,
|
|
||||||
session_id: str,
|
|
||||||
cell_id: str,
|
|
||||||
principal_id: str,
|
|
||||||
ttl_seconds: int = 86400,
|
|
||||||
) -> None:
|
|
||||||
tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
|
|
||||||
session_id = require_ident("session_id", session_id)
|
|
||||||
cell_id = require_ident("cell_id", cell_id)
|
|
||||||
principal_id = require_ident("principal_id", principal_id)
|
|
||||||
if not 60 <= ttl_seconds <= 31 * 86400:
|
|
||||||
raise ValidationError("invalid session TTL")
|
|
||||||
now = self._clock()
|
|
||||||
expires = isoformat(now + timedelta(seconds=ttl_seconds))
|
|
||||||
with self._transaction() as db:
|
|
||||||
tenant = db.execute(
|
|
||||||
"SELECT cell_id, status FROM tenants WHERE tenant_id=?", (tenant_id,)
|
|
||||||
).fetchone()
|
|
||||||
if not tenant or tenant["status"] != "active" or tenant["cell_id"] != cell_id:
|
|
||||||
raise ScopeError("session cell does not match tenant")
|
|
||||||
existing = db.execute(
|
|
||||||
"SELECT cell_id, principal_id FROM session_bindings "
|
|
||||||
"WHERE tenant_id=? AND session_id=?",
|
|
||||||
(tenant_id, session_id),
|
|
||||||
).fetchone()
|
|
||||||
if existing and (
|
|
||||||
existing["cell_id"] != cell_id or existing["principal_id"] != principal_id
|
|
||||||
):
|
|
||||||
raise ConflictError("session is already bound to another principal or cell")
|
|
||||||
db.execute(
|
|
||||||
"INSERT INTO session_bindings VALUES(?,?,?,?,?,?) "
|
|
||||||
"ON CONFLICT(tenant_id,session_id) DO UPDATE SET expires_at=excluded.expires_at",
|
|
||||||
(tenant_id, session_id, cell_id, principal_id, expires, isoformat(now)),
|
|
||||||
)
|
|
||||||
|
|
||||||
def resolve_channel(self, channel: str, channel_account_id: str) -> Route:
|
|
||||||
channel = require_ident("channel", channel)
|
|
||||||
channel_account_id = require_ident("channel_account_id", channel_account_id)
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
row = db.execute(
|
|
||||||
"SELECT r.tenant_id, r.cell_id, t.status FROM channel_routes r "
|
|
||||||
"JOIN tenants t ON t.tenant_id=r.tenant_id "
|
|
||||||
"WHERE r.channel=? AND r.channel_account_id=?",
|
|
||||||
(channel, channel_account_id),
|
|
||||||
).fetchone()
|
|
||||||
if not row:
|
|
||||||
raise ScopeError("unknown channel account")
|
|
||||||
if row["status"] != "active":
|
|
||||||
raise ScopeError("tenant is not active")
|
|
||||||
return Route(row["tenant_id"], row["cell_id"], channel, channel_account_id, "", None)
|
|
||||||
|
|
||||||
def resolve(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
channel: str,
|
|
||||||
channel_account_id: str,
|
|
||||||
principal_id: str,
|
|
||||||
session_id: str | None = None,
|
|
||||||
) -> Route:
|
|
||||||
principal_id = require_ident("principal_id", principal_id)
|
|
||||||
base = self.resolve_channel(channel, channel_account_id)
|
|
||||||
with closing(self._connect()) as connection, connection as db:
|
|
||||||
principal = db.execute(
|
|
||||||
"SELECT tenant_id, cell_id FROM principal_routes WHERE "
|
|
||||||
"channel=? AND channel_account_id=? AND principal_id=?",
|
|
||||||
(channel, channel_account_id, principal_id),
|
|
||||||
).fetchone()
|
|
||||||
if principal and (
|
|
||||||
principal["tenant_id"] != base.tenant_id or principal["cell_id"] != base.cell_id
|
|
||||||
):
|
|
||||||
raise ScopeError("principal route violates channel ownership")
|
|
||||||
if session_id is not None:
|
|
||||||
session_id = require_ident("session_id", session_id)
|
|
||||||
session = db.execute(
|
|
||||||
"SELECT cell_id, principal_id, expires_at FROM session_bindings "
|
|
||||||
"WHERE tenant_id=? AND session_id=?",
|
|
||||||
(base.tenant_id, session_id),
|
|
||||||
).fetchone()
|
|
||||||
if not session:
|
|
||||||
raise ScopeError("unknown session")
|
|
||||||
if parse_time(session["expires_at"]) <= self._clock():
|
|
||||||
raise ScopeError("session expired")
|
|
||||||
if session["cell_id"] != base.cell_id or session["principal_id"] != principal_id:
|
|
||||||
raise ScopeError("session scope mismatch")
|
|
||||||
return Route(
|
|
||||||
base.tenant_id,
|
|
||||||
base.cell_id,
|
|
||||||
channel,
|
|
||||||
channel_account_id,
|
|
||||||
principal_id,
|
|
||||||
session_id,
|
|
||||||
)
|
|
||||||
|
|
||||||
def assert_message_route(self, message: CanonicalMessage) -> Route:
|
|
||||||
route = self.resolve(
|
|
||||||
channel=message.channel,
|
|
||||||
channel_account_id=message.channel_account_id,
|
|
||||||
principal_id=message.principal_id,
|
|
||||||
session_id=message.session_id,
|
|
||||||
)
|
|
||||||
if message.tenant_id != route.tenant_id or message.cell_id != route.cell_id:
|
|
||||||
raise ScopeError("message claims do not match authoritative route")
|
|
||||||
return route
|
|
||||||
|
|
||||||
def assert_context_route(self, context: TenantContext) -> Route:
|
|
||||||
route = self.resolve(
|
|
||||||
channel=context.channel,
|
|
||||||
channel_account_id=context.channel_account_id,
|
|
||||||
principal_id=context.principal_id,
|
|
||||||
session_id=context.session_id,
|
|
||||||
)
|
|
||||||
if context.tenant_id != route.tenant_id or context.cell_id != route.cell_id:
|
|
||||||
raise ScopeError("context claims do not match authoritative route")
|
|
||||||
return route
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
"""V2R1 runtime composition root for authenticated channel ingress."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Any, Callable, Mapping
|
|
||||||
|
|
||||||
from .channel_adapter import ChannelAdapter, IngressResult
|
|
||||||
from .identity import (
|
|
||||||
AuthenticationError,
|
|
||||||
IngressAuthenticator,
|
|
||||||
RuntimeIdentity,
|
|
||||||
RuntimeIdentityResolver,
|
|
||||||
)
|
|
||||||
from .message_ledger import MessageLedger
|
|
||||||
from .router import TenantRouter
|
|
||||||
from .session_pool import SessionPool
|
|
||||||
from .tenant_context import ConflictError, ScopeError, TenantContext, ValidationError, utc_now
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class RuntimeIngressResponse:
|
|
||||||
"""Sanitised boundary response; no exception text crosses external ingress."""
|
|
||||||
|
|
||||||
status: str
|
|
||||||
result: IngressResult | None = None
|
|
||||||
|
|
||||||
|
|
||||||
class RuntimeWiring:
|
|
||||||
"""Own the only external-to-runtime identity binding and message path.
|
|
||||||
|
|
||||||
The request accepted by :meth:`ingest` is an HMAC-authenticated envelope;
|
|
||||||
tenant, cell, channel, account, session, principal, and message claims are
|
|
||||||
signed together. The envelope is then resolved against ``TenantRouter``.
|
|
||||||
Only that resolved identity can mint the short-lived internal context passed
|
|
||||||
to ``ChannelAdapter``.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
router: TenantRouter,
|
|
||||||
ledger: MessageLedger,
|
|
||||||
session_pool: SessionPool,
|
|
||||||
channel_adapter: ChannelAdapter,
|
|
||||||
identity_resolver: RuntimeIdentityResolver,
|
|
||||||
ingress_authenticator: IngressAuthenticator,
|
|
||||||
internal_signing_key: bytes,
|
|
||||||
clock: Callable[[], datetime],
|
|
||||||
) -> None:
|
|
||||||
self.router = router
|
|
||||||
self.ledger = ledger
|
|
||||||
self.session_pool = session_pool
|
|
||||||
self.channel_adapter = channel_adapter
|
|
||||||
self.identity_resolver = identity_resolver
|
|
||||||
self._ingress_authenticator = ingress_authenticator
|
|
||||||
self._internal_signing_key = internal_signing_key
|
|
||||||
self._clock = clock
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def create(
|
|
||||||
cls,
|
|
||||||
root: str | Path,
|
|
||||||
*,
|
|
||||||
signing_key: bytes,
|
|
||||||
ingress_hmac_key: bytes | None = None,
|
|
||||||
clock: Callable[[], datetime] = utc_now,
|
|
||||||
) -> "RuntimeWiring":
|
|
||||||
if not isinstance(signing_key, bytes) or len(signing_key) < 32:
|
|
||||||
raise ValidationError("internal signing key must be at least 32 bytes")
|
|
||||||
# Kept optional for one controlled migration release; the external
|
|
||||||
# request path still cannot supply a TenantContext token.
|
|
||||||
hmac_key = ingress_hmac_key if ingress_hmac_key is not None else signing_key
|
|
||||||
root_path = Path(root)
|
|
||||||
root_path.mkdir(parents=True, exist_ok=True)
|
|
||||||
router = TenantRouter(root_path / "router.sqlite3", clock=clock)
|
|
||||||
ledger = MessageLedger(root_path / "message_ledger.sqlite3")
|
|
||||||
session_pool = SessionPool(router)
|
|
||||||
adapter = ChannelAdapter(
|
|
||||||
router=router,
|
|
||||||
ledger=ledger,
|
|
||||||
session_pool=session_pool,
|
|
||||||
signing_key=signing_key,
|
|
||||||
clock=clock,
|
|
||||||
)
|
|
||||||
return cls(
|
|
||||||
router=router,
|
|
||||||
ledger=ledger,
|
|
||||||
session_pool=session_pool,
|
|
||||||
channel_adapter=adapter,
|
|
||||||
identity_resolver=RuntimeIdentityResolver(router),
|
|
||||||
ingress_authenticator=IngressAuthenticator(hmac_key),
|
|
||||||
internal_signing_key=signing_key,
|
|
||||||
clock=clock,
|
|
||||||
)
|
|
||||||
|
|
||||||
def _issue_internal_context(self, identity: RuntimeIdentity) -> TenantContext:
|
|
||||||
"""Mint internal scope only after all claims matched the router route."""
|
|
||||||
return TenantContext.issue(
|
|
||||||
lifetime_seconds=300,
|
|
||||||
now=self._clock(),
|
|
||||||
tenant_id=identity.tenant_id,
|
|
||||||
cell_id=identity.cell_id,
|
|
||||||
principal_id=identity.principal_id,
|
|
||||||
principal_type="authenticated_user",
|
|
||||||
session_id=identity.session_id,
|
|
||||||
task_id=None,
|
|
||||||
channel=identity.channel,
|
|
||||||
channel_account_id=identity.channel_account_id,
|
|
||||||
)
|
|
||||||
|
|
||||||
def ingest(self, *, request: Mapping[str, Any]) -> RuntimeIngressResponse:
|
|
||||||
"""Authenticate, resolve, issue internal context, then append and lease.
|
|
||||||
|
|
||||||
The only successful route is ``IngressAuthenticator`` ->
|
|
||||||
``RuntimeIdentityResolver`` -> ``ChannelAdapter`` ->
|
|
||||||
``MessageLedger.append`` + ``SessionPool``. The legacy caller-supplied
|
|
||||||
TenantContext token interface is intentionally not accepted.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
ingress = self._ingress_authenticator.authenticate(request)
|
|
||||||
identity = self.identity_resolver.resolve(ingress.principal, ingress.claims)
|
|
||||||
context = self._issue_internal_context(identity)
|
|
||||||
result = self.channel_adapter.ingest(
|
|
||||||
token=context.sign(self._internal_signing_key), message=ingress.message
|
|
||||||
)
|
|
||||||
return RuntimeIngressResponse(status="ACCEPTED", result=result)
|
|
||||||
except (AuthenticationError, ScopeError):
|
|
||||||
return RuntimeIngressResponse(status="AUTH_FAILED")
|
|
||||||
except ValidationError:
|
|
||||||
return RuntimeIngressResponse(status="VALIDATION_FAILED")
|
|
||||||
except ConflictError:
|
|
||||||
return RuntimeIngressResponse(status="CONFLICT")
|
|
||||||
except Exception:
|
|
||||||
return RuntimeIngressResponse(status="INTERNAL_ERROR")
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
"""Tenant and Cell scoped secret reference model.
|
|
||||||
|
|
||||||
This module never stores secret values. It stores ownership and retrieval scope
|
|
||||||
metadata for integration with a real secret broker.
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from typing import Literal
|
|
||||||
|
|
||||||
from .tenant_context import ValidationError, require_ident
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class SecretRef:
|
|
||||||
secret_id: str
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
kind: Literal["channel", "model", "tool", "runtime"]
|
|
||||||
version: str
|
|
||||||
broker_path: str
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
for name in ("secret_id", "cell_id", "version"):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
if self.kind not in {"channel", "model", "tool", "runtime"}:
|
|
||||||
raise ValidationError("invalid secret kind")
|
|
||||||
if not self.broker_path.startswith("secret://"):
|
|
||||||
raise ValidationError("secret broker path required")
|
|
||||||
|
|
||||||
def can_be_used_by(self, *, tenant_id: str, cell_id: str) -> bool:
|
|
||||||
return self.tenant_id == tenant_id and self.cell_id == cell_id
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
"""Process-local session lease pool backed by TenantRouter authority."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from threading import RLock
|
|
||||||
|
|
||||||
from .router import Route, TenantRouter
|
|
||||||
from .tenant_context import ScopeError, TenantContext
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class SessionLease:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
principal_id: str
|
|
||||||
session_id: str
|
|
||||||
|
|
||||||
|
|
||||||
class SessionPool:
|
|
||||||
"""Tracks active leases without creating a second session authority store."""
|
|
||||||
|
|
||||||
def __init__(self, router: TenantRouter) -> None:
|
|
||||||
self._router = router
|
|
||||||
self._leases: dict[tuple[str, str], SessionLease] = {}
|
|
||||||
self._lock = RLock()
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _assert_route(context: TenantContext, route: Route) -> None:
|
|
||||||
if (
|
|
||||||
route.tenant_id != context.tenant_id
|
|
||||||
or route.cell_id != context.cell_id
|
|
||||||
or route.principal_id != context.principal_id
|
|
||||||
or route.session_id != context.session_id
|
|
||||||
):
|
|
||||||
raise ScopeError("session lease does not match authoritative route")
|
|
||||||
|
|
||||||
def assert_available(self, context: TenantContext, route: Route) -> None:
|
|
||||||
"""Re-resolve the context from the router before a ledger mutation."""
|
|
||||||
self._assert_route(context, route)
|
|
||||||
self._assert_route(context, self._router.assert_context_route(context))
|
|
||||||
|
|
||||||
def acquire(self, context: TenantContext, route: Route) -> SessionLease:
|
|
||||||
self._assert_route(context, route)
|
|
||||||
lease = SessionLease(
|
|
||||||
tenant_id=context.tenant_id,
|
|
||||||
cell_id=context.cell_id,
|
|
||||||
principal_id=context.principal_id,
|
|
||||||
session_id=context.session_id,
|
|
||||||
)
|
|
||||||
with self._lock:
|
|
||||||
return self._leases.setdefault((lease.tenant_id, lease.session_id), lease)
|
|
||||||
|
|
||||||
def release(self, lease: SessionLease) -> None:
|
|
||||||
with self._lock:
|
|
||||||
self._leases.pop((lease.tenant_id, lease.session_id), None)
|
|
||||||
|
|
||||||
def active_count(self) -> int:
|
|
||||||
with self._lock:
|
|
||||||
return len(self._leases)
|
|
||||||
@@ -1,316 +0,0 @@
|
|||||||
"""Signed tenant context and canonical message contract for AIOS V2R1."""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import base64
|
|
||||||
from dataclasses import asdict, dataclass
|
|
||||||
from datetime import datetime, timedelta, timezone
|
|
||||||
import hashlib
|
|
||||||
import hmac
|
|
||||||
import json
|
|
||||||
import re
|
|
||||||
import secrets
|
|
||||||
from typing import Any, Mapping
|
|
||||||
|
|
||||||
VERSION = "V2R1C0"
|
|
||||||
MAX_SAFE_INTEGER = 9_007_199_254_740_991
|
|
||||||
TENANT_RE = re.compile(r"^[a-z0-9](?:[a-z0-9-]{0,38}[a-z0-9])?$")
|
|
||||||
IDENT_RE = re.compile(r"^[A-Za-z0-9](?:[A-Za-z0-9._:@-]{0,126}[A-Za-z0-9])?$")
|
|
||||||
|
|
||||||
|
|
||||||
class V2R1Error(RuntimeError):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ValidationError(V2R1Error):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ScopeError(V2R1Error):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ConflictError(V2R1Error):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def utc_now() -> datetime:
|
|
||||||
return datetime.now(timezone.utc)
|
|
||||||
|
|
||||||
|
|
||||||
def isoformat(value: datetime | None = None) -> str:
|
|
||||||
return (value or utc_now()).astimezone(timezone.utc).isoformat()
|
|
||||||
|
|
||||||
|
|
||||||
def parse_time(value: str) -> datetime:
|
|
||||||
if not isinstance(value, str) or not value.strip():
|
|
||||||
raise ValidationError("timestamp must be a non-empty string")
|
|
||||||
text = value.strip()
|
|
||||||
if text.endswith("Z"):
|
|
||||||
text = text[:-1] + "+00:00"
|
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(text)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise ValidationError(f"invalid timestamp: {value!r}") from exc
|
|
||||||
if parsed.tzinfo is None:
|
|
||||||
raise ValidationError("timestamp must include timezone")
|
|
||||||
return parsed.astimezone(timezone.utc)
|
|
||||||
|
|
||||||
|
|
||||||
def require_ident(name: str, value: Any, *, tenant: bool = False) -> str:
|
|
||||||
if not isinstance(value, str):
|
|
||||||
raise ValidationError(f"{name} must be a string")
|
|
||||||
value = value.strip()
|
|
||||||
pattern = TENANT_RE if tenant else IDENT_RE
|
|
||||||
if not pattern.fullmatch(value):
|
|
||||||
raise ValidationError(f"invalid {name}: {value!r}")
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
def normalize_message_id(value: Any, *, field_name: str = "message_id") -> str:
|
|
||||||
if isinstance(value, bool):
|
|
||||||
raise ValidationError(f"{field_name} cannot be boolean")
|
|
||||||
if isinstance(value, str):
|
|
||||||
value = value.strip()
|
|
||||||
if not value or len(value) > 256 or any(ord(ch) < 32 for ch in value):
|
|
||||||
raise ValidationError(f"invalid {field_name}")
|
|
||||||
return value
|
|
||||||
if isinstance(value, int):
|
|
||||||
if abs(value) > MAX_SAFE_INTEGER:
|
|
||||||
raise ValidationError(f"{field_name} is an unsafe numeric ID")
|
|
||||||
return str(value)
|
|
||||||
raise ValidationError(f"{field_name} must be a lossless string or safe integer")
|
|
||||||
|
|
||||||
|
|
||||||
def canonical_json(value: Any) -> bytes:
|
|
||||||
return json.dumps(
|
|
||||||
value, ensure_ascii=False, separators=(",", ":"), sort_keys=True
|
|
||||||
).encode("utf-8")
|
|
||||||
|
|
||||||
|
|
||||||
def _b64(data: bytes) -> str:
|
|
||||||
return base64.urlsafe_b64encode(data).rstrip(b"=").decode("ascii")
|
|
||||||
|
|
||||||
|
|
||||||
def _unb64(value: str) -> bytes:
|
|
||||||
return base64.urlsafe_b64decode(value + "=" * (-len(value) % 4))
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class TenantContext:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
principal_id: str
|
|
||||||
principal_type: str
|
|
||||||
session_id: str
|
|
||||||
task_id: str | None
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
issued_at: str
|
|
||||||
expires_at: str
|
|
||||||
nonce: str
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
for name in (
|
|
||||||
"cell_id", "principal_id", "principal_type", "session_id",
|
|
||||||
"channel", "channel_account_id", "nonce",
|
|
||||||
):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
if self.task_id is not None:
|
|
||||||
require_ident("task_id", self.task_id)
|
|
||||||
issued = parse_time(self.issued_at)
|
|
||||||
expires = parse_time(self.expires_at)
|
|
||||||
if expires <= issued or expires - issued > timedelta(hours=1):
|
|
||||||
raise ValidationError("invalid tenant context lifetime")
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def issue(cls, *, lifetime_seconds: int = 300, now: datetime | None = None, **scope: Any) -> "TenantContext":
|
|
||||||
if not 1 <= lifetime_seconds <= 3600:
|
|
||||||
raise ValidationError("lifetime_seconds must be between 1 and 3600")
|
|
||||||
current = (now or utc_now()).astimezone(timezone.utc)
|
|
||||||
return cls(
|
|
||||||
**scope,
|
|
||||||
issued_at=isoformat(current),
|
|
||||||
expires_at=isoformat(current + timedelta(seconds=lifetime_seconds)),
|
|
||||||
nonce=secrets.token_hex(16),
|
|
||||||
)
|
|
||||||
|
|
||||||
def sign(self, key: bytes) -> str:
|
|
||||||
if len(key) < 32:
|
|
||||||
raise ValidationError("signing key must be at least 32 bytes")
|
|
||||||
payload = _b64(canonical_json(asdict(self)))
|
|
||||||
signature = _b64(hmac.new(key, payload.encode("ascii"), hashlib.sha256).digest())
|
|
||||||
return f"{payload}.{signature}"
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def verify(
|
|
||||||
cls,
|
|
||||||
token: str,
|
|
||||||
key: bytes,
|
|
||||||
*,
|
|
||||||
now: datetime | None = None,
|
|
||||||
expected_tenant_id: str | None = None,
|
|
||||||
expected_cell_id: str | None = None,
|
|
||||||
) -> "TenantContext":
|
|
||||||
if len(key) < 32:
|
|
||||||
raise ValidationError("signing key must be at least 32 bytes")
|
|
||||||
try:
|
|
||||||
payload, encoded_signature = token.split(".", 1)
|
|
||||||
actual = _unb64(encoded_signature)
|
|
||||||
if encoded_signature != _b64(actual):
|
|
||||||
raise ValidationError("non-canonical tenant context signature")
|
|
||||||
data = json.loads(_unb64(payload))
|
|
||||||
except Exception as exc:
|
|
||||||
raise ValidationError("malformed tenant context token") from exc
|
|
||||||
expected = hmac.new(key, payload.encode("ascii"), hashlib.sha256).digest()
|
|
||||||
if not hmac.compare_digest(actual, expected):
|
|
||||||
raise ValidationError("tenant context signature mismatch")
|
|
||||||
context = cls(**data)
|
|
||||||
current = (now or utc_now()).astimezone(timezone.utc)
|
|
||||||
if current < parse_time(context.issued_at) - timedelta(seconds=60):
|
|
||||||
raise ValidationError("tenant context issued in future")
|
|
||||||
if current >= parse_time(context.expires_at):
|
|
||||||
raise ValidationError("tenant context expired")
|
|
||||||
if expected_tenant_id and context.tenant_id != expected_tenant_id:
|
|
||||||
raise ScopeError("tenant mismatch")
|
|
||||||
if expected_cell_id and context.cell_id != expected_cell_id:
|
|
||||||
raise ScopeError("cell mismatch")
|
|
||||||
return context
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class CanonicalMessage:
|
|
||||||
tenant_id: str
|
|
||||||
cell_id: str
|
|
||||||
principal_id: str
|
|
||||||
principal_type: str
|
|
||||||
origin_type: str
|
|
||||||
channel: str
|
|
||||||
channel_account_id: str
|
|
||||||
peer_id: str
|
|
||||||
conversation_id: str
|
|
||||||
session_id: str
|
|
||||||
task_id: str | None
|
|
||||||
event_id: str
|
|
||||||
message_id: str
|
|
||||||
reply_to_message_id: str | None
|
|
||||||
direction: str
|
|
||||||
command_capable: bool
|
|
||||||
occurred_at: str
|
|
||||||
received_at: str
|
|
||||||
body: str
|
|
||||||
quoted_body: str | None
|
|
||||||
adapter_name: str
|
|
||||||
adapter_version: str
|
|
||||||
schema_version: str = "aios.message.v1"
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
|
||||||
if self.schema_version != "aios.message.v1":
|
|
||||||
raise ValidationError("unsupported message schema version")
|
|
||||||
require_ident("tenant_id", self.tenant_id, tenant=True)
|
|
||||||
for name in (
|
|
||||||
"cell_id", "principal_id", "principal_type", "origin_type", "channel",
|
|
||||||
"channel_account_id", "peer_id", "conversation_id", "session_id",
|
|
||||||
"event_id", "adapter_name", "adapter_version",
|
|
||||||
):
|
|
||||||
require_ident(name, getattr(self, name))
|
|
||||||
if self.task_id is not None:
|
|
||||||
require_ident("task_id", self.task_id)
|
|
||||||
normalize_message_id(self.message_id)
|
|
||||||
if self.reply_to_message_id is not None:
|
|
||||||
normalize_message_id(self.reply_to_message_id, field_name="reply_to_message_id")
|
|
||||||
if self.direction not in {"inbound", "outbound", "internal"}:
|
|
||||||
raise ValidationError("invalid direction")
|
|
||||||
if not isinstance(self.command_capable, bool):
|
|
||||||
raise ValidationError("command_capable must be boolean")
|
|
||||||
parse_time(self.occurred_at)
|
|
||||||
parse_time(self.received_at)
|
|
||||||
if not isinstance(self.body, str):
|
|
||||||
raise ValidationError("body must be a string")
|
|
||||||
if self.quoted_body is not None and not isinstance(self.quoted_body, str):
|
|
||||||
raise ValidationError("quoted_body must be a string or null")
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_mapping(cls, data: Mapping[str, Any]) -> "CanonicalMessage":
|
|
||||||
content = data.get("content") or {}
|
|
||||||
adapter = data.get("adapter") or {}
|
|
||||||
if not isinstance(content, Mapping) or not isinstance(adapter, Mapping):
|
|
||||||
raise ValidationError("content and adapter must be objects")
|
|
||||||
values = dict(data)
|
|
||||||
return cls(
|
|
||||||
schema_version=values.get("schema_version", "aios.message.v1"),
|
|
||||||
tenant_id=values["tenant_id"],
|
|
||||||
cell_id=values["cell_id"],
|
|
||||||
principal_id=values["principal_id"],
|
|
||||||
principal_type=values["principal_type"],
|
|
||||||
origin_type=values["origin_type"],
|
|
||||||
channel=values["channel"],
|
|
||||||
channel_account_id=values["channel_account_id"],
|
|
||||||
peer_id=values["peer_id"],
|
|
||||||
conversation_id=values["conversation_id"],
|
|
||||||
session_id=values["session_id"],
|
|
||||||
task_id=values.get("task_id"),
|
|
||||||
event_id=values["event_id"],
|
|
||||||
message_id=normalize_message_id(values["message_id"]),
|
|
||||||
reply_to_message_id=(
|
|
||||||
normalize_message_id(values["reply_to_message_id"], field_name="reply_to_message_id")
|
|
||||||
if values.get("reply_to_message_id") is not None else None
|
|
||||||
),
|
|
||||||
direction=values["direction"],
|
|
||||||
command_capable=values["command_capable"],
|
|
||||||
occurred_at=values["occurred_at"],
|
|
||||||
received_at=values["received_at"],
|
|
||||||
body=content.get("body", ""),
|
|
||||||
quoted_body=content.get("quoted_body"),
|
|
||||||
adapter_name=adapter["name"],
|
|
||||||
adapter_version=adapter["version"],
|
|
||||||
)
|
|
||||||
|
|
||||||
def assert_context(self, context: TenantContext) -> None:
|
|
||||||
fields = (
|
|
||||||
"tenant_id", "cell_id", "principal_id", "session_id", "task_id",
|
|
||||||
"channel", "channel_account_id",
|
|
||||||
)
|
|
||||||
mismatches = [name for name in fields if getattr(self, name) != getattr(context, name)]
|
|
||||||
if mismatches:
|
|
||||||
raise ScopeError("message/context mismatch: " + ", ".join(mismatches))
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_authenticated_human_command(self) -> bool:
|
|
||||||
return (
|
|
||||||
self.direction == "inbound"
|
|
||||||
and self.command_capable
|
|
||||||
and self.principal_type == "authenticated_user"
|
|
||||||
and self.origin_type == "channel_user"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class PolicyDecision:
|
|
||||||
allowed: bool
|
|
||||||
approval_required: bool
|
|
||||||
code: str
|
|
||||||
reason: str
|
|
||||||
|
|
||||||
|
|
||||||
READ_ONLY_TOOLS = frozenset({
|
|
||||||
"read", "grep", "glob", "find", "ls", "web_search", "web_fetch",
|
|
||||||
"memory_search", "sessions_list", "sessions_history", "session_status",
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def evaluate_tool_call(tool_name: str, message: CanonicalMessage) -> PolicyDecision:
|
|
||||||
normalized = tool_name.strip().lower() if isinstance(tool_name, str) else ""
|
|
||||||
if not normalized:
|
|
||||||
return PolicyDecision(False, False, "invalid_tool", "tool name missing")
|
|
||||||
if normalized in READ_ONLY_TOOLS:
|
|
||||||
return PolicyDecision(True, False, "read_only", "read-only operation")
|
|
||||||
if not message.is_authenticated_human_command:
|
|
||||||
return PolicyDecision(
|
|
||||||
False, False, "origin_denied",
|
|
||||||
"side effects require an authenticated current human command",
|
|
||||||
)
|
|
||||||
return PolicyDecision(
|
|
||||||
True, True, "approval_required",
|
|
||||||
"authenticated human side effect requires explicit approval",
|
|
||||||
)
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
[build-system]
|
|
||||||
requires = ["setuptools>=68"]
|
|
||||||
build-backend = "setuptools.build_meta"
|
|
||||||
|
|
||||||
[project]
|
|
||||||
name = "aios-v2r1-runtime"
|
|
||||||
version = "2.1.0rc1"
|
|
||||||
description = "AIOS V2R1 canonical runtime package"
|
|
||||||
requires-python = ">=3.11"
|
|
||||||
dependencies = []
|
|
||||||
|
|
||||||
[project.scripts]
|
|
||||||
aios-cell = "aios_v2r1.cli:main"
|
|
||||||
|
|
||||||
[tool.setuptools]
|
|
||||||
package-dir = {"" = "app"}
|
|
||||||
packages = ["aios_v2r1"]
|
|
||||||
Symlink
+1
@@ -0,0 +1 @@
|
|||||||
|
/data/aios-gitops/workspace/active-runtime
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"ts": 1783642009.9384289, "name": "another_cmd.json"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"ts": 1783642009.9384289, "name": "stuck_cmd.json"}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# CMD-20260710-sr01-gitea-branch-sync
|
||||||
|
|
||||||
|
## Objective
|
||||||
|
Fix Gitea DB branch index desync: Gitea DB 与 bare repo 分支列表不一致(Gitea API 返回 50 条 vs bare repo 55 条)。
|
||||||
|
|
||||||
|
## Analysis
|
||||||
|
- Root cause: `h_branch_sync()` 之前依赖 Gitea API `POST /api/v1/repos/aios/aios/branches` 分页查询
|
||||||
|
- Token scope 不足 `read:admin` 导致只能获取 50 条(默认 limit),但 total 是 55
|
||||||
|
- 临时修复: 改为 `git ls-remote --heads` 直接枚举 bare repo,绕过了 Gitea API 分页问题
|
||||||
|
- 但根本问题:Gitea DB 索引没有完全同步 bare repo,需要调查 Gitea 后台同步机制
|
||||||
|
|
||||||
|
## Plan
|
||||||
|
1. 诊断 Gitea DB 与 bare repo 实际的差异详情
|
||||||
|
2. 决定修复方案:full resync Gitea, or fix the sync mechanism
|
||||||
|
3. 实现/验证
|
||||||
|
4. 更新 baseline
|
||||||
|
|
||||||
|
## Status
|
||||||
|
pending
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"ts": 1783642009.9169936, "name": "cmd1.json"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"ts": 1783642009.9169936, "name": "cmd2.json"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"ts": 1783643569.9295633, "name": "recent"}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783583895",
|
||||||
|
"title": "⚠️ Issue Detected: stuck",
|
||||||
|
"body": "1 commands stuck in running/ for >30m",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T15:58:15+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783583993",
|
||||||
|
"title": "⚠️ Issue Detected: stuck",
|
||||||
|
"body": "1 commands stuck in running/ for >30m",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T15:59:53+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783584042",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T16:00:42+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783597695",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T19:48:15+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783597737",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T19:48:57+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783598337",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T19:58:57+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783598938",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:08:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783599538",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:18:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783600138",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:28:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783600738",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:38:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783601338",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:48:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783601938",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T20:58:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783602538",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:08:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783603138",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:18:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783603738",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:28:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783604338",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:38:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783604938",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:48:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783605538",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T21:58:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783606138",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:08:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783606738",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:18:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783607338",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:28:58+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783607939",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:38:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783608539",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:48:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783609139",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T22:58:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783609739",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T23:08:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783610339",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T23:18:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783610939",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T23:28:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783611539",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T23:38:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783612139",
|
||||||
|
"title": "⚠️ Issue Detected: branch_sync",
|
||||||
|
"body": "5 branches missing from Gitea DB",
|
||||||
|
"urgency": "warning",
|
||||||
|
"ts": "2026-07-09T23:48:59+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"nid": "n-1783643869",
|
||||||
|
"title": "Stuck Commands Cleaned",
|
||||||
|
"body": "Moved 2 stuck commands to failed/",
|
||||||
|
"urgency": "info",
|
||||||
|
"ts": "2026-07-10T08:37:49+0800"
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"check": "stuck", "severity": "medium", "diagnosis": "stuck commands", "stuck": [{"n": "stuck_cmd.json", "ts": 1783642009.9384289}, {"n": "another_cmd.json", "ts": 1783642009.9384289}], "fix": "move_to_failed"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"check": "branch_sync", "severity": "high", "diagnosis": "missing branches", "branches": ["br1"], "fix": "sync_branches"}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783584042",
|
||||||
|
"created": "2026-07-09T16:00:42+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/user-profile-isolation",
|
||||||
|
"patch/gitops-change-archive-audit"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783597695",
|
||||||
|
"created": "2026-07-09T19:48:15+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/user-profile-isolation",
|
||||||
|
"patch/group-owner-agent-context-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783597737",
|
||||||
|
"created": "2026-07-09T19:48:57+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783598337",
|
||||||
|
"created": "2026-07-09T19:58:57+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783598938",
|
||||||
|
"created": "2026-07-09T20:08:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783599538",
|
||||||
|
"created": "2026-07-09T20:18:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783600138",
|
||||||
|
"created": "2026-07-09T20:28:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783600738",
|
||||||
|
"created": "2026-07-09T20:38:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783601338",
|
||||||
|
"created": "2026-07-09T20:48:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783601938",
|
||||||
|
"created": "2026-07-09T20:58:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783602538",
|
||||||
|
"created": "2026-07-09T21:08:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783603138",
|
||||||
|
"created": "2026-07-09T21:18:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783603738",
|
||||||
|
"created": "2026-07-09T21:28:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783604338",
|
||||||
|
"created": "2026-07-09T21:38:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783604938",
|
||||||
|
"created": "2026-07-09T21:48:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783605538",
|
||||||
|
"created": "2026-07-09T21:58:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783606138",
|
||||||
|
"created": "2026-07-09T22:08:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783606738",
|
||||||
|
"created": "2026-07-09T22:18:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783607338",
|
||||||
|
"created": "2026-07-09T22:28:58+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783607939",
|
||||||
|
"created": "2026-07-09T22:38:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783608539",
|
||||||
|
"created": "2026-07-09T22:48:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783609139",
|
||||||
|
"created": "2026-07-09T22:58:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783609739",
|
||||||
|
"created": "2026-07-09T23:08:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783610339",
|
||||||
|
"created": "2026-07-09T23:18:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783610939",
|
||||||
|
"created": "2026-07-09T23:28:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783611539",
|
||||||
|
"created": "2026-07-09T23:38:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783612139",
|
||||||
|
"created": "2026-07-09T23:48:59+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "5 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"patch/agent-event-bus-unified",
|
||||||
|
"patch/agent-gpt-message-plane",
|
||||||
|
"patch/group-owner-agent-context-isolation",
|
||||||
|
"patch/gitops-change-archive-audit",
|
||||||
|
"patch/user-profile-isolation"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"patch_id": "patch-1783643869",
|
||||||
|
"created": "2026-07-10T08:37:49+0800",
|
||||||
|
"check": "branch_sync",
|
||||||
|
"severity": "high",
|
||||||
|
"diagnosis": "2 branches missing from Gitea DB",
|
||||||
|
"branches": [
|
||||||
|
"br1",
|
||||||
|
"br2"
|
||||||
|
],
|
||||||
|
"stuck": [],
|
||||||
|
"fix": "sync_branches"
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
this is not json
|
||||||
+29
-18
@@ -1,7 +1,8 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
# AIOS Agent Command Plane Registry
|
# AIOS Agent Command Plane Registry
|
||||||
# Git is the single source of truth for all agent commands.
|
# Git is the single source of truth for all agent commands.
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
created_at: "2026-07-08T15:20:00+08:00"
|
created_at: 2026-07-08T15:20:00+08:00
|
||||||
baseline: V1R3C1
|
baseline: V1R3C1
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
@@ -11,22 +12,6 @@ commands:
|
|||||||
completed_path: "agents/commands/completed/"
|
completed_path: "agents/commands/completed/"
|
||||||
failed_path: "agents/commands/failed/"
|
failed_path: "agents/commands/failed/"
|
||||||
|
|
||||||
directories:
|
|
||||||
commands/active: "New commands pending execution — Git is the only entry point"
|
|
||||||
commands/running: "Commands currently being executed by an agent"
|
|
||||||
commands/completed: "Commands that finished successfully — moved here on success"
|
|
||||||
commands/failed: "Commands that finished with errors — moved here on failure"
|
|
||||||
|
|
||||||
lifecycle:
|
|
||||||
new: active/
|
|
||||||
running: running/
|
|
||||||
success: completed/
|
|
||||||
failure: failed/
|
|
||||||
|
|
||||||
# Command lifecycle state machine:
|
|
||||||
# active/ → locked & moved to running/ → execute → success → completed/
|
|
||||||
# → failure → failed/
|
|
||||||
|
|
||||||
policies:
|
policies:
|
||||||
path: "agents/policies/"
|
path: "agents/policies/"
|
||||||
source: "git"
|
source: "git"
|
||||||
@@ -53,4 +38,30 @@ audit:
|
|||||||
agent_runs: "audit/agent-runs/"
|
agent_runs: "audit/agent-runs/"
|
||||||
version_history: "audit/version-history/"
|
version_history: "audit/version-history/"
|
||||||
command_history: "audit/command-history/"
|
command_history: "audit/command-history/"
|
||||||
interaction_history: "audit/interaction-history/"
|
=======
|
||||||
|
# AIOS Agent Command Registry
|
||||||
|
# Git is the single source of truth for all agent commands.
|
||||||
|
|
||||||
|
registry_version: 1.0.0
|
||||||
|
created_at: "2026-07-08T15:44:00+08:00"
|
||||||
|
baseline: V1R3C1
|
||||||
|
|
||||||
|
directories:
|
||||||
|
commands/active: "New commands pending execution — Git is the only entry point"
|
||||||
|
commands/running: "Commands currently being executed by an agent"
|
||||||
|
commands/completed: "Commands that finished successfully — moved here on success"
|
||||||
|
commands/failed: "Commands that finished with errors — moved here on failure"
|
||||||
|
|
||||||
|
state: agents/state/
|
||||||
|
policies: agents/policies/
|
||||||
|
|
||||||
|
lifecycle:
|
||||||
|
new: active/
|
||||||
|
running: running/
|
||||||
|
success: completed/
|
||||||
|
failure: failed/
|
||||||
|
|
||||||
|
# Command lifecycle state machine:
|
||||||
|
# active/ → locked & moved to running/ → execute → success → completed/
|
||||||
|
# → failure → failed/
|
||||||
|
>>>>>>> 4d18ee0 (feat(cmd): enable Agent Command Plane, audit plane, and Web UI dashboard)
|
||||||
|
|||||||
@@ -76,20 +76,25 @@ def h_api():
|
|||||||
except Exception as e: return {"ok": False, "err": str(e)}
|
except Exception as e: return {"ok": False, "err": str(e)}
|
||||||
|
|
||||||
def h_branch_sync():
|
def h_branch_sync():
|
||||||
bare = Path("/data/aios-gitops/runtime/gitea-bin/data/repositories/aios/aios-v23.git")
|
bare = Path("/data/aios-gitops/runtime/gitea-bin/data/repositories/aios/aios.git")
|
||||||
try:
|
try:
|
||||||
|
# Use git command directly instead of Gitea API to avoid auth/permission issues
|
||||||
r = subprocess.run(["git","--git-dir",str(bare),"branch","-a"], capture_output=True, text=True, timeout=10)
|
r = subprocess.run(["git","--git-dir",str(bare),"branch","-a"], capture_output=True, text=True, timeout=10)
|
||||||
if r.returncode != 0: return {"ok": False, "err": r.stderr[:200]}
|
if r.returncode != 0: return {"ok": False, "err": r.stderr[:200]}
|
||||||
bb = set(l.strip().replace("remotes/origin/","").replace("* ","") for l in r.stdout.strip().split("\n") if l.strip())
|
bb = set(l.strip().replace("remotes/origin/","").replace("* ","") for l in r.stdout.strip().split("\n") if l.strip())
|
||||||
gb = []; pg = 1
|
# Use git ls-remote to get remote branches instead of Gitea API
|
||||||
while True:
|
r2 = subprocess.run(["git","ls-remote","--heads",GITEA_URL.split("//")[0]+"//"+GITEA_TOKEN+"@"+GITEA_URL.split("//")[1]+"/aios/aios.git"],
|
||||||
r2 = requests.get(f"{GITEA_URL}/api/v1/repos/aios/aios-v23/branches", params={"page":pg,"limit":50},
|
capture_output=True, text=True, timeout=15)
|
||||||
headers={"Authorization":f"token {GITEA_TOKEN}"}, timeout=10)
|
if r2.returncode != 0: return {"ok": False, "bare": len(bb), "gitea": 0, "err": "ls-remote failed: "+r2.stderr[:200]}
|
||||||
if r2.status_code != 200: break
|
gb = []
|
||||||
d = r2.json()
|
for line in r2.stdout.strip().split("\n"):
|
||||||
if not d: break
|
if line.strip():
|
||||||
gb.extend(b["name"] for b in d); pg += 1
|
parts = line.strip().split(None, 1)
|
||||||
gs = set(gb); miss = bb - gs
|
if len(parts) == 2:
|
||||||
|
ref = parts[1].replace("refs/heads/","")
|
||||||
|
gb.append(ref)
|
||||||
|
gs = set(gb)
|
||||||
|
miss = bb - gs
|
||||||
return {"ok": len(miss)==0, "bare": len(bb), "gitea": len(gs), "missing": list(miss)[:10]}
|
return {"ok": len(miss)==0, "bare": len(bb), "gitea": len(gs), "missing": list(miss)[:10]}
|
||||||
except Exception as e: return {"ok": False, "err": str(e)}
|
except Exception as e: return {"ok": False, "err": str(e)}
|
||||||
|
|
||||||
|
|||||||
+11
-10
@@ -1,11 +1,12 @@
|
|||||||
{
|
{
|
||||||
"ts": "2026-07-09T00:00:00+09:00",
|
"ts": "2026-07-11T02:23:29+0800",
|
||||||
"ok": true,
|
"ok": false,
|
||||||
"checks": {
|
"checks": {
|
||||||
"git_object_permission": true,
|
"gitea": false,
|
||||||
"api": true,
|
"api": true,
|
||||||
"branch_sync": true,
|
"branch_sync": true,
|
||||||
"stale_runtime_state_cleaned": true
|
"stuck": true
|
||||||
},
|
},
|
||||||
"note": "Updated during PR #2 cleanup before merge"
|
"plans": 0,
|
||||||
}
|
"applied": 0
|
||||||
|
}
|
||||||
@@ -11,5 +11,5 @@
|
|||||||
"discovered_at": "2026-07-08T19:01:45+0800"
|
"discovered_at": "2026-07-08T19:01:45+0800"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"last_scan": "2026-07-09T10:42:52+0800"
|
"last_scan": "2026-07-11T02:28:28+0800"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783583895",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "degraded",
|
||||||
|
"ts": "2026-07-09T15:58:15+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": false,
|
||||||
|
"stuck": [
|
||||||
|
{
|
||||||
|
"n": "CMD-20260709-enable-autonomous-controller.md",
|
||||||
|
"age": 292.9
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783583993",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "degraded",
|
||||||
|
"ts": "2026-07-09T15:59:53+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": false,
|
||||||
|
"stuck": [
|
||||||
|
{
|
||||||
|
"n": "CMD-20260709-enable-autonomous-controller.md",
|
||||||
|
"age": 294.6
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783584042",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "degraded",
|
||||||
|
"ts": "2026-07-09T16:00:42+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": false,
|
||||||
|
"stuck": [
|
||||||
|
{
|
||||||
|
"n": "CMD-20260709-enable-autonomous-controller.md",
|
||||||
|
"age": 295.4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783597602",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "ok",
|
||||||
|
"ts": "2026-07-09T19:46:42+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": true,
|
||||||
|
"stuck": []
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783597695",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "ok",
|
||||||
|
"ts": "2026-07-09T19:48:15+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": true,
|
||||||
|
"stuck": []
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783597737",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "ok",
|
||||||
|
"ts": "2026-07-09T19:48:57+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": true,
|
||||||
|
"stuck": []
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"run_id": "c-1783598337",
|
||||||
|
"check": "stuck",
|
||||||
|
"status": "ok",
|
||||||
|
"ts": "2026-07-09T19:58:57+0800",
|
||||||
|
"details": {
|
||||||
|
"ok": true,
|
||||||
|
"stuck": []
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user