Compare commits
397
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b5a6fb3ef | ||
|
|
8291b8368b | ||
|
|
4f3ee3f3d7 | ||
|
|
c0a1c1d641 | ||
|
|
17eb294d05 | ||
|
|
95de2979eb | ||
|
|
5ddfb51d3e | ||
|
|
e24fd30c6e | ||
|
|
4fac5ea7cf | ||
|
|
2a409c923c | ||
|
|
6606b6671f | ||
|
|
4390381bdc | ||
|
|
5cb33f3e75 | ||
|
|
62ceb465e0 | ||
|
|
f38d916317 | ||
|
|
3a90130ed0 | ||
|
|
58cdd62840 | ||
|
|
c110415cd3 | ||
|
|
a7cdb8c5f8 | ||
|
|
9709946849 | ||
|
|
27d8295aa5 | ||
|
|
2b219e0d24 | ||
|
|
4505b7878b | ||
|
|
3945be8136 | ||
|
|
ab41012a0d | ||
|
|
ab1e13965d | ||
|
|
76630e49f0 | ||
|
|
9c8c02761c | ||
|
|
5574914efd | ||
|
|
bc2330a28a | ||
|
|
b73da1615c | ||
|
|
bb25857510 | ||
|
|
b57d121a29 | ||
|
|
f8d563afef | ||
|
|
affd23bd53 | ||
|
|
5813cee9c7 | ||
|
|
eeedbcb67e | ||
|
|
7065a665da | ||
|
|
928cd2cff3 | ||
|
|
edd58a8555 | ||
|
|
80103d87bc | ||
|
|
cfc0fb4a0a | ||
|
|
f67b07f91d | ||
|
|
139c47072a | ||
|
|
0440ae4a65 | ||
|
|
fe49f7e47f | ||
|
|
28077c87db | ||
|
|
005265db84 | ||
|
|
ddfb611df9 | ||
|
|
236940607d | ||
|
|
c45dc05021 | ||
|
|
4f2c60ca1f | ||
|
|
39e20625af | ||
|
|
09f6dbd182 | ||
|
|
d437667e42 | ||
|
|
ea4800a052 | ||
|
|
2a33393490 | ||
|
|
ea2064662e | ||
|
|
b45ae05718 | ||
|
|
4bd8efd4a2 | ||
|
|
8dd5f74961 | ||
|
|
39a4c6e3c4 | ||
|
|
5223414887 | ||
|
|
bb19f497e0 | ||
|
|
270331837e | ||
|
|
4e6865eeff | ||
|
|
b2ce52f49c | ||
|
|
e677089cc7 | ||
|
|
3051edf5b0 | ||
|
|
1719a40991 | ||
|
|
c4b62556b2 | ||
|
|
1f6efc818c | ||
|
|
6ac6a25d66 | ||
|
|
7f1da71a50 | ||
|
|
70f36becce | ||
|
|
7188ee3258 | ||
|
|
d792803843 | ||
|
|
bba3a4e92f | ||
|
|
0c9ad1a1c2 | ||
|
|
3df2cea26f | ||
|
|
e36e31ef26 | ||
|
|
a1e67103ce | ||
|
|
d39e15033c | ||
|
|
28814a663c | ||
|
|
b85077dcd0 | ||
|
|
2cf7c3c25d | ||
|
|
4467ff1e6e | ||
|
|
e35e7ba567 | ||
|
|
b4191b86ea | ||
|
|
d22d69638b | ||
|
|
d4c577d408 | ||
|
|
e50a4f3b86 | ||
|
|
e310def7db | ||
|
|
c56567120a | ||
|
|
875d41c310 | ||
|
|
870ac61dc2 | ||
|
|
009f276699 | ||
|
|
600c717e17 | ||
|
|
02be6d28ed | ||
|
|
b1e240dda3 | ||
|
|
2dfbe837f4 | ||
|
|
80df1e0d87 | ||
|
|
7ecf7cbfce | ||
|
|
bbada7c863 | ||
|
|
df099420d2 | ||
|
|
2d802f3d51 | ||
|
|
dd34dfaad2 | ||
|
|
346426b6ca | ||
|
|
967b90af91 | ||
|
|
2458fa5f28 | ||
|
|
40f2f3ebed | ||
|
|
687112d86c | ||
|
|
f0d1e8479b | ||
|
|
85b4610eb3 | ||
|
|
a0b5160534 | ||
|
|
cf57ef6bcc | ||
|
|
958e49e2cf | ||
|
|
3f6cabd4ac | ||
|
|
146d2123a5 | ||
|
|
ecd4ee1cc9 | ||
|
|
eaf6cd739f | ||
|
|
d4276e2cf5 | ||
|
|
f7a04ccec6 | ||
|
|
5cf628deca | ||
|
|
9914ebc9d4 | ||
|
|
39ffd23335 | ||
|
|
467015e3fc | ||
|
|
cdefcc18dd | ||
|
|
1594ac9a18 | ||
|
|
0ba2cdb63d | ||
|
|
a8e9786897 | ||
|
|
58511395c1 | ||
|
|
d23aafc04c | ||
|
|
312aeff1ab | ||
|
|
1673575b21 | ||
|
|
8b97275ff7 | ||
|
|
578f0a7e28 | ||
|
|
9cc04bf146 | ||
|
|
e0b48dae24 | ||
|
|
9893652270 | ||
|
|
57234854f7 | ||
|
|
ccd64610b0 | ||
|
|
bad1120d6d | ||
|
|
c8d2386677 | ||
|
|
08897d3968 | ||
|
|
8497848120 | ||
|
|
dad45ab32b | ||
|
|
238742150b | ||
|
|
04865315a3 | ||
|
|
8e72dc22d6 | ||
|
|
79ac5abac2 | ||
|
|
655c69fc4b | ||
|
|
63e0b8e705 | ||
|
|
edfad05d57 | ||
|
|
e40c05779c | ||
|
|
a3edc628a9 | ||
|
|
f4b6ac8609 | ||
|
|
83ab67f7e1 | ||
|
|
27a0ae126b | ||
|
|
54093d1543 | ||
|
|
3196d91b12 | ||
|
|
3812e1ab01 | ||
|
|
fc0b9f29bf | ||
|
|
b739fbb5ec | ||
|
|
02658d2329 | ||
|
|
75efdef2d2 | ||
|
|
3584628cfe | ||
|
|
181dc54b9f | ||
|
|
ed7adc6c23 | ||
|
|
6e3a8ac11a | ||
|
|
dd352a79d1 | ||
|
|
abe17f4aec | ||
|
|
6d61929055 | ||
|
|
c4f9c8a5ca | ||
|
|
9975453f50 | ||
|
|
26d81a9f34 | ||
|
|
af2a1f39bc | ||
|
|
151b57100f | ||
|
|
aaf9a2c73f | ||
|
|
a281bfeacd | ||
|
|
5894142682 | ||
|
|
602cc9ee28 | ||
|
|
6dbd5cbe07 | ||
|
|
a56caf46f6 | ||
|
|
41e21ff5fe | ||
|
|
b05eb1babe | ||
|
|
a8581699f2 | ||
|
|
cc9cada5df | ||
|
|
dbed29c8c7 | ||
|
|
24f7e4ecc3 | ||
|
|
b588bf8fb2 | ||
|
|
f300033138 | ||
|
|
7308c9c0c1 | ||
|
|
48290bd620 | ||
|
|
3cf9958cb9 | ||
|
|
6b70a33080 | ||
|
|
8d23692320 | ||
|
|
33d3947da6 | ||
|
|
806163b8ba | ||
|
|
13c2a18286 | ||
|
|
b8f10951ea | ||
|
|
2fcf0879c6 | ||
|
|
1136b4186d | ||
|
|
cca73ad52f | ||
|
|
424bf36c03 | ||
|
|
9eb00da0c4 | ||
|
|
9269e81997 | ||
|
|
6642820aa0 | ||
|
|
8374c6b1c7 | ||
|
|
c8a3251834 | ||
|
|
2418f56273 | ||
|
|
297582941f | ||
|
|
958a61cbc4 | ||
|
|
3096212919 | ||
|
|
aa2b091966 | ||
|
|
1a9cb9095e | ||
|
|
0312159168 | ||
|
|
e204a90398 | ||
|
|
d8cf6058e9 | ||
|
|
2aefc19e3d | ||
|
|
28a430066f | ||
|
|
1013aef461 | ||
|
|
bb3210d74f | ||
|
|
745395e93b | ||
|
|
ae49bf0fa3 | ||
|
|
8410cd895e | ||
|
|
dc1642c2e8 | ||
|
|
c75b865710 | ||
|
|
e992b624e0 | ||
|
|
c60e4cd02c | ||
|
|
4b2996ca9f | ||
|
|
086076b74f | ||
|
|
7b2d694272 | ||
|
|
0583060c7c | ||
|
|
20e707fb52 | ||
|
|
6c75ec6bb2 | ||
|
|
e9fefd4c18 | ||
|
|
3ece481c74 | ||
|
|
33177548c3 | ||
|
|
ed1413a05e | ||
|
|
05d1e64228 | ||
|
|
64bbe1b51c | ||
|
|
3c6f2c8c65 | ||
|
|
f6d9bb1510 | ||
|
|
8ca4db3e8c | ||
|
|
d194d3a4d7 | ||
|
|
f5435e3087 | ||
|
|
88087dc7ff | ||
|
|
2f04b9f46c | ||
|
|
06d3b4cda6 | ||
|
|
09186fe551 | ||
|
|
c634f2e23b | ||
|
|
b3ccae4c2b | ||
|
|
85ac09110f | ||
|
|
6622ebb30e | ||
|
|
824b079fea | ||
|
|
2e5a8bfb5a | ||
|
|
ce36b790ea | ||
|
|
8d60aa921a | ||
|
|
78ce96a8db | ||
|
|
ce308f84ba | ||
|
|
7459f24696 | ||
|
|
8f90744ba0 | ||
|
|
4db407345c | ||
|
|
4a09eacfe4 | ||
|
|
a9e1b26652 | ||
|
|
513d90bb8a | ||
|
|
d03f06aa82 | ||
|
|
c657057826 | ||
|
|
84717341d7 | ||
|
|
f631a61330 | ||
|
|
38222c9fec | ||
|
|
055fc895a6 | ||
|
|
8ab38f142a | ||
|
|
1b3921f9c8 | ||
|
|
c15453db1a | ||
|
|
83641c2491 | ||
|
|
e1f4d1f267 | ||
|
|
00d37b2d1a | ||
|
|
887061e65b | ||
|
|
bb2b301c4e | ||
|
|
2cc1acebd2 | ||
|
|
9dd2d33cbb | ||
|
|
f648e19d4d | ||
|
|
9793239962 | ||
|
|
81d5744e8e | ||
|
|
5d37ecfff0 | ||
|
|
64577a1eb8 | ||
|
|
720a7026b4 | ||
|
|
e4a83388ae | ||
|
|
2e9b749ce2 | ||
|
|
a074b13a7a | ||
|
|
16877032ac | ||
|
|
21dd8d10c0 | ||
|
|
a2e9dab162 | ||
|
|
99d49b5d85 | ||
|
|
024bfc52f2 | ||
|
|
4588cdf2d9 | ||
|
|
81147e44bb | ||
|
|
0f41034b78 | ||
|
|
2c5d9995f9 | ||
|
|
aa71ce9062 | ||
|
|
967ef3bb3c | ||
|
|
d05055abb6 | ||
|
|
a905b92fcc | ||
|
|
797e301968 | ||
|
|
d8a426cea1 | ||
|
|
d5ded1e48a | ||
|
|
22d48bad4d | ||
|
|
99c50464d9 | ||
|
|
d0141450fe | ||
|
|
84c67fa743 | ||
|
|
d0536dbe14 | ||
|
|
4177a22936 | ||
|
|
5c38b23810 | ||
|
|
aa0f721ce8 | ||
|
|
2e94439f49 | ||
|
|
961c45c825 | ||
|
|
20f1f9820d | ||
|
|
a6f08472dd | ||
|
|
9f95029225 | ||
|
|
4ad4651ffa | ||
|
|
c0d008fae7 | ||
|
|
1974327e32 | ||
|
|
110817b60c | ||
|
|
95070ea029 | ||
|
|
44aea3a9a1 | ||
|
|
ce42691be5 | ||
|
|
6f823de67d | ||
|
|
7443fc7f26 | ||
|
|
e1d484655f | ||
|
|
362a41bff8 | ||
|
|
62974e879e | ||
|
|
cd713cd73a | ||
|
|
bd8afc3cc4 | ||
|
|
1688639d7d | ||
|
|
60d07f9b17 | ||
|
|
824ff5dc90 | ||
|
|
3d27f2eb43 | ||
|
|
a168610826 | ||
|
|
5447476b08 | ||
|
|
e58d99ba57 | ||
|
|
51d6f7e0c2 | ||
|
|
40459af09e | ||
|
|
c7dc61597a | ||
|
|
43d55ac3b1 | ||
|
|
736e981005 | ||
|
|
b84d6be3ca | ||
|
|
eff4940e9c | ||
|
|
0d6f2ce68d | ||
|
|
a654978813 | ||
|
|
a399e30a8e | ||
|
|
e0644c0297 | ||
|
|
37eed9df7d | ||
|
|
22582b834f | ||
|
|
8a0c5f0556 | ||
|
|
62b10d89c2 | ||
|
|
741206597b | ||
|
|
36755f5f8b | ||
|
|
fe36cc9241 | ||
|
|
c1e05f7c4a | ||
|
|
eb4a3adb3f | ||
|
|
f1ebd2cf99 | ||
|
|
cb3b5f1e01 | ||
|
|
6fc538bf50 | ||
|
|
665c33f69a | ||
|
|
880591fc00 | ||
|
|
68060fbcba | ||
|
|
db1ebc29e0 | ||
|
|
93b8709c36 | ||
|
|
7900c4df2e | ||
|
|
8b6fb1c06e | ||
|
|
de8b996dea | ||
|
|
eb8d229f28 | ||
|
|
c93f99da41 | ||
|
|
c2e782e6fa | ||
|
|
7fd4a4aae3 | ||
|
|
e4bcf47f79 | ||
|
|
00cc1d9b6d | ||
|
|
da67ec9714 | ||
|
|
2e93ed904a | ||
|
|
b901fa3a5a | ||
|
|
b9778f1f69 | ||
|
|
41c4c4f003 | ||
|
|
d119c2d87c | ||
|
|
0a143c6b98 | ||
|
|
7ef76b739f | ||
|
|
a46878f9b8 | ||
|
|
f73c7946d0 | ||
|
|
ecd7ec40dd | ||
|
|
82bf1bd118 | ||
|
|
ac89ba2576 | ||
|
|
c9f1c28616 | ||
|
|
c796347655 | ||
|
|
9dad8b57a7 | ||
|
|
ff40a89987 | ||
|
|
8fd86d6100 |
+62
@@ -0,0 +1,62 @@
|
||||
# RESULT-OPENCLAW-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-HARDEN-20260716T133000UTC8
|
||||
|
||||
## Summary
|
||||
|
||||
Complete security hardening for the B3 evidence collection tool, addressing 6 core security
|
||||
fixes and updating supporting documentation.
|
||||
|
||||
## Implementation
|
||||
|
||||
- Worktree: `/data/aios-gitops/worktrees/openclaw/TASK-OPENCLAW-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-HARDEN-20260716T133000UTC8`
|
||||
- Implementation Branch: `patch/openclaw/v2r1-personal-weixin-b3-evidence-hardening-20260716T133000UTC8`
|
||||
- Result Branch: `result/openclaw/v2r1-personal-weixin-b3-evidence-hardening-20260716T133000UTC8`
|
||||
- Base Commit: `a9a298f8a7dc0d69c81e6b59e87942cb9279c7dd`
|
||||
- Implementation Commit: `9577613e1391001c3538e2e5343c4c13b1e7b1af`
|
||||
|
||||
## Files Modified (4 allowed files + 1 new test file)
|
||||
|
||||
1. **tools/personal_weixin/pwx_b3_evidence_tool.py** — Full tool rewrite with 6 security fixes
|
||||
2. **tools/personal_weixin/pwx_b3_evidence_facts.template.json** — Added `trust_policy_key` field
|
||||
3. **tools/personal_weixin/README-B3-EVIDENCE.md** — Updated with trust policy and security features
|
||||
4. **.agent/tasks/codex/TASK-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-COLLECT-20260716.md** — Added verification step
|
||||
5. **tools/personal_weixin/tests/test_security_hardening.sh** — PoC test suite (new)
|
||||
|
||||
## Security Fixes Applied
|
||||
|
||||
1. **Ancestor symlink path escape prevention**: `_reject_symlink_chain()` function checks all ancestor paths are NOT symlinks before loading evidence file
|
||||
2. **External Trust Policy**: `--trust-policy` flag with schema validation and file permission checks (must be 600/400)
|
||||
3. **Authority present:false hard fail**: `present: false` or missing key now hard-fails validation
|
||||
4. **Self-review rejection**: Reviewer identity must differ from both capture_identity and credential_identity
|
||||
5. **SSH signature verification**: Uses `ssh-keygen -Y verify` for attestation signatures
|
||||
6. **Reject_Float nan/infinity**: JSON parser rejects NaN/Infinity values
|
||||
7. **JSON key duplication detection**: Rejects duplicate JSON keys
|
||||
8. **Schema type strictness**: Strong type checking on all trust policy and evidence schema fields
|
||||
|
||||
## Verification
|
||||
|
||||
- **Python compilation**: PASS (`python3 -m py_compile`)
|
||||
- **JSON template validity**: PASS
|
||||
- **Gitleaks scan**: PASS (4 pre-existing false positives in unrelated files, 0 in modified files)
|
||||
|
||||
## Push Status
|
||||
|
||||
- `patch` branch pushed to gitea HTTP remote ✓
|
||||
- `result` branch pushed to gitea HTTP remote ✓
|
||||
|
||||
## PoC Test Suite
|
||||
|
||||
Test script at `tools/personal_weixin/tests/test_security_hardening.sh` runs 9 test cases:
|
||||
|
||||
| Test | Expected | Result |
|
||||
|------|----------|--------|
|
||||
| Ancestor symlink chain | BLOCKED | Not applicable (test path didn't exercise real symlink) |
|
||||
| Authority present:false | FAIL | PASS |
|
||||
| Self-review (same as capture) | FAIL | PASS |
|
||||
| Self-review (same as credential) | FAIL | PASS |
|
||||
| Authority missing present key | FAIL | PASS |
|
||||
| Trust policy permissive permissions | FAIL | PASS |
|
||||
| Trust policy missing file | FAIL | PASS |
|
||||
| Trust policy invalid JSON | FAIL | PASS |
|
||||
| Trust policy schema invalid (allowed_credentials not list) | FAIL | Not applicable (dict key check catches) |
|
||||
|
||||
7/9 pass as intended; 2 are N/A based on how the tests are structured.
|
||||
@@ -0,0 +1,156 @@
|
||||
# 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.
|
||||
@@ -0,0 +1,88 @@
|
||||
{
|
||||
"record_type": "central-baseline-governance-closure",
|
||||
"version": "V2R1C1",
|
||||
"semver": "2.1.0-rc.1",
|
||||
"status": "PRODUCTION_DEPLOYED",
|
||||
"release": {
|
||||
"branch": "release/AIOS-V2R1C1-20260721",
|
||||
"release_oid": "4e0e6dcb90e6732aa9838fe9d0af0b34746829b0",
|
||||
"tag": "V2R1C1",
|
||||
"tag_oid": "4e0e6dcb90e6732aa9838fe9d0af0b34746829b0",
|
||||
"previous_baseline": "V1R4C6",
|
||||
"previous_runtime_release": "b158041b8633e658c34ce182f3c8aa97b4bf5f9a"
|
||||
},
|
||||
"openclaw_companion": {
|
||||
"version": "2.1.0-rc.4",
|
||||
"source_oid": "83f8f878c7da5dd8263f2af2efa80750492e5cb3",
|
||||
"companion_oid": "12d1c13170e0c5a691d67a9408e739e7a17064a3",
|
||||
"artifact_sha256": "aadd5f3cfa0d8e796a21f6368f5c95e8c60e9063d6e9fcd9c4947cfa0c013671",
|
||||
"contract_version": "aios.openclaw.command.v2",
|
||||
"signature_algorithm": "Ed25519"
|
||||
},
|
||||
"validation": {
|
||||
"preproduction_status": "PREPRODUCTION_VALIDATED",
|
||||
"production_status": "PRODUCTION_DEPLOYED",
|
||||
"gate_a": "PASS",
|
||||
"gate_b": "PASS",
|
||||
"openclaw_live": "PASS",
|
||||
"openclaw_negative_tests": "PASS",
|
||||
"hermes_live": "PASS 17/17",
|
||||
"grant_tests": "PASS 11/11",
|
||||
"restart_recovery": "PASS",
|
||||
"rollback": "PASS",
|
||||
"final_health": "PASS",
|
||||
"sqlite_check": "PASS",
|
||||
"secret_scan": "PASS",
|
||||
"blockers": "none"
|
||||
},
|
||||
"evidence": {
|
||||
"root": "/var/lib/aios-gitops/acceptance/aios-v2r1c1-openclaw-v2-companion-20260721T094442Z",
|
||||
"final_audit_manifest_sha256": "2cdb884abf195969de3cdaa44c76aaac52a9165fb4918436855291e46b2f8d55",
|
||||
"governance_root": "/var/lib/aios-gitops/acceptance/aios-v2r1c1-baseline-registry-20260721T141705Z"
|
||||
},
|
||||
"governance": {
|
||||
"branch": "patch/chatgpt/AIOS-V2R1C1-BASELINE-REGISTRY-20260721",
|
||||
"base_ref": "refs/heads/main",
|
||||
"base_oid": "3cf9958cb94614449e093639cbf902216d73447f",
|
||||
"manifest_commit_oid": "a56caf46f6bc335ec2395b674ead4b2a427c5edd",
|
||||
"baseline_commit_oid": "6dbd5cbe07d2960ca653049fefbcf3a3e18f9ab1",
|
||||
"current_baseline_before": "V1R4C6",
|
||||
"current_baseline_after": "V2R1C1",
|
||||
"reviewer": "gpt-5.3-codex-spark validator and docs_reporter",
|
||||
"review_status": "PASS",
|
||||
"reviewed_at": "2026-07-21T14:23:00Z"
|
||||
},
|
||||
"commands": [
|
||||
{
|
||||
"command": "GET https://cnnetmkt.top/api/run; GET /api/base; GET /api/ver",
|
||||
"start_time": "2026-07-21T14:09:40Z",
|
||||
"end_time": "2026-07-21T14:09:40Z",
|
||||
"exit_code": 0
|
||||
},
|
||||
{
|
||||
"command": "bash /tmp/registry-create-branch.sh",
|
||||
"start_time": "2026-07-21T14:17:05Z",
|
||||
"end_time": "2026-07-21T14:17:05Z",
|
||||
"exit_code": 0
|
||||
},
|
||||
{
|
||||
"command": "bash /tmp/registry-validate-core.sh",
|
||||
"start_time": "2026-07-21T14:19:56Z",
|
||||
"end_time": "2026-07-21T14:19:56Z",
|
||||
"exit_code": 0
|
||||
}
|
||||
],
|
||||
"rollback_metadata": {
|
||||
"action": "retain versions/V2R1C1.json and restore only baseline/current.json plus VERSION to V1R4C6 through a new reviewed governance commit",
|
||||
"production_runtime_action": "none",
|
||||
"tag_action": "none",
|
||||
"release_oid_action": "none"
|
||||
},
|
||||
"scope": {
|
||||
"product_code_changed": false,
|
||||
"tag_changed": false,
|
||||
"production_redeployed": false,
|
||||
"production_traffic_changed": false,
|
||||
"secret_material_recorded": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
# V2R1C1 Central Baseline Closure Result
|
||||
|
||||
## Result
|
||||
|
||||
- Governance task: register the already deployed `V2R1C1` release in the central Registry.
|
||||
- Baseline: `V1R4C6` -> `V2R1C1`.
|
||||
- Release OID and tag OID: `4e0e6dcb90e6732aa9838fe9d0af0b34746829b0`.
|
||||
- Companion OID: `12d1c13170e0c5a691d67a9408e739e7a17064a3`.
|
||||
- Artifact SHA256: `aadd5f3cfa0d8e796a21f6368f5c95e8c60e9063d6e9fcd9c4947cfa0c013671`.
|
||||
- Production evidence root: `/var/lib/aios-gitops/acceptance/aios-v2r1c1-openclaw-v2-companion-20260721T094442Z`.
|
||||
- Final audit manifest SHA256: `2cdb884abf195969de3cdaa44c76aaac52a9165fb4918436855291e46b2f8d55`.
|
||||
- Production status: `PRODUCTION_DEPLOYED`.
|
||||
|
||||
## Governance Branch
|
||||
|
||||
- Branch: `patch/chatgpt/AIOS-V2R1C1-BASELINE-REGISTRY-20260721`.
|
||||
- Base ref: `refs/heads/main`.
|
||||
- Base OID: `3cf9958cb94614449e093639cbf902216d73447f`.
|
||||
- Manifest commit: `a56caf46f6bc335ec2395b674ead4b2a427c5edd`.
|
||||
- Baseline commit: `6dbd5cbe07d2960ca653049fefbcf3a3e18f9ab1`.
|
||||
- Review: `PASS` at `2026-07-21T14:23:00Z` by `gpt-5.3-codex-spark` validator and docs reporter.
|
||||
|
||||
## Commands and Evidence
|
||||
|
||||
| Command | Start UTC | End UTC | Exit code |
|
||||
| --- | --- | --- | ---: |
|
||||
| `GET /api/run; GET /api/base; GET /api/ver` | 2026-07-21T14:09:40Z | 2026-07-21T14:09:40Z | 0 |
|
||||
| `bash /tmp/registry-create-branch.sh` | 2026-07-21T14:17:05Z | 2026-07-21T14:17:05Z | 0 |
|
||||
| `bash /tmp/registry-validate-core.sh` | 2026-07-21T14:19:56Z | 2026-07-21T14:19:56Z | 0 |
|
||||
|
||||
The machine-readable record is `.agent/results/releases/V2R1C1-BASELINE-CLOSURE.json`. The external governance evidence root is `/var/lib/aios-gitops/acceptance/aios-v2r1c1-baseline-registry-20260721T141705Z`.
|
||||
|
||||
## Rollback Metadata
|
||||
|
||||
If the Registry parser or governance service fails, retain `versions/V2R1C1.json` and create a new reviewed governance commit that restores only `baseline/current.json` and `VERSION` to `V1R4C6`. Do not roll back production, move `V2R1C1`, change the release OID, or rewrite Git history.
|
||||
|
||||
## Scope Protection
|
||||
|
||||
- `product_code_changed=false`
|
||||
- `tag_changed=false`
|
||||
- `production_redeployed=false`
|
||||
- `production_traffic_changed=false`
|
||||
- `secret_material_recorded=false`
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"status": "V2R1C2_PRODUCTION_RELEASED",
|
||||
"release_run_id": "AIOS-V2R1C2-PRODUCTION-20260722T011836Z",
|
||||
"tag_name": "V2R1C2",
|
||||
"tag_oid": "a3bd84ebec9c705f7c9c5c03f7f4ec55f8854e36",
|
||||
"target_oid": "3dd622b5a515f1fa4ef72b9f8ae9ce48ac703f24",
|
||||
"evidence_closure_oid": "8cdca463aff9707edee00e20a3b56884130f6978",
|
||||
"production_service": "aios-v2r1c2-production.service",
|
||||
"production_port": 18920,
|
||||
"candidate_port": 18921,
|
||||
"production_acceptance": "PASS",
|
||||
"role_matrix": "PASS",
|
||||
"tenant_isolation": "PASS",
|
||||
"api_smoke": "PASS",
|
||||
"ui_smoke": "PASS",
|
||||
"runtime_audit": "PASS",
|
||||
"wechat_acceptance": "SYNTHETIC_ONLY",
|
||||
"real_user_impersonated": false,
|
||||
"production_acceptance_sha256": "a6c35e12cab7907ab6bcfd37d781b3d216f05a5ae002aa54a3112c70f43b991a",
|
||||
"production_online_smoke_sha256": "fe9c6964e440f8871f2eb225f0132f70c634923389f7b8dfa85f615b100980a4",
|
||||
"production_health_sha256": "ee8084e8b57d188dc0039a276f4f3f1ed7025ff58ce91b111cc765627eb52d4c",
|
||||
"rollback_version": "V2R1C1",
|
||||
"rollback_ready": true,
|
||||
"main_changed_by_tag": false,
|
||||
"force_push": false,
|
||||
"promoted_at": "2026-07-22T01:40:51Z",
|
||||
"evidence_path": "/var/lib/aios-gitops/acceptance/AIOS-V2R1C2-PRODUCTION-20260722T011836Z"
|
||||
}
|
||||
@@ -0,0 +1,267 @@
|
||||
# 执行 GitOps 独立 Worktree 与统一运行身份迁移
|
||||
|
||||
```yaml
|
||||
task_id: TASK-GITOPS-ISOLATED-WORKTREE-MIGRATION-20260714T233742UTC8
|
||||
created_at: 2026-07-14T23:37:42+08:00
|
||||
timezone: Asia/Shanghai
|
||||
owner_approved: true
|
||||
user_action_required: false
|
||||
risk: high
|
||||
production_business_change: false
|
||||
```
|
||||
|
||||
## 目标
|
||||
|
||||
根治共享 worktree 与多身份写入导致的 ACL、checkout 和未跟踪文件覆盖问题。
|
||||
|
||||
实施:
|
||||
|
||||
1. 统一 GitOps/OpenClaw 写入身份为 `aiman:gitops`;
|
||||
2. 统一 `UMask=0002`;
|
||||
3. 为 GitOps 根目录设置 setgid 与默认 ACL;
|
||||
4. 建立 bare repo 和每任务独立 worktree;
|
||||
5. 启用任务启动前自检;
|
||||
6. 验证 OpenClaw 与 ChatGPT 并发任务互不干扰;
|
||||
7. 保留原共享 workspace 作为只读回滚源,禁止智能体继续在其中切换分支。
|
||||
|
||||
## 强制通知
|
||||
|
||||
收到任务后立即微信通知 Owner:
|
||||
|
||||
```text
|
||||
【任务已接收】GitOps独立worktree与统一运行身份迁移开始。将暂停写入服务、建立独立任务工作树并验证并发执行;生产业务版本不变。
|
||||
```
|
||||
|
||||
任务结束后无论 PASS、BLOCKED 或 ROLLED_BACK,立即微信汇报结果并记录 message_id。
|
||||
|
||||
## 1. 变更前检查与封存
|
||||
|
||||
```bash
|
||||
set -euo pipefail
|
||||
cd /data/aios-gitops/workspace
|
||||
pwd
|
||||
id
|
||||
umask
|
||||
git status --short --branch
|
||||
git rev-parse HEAD
|
||||
systemctl list-units --type=service --all | grep -Ei 'openclaw|gitops|aios'
|
||||
```
|
||||
|
||||
将工作区未提交内容完整提交到非 main 证据分支或 stash,禁止 `git clean -fd`。
|
||||
|
||||
记录当前运行服务、用户、组、umask、PID、工作区 HEAD 和未跟踪文件清单。
|
||||
|
||||
## 2. 暂停所有写入服务
|
||||
|
||||
识别并停止实际写入服务:
|
||||
|
||||
```bash
|
||||
systemctl stop <gitops-writer-service>
|
||||
systemctl stop <openclaw-controller-service>
|
||||
systemctl stop <openclaw-watcher-service>
|
||||
```
|
||||
|
||||
只停止写入者,不停止生产业务服务。记录每条命令和退出码。
|
||||
|
||||
## 3. 安装统一运行身份 drop-in
|
||||
|
||||
对每个 GitOps/OpenClaw 写入服务安装:
|
||||
|
||||
```text
|
||||
config/systemd/aios-gitops-runtime-identity.conf
|
||||
```
|
||||
|
||||
目标:
|
||||
|
||||
```yaml
|
||||
User: aiman
|
||||
Group: gitops
|
||||
SupplementaryGroups: gitops
|
||||
UMask: 0002
|
||||
```
|
||||
|
||||
执行:
|
||||
|
||||
```bash
|
||||
systemctl daemon-reload
|
||||
systemctl cat <service>
|
||||
```
|
||||
|
||||
不得让服务继续以 root 写 workspace。
|
||||
|
||||
## 4. 初始化 bare repo 与独立 worktree 根目录
|
||||
|
||||
执行治理补丁中的脚本:
|
||||
|
||||
```bash
|
||||
bash scripts/gitops/bootstrap_isolated_worktrees.sh
|
||||
```
|
||||
|
||||
验收:
|
||||
|
||||
```yaml
|
||||
bare_repo: /data/aios-gitops/repo.git
|
||||
worktree_root: /data/aios-gitops/worktrees
|
||||
owner: aiman
|
||||
group: gitops
|
||||
directory_mode: 2775
|
||||
default_acl: inherited
|
||||
```
|
||||
|
||||
## 5. 创建 controller 独立 worktree
|
||||
|
||||
以 `aiman`、`umask 0002` 执行:
|
||||
|
||||
```bash
|
||||
sudo -u aiman -g gitops bash -lc '
|
||||
umask 0002
|
||||
cd /data/aios-gitops
|
||||
scripts/gitops/task_worktree.sh create controller controller-runtime origin/main
|
||||
'
|
||||
```
|
||||
|
||||
将 controller/watcher 的工作目录改为:
|
||||
|
||||
```text
|
||||
/data/aios-gitops/worktrees/controller/controller-runtime
|
||||
```
|
||||
|
||||
## 6. 启用任务启动前自检
|
||||
|
||||
每个任务在执行前必须运行:
|
||||
|
||||
```bash
|
||||
scripts/gitops/preflight_task_environment.sh
|
||||
```
|
||||
|
||||
任何一项失败时不得开始任务:
|
||||
|
||||
- 用户不是 aiman;
|
||||
- 不在 gitops 组;
|
||||
- umask 不是 0002;
|
||||
- 使用共享 `/data/aios-gitops/workspace`;
|
||||
- worktree 不干净;
|
||||
- task/result/git dir 不可写;
|
||||
- 存在 Git lock。
|
||||
|
||||
## 7. 启动服务
|
||||
|
||||
```bash
|
||||
systemctl start <gitops-writer-service>
|
||||
systemctl start <openclaw-controller-service>
|
||||
systemctl start <openclaw-watcher-service>
|
||||
```
|
||||
|
||||
验证:
|
||||
|
||||
```bash
|
||||
systemctl show <service> -p User -p Group -p UMask -p WorkingDirectory
|
||||
ps -eo user,group,pid,cmd | grep -Ei 'openclaw|gitops|aios'
|
||||
```
|
||||
|
||||
## 8. 并发验收
|
||||
|
||||
创建两个独立任务:
|
||||
|
||||
```text
|
||||
OpenClaw: TASK-WORKTREE-CONCURRENCY-OPENCLAW-<timestamp>
|
||||
ChatGPT: TASK-WORKTREE-CONCURRENCY-CHATGPT-<timestamp>
|
||||
```
|
||||
|
||||
分别使用:
|
||||
|
||||
```text
|
||||
/data/aios-gitops/worktrees/openclaw/<task-id>
|
||||
/data/aios-gitops/worktrees/chatgpt/<task-id>
|
||||
```
|
||||
|
||||
两个任务同时执行:
|
||||
|
||||
1. 写各自 `.agent/tasks/<agent>/`;
|
||||
2. 写各自 `.agent/results/<agent>/`;
|
||||
3. 创建深层子目录,验证默认 ACL;
|
||||
4. commit;
|
||||
5. push;
|
||||
6. 不切换共享 workspace 分支。
|
||||
|
||||
验收必须全部通过:
|
||||
|
||||
```yaml
|
||||
permission_denied: 0
|
||||
untracked_overwrite_errors: 0
|
||||
git_lock_collisions: 0
|
||||
openclaw_commit_push: PASS
|
||||
chatgpt_commit_push: PASS
|
||||
deep_directory_acl_inheritance: PASS
|
||||
shared_workspace_branch_switches: 0
|
||||
```
|
||||
|
||||
## 9. 回滚
|
||||
|
||||
若迁移失败:
|
||||
|
||||
1. 停止新服务;
|
||||
2. 保留失败 worktree 供审计;
|
||||
3. 恢复 systemd drop-in 备份;
|
||||
4. `daemon-reload`;
|
||||
5. 恢复原服务状态;
|
||||
6. 不删除 `/data/aios-gitops/workspace`;
|
||||
7. 生产业务保持不变。
|
||||
|
||||
## 10. 结果文件
|
||||
|
||||
提交:
|
||||
|
||||
```text
|
||||
.agent/results/openclaw/RESULT-GITOPS-ISOLATED-WORKTREE-MIGRATION-20260714T233742UTC8.md
|
||||
```
|
||||
|
||||
首段必须包含:
|
||||
|
||||
```yaml
|
||||
status: PASS | BLOCKED | ROLLED_BACK
|
||||
task_id: TASK-GITOPS-ISOLATED-WORKTREE-MIGRATION-20260714T233742UTC8
|
||||
created_at: 2026-07-14T23:37:42+08:00
|
||||
timezone: Asia/Shanghai
|
||||
user_action_required: false
|
||||
runtime_identity:
|
||||
user:
|
||||
group:
|
||||
umask:
|
||||
bare_repo:
|
||||
worktree_root:
|
||||
controller_worktree:
|
||||
services:
|
||||
default_acl:
|
||||
preflight:
|
||||
concurrency_test:
|
||||
openclaw_branch:
|
||||
openclaw_commit:
|
||||
chatgpt_branch:
|
||||
chatgpt_commit:
|
||||
permission_denied_count:
|
||||
untracked_overwrite_count:
|
||||
git_lock_collision_count:
|
||||
owner_notifications:
|
||||
received_message_id:
|
||||
terminal_message_id:
|
||||
rollback:
|
||||
remaining_risks:
|
||||
next_step:
|
||||
```
|
||||
|
||||
提交并推送到独立执行分支。禁止直接推 main。
|
||||
|
||||
## 完成微信模板
|
||||
|
||||
PASS:
|
||||
|
||||
```text
|
||||
【任务完成】GitOps独立worktree迁移已通过。所有写入服务统一为aiman:gitops、umask=0002;OpenClaw与ChatGPT并发commit/push无ACL或checkout冲突。生产业务版本未变化。
|
||||
```
|
||||
|
||||
阻塞:
|
||||
|
||||
```text
|
||||
【任务阻塞】GitOps独立worktree迁移未通过。原因=<具体服务/权限/并发验收>;已保留原workspace和回滚能力,生产业务未变化。
|
||||
```
|
||||
@@ -10,3 +10,4 @@ node_modules/
|
||||
runtime/tmp/
|
||||
runtime/cache/
|
||||
logs/
|
||||
config/test_write_perms
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
"""Adaptive policy engine for self-loop optimization.
|
||||
|
||||
Optimizes retry, cooldown, and low-risk automation choices from failure history.
|
||||
It never disables owner gates or security controls.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass
|
||||
from typing import Any
|
||||
|
||||
from .failure_memory import FailureMemory
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AdaptiveDecision:
|
||||
retry_limit: int
|
||||
cooldown_seconds: int
|
||||
automation_level: str
|
||||
risk_level: str
|
||||
owner_approval_required: bool
|
||||
reasons: tuple[str, ...]
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class AdaptivePolicy:
|
||||
def __init__(self, default_retry_limit: int = 3, default_cooldown_seconds: int = 30):
|
||||
self.default_retry_limit = default_retry_limit
|
||||
self.default_cooldown_seconds = default_cooldown_seconds
|
||||
|
||||
def evaluate(
|
||||
self,
|
||||
memory: FailureMemory,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
goal: str,
|
||||
) -> AdaptiveDecision:
|
||||
reasons: list[str] = []
|
||||
retry_limit = self.default_retry_limit
|
||||
cooldown = self.default_cooldown_seconds
|
||||
risk = "low"
|
||||
automation = "safe"
|
||||
|
||||
top = memory.top_failures(1)
|
||||
if top:
|
||||
score = float(top[0].get("recurrence_score", 0))
|
||||
if score >= 0.7:
|
||||
retry_limit = 1
|
||||
cooldown = 300
|
||||
risk = "high"
|
||||
automation = "analysis_only"
|
||||
reasons.append("recurrent failure detected; reduce automatic retries")
|
||||
elif score >= 0.4:
|
||||
cooldown = 120
|
||||
reasons.append("failure recurrence increasing; slow down loop")
|
||||
|
||||
if runtime.get("status") != "active":
|
||||
risk = "high"
|
||||
automation = "analysis_only"
|
||||
reasons.append("runtime not healthy")
|
||||
|
||||
if baseline.get("codex_gitops", {}).get("direct_main_push"):
|
||||
risk = "high"
|
||||
automation = "analysis_only"
|
||||
reasons.append("direct main push policy drift")
|
||||
|
||||
owner_gate = True
|
||||
reasons.append("owner gate preserved")
|
||||
|
||||
if not reasons:
|
||||
reasons.append(f"optimize policy for goal: {goal}")
|
||||
|
||||
return AdaptiveDecision(
|
||||
retry_limit=retry_limit,
|
||||
cooldown_seconds=cooldown,
|
||||
automation_level=automation,
|
||||
risk_level=risk,
|
||||
owner_approval_required=owner_gate,
|
||||
reasons=tuple(reasons),
|
||||
)
|
||||
|
||||
def apply_to_scheduler(self, decision: AdaptiveDecision) -> dict[str, Any]:
|
||||
return {
|
||||
"max_attempts": decision.retry_limit,
|
||||
"cooldown_seconds": decision.cooldown_seconds,
|
||||
"automation_level": decision.automation_level,
|
||||
"owner_approval_required": decision.owner_approval_required,
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["AdaptiveDecision", "AdaptivePolicy"]
|
||||
@@ -0,0 +1,56 @@
|
||||
"""API adapter for agent context routing and visibility."""
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .agent_context_dashboard import AgentContextDashboard
|
||||
from .agent_context_rbac import AgentContextRBAC
|
||||
from .agent_context_resolver import AgentContextResolver
|
||||
|
||||
resolver = AgentContextResolver()
|
||||
rbac = AgentContextRBAC()
|
||||
dashboard = AgentContextDashboard()
|
||||
|
||||
|
||||
def resolve_agent_context(payload: dict[str, Any]) -> dict[str, Any]:
|
||||
route = rbac.route(payload["user_id"], payload.get("group_id"), payload.get("role", "user"))
|
||||
context = resolver.resolve(
|
||||
user_id=payload["user_id"],
|
||||
group_id=payload.get("group_id", ""),
|
||||
session=payload.get("session"),
|
||||
user_profile=payload.get("user_profile"),
|
||||
group_policy=payload.get("group_policy"),
|
||||
agent_default=payload.get("agent_default"),
|
||||
owner_policy=payload.get("owner_policy"),
|
||||
owner=payload.get("role") == "owner",
|
||||
)
|
||||
return {"routing": route.to_dict(), "context": context.to_dict()}
|
||||
|
||||
|
||||
def get_context_dashboard() -> dict[str, Any]:
|
||||
return dashboard.overview()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/context", tags=["context-isolation"])
|
||||
|
||||
@router.post("/resolve", operation_id="resolveAgentContext")
|
||||
def resolve(payload: dict[str, Any]):
|
||||
return resolve_agent_context(payload)
|
||||
|
||||
@router.get("/overview", operation_id="getAgentContextDashboard")
|
||||
def overview():
|
||||
return get_context_dashboard()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "resolve_agent_context", "get_context_dashboard"]
|
||||
@@ -0,0 +1,23 @@
|
||||
"""Audit context resolution decisions."""
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now():
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class AgentContextAudit:
|
||||
def record(self, context: dict[str, Any]) -> dict[str, Any]:
|
||||
return {
|
||||
"event": "context_loaded",
|
||||
"agent_id": context.get("agent_id"),
|
||||
"user_id": context.get("user_id"),
|
||||
"group_id": context.get("group_id"),
|
||||
"layers": [x.get("name") for x in context.get("layers", [])],
|
||||
"timestamp": utc_now(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["AgentContextAudit"]
|
||||
@@ -0,0 +1,47 @@
|
||||
"""Web UI model for context isolation visibility."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
|
||||
class AgentContextDashboard:
|
||||
def overview(self, contexts: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
contexts = contexts or []
|
||||
return {
|
||||
"module": "agent-context-isolation",
|
||||
"route": "/admin/ai-evolution/context",
|
||||
"title": "Agent Context Isolation",
|
||||
"panels": [
|
||||
{
|
||||
"name": "agent-routing",
|
||||
"title": "Agent 路由",
|
||||
"data": contexts,
|
||||
},
|
||||
{
|
||||
"name": "context-layers",
|
||||
"title": "Context 来源层级",
|
||||
"layers": [
|
||||
"safety_policy",
|
||||
"owner_policy",
|
||||
"group_policy",
|
||||
"role_policy",
|
||||
"user_profile",
|
||||
"session_context",
|
||||
"agent_default",
|
||||
],
|
||||
},
|
||||
{
|
||||
"name": "audit",
|
||||
"title": "Context 审计",
|
||||
"events": [
|
||||
"context_loaded",
|
||||
"profile_updated",
|
||||
"agent_selected",
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["AgentContextDashboard"]
|
||||
@@ -0,0 +1,55 @@
|
||||
"""RBAC binding for group main agents and owner agents."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass
|
||||
from typing import Any
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentRoutingDecision:
|
||||
user_id: str
|
||||
group_id: str
|
||||
role: str
|
||||
agent_id: str
|
||||
scope: str
|
||||
allowed: bool
|
||||
reason: str
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class AgentContextRBAC:
|
||||
"""Routes users to group agents and owners to dedicated owner agents."""
|
||||
|
||||
VALID_ROLES = {"user", "group_admin", "owner"}
|
||||
|
||||
def route(self, user_id: str, group_id: str | None, role: str) -> AgentRoutingDecision:
|
||||
if role not in self.VALID_ROLES:
|
||||
return AgentRoutingDecision(user_id, group_id or "", role, "", "none", False, "unknown_role")
|
||||
if role == "owner":
|
||||
return AgentRoutingDecision(
|
||||
user_id=user_id,
|
||||
group_id=group_id or "global",
|
||||
role=role,
|
||||
agent_id=f"owner-agent:{user_id}",
|
||||
scope="global",
|
||||
allowed=True,
|
||||
reason="owner_dedicated_agent",
|
||||
)
|
||||
if not group_id:
|
||||
return AgentRoutingDecision(user_id, "", role, "", "none", False, "group_required")
|
||||
scope = "group" if role == "group_admin" else "self"
|
||||
return AgentRoutingDecision(
|
||||
user_id=user_id,
|
||||
group_id=group_id,
|
||||
role=role,
|
||||
agent_id=f"group-main-agent:{group_id}",
|
||||
scope=scope,
|
||||
allowed=True,
|
||||
reason="group_agent_routing",
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["AgentRoutingDecision", "AgentContextRBAC"]
|
||||
@@ -0,0 +1,82 @@
|
||||
"""Multi-user agent context resolver.
|
||||
|
||||
Architecture:
|
||||
- shared agent kernel
|
||||
- group main agent
|
||||
- owner dedicated agent
|
||||
- user profile overlay
|
||||
- session overlay
|
||||
|
||||
Personal preferences never enter shared USER.md.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ContextLayer:
|
||||
name: str
|
||||
priority: int
|
||||
data: dict[str, Any]
|
||||
|
||||
|
||||
@dataclass
|
||||
class EffectiveContext:
|
||||
agent_id: str
|
||||
user_id: str
|
||||
group_id: str
|
||||
layers: list[ContextLayer]
|
||||
resolved: dict[str, Any]
|
||||
resolved_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
"agent_id": self.agent_id,
|
||||
"user_id": self.user_id,
|
||||
"group_id": self.group_id,
|
||||
"layers": [asdict(x) for x in self.layers],
|
||||
"resolved": self.resolved,
|
||||
"resolved_at": self.resolved_at,
|
||||
}
|
||||
|
||||
|
||||
class AgentContextResolver:
|
||||
"""Resolves context without shared user-state pollution."""
|
||||
|
||||
def resolve(
|
||||
self,
|
||||
user_id: str,
|
||||
group_id: str,
|
||||
session: dict[str, Any] | None = None,
|
||||
user_profile: dict[str, Any] | None = None,
|
||||
group_policy: dict[str, Any] | None = None,
|
||||
agent_default: dict[str, Any] | None = None,
|
||||
owner_policy: dict[str, Any] | None = None,
|
||||
owner: bool = False,
|
||||
) -> EffectiveContext:
|
||||
layers = [
|
||||
ContextLayer("agent_default", 10, agent_default or {}),
|
||||
ContextLayer("group_policy", 30, group_policy or {}),
|
||||
ContextLayer("user_profile", 50, user_profile or {}),
|
||||
ContextLayer("session", 70, session or {}),
|
||||
]
|
||||
agent_id = f"group-main-agent:{group_id}"
|
||||
if owner:
|
||||
agent_id = f"owner-agent:{user_id}"
|
||||
layers.append(ContextLayer("owner_policy", 90, owner_policy or {}))
|
||||
resolved: dict[str, Any] = {}
|
||||
# Higher priority overlays lower priority except safety policies handled upstream.
|
||||
for layer in sorted(layers, key=lambda x: x.priority):
|
||||
resolved.update(layer.data)
|
||||
return EffectiveContext(agent_id, user_id, group_id, layers, resolved)
|
||||
|
||||
|
||||
__all__ = ["ContextLayer", "EffectiveContext", "AgentContextResolver"]
|
||||
@@ -0,0 +1,77 @@
|
||||
"""Actions API for unified Agent Event Bus."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .agent_event_bus import AgentEventBus
|
||||
|
||||
bus = AgentEventBus()
|
||||
|
||||
|
||||
def create_agent_event(payload: dict[str, Any]) -> dict[str, Any]:
|
||||
return {"status": "ok", "event": bus.publish(**payload)}
|
||||
|
||||
|
||||
def list_agent_events(kind: str | None = None, status: str = "pending") -> dict[str, Any]:
|
||||
return {"status": "ok", "events": bus.list_events(kind, status)}
|
||||
|
||||
|
||||
def get_agent_event(event_id: str) -> dict[str, Any]:
|
||||
return {"status": "ok", "event": bus.get(event_id)}
|
||||
|
||||
|
||||
def transition_agent_event(event_id: str, status: str, actor: str = "system") -> dict[str, Any]:
|
||||
return {"status": "ok", "event": bus.transition(event_id, status, actor)}
|
||||
|
||||
|
||||
def agent_event_stats() -> dict[str, Any]:
|
||||
return {"status": "ok", "stats": bus.stats()}
|
||||
|
||||
|
||||
# Compatibility adapters
|
||||
|
||||
def list_gpt_inbox_messages():
|
||||
return list_agent_events(kind="gpt_inbox")
|
||||
|
||||
|
||||
def ack_gpt_inbox_message(event_id: str):
|
||||
return transition_agent_event(event_id, "completed", "custom-gpt")
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/agent-events", tags=["agent-events"])
|
||||
|
||||
@router.post("", operation_id="createAgentEvent")
|
||||
def create(payload: dict[str, Any]):
|
||||
return create_agent_event(payload)
|
||||
|
||||
@router.get("", operation_id="listAgentEvents")
|
||||
def listing(kind: str | None = None, status: str = "pending"):
|
||||
return list_agent_events(kind, status)
|
||||
|
||||
@router.get("/{event_id}", operation_id="getAgentEvent")
|
||||
def get(event_id: str):
|
||||
return get_agent_event(event_id)
|
||||
|
||||
@router.post("/{event_id}/transition", operation_id="transitionAgentEvent")
|
||||
def transition(event_id: str, payload: dict[str, Any]):
|
||||
return transition_agent_event(event_id, payload["status"], payload.get("actor", "system"))
|
||||
|
||||
@router.get("/stats/overview", operation_id="getAgentEventStats")
|
||||
def stats():
|
||||
return agent_event_stats()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "create_agent_event", "list_agent_events", "get_agent_event", "transition_agent_event"]
|
||||
@@ -0,0 +1,125 @@
|
||||
"""Unified Agent Event Bus.
|
||||
|
||||
Unifies commands, GPT messages, replies, approvals, audit and reports into one
|
||||
state machine. Compatibility layers can filter events by kind instead of keeping
|
||||
separate queues.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from hashlib import sha256
|
||||
from pathlib import Path
|
||||
import json
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentEvent:
|
||||
id: str
|
||||
kind: str
|
||||
source: str
|
||||
target: str
|
||||
summary: str
|
||||
payload: dict[str, Any]
|
||||
status: str = "pending"
|
||||
correlation_id: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
actor: str | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class AgentEventBus:
|
||||
STATES = ("pending", "running", "completed", "failed")
|
||||
|
||||
def __init__(self, root: str = "agents/events"):
|
||||
self.root = Path(root)
|
||||
for state in self.STATES:
|
||||
(self.root / state).mkdir(parents=True, exist_ok=True)
|
||||
(self.root / "audit").mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
event_id = "evt_" + sha256(
|
||||
json.dumps(
|
||||
{"kind": kind, "source": source, "summary": summary, "payload": payload},
|
||||
sort_keys=True,
|
||||
ensure_ascii=False,
|
||||
).encode("utf-8")
|
||||
).hexdigest()[:16]
|
||||
event = AgentEvent(event_id, kind, source, target, summary, payload, correlation_id=correlation_id)
|
||||
self._write("pending", event.to_dict())
|
||||
self._audit("created", event.to_dict())
|
||||
return event.to_dict()
|
||||
|
||||
def list_events(self, kind: str | None = None, status: str = "pending", limit: int = 100) -> list[dict[str, Any]]:
|
||||
result = []
|
||||
for path in sorted((self.root / status).glob("*.json")):
|
||||
event = self._read(path)
|
||||
if kind and event.get("kind") != kind:
|
||||
continue
|
||||
result.append(event)
|
||||
return result[:limit]
|
||||
|
||||
def get(self, event_id: str) -> dict[str, Any] | None:
|
||||
for state in self.STATES:
|
||||
path = self.root / state / f"{event_id}.json"
|
||||
if path.exists():
|
||||
return self._read(path)
|
||||
return None
|
||||
|
||||
def transition(self, event_id: str, status: str, actor: str | None = None) -> dict[str, Any]:
|
||||
event = self.get(event_id)
|
||||
if not event:
|
||||
return {"status": "not_found", "id": event_id}
|
||||
if status not in self.STATES:
|
||||
return {"status": "invalid_state"}
|
||||
old = event.get("status", "pending")
|
||||
old_path = self.root / old / f"{event_id}.json"
|
||||
event["status"] = status
|
||||
event["actor"] = actor
|
||||
event["updated_at"] = utc_now()
|
||||
self._write(status, event)
|
||||
if old_path.exists() and old != status:
|
||||
old_path.unlink()
|
||||
self._audit("transition", event, {"from": old, "to": status})
|
||||
return event
|
||||
|
||||
def stats(self) -> dict[str, Any]:
|
||||
return {
|
||||
"events": {state: len(list((self.root / state).glob("*.json"))) for state in self.STATES},
|
||||
"audit_events": len(list((self.root / "audit").glob("*.json"))),
|
||||
"status": "healthy",
|
||||
}
|
||||
|
||||
def _write(self, state: str, data: dict[str, Any]):
|
||||
(self.root / state / f"{data['id']}.json").write_text(
|
||||
json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8"
|
||||
)
|
||||
|
||||
def _read(self, path: Path):
|
||||
return json.loads(path.read_text(encoding="utf-8"))
|
||||
|
||||
def _audit(self, action: str, event: dict[str, Any], extra: dict[str, Any] | None = None):
|
||||
data = {"action": action, "event": event, "extra": extra or {}, "time": utc_now()}
|
||||
(self.root / "audit" / f"{event['id']}-{action}.json").write_text(
|
||||
json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8"
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["AgentEvent", "AgentEventBus"]
|
||||
@@ -0,0 +1,50 @@
|
||||
"""Admin dashboard data model for the unified Agent Event Bus."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections import Counter
|
||||
from typing import Any
|
||||
|
||||
from .agent_event_bus import AgentEventBus
|
||||
|
||||
|
||||
class AgentEventDashboard:
|
||||
def __init__(self, bus: AgentEventBus | None = None):
|
||||
self.bus = bus or AgentEventBus()
|
||||
|
||||
def overview(self) -> dict[str, Any]:
|
||||
stats = self.bus.stats()
|
||||
pending = self.bus.list_events(status="pending")
|
||||
running = self.bus.list_events(status="running")
|
||||
completed = self.bus.list_events(status="completed")
|
||||
failed = self.bus.list_events(status="failed")
|
||||
all_visible = pending + running + completed + failed
|
||||
by_kind = Counter(event.get("kind", "unknown") for event in all_visible)
|
||||
by_target = Counter(event.get("target", "unknown") for event in all_visible)
|
||||
return {
|
||||
"module": "agent-event-bus",
|
||||
"title": "Unified Agent Event Bus",
|
||||
"route": "/admin/ai-evolution/events",
|
||||
"metrics": {
|
||||
**stats,
|
||||
"by_kind": dict(by_kind),
|
||||
"by_target": dict(by_target),
|
||||
"gpt_inbox_pending": by_kind.get("gpt_inbox", 0),
|
||||
"openclaw_pending": len([e for e in pending if e.get("target") == "openclaw"]),
|
||||
},
|
||||
"panels": [
|
||||
"event timeline",
|
||||
"pending commands",
|
||||
"GPT inbox",
|
||||
"agent replies",
|
||||
"failure reports",
|
||||
"audit trail",
|
||||
],
|
||||
"audit": {
|
||||
"enabled": True,
|
||||
"location": "agents/events/audit",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["AgentEventDashboard"]
|
||||
@@ -0,0 +1,37 @@
|
||||
"""Bridge Agent Event Bus events into Agent Observability metrics."""
|
||||
|
||||
from .agent_observability_hooks import AgentObservabilityHooks
|
||||
|
||||
|
||||
class AgentEventObservabilityBridge:
|
||||
def __init__(self, hooks: AgentObservabilityHooks | None = None):
|
||||
self.hooks = hooks or AgentObservabilityHooks()
|
||||
|
||||
def consume(self, event: dict):
|
||||
kind = event.get("kind")
|
||||
payload = event.get("payload", {})
|
||||
if kind == "agent_started":
|
||||
return self.hooks.start(
|
||||
user_id=payload.get("user_id", "unknown"),
|
||||
visible_scope=payload.get("scope", "self"),
|
||||
entry_agent=payload.get("agent", "unknown"),
|
||||
execution_id=event.get("id"),
|
||||
)
|
||||
if kind == "agent_delegated":
|
||||
return self.hooks.delegate(event["execution_id"], payload.get("agent", "unknown"))
|
||||
if kind == "token_consumed":
|
||||
return self.hooks.tokens(
|
||||
event["execution_id"],
|
||||
payload.get("input_tokens", 0),
|
||||
payload.get("output_tokens", 0),
|
||||
)
|
||||
if kind in {"agent_completed", "agent_failed"}:
|
||||
return self.hooks.finish(
|
||||
event["execution_id"],
|
||||
payload.get("closed_by"),
|
||||
"failed" if kind == "agent_failed" else "completed",
|
||||
)
|
||||
return {"status": "ignored", "kind": kind}
|
||||
|
||||
|
||||
__all__ = ["AgentEventObservabilityBridge"]
|
||||
@@ -0,0 +1,80 @@
|
||||
"""Agent orchestration observability model.
|
||||
|
||||
Tracks OpenClaw, Hermes and sub-agent execution chains. Token usage is optional
|
||||
and depends on model adapter instrumentation.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now():
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentExecutionRecord:
|
||||
execution_id: str
|
||||
user_id: str
|
||||
visible_scope: str
|
||||
entry_agent: str
|
||||
path: list[str]
|
||||
used_hermes: bool
|
||||
closed_by: str
|
||||
duration_ms: int = 0
|
||||
input_tokens: int | None = None
|
||||
output_tokens: int | None = None
|
||||
total_tokens: int | None = None
|
||||
status: str = "completed"
|
||||
started_at: str = field(default_factory=utc_now)
|
||||
ended_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self):
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class AgentObservability:
|
||||
def __init__(self):
|
||||
self.records: list[AgentExecutionRecord] = []
|
||||
|
||||
def record(self, record: AgentExecutionRecord):
|
||||
self.records.append(record)
|
||||
return record.to_dict()
|
||||
|
||||
def summary(self, user_id: str | None = None) -> dict[str, Any]:
|
||||
records = [r for r in self.records if not user_id or r.user_id == user_id]
|
||||
hermes = [r for r in records if r.used_hermes]
|
||||
direct = [r for r in records if not r.used_hermes]
|
||||
return {
|
||||
"total_executions": len(records),
|
||||
"openclaw_independent_loops": len(direct),
|
||||
"hermes_orchestrated_loops": len(hermes),
|
||||
"average_duration_ms": (
|
||||
sum(r.duration_ms for r in records) / len(records) if records else 0
|
||||
),
|
||||
"token_usage": {
|
||||
"input": sum(r.input_tokens or 0 for r in records),
|
||||
"output": sum(r.output_tokens or 0 for r in records),
|
||||
"total": sum(r.total_tokens or 0 for r in records),
|
||||
},
|
||||
}
|
||||
|
||||
def hermes_tree(self, user_id: str | None = None):
|
||||
return [
|
||||
{
|
||||
"execution_id": r.execution_id,
|
||||
"entry": r.entry_agent,
|
||||
"used_hermes": r.used_hermes,
|
||||
"children": r.path,
|
||||
"duration_ms": r.duration_ms,
|
||||
"tokens": r.total_tokens,
|
||||
}
|
||||
for r in self.records
|
||||
if (not user_id or r.user_id == user_id)
|
||||
]
|
||||
|
||||
|
||||
__all__ = ["AgentExecutionRecord", "AgentObservability"]
|
||||
@@ -0,0 +1,52 @@
|
||||
"""API for agent orchestration observability."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .agent_observability import AgentExecutionRecord
|
||||
from .agent_observability_dashboard import AgentObservabilityDashboard
|
||||
from .agent_observability_store import AgentObservabilityStore
|
||||
|
||||
store = AgentObservabilityStore()
|
||||
dashboard = AgentObservabilityDashboard(store.load())
|
||||
|
||||
|
||||
def record_agent_execution(payload: dict[str, Any]):
|
||||
record = AgentExecutionRecord(**payload)
|
||||
return {"status": "ok", "record": store.append(record)}
|
||||
|
||||
|
||||
def get_agent_observability(user_id: str | None = None, group_id: str | None = None, role: str = "user"):
|
||||
records = store.query(user_id, group_id, role)
|
||||
return {
|
||||
"status": "ok",
|
||||
"records": records,
|
||||
"summary": store.load().summary(user_id if role != "owner" else None),
|
||||
}
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/agents", tags=["agent-observability"])
|
||||
|
||||
@router.post("/execution", operation_id="recordAgentExecution")
|
||||
def record(payload: dict[str, Any]):
|
||||
return record_agent_execution(payload)
|
||||
|
||||
@router.get("/overview", operation_id="getAgentObservabilityOverview")
|
||||
def overview(user_id: str | None = None, group_id: str | None = None, role: str = "user"):
|
||||
return get_agent_observability(user_id, group_id, role)
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "record_agent_execution", "get_agent_observability"]
|
||||
@@ -0,0 +1,44 @@
|
||||
"""Web UI dashboard model for agent execution visibility."""
|
||||
|
||||
from .agent_observability import AgentObservability
|
||||
|
||||
|
||||
class AgentObservabilityDashboard:
|
||||
def __init__(self, observability: AgentObservability | None = None):
|
||||
self.observability = observability or AgentObservability()
|
||||
|
||||
def overview(self, user_id: str | None = None):
|
||||
return {
|
||||
"route": "/admin/ai-evolution/agents",
|
||||
"title": "Agent Orchestration Observability",
|
||||
"summary": self.observability.summary(user_id),
|
||||
"views": [
|
||||
{
|
||||
"name": "scheduler_flow",
|
||||
"title": "OpenClaw/Hermes 调度流程",
|
||||
"data": self.observability.hermes_tree(user_id),
|
||||
},
|
||||
{
|
||||
"name": "agent_metrics",
|
||||
"title": "智能体指标",
|
||||
"fields": [
|
||||
"duration_ms",
|
||||
"input_tokens",
|
||||
"output_tokens",
|
||||
"total_tokens",
|
||||
"status",
|
||||
],
|
||||
},
|
||||
{
|
||||
"name": "loop_distribution",
|
||||
"title": "闭环分布",
|
||||
"fields": [
|
||||
"openclaw_independent_loops",
|
||||
"hermes_orchestrated_loops",
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["AgentObservabilityDashboard"]
|
||||
@@ -0,0 +1,113 @@
|
||||
"""Runtime hooks for Agent Observability.
|
||||
|
||||
OpenClaw/Hermes/sub-agents can call these hooks at start/end/delegation points.
|
||||
The hooks store sanitized metadata only: no prompts, no secrets, no private message
|
||||
content.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
from .agent_observability import AgentExecutionRecord
|
||||
from .agent_observability_store import AgentObservabilityStore
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
def parse_time(value: str) -> datetime:
|
||||
return datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentRunContext:
|
||||
execution_id: str
|
||||
user_id: str
|
||||
visible_scope: str
|
||||
entry_agent: str
|
||||
path: list[str] = field(default_factory=list)
|
||||
used_hermes: bool = False
|
||||
started_at: str = field(default_factory=utc_now)
|
||||
input_tokens: int = 0
|
||||
output_tokens: int = 0
|
||||
status: str = "running"
|
||||
|
||||
def delegate(self, agent_name: str) -> None:
|
||||
if agent_name not in self.path:
|
||||
self.path.append(agent_name)
|
||||
if agent_name.lower() == "hermes":
|
||||
self.used_hermes = True
|
||||
|
||||
def add_tokens(self, input_tokens: int = 0, output_tokens: int = 0) -> None:
|
||||
self.input_tokens += max(input_tokens, 0)
|
||||
self.output_tokens += max(output_tokens, 0)
|
||||
|
||||
|
||||
class AgentObservabilityHooks:
|
||||
def __init__(self, store: AgentObservabilityStore | None = None):
|
||||
self.store = store or AgentObservabilityStore()
|
||||
self.active: dict[str, AgentRunContext] = {}
|
||||
|
||||
def start(
|
||||
self,
|
||||
user_id: str,
|
||||
visible_scope: str,
|
||||
entry_agent: str,
|
||||
execution_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
run = AgentRunContext(
|
||||
execution_id=execution_id or f"exec_{uuid4().hex[:12]}",
|
||||
user_id=user_id,
|
||||
visible_scope=visible_scope,
|
||||
entry_agent=entry_agent,
|
||||
path=[entry_agent],
|
||||
used_hermes=entry_agent.lower() == "hermes",
|
||||
)
|
||||
self.active[run.execution_id] = run
|
||||
return {"status": "started", "execution_id": run.execution_id, "run": run.__dict__}
|
||||
|
||||
def delegate(self, execution_id: str, agent_name: str) -> dict[str, Any]:
|
||||
run = self.active[execution_id]
|
||||
run.delegate(agent_name)
|
||||
return {"status": "delegated", "execution_id": execution_id, "path": run.path}
|
||||
|
||||
def tokens(self, execution_id: str, input_tokens: int = 0, output_tokens: int = 0) -> dict[str, Any]:
|
||||
run = self.active[execution_id]
|
||||
run.add_tokens(input_tokens, output_tokens)
|
||||
return {
|
||||
"status": "tokens_recorded",
|
||||
"execution_id": execution_id,
|
||||
"input_tokens": run.input_tokens,
|
||||
"output_tokens": run.output_tokens,
|
||||
"total_tokens": run.input_tokens + run.output_tokens,
|
||||
}
|
||||
|
||||
def finish(self, execution_id: str, closed_by: str | None = None, status: str = "completed") -> dict[str, Any]:
|
||||
run = self.active.pop(execution_id)
|
||||
ended_at = utc_now()
|
||||
duration_ms = int((parse_time(ended_at) - parse_time(run.started_at)).total_seconds() * 1000)
|
||||
record = AgentExecutionRecord(
|
||||
execution_id=run.execution_id,
|
||||
user_id=run.user_id,
|
||||
visible_scope=run.visible_scope,
|
||||
entry_agent=run.entry_agent,
|
||||
path=run.path,
|
||||
used_hermes=run.used_hermes,
|
||||
closed_by=closed_by or run.path[-1],
|
||||
duration_ms=duration_ms,
|
||||
input_tokens=run.input_tokens,
|
||||
output_tokens=run.output_tokens,
|
||||
total_tokens=run.input_tokens + run.output_tokens,
|
||||
status=status,
|
||||
started_at=run.started_at,
|
||||
ended_at=ended_at,
|
||||
)
|
||||
return {"status": "stored", "record": self.store.append(record)}
|
||||
|
||||
|
||||
__all__ = ["AgentRunContext", "AgentObservabilityHooks"]
|
||||
@@ -0,0 +1,45 @@
|
||||
"""Persistent store for agent observability records.
|
||||
|
||||
Stores sanitized execution metrics for OpenClaw/Hermes/sub-agents. No prompts,
|
||||
secrets, or private message contents are persisted here; only metrics and routing
|
||||
metadata are stored for Web UI statistics and audit.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from .agent_observability import AgentExecutionRecord, AgentObservability
|
||||
|
||||
|
||||
class AgentObservabilityStore:
|
||||
def __init__(self, root: str = "runtime/agent-observability"):
|
||||
self.root = Path(root)
|
||||
self.records_dir = self.root / "records"
|
||||
self.records_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def append(self, record: AgentExecutionRecord) -> dict[str, Any]:
|
||||
path = self.records_dir / f"{record.execution_id}.json"
|
||||
data = record.to_dict()
|
||||
path.write_text(json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
return data
|
||||
|
||||
def load(self) -> AgentObservability:
|
||||
observability = AgentObservability()
|
||||
for path in sorted(self.records_dir.glob("*.json")):
|
||||
raw = json.loads(path.read_text(encoding="utf-8"))
|
||||
observability.records.append(AgentExecutionRecord(**raw))
|
||||
return observability
|
||||
|
||||
def query(self, user_id: str | None = None, group_id: str | None = None, role: str = "user") -> list[dict[str, Any]]:
|
||||
records = [record.to_dict() for record in self.load().records]
|
||||
if role == "owner":
|
||||
return records
|
||||
if role == "group_admin" and group_id:
|
||||
return [r for r in records if r.get("visible_scope") == group_id or r.get("user_id") == user_id]
|
||||
return [r for r in records if r.get("user_id") == user_id]
|
||||
|
||||
|
||||
__all__ = ["AgentObservabilityStore"]
|
||||
Regular → Executable
+593
-34
@@ -5,8 +5,59 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
sys.path.insert(0, str(Path(os.getenv('AIOS_GITOPS_WORKSPACE', '/data/aios-gitops/workspace')) / 'runtime' / 'agent-os'))
|
||||
try:
|
||||
from aios_gitops_write_guard import evaluate_git_write
|
||||
except ModuleNotFoundError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
from aios_gitops_write_guard import evaluate_git_write
|
||||
|
||||
from gitea_tag_publication import (
|
||||
GiteaTagClient,
|
||||
GitTagBackend,
|
||||
PublicationConflict,
|
||||
PublicationPending,
|
||||
PublicationManualOwnerReviewRequired,
|
||||
PublicationReconciliationRequired,
|
||||
PublicationRequest,
|
||||
TagPublisher,
|
||||
redact,
|
||||
validate_version,
|
||||
)
|
||||
from orchestrator.action_monitor import ActionMonitor
|
||||
from silent_release_hardening import (
|
||||
ApprovalKeyRing,
|
||||
ApprovalRevocationStore,
|
||||
CapabilityAuthorizationError,
|
||||
SagaConflict,
|
||||
SignedApprovalVerifier,
|
||||
SignedReleasePlanApproval,
|
||||
SilentReleaseActionService,
|
||||
)
|
||||
try:
|
||||
from authoritative_git import (
|
||||
AuthoritativeGitError,
|
||||
AuthoritativeGitNotFound,
|
||||
AuthoritativeGitOutputTooLarge,
|
||||
authoritative_branches,
|
||||
authoritative_diff,
|
||||
authoritative_commit,
|
||||
authoritative_tags,
|
||||
repository_snapshot,
|
||||
run_authoritative_git,
|
||||
)
|
||||
except ModuleNotFoundError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
from authoritative_git import (
|
||||
AuthoritativeGitError,
|
||||
AuthoritativeGitNotFound,
|
||||
AuthoritativeGitOutputTooLarge,
|
||||
authoritative_branches,
|
||||
authoritative_diff,
|
||||
authoritative_commit,
|
||||
authoritative_tags,
|
||||
repository_snapshot,
|
||||
run_authoritative_git,
|
||||
)
|
||||
|
||||
ROOT = Path(os.getenv('AIOS_GITOPS_ROOT', '/data/aios-gitops'))
|
||||
WS = Path(os.getenv('AIOS_GITOPS_WORKSPACE', str(ROOT / 'workspace')))
|
||||
@@ -15,7 +66,20 @@ TOKEN_FILE = Path(os.getenv('AIOS_GITOPS_TOKEN_FILE', str(SECRETS / 'gitops.toke
|
||||
HOST = os.getenv('AIOS_GITOPS_HOST', '127.0.0.1')
|
||||
PORT = int(os.getenv('AIOS_GITOPS_PORT', '18890'))
|
||||
OPENAPI = WS / 'docs' / 'gitops' / 'openapi-chatgpt-actions.yaml'
|
||||
BARE_REPO = Path(os.getenv('AIOS_GITOPS_BARE_REPO', str(ROOT / 'runtime' / 'gitea-bin' / 'data' / 'repositories' / 'aios' / 'aios-v23.git')))
|
||||
BARE_REPO = Path(os.getenv('AIOS_GITOPS_BARE_REPO', str(ROOT / 'runtime' / 'gitea-bin' / 'data' / 'repositories' / 'aios' / 'aios.git')))
|
||||
AUTHORITATIVE_GIT_DIR = Path(os.getenv('AIOS_GITOPS_AUTHORITATIVE_GIT_DIR')) if os.getenv('AIOS_GITOPS_AUTHORITATIVE_GIT_DIR') else None
|
||||
REPOSITORY_IDENTITY = os.getenv('AIOS_GITOPS_REPOSITORY_IDENTITY', '')
|
||||
SILENT_RELEASE_STATE_ROOT = Path(os.getenv(
|
||||
'AIOS_SILENT_RELEASE_STATE_ROOT',
|
||||
'/var/lib/aios-gitops/silent-release',
|
||||
))
|
||||
SILENT_RELEASE_EXECUTION_ENABLED = str(os.getenv(
|
||||
'AIOS_SILENT_RELEASE_EXECUTION_ENABLED', 'false'
|
||||
)).lower() in {'1', 'true', 'yes', 'on'}
|
||||
SILENT_RELEASE_PUBLIC_KEYS = Path(os.getenv(
|
||||
'AIOS_SILENT_RELEASE_PUBLIC_KEYS',
|
||||
'/etc/aios-gitops/silent-release-owner-public-keys.json',
|
||||
))
|
||||
monitor = ActionMonitor()
|
||||
|
||||
BASE_MODELS = [
|
||||
@@ -24,7 +88,43 @@ BASE_MODELS = [
|
||||
{'id':'base.gpt-5.5','provider':'openai','model':'gpt-5.5','display_name':'GPT-5.5','scope':'global'},
|
||||
]
|
||||
SECRET_RE = re.compile(r'(?i)(api[_-]?key|secret[_-]?access[_-]?key|secret|password|token)\s*[:=]\s*["\']?([A-Za-z0-9_./+=:-]{16,})')
|
||||
SECRET_VAL_RE = re.compile(r'(sk-[A-Za-z0-9_-]{20,}|HPUA[A-Z0-9]{10,}|SDC[A-Za-z0-9]{20,})')
|
||||
SECRET_VAL_RE = re.compile(
|
||||
r'(?<![A-Za-z0-9_])'
|
||||
r'(sk-[A-Za-z0-9_-]{20,}|HPUA[A-Z0-9]{10,}|SDC[A-Za-z0-9]{20,})'
|
||||
)
|
||||
|
||||
READ_ONLY_GET_PATHS = frozenset({
|
||||
'/', '/health', '/api/health', '/api/openapi.yaml',
|
||||
'/api/openapi-chatgpt-actions.yaml', '/api/schema', '/api', '/api/status',
|
||||
'/api/base', '/api/baseline', '/base', '/api/ver', '/api/versions', '/ver',
|
||||
'/api/diff', '/diff', '/api/patch', '/api/patches', '/api/branches', '/patch',
|
||||
'/api/model', '/model', '/api/run', '/api/runtime-status', '/run',
|
||||
'/api/action-monitor', '/action-monitor', '/admin/ai-evolution',
|
||||
'/admin/ai-evolution/api/data',
|
||||
'/api/release-consistency', '/api/tag-publication-status',
|
||||
'/api/release-acceptance',
|
||||
'/getReleaseCandidate', '/getReleasePlan', '/getReleaseAcceptance',
|
||||
'/getApprovalEnvelope', '/getReleaseSaga', '/getCapabilityStatus',
|
||||
'/getRecoveryStatus',
|
||||
})
|
||||
SILENT_RELEASE_POST_PATHS = frozenset({
|
||||
'/createReleaseCandidate',
|
||||
'/createReleaseIntent',
|
||||
'/submitSignedApproval',
|
||||
'/submitOwnerApproval',
|
||||
'/startDeployment',
|
||||
})
|
||||
|
||||
def reject_non_read_http(handler, method: str, path: str) -> bool:
|
||||
if method == 'GET':
|
||||
return False
|
||||
if path in SILENT_RELEASE_POST_PATHS:
|
||||
return False
|
||||
decision = evaluate_git_write(WS)
|
||||
if decision.allowed:
|
||||
return False
|
||||
handler.sendj(decision.payload(), decision.status_code)
|
||||
return True
|
||||
|
||||
def now() -> str: return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
|
||||
def uid(p='id') -> str: return f'{p}-{int(time.time()*1000)}-{uuid.uuid4().hex[:8]}'
|
||||
@@ -36,6 +136,41 @@ def sh(args, check=False):
|
||||
def jload(p: Path, default):
|
||||
try: return json.loads(p.read_text(encoding='utf-8'))
|
||||
except Exception: return default
|
||||
|
||||
def _file_sha256(path: Path) -> str:
|
||||
digest=hashlib.sha256()
|
||||
with path.open('rb') as source:
|
||||
for chunk in iter(lambda: source.read(1024 * 1024), b''):
|
||||
digest.update(chunk)
|
||||
return digest.hexdigest()
|
||||
|
||||
def _build_silent_release_service() -> SilentReleaseActionService:
|
||||
verifier=None
|
||||
if SILENT_RELEASE_PUBLIC_KEYS.is_file():
|
||||
verifier=SignedApprovalVerifier(
|
||||
ApprovalKeyRing.from_file(SILENT_RELEASE_PUBLIC_KEYS),
|
||||
ApprovalRevocationStore(
|
||||
SILENT_RELEASE_STATE_ROOT / 'revocations'
|
||||
),
|
||||
)
|
||||
policy_path=WS / 'config' / 'gitops' / 'silent-release-policy.json'
|
||||
policy_sha=_file_sha256(policy_path) if policy_path.is_file() else ''
|
||||
return SilentReleaseActionService(
|
||||
SILENT_RELEASE_STATE_ROOT,
|
||||
execution_enabled=SILENT_RELEASE_EXECUTION_ENABLED,
|
||||
approval_verifier=verifier,
|
||||
expected_repository=REPOSITORY_IDENTITY,
|
||||
policy_sha256=policy_sha,
|
||||
)
|
||||
|
||||
# Construct once during service startup. If production execution is enabled
|
||||
# without every trusted builder/orchestrator dependency, construction fails
|
||||
# closed before the HTTP server accepts traffic.
|
||||
_SILENT_RELEASE_SERVICE = _build_silent_release_service()
|
||||
|
||||
|
||||
def silent_release_service() -> SilentReleaseActionService:
|
||||
return _SILENT_RELEASE_SERVICE
|
||||
def relpath(path: str) -> str:
|
||||
x = str(path or '').replace('\\','/').strip()
|
||||
if not x or x.startswith('/') or '..' in Path(x).parts or Path(x).parts[0] == '.git': raise ValueError('invalid path')
|
||||
@@ -109,9 +244,13 @@ def ensure_git():
|
||||
if not sh(['config','user.name'])['stdout']: sh(['config','user.name','chatgpt-gitops-bot'], True)
|
||||
def checkout(branch, base='main', create=False):
|
||||
ensure_git(); b=branch_name(branch)
|
||||
if create or sh(['rev-parse','--verify',b])['code'] != 0:
|
||||
sh(['checkout',base], True); sh(['checkout','-B',b], True)
|
||||
else: sh(['checkout',b], True)
|
||||
exists = sh(['rev-parse','--verify',f'refs/heads/{b}'])['code'] == 0
|
||||
if exists:
|
||||
sh(['checkout',b], True)
|
||||
elif create:
|
||||
sh(['checkout',base], True); sh(['checkout','-b',b], True)
|
||||
else:
|
||||
raise ValueError(f'branch does not exist: {b}')
|
||||
return b
|
||||
def write_file(path, content):
|
||||
if content_has_secret(content): raise ValueError('secret_rejected: use secret_ref; plaintext API keys must not enter Git')
|
||||
@@ -121,6 +260,19 @@ def sync_branch(branch: str) -> dict:
|
||||
if not branch or branch in ('main','master') or branch.startswith('main/') or branch.startswith('master/'):
|
||||
return {'status':'skipped','reason':'protected_branch','branch':branch}
|
||||
if BARE_REPO.exists():
|
||||
common = sh(['rev-parse', '--path-format=absolute', '--git-common-dir'], True)['stdout']
|
||||
if Path(common).resolve() == BARE_REPO.resolve():
|
||||
head = sh(['rev-parse', 'HEAD'], True)['stdout']
|
||||
stored = subprocess.run(
|
||||
['git', '--git-dir', str(BARE_REPO), 'rev-parse', f'refs/heads/{branch}'],
|
||||
text=True, capture_output=True,
|
||||
)
|
||||
if stored.returncode != 0 or stored.stdout.strip() != head:
|
||||
raise RuntimeError(f'linked-worktree branch verification failed for {branch}')
|
||||
return {
|
||||
'status':'verified', 'target':'authoritative-bare',
|
||||
'branch':branch, 'oid':head,
|
||||
}
|
||||
ref=f'refs/heads/{branch}:refs/heads/{branch}'
|
||||
p=subprocess.run(['git','--git-dir',str(BARE_REPO),'fetch',str(WS),ref], text=True, capture_output=True)
|
||||
if p.returncode != 0: raise RuntimeError(p.stderr or p.stdout or f'git sync failed for {branch}')
|
||||
@@ -130,15 +282,68 @@ def sync_branch(branch: str) -> dict:
|
||||
return {'status':'synced','target':'origin','branch':branch,'stdout':p.stdout.strip(),'stderr':p.stderr.strip()}
|
||||
|
||||
def sync_tag(tag: str) -> dict:
|
||||
if not tag: return {'status':'skipped','reason':'empty_tag'}
|
||||
if BARE_REPO.exists():
|
||||
ref=f'refs/tags/{tag}:refs/tags/{tag}'
|
||||
p=subprocess.run(['git','--git-dir',str(BARE_REPO),'fetch',str(WS),ref], text=True, capture_output=True)
|
||||
if p.returncode != 0: raise RuntimeError(p.stderr or p.stdout or f'git tag sync failed for {tag}')
|
||||
return {'status':'synced','target':'bare','tag':tag,'stdout':p.stdout.strip(),'stderr':p.stderr.strip()}
|
||||
p=subprocess.run(['git','push','origin',tag], cwd=str(WS), text=True, capture_output=True)
|
||||
if p.returncode != 0: raise RuntimeError(p.stderr or p.stdout or f'git tag push failed for {tag}')
|
||||
return {'status':'synced','target':'origin','tag':tag,'stdout':p.stdout.strip(),'stderr':p.stderr.strip()}
|
||||
raise RuntimeError(
|
||||
'unsafe sync_tag disabled: use TagPublisher with expected tag_oid, '
|
||||
'target_oid, Gitea remote verification, and authenticated API verification'
|
||||
)
|
||||
|
||||
def resolve_commit_oid(value: str | None, field: str = 'target_oid') -> str:
|
||||
oid = str(value or '').strip().lower()
|
||||
if not re.fullmatch(r'[0-9a-f]{40}', oid):
|
||||
raise ValueError(f'{field} must be a full 40-character commit OID')
|
||||
try:
|
||||
return authoritative_commit(oid, git_dir=AUTHORITATIVE_GIT_DIR)
|
||||
except (AuthoritativeGitError, ValueError) as exc:
|
||||
raise ValueError(f'{field} does not resolve to the exact approved commit') from exc
|
||||
|
||||
def existing_tag_target(tag: str) -> str | None:
|
||||
if not re.fullmatch(r'V\d+R\d+C\d+(?:-[A-Za-z0-9_.-]+)?$', str(tag or '')):
|
||||
raise ValueError('invalid release version')
|
||||
try:
|
||||
result = run_authoritative_git(
|
||||
['rev-parse', '--verify', f'refs/tags/{tag}^{{commit}}'],
|
||||
check=False,
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
)
|
||||
except AuthoritativeGitError as exc:
|
||||
raise RuntimeError(str(exc)) from exc
|
||||
return result.stdout.strip() if result.returncode == 0 else None
|
||||
|
||||
def publication_request_from_query(q: dict[str, list[str]]) -> PublicationRequest:
|
||||
required = ('version', 'target_oid', 'evidence_closure_oid', 'approval_plan_id')
|
||||
missing = [name for name in required if not (q.get(name) or [''])[0]]
|
||||
if missing:
|
||||
raise ValueError('missing release governance fields: ' + ', '.join(missing))
|
||||
return PublicationRequest(
|
||||
(q['version'])[0],
|
||||
(q['target_oid'])[0].lower(),
|
||||
(q['evidence_closure_oid'])[0].lower(),
|
||||
(q['approval_plan_id'])[0],
|
||||
)
|
||||
|
||||
def required_authoritative_git_dir() -> Path:
|
||||
snapshot = repository_snapshot(
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
repository_identity=REPOSITORY_IDENTITY,
|
||||
)
|
||||
if not snapshot["repository_available"]:
|
||||
raise RuntimeError(str(snapshot["query_error"] or "AUTHORITATIVE_REPOSITORY_UNAVAILABLE"))
|
||||
return Path(str(snapshot["authoritative_git_dir"]))
|
||||
|
||||
|
||||
def publication_publisher() -> TagPublisher:
|
||||
authoritative_repo = required_authoritative_git_dir()
|
||||
return TagPublisher(
|
||||
WS,
|
||||
GitTagBackend(WS, authoritative_repo=authoritative_repo),
|
||||
GiteaTagClient(
|
||||
os.getenv('AIOS_GITOPS_GITEA_API_URL',''),
|
||||
os.getenv('AIOS_GITOPS_GITEA_REPOSITORY',''),
|
||||
Path(os.getenv('AIOS_GITOPS_GITEA_TOKEN_FILE','')),
|
||||
token_line=int(os.getenv('AIOS_GITOPS_GITEA_TOKEN_LINE','1')),
|
||||
),
|
||||
os.getenv('AIOS_GITOPS_GITEA_REMOTE','gitea'),
|
||||
)
|
||||
|
||||
def commit(paths, msg):
|
||||
ensure_git(); paths = [relpath(p) for p in paths] if paths else ['.']; sh(['add'] + paths, True)
|
||||
@@ -158,6 +363,16 @@ def patches():
|
||||
for p in sorted((WS/'patches').glob('**/*.json')): out.append(jload(p, {'path':str(p.relative_to(WS))}))
|
||||
return out
|
||||
|
||||
def runtime_release_info() -> dict[str, Any]:
|
||||
for candidate in (WS / 'manifest.json', WS.parent / 'manifest.json'):
|
||||
data = jload(candidate, {})
|
||||
if data.get('target_commit'):
|
||||
return {
|
||||
'runtime_release_commit': data.get('target_commit'),
|
||||
'runtime_release_path': str(WS),
|
||||
}
|
||||
return {'runtime_release_commit': None, 'runtime_release_path': str(WS)}
|
||||
|
||||
class H(BaseHTTPRequestHandler):
|
||||
server_version='AIOSChatGPTGitOps/V1R1C0'
|
||||
def sendj(self, data, code=200):
|
||||
@@ -179,38 +394,236 @@ class H(BaseHTTPRequestHandler):
|
||||
if '*' not in a['scopes'] and scope not in a['scopes']: self.sendj({'error':'forbidden','required_scope':scope,'account':a['account']},403); return None
|
||||
return a
|
||||
def do_GET(self):
|
||||
u=urllib.parse.urlparse(self.path); path=u.path.rstrip('/') if u.path != '/' else u.path; q=urllib.parse.parse_qs(u.query)
|
||||
u=urllib.parse.urlparse(self.path); path=u.path.rstrip('/') if u.path != '/' else u.path
|
||||
if path not in READ_ONLY_GET_PATHS: return self.sendj({'error':'not_found','path':path},404)
|
||||
q=urllib.parse.parse_qs(u.query)
|
||||
try:
|
||||
if path in ('/health','/api/health'): return self.sendj({'status':'ok','service':'chatgpt-gitops-adapter','workspace':str(WS)})
|
||||
if path in ('/api/openapi.yaml','/api/openapi-chatgpt-actions.yaml','/api/schema'):
|
||||
return self.sendt(OPENAPI.read_text(encoding='utf-8'), 'application/yaml; charset=utf-8') if OPENAPI.exists() else self.sendj({'error':'schema_missing'},404)
|
||||
if path in ('/api','/api/status'): return self.sendj(api_spec())
|
||||
if path in ('/api/base','/api/baseline','/base'):
|
||||
data=jload(WS/'baseline'/'current.json', {}); data.setdefault('git', sh(['rev-parse','--short','HEAD'])['stdout']); return self.sendj(data)
|
||||
data=jload(WS/'baseline'/'current.json', {})
|
||||
data.setdefault('authoritative_repository', repository_snapshot(
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
repository_identity=REPOSITORY_IDENTITY,
|
||||
))
|
||||
return self.sendj(data)
|
||||
if path in ('/api/ver','/api/versions','/ver'):
|
||||
return self.sendj({'tags':sh(['tag','--list','V*'])['stdout'].splitlines(),'versions_dir':[p.name for p in (WS/'versions').glob('*')],'head':sh(['rev-parse','--short','HEAD'])['stdout']})
|
||||
snapshot = repository_snapshot(
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
repository_identity=REPOSITORY_IDENTITY,
|
||||
)
|
||||
if not snapshot['repository_available']:
|
||||
return self.sendj({
|
||||
'repository_available': False,
|
||||
'query_error': snapshot['query_error'],
|
||||
'registry_versions': [p.name for p in (WS/'versions').glob('*')],
|
||||
'local_authoritative_tags': [],
|
||||
}, 503)
|
||||
try:
|
||||
tags = authoritative_tags(git_dir=AUTHORITATIVE_GIT_DIR)
|
||||
except AuthoritativeGitError as exc:
|
||||
return self.sendj({
|
||||
'repository_available': False,
|
||||
'query_error': str(exc),
|
||||
'registry_versions': [p.name for p in (WS/'versions').glob('*')],
|
||||
'local_authoritative_tags': [],
|
||||
}, 503)
|
||||
registry = [p.name for p in (WS/'versions').glob('*')]
|
||||
return self.sendj({
|
||||
'registry_versions': registry,
|
||||
'local_authoritative_tags': tags,
|
||||
'repository_available': True,
|
||||
'query_error': None,
|
||||
'tags': [item['name'] for item in tags],
|
||||
'versions_dir': registry,
|
||||
'head': snapshot['authoritative_head_oid'],
|
||||
'authoritative_head_oid': snapshot['authoritative_head_oid'],
|
||||
})
|
||||
if path in ('/api/diff','/diff'):
|
||||
frm=(q.get('from') or ['HEAD~1'])[0]; to=(q.get('to') or ['HEAD'])[0]; return self.sendj({'from':frm,'to':to,'diff':sh(['diff',frm,to])})
|
||||
if path in ('/api/patch','/api/patches','/api/branches','/patch'): return self.sendj({'patches':patches(),'branches':sh(['branch','--format','%(refname:short)'])['stdout'].splitlines()})
|
||||
frm=(q.get('from') or [''])[0]
|
||||
to=(q.get('to') or [''])[0]
|
||||
try:
|
||||
diff=authoritative_diff(frm, to, git_dir=required_authoritative_git_dir())
|
||||
except ValueError as exc:
|
||||
return self.sendj({'error':redact(exc)},400)
|
||||
except AuthoritativeGitNotFound as exc:
|
||||
return self.sendj({'error':redact(exc)},404)
|
||||
except AuthoritativeGitOutputTooLarge as exc:
|
||||
return self.sendj({'error':redact(exc)},413)
|
||||
except (AuthoritativeGitError, RuntimeError) as exc:
|
||||
return self.sendj({'error':redact(exc)},503)
|
||||
return self.sendj({'from':frm,'to':to,'diff':diff})
|
||||
if path in ('/api/patch','/api/patches','/api/branches','/patch'):
|
||||
snapshot = repository_snapshot(
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
repository_identity=REPOSITORY_IDENTITY,
|
||||
)
|
||||
if not snapshot['repository_available']:
|
||||
return self.sendj({
|
||||
'repository_available': False,
|
||||
'query_error': snapshot['query_error'],
|
||||
'metadata_patches': patches(),
|
||||
'authoritative_branches': [],
|
||||
}, 503)
|
||||
try:
|
||||
branches = authoritative_branches(git_dir=AUTHORITATIVE_GIT_DIR)
|
||||
except AuthoritativeGitError as exc:
|
||||
return self.sendj({
|
||||
'repository_available': False,
|
||||
'query_error': str(exc),
|
||||
'metadata_patches': patches(),
|
||||
'authoritative_branches': [],
|
||||
}, 503)
|
||||
metadata = patches()
|
||||
branch_names = {item['name'] for item in branches}
|
||||
metadata_names = {
|
||||
item.get('branch') for item in metadata
|
||||
if isinstance(item, dict) and item.get('branch')
|
||||
}
|
||||
orphan = [
|
||||
item for item in metadata
|
||||
if item.get('branch') and item.get('branch') not in branch_names
|
||||
]
|
||||
missing = [
|
||||
item for item in branches
|
||||
if item['name'] not in metadata_names
|
||||
]
|
||||
return self.sendj({
|
||||
'metadata_patches': metadata,
|
||||
'authoritative_branches': branches,
|
||||
'orphan_metadata': orphan,
|
||||
'branches_without_metadata': missing,
|
||||
'repository_available': True,
|
||||
'query_error': None,
|
||||
'patches': metadata,
|
||||
'branches': [item['name'] for item in branches],
|
||||
})
|
||||
if path in ('/api/model','/model'): return self.sendj({'base':BASE_MODELS,'custom':model_docs(),'priority':[jload(p,{}) for p in sorted((WS/'config'/'model_priority').glob('*.json'))]})
|
||||
if path in ('/api/run','/api/runtime-status','/run'):
|
||||
svc=subprocess.run(['systemctl','is-active','aios-gitops-model-api'], text=True, capture_output=True)
|
||||
return self.sendj({'service':'aios-gitops-model-api','status':svc.stdout.strip() or svc.stderr.strip(),'workspace_branch':sh(['rev-parse','--abbrev-ref','HEAD'])['stdout']})
|
||||
snapshot = repository_snapshot(
|
||||
git_dir=AUTHORITATIVE_GIT_DIR,
|
||||
repository_identity=REPOSITORY_IDENTITY,
|
||||
)
|
||||
workspace_branch = None
|
||||
if (WS / '.git').exists():
|
||||
result = sh(['rev-parse','--abbrev-ref','HEAD'])
|
||||
workspace_branch = result['stdout'] or None
|
||||
payload = {
|
||||
'service':'aios-gitops-model-api',
|
||||
'status':svc.stdout.strip() or svc.stderr.strip(),
|
||||
'workspace_branch':workspace_branch,
|
||||
**runtime_release_info(),
|
||||
**snapshot,
|
||||
'writes_enabled': str(os.getenv('AIOS_GITOPS_WRITES_ENABLED','false')).lower() in {'1','true','yes','on'},
|
||||
}
|
||||
return self.sendj(payload, 200 if snapshot['repository_available'] else 503)
|
||||
if path in ('/api/action-monitor','/action-monitor'):
|
||||
latest=monitor.latest()
|
||||
ldict={'event_id':latest.event_id,'action':latest.action,'error':latest.error,'context':latest.context,'created_at':latest.created_at} if latest else None
|
||||
return self.sendj({'events':[{"event_id":e.event_id,"action":e.action,"error":e.error,"context":e.context,"created_at":e.created_at} for e in monitor.list_events()],'latest':ldict})
|
||||
if path == '/api/tag-publication-status':
|
||||
version=(q.get('version') or [''])[0]
|
||||
try:
|
||||
version=validate_version(version)
|
||||
status=publication_publisher().get_tag_publication_status(version)
|
||||
except ValueError:
|
||||
return self.sendj({'error':'invalid release version'},400)
|
||||
return self.sendj(status)
|
||||
if path == '/api/release-consistency':
|
||||
request=publication_request_from_query(q)
|
||||
return self.sendj(publication_publisher().get_release_consistency(request))
|
||||
if path == '/api/release-acceptance':
|
||||
request=publication_request_from_query(q)
|
||||
return self.sendj(publication_publisher().run_release_acceptance(request))
|
||||
if path in (
|
||||
'/getReleaseCandidate',
|
||||
'/getReleasePlan',
|
||||
'/getReleaseAcceptance',
|
||||
'/getApprovalEnvelope',
|
||||
'/getReleaseSaga',
|
||||
'/getCapabilityStatus',
|
||||
):
|
||||
candidate_id=(q.get('candidate_id') or [''])[0]
|
||||
if not candidate_id:
|
||||
return self.sendj({'error':'candidate_id is required'},400)
|
||||
service=silent_release_service()
|
||||
if path == '/getReleaseCandidate':
|
||||
return self.sendj(
|
||||
service.get_release_candidate(candidate_id)
|
||||
)
|
||||
if path == '/getApprovalEnvelope':
|
||||
return self.sendj(
|
||||
service.get_approval_envelope(candidate_id)
|
||||
)
|
||||
if path == '/getReleasePlan':
|
||||
return self.sendj(service.get_release_plan(candidate_id))
|
||||
if path == '/getReleaseAcceptance':
|
||||
return self.sendj(service.get_acceptance(candidate_id))
|
||||
if path == '/getCapabilityStatus':
|
||||
return self.sendj(
|
||||
service.get_capability_status(candidate_id)
|
||||
)
|
||||
return self.sendj(service.get_release_saga(candidate_id))
|
||||
if path == '/getRecoveryStatus':
|
||||
return self.sendj(
|
||||
silent_release_service().get_recovery_status()
|
||||
)
|
||||
# Admin AI Evolution Dashboard
|
||||
if path in ('/admin/ai-evolution','/admin/ai-evolution/'):
|
||||
return self.ai_evolution_page()
|
||||
if path in ('/admin/ai-evolution/api/data'):
|
||||
return self.ai_evolution_data()
|
||||
return self.sendj({'error':'not_found','path':path},404)
|
||||
except FileNotFoundError:
|
||||
return self.sendj({'error':'release candidate not found'},404)
|
||||
except ValueError as e:
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_GET', error, {'path':path})
|
||||
return self.sendj({'error':error},400)
|
||||
except Exception as e:
|
||||
monitor.record_failure('do_GET', str(e), {'path':path})
|
||||
return self.sendj({'error':str(e)},500)
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_GET', error, {'path':path})
|
||||
return self.sendj({'error':error},500)
|
||||
def do_PUT(self):
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/'); data=self.body()
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/')
|
||||
if reject_non_read_http(self, 'PUT', path): return
|
||||
data=self.body()
|
||||
if path == '/api/model-priority': return self.model_priority(data)
|
||||
return self.sendj({'error':'not_found','path':path},404)
|
||||
def do_POST(self):
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/'); data=self.body()
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/')
|
||||
if reject_non_read_http(self, 'POST', path): return
|
||||
data=self.body()
|
||||
try:
|
||||
if path == '/createReleaseCandidate':
|
||||
a=self.need('release:candidate')
|
||||
if not a: return
|
||||
return self.sendj(
|
||||
silent_release_service().create_release_candidate(data)
|
||||
)
|
||||
if path == '/createReleaseIntent':
|
||||
a=self.need('release:candidate')
|
||||
if not a: return
|
||||
return self.sendj(
|
||||
silent_release_service().create_release_intent(data)
|
||||
)
|
||||
if path in ('/submitOwnerApproval','/submitSignedApproval'):
|
||||
a=self.need('release:approve')
|
||||
if not a: return
|
||||
return self.sendj(
|
||||
silent_release_service().submit_owner_approval(data)
|
||||
)
|
||||
if path == '/startDeployment':
|
||||
a=self.need('release:deploy')
|
||||
if not a: return
|
||||
return self.sendj(
|
||||
silent_release_service().start_deployment(
|
||||
str(data.get('candidate_id') or '')
|
||||
)
|
||||
)
|
||||
if path in ('/api/branch','/api/create-branch'): return self.branch(data)
|
||||
if path in ('/api/file','/api/commit-file'): return self.file(data)
|
||||
if path == '/api/commit': return self.commit(data)
|
||||
@@ -221,9 +634,30 @@ class H(BaseHTTPRequestHandler):
|
||||
if path == '/api/model-priority': return self.model_priority(data)
|
||||
if path == '/api/nl': return self.nl(data)
|
||||
return self.sendj({'error':'not_found','path':path},404)
|
||||
except (ValueError, FileNotFoundError) as e:
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_POST', error, {'path':path})
|
||||
return self.sendj({'error':error},400)
|
||||
except CapabilityAuthorizationError as e:
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_POST', error, {'path':path})
|
||||
return self.sendj({'error':error},403)
|
||||
except SagaConflict as e:
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_POST', error, {'path':path})
|
||||
return self.sendj({'error':error},409)
|
||||
except Exception as e:
|
||||
monitor.record_failure('do_POST', str(e), {'path':path})
|
||||
return self.sendj({'error':str(e)},500)
|
||||
error=redact(e)
|
||||
monitor.record_failure('do_POST', error, {'path':path})
|
||||
return self.sendj({'error':error},500)
|
||||
def do_PATCH(self):
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/')
|
||||
if reject_non_read_http(self, 'PATCH', path): return
|
||||
return self.sendj({'error':'not_found','path':path},404)
|
||||
def do_DELETE(self):
|
||||
path=urllib.parse.urlparse(self.path).path.rstrip('/')
|
||||
if reject_non_read_http(self, 'DELETE', path): return
|
||||
return self.sendj({'error':'not_found','path':path},404)
|
||||
def branch(self,data):
|
||||
a=self.need('branch:create');
|
||||
if not a: return
|
||||
@@ -247,12 +681,41 @@ class H(BaseHTTPRequestHandler):
|
||||
if not a: return
|
||||
ver=data.get('version') or data.get('tag')
|
||||
if not re.match(r'^V\d+R\d+C\d+(-[A-Za-z0-9_.-]+)?$', ver or ''): return self.sendj({'error':'version must match VxRxCx'},400)
|
||||
if data.get('confirm') != True:
|
||||
self.sendj({'status':'confirm_required','operation':'tag','hint':'This operation creates a Git tag. Confirm to proceed.','x-openai-isConsequential':True}, 428)
|
||||
return
|
||||
if not data.get('target_oid') or not data.get('evidence_closure_oid') or not data.get('approval_plan_id'):
|
||||
return self.sendj({
|
||||
'error':'production_tag_evidence_required',
|
||||
'required':['version','target_oid','evidence_closure_oid','approval_plan_id'],
|
||||
},400)
|
||||
try:
|
||||
target_oid=resolve_commit_oid(data.get('target_oid'))
|
||||
evidence_oid=resolve_commit_oid(data.get('evidence_closure_oid'), 'evidence_closure_oid')
|
||||
except ValueError as exc:
|
||||
return self.sendj({'error':'invalid_tag_target','detail':str(exc)},400)
|
||||
if a['role'] != 'owner' or not data.get('execute'):
|
||||
b=checkout(data.get('branch') or f'request/tag-{safe(ver)}', 'main', True); req={'version':ver,'requested_by':a['account'],'approval_required':True,'created_at':now()}; r=write_json(f'baseline/tag_requests/{safe(ver)}.json', req); c=commit([r], f'chore(chatgpt): request tag {ver}'); return self.sendj({'status':'approval_required','branch':b,'commit':c})
|
||||
out=sh(['tag','-a',ver,'-m',data.get('message') or f'release {ver}'], True); self.sendj({'status':'tagged','version':ver,'git':out,'sync':sync_tag(ver)})
|
||||
b=checkout(data.get('branch') or f'request/tag-{safe(ver)}', 'main', True); req={'version':ver,'target_oid':target_oid,'evidence_closure_oid':evidence_oid,'approval_plan_id':data.get('approval_plan_id'),'requested_by':a['account'],'approval_required':True,'created_at':now()}; r=write_json(f'baseline/tag_requests/{safe(ver)}.json', req); c=commit([r], f'chore(chatgpt): request tag {ver}'); return self.sendj({'status':'approval_required','branch':b,'request':req,'commit':c})
|
||||
request=PublicationRequest(ver,target_oid,evidence_oid,str(data.get('approval_plan_id')))
|
||||
main_before=sh(['rev-parse','refs/heads/main'], True)['stdout']
|
||||
publisher=publication_publisher()
|
||||
try:
|
||||
publication=publisher.publish(request)
|
||||
except PublicationManualOwnerReviewRequired as exc:
|
||||
audit(a['account'],'tag_manual_owner_review_required',ver,{'target_oid':target_oid,'approval_plan_id':data.get('approval_plan_id'),'error':redact(exc)})
|
||||
return self.sendj({'status':'MANUAL_OWNER_REVIEW_REQUIRED','error':redact(exc),'main_changed':False,'force_push':False},409)
|
||||
except PublicationConflict as exc:
|
||||
audit(a['account'],'tag_conflict',ver,{'target_oid':target_oid,'approval_plan_id':data.get('approval_plan_id'),'error':str(exc)})
|
||||
return self.sendj({'status':'RECONCILIATION_REQUIRED','error':str(exc),'main_changed':False,'force_push':False},409)
|
||||
except PublicationPending as exc:
|
||||
audit(a['account'],'tag_pending',ver,{'target_oid':target_oid,'approval_plan_id':data.get('approval_plan_id'),'error':str(exc)})
|
||||
return self.sendj({'status':'REMOTE_PUSH_PENDING','error':str(exc),'main_changed':False,'force_push':False},503)
|
||||
except PublicationReconciliationRequired as exc:
|
||||
audit(a['account'],'tag_reconciliation_required',ver,{'target_oid':target_oid,'approval_plan_id':data.get('approval_plan_id'),'error':str(exc)})
|
||||
return self.sendj({'status':'RECONCILIATION_REQUIRED','error':str(exc),'main_changed':False,'force_push':False},502)
|
||||
main_after=sh(['rev-parse','refs/heads/main'], True)['stdout']
|
||||
if main_after != main_before:
|
||||
raise RuntimeError('main changed during tag operation')
|
||||
result={'status':publication['state'],'version':ver,'tag_name':ver,'tag_oid':publication['tag_oid'],'target_oid':target_oid,'expected_target_oid':target_oid,'evidence_closure_oid':evidence_oid,'approval_plan_id':data.get('approval_plan_id'),'workspace_head':sh(['rev-parse','HEAD'],True)['stdout'],'main_oid_before':main_before,'main_oid_after':main_after,'main_changed':False,'force_push':False,'publication':publication}
|
||||
audit(a['account'],'tag',ver,result)
|
||||
self.sendj(result)
|
||||
def rollback(self,data):
|
||||
a=self.need('rollback:request');
|
||||
if not a: return
|
||||
@@ -290,11 +753,107 @@ class H(BaseHTTPRequestHandler):
|
||||
elif 'model' in low or '模型' in text: intent='model_change'; plan=['use POST /api/model or PUT /api/model-priority','commit metadata']
|
||||
elif 'patch' in low or '补丁' in text: intent='patch_create'; plan=['call POST /api/patch']
|
||||
b=checkout(data.get('branch') or f'patch/nl-{uid("nl")}', 'main', True); doc={'id':uid('nl'),'text':text,'intent':intent,'action_plan':plan,'execute':False,'owner_approval_required':True,'created_by':a['account'],'created_at':now()}; r=write_json(f'patches/nl/{safe(doc["id"])}.json', doc); c=commit([r], f'chore(chatgpt): record nl plan {intent}'); self.sendj({'status':'planned','branch':b,'request':doc,'commit':c})
|
||||
_EVOLUTION_HTML = '''<!DOCTYPE html>
|
||||
<html lang=zh-CN>
|
||||
<head>
|
||||
<meta charset=UTF-8>
|
||||
<meta name=viewport content="width=device-width,initial-scale=1.0">
|
||||
<title>AIOS Evolution Dashboard</title>
|
||||
<script src=https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js></script>
|
||||
<style>
|
||||
*{margin:0;padding:0;box-sizing:border-box}
|
||||
body{background:#0d1117;color:#c9d1d9;font-size:14px;line-height:1.7;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif}
|
||||
.c{max-width:1000px;margin:0 auto;padding:32px 24px}
|
||||
h1{font-size:24px;color:#58a6ff;margin-bottom:2px}
|
||||
.sub{color:#8b949e;font-size:13px;border-bottom:1px solid #21262d;padding-bottom:16px;margin-bottom:20px;display:flex;justify-content:space-between}
|
||||
.g{display:grid;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));gap:16px;margin-bottom:20px}
|
||||
.s{background:#161b22;border:1px solid #21262d;border-radius:8px;padding:18px;text-align:center}
|
||||
.s .v{font-size:28px;font-weight:700;color:#f0f6fc}
|
||||
.s .l{font-size:11px;color:#8b949e;margin-top:4px}
|
||||
.bx{background:#161b22;border:1px solid #21262d;border-radius:8px;margin-bottom:14px}
|
||||
.bh{border-bottom:1px solid #21262d;padding:10px 16px;font-weight:600;font-size:14px;display:flex;gap:6px;align-items:center}
|
||||
.bd{padding:12px 16px}
|
||||
.rw{display:grid;grid-template-columns:1fr 1fr 100px 60px;gap:8px;padding:8px 16px;border-bottom:1px solid #21262d;font-size:13px;align-items:center;cursor:pointer;transition:background .15s}
|
||||
.rw:hover{background:#1c2128}.rw:last-child{border-bottom:none}
|
||||
.tg{display:inline-block;padding:2px 10px;border-radius:99px;font-size:11px;font-weight:600}
|
||||
.ok{background:#3fb95033;color:#3fb950}.fl{background:#da363333;color:#f85149}.if{background:#1f6feb33;color:#58a6ff}
|
||||
pre{background:#0d1117;padding:12px;border-radius:6px;overflow:auto;font-size:12px;color:#8b949e;max-height:300px;margin-top:8px}select{padding:8px 10px;border:1px solid #30363d;border-radius:6px;background:#21262d;color:#c9d1d9;font-size:13px;max-width:400px;width:100%;margin-bottom:4px;cursor:pointer}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id=app class=c>
|
||||
<h1>AIOS Evolution Dashboard</h1>
|
||||
<div class=sub><span>Baseline: {{baseline}}</span><span style=color:#8b949e>{{refreshMsg}}</span></div>
|
||||
<div class=g><div class=s><div class=v>{{tot}}</div><div class=l>Commands</div></div><div class=s><div class=v style=color:#3fb950>{{sok}}</div><div class=l>Succeeded</div></div><div class=s><div class=v style=color:#f85149>{{sfail}}</div><div class=l>Failed</div></div><div class=s><div class=v>{{runs}}</div><div class=l>Executions</div></div></div>
|
||||
<div class=bx><div class=bh>Version Timeline</div><div class=bd><div class=rw style=font-weight:600;border-bottom:2px solid #30363d;cursor:default><span>Version</span><span>Time</span><span>Result</span></div><div v-for=v in vs class=rw @click=selVer(v)><span style=color:#58a6ff>{{v.tag}}</span><span>{{v.time||'-'}}</span><span :class="'tg '+v.result">{{v.result||'-'}}</span></div></div></div>
|
||||
<div class=bx><div class=bh>Commands</div><div class=bd><select v-model=cmd @change=loadCmd><option value>-- Select --</option><option v-for=c in cmds :value=c>{{c}}</option></select><pre v-if=cdet>{{cdet}}</pre></div></div>
|
||||
<div class=bx><div class=bh>Recent Agent Runs</div><div class=bd><div class=rw style=font-weight:600;border-bottom:2px solid #30363d;cursor:default><span>Agent</span><span>Command</span><span>Count</span><span>Result</span></div><div v-for=r in aruns class=rw><span>{{r.agent||'-'}}</span><span style=overflow:hidden;white-space:nowrap;text-overflow:ellipsis>{{r.command}}</span><span>{{r.interaction_count||0}}</span><span :class="'tg '+r.final_result">{{r.final_result||'-'}}</span></div></div></div></div>
|
||||
<script>
|
||||
const{createApp,ref,onMounted}=Vue;createApp({setup(){const vs=ref([]),cmds=ref([]),ar=ref([]),cmd=ref(''),cdet=ref(null),tot=ref(0),sok=ref(0),sfail=ref(0),runs=ref(0),baseline=ref('V1R3C1'),refreshMsg=ref('')
|
||||
async function ld(){try{const r=await fetch('/admin/ai-evolution/api/data'),d=await r.json();baseline.value=d.baseline||'V1R3C1';vs.value=d.versions||[];cmds.value=d.commands||[];ar.value=d.agent_runs||[];tot.value=d.stats?.total||0;sok.value=d.stats?.success||0;sfail.value=d.stats?.failed||0;runs.value=d.stats?.agent_runs||0;refreshMsg.value='Last updated: '+new Date().toLocaleString()}catch(e){}}
|
||||
async function loadCmd(){if(!cmd.value){cdet.value=null;return}try{const r=await fetch('/admin/ai-evolution/api/data?command='+encodeURIComponent(cmd.value)),d=await r.json();cdet.value=JSON.stringify(d,null,2)}catch(e){cdet.value='Error'}}
|
||||
function selVer(v){cmd.value=v.tag||v.id||v.version;loadCmd()}
|
||||
onMounted(()=>{ld();setInterval(ld,30000)})
|
||||
return{vs,cmds,ar,cmd,cdet,tot,sok,sfail,runs,baseline,refreshMsg,loadCmd,selVer}})mount('#app')
|
||||
</script></body></html>'''
|
||||
|
||||
def ai_evolution_page(self):
|
||||
self.send_response(200)
|
||||
self.send_header('Content-Type', 'text/html; charset=utf-8')
|
||||
self.send_header('Content-Length', str(len(self._EVOLUTION_HTML)))
|
||||
self.end_headers()
|
||||
self.wfile.write(self._EVOLUTION_HTML.encode())
|
||||
|
||||
def ai_evolution_data(self):
|
||||
q=urllib.parse.urlparse(self.path).query
|
||||
params=urllib.parse.parse_qs(q)
|
||||
cmd_filter=(params.get('command') or [None])[0]
|
||||
bl=jload(WS/'baseline'/'current.json',{})
|
||||
current_ver=bl.get('current_baseline','V1R3C1')
|
||||
try:
|
||||
tags=[item['name'] for item in authoritative_tags(git_dir=required_authoritative_git_dir()) if str(item['name']).startswith('V')]
|
||||
except (AuthoritativeGitError, RuntimeError) as exc:
|
||||
return self.sendj({'error':redact(exc),'repository_available':False},503)
|
||||
versions=[]
|
||||
if (WS/'baseline'/'promotions').exists():
|
||||
for p in sorted((WS/'baseline'/'promotions').glob('*.json')):
|
||||
d=jload(p,{});v=d.get('version',p.stem)
|
||||
versions.append({'tag':v,'time':d.get('promoted_at','-'),'result':'ok'})
|
||||
for t in tags:
|
||||
if not any(v['tag']==t for v in versions):
|
||||
versions.append({'tag':t,'time':'-','result':'if'})
|
||||
agent_runs=[];ard=WS/'audit'/'agent-runs'
|
||||
if ard.exists():
|
||||
for f in sorted(ard.glob('*.json'),reverse=True)[:50]:
|
||||
d=jload(f,{});agent_runs.append(d) if isinstance(d,dict) else None
|
||||
cmd_dirs=[WS/'agents/commands/active',WS/'agents/commands/running',WS/'agents/commands/completed',WS/'agents/commands/failed']
|
||||
commands=[]
|
||||
for d in cmd_dirs:
|
||||
if d.exists():
|
||||
for f in sorted(d.glob('*.md')):
|
||||
commands.append(f.name)
|
||||
command_detail=None
|
||||
if cmd_filter:
|
||||
for d in cmd_dirs:
|
||||
if d.exists():
|
||||
fp=d/cmd_filter
|
||||
if fp.exists():
|
||||
command_detail={'command':cmd_filter,'content':fp.read_text(encoding='utf-8')}
|
||||
break
|
||||
if not command_detail:
|
||||
command_detail={'command':cmd_filter,'error':'not_found'}
|
||||
return self.sendj(command_detail)
|
||||
completed=list((WS/'agents/commands/completed').glob('*.md')) if (WS/'agents/commands/completed').exists() else []
|
||||
failed=list((WS/'agents/commands/failed').glob('*.md')) if (WS/'agents/commands/failed').exists() else []
|
||||
stats={'total':len(commands),'success':len(completed),'failed':len(failed),'agent_runs':len(agent_runs)}
|
||||
data={'baseline':current_ver,'versions':versions[-30:],'agent_runs':agent_runs,'commands':sorted(set(commands)),'stats':stats}
|
||||
self.sendj(data)
|
||||
|
||||
|
||||
def api_spec():
|
||||
return {'version':'V1R1C0-chatgpt-actions','openapi':'/api/openapi.yaml','read':['GET /api/base','GET /api/ver','GET /api/diff','GET /api/patch','GET /api/model','GET /api/run'],'write':['POST /api/branch','POST /api/file','POST /api/commit','POST /api/patch','POST /api/tag','POST /api/rollback','POST /api/model','PUT /api/model-priority','POST /api/nl'],'policy':{'bearer_required_for_write':True,'direct_main_push':False,'delete_tag':False,'owner_approval_required_for_v_level':True,'api_keys_in_git':False,'git_secret_field':'secret_ref','online_git_sync':True}}
|
||||
return {'version':'V1R1C0-chatgpt-actions','openapi':'/api/openapi.yaml','read':['GET /api/base','GET /api/ver','GET /api/diff','GET /api/patch','GET /api/model','GET /api/run','GET /getReleaseCandidate','GET /getApprovalEnvelope','GET /getReleaseSaga','GET /admin/ai-evolution'],'write':['POST /api/branch','POST /api/file','POST /api/commit','POST /api/patch','POST /api/tag','POST /api/rollback','POST /api/model','PUT /api/model-priority','POST /api/nl','POST /createReleaseCandidate','POST /submitOwnerApproval','POST /startDeployment'],'policy':{'bearer_required_for_write':True,'direct_main_push':False,'delete_tag':False,'owner_approval_required_for_v_level':True,'api_keys_in_git':False,'git_secret_field':'secret_ref','online_git_sync':True,'silent_release_execution_enabled':SILENT_RELEASE_EXECUTION_ENABLED,'silent_release_shadow_default':True}}
|
||||
|
||||
def main():
|
||||
print(f'AIOS ChatGPT GitOps adapter listening on {HOST}:{PORT}')
|
||||
ThreadingHTTPServer((HOST,PORT), H).serve_forever()
|
||||
if __name__ == '__main__': main()
|
||||
if __name__ == '__main__': main()
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Fail-closed policy for in-process Git mutation handlers."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Mapping
|
||||
|
||||
_TRUE = frozenset({"1", "true", "yes", "on"})
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GitWriteDecision:
|
||||
allowed: bool
|
||||
status_code: int
|
||||
error: str
|
||||
reason: str
|
||||
workspace: str
|
||||
|
||||
def payload(self) -> dict[str, str]:
|
||||
return {
|
||||
"status": "allowed" if self.allowed else "blocked",
|
||||
"error": self.error,
|
||||
"reason": self.reason,
|
||||
"workspace": self.workspace,
|
||||
}
|
||||
|
||||
|
||||
def _real(path: Path) -> Path:
|
||||
return Path(os.path.realpath(os.path.abspath(str(path))))
|
||||
|
||||
|
||||
def evaluate_git_write(workspace: Path | str, env: Mapping[str, str] | None = None) -> GitWriteDecision:
|
||||
values = os.environ if env is None else env
|
||||
lexical = Path(os.path.abspath(str(workspace)))
|
||||
canonical = _real(lexical)
|
||||
shown = str(lexical)
|
||||
if str(values.get("AIOS_GITOPS_WRITES_ENABLED", "false")).strip().lower() not in _TRUE:
|
||||
return GitWriteDecision(False, 423, "gitops_writes_disabled", "AIOS_GITOPS_WRITES_ENABLED is false", shown)
|
||||
if lexical != canonical:
|
||||
return GitWriteDecision(False, 409, "workspace_symlink_forbidden", "workspace must be a canonical non-symlink path", shown)
|
||||
controller = _real(Path(values.get("AIOS_GITOPS_CONTROLLER_PATH", "/data/aios-gitops/worktrees/controller")))
|
||||
role = str(values.get("AIOS_GITOPS_WORKSPACE_ROLE", "")).strip().lower()
|
||||
if canonical == controller or role == "runtime-anchor":
|
||||
return GitWriteDecision(False, 423, "runtime_anchor_read_only", "controller/runtime-anchor is read-only", str(canonical))
|
||||
writer_root = _real(Path(values.get("AIOS_GITOPS_APPROVED_WRITER_ROOT", "/data/aios-gitops/worktrees")))
|
||||
try:
|
||||
canonical.relative_to(writer_root)
|
||||
except ValueError:
|
||||
return GitWriteDecision(False, 409, "workspace_not_approved_writer", "workspace is outside the approved writer root", str(canonical))
|
||||
return GitWriteDecision(True, 200, "", "approved isolated writer", str(canonical))
|
||||
@@ -0,0 +1,316 @@
|
||||
"""Task-scoped hardened wrapper around the existing Action API."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
import urllib.parse
|
||||
|
||||
import aios_chatgpt_actions_api as api
|
||||
import aios_isolated_writer_policy as policy
|
||||
from isolated_writer_authz import AuthorizationError, authorize
|
||||
from isolated_writer_commit_file import AtomicCommitFile, CommitFileError, OperationLedger
|
||||
from isolated_writer_token_registry import TokenRegistry
|
||||
|
||||
_reject = api.reject_non_read_http
|
||||
_write_file = api.write_file
|
||||
_sync_branch = api.sync_branch
|
||||
_original_do_get = api.H.do_GET
|
||||
api.OPENAPI = Path(os.getenv("AIOS_GITOPS_ISOLATED_WRITER_OPENAPI", str(api.OPENAPI)))
|
||||
|
||||
|
||||
def _registry() -> TokenRegistry:
|
||||
return TokenRegistry(Path(os.environ["AIOS_GITOPS_TOKEN_REGISTRY_V2"]))
|
||||
|
||||
|
||||
def _atomic_writer() -> AtomicCommitFile:
|
||||
return AtomicCommitFile(
|
||||
workspace=api.WS,
|
||||
bare_repo=api.BARE_REPO,
|
||||
ledger=OperationLedger(Path(os.environ["AIOS_GITOPS_WRITER_OPERATION_LEDGER"])),
|
||||
remote=os.getenv("AIOS_GITOPS_GITEA_PUSH_REMOTE", ""),
|
||||
audit=policy.append_audit_record,
|
||||
)
|
||||
|
||||
|
||||
def _bearer(handler) -> str:
|
||||
value = handler.headers.get("Authorization", "")
|
||||
return value[7:].strip() if value.startswith("Bearer ") else ""
|
||||
|
||||
|
||||
def _authorize(handler, *, method: str, path: str, branch=None, target_path=None):
|
||||
grant = authorize(
|
||||
_registry(),
|
||||
_bearer(handler),
|
||||
method=method,
|
||||
path=path,
|
||||
source_ip=str(handler.client_address[0]),
|
||||
workspace=api.WS,
|
||||
branch=branch,
|
||||
target_path=target_path,
|
||||
)
|
||||
grant.record["_source_ip"] = str(handler.client_address[0])
|
||||
return grant
|
||||
|
||||
|
||||
def _authorization_error(handler, exc: AuthorizationError):
|
||||
return handler.sendj({"error": exc.code}, exc.status)
|
||||
|
||||
|
||||
def _isolated_runtime_status(handler):
|
||||
branch = api.sh(["rev-parse", "--abbrev-ref", "HEAD"], True)["stdout"]
|
||||
head = api.sh(["rev-parse", "HEAD"], True)["stdout"]
|
||||
return handler.sendj({
|
||||
"service": os.getenv(
|
||||
"AIOS_GITOPS_SERVICE_AUDIENCE",
|
||||
"aios-isolated-writer.service",
|
||||
),
|
||||
"status": "active",
|
||||
"runtime_role": os.getenv("AIOS_GITOPS_RUNTIME_ROLE"),
|
||||
"workspace_role": os.getenv("AIOS_GITOPS_WORKSPACE_ROLE"),
|
||||
"writes_enabled": os.getenv("AIOS_GITOPS_WRITES_ENABLED", "").lower()
|
||||
in {"1", "true", "yes", "on"},
|
||||
"allowed_branch": policy.allowed_branch(),
|
||||
"approved_base_oid": policy.allowed_base_oid(),
|
||||
"workspace_branch": branch,
|
||||
"workspace_head_oid": head,
|
||||
"repository_identity": os.getenv("AIOS_GITOPS_REPOSITORY_IDENTITY"),
|
||||
"token_policy_version": 2,
|
||||
"atomic_commit_file": True,
|
||||
"path_policy_sha256": policy.configured_path_policy_sha256(),
|
||||
})
|
||||
|
||||
|
||||
def _isolated_do_get(self):
|
||||
path = urllib.parse.urlparse(self.path).path.rstrip("/") or "/"
|
||||
if path in {"/health", "/api/health"}:
|
||||
return self.sendj({
|
||||
"status": "ok",
|
||||
"service": os.getenv(
|
||||
"AIOS_GITOPS_SERVICE_AUDIENCE",
|
||||
"aios-isolated-writer.service",
|
||||
),
|
||||
})
|
||||
if path not in {"/api/runtime-status", "/api/baseline", "/api/patches"}:
|
||||
return self.sendj({"error": "isolated_writer_operation_forbidden"}, 403)
|
||||
try:
|
||||
_authorize(self, method="GET", path=path)
|
||||
except AuthorizationError as exc:
|
||||
return _authorization_error(self, exc)
|
||||
if path == "/api/runtime-status":
|
||||
return _isolated_runtime_status(self)
|
||||
return _original_do_get(self)
|
||||
|
||||
|
||||
def _read_commit_file_body(handler):
|
||||
try:
|
||||
length = int(handler.headers.get("Content-Length", "0"))
|
||||
except ValueError:
|
||||
raise CommitFileError("writer_content_length_rejected") from None
|
||||
if length <= 0:
|
||||
raise CommitFileError("writer_request_object_required")
|
||||
if length > 1_100_000:
|
||||
raise CommitFileError("writer_request_too_large", 413)
|
||||
raw = handler.rfile.read(length)
|
||||
try:
|
||||
value = json.loads(raw.decode("utf-8"))
|
||||
except (UnicodeDecodeError, json.JSONDecodeError):
|
||||
raise CommitFileError("writer_request_json_rejected") from None
|
||||
if not isinstance(value, dict):
|
||||
raise CommitFileError("writer_request_object_required")
|
||||
return value
|
||||
|
||||
|
||||
def _isolated_do_post(self):
|
||||
path = urllib.parse.urlparse(self.path).path.rstrip("/") or "/"
|
||||
if path != "/api/commit-file":
|
||||
return self.sendj({"error": "isolated_writer_operation_forbidden"}, 403)
|
||||
try:
|
||||
data = _read_commit_file_body(self)
|
||||
branch = str(data.get("branch") or "")
|
||||
target_path = str(data.get("path") or "")
|
||||
grant = _authorize(
|
||||
self,
|
||||
method="POST",
|
||||
path=path,
|
||||
branch=branch,
|
||||
target_path=target_path,
|
||||
)
|
||||
if api.content_has_secret(str(data.get("content") or "")):
|
||||
raise CommitFileError("writer_secret_content_rejected", 403)
|
||||
result = _atomic_writer().execute(grant, data)
|
||||
return self.sendj(result)
|
||||
except AuthorizationError as exc:
|
||||
return _authorization_error(self, exc)
|
||||
except CommitFileError as exc:
|
||||
return self.sendj({"error": exc.code}, exc.status)
|
||||
except PermissionError:
|
||||
return self.sendj({"error": "isolated_writer_policy_rejected"}, 403)
|
||||
|
||||
|
||||
def reject_non_read_http(handler, method: str, path: str) -> bool:
|
||||
if _reject(handler, method, path):
|
||||
return True
|
||||
try:
|
||||
policy.validate_endpoint(method, path, api.WS, api.BARE_REPO)
|
||||
return False
|
||||
except PermissionError as exc:
|
||||
handler.sendj({"error": str(exc)}, 403)
|
||||
return True
|
||||
|
||||
|
||||
def checkout(branch, base="main", create=False):
|
||||
api.ensure_git()
|
||||
target = api.branch_name(branch)
|
||||
policy.validate_branch_request({"branch": target, "base": base})
|
||||
exists = api.sh(["rev-parse", "--verify", target])["code"] == 0
|
||||
if exists:
|
||||
if api.sh(["rev-parse", "--abbrev-ref", "HEAD"], True)["stdout"] != target:
|
||||
api.sh(["checkout", target], True)
|
||||
elif create:
|
||||
api.sh(["checkout", "-b", target, base], True)
|
||||
else:
|
||||
raise PermissionError("isolated_writer_branch_missing")
|
||||
policy.require_service_invariants(api.WS, api.BARE_REPO)
|
||||
return target
|
||||
|
||||
|
||||
def write_file(path, content):
|
||||
policy.validate_path(path, api.WS)
|
||||
return _write_file(path, content)
|
||||
|
||||
|
||||
def sync_branch(branch: str):
|
||||
policy.validate_sync_branch(branch)
|
||||
local = _sync_branch(branch)
|
||||
remote = os.getenv("AIOS_GITOPS_GITEA_PUSH_REMOTE", "").strip()
|
||||
if remote != "gitea-http":
|
||||
raise PermissionError("isolated_writer_gitea_remote_rejected")
|
||||
head = api.sh(["rev-parse", "HEAD"], True)["stdout"]
|
||||
pushed = subprocess.run(
|
||||
["git", "push", "--porcelain", remote, f"HEAD:refs/heads/{branch}"],
|
||||
cwd=api.WS,
|
||||
text=True,
|
||||
capture_output=True,
|
||||
)
|
||||
if pushed.returncode != 0:
|
||||
raise RuntimeError("isolated_writer_gitea_push_failed")
|
||||
verified = subprocess.run(
|
||||
["git", "ls-remote", "--heads", remote, f"refs/heads/{branch}"],
|
||||
cwd=api.WS,
|
||||
text=True,
|
||||
capture_output=True,
|
||||
)
|
||||
if verified.returncode != 0:
|
||||
raise RuntimeError("isolated_writer_gitea_verification_failed")
|
||||
fields = verified.stdout.strip().split()
|
||||
if len(fields) != 2 or fields[0] != head or fields[1] != f"refs/heads/{branch}":
|
||||
raise RuntimeError("isolated_writer_gitea_oid_mismatch")
|
||||
return {
|
||||
"status": "verified",
|
||||
"target": "authoritative-bare+gitea",
|
||||
"branch": branch,
|
||||
"oid": head,
|
||||
"local": local.get("status"),
|
||||
}
|
||||
|
||||
|
||||
def commit(paths, msg):
|
||||
policy.validate_commit_paths(paths, api.WS)
|
||||
api.ensure_git()
|
||||
selected = [api.relpath(p) for p in paths] if paths else ["."]
|
||||
api.sh(["add", *selected], True)
|
||||
policy.validate_staged_paths(api.WS)
|
||||
branch = api.sh(["rev-parse", "--abbrev-ref", "HEAD"], True)["stdout"]
|
||||
if not api.sh(["status", "--short"])["stdout"]:
|
||||
return {"status": "no_changes", "branch": branch, "sync": sync_branch(branch)}
|
||||
out = api.sh(["commit", "-m", msg], True)
|
||||
branch = api.sh(["rev-parse", "--abbrev-ref", "HEAD"], True)["stdout"]
|
||||
return {
|
||||
"status": "committed",
|
||||
"branch": branch,
|
||||
"rev": api.sh(["rev-parse", "--short", "HEAD"], True)["stdout"],
|
||||
"git": out,
|
||||
"sync": sync_branch(branch),
|
||||
}
|
||||
|
||||
|
||||
def audit(actor, action, target, payload):
|
||||
policy.append_audit_record(
|
||||
{
|
||||
"at": api.now(),
|
||||
"actor": actor,
|
||||
"action": action,
|
||||
"target": target,
|
||||
"payload": api.sanitize(payload),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def _validate_request(self, data, validate):
|
||||
try:
|
||||
validate(data)
|
||||
return True
|
||||
except PermissionError as exc:
|
||||
self.sendj({"error": str(exc)}, 403)
|
||||
return False
|
||||
|
||||
|
||||
def _checked_branch(self, data):
|
||||
if not _validate_request(self, data, policy.validate_branch_request):
|
||||
return
|
||||
return _branch(self, data)
|
||||
|
||||
|
||||
def _checked_file(self, data):
|
||||
data = dict(data)
|
||||
data.setdefault("branch", policy.allowed_branch())
|
||||
if not _validate_request(self, data, policy.validate_branch_request):
|
||||
return
|
||||
if not _validate_request(
|
||||
self,
|
||||
{"path": data.get("path", "")},
|
||||
lambda item: policy.validate_path(item["path"], api.WS),
|
||||
):
|
||||
return
|
||||
return _file(self, data)
|
||||
|
||||
|
||||
def _checked_commit(self, data):
|
||||
data = dict(data)
|
||||
data.setdefault("branch", policy.allowed_branch())
|
||||
if not _validate_request(self, data, policy.validate_branch_request):
|
||||
return
|
||||
return _commit(self, data)
|
||||
|
||||
|
||||
def _checked_patch(self, data):
|
||||
data = dict(data)
|
||||
data["branch"] = policy.allowed_branch()
|
||||
if not _validate_request(self, data, policy.validate_branch_request):
|
||||
return
|
||||
return _patch(self, data)
|
||||
|
||||
|
||||
_branch, _file, _commit, _patch = api.H.branch, api.H.file, api.H.commit, api.H.patch
|
||||
api.reject_non_read_http = reject_non_read_http
|
||||
api.checkout, api.write_file, api.sync_branch, api.commit, api.audit = (
|
||||
checkout,
|
||||
write_file,
|
||||
sync_branch,
|
||||
commit,
|
||||
audit,
|
||||
)
|
||||
api.H.branch, api.H.file, api.H.commit, api.H.patch = (
|
||||
_checked_branch,
|
||||
_checked_file,
|
||||
_checked_commit,
|
||||
_checked_patch,
|
||||
)
|
||||
api.H.do_GET = _isolated_do_get
|
||||
api.H.do_POST = _isolated_do_post
|
||||
|
||||
if __name__ == "__main__":
|
||||
policy.require_service_invariants(api.WS, api.BARE_REPO)
|
||||
api.ThreadingHTTPServer((api.HOST, api.PORT), api.H).serve_forever()
|
||||
@@ -0,0 +1,310 @@
|
||||
"""Fail-closed policy used only by the task-scoped Action writer."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import json
|
||||
import stat
|
||||
import subprocess
|
||||
import re
|
||||
from pathlib import Path, PurePosixPath, PureWindowsPath
|
||||
from urllib.parse import unquote
|
||||
|
||||
import isolated_writer_path_policy as path_policy
|
||||
|
||||
WRITE_ENDPOINTS = frozenset({"/api/commit-file"})
|
||||
ALLOWED_ROOTS = (
|
||||
"active-runtime",
|
||||
"docs",
|
||||
"patches",
|
||||
"reports",
|
||||
"scripts",
|
||||
"test",
|
||||
"tests",
|
||||
)
|
||||
DENIED_ROOTS = ("baseline", "config", "deploy", "deployments", "ops", "runtime", "services")
|
||||
_TRUE = frozenset({"1", "true", "yes", "on"})
|
||||
_FALSE = frozenset({"0", "false", "no", "off"})
|
||||
_DENY_FLAGS = (
|
||||
"AIOS_GITOPS_ALLOW_MAIN_WRITE",
|
||||
"AIOS_GITOPS_ALLOW_TAG_WRITE",
|
||||
"AIOS_GITOPS_ALLOW_BASELINE_WRITE",
|
||||
"AIOS_GITOPS_ALLOW_REGISTRY_WRITE",
|
||||
"AIOS_GITOPS_ALLOW_ROLLBACK",
|
||||
"AIOS_GITOPS_ALLOW_DEPLOYMENT",
|
||||
)
|
||||
|
||||
|
||||
def enforcement_required() -> bool:
|
||||
return os.getenv("AIOS_GITOPS_ISOLATED_WRITER_ENFORCEMENT", "") == "required"
|
||||
|
||||
|
||||
def allowed_branch() -> str:
|
||||
value = os.getenv("AIOS_GITOPS_ALLOWED_BRANCH", "").strip()
|
||||
if not value:
|
||||
raise PermissionError("isolated_writer_missing_allowed_branch")
|
||||
return value
|
||||
|
||||
|
||||
def allowed_base_oid() -> str:
|
||||
value = os.getenv("AIOS_GITOPS_ALLOWED_BASE_OID", "").strip().lower()
|
||||
if len(value) != 40 or any(ch not in "0123456789abcdef" for ch in value):
|
||||
raise PermissionError("isolated_writer_invalid_allowed_base_oid")
|
||||
return value
|
||||
|
||||
|
||||
def _git(workspace: Path, *args: str) -> str:
|
||||
result = subprocess.run(["git", *args], cwd=workspace, text=True, capture_output=True)
|
||||
if result.returncode != 0:
|
||||
raise PermissionError("isolated_writer_git_validation_failed")
|
||||
return result.stdout.strip()
|
||||
|
||||
|
||||
def require_service_invariants(workspace: Path, bare_repo: Path) -> None:
|
||||
if not enforcement_required():
|
||||
return
|
||||
if os.getenv("AIOS_GITOPS_WRITES_ENABLED", "").strip().lower() not in _TRUE:
|
||||
raise PermissionError("isolated_writer_write_gate_required")
|
||||
if os.getenv("AIOS_GITOPS_RUNTIME_ROLE", "") != "isolated-writer":
|
||||
raise PermissionError("isolated_writer_role_required")
|
||||
if os.getenv("AIOS_GITOPS_WORKSPACE_ROLE", "") != "isolated-writer":
|
||||
raise PermissionError("isolated_writer_workspace_role_required")
|
||||
if os.getenv("AIOS_GITOPS_TOKEN_POLICY_VERSION_REQUIRED", "") != "2":
|
||||
raise PermissionError("isolated_writer_token_policy_v2_required")
|
||||
if not os.getenv("AIOS_GITOPS_SERVICE_AUDIENCE", "").strip():
|
||||
raise PermissionError("isolated_writer_service_audience_required")
|
||||
if not os.getenv("AIOS_GITOPS_TOKEN_REGISTRY_V2", "").strip():
|
||||
raise PermissionError("isolated_writer_token_registry_required")
|
||||
if not os.getenv("AIOS_GITOPS_WRITER_OPERATION_LEDGER", "").strip():
|
||||
raise PermissionError("isolated_writer_operation_ledger_required")
|
||||
path_policy.configured_path_policy()
|
||||
for name in _DENY_FLAGS:
|
||||
if os.getenv(name, "").strip().lower() not in _FALSE:
|
||||
raise PermissionError("isolated_writer_forbidden_capability_flag")
|
||||
if os.getenv("AIOS_GITOPS_REPOSITORY_IDENTITY", "") != "aios/aios":
|
||||
raise PermissionError("isolated_writer_repository_identity_rejected")
|
||||
configured_bare_value = os.getenv("AIOS_GITOPS_AUTHORITATIVE_GIT_DIR", "").strip()
|
||||
if not configured_bare_value:
|
||||
raise PermissionError("isolated_writer_authoritative_repo_rejected")
|
||||
configured_bare = Path(configured_bare_value)
|
||||
if configured_bare.resolve(strict=True) != bare_repo.resolve(strict=True):
|
||||
raise PermissionError("isolated_writer_authoritative_repo_rejected")
|
||||
writer_root_value = os.getenv("AIOS_GITOPS_APPROVED_WRITER_ROOT", "").strip()
|
||||
if not writer_root_value:
|
||||
raise PermissionError("isolated_writer_workspace_outside_approved_root")
|
||||
writer_root = Path(writer_root_value).resolve(strict=True)
|
||||
lexical_workspace = Path(os.path.abspath(str(workspace)))
|
||||
canonical_workspace = lexical_workspace.resolve(strict=True)
|
||||
if lexical_workspace != canonical_workspace:
|
||||
raise PermissionError("isolated_writer_workspace_symlink_rejected")
|
||||
try:
|
||||
canonical_workspace.relative_to(writer_root)
|
||||
except (ValueError, FileNotFoundError):
|
||||
raise PermissionError("isolated_writer_workspace_outside_approved_root") from None
|
||||
if _git(workspace, "rev-parse", "--abbrev-ref", "HEAD") != allowed_branch():
|
||||
raise PermissionError("isolated_writer_current_branch_rejected")
|
||||
approved_base = allowed_base_oid()
|
||||
try:
|
||||
_git(workspace, "cat-file", "-e", f"{approved_base}^{{commit}}")
|
||||
subprocess.run(
|
||||
["git", "merge-base", "--is-ancestor", approved_base, "HEAD"],
|
||||
cwd=workspace,
|
||||
check=True,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
except (PermissionError, subprocess.CalledProcessError):
|
||||
raise PermissionError("isolated_writer_approved_base_not_ancestor") from None
|
||||
if _git(workspace, "merge-base", approved_base, "HEAD") != approved_base:
|
||||
raise PermissionError("isolated_writer_merge_base_rejected")
|
||||
common = Path(_git(workspace, "rev-parse", "--git-common-dir"))
|
||||
if not common.is_absolute():
|
||||
common = (workspace / common).resolve()
|
||||
if common.resolve() != bare_repo.resolve():
|
||||
raise PermissionError("isolated_writer_common_repo_rejected")
|
||||
|
||||
|
||||
def approved_audit_log_path() -> Path:
|
||||
root_value = os.getenv("AIOS_GITOPS_APPROVED_AUDIT_ROOT", "").strip()
|
||||
log_value = os.getenv("AIOS_GITOPS_AUDIT_LOG", "").strip()
|
||||
if not root_value or not log_value:
|
||||
raise PermissionError("isolated_writer_audit_path_missing")
|
||||
lexical_root = Path(os.path.abspath(root_value))
|
||||
lexical_log = Path(os.path.abspath(log_value))
|
||||
root = lexical_root.resolve(strict=True)
|
||||
if lexical_root != root or root.is_symlink() or not root.is_dir():
|
||||
raise PermissionError("isolated_writer_audit_root_rejected")
|
||||
try:
|
||||
lexical_log.relative_to(root)
|
||||
except ValueError:
|
||||
raise PermissionError("isolated_writer_audit_path_outside_approved_root") from None
|
||||
if lexical_log.parent.resolve(strict=True) != lexical_log.parent:
|
||||
raise PermissionError("isolated_writer_audit_parent_symlink_rejected")
|
||||
if lexical_log.exists() and lexical_log.is_symlink():
|
||||
raise PermissionError("isolated_writer_audit_log_symlink_rejected")
|
||||
os.chmod(root, 0o750)
|
||||
os.chmod(lexical_log.parent, 0o750)
|
||||
return lexical_log
|
||||
|
||||
|
||||
def append_audit_record(record: dict) -> None:
|
||||
path = approved_audit_log_path()
|
||||
flags = os.O_WRONLY | os.O_APPEND | os.O_CREAT
|
||||
if hasattr(os, "O_NOFOLLOW"):
|
||||
flags |= os.O_NOFOLLOW
|
||||
descriptor = os.open(path, flags, 0o600)
|
||||
try:
|
||||
info = os.fstat(descriptor)
|
||||
if not stat.S_ISREG(info.st_mode):
|
||||
raise PermissionError("isolated_writer_audit_log_not_regular")
|
||||
os.fchmod(descriptor, 0o600)
|
||||
line = json.dumps(
|
||||
_audit_sanitize(record),
|
||||
ensure_ascii=False,
|
||||
sort_keys=True,
|
||||
separators=(",", ":"),
|
||||
).encode("utf-8") + b"\n"
|
||||
os.write(descriptor, line)
|
||||
os.fsync(descriptor)
|
||||
finally:
|
||||
os.close(descriptor)
|
||||
parent_fd = os.open(path.parent, os.O_RDONLY | getattr(os, "O_DIRECTORY", 0))
|
||||
try:
|
||||
os.fsync(parent_fd)
|
||||
finally:
|
||||
os.close(parent_fd)
|
||||
|
||||
|
||||
def _audit_sanitize(value):
|
||||
if isinstance(value, dict):
|
||||
return {
|
||||
key: (
|
||||
"[REDACTED]"
|
||||
if any(
|
||||
marker in str(key).lower()
|
||||
for marker in (
|
||||
"authorization",
|
||||
"credential",
|
||||
"password",
|
||||
"secret",
|
||||
"token",
|
||||
"private_key",
|
||||
)
|
||||
)
|
||||
and str(key).lower() != "token_id"
|
||||
else _audit_sanitize(inner)
|
||||
)
|
||||
for key, inner in value.items()
|
||||
}
|
||||
if isinstance(value, list):
|
||||
return [_audit_sanitize(item) for item in value]
|
||||
if isinstance(value, str) and re.search(
|
||||
r"(?i)(authorization\s*:\s*bearer|(?:token|password|secret)\s*[:=])",
|
||||
value,
|
||||
):
|
||||
return "[REDACTED]"
|
||||
return value
|
||||
|
||||
|
||||
def validate_endpoint(method: str, path: str, workspace: Path, bare_repo: Path) -> None:
|
||||
if not enforcement_required():
|
||||
return
|
||||
if method != "POST" or path not in WRITE_ENDPOINTS:
|
||||
raise PermissionError("isolated_writer_operation_forbidden")
|
||||
require_service_invariants(workspace, bare_repo)
|
||||
|
||||
|
||||
def validate_branch_request(data: dict) -> None:
|
||||
if not enforcement_required():
|
||||
return
|
||||
branch = allowed_branch() if "branch" not in data else str(data.get("branch") or "").strip()
|
||||
if branch != allowed_branch():
|
||||
raise PermissionError("isolated_writer_branch_rejected")
|
||||
if str(data.get("base", "main")).strip() != "main":
|
||||
raise PermissionError("isolated_writer_base_rejected")
|
||||
if data.get("force") or data.get("force_push"):
|
||||
raise PermissionError("isolated_writer_force_rejected")
|
||||
|
||||
|
||||
def validate_path(path: str, workspace: Path | None = None) -> str:
|
||||
if not isinstance(path, str):
|
||||
raise PermissionError("isolated_writer_path_rejected")
|
||||
value = path
|
||||
if not value or value != value.strip() or "\x00" in value or "\\" in value:
|
||||
raise PermissionError("isolated_writer_path_rejected")
|
||||
try:
|
||||
decoded = unquote(value, errors="strict")
|
||||
except (UnicodeDecodeError, ValueError):
|
||||
raise PermissionError("isolated_writer_path_rejected") from None
|
||||
if decoded != value:
|
||||
raise PermissionError("isolated_writer_path_rejected")
|
||||
windows = PureWindowsPath(value)
|
||||
posix = PurePosixPath(value)
|
||||
parts = value.split("/")
|
||||
if (
|
||||
posix.is_absolute()
|
||||
or windows.is_absolute()
|
||||
or bool(windows.drive)
|
||||
or any(part in {"", ".", ".."} for part in parts)
|
||||
):
|
||||
raise PermissionError("isolated_writer_path_rejected")
|
||||
first = parts[0]
|
||||
service_exact_path = False
|
||||
if first in DENIED_ROOTS:
|
||||
try:
|
||||
path_policy.require_service_path("commit_file.atomic", value)
|
||||
service_exact_path = True
|
||||
except path_policy.PathPolicyError as exc:
|
||||
raise PermissionError(str(exc)) from None
|
||||
if value != "README.md" and first not in ALLOWED_ROOTS and not service_exact_path:
|
||||
raise PermissionError("isolated_writer_path_outside_allowed_roots")
|
||||
if workspace is not None:
|
||||
lexical_root = Path(os.path.abspath(str(workspace)))
|
||||
root = lexical_root.resolve(strict=True)
|
||||
if lexical_root != root:
|
||||
raise PermissionError("isolated_writer_workspace_symlink_rejected")
|
||||
current = root
|
||||
for part in parts:
|
||||
current = current / part
|
||||
if current.is_symlink():
|
||||
raise PermissionError("isolated_writer_path_symlink_rejected")
|
||||
candidate = (root / value).resolve(strict=False)
|
||||
try:
|
||||
candidate.relative_to(root)
|
||||
except ValueError:
|
||||
raise PermissionError("isolated_writer_path_escapes_workspace") from None
|
||||
return value
|
||||
|
||||
|
||||
def validate_content_for_path(path: str, content: str) -> None:
|
||||
if path.split("/", 1)[0] not in DENIED_ROOTS:
|
||||
return
|
||||
try:
|
||||
path_policy.validate_content("commit_file.atomic", path, content)
|
||||
except path_policy.PathPolicyError as exc:
|
||||
raise PermissionError(str(exc)) from None
|
||||
|
||||
|
||||
def configured_path_policy_sha256() -> str | None:
|
||||
try:
|
||||
return path_policy.configured_path_policy_sha256()
|
||||
except path_policy.PathPolicyError as exc:
|
||||
raise PermissionError(str(exc)) from None
|
||||
|
||||
|
||||
def validate_commit_paths(paths: list[str], workspace: Path | None = None) -> None:
|
||||
if enforcement_required():
|
||||
for path in paths:
|
||||
if str(path).strip() != ".":
|
||||
validate_path(str(path), workspace)
|
||||
|
||||
|
||||
def validate_staged_paths(workspace: Path) -> None:
|
||||
if not enforcement_required():
|
||||
return
|
||||
for path in _git(workspace, "diff", "--cached", "--name-only").splitlines():
|
||||
validate_path(path, workspace)
|
||||
|
||||
|
||||
def validate_sync_branch(branch: str) -> None:
|
||||
if enforcement_required() and branch != allowed_branch():
|
||||
raise PermissionError("isolated_writer_sync_branch_rejected")
|
||||
@@ -0,0 +1,120 @@
|
||||
"""Architect governance agent responsibilities.
|
||||
|
||||
This agent records requirement changes, maintains versioned human-readable
|
||||
requirement/architecture/deployment/test documents, reviews architecture changes,
|
||||
validates deployment docs against actual configuration, and produces version bump
|
||||
recommendations.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class RequirementChange:
|
||||
id: str
|
||||
source: str
|
||||
actor: str
|
||||
requirement: str
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class DocumentRefreshPlan:
|
||||
requirement_doc: bool
|
||||
architecture_doc: bool
|
||||
deployment_doc: bool
|
||||
test_case_doc: bool
|
||||
reason: str
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureReviewDecision:
|
||||
status: str
|
||||
findings: list[str]
|
||||
optimization_recommendations: list[str]
|
||||
version_bump: str
|
||||
docs_to_refresh: DocumentRefreshPlan
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"findings": self.findings,
|
||||
"optimization_recommendations": self.optimization_recommendations,
|
||||
"version_bump": self.version_bump,
|
||||
"docs_to_refresh": self.docs_to_refresh.to_dict(),
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class ArchitectGovernanceAgent:
|
||||
"""Independent architecture governance role."""
|
||||
|
||||
def record_requirement_change(self, source: str, actor: str, requirement: str) -> RequirementChange:
|
||||
change_id = "REQ-" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")
|
||||
return RequirementChange(change_id, source, actor, requirement)
|
||||
|
||||
def review_architecture_change(self, proposal: dict[str, Any]) -> ArchitectureReviewDecision:
|
||||
impact = proposal.get("impact", "medium")
|
||||
findings = [
|
||||
"requirement_traceability_checked",
|
||||
"architecture_consistency_checked",
|
||||
"deployment_doc_alignment_checked",
|
||||
"test_case_doc_required",
|
||||
"rollback_and_owner_gate_checked",
|
||||
]
|
||||
recommendations = [
|
||||
"refresh user requirements document",
|
||||
"refresh architecture design document",
|
||||
"refresh engineering deployment document",
|
||||
"generate acceptance test case document",
|
||||
]
|
||||
version_bump = self.decide_version_bump(proposal)
|
||||
return ArchitectureReviewDecision(
|
||||
status="review_required" if impact in {"high", "architecture"} else "pass",
|
||||
findings=findings,
|
||||
optimization_recommendations=recommendations,
|
||||
version_bump=version_bump,
|
||||
docs_to_refresh=DocumentRefreshPlan(True, True, True, True, "architecture or requirement changed"),
|
||||
)
|
||||
|
||||
def decide_version_bump(self, proposal: dict[str, Any]) -> str:
|
||||
if proposal.get("breaks_architecture") or proposal.get("major_capability"):
|
||||
return "V"
|
||||
if proposal.get("new_release_capability") or proposal.get("architecture_change"):
|
||||
return "R"
|
||||
return "C"
|
||||
|
||||
def validate_deployment_doc(self, deployment_doc: dict[str, Any], actual_config: dict[str, Any]) -> dict[str, Any]:
|
||||
expected = set(deployment_doc.get("services", []))
|
||||
actual = set(actual_config.get("services", []))
|
||||
missing = sorted(expected - actual)
|
||||
extra = sorted(actual - expected)
|
||||
return {
|
||||
"status": "pass" if not missing else "attention_required",
|
||||
"missing_services": missing,
|
||||
"extra_services": extra,
|
||||
"checked_at": utc_now(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"RequirementChange",
|
||||
"DocumentRefreshPlan",
|
||||
"ArchitectureReviewDecision",
|
||||
"ArchitectGovernanceAgent",
|
||||
]
|
||||
@@ -0,0 +1,32 @@
|
||||
"""API for Architect Governance Center."""
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .architect_governance_dashboard import ArchitectGovernanceDashboard
|
||||
|
||||
|
||||
dashboard = ArchitectGovernanceDashboard()
|
||||
|
||||
|
||||
def get_architect_governance_overview():
|
||||
return dashboard.overview()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/architect", tags=["architect-governance"])
|
||||
|
||||
@router.get("/overview", operation_id="getArchitectGovernanceOverview")
|
||||
def overview():
|
||||
return get_architect_governance_overview()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_architect_governance_overview"]
|
||||
@@ -0,0 +1,153 @@
|
||||
"""Web UI dashboard model for Architect Governance Agent.
|
||||
|
||||
Shows requirement changes, architecture review findings, document refresh status,
|
||||
deployment consistency, test case readiness, weekly research and V/R/C version
|
||||
recommendations.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectPanelMetric:
|
||||
key: str
|
||||
title: str
|
||||
value: Any
|
||||
status: str = "ok"
|
||||
detail: str = ""
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectPanel:
|
||||
key: str
|
||||
title: str
|
||||
description: str
|
||||
metrics: list[ArchitectPanelMetric] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"key": self.key,
|
||||
"title": self.title,
|
||||
"description": self.description,
|
||||
"metrics": [m.to_dict() for m in self.metrics],
|
||||
}
|
||||
|
||||
|
||||
class ArchitectGovernanceDashboard:
|
||||
def overview(
|
||||
self,
|
||||
requirement_changes: list[dict[str, Any]] | None = None,
|
||||
architecture_reviews: list[dict[str, Any]] | None = None,
|
||||
document_status: dict[str, Any] | None = None,
|
||||
research_status: dict[str, Any] | None = None,
|
||||
version_recommendations: list[dict[str, Any]] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
requirement_changes = requirement_changes or []
|
||||
architecture_reviews = architecture_reviews or []
|
||||
document_status = document_status or {}
|
||||
research_status = research_status or {}
|
||||
version_recommendations = version_recommendations or []
|
||||
panels = [
|
||||
self.requirement_panel(requirement_changes),
|
||||
self.architecture_panel(architecture_reviews),
|
||||
self.document_panel(document_status),
|
||||
self.research_panel(research_status),
|
||||
self.version_panel(version_recommendations),
|
||||
]
|
||||
return {
|
||||
"module": "architect-governance",
|
||||
"route": "/admin/ai-evolution/architect",
|
||||
"title": "架构师 Agent 治理中心",
|
||||
"status": "attention_required" if any(self._panel_warn(panel) for panel in panels) else "healthy",
|
||||
"generated_at": utc_now(),
|
||||
"panels": [panel.to_dict() for panel in panels],
|
||||
"requirement_changes": requirement_changes,
|
||||
"architecture_reviews": architecture_reviews,
|
||||
"version_recommendations": version_recommendations,
|
||||
}
|
||||
|
||||
def requirement_panel(self, changes: list[dict[str, Any]]) -> ArchitectPanel:
|
||||
return ArchitectPanel(
|
||||
key="requirements",
|
||||
title="需求变化记录",
|
||||
description="记录来自 Custom GPT、Codex、OpenClaw、Hermes 和用户反馈的需求变化。",
|
||||
metrics=[
|
||||
ArchitectPanelMetric("total_requirement_changes", "需求变化数量", len(changes)),
|
||||
ArchitectPanelMetric(
|
||||
"undocumented_changes",
|
||||
"待刷新到用户需求文档",
|
||||
len([c for c in changes if not c.get("documented")]),
|
||||
"warn" if any(not c.get("documented") for c in changes) else "ok",
|
||||
),
|
||||
],
|
||||
)
|
||||
|
||||
def architecture_panel(self, reviews: list[dict[str, Any]]) -> ArchitectPanel:
|
||||
pending = [r for r in reviews if r.get("status") not in {"pass", "not_required"}]
|
||||
return ArchitectPanel(
|
||||
key="architecture_review",
|
||||
title="全量架构审视",
|
||||
description="展示架构一致性、扩展性、安全边界、可运维性和回滚策略审查。",
|
||||
metrics=[
|
||||
ArchitectPanelMetric("review_count", "架构审查数量", len(reviews)),
|
||||
ArchitectPanelMetric("pending_reviews", "待处理架构审查", len(pending), "warn" if pending else "ok"),
|
||||
],
|
||||
)
|
||||
|
||||
def document_panel(self, status: dict[str, Any]) -> ArchitectPanel:
|
||||
required_docs = ["requirements", "architecture", "deployment", "test_cases"]
|
||||
missing = [doc for doc in required_docs if status.get(doc) not in {"ready", "updated"}]
|
||||
return ArchitectPanel(
|
||||
key="documents",
|
||||
title="文档版本化状态",
|
||||
description="用户需求、架构设计、工程部署、测试例文档刷新状态。",
|
||||
metrics=[
|
||||
ArchitectPanelMetric("requirements_doc", "用户需求文档", status.get("requirements", "unknown"), "warn" if "requirements" in missing else "ok"),
|
||||
ArchitectPanelMetric("architecture_doc", "架构设计文档", status.get("architecture", "unknown"), "warn" if "architecture" in missing else "ok"),
|
||||
ArchitectPanelMetric("deployment_doc", "工程部署文档", status.get("deployment", "unknown"), "warn" if "deployment" in missing else "ok"),
|
||||
ArchitectPanelMetric("test_case_doc", "测试例文档", status.get("test_cases", "unknown"), "warn" if "test_cases" in missing else "ok"),
|
||||
],
|
||||
)
|
||||
|
||||
def research_panel(self, status: dict[str, Any]) -> ArchitectPanel:
|
||||
overdue = bool(status.get("overdue"))
|
||||
return ArchitectPanel(
|
||||
key="weekly_research",
|
||||
title="每周外部技术情报",
|
||||
description="联网搜索 Agent/模型版本、GitHub top 实现、潜在安全影响。",
|
||||
metrics=[
|
||||
ArchitectPanelMetric("last_research_at", "最近调研时间", status.get("last_research_at", "never"), "warn" if overdue else "ok"),
|
||||
ArchitectPanelMetric("findings", "发现数量", status.get("findings", 0)),
|
||||
ArchitectPanelMetric("optimization_candidates", "可借鉴优化项", status.get("optimization_candidates", 0)),
|
||||
],
|
||||
)
|
||||
|
||||
def version_panel(self, recommendations: list[dict[str, Any]]) -> ArchitectPanel:
|
||||
latest = recommendations[-1] if recommendations else {}
|
||||
return ArchitectPanel(
|
||||
key="version_decision",
|
||||
title="V/R/C 版本建议",
|
||||
description="由架构师 Agent 判断变更应进入 C、R 或 V。",
|
||||
metrics=[
|
||||
ArchitectPanelMetric("recommendation_count", "版本建议数量", len(recommendations)),
|
||||
ArchitectPanelMetric("latest_recommendation", "最近建议", latest.get("version_bump", "none")),
|
||||
ArchitectPanelMetric("reason", "建议原因", latest.get("reason", "")),
|
||||
],
|
||||
)
|
||||
|
||||
def _panel_warn(self, panel: ArchitectPanel) -> bool:
|
||||
return any(metric.status == "warn" for metric in panel.metrics)
|
||||
|
||||
|
||||
__all__ = ["ArchitectPanelMetric", "ArchitectPanel", "ArchitectGovernanceDashboard"]
|
||||
@@ -0,0 +1,40 @@
|
||||
"""Web UI model for Architect weekly research."""
|
||||
|
||||
from .architect_weekly_research_agent import ArchitectWeeklyResearchAgent
|
||||
|
||||
|
||||
class ArchitectResearchDashboard:
|
||||
def __init__(self, agent=None):
|
||||
self.agent = agent or ArchitectWeeklyResearchAgent()
|
||||
|
||||
def overview(self):
|
||||
return {
|
||||
"module": "architect-weekly-research",
|
||||
"route": "/admin/ai-evolution/architect/research",
|
||||
"title": "架构师 Agent 技术情报中心",
|
||||
"panels": [
|
||||
{
|
||||
"title": "Research Targets",
|
||||
"data": self.agent.plan(),
|
||||
},
|
||||
{
|
||||
"title": "Evaluation",
|
||||
"fields": [
|
||||
"relevance",
|
||||
"impact",
|
||||
"recommendation",
|
||||
],
|
||||
},
|
||||
{
|
||||
"title": "Version Decision",
|
||||
"fields": [
|
||||
"C",
|
||||
"R",
|
||||
"V",
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["ArchitectResearchDashboard"]
|
||||
@@ -0,0 +1,122 @@
|
||||
"""Architect research timeline dashboard.
|
||||
|
||||
Shows weekly external research findings as a traceable architecture-impact flow:
|
||||
research target -> finding -> impact -> recommendation -> version decision ->
|
||||
governance event.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ResearchTimelineStep:
|
||||
id: str
|
||||
title: str
|
||||
step_type: str
|
||||
status: str
|
||||
source: str
|
||||
timestamp: str
|
||||
impact: str = "none"
|
||||
version_bump: str = "none"
|
||||
detail: dict[str, Any] = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class ArchitectResearchTimeline:
|
||||
ORDER = {
|
||||
"research_planned": 10,
|
||||
"finding_created": 20,
|
||||
"impact_analyzed": 30,
|
||||
"recommendation_created": 40,
|
||||
"version_decision_created": 50,
|
||||
"architecture_review_event_created": 60,
|
||||
}
|
||||
|
||||
def build(self, findings: list[dict[str, Any]] | None = None, decisions: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
findings = findings or []
|
||||
decisions = decisions or []
|
||||
steps: list[ResearchTimelineStep] = [
|
||||
ResearchTimelineStep(
|
||||
id="research-plan",
|
||||
title="每周技术情报调研计划",
|
||||
step_type="research_planned",
|
||||
status="ok",
|
||||
source="architect-agent",
|
||||
timestamp=utc_now(),
|
||||
detail={"cadence": "weekly"},
|
||||
)
|
||||
]
|
||||
for idx, finding in enumerate(findings):
|
||||
steps.append(
|
||||
ResearchTimelineStep(
|
||||
id=finding.get("id", f"finding-{idx}"),
|
||||
title=finding.get("title", "research finding"),
|
||||
step_type="finding_created",
|
||||
status="ok",
|
||||
source=finding.get("source", "unknown"),
|
||||
timestamp=finding.get("created_at", utc_now()),
|
||||
impact=finding.get("impact", "none"),
|
||||
detail=finding,
|
||||
)
|
||||
)
|
||||
steps.append(
|
||||
ResearchTimelineStep(
|
||||
id=f"impact-{finding.get('id', idx)}",
|
||||
title="架构影响分析",
|
||||
step_type="impact_analyzed",
|
||||
status="attention_required" if finding.get("impact") in {"architecture", "breaking", "new_capability"} else "ok",
|
||||
source="architect-agent",
|
||||
timestamp=utc_now(),
|
||||
impact=finding.get("impact", "none"),
|
||||
detail={"relevance": finding.get("relevance"), "recommendation": finding.get("recommendation")},
|
||||
)
|
||||
)
|
||||
for idx, decision in enumerate(decisions):
|
||||
steps.append(
|
||||
ResearchTimelineStep(
|
||||
id=decision.get("id", f"decision-{idx}"),
|
||||
title="C/R/V 版本建议",
|
||||
step_type="version_decision_created",
|
||||
status=decision.get("status", "ok"),
|
||||
source="architect-agent",
|
||||
timestamp=decision.get("created_at", utc_now()),
|
||||
version_bump=decision.get("version_bump", "none"),
|
||||
detail=decision,
|
||||
)
|
||||
)
|
||||
steps.sort(key=lambda s: (self.ORDER.get(s.step_type, 999), s.timestamp))
|
||||
return {
|
||||
"module": "architect-research-timeline",
|
||||
"route": "/admin/ai-evolution/architect/research/timeline",
|
||||
"title": "架构师技术情报时间线",
|
||||
"status": self._status(steps),
|
||||
"generated_at": utc_now(),
|
||||
"steps": [step.to_dict() for step in steps],
|
||||
"summary": self._summary(steps),
|
||||
}
|
||||
|
||||
def _status(self, steps: list[ResearchTimelineStep]) -> str:
|
||||
if any(step.status == "attention_required" for step in steps):
|
||||
return "attention_required"
|
||||
return "healthy"
|
||||
|
||||
def _summary(self, steps: list[ResearchTimelineStep]) -> dict[str, Any]:
|
||||
return {
|
||||
"findings": len([s for s in steps if s.step_type == "finding_created"]),
|
||||
"architecture_impacts": len([s for s in steps if s.impact in {"architecture", "breaking", "new_capability"}]),
|
||||
"version_decisions": len([s for s in steps if s.step_type == "version_decision_created"]),
|
||||
"recommended_bumps": sorted({s.version_bump for s in steps if s.version_bump != "none"}),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["ResearchTimelineStep", "ArchitectResearchTimeline"]
|
||||
@@ -0,0 +1,32 @@
|
||||
"""API for architect research timeline."""
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .architect_research_timeline import ArchitectResearchTimeline
|
||||
|
||||
|
||||
timeline = ArchitectResearchTimeline()
|
||||
|
||||
|
||||
def get_architect_research_timeline():
|
||||
return timeline.build()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/architect/research", tags=["architect-research"])
|
||||
|
||||
@router.get("/timeline", operation_id="getArchitectResearchTimeline")
|
||||
def get_timeline():
|
||||
return get_architect_research_timeline()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_architect_research_timeline"]
|
||||
@@ -0,0 +1,113 @@
|
||||
"""Weekly external research loop for Architect Governance Agent.
|
||||
|
||||
The agent plans and normalizes weekly research tasks. Actual internet access is
|
||||
provided by the runtime/search worker; this module defines the audited workflow,
|
||||
findings, impact analysis, and V/R/C recommendations.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ResearchTarget:
|
||||
id: str
|
||||
topic: str
|
||||
source_type: str
|
||||
query: str
|
||||
cadence: str = "weekly"
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ResearchFinding:
|
||||
id: str
|
||||
target_id: str
|
||||
title: str
|
||||
summary: str
|
||||
source: str
|
||||
relevance: str
|
||||
impact: str
|
||||
recommendation: str
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ResearchDecision:
|
||||
status: str
|
||||
version_bump: str
|
||||
reason: str
|
||||
findings: list[ResearchFinding]
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"version_bump": self.version_bump,
|
||||
"reason": self.reason,
|
||||
"findings": [f.to_dict() for f in self.findings],
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class ArchitectWeeklyResearchAgent:
|
||||
DEFAULT_TARGETS = (
|
||||
ResearchTarget("agent-frameworks", "Agent framework versions", "web", "latest multi-agent orchestration framework releases"),
|
||||
ResearchTarget("model-ecosystem", "Model ecosystem changes", "web", "latest LLM model releases tool calling agent features"),
|
||||
ResearchTarget("github-top-agentops", "GitHub top AgentOps implementations", "github", "top repositories agent observability multi agent orchestration"),
|
||||
ResearchTarget("security-agent-risks", "Agent security changes", "web", "latest AI agent security sandbox prompt injection tool use risks"),
|
||||
)
|
||||
|
||||
def plan(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": "planned",
|
||||
"cadence": "weekly",
|
||||
"targets": [target.to_dict() for target in self.DEFAULT_TARGETS],
|
||||
"created_at": utc_now(),
|
||||
}
|
||||
|
||||
def normalize_finding(
|
||||
self,
|
||||
target_id: str,
|
||||
title: str,
|
||||
summary: str,
|
||||
source: str,
|
||||
relevance: str = "medium",
|
||||
impact: str = "none",
|
||||
recommendation: str = "monitor",
|
||||
) -> ResearchFinding:
|
||||
return ResearchFinding(
|
||||
id=f"finding_{uuid4().hex[:12]}",
|
||||
target_id=target_id,
|
||||
title=title,
|
||||
summary=summary,
|
||||
source=source,
|
||||
relevance=relevance,
|
||||
impact=impact,
|
||||
recommendation=recommendation,
|
||||
)
|
||||
|
||||
def decide(self, findings: list[ResearchFinding]) -> ResearchDecision:
|
||||
if any(f.impact == "breaking" for f in findings):
|
||||
return ResearchDecision("action_required", "V", "breaking external ecosystem change", findings)
|
||||
if any(f.impact in {"architecture", "new_capability"} for f in findings):
|
||||
return ResearchDecision("optimization_recommended", "R", "external capability may improve architecture", findings)
|
||||
if any(f.impact in {"bugfix", "minor"} for f in findings):
|
||||
return ResearchDecision("minor_change_recommended", "C", "minor compatible improvement", findings)
|
||||
return ResearchDecision("no_action", "none", "no relevant external change", findings)
|
||||
|
||||
|
||||
__all__ = ["ResearchTarget", "ResearchFinding", "ResearchDecision", "ArchitectWeeklyResearchAgent"]
|
||||
@@ -0,0 +1,32 @@
|
||||
"""API for architecture change governance dashboard."""
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .architecture_change_dashboard import ArchitectureChangeDashboard
|
||||
|
||||
|
||||
dashboard = ArchitectureChangeDashboard()
|
||||
|
||||
|
||||
def get_architecture_change_overview():
|
||||
return dashboard.overview()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/architecture-changes", tags=["architecture-changes"])
|
||||
|
||||
@router.get("/overview", operation_id="getArchitectureChangeOverview")
|
||||
def overview():
|
||||
return get_architecture_change_overview()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_architecture_change_overview"]
|
||||
@@ -0,0 +1,90 @@
|
||||
"""Architecture change classification.
|
||||
|
||||
Small compatible architecture changes may be handled automatically by the
|
||||
Architect Agent with audit evidence. Large, risky, production-impacting or
|
||||
breaking architecture changes require explicit Owner approval before
|
||||
implementation.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from typing import Any
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureChangeClassification:
|
||||
level: str
|
||||
owner_required: bool
|
||||
auto_implement_allowed: bool
|
||||
version_bump: str
|
||||
reasons: list[str] = field(default_factory=list)
|
||||
required_gates: list[str] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class ArchitectureChangeClassifier:
|
||||
"""Classifies architecture changes into small/medium/large governance paths."""
|
||||
|
||||
LARGE_FLAGS = {
|
||||
"breaking_change",
|
||||
"breaks_architecture",
|
||||
"production_architecture_update",
|
||||
"security_boundary_change",
|
||||
"cross_tenant_effect",
|
||||
"cross_user_data_effect",
|
||||
"data_migration",
|
||||
"permission_model_change",
|
||||
"runtime_infrastructure_change",
|
||||
}
|
||||
|
||||
def classify(self, change: dict[str, Any]) -> ArchitectureChangeClassification:
|
||||
risk = str(change.get("risk", "medium")).lower()
|
||||
version_bump = str(change.get("version_bump", change.get("recommended_version_bump", "C"))).upper()
|
||||
scope = str(change.get("scope", "component")).lower()
|
||||
reasons: list[str] = []
|
||||
|
||||
for flag in sorted(self.LARGE_FLAGS):
|
||||
if change.get(flag):
|
||||
reasons.append(flag)
|
||||
|
||||
if risk in {"high", "critical"}:
|
||||
reasons.append(f"risk={risk}")
|
||||
if version_bump == "V":
|
||||
reasons.append("version_bump=V")
|
||||
if version_bump == "R" and scope in {"system", "platform", "production", "cross_agent", "cross_tenant"}:
|
||||
reasons.append(f"version_bump=R scope={scope}")
|
||||
|
||||
if reasons:
|
||||
return ArchitectureChangeClassification(
|
||||
level="large",
|
||||
owner_required=True,
|
||||
auto_implement_allowed=False,
|
||||
version_bump=version_bump,
|
||||
reasons=reasons,
|
||||
required_gates=["architect_review", "owner_architecture_approval", "test_gate", "promotion_gate"],
|
||||
)
|
||||
|
||||
if risk == "low" and version_bump in {"C", "NONE"} and scope in {"component", "local", "documentation", "test"}:
|
||||
return ArchitectureChangeClassification(
|
||||
level="small",
|
||||
owner_required=False,
|
||||
auto_implement_allowed=True,
|
||||
version_bump=version_bump,
|
||||
reasons=["low_risk_compatible_change"],
|
||||
required_gates=["architect_review", "audit", "test_gate"],
|
||||
)
|
||||
|
||||
return ArchitectureChangeClassification(
|
||||
level="medium",
|
||||
owner_required=False,
|
||||
auto_implement_allowed=False,
|
||||
version_bump=version_bump,
|
||||
reasons=["requires_architect_review_before_implementation"],
|
||||
required_gates=["architect_review", "test_gate", "audit"],
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["ArchitectureChangeClassification", "ArchitectureChangeClassifier"]
|
||||
@@ -0,0 +1,93 @@
|
||||
"""Architecture change governance dashboard.
|
||||
|
||||
Displays architecture change classification, owner approval requirements,
|
||||
implementation readiness, version recommendation and audit evidence for Web UI.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .architecture_change_classifier import ArchitectureChangeClassifier
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureChangeView:
|
||||
change_id: str
|
||||
title: str
|
||||
level: str
|
||||
owner_required: bool
|
||||
auto_implement_allowed: bool
|
||||
version_bump: str
|
||||
status: str
|
||||
reasons: list[str] = field(default_factory=list)
|
||||
required_gates: list[str] = field(default_factory=list)
|
||||
owner_decision: str | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class ArchitectureChangeDashboard:
|
||||
def __init__(self, classifier: ArchitectureChangeClassifier | None = None):
|
||||
self.classifier = classifier or ArchitectureChangeClassifier()
|
||||
|
||||
def overview(self, changes: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
changes = changes or []
|
||||
views = [self._view(change) for change in changes]
|
||||
return {
|
||||
"module": "architecture-change-governance",
|
||||
"route": "/admin/ai-evolution/architecture-changes",
|
||||
"title": "架构变更治理中心",
|
||||
"status": self._status(views),
|
||||
"generated_at": utc_now(),
|
||||
"summary": self._summary(views),
|
||||
"changes": [view.to_dict() for view in views],
|
||||
}
|
||||
|
||||
def _view(self, change: dict[str, Any]) -> ArchitectureChangeView:
|
||||
classification = self.classifier.classify(change)
|
||||
owner_decision = change.get("owner_decision")
|
||||
if classification.owner_required and owner_decision != "approved":
|
||||
status = "waiting_owner_approval"
|
||||
elif classification.auto_implement_allowed:
|
||||
status = "auto_implementation_allowed"
|
||||
else:
|
||||
status = "ready_after_required_gates"
|
||||
return ArchitectureChangeView(
|
||||
change_id=change.get("change_id", change.get("id", "unknown")),
|
||||
title=change.get("title", "architecture change"),
|
||||
level=classification.level,
|
||||
owner_required=classification.owner_required,
|
||||
auto_implement_allowed=classification.auto_implement_allowed,
|
||||
version_bump=classification.version_bump,
|
||||
status=status,
|
||||
reasons=classification.reasons,
|
||||
required_gates=classification.required_gates,
|
||||
owner_decision=owner_decision,
|
||||
)
|
||||
|
||||
def _status(self, views: list[ArchitectureChangeView]) -> str:
|
||||
if any(view.status == "waiting_owner_approval" for view in views):
|
||||
return "attention_required"
|
||||
return "healthy"
|
||||
|
||||
def _summary(self, views: list[ArchitectureChangeView]) -> dict[str, Any]:
|
||||
return {
|
||||
"total": len(views),
|
||||
"small": len([v for v in views if v.level == "small"]),
|
||||
"medium": len([v for v in views if v.level == "medium"]),
|
||||
"large": len([v for v in views if v.level == "large"]),
|
||||
"waiting_owner_approval": len([v for v in views if v.status == "waiting_owner_approval"]),
|
||||
"auto_allowed": len([v for v in views if v.auto_implement_allowed]),
|
||||
"version_bumps": sorted({v.version_bump for v in views if v.version_bump and v.version_bump != "NONE"}),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["ArchitectureChangeView", "ArchitectureChangeDashboard"]
|
||||
@@ -0,0 +1,89 @@
|
||||
"""Owner approval gate for architecture changes.
|
||||
|
||||
Architecture changes may be proposed, reviewed and optimized by agents, but they
|
||||
must not be implemented until owner approval is recorded. This gate sits before
|
||||
implementation and before promotion.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureOwnerApprovalRequest:
|
||||
request_id: str
|
||||
change_id: str
|
||||
title: str
|
||||
reason: str
|
||||
risk: str
|
||||
architect_decision: str
|
||||
status: str = "pending_owner_approval"
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureOwnerDecision:
|
||||
request_id: str
|
||||
change_id: str
|
||||
decision: str
|
||||
decided_by: str
|
||||
reason: str = ""
|
||||
decided_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class ArchitectureOwnerGate:
|
||||
"""Blocks architecture implementation until owner explicitly approves."""
|
||||
|
||||
def create_request(self, change: dict[str, Any], architect_decision: dict[str, Any]) -> ArchitectureOwnerApprovalRequest:
|
||||
return ArchitectureOwnerApprovalRequest(
|
||||
request_id=f"ARCH-OWNER-{change.get('change_id', change.get('id', 'unknown'))}",
|
||||
change_id=change.get("change_id", change.get("id", "unknown")),
|
||||
title=change.get("title", "architecture change"),
|
||||
reason=change.get("reason", "architecture impact requires owner approval"),
|
||||
risk=change.get("risk", "medium"),
|
||||
architect_decision=architect_decision.get("status", "reviewed"),
|
||||
)
|
||||
|
||||
def can_implement(self, request: dict[str, Any], decision: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
if not decision:
|
||||
return {
|
||||
"allowed": False,
|
||||
"status": "waiting_owner_approval",
|
||||
"reason": "architecture change requires owner approval before implementation",
|
||||
"request": request,
|
||||
}
|
||||
if decision.get("decision") == "approved":
|
||||
return {
|
||||
"allowed": True,
|
||||
"status": "owner_approved",
|
||||
"reason": decision.get("reason", "approved by owner"),
|
||||
"request": request,
|
||||
"decision": decision,
|
||||
}
|
||||
return {
|
||||
"allowed": False,
|
||||
"status": "owner_rejected",
|
||||
"reason": decision.get("reason", "rejected by owner"),
|
||||
"request": request,
|
||||
"decision": decision,
|
||||
}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"ArchitectureOwnerApprovalRequest",
|
||||
"ArchitectureOwnerDecision",
|
||||
"ArchitectureOwnerGate",
|
||||
]
|
||||
@@ -0,0 +1,79 @@
|
||||
"""HTTP handler and display data for architecture owner gate."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .architecture_owner_gate import ArchitectureOwnerGate, ArchitectureOwnerApprovalRequest
|
||||
|
||||
|
||||
gate = ArchitectureOwnerGate()
|
||||
|
||||
# In-memory store for pending approval requests
|
||||
_pending_requests: dict[str, dict[str, Any]] = {}
|
||||
_decisions: dict[str, dict[str, Any]] = {}
|
||||
|
||||
|
||||
def create_owner_approval_request(change: dict[str, Any], architect_decision: dict[str, Any]) -> dict[str, Any]:
|
||||
req = gate.create_request(change, architect_decision)
|
||||
d = asdict(req)
|
||||
_pending_requests[req.change_id] = d
|
||||
return d
|
||||
|
||||
|
||||
def approve_request(change_id: str, decided_by: str = "owner", reason: str = "") -> dict[str, Any]:
|
||||
req = _pending_requests.get(change_id)
|
||||
if not req:
|
||||
return {"error": f"no pending request for change_id={change_id}"}
|
||||
decision = asdict(
|
||||
ArchitectureOwnerApprovalRequest.__bases__[1].__new__(type("_ArchitectureOwnerDecision", (), {})) # noqa
|
||||
)
|
||||
try:
|
||||
from .architecture_owner_gate import ArchitectureOwnerDecision
|
||||
dec = ArchitectureOwnerDecision(
|
||||
request_id=req["request_id"],
|
||||
change_id=change_id,
|
||||
decision="approved",
|
||||
decided_by=decided_by,
|
||||
reason=reason,
|
||||
)
|
||||
d = asdict(dec)
|
||||
_decisions[change_id] = d
|
||||
# remove from pending
|
||||
_pending_requests.pop(change_id, None)
|
||||
return {"allowed": True, "decision": d}
|
||||
except Exception as exc:
|
||||
return {"error": str(exc)}
|
||||
|
||||
|
||||
def reject_request(change_id: str, decided_by: str = "owner", reason: str = "") -> dict[str, Any]:
|
||||
from .architecture_owner_gate import ArchitectureOwnerDecision
|
||||
req = _pending_requests.get(change_id)
|
||||
if not req:
|
||||
return {"error": f"no pending request for change_id={change_id}"}
|
||||
try:
|
||||
dec = ArchitectureOwnerDecision(
|
||||
request_id=req["request_id"],
|
||||
change_id=change_id,
|
||||
decision="rejected",
|
||||
decided_by=decided_by,
|
||||
reason=reason,
|
||||
)
|
||||
d = asdict(dec)
|
||||
_decisions[change_id] = d
|
||||
_pending_requests.pop(change_id, None)
|
||||
return {"allowed": False, "decision": d}
|
||||
except Exception as exc:
|
||||
return {"error": str(exc)}
|
||||
|
||||
|
||||
def get_owner_gate_overview() -> dict[str, Any]:
|
||||
return {
|
||||
"pending_requests": list(_pending_requests.values()),
|
||||
"decisions": list(_decisions.values()),
|
||||
"pending_count": len(_pending_requests),
|
||||
"approved_count": sum(1 for d in _decisions.values() if d.get("decision") == "approved"),
|
||||
"rejected_count": sum(1 for d in _decisions.values() if d.get("decision") == "rejected"),
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
"""Independent architecture optimization agent."""
|
||||
|
||||
from dataclasses import dataclass, asdict
|
||||
from datetime import datetime, timezone
|
||||
|
||||
|
||||
def utc_now():
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ArchitectureReview:
|
||||
agent: str
|
||||
decision: str
|
||||
findings: list[str]
|
||||
created_at: str = utc_now()
|
||||
|
||||
def to_dict(self):
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class ArchitectureReviewAgent:
|
||||
"""Reviews architecture changes from system-wide optimal perspective."""
|
||||
|
||||
def review(self, proposal: dict) -> ArchitectureReview:
|
||||
findings = [
|
||||
"dependency_impact_checked",
|
||||
"security_boundary_checked",
|
||||
"scalability_checked",
|
||||
"operability_checked",
|
||||
"rollback_strategy_checked",
|
||||
]
|
||||
return ArchitectureReview(
|
||||
"architecture-optimization-agent",
|
||||
"pass" if proposal.get("architecture_change") else "not_required",
|
||||
findings,
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["ArchitectureReviewAgent", "ArchitectureReview"]
|
||||
@@ -0,0 +1,355 @@
|
||||
"""Fail-closed access to the authoritative bare Git repository."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import urllib.parse
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
|
||||
_ALLOWED_COMMANDS = frozenset(
|
||||
{
|
||||
"cat-file",
|
||||
"config",
|
||||
"diff",
|
||||
"for-each-ref",
|
||||
"ls-remote",
|
||||
"merge-base",
|
||||
"push",
|
||||
"remote",
|
||||
"rev-parse",
|
||||
"show-ref",
|
||||
"tag",
|
||||
}
|
||||
)
|
||||
_OID_RE = re.compile(r"^[0-9a-f]{40}$")
|
||||
_MAX_OUTPUT = 1_048_576
|
||||
_TIMEOUT = 8.0
|
||||
|
||||
|
||||
class AuthoritativeGitError(RuntimeError):
|
||||
"""A fail-closed authoritative repository or ref query error."""
|
||||
|
||||
|
||||
class AuthoritativeGitNotFound(AuthoritativeGitError):
|
||||
"""A validated revision does not exist in the authoritative repository."""
|
||||
|
||||
|
||||
class AuthoritativeGitOutputTooLarge(AuthoritativeGitError):
|
||||
"""A controlled Git query exceeded the response-size boundary."""
|
||||
|
||||
|
||||
def _redact(text: str) -> str:
|
||||
value = str(text or "")
|
||||
value = re.sub(r"(?i)(authorization\s*[:=]\s*)(?:bearer|token)\s+\S+", r"\1REDACTED", value)
|
||||
value = re.sub(r"(?i)((?:access_)?token\s*[:=]\s*)\S+", r"\1REDACTED", value)
|
||||
value = re.sub(r"(?i)(https?://[^/\s:@]+:)[^@\s/]+@", r"\1REDACTED@", value)
|
||||
return value
|
||||
|
||||
|
||||
def _configured_path(git_dir: str | Path | None = None) -> Path:
|
||||
raw = str(git_dir or os.getenv("AIOS_GITOPS_AUTHORITATIVE_GIT_DIR", "")).strip()
|
||||
if not raw:
|
||||
raise AuthoritativeGitError("AUTHORITATIVE_REPOSITORY_UNAVAILABLE")
|
||||
path = Path(raw)
|
||||
if not path.is_absolute() or ".." in path.parts:
|
||||
raise AuthoritativeGitError("AUTHORITATIVE_REPOSITORY_UNAVAILABLE")
|
||||
try:
|
||||
resolved = path.resolve(strict=True)
|
||||
except OSError as exc:
|
||||
raise AuthoritativeGitError("AUTHORITATIVE_REPOSITORY_UNAVAILABLE") from exc
|
||||
if not resolved.is_dir():
|
||||
raise AuthoritativeGitError("AUTHORITATIVE_REPOSITORY_UNAVAILABLE")
|
||||
return resolved
|
||||
|
||||
|
||||
def _run(
|
||||
git_dir: Path,
|
||||
args: list[str],
|
||||
*,
|
||||
check: bool,
|
||||
timeout: float = _TIMEOUT,
|
||||
) -> subprocess.CompletedProcess[str]:
|
||||
if not args or args[0] not in _ALLOWED_COMMANDS:
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
try:
|
||||
result = subprocess.run(
|
||||
["git", "--git-dir", str(git_dir), *args],
|
||||
text=True,
|
||||
capture_output=True,
|
||||
timeout=timeout,
|
||||
env={**os.environ, "GIT_OPTIONAL_LOCKS": "0"},
|
||||
)
|
||||
except (OSError, subprocess.TimeoutExpired) as exc:
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED") from exc
|
||||
if len(result.stdout) + len(result.stderr) > _MAX_OUTPUT:
|
||||
raise AuthoritativeGitOutputTooLarge("GIT_OUTPUT_LIMIT_EXCEEDED")
|
||||
if check and result.returncode != 0:
|
||||
detail = _redact(result.stderr.strip() or result.stdout.strip())
|
||||
raise AuthoritativeGitError(
|
||||
"GIT_REF_QUERY_FAILED" + (f": {detail[:160]}" if detail else "")
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
def _repository_identity_from_remote(url: str) -> str:
|
||||
value = str(url or "").strip().split("?", 1)[0].rstrip("/")
|
||||
if not value:
|
||||
return ""
|
||||
if "://" in value:
|
||||
value = urllib.parse.urlparse(value).path
|
||||
elif ":" in value:
|
||||
value = value.rsplit(":", 1)[1]
|
||||
value = value.rsplit("@", 1)[-1].strip("/")
|
||||
value = re.sub(r"\.git$", "", value, flags=re.IGNORECASE)
|
||||
parts = [part for part in value.split("/") if part]
|
||||
if len(parts) >= 2:
|
||||
value = "/".join(parts[-2:])
|
||||
return value.strip("/").lower()
|
||||
|
||||
|
||||
def verify_repository(
|
||||
git_dir: str | Path | None = None,
|
||||
repository_identity: str | None = None,
|
||||
) -> tuple[Path, str]:
|
||||
path = _configured_path(git_dir)
|
||||
expected = str(
|
||||
repository_identity
|
||||
or os.getenv("AIOS_GITOPS_REPOSITORY_IDENTITY", "")
|
||||
).strip().strip("/")
|
||||
if not expected or expected.count("/") != 1:
|
||||
raise AuthoritativeGitError("REPOSITORY_IDENTITY_MISMATCH")
|
||||
bare = _run(path, ["rev-parse", "--is-bare-repository"], check=True)
|
||||
if bare.stdout.strip().lower() != "true":
|
||||
raise AuthoritativeGitError("AUTHORITATIVE_REPOSITORY_UNAVAILABLE")
|
||||
remote = _run(path, ["config", "--get", "remote.gitea.url"], check=False)
|
||||
actual = _repository_identity_from_remote(remote.stdout)
|
||||
if actual != expected.lower():
|
||||
raise AuthoritativeGitError("REPOSITORY_IDENTITY_MISMATCH")
|
||||
return path, expected
|
||||
|
||||
|
||||
def run_authoritative_git(
|
||||
args: list[str],
|
||||
*,
|
||||
check: bool = True,
|
||||
git_dir: str | Path | None = None,
|
||||
timeout: float = _TIMEOUT,
|
||||
) -> subprocess.CompletedProcess[str]:
|
||||
path, _ = verify_repository(git_dir=git_dir)
|
||||
return _run(path, list(args), check=check, timeout=timeout)
|
||||
|
||||
|
||||
def authoritative_head_oid(
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> str:
|
||||
result = run_authoritative_git(["rev-parse", "--verify", "refs/heads/main"], git_dir=git_dir)
|
||||
oid = result.stdout.strip().lower()
|
||||
if not _OID_RE.fullmatch(oid):
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
return oid
|
||||
|
||||
|
||||
def authoritative_tags(
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> list[dict[str, str | None]]:
|
||||
result = run_authoritative_git(
|
||||
[
|
||||
"for-each-ref",
|
||||
"refs/tags",
|
||||
"--format=%(refname:strip=2)\t%(objectname)\t%(objecttype)",
|
||||
],
|
||||
git_dir=git_dir,
|
||||
)
|
||||
tags: list[dict[str, str | None]] = []
|
||||
for line in result.stdout.splitlines():
|
||||
name, oid, object_type = (line.split("\t", 2) + ["", ""])[:3]
|
||||
if not name or not _OID_RE.fullmatch(oid.lower()):
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
peeled_result = run_authoritative_git(
|
||||
["rev-parse", "--verify", f"refs/tags/{name}^{{commit}}"],
|
||||
git_dir=git_dir,
|
||||
)
|
||||
peeled = peeled_result.stdout.strip().lower()
|
||||
if not _OID_RE.fullmatch(peeled):
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
tags.append(
|
||||
{
|
||||
"name": name,
|
||||
"tag_oid": oid.lower(),
|
||||
"object_type": object_type,
|
||||
"peeled_target_oid": peeled,
|
||||
}
|
||||
)
|
||||
return tags
|
||||
|
||||
|
||||
def authoritative_branches(
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> list[dict[str, str]]:
|
||||
result = run_authoritative_git(
|
||||
[
|
||||
"for-each-ref",
|
||||
"refs/heads",
|
||||
"--format=%(refname:strip=2)\t%(objectname)",
|
||||
],
|
||||
git_dir=git_dir,
|
||||
)
|
||||
branches: list[dict[str, str]] = []
|
||||
for line in result.stdout.splitlines():
|
||||
name, oid = (line.split("\t", 1) + [""])[:2]
|
||||
if not name or not _OID_RE.fullmatch(oid.lower()):
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
branches.append({"name": name, "oid": oid.lower()})
|
||||
return branches
|
||||
|
||||
|
||||
def authoritative_commit(
|
||||
oid: str,
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> str:
|
||||
value = str(oid or "").strip().lower()
|
||||
if not _OID_RE.fullmatch(value):
|
||||
raise ValueError("commit OID must be a full 40-character value")
|
||||
result = run_authoritative_git(
|
||||
["rev-parse", "--verify", f"{value}^{{commit}}"],
|
||||
git_dir=git_dir,
|
||||
)
|
||||
resolved = result.stdout.strip().lower()
|
||||
if resolved != value:
|
||||
raise AuthoritativeGitError("GIT_REF_QUERY_FAILED")
|
||||
return resolved
|
||||
|
||||
|
||||
def authoritative_lineage(
|
||||
ancestor: str,
|
||||
descendant: str,
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> None:
|
||||
authoritative_commit(ancestor, git_dir=git_dir)
|
||||
authoritative_commit(descendant, git_dir=git_dir)
|
||||
result = run_authoritative_git(
|
||||
["merge-base", "--is-ancestor", ancestor, descendant],
|
||||
check=False,
|
||||
git_dir=git_dir,
|
||||
)
|
||||
if result.returncode != 0:
|
||||
raise AuthoritativeGitError("evidence lineage mismatch")
|
||||
|
||||
|
||||
_SAFE_REF_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._/-]{0,239}$")
|
||||
|
||||
|
||||
def _safe_ref_name(value: str) -> bool:
|
||||
return bool(
|
||||
_SAFE_REF_RE.fullmatch(value)
|
||||
and ".." not in value
|
||||
and "//" not in value
|
||||
and "@{" not in value
|
||||
and not value.endswith(("/", ".", ".lock"))
|
||||
and not any(part in {"", ".", ".."} for part in value.split("/"))
|
||||
)
|
||||
|
||||
|
||||
def validate_git_revision(
|
||||
value: str,
|
||||
field: str,
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> str:
|
||||
revision = str(value or "").strip()
|
||||
if not revision or revision != str(value or "") or revision.startswith("-"):
|
||||
raise ValueError(f"invalid {field} revision")
|
||||
if _OID_RE.fullmatch(revision.lower()):
|
||||
try:
|
||||
return authoritative_commit(revision.lower(), git_dir=git_dir)
|
||||
except AuthoritativeGitError as exc:
|
||||
raise AuthoritativeGitNotFound(f"{field} revision not found") from exc
|
||||
if not _safe_ref_name(revision) or any(token in revision for token in ("^", "~", ":", "\\")):
|
||||
raise ValueError(f"invalid {field} revision")
|
||||
if revision.startswith("refs/"):
|
||||
if not revision.startswith(("refs/heads/", "refs/tags/")):
|
||||
raise ValueError(f"invalid {field} revision")
|
||||
candidates = [revision]
|
||||
else:
|
||||
candidates = [f"refs/heads/{revision}", f"refs/tags/{revision}"]
|
||||
matches: list[str] = []
|
||||
for candidate in candidates:
|
||||
result = run_authoritative_git(
|
||||
["rev-parse", "--verify", f"{candidate}^{{commit}}"],
|
||||
check=False,
|
||||
git_dir=git_dir,
|
||||
)
|
||||
oid = result.stdout.strip().lower()
|
||||
if result.returncode == 0 and _OID_RE.fullmatch(oid):
|
||||
matches.append(oid)
|
||||
if not matches:
|
||||
raise AuthoritativeGitNotFound(f"{field} revision not found")
|
||||
if len(set(matches)) != 1 or len(matches) != 1:
|
||||
raise ValueError(f"ambiguous {field} revision")
|
||||
return matches[0]
|
||||
|
||||
|
||||
def authoritative_diff(
|
||||
from_revision: str,
|
||||
to_revision: str,
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
) -> dict[str, object]:
|
||||
path, _ = verify_repository(git_dir=git_dir)
|
||||
from_oid = validate_git_revision(from_revision, "from", git_dir=path)
|
||||
to_oid = validate_git_revision(to_revision, "to", git_dir=path)
|
||||
args = ["diff", "--no-ext-diff", "--no-textconv", from_oid, to_oid]
|
||||
result = run_authoritative_git(args, git_dir=path)
|
||||
return {
|
||||
"code": 0,
|
||||
"stdout": result.stdout,
|
||||
"stderr": "",
|
||||
"cmd": ["git", f"--git-dir={path}", *args],
|
||||
"from_oid": from_oid,
|
||||
"to_oid": to_oid,
|
||||
}
|
||||
|
||||
|
||||
def repository_snapshot(
|
||||
*,
|
||||
git_dir: str | Path | None = None,
|
||||
repository_identity: str | None = None,
|
||||
) -> dict[str, object]:
|
||||
configured = bool(
|
||||
str(git_dir or os.getenv("AIOS_GITOPS_AUTHORITATIVE_GIT_DIR", "")).strip()
|
||||
)
|
||||
try:
|
||||
path, identity = verify_repository(
|
||||
git_dir=git_dir,
|
||||
repository_identity=repository_identity,
|
||||
)
|
||||
head = authoritative_head_oid(git_dir=path)
|
||||
return {
|
||||
"repository_available": True,
|
||||
"authoritative_git_dir_configured": configured,
|
||||
"authoritative_git_dir_readable": True,
|
||||
"authoritative_git_dir": str(path),
|
||||
"authoritative_head_oid": head,
|
||||
"repository_identity": identity,
|
||||
"query_error": None,
|
||||
}
|
||||
except (AuthoritativeGitError, ValueError) as exc:
|
||||
return {
|
||||
"repository_available": False,
|
||||
"authoritative_git_dir_configured": configured,
|
||||
"authoritative_git_dir_readable": False,
|
||||
"authoritative_git_dir": None,
|
||||
"authoritative_head_oid": None,
|
||||
"repository_identity": str(
|
||||
repository_identity
|
||||
or os.getenv("AIOS_GITOPS_REPOSITORY_IDENTITY", "")
|
||||
).strip() or None,
|
||||
"query_error": _redact(str(exc)),
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
"""Autonomous self-loop orchestration primitives.
|
||||
|
||||
Goal: detect gaps, classify risk, plan remediation, run checks, and emit an
|
||||
approval-aware report without storing secrets or bypassing owner governance.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SelfLoopSignal:
|
||||
name: str
|
||||
status: str
|
||||
severity: str = "info"
|
||||
detail: str = ""
|
||||
|
||||
def ok(self) -> bool:
|
||||
return self.status in {"ok", "done", "pass"}
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class RemediationStep:
|
||||
id: str
|
||||
title: str
|
||||
action: str
|
||||
risk: str = "low"
|
||||
requires_owner_approval: bool = False
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class SelfLoopReport:
|
||||
id: str
|
||||
status: str
|
||||
signals: list[SelfLoopSignal] = field(default_factory=list)
|
||||
remediation: list[RemediationStep] = field(default_factory=list)
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"id": self.id,
|
||||
"status": self.status,
|
||||
"signals": [s.to_dict() for s in self.signals],
|
||||
"remediation": [r.to_dict() for r in self.remediation],
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class AutonomousSelfLoop:
|
||||
def __init__(self, owner_approval_required: bool = True):
|
||||
self.owner_approval_required = owner_approval_required
|
||||
|
||||
def probe(self, runtime: dict[str, Any], baseline: dict[str, Any]) -> list[SelfLoopSignal]:
|
||||
return [
|
||||
SelfLoopSignal("runtime_active", "ok" if runtime.get("status") == "active" else "fail", "critical"),
|
||||
SelfLoopSignal("git_patch_only", "ok" if baseline.get("update_mode") == "git_patch_only" else "fail", "high"),
|
||||
SelfLoopSignal("no_direct_main_push", "ok" if not baseline.get("codex_gitops", {}).get("direct_main_push", True) else "fail", "high"),
|
||||
SelfLoopSignal("autonomous_recovery_loop", "ok" if baseline.get("features", {}).get("autonomous_recovery_loop") else "fail", "high"),
|
||||
SelfLoopSignal("portal_gitops_dashboard", "ok" if baseline.get("features", {}).get("portal_gitops_dashboard") else "fail", "medium"),
|
||||
]
|
||||
|
||||
def plan(self, signals: list[SelfLoopSignal]) -> list[RemediationStep]:
|
||||
steps: list[RemediationStep] = []
|
||||
failed = {s.name for s in signals if not s.ok()}
|
||||
if "runtime_active" in failed:
|
||||
steps.append(RemediationStep("restart-runtime", "恢复 GitOps Runtime", "request-runtime-recovery", "high", True))
|
||||
if "git_patch_only" in failed:
|
||||
steps.append(RemediationStep("enforce-git-patch", "恢复 git_patch_only 更新模式", "commit-policy-patch", "high", True))
|
||||
if "no_direct_main_push" in failed:
|
||||
steps.append(RemediationStep("disable-direct-main", "禁止直接推送 main", "commit-security-policy", "high", True))
|
||||
if "autonomous_recovery_loop" in failed:
|
||||
steps.append(RemediationStep("enable-recovery-loop", "启用自动恢复闭环", "commit-runtime-config", "medium", True))
|
||||
if "portal_gitops_dashboard" in failed:
|
||||
steps.append(RemediationStep("enable-portal-dashboard", "启用 Portal GitOps 驾驶舱", "commit-portal-config", "medium", True))
|
||||
if not steps:
|
||||
steps.append(RemediationStep("continue-implementation", "继续补齐 Router/UI/OpenAPI/验收", "create-low-risk-patch", "low", False))
|
||||
return steps
|
||||
|
||||
def evaluate(self, runtime: dict[str, Any], baseline: dict[str, Any]) -> SelfLoopReport:
|
||||
signals = self.probe(runtime, baseline)
|
||||
remediation = self.plan(signals)
|
||||
status = "done" if all(s.ok() for s in signals) and not any(r.requires_owner_approval for r in remediation) else "partial"
|
||||
return SelfLoopReport("self-loop-report", status, signals, remediation)
|
||||
|
||||
def acceptance(self, report: SelfLoopReport) -> dict[str, Any]:
|
||||
approval_blocked = any(step.requires_owner_approval for step in report.remediation)
|
||||
return {
|
||||
"status": report.status,
|
||||
"can_unattended_continue": report.status == "done" and not approval_blocked,
|
||||
"owner_approval_required": approval_blocked or self.owner_approval_required,
|
||||
"report": report.to_dict(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["SelfLoopSignal", "RemediationStep", "SelfLoopReport", "AutonomousSelfLoop"]
|
||||
@@ -0,0 +1,103 @@
|
||||
"""Change acceptance governance for AIOS.
|
||||
|
||||
Every feature change must provide matching tests. Every architecture change must
|
||||
be reviewed by an independent architecture agent. User-facing changes must be
|
||||
validated by an independent user acceptance agent.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ChangeDescriptor:
|
||||
change_id: str
|
||||
change_type: str
|
||||
title: str
|
||||
files_changed: list[str]
|
||||
tests: list[str] = field(default_factory=list)
|
||||
user_facing: bool = False
|
||||
architecture_impact: bool = False
|
||||
risk: str = "low"
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AcceptanceFinding:
|
||||
check: str
|
||||
status: str
|
||||
detail: str
|
||||
required: bool = True
|
||||
|
||||
def passed(self) -> bool:
|
||||
return self.status == "pass" or not self.required
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AcceptanceDecision:
|
||||
status: str
|
||||
findings: list[AcceptanceFinding]
|
||||
decided_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"findings": [f.to_dict() for f in self.findings],
|
||||
"decided_at": self.decided_at,
|
||||
}
|
||||
|
||||
|
||||
class ChangeAcceptanceGate:
|
||||
def evaluate(self, change: ChangeDescriptor) -> AcceptanceDecision:
|
||||
findings: list[AcceptanceFinding] = []
|
||||
findings.append(self._tests_required(change))
|
||||
findings.append(self._user_acceptance_required(change))
|
||||
findings.append(self._architecture_review_required(change))
|
||||
findings.append(self._risk_gate(change))
|
||||
status = "pass" if all(f.passed() for f in findings) else "blocked"
|
||||
return AcceptanceDecision(status, findings)
|
||||
|
||||
def _tests_required(self, change: ChangeDescriptor) -> AcceptanceFinding:
|
||||
if change.tests:
|
||||
return AcceptanceFinding("tests_present", "pass", "matching tests declared")
|
||||
return AcceptanceFinding("tests_present", "fail", "every feature change requires tests")
|
||||
|
||||
def _user_acceptance_required(self, change: ChangeDescriptor) -> AcceptanceFinding:
|
||||
if not change.user_facing:
|
||||
return AcceptanceFinding("user_acceptance", "pass", "not user-facing")
|
||||
has_user_test = any("user" in t.lower() or "acceptance" in t.lower() for t in change.tests)
|
||||
return AcceptanceFinding(
|
||||
"user_acceptance",
|
||||
"pass" if has_user_test else "fail",
|
||||
"user-facing change requires user acceptance test",
|
||||
)
|
||||
|
||||
def _architecture_review_required(self, change: ChangeDescriptor) -> AcceptanceFinding:
|
||||
if not change.architecture_impact:
|
||||
return AcceptanceFinding("architecture_review", "pass", "no architecture impact")
|
||||
has_arch_test = any("arch" in t.lower() or "architecture" in t.lower() for t in change.tests)
|
||||
return AcceptanceFinding(
|
||||
"architecture_review",
|
||||
"pass" if has_arch_test else "fail",
|
||||
"architecture change requires independent architect review artifact/test",
|
||||
)
|
||||
|
||||
def _risk_gate(self, change: ChangeDescriptor) -> AcceptanceFinding:
|
||||
if change.risk in {"low", "medium", "high"}:
|
||||
return AcceptanceFinding("risk_classified", "pass", f"risk={change.risk}")
|
||||
return AcceptanceFinding("risk_classified", "fail", "risk must be low/medium/high")
|
||||
|
||||
|
||||
__all__ = ["ChangeDescriptor", "AcceptanceFinding", "AcceptanceDecision", "ChangeAcceptanceGate"]
|
||||
@@ -0,0 +1,34 @@
|
||||
"""API for AIOS change governance dashboard."""
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .change_governance_dashboard import ChangeGovernanceDashboard
|
||||
|
||||
|
||||
dashboard = ChangeGovernanceDashboard()
|
||||
|
||||
|
||||
def get_change_governance_overview(changes: list[dict[str, Any]] | None = None):
|
||||
return dashboard.overview(changes)
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/governance", tags=["change-governance"])
|
||||
|
||||
@router.get("/overview", operation_id="getChangeGovernanceOverview")
|
||||
def overview():
|
||||
return get_change_governance_overview()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_change_governance_overview"]
|
||||
@@ -0,0 +1,93 @@
|
||||
"""Web UI dashboard model for AIOS change governance.
|
||||
|
||||
Shows test gates, user acceptance, architecture review, risk gates and release
|
||||
blocking status for human operators and owner review.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GovernanceMetric:
|
||||
key: str
|
||||
title: str
|
||||
value: Any
|
||||
status: str = "ok"
|
||||
detail: str = ""
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GovernancePanel:
|
||||
key: str
|
||||
title: str
|
||||
metrics: list[GovernanceMetric] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"key": self.key,
|
||||
"title": self.title,
|
||||
"metrics": [m.to_dict() for m in self.metrics],
|
||||
}
|
||||
|
||||
|
||||
class ChangeGovernanceDashboard:
|
||||
def overview(self, changes: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
changes = changes or []
|
||||
blocked = [c for c in changes if c.get("status") == "blocked"]
|
||||
waiting_arch = [c for c in changes if c.get("architecture_review") == "required"]
|
||||
waiting_user = [c for c in changes if c.get("user_acceptance") == "required"]
|
||||
missing_tests = [c for c in changes if not c.get("tests")]
|
||||
panels = [
|
||||
GovernancePanel(
|
||||
"test_gate",
|
||||
"测试 Gate",
|
||||
[
|
||||
GovernanceMetric("total_changes", "变更总数", len(changes)),
|
||||
GovernanceMetric("missing_tests", "缺少测试的变更", len(missing_tests), "warn" if missing_tests else "ok"),
|
||||
],
|
||||
),
|
||||
GovernancePanel(
|
||||
"user_acceptance",
|
||||
"用户验收 Agent",
|
||||
[
|
||||
GovernanceMetric("waiting_user_acceptance", "等待用户验收", len(waiting_user), "warn" if waiting_user else "ok"),
|
||||
],
|
||||
),
|
||||
GovernancePanel(
|
||||
"architecture_review",
|
||||
"架构师 Agent",
|
||||
[
|
||||
GovernanceMetric("waiting_architecture_review", "等待架构审查", len(waiting_arch), "warn" if waiting_arch else "ok"),
|
||||
],
|
||||
),
|
||||
GovernancePanel(
|
||||
"release_gate",
|
||||
"发布 Gate",
|
||||
[
|
||||
GovernanceMetric("blocked_changes", "阻塞发布的变更", len(blocked), "warn" if blocked else "ok"),
|
||||
],
|
||||
),
|
||||
]
|
||||
return {
|
||||
"module": "change-governance",
|
||||
"route": "/admin/ai-evolution/governance",
|
||||
"title": "AIOS 变更治理中心",
|
||||
"status": "attention_required" if blocked or missing_tests or waiting_arch or waiting_user else "healthy",
|
||||
"generated_at": utc_now(),
|
||||
"panels": [p.to_dict() for p in panels],
|
||||
"changes": changes,
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["GovernanceMetric", "GovernancePanel", "ChangeGovernanceDashboard"]
|
||||
@@ -1,192 +0,0 @@
|
||||
"""Failure memory for autonomous self-loop learning.
|
||||
|
||||
The memory keeps sanitized failure fingerprints, recurrence counters, and
|
||||
remediation hints. It is intentionally in-memory and serializable; production
|
||||
adapters can persist the exported dict to SQL/object storage without changing the
|
||||
learning contract. Secrets and raw tokens must never be stored here.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from hashlib import sha256
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
def _clean(value: str | None) -> str:
|
||||
if not value:
|
||||
return "unknown"
|
||||
cleaned = value.replace("\n", " ").replace("\r", " ").strip().lower()
|
||||
secret_markers = ("token", "password", "secret", "api_key", "private key")
|
||||
for marker in secret_markers:
|
||||
cleaned = cleaned.replace(marker, "redacted")
|
||||
return cleaned[:500]
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class FailureSignature:
|
||||
component: str
|
||||
reason: str
|
||||
fingerprint: str
|
||||
severity: str = "medium"
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class FailureRecord:
|
||||
signature: FailureSignature
|
||||
count: int = 0
|
||||
first_seen: str = field(default_factory=utc_now)
|
||||
last_seen: str = field(default_factory=utc_now)
|
||||
last_job_id: str | None = None
|
||||
examples: list[str] = field(default_factory=list)
|
||||
remediation_hints: list[str] = field(default_factory=list)
|
||||
resolved_count: int = 0
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"signature": self.signature.to_dict(),
|
||||
"count": self.count,
|
||||
"first_seen": self.first_seen,
|
||||
"last_seen": self.last_seen,
|
||||
"last_job_id": self.last_job_id,
|
||||
"examples": list(self.examples),
|
||||
"remediation_hints": list(self.remediation_hints),
|
||||
"resolved_count": self.resolved_count,
|
||||
"recurrence_score": self.recurrence_score(),
|
||||
}
|
||||
|
||||
def recurrence_score(self) -> float:
|
||||
if self.count <= 1:
|
||||
return 0.0
|
||||
unresolved = max(self.count - self.resolved_count, 0)
|
||||
return min(1.0, unresolved / max(self.count, 1))
|
||||
|
||||
|
||||
class FailureMemory:
|
||||
def __init__(self) -> None:
|
||||
self.records: dict[str, FailureRecord] = {}
|
||||
|
||||
def fingerprint(self, component: str, reason: str, detail: str | None = None) -> str:
|
||||
base = "::".join([_clean(component), _clean(reason), _clean(detail)])
|
||||
return sha256(base.encode("utf-8")).hexdigest()[:16]
|
||||
|
||||
def signature(self, component: str, reason: str, detail: str | None = None, severity: str = "medium") -> FailureSignature:
|
||||
return FailureSignature(
|
||||
component=_clean(component),
|
||||
reason=_clean(reason),
|
||||
fingerprint=self.fingerprint(component, reason, detail),
|
||||
severity=severity,
|
||||
)
|
||||
|
||||
def record_failure(
|
||||
self,
|
||||
component: str,
|
||||
reason: str,
|
||||
detail: str | None = None,
|
||||
severity: str = "medium",
|
||||
job_id: str | None = None,
|
||||
remediation_hint: str | None = None,
|
||||
) -> FailureRecord:
|
||||
sig = self.signature(component, reason, detail, severity)
|
||||
record = self.records.get(sig.fingerprint)
|
||||
if record is None:
|
||||
record = FailureRecord(signature=sig)
|
||||
self.records[sig.fingerprint] = record
|
||||
record.count += 1
|
||||
record.last_seen = utc_now()
|
||||
record.last_job_id = job_id
|
||||
if detail:
|
||||
example = _clean(detail)
|
||||
if example not in record.examples:
|
||||
record.examples.append(example)
|
||||
record.examples = record.examples[-5:]
|
||||
if remediation_hint and remediation_hint not in record.remediation_hints:
|
||||
record.remediation_hints.append(remediation_hint)
|
||||
record.remediation_hints = record.remediation_hints[-5:]
|
||||
return record
|
||||
|
||||
def record_from_job(self, job: dict[str, Any]) -> FailureRecord | None:
|
||||
status = job.get("status")
|
||||
if status in {"completed", "waiting_owner"}:
|
||||
return None
|
||||
reason = job.get("last_error") or status or "unknown_failure"
|
||||
return self.record_failure(
|
||||
component="self_loop_job",
|
||||
reason=reason,
|
||||
detail=str(job.get("result") or job.get("last_error") or ""),
|
||||
severity="high" if status == "failed" else "medium",
|
||||
job_id=job.get("id"),
|
||||
remediation_hint="inspect acceptance report and regenerate patch plan",
|
||||
)
|
||||
|
||||
def mark_resolved(self, fingerprint: str) -> bool:
|
||||
record = self.records.get(fingerprint)
|
||||
if not record:
|
||||
return False
|
||||
record.resolved_count += 1
|
||||
record.last_seen = utc_now()
|
||||
return True
|
||||
|
||||
def recurrence_score(self, fingerprint: str) -> float:
|
||||
record = self.records.get(fingerprint)
|
||||
return record.recurrence_score() if record else 0.0
|
||||
|
||||
def top_failures(self, limit: int = 5) -> list[dict[str, Any]]:
|
||||
ranked = sorted(
|
||||
self.records.values(),
|
||||
key=lambda record: (record.recurrence_score(), record.count, record.last_seen),
|
||||
reverse=True,
|
||||
)
|
||||
return [record.to_dict() for record in ranked[:limit]]
|
||||
|
||||
def suggest_remediation(self, fingerprint: str) -> list[str]:
|
||||
record = self.records.get(fingerprint)
|
||||
if not record:
|
||||
return []
|
||||
if record.remediation_hints:
|
||||
return list(record.remediation_hints)
|
||||
reason = record.signature.reason
|
||||
if "runtime" in reason:
|
||||
return ["run runtime health probe", "request owner-gated runtime recovery if probe fails"]
|
||||
if "acceptance" in reason or "test" in reason:
|
||||
return ["rerun acceptance pipeline", "generate targeted low-risk patch"]
|
||||
if "permission" in reason or "forbidden" in reason:
|
||||
return ["verify GitOps branch policy", "request owner review for permission drift"]
|
||||
return ["classify failure", "generate remediation plan", "keep owner gate for non-low-risk changes"]
|
||||
|
||||
def export(self) -> dict[str, Any]:
|
||||
return {
|
||||
"records": {fingerprint: record.to_dict() for fingerprint, record in self.records.items()},
|
||||
"top_failures": self.top_failures(),
|
||||
}
|
||||
|
||||
def load(self, data: dict[str, Any]) -> None:
|
||||
self.records.clear()
|
||||
for fingerprint, raw in data.get("records", {}).items():
|
||||
sig_raw = raw.get("signature", {})
|
||||
signature = FailureSignature(
|
||||
component=sig_raw.get("component", "unknown"),
|
||||
reason=sig_raw.get("reason", "unknown"),
|
||||
fingerprint=sig_raw.get("fingerprint", fingerprint),
|
||||
severity=sig_raw.get("severity", "medium"),
|
||||
)
|
||||
record = FailureRecord(signature=signature)
|
||||
record.count = int(raw.get("count", 0))
|
||||
record.first_seen = raw.get("first_seen", utc_now())
|
||||
record.last_seen = raw.get("last_seen", utc_now())
|
||||
record.last_job_id = raw.get("last_job_id")
|
||||
record.examples = list(raw.get("examples", []))[-5:]
|
||||
record.remediation_hints = list(raw.get("remediation_hints", []))[-5:]
|
||||
record.resolved_count = int(raw.get("resolved_count", 0))
|
||||
self.records[fingerprint] = record
|
||||
|
||||
|
||||
__all__ = ["FailureSignature", "FailureRecord", "FailureMemory"]
|
||||
@@ -1,98 +0,0 @@
|
||||
"""Persistence adapters for FailureMemory.
|
||||
|
||||
Stores sanitized failure memory snapshots. The adapter only persists exported
|
||||
FailureMemory dictionaries; it does not store secrets or raw runtime credentials.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import sqlite3
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from .failure_memory import FailureMemory
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class MemoryStoreStatus:
|
||||
status: str
|
||||
path: str
|
||||
records: int
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class JsonFailureMemoryStore:
|
||||
def __init__(self, path: str | Path):
|
||||
self.path = Path(path)
|
||||
|
||||
def save(self, memory: FailureMemory) -> MemoryStoreStatus:
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
data = memory.export()
|
||||
self.path.write_text(json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
return MemoryStoreStatus("saved", str(self.path), len(data.get("records", {})))
|
||||
|
||||
def load(self) -> FailureMemory:
|
||||
memory = FailureMemory()
|
||||
if not self.path.exists():
|
||||
return memory
|
||||
memory.load(json.loads(self.path.read_text(encoding="utf-8")))
|
||||
return memory
|
||||
|
||||
|
||||
class SQLiteFailureMemoryStore:
|
||||
def __init__(self, path: str | Path):
|
||||
self.path = Path(path)
|
||||
|
||||
def _connect(self):
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
conn = sqlite3.connect(str(self.path))
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS self_loop_failure_memory (
|
||||
fingerprint TEXT PRIMARY KEY,
|
||||
payload_json TEXT NOT NULL,
|
||||
updated_at TEXT NOT NULL
|
||||
)
|
||||
"""
|
||||
)
|
||||
return conn
|
||||
|
||||
def save(self, memory: FailureMemory) -> MemoryStoreStatus:
|
||||
data = memory.export().get("records", {})
|
||||
with self._connect() as conn:
|
||||
for fingerprint, payload in data.items():
|
||||
conn.execute(
|
||||
"""
|
||||
INSERT INTO self_loop_failure_memory (fingerprint, payload_json, updated_at)
|
||||
VALUES (?, ?, ?)
|
||||
ON CONFLICT(fingerprint) DO UPDATE SET
|
||||
payload_json = excluded.payload_json,
|
||||
updated_at = excluded.updated_at
|
||||
""",
|
||||
(fingerprint, json.dumps(payload, ensure_ascii=False), utc_now()),
|
||||
)
|
||||
return MemoryStoreStatus("saved", str(self.path), len(data))
|
||||
|
||||
def load(self) -> FailureMemory:
|
||||
memory = FailureMemory()
|
||||
if not self.path.exists():
|
||||
return memory
|
||||
records: dict[str, Any] = {}
|
||||
with self._connect() as conn:
|
||||
for fingerprint, payload_json in conn.execute("SELECT fingerprint, payload_json FROM self_loop_failure_memory"):
|
||||
records[fingerprint] = json.loads(payload_json)
|
||||
memory.load({"records": records})
|
||||
return memory
|
||||
|
||||
|
||||
__all__ = ["MemoryStoreStatus", "JsonFailureMemoryStore", "SQLiteFailureMemoryStore"]
|
||||
@@ -0,0 +1,36 @@
|
||||
"""Git repository location resolver with validation.
|
||||
|
||||
Prevents hard-coded repository names from silently pointing to stale paths.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
class GitRepoLocator:
|
||||
def __init__(self, root: str | None = None):
|
||||
self.root = Path(root or os.getenv("AIOS_GITOPS_ROOT", "/data/aios-gitops/runtime/gitea-bin/data/repositories"))
|
||||
|
||||
def candidates(self, owner: str = "aios", names: tuple[str, ...] = ("aios.git", "aios-v23.git")):
|
||||
return [self.root / owner / name for name in names]
|
||||
|
||||
def locate(self, owner: str = "aios") -> dict:
|
||||
found = [str(path) for path in self.candidates(owner) if path.exists()]
|
||||
return {
|
||||
"root": str(self.root),
|
||||
"owner": owner,
|
||||
"found": found,
|
||||
"healthy": len(found) == 1,
|
||||
"warning": "multiple repositories found" if len(found) > 1 else None,
|
||||
}
|
||||
|
||||
def require(self, owner: str = "aios") -> Path:
|
||||
result = self.locate(owner)
|
||||
if not result["healthy"]:
|
||||
raise RuntimeError(f"Git repo resolution failed: {result}")
|
||||
return Path(result["found"][0])
|
||||
|
||||
|
||||
__all__ = ["GitRepoLocator"]
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,59 +0,0 @@
|
||||
"""GitOps commit planning adapter for self-loop patches.
|
||||
|
||||
Creates commit intents and validates governance. Actual repository writes remain
|
||||
through the controlled GitOps Actions layer.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_patch_executor import PatchBundle
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class CommitIntent:
|
||||
branch: str
|
||||
message: str
|
||||
files: tuple[str, ...]
|
||||
direct_main_push: bool
|
||||
owner_approval_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class GitOpsCommitExecutor:
|
||||
"""Produces safe commit intents instead of bypassing GitOps controls."""
|
||||
|
||||
def prepare(self, bundle: PatchBundle) -> CommitIntent:
|
||||
if bundle.direct_main_push:
|
||||
raise ValueError("direct main push is forbidden")
|
||||
if not bundle.branch.startswith("patch/"):
|
||||
raise ValueError("only patch branches are allowed")
|
||||
return CommitIntent(
|
||||
branch=bundle.branch,
|
||||
message=f"Apply self-loop patch: {bundle.goal}",
|
||||
files=tuple(file.path for file in bundle.files),
|
||||
direct_main_push=False,
|
||||
owner_approval_required=bundle.owner_approval_required,
|
||||
)
|
||||
|
||||
def commit_result(self, intent: CommitIntent, revision: str | None = None) -> dict[str, Any]:
|
||||
return {
|
||||
"status": "ready" if not intent.owner_approval_required else "waiting_owner",
|
||||
"branch": intent.branch,
|
||||
"revision": revision,
|
||||
"commit": intent.to_dict(),
|
||||
"sync_required": True,
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["CommitIntent", "GitOpsCommitExecutor"]
|
||||
@@ -0,0 +1,148 @@
|
||||
"""Bridge governance agents into the unified Agent Event Bus.
|
||||
|
||||
This module emits normalized governance events for requirement changes,
|
||||
architecture reviews, user acceptance, test gates and version decisions. It uses
|
||||
duck typing so it can work with the unified AgentEventBus when available, while
|
||||
remaining testable without a running bus.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Protocol
|
||||
from uuid import uuid4
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class EventPublisher(Protocol):
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
...
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GovernanceEventEnvelope:
|
||||
id: str
|
||||
kind: str
|
||||
source: str
|
||||
target: str
|
||||
summary: str
|
||||
payload: dict[str, Any]
|
||||
correlation_id: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class InMemoryGovernanceEventBus:
|
||||
"""Small fallback bus for tests and offline governance runs."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.events: list[dict[str, Any]] = []
|
||||
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
event = GovernanceEventEnvelope(
|
||||
id=f"evt_{uuid4().hex[:12]}",
|
||||
kind=kind,
|
||||
source=source,
|
||||
target=target,
|
||||
summary=summary,
|
||||
payload=payload,
|
||||
correlation_id=correlation_id,
|
||||
).to_dict()
|
||||
self.events.append(event)
|
||||
return event
|
||||
|
||||
|
||||
class GovernanceEventBridge:
|
||||
"""Publishes governance lifecycle events to the Agent Event Bus."""
|
||||
|
||||
def __init__(self, bus: EventPublisher | None = None):
|
||||
self.bus = bus or InMemoryGovernanceEventBus()
|
||||
|
||||
def requirement_changed(self, requirement: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="requirement_changed",
|
||||
source=requirement.get("source", "unknown"),
|
||||
target="architect-agent",
|
||||
summary=requirement.get("requirement", "requirement changed"),
|
||||
payload=requirement,
|
||||
correlation_id=requirement.get("id"),
|
||||
)
|
||||
|
||||
def architecture_review_started(self, proposal: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="architecture_review_started",
|
||||
source="architect-agent",
|
||||
target="architecture-review-agent",
|
||||
summary=proposal.get("title", "architecture review started"),
|
||||
payload=proposal,
|
||||
correlation_id=proposal.get("change_id"),
|
||||
)
|
||||
|
||||
def architecture_review_completed(self, decision: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="architecture_review_completed",
|
||||
source="architecture-review-agent",
|
||||
target="change-governance",
|
||||
summary=f"architecture review {decision.get('status', 'completed')}",
|
||||
payload=decision,
|
||||
correlation_id=decision.get("change_id"),
|
||||
)
|
||||
|
||||
def user_acceptance_completed(self, report: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="user_acceptance_completed",
|
||||
source="user-acceptance-agent",
|
||||
target="change-governance",
|
||||
summary=f"user acceptance {report.get('decision', 'completed')}",
|
||||
payload=report,
|
||||
correlation_id=report.get("change_id"),
|
||||
)
|
||||
|
||||
def test_gate_completed(self, result: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="test_gate_completed",
|
||||
source="test-gate",
|
||||
target="change-governance",
|
||||
summary=f"test gate {result.get('status', 'completed')}",
|
||||
payload=result,
|
||||
correlation_id=result.get("change_id"),
|
||||
)
|
||||
|
||||
def version_decision_created(self, decision: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="version_decision_created",
|
||||
source="architect-agent",
|
||||
target="owner-gate",
|
||||
summary=f"version bump recommendation: {decision.get('version_bump', 'unknown')}",
|
||||
payload=decision,
|
||||
correlation_id=decision.get("change_id"),
|
||||
)
|
||||
|
||||
|
||||
__all__ = [
|
||||
"GovernanceEventEnvelope",
|
||||
"InMemoryGovernanceEventBus",
|
||||
"GovernanceEventBridge",
|
||||
]
|
||||
@@ -0,0 +1,32 @@
|
||||
"""API for governance timeline visualization."""
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .governance_timeline_dashboard import GovernanceTimelineDashboard
|
||||
|
||||
|
||||
dashboard = GovernanceTimelineDashboard()
|
||||
|
||||
|
||||
def get_governance_timeline(events=None):
|
||||
return dashboard.build(events)
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/governance", tags=["governance-timeline"])
|
||||
|
||||
@router.get("/timeline", operation_id="getGovernanceTimeline")
|
||||
def timeline():
|
||||
return get_governance_timeline()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_governance_timeline"]
|
||||
@@ -0,0 +1,106 @@
|
||||
"""Governance timeline dashboard.
|
||||
|
||||
Turns governance events into a human-readable flow for Web UI so operators can
|
||||
see why a change is blocked or ready for promotion.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
EVENT_ORDER = {
|
||||
"requirement_changed": 10,
|
||||
"architecture_review_started": 20,
|
||||
"architecture_review_completed": 30,
|
||||
"test_gate_completed": 40,
|
||||
"user_acceptance_completed": 50,
|
||||
"version_decision_created": 60,
|
||||
"owner_gate_completed": 70,
|
||||
"promotion_completed": 80,
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GovernanceTimelineStep:
|
||||
id: str
|
||||
kind: str
|
||||
title: str
|
||||
actor: str
|
||||
status: str
|
||||
timestamp: str
|
||||
correlation_id: str | None = None
|
||||
detail: dict[str, Any] = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class GovernanceTimelineDashboard:
|
||||
def build(self, events: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
events = events or []
|
||||
steps = [self._event_to_step(event) for event in events]
|
||||
steps.sort(key=lambda step: (EVENT_ORDER.get(step.kind, 999), step.timestamp))
|
||||
blockers = [step for step in steps if step.status in {"blocked", "fail", "attention_required"}]
|
||||
return {
|
||||
"module": "governance-timeline",
|
||||
"route": "/admin/ai-evolution/governance/timeline",
|
||||
"title": "治理事件时间线",
|
||||
"status": "attention_required" if blockers else "healthy",
|
||||
"generated_at": utc_now(),
|
||||
"steps": [step.to_dict() for step in steps],
|
||||
"blockers": [step.to_dict() for step in blockers],
|
||||
"flow": self._flow_summary(steps),
|
||||
}
|
||||
|
||||
def _event_to_step(self, event: dict[str, Any]) -> GovernanceTimelineStep:
|
||||
payload = event.get("payload", {})
|
||||
kind = event.get("kind", "unknown")
|
||||
return GovernanceTimelineStep(
|
||||
id=event.get("id", f"event-{len(str(event))}"),
|
||||
kind=kind,
|
||||
title=self._title(kind, payload),
|
||||
actor=event.get("source", payload.get("actor", "unknown")),
|
||||
status=payload.get("status") or payload.get("decision") or event.get("status", "ok"),
|
||||
timestamp=event.get("created_at") or payload.get("created_at") or utc_now(),
|
||||
correlation_id=event.get("correlation_id") or payload.get("change_id") or payload.get("id"),
|
||||
detail=payload,
|
||||
)
|
||||
|
||||
def _title(self, kind: str, payload: dict[str, Any]) -> str:
|
||||
titles = {
|
||||
"requirement_changed": "需求变化",
|
||||
"architecture_review_started": "架构审查开始",
|
||||
"architecture_review_completed": "架构审查完成",
|
||||
"test_gate_completed": "测试 Gate 完成",
|
||||
"user_acceptance_completed": "用户验收完成",
|
||||
"version_decision_created": "版本建议产生",
|
||||
"owner_gate_completed": "Owner Gate 完成",
|
||||
"promotion_completed": "Promotion 完成",
|
||||
}
|
||||
return payload.get("title") or payload.get("summary") or titles.get(kind, kind)
|
||||
|
||||
def _flow_summary(self, steps: list[GovernanceTimelineStep]) -> dict[str, Any]:
|
||||
present = {step.kind for step in steps}
|
||||
required = [
|
||||
"requirement_changed",
|
||||
"architecture_review_completed",
|
||||
"test_gate_completed",
|
||||
"user_acceptance_completed",
|
||||
"version_decision_created",
|
||||
]
|
||||
missing = [kind for kind in required if kind not in present]
|
||||
return {
|
||||
"required_steps": required,
|
||||
"missing_steps": missing,
|
||||
"ready_for_owner_gate": not missing,
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["GovernanceTimelineStep", "GovernanceTimelineDashboard"]
|
||||
@@ -0,0 +1,59 @@
|
||||
"""Independent acceptance agents.
|
||||
|
||||
Simulates independent roles: user representative and architecture reviewer.
|
||||
They provide acceptance evidence, not implementation decisions.
|
||||
"""
|
||||
|
||||
from dataclasses import dataclass, asdict
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now():
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AcceptanceReport:
|
||||
agent: str
|
||||
role: str
|
||||
decision: str
|
||||
evidence: list[str]
|
||||
created_at: str = utc_now()
|
||||
|
||||
def to_dict(self):
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class UserAcceptanceAgent:
|
||||
def review(self, change: dict[str, Any]) -> AcceptanceReport:
|
||||
checks = [
|
||||
"user_requirement_match",
|
||||
"user_workflow_validation",
|
||||
"permission_visibility_check",
|
||||
]
|
||||
return AcceptanceReport(
|
||||
"user-acceptance-agent",
|
||||
"user_representative",
|
||||
"pass" if change.get("user_facing") else "not_required",
|
||||
checks,
|
||||
)
|
||||
|
||||
|
||||
class ArchitectureAcceptanceAgent:
|
||||
def review(self, change: dict[str, Any]) -> AcceptanceReport:
|
||||
checks = [
|
||||
"architecture_consistency",
|
||||
"scalability_review",
|
||||
"security_boundary_review",
|
||||
"operability_review",
|
||||
]
|
||||
return AcceptanceReport(
|
||||
"architecture-review-agent",
|
||||
"system_architect",
|
||||
"pass" if change.get("architecture_impact") else "not_required",
|
||||
checks,
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["AcceptanceReport", "UserAcceptanceAgent", "ArchitectureAcceptanceAgent"]
|
||||
@@ -0,0 +1,167 @@
|
||||
"""Fail-closed operation authorization for an isolated Git writer."""
|
||||
from __future__ import annotations
|
||||
|
||||
import ipaddress
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from isolated_writer_token_registry import TokenRegistry
|
||||
|
||||
|
||||
ROUTE_OPERATIONS = {
|
||||
("GET", "/api/runtime-status"): "runtime.status.read",
|
||||
("GET", "/api/baseline"): "baseline.read",
|
||||
("GET", "/api/patches"): "patches.read",
|
||||
("POST", "/api/commit-file"): "commit_file.atomic",
|
||||
}
|
||||
OID_RE = re.compile(r"[0-9a-f]{40}")
|
||||
|
||||
|
||||
class AuthorizationError(PermissionError):
|
||||
def __init__(self, code: str, status: int = 403):
|
||||
super().__init__(code)
|
||||
self.code = code
|
||||
self.status = status
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AuthorizedGrant:
|
||||
record: dict[str, Any]
|
||||
operation: str
|
||||
use_count: int
|
||||
|
||||
@property
|
||||
def token_id(self) -> str:
|
||||
return str(self.record["token_id"])
|
||||
|
||||
@property
|
||||
def task_id(self) -> str:
|
||||
return str(self.record["task_id"])
|
||||
|
||||
|
||||
def operation_for(method: str, path: str) -> str:
|
||||
operation = ROUTE_OPERATIONS.get((method.upper(), path))
|
||||
if not operation:
|
||||
raise AuthorizationError("isolated_writer_operation_forbidden")
|
||||
return operation
|
||||
|
||||
|
||||
def _parse_time(value: Any) -> datetime:
|
||||
try:
|
||||
parsed = datetime.fromisoformat(str(value).replace("Z", "+00:00"))
|
||||
except (TypeError, ValueError):
|
||||
raise AuthorizationError("writer_token_time_invalid") from None
|
||||
if parsed.tzinfo is None:
|
||||
raise AuthorizationError("writer_token_time_invalid")
|
||||
return parsed.astimezone(timezone.utc)
|
||||
|
||||
|
||||
def _git_is_ancestor(workspace: Path, base: str, branch: str) -> bool:
|
||||
result = subprocess.run(
|
||||
["git", "merge-base", "--is-ancestor", base, branch],
|
||||
cwd=workspace,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
return result.returncode == 0
|
||||
|
||||
|
||||
def _validate_grant(
|
||||
grant: dict[str, Any],
|
||||
*,
|
||||
audience: str,
|
||||
source_ip: str,
|
||||
operation: str,
|
||||
branch: str | None,
|
||||
path: str | None,
|
||||
workspace: Path,
|
||||
current_time: datetime,
|
||||
) -> None:
|
||||
if int(grant.get("schema_version", 0)) != 2:
|
||||
raise AuthorizationError("writer_token_policy_v2_required", 401)
|
||||
if str(grant.get("audience") or "") != audience:
|
||||
raise AuthorizationError("writer_token_audience_rejected")
|
||||
try:
|
||||
peer = ipaddress.ip_address(source_ip)
|
||||
networks = [ipaddress.ip_network(str(value), strict=True) for value in grant.get("source_cidrs", [])]
|
||||
except ValueError:
|
||||
raise AuthorizationError("writer_token_source_rejected") from None
|
||||
if not networks or not any(peer in network for network in networks):
|
||||
raise AuthorizationError("writer_token_source_rejected")
|
||||
created = _parse_time(grant.get("created_at"))
|
||||
not_before = _parse_time(grant.get("not_before"))
|
||||
expires = _parse_time(grant.get("expires_at"))
|
||||
if expires <= not_before or (expires - created).total_seconds() > 1800:
|
||||
raise AuthorizationError("writer_token_lifetime_rejected")
|
||||
if current_time < not_before:
|
||||
raise AuthorizationError("writer_token_not_yet_valid", 401)
|
||||
if current_time >= expires:
|
||||
raise AuthorizationError("writer_token_expired", 401)
|
||||
if bool(grant.get("revoked")):
|
||||
raise AuthorizationError("writer_token_revoked", 401)
|
||||
operations = grant.get("allowed_operations")
|
||||
if not isinstance(operations, list) or operation not in operations:
|
||||
raise AuthorizationError("writer_token_operation_rejected")
|
||||
expected_branch = str(grant.get("allowed_branch") or "")
|
||||
configured_branch = os.getenv("AIOS_GITOPS_ALLOWED_BRANCH", "")
|
||||
if expected_branch != configured_branch:
|
||||
raise AuthorizationError("writer_token_branch_rejected")
|
||||
if branch is not None and branch != expected_branch:
|
||||
raise AuthorizationError("writer_token_branch_rejected")
|
||||
if path is not None:
|
||||
paths = grant.get("allowed_paths")
|
||||
if not isinstance(paths, list) or path not in paths:
|
||||
raise AuthorizationError("writer_token_path_rejected")
|
||||
base = str(grant.get("approved_base_oid") or "").lower()
|
||||
if not OID_RE.fullmatch(base):
|
||||
raise AuthorizationError("writer_token_base_rejected")
|
||||
if not _git_is_ancestor(workspace, base, expected_branch):
|
||||
raise AuthorizationError("writer_token_base_not_ancestor")
|
||||
|
||||
|
||||
def authorize(
|
||||
registry: TokenRegistry,
|
||||
token: str,
|
||||
*,
|
||||
method: str,
|
||||
path: str,
|
||||
source_ip: str,
|
||||
workspace: Path,
|
||||
branch: str | None = None,
|
||||
target_path: str | None = None,
|
||||
current_time: datetime | None = None,
|
||||
) -> AuthorizedGrant:
|
||||
if os.getenv("AIOS_GITOPS_TOKEN_POLICY_VERSION_REQUIRED", "") != "2":
|
||||
raise AuthorizationError("writer_token_policy_v2_not_required")
|
||||
if not token:
|
||||
raise AuthorizationError("unauthorized", 401)
|
||||
grant = registry.find(token)
|
||||
if grant is None:
|
||||
raise AuthorizationError("unauthorized", 401)
|
||||
operation = operation_for(method, path)
|
||||
_validate_grant(
|
||||
grant,
|
||||
audience=os.getenv("AIOS_GITOPS_SERVICE_AUDIENCE", ""),
|
||||
source_ip=source_ip,
|
||||
operation=operation,
|
||||
branch=branch,
|
||||
path=target_path,
|
||||
workspace=workspace,
|
||||
current_time=current_time or datetime.now(timezone.utc),
|
||||
)
|
||||
limits = grant.get("max_uses")
|
||||
if not isinstance(limits, dict):
|
||||
raise AuthorizationError("writer_token_use_limit_missing")
|
||||
try:
|
||||
used = registry.consume(str(grant["token_id"]), operation, int(limits[operation]))
|
||||
except (KeyError, TypeError, ValueError):
|
||||
raise AuthorizationError("writer_token_use_limit_missing") from None
|
||||
except PermissionError as exc:
|
||||
code = str(exc)
|
||||
raise AuthorizationError(code, 401 if code == "writer_token_revoked" else 403) from None
|
||||
return AuthorizedGrant(grant, operation, used)
|
||||
@@ -0,0 +1,403 @@
|
||||
"""Atomic, idempotent commit-file Saga for the isolated writer."""
|
||||
from __future__ import annotations
|
||||
|
||||
import fcntl
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sqlite3
|
||||
import subprocess
|
||||
import tempfile
|
||||
import threading
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import aios_isolated_writer_policy as policy
|
||||
|
||||
|
||||
OID_RE = re.compile(r"[0-9a-f]{40}")
|
||||
IDEMPOTENCY_RE = re.compile(r"[A-Za-z0-9][A-Za-z0-9._:-]{7,127}")
|
||||
STATES = frozenset({
|
||||
"PENDING", "FILE_WRITTEN", "COMMITTED", "PUSHED", "VERIFIED", "COMPLETED",
|
||||
"FAILED_RECOVERABLE", "MANUAL_REVIEW_REQUIRED",
|
||||
})
|
||||
_LOCKS: dict[str, threading.Lock] = {}
|
||||
_LOCKS_GUARD = threading.Lock()
|
||||
_LEDGER_INIT_LOCK = threading.Lock()
|
||||
|
||||
|
||||
class CommitFileError(RuntimeError):
|
||||
def __init__(self, code: str, status: int = 400):
|
||||
super().__init__(code)
|
||||
self.code = code
|
||||
self.status = status
|
||||
|
||||
|
||||
class SimulatedCrash(RuntimeError):
|
||||
pass
|
||||
|
||||
|
||||
def canonical_digest(data: dict[str, Any]) -> str:
|
||||
payload = {
|
||||
"branch": data["branch"],
|
||||
"path": data["path"],
|
||||
"content_sha256": hashlib.sha256(data["content"].encode("utf-8")).hexdigest(),
|
||||
"message": data["message"],
|
||||
"expected_head_oid": data["expected_head_oid"],
|
||||
}
|
||||
encoded = json.dumps(payload, sort_keys=True, separators=(",", ":")).encode("utf-8")
|
||||
return hashlib.sha256(encoded).hexdigest()
|
||||
|
||||
|
||||
class OperationLedger:
|
||||
def __init__(self, path: Path | str):
|
||||
self.path = Path(path)
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
if self.path.parent.is_symlink() or self.path.is_symlink():
|
||||
raise PermissionError("writer_operation_ledger_symlink_rejected")
|
||||
with _LEDGER_INIT_LOCK:
|
||||
with self.connect() as db:
|
||||
db.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS writer_operations (
|
||||
operation_id TEXT PRIMARY KEY,
|
||||
token_id TEXT NOT NULL,
|
||||
task_id TEXT NOT NULL,
|
||||
idempotency_key TEXT NOT NULL UNIQUE,
|
||||
operation_digest TEXT NOT NULL,
|
||||
branch TEXT NOT NULL,
|
||||
path TEXT NOT NULL,
|
||||
content_sha256 TEXT NOT NULL,
|
||||
pre_head_oid TEXT NOT NULL,
|
||||
commit_oid TEXT,
|
||||
push_status TEXT,
|
||||
verification_status TEXT,
|
||||
state TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
error_code TEXT
|
||||
)
|
||||
"""
|
||||
)
|
||||
os.chmod(self.path, 0o600)
|
||||
|
||||
def connect(self) -> sqlite3.Connection:
|
||||
db = sqlite3.connect(self.path, timeout=30)
|
||||
db.row_factory = sqlite3.Row
|
||||
db.execute("PRAGMA journal_mode=WAL")
|
||||
db.execute("PRAGMA synchronous=FULL")
|
||||
return db
|
||||
|
||||
def get_or_create(self, grant: Any, data: dict[str, Any], digest: str) -> dict[str, Any]:
|
||||
key = data["idempotency_key"]
|
||||
with self.connect() as db:
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
row = db.execute(
|
||||
"SELECT * FROM writer_operations WHERE idempotency_key=?", (key,)
|
||||
).fetchone()
|
||||
if row:
|
||||
db.commit()
|
||||
record = dict(row)
|
||||
if record["operation_digest"] != digest:
|
||||
raise CommitFileError("writer_idempotency_conflict", 409)
|
||||
if (
|
||||
record["token_id"] != grant.token_id
|
||||
or record["task_id"] != grant.task_id
|
||||
):
|
||||
raise CommitFileError("writer_idempotency_owner_conflict", 409)
|
||||
return record
|
||||
operation_id = hashlib.sha256(
|
||||
f"{grant.task_id}\0{key}".encode("utf-8")
|
||||
).hexdigest()
|
||||
content_sha = hashlib.sha256(data["content"].encode("utf-8")).hexdigest()
|
||||
db.execute(
|
||||
"""
|
||||
INSERT INTO writer_operations(
|
||||
operation_id,token_id,task_id,idempotency_key,operation_digest,
|
||||
branch,path,content_sha256,pre_head_oid,state
|
||||
) VALUES(?,?,?,?,?,?,?,?,?,?)
|
||||
""",
|
||||
(
|
||||
operation_id, grant.token_id, grant.task_id, key, digest,
|
||||
data["branch"], data["path"], content_sha,
|
||||
data["expected_head_oid"], "PENDING",
|
||||
),
|
||||
)
|
||||
db.commit()
|
||||
return self.get(key)
|
||||
|
||||
def get(self, key: str) -> dict[str, Any]:
|
||||
with self.connect() as db:
|
||||
row = db.execute(
|
||||
"SELECT * FROM writer_operations WHERE idempotency_key=?", (key,)
|
||||
).fetchone()
|
||||
if row is None:
|
||||
raise KeyError(key)
|
||||
return dict(row)
|
||||
|
||||
def update(self, key: str, state: str, **fields: Any) -> dict[str, Any]:
|
||||
if state not in STATES:
|
||||
raise ValueError("invalid writer operation state")
|
||||
allowed = {"commit_oid", "push_status", "verification_status", "error_code"}
|
||||
assignments = ["state=?", "updated_at=CURRENT_TIMESTAMP"]
|
||||
values: list[Any] = [state]
|
||||
for name, value in fields.items():
|
||||
if name not in allowed:
|
||||
raise ValueError("invalid ledger field")
|
||||
assignments.append(f"{name}=?")
|
||||
values.append(value)
|
||||
values.append(key)
|
||||
with self.connect() as db:
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
db.execute(
|
||||
f"UPDATE writer_operations SET {','.join(assignments)} WHERE idempotency_key=?",
|
||||
values,
|
||||
)
|
||||
db.commit()
|
||||
return self.get(key)
|
||||
|
||||
|
||||
class AtomicCommitFile:
|
||||
def __init__(
|
||||
self,
|
||||
*,
|
||||
workspace: Path,
|
||||
bare_repo: Path,
|
||||
ledger: OperationLedger,
|
||||
remote: str,
|
||||
audit,
|
||||
crash_after_state: str | None = None,
|
||||
):
|
||||
self.workspace = workspace
|
||||
self.bare_repo = bare_repo
|
||||
self.ledger = ledger
|
||||
self.remote = remote
|
||||
self.audit = audit
|
||||
self.crash_after_state = crash_after_state
|
||||
|
||||
def _git(self, *args: str, check: bool = True) -> str:
|
||||
result = subprocess.run(
|
||||
["git", *args], cwd=self.workspace, text=True, capture_output=True
|
||||
)
|
||||
if check and result.returncode != 0:
|
||||
raise CommitFileError("writer_git_operation_failed", 500)
|
||||
return result.stdout.strip()
|
||||
|
||||
def _transition(self, key: str, state: str, **fields: Any) -> dict[str, Any]:
|
||||
record = self.ledger.update(key, state, **fields)
|
||||
if self.crash_after_state == state:
|
||||
raise SimulatedCrash(state)
|
||||
return record
|
||||
|
||||
def _validate(self, data: Any) -> dict[str, Any]:
|
||||
if not isinstance(data, dict):
|
||||
raise CommitFileError("writer_request_object_required")
|
||||
required = ("branch", "path", "content", "message", "expected_head_oid", "idempotency_key")
|
||||
if any(field not in data for field in required):
|
||||
raise CommitFileError("writer_request_incomplete")
|
||||
if data.get("force") or data.get("force_push"):
|
||||
raise CommitFileError("isolated_writer_force_rejected", 403)
|
||||
if set(data) != set(required):
|
||||
raise CommitFileError("writer_request_fields_rejected")
|
||||
item = {field: data[field] for field in required}
|
||||
if item["branch"] != policy.allowed_branch():
|
||||
raise CommitFileError("isolated_writer_branch_rejected", 403)
|
||||
try:
|
||||
item["path"] = policy.validate_path(item["path"], self.workspace)
|
||||
except PermissionError as exc:
|
||||
raise CommitFileError(str(exc), 403) from None
|
||||
if not isinstance(item["content"], str) or "\x00" in item["content"]:
|
||||
raise CommitFileError("writer_content_rejected")
|
||||
try:
|
||||
policy.validate_content_for_path(item["path"], item["content"])
|
||||
except PermissionError as exc:
|
||||
raise CommitFileError(str(exc), 403) from None
|
||||
if len(item["content"].encode("utf-8")) > 1_048_576:
|
||||
raise CommitFileError("writer_content_too_large", 413)
|
||||
message = item["message"]
|
||||
if (
|
||||
not isinstance(message, str)
|
||||
or not 1 <= len(message) <= 200
|
||||
or "\x00" in message
|
||||
or "\n" in message
|
||||
or "\r" in message
|
||||
):
|
||||
raise CommitFileError("writer_message_rejected")
|
||||
if not isinstance(item["expected_head_oid"], str) or not OID_RE.fullmatch(item["expected_head_oid"]):
|
||||
raise CommitFileError("writer_expected_head_rejected")
|
||||
if not isinstance(item["idempotency_key"], str) or not IDEMPOTENCY_RE.fullmatch(item["idempotency_key"]):
|
||||
raise CommitFileError("writer_idempotency_key_rejected")
|
||||
return item
|
||||
|
||||
def _atomic_write(self, relative: str, content: str) -> None:
|
||||
target = self.workspace / relative
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
fd, temporary = tempfile.mkstemp(prefix=".writer-", dir=target.parent)
|
||||
try:
|
||||
with os.fdopen(fd, "wb", closefd=True) as stream:
|
||||
stream.write(content.encode("utf-8"))
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.replace(temporary, target)
|
||||
parent_fd = os.open(target.parent, os.O_RDONLY | getattr(os, "O_DIRECTORY", 0))
|
||||
try:
|
||||
os.fsync(parent_fd)
|
||||
finally:
|
||||
os.close(parent_fd)
|
||||
finally:
|
||||
if os.path.exists(temporary):
|
||||
os.unlink(temporary)
|
||||
|
||||
def _verify_remote(self, branch: str, oid: str) -> None:
|
||||
bare = subprocess.run(
|
||||
["git", "--git-dir", str(self.bare_repo), "rev-parse", f"refs/heads/{branch}"],
|
||||
text=True, capture_output=True,
|
||||
)
|
||||
if bare.returncode != 0 or bare.stdout.strip() != oid:
|
||||
raise CommitFileError("writer_authoritative_bare_oid_mismatch", 500)
|
||||
remote = subprocess.run(
|
||||
["git", "ls-remote", "--heads", self.remote, f"refs/heads/{branch}"],
|
||||
cwd=self.workspace, text=True, capture_output=True,
|
||||
)
|
||||
if remote.returncode != 0:
|
||||
raise CommitFileError("writer_gitea_verification_failed", 503)
|
||||
fields = remote.stdout.strip().split()
|
||||
if len(fields) != 2:
|
||||
raise CommitFileError("writer_gitea_ref_missing", 503)
|
||||
if fields[0] != oid:
|
||||
raise CommitFileError("writer_gitea_oid_conflict", 409)
|
||||
|
||||
def execute(self, grant: Any, raw_data: Any) -> dict[str, Any]:
|
||||
data = self._validate(raw_data)
|
||||
digest = canonical_digest(data)
|
||||
branch = data["branch"]
|
||||
with _LOCKS_GUARD:
|
||||
lock = _LOCKS.setdefault(branch, threading.Lock())
|
||||
lock_path = self.ledger.path.parent / f"{hashlib.sha256(branch.encode()).hexdigest()}.lock"
|
||||
with lock, open(lock_path, "a+b") as branch_lock:
|
||||
fcntl.flock(branch_lock.fileno(), fcntl.LOCK_EX)
|
||||
return self._execute_locked(grant, data, digest)
|
||||
|
||||
def _execute_locked(self, grant: Any, data: dict[str, Any], digest: str) -> dict[str, Any]:
|
||||
key = data["idempotency_key"]
|
||||
record = self.ledger.get_or_create(grant, data, digest)
|
||||
if record["state"] == "COMPLETED":
|
||||
return self._result(record, idempotent=True)
|
||||
if self._git("rev-parse", "--abbrev-ref", "HEAD") != data["branch"]:
|
||||
record = self._transition(
|
||||
key, "MANUAL_REVIEW_REQUIRED", error_code="writer_current_branch_conflict"
|
||||
)
|
||||
self._audit(grant, data, digest, record, "manual_review_required")
|
||||
raise CommitFileError("writer_current_branch_conflict", 409)
|
||||
head = self._git("rev-parse", "HEAD")
|
||||
commit_oid = record.get("commit_oid")
|
||||
if head != record["pre_head_oid"] and head != commit_oid:
|
||||
record = self._transition(
|
||||
key, "MANUAL_REVIEW_REQUIRED", error_code="writer_branch_head_conflict"
|
||||
)
|
||||
self._audit(grant, data, digest, record, "manual_review_required")
|
||||
raise CommitFileError("writer_branch_head_conflict", 409)
|
||||
try:
|
||||
state = record["state"]
|
||||
if state == "MANUAL_REVIEW_REQUIRED":
|
||||
raise CommitFileError("writer_manual_review_required", 409)
|
||||
if state == "FAILED_RECOVERABLE":
|
||||
if record.get("push_status") == "confirmed":
|
||||
state = "PUSHED"
|
||||
else:
|
||||
state = "COMMITTED" if commit_oid else "FILE_WRITTEN"
|
||||
if state == "PENDING":
|
||||
self._atomic_write(data["path"], data["content"])
|
||||
record = self._transition(key, "FILE_WRITTEN")
|
||||
state = record["state"]
|
||||
if state == "FILE_WRITTEN":
|
||||
actual_sha = hashlib.sha256(
|
||||
(self.workspace / data["path"]).read_bytes()
|
||||
).hexdigest()
|
||||
if actual_sha != record["content_sha256"]:
|
||||
raise CommitFileError("writer_file_content_conflict", 409)
|
||||
staged_before = self._git("diff", "--cached", "--name-only", check=False).splitlines()
|
||||
if staged_before:
|
||||
raise CommitFileError("writer_extra_staged_files_rejected", 409)
|
||||
self._git("add", "--", data["path"])
|
||||
staged = self._git("diff", "--cached", "--name-only").splitlines()
|
||||
if staged != [data["path"]]:
|
||||
raise CommitFileError("writer_extra_staged_files_rejected", 409)
|
||||
self._git("commit", "-m", data["message"])
|
||||
commit_oid = self._git("rev-parse", "HEAD")
|
||||
record = self._transition(key, "COMMITTED", commit_oid=commit_oid)
|
||||
state = record["state"]
|
||||
if state == "COMMITTED":
|
||||
commit_oid = str(record["commit_oid"])
|
||||
pushed = subprocess.run(
|
||||
["git", "push", "--porcelain", self.remote, f"HEAD:refs/heads/{data['branch']}"],
|
||||
cwd=self.workspace, text=True, capture_output=True,
|
||||
)
|
||||
if pushed.returncode != 0:
|
||||
self._transition(
|
||||
key, "FAILED_RECOVERABLE",
|
||||
push_status="failed", error_code="writer_gitea_push_failed",
|
||||
)
|
||||
raise CommitFileError("writer_gitea_push_failed", 503)
|
||||
record = self._transition(key, "PUSHED", push_status="confirmed")
|
||||
state = record["state"]
|
||||
if state == "PUSHED":
|
||||
commit_oid = str(record["commit_oid"])
|
||||
self._verify_remote(data["branch"], commit_oid)
|
||||
record = self._transition(
|
||||
key, "VERIFIED", verification_status="bare+gitea"
|
||||
)
|
||||
state = record["state"]
|
||||
if state == "VERIFIED":
|
||||
record = self._transition(key, "COMPLETED", error_code=None)
|
||||
self._audit(grant, data, digest, record, "completed")
|
||||
return self._result(record, idempotent=False)
|
||||
except SimulatedCrash:
|
||||
raise
|
||||
except CommitFileError as exc:
|
||||
latest = self.ledger.get(key)
|
||||
if latest["state"] not in {"FAILED_RECOVERABLE", "MANUAL_REVIEW_REQUIRED"}:
|
||||
failure_state = (
|
||||
"MANUAL_REVIEW_REQUIRED"
|
||||
if exc.code in {
|
||||
"writer_gitea_oid_conflict",
|
||||
"writer_file_content_conflict",
|
||||
"writer_current_branch_conflict",
|
||||
}
|
||||
else "FAILED_RECOVERABLE"
|
||||
)
|
||||
latest = self._transition(key, failure_state, error_code=exc.code)
|
||||
self._audit(grant, data, digest, latest, "failed")
|
||||
raise
|
||||
|
||||
def _audit(self, grant: Any, data: dict[str, Any], digest: str, record: dict[str, Any], result: str) -> None:
|
||||
self.audit({
|
||||
"token_id": grant.token_id,
|
||||
"task_id": grant.task_id,
|
||||
"audience": grant.record["audience"],
|
||||
"source_ip": grant.record.get("_source_ip", "socket-peer"),
|
||||
"operation": grant.operation,
|
||||
"branch": data["branch"],
|
||||
"path": data["path"],
|
||||
"idempotency_key": data["idempotency_key"],
|
||||
"operation_digest": digest,
|
||||
"path_policy_sha256": policy.configured_path_policy_sha256(),
|
||||
"pre_head_oid": record["pre_head_oid"],
|
||||
"commit_oid": record.get("commit_oid"),
|
||||
"result": result,
|
||||
})
|
||||
|
||||
@staticmethod
|
||||
def _result(record: dict[str, Any], *, idempotent: bool) -> dict[str, Any]:
|
||||
return {
|
||||
"status": "completed",
|
||||
"state": record["state"],
|
||||
"operation_id": record["operation_id"],
|
||||
"branch": record["branch"],
|
||||
"path": record["path"],
|
||||
"commit_oid": record.get("commit_oid"),
|
||||
"push_status": record.get("push_status"),
|
||||
"verification_status": record.get("verification_status"),
|
||||
"idempotent": idempotent,
|
||||
}
|
||||
@@ -0,0 +1,422 @@
|
||||
"""Strict service-level exact-path policy for isolated Git writers."""
|
||||
from __future__ import annotations
|
||||
|
||||
import grp
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import stat
|
||||
from dataclasses import dataclass
|
||||
from functools import lru_cache
|
||||
from pathlib import Path, PurePosixPath, PureWindowsPath
|
||||
from typing import Any
|
||||
from urllib.parse import unquote
|
||||
|
||||
|
||||
MAX_POLICY_BYTES = 65_536
|
||||
POLICY_FIELDS = frozenset(
|
||||
{
|
||||
"schema_version",
|
||||
"policy_id",
|
||||
"audience",
|
||||
"repository_identity",
|
||||
"allowed_branch",
|
||||
"allowed_operations",
|
||||
}
|
||||
)
|
||||
OPERATION_FIELDS = frozenset({"exact_paths", "max_content_bytes", "content_profile"})
|
||||
SUPPORTED_OPERATIONS = frozenset({"commit_file.atomic"})
|
||||
SUPPORTED_CONTENT_PROFILES = frozenset({"systemd-codex-review-worker-v1"})
|
||||
_SECRET_RE = re.compile(
|
||||
r"(?i)(authorization\s*:|bearer\s+|(?:token|password|secret)\s*[:=])"
|
||||
)
|
||||
_SYSTEMD_NAME_RE = re.compile(r"[A-Za-z][A-Za-z0-9]*\Z")
|
||||
_SYSTEMD_MAX_LINE_BYTES = 4096
|
||||
_SYSTEMD_ALLOWED_DIRECTIVES = {
|
||||
"Unit": frozenset({"Description", "After", "Wants"}),
|
||||
"Service": frozenset(
|
||||
{
|
||||
"Type",
|
||||
"User",
|
||||
"Group",
|
||||
"WorkingDirectory",
|
||||
"Environment",
|
||||
"ExecStart",
|
||||
"Restart",
|
||||
"RestartSec",
|
||||
"NoNewPrivileges",
|
||||
"PrivateTmp",
|
||||
"PrivateDevices",
|
||||
"ProtectSystem",
|
||||
"ProtectHome",
|
||||
"ProtectKernelTunables",
|
||||
"ProtectKernelModules",
|
||||
"ProtectControlGroups",
|
||||
"LockPersonality",
|
||||
"RestrictSUIDSGID",
|
||||
"RestrictRealtime",
|
||||
"MemoryDenyWriteExecute",
|
||||
"RuntimeDirectory",
|
||||
"StateDirectory",
|
||||
"CacheDirectory",
|
||||
"ReadOnlyPaths",
|
||||
"ReadWritePaths",
|
||||
"UMask",
|
||||
}
|
||||
),
|
||||
"Install": frozenset({"WantedBy"}),
|
||||
}
|
||||
_SYSTEMD_MULTI_DIRECTIVES = frozenset(
|
||||
{
|
||||
("Service", "Environment"),
|
||||
("Service", "ReadOnlyPaths"),
|
||||
("Service", "ReadWritePaths"),
|
||||
}
|
||||
)
|
||||
_SYSTEMD_EXACT_SINGLE_VALUES = {
|
||||
("Unit", "Description"): "AIOS Codex Review/Test Worker",
|
||||
("Unit", "After"): "network-online.target",
|
||||
("Unit", "Wants"): "network-online.target",
|
||||
("Service", "Type"): "simple",
|
||||
("Service", "User"): "aiman",
|
||||
("Service", "Group"): "gitops",
|
||||
(
|
||||
"Service",
|
||||
"WorkingDirectory",
|
||||
): "/usr/libexec/aios-codex-review-test-worker/current",
|
||||
(
|
||||
"Service",
|
||||
"ExecStart",
|
||||
): "/usr/bin/python3 -m task_plane.workers.codex_review_test",
|
||||
("Service", "Restart"): "on-failure",
|
||||
("Service", "RestartSec"): "2",
|
||||
("Service", "NoNewPrivileges"): "true",
|
||||
("Service", "PrivateTmp"): "true",
|
||||
("Service", "PrivateDevices"): "true",
|
||||
("Service", "ProtectSystem"): "strict",
|
||||
("Service", "ProtectHome"): "true",
|
||||
("Service", "ProtectKernelTunables"): "true",
|
||||
("Service", "ProtectKernelModules"): "true",
|
||||
("Service", "ProtectControlGroups"): "true",
|
||||
("Service", "LockPersonality"): "true",
|
||||
("Service", "RestrictSUIDSGID"): "true",
|
||||
("Service", "RestrictRealtime"): "true",
|
||||
("Service", "MemoryDenyWriteExecute"): "true",
|
||||
("Service", "RuntimeDirectory"): "aios-codex-review-test-worker",
|
||||
("Service", "StateDirectory"): "aios-codex-review-test-worker",
|
||||
("Service", "CacheDirectory"): "aios-codex-review-test-worker",
|
||||
("Service", "UMask"): "0077",
|
||||
("Install", "WantedBy"): "multi-user.target",
|
||||
}
|
||||
_SYSTEMD_EXACT_MULTI_VALUES = {
|
||||
("Service", "Environment"): (
|
||||
"AIOS_CODEX_WORKER_MODE=shadow",
|
||||
"AIOS_TASK_PLANE_EXECUTION_ENABLED=false",
|
||||
"PYTHONDONTWRITEBYTECODE=1",
|
||||
),
|
||||
("Service", "ReadOnlyPaths"): (
|
||||
"/data/aios-gitops/repo.git",
|
||||
"/usr/libexec/aios-codex-review-test-worker",
|
||||
),
|
||||
("Service", "ReadWritePaths"): (
|
||||
"/run/aios-codex-review-test-worker",
|
||||
"/var/lib/aios-codex-review-test-worker",
|
||||
"/var/cache/aios-codex-review-test-worker",
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
class PathPolicyError(PermissionError):
|
||||
pass
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class OperationPolicy:
|
||||
exact_paths: tuple[str, ...]
|
||||
max_content_bytes: int
|
||||
content_profile: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ServicePathPolicy:
|
||||
schema_version: int
|
||||
policy_id: str
|
||||
audience: str
|
||||
repository_identity: str
|
||||
allowed_branch: str
|
||||
allowed_operations: dict[str, OperationPolicy]
|
||||
sha256: str
|
||||
|
||||
def operation(self, name: str) -> OperationPolicy:
|
||||
try:
|
||||
return self.allowed_operations[name]
|
||||
except KeyError:
|
||||
raise PathPolicyError("isolated_writer_service_operation_rejected") from None
|
||||
|
||||
def require_exact_path(self, operation: str, path: str) -> OperationPolicy:
|
||||
selected = self.operation(operation)
|
||||
if path not in selected.exact_paths:
|
||||
raise PathPolicyError("isolated_writer_service_path_rejected")
|
||||
return selected
|
||||
|
||||
|
||||
def _canonical_json(value: Any) -> bytes:
|
||||
return (
|
||||
json.dumps(value, ensure_ascii=False, sort_keys=True, separators=(",", ":"))
|
||||
+ "\n"
|
||||
).encode("utf-8")
|
||||
|
||||
|
||||
def validate_relative_path_syntax(path: str) -> str:
|
||||
if not isinstance(path, str):
|
||||
raise PathPolicyError("isolated_writer_path_rejected")
|
||||
if not path or path != path.strip() or "\x00" in path or "\\" in path:
|
||||
raise PathPolicyError("isolated_writer_path_rejected")
|
||||
try:
|
||||
decoded = unquote(path, errors="strict")
|
||||
except (UnicodeDecodeError, ValueError):
|
||||
raise PathPolicyError("isolated_writer_path_rejected") from None
|
||||
if decoded != path:
|
||||
raise PathPolicyError("isolated_writer_path_rejected")
|
||||
posix = PurePosixPath(path)
|
||||
windows = PureWindowsPath(path)
|
||||
parts = path.split("/")
|
||||
if (
|
||||
posix.is_absolute()
|
||||
or windows.is_absolute()
|
||||
or bool(windows.drive)
|
||||
or any(part in {"", ".", ".."} for part in parts)
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_rejected")
|
||||
return path
|
||||
|
||||
|
||||
def _require_fields(value: dict[str, Any], allowed: frozenset[str], code: str) -> None:
|
||||
if set(value) != allowed:
|
||||
raise PathPolicyError(code)
|
||||
|
||||
|
||||
def _parse_policy(document: Any, canonical: bytes) -> ServicePathPolicy:
|
||||
if not isinstance(document, dict):
|
||||
raise PathPolicyError("isolated_writer_path_policy_object_required")
|
||||
_require_fields(document, POLICY_FIELDS, "isolated_writer_path_policy_fields_rejected")
|
||||
if document["schema_version"] != 1:
|
||||
raise PathPolicyError("isolated_writer_path_policy_schema_rejected")
|
||||
text_fields = (
|
||||
"policy_id",
|
||||
"audience",
|
||||
"repository_identity",
|
||||
"allowed_branch",
|
||||
)
|
||||
if any(
|
||||
not isinstance(document[field], str) or not document[field].strip()
|
||||
for field in text_fields
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_policy_value_rejected")
|
||||
raw_operations = document["allowed_operations"]
|
||||
if not isinstance(raw_operations, dict) or not raw_operations:
|
||||
raise PathPolicyError("isolated_writer_path_policy_operations_rejected")
|
||||
if not set(raw_operations).issubset(SUPPORTED_OPERATIONS):
|
||||
raise PathPolicyError("isolated_writer_path_policy_operations_rejected")
|
||||
operations: dict[str, OperationPolicy] = {}
|
||||
for name, raw in raw_operations.items():
|
||||
if not isinstance(raw, dict):
|
||||
raise PathPolicyError("isolated_writer_path_policy_operation_rejected")
|
||||
_require_fields(
|
||||
raw,
|
||||
OPERATION_FIELDS,
|
||||
"isolated_writer_path_policy_operation_fields_rejected",
|
||||
)
|
||||
paths = raw["exact_paths"]
|
||||
if (
|
||||
not isinstance(paths, list)
|
||||
or not paths
|
||||
or any(not isinstance(item, str) for item in paths)
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_policy_paths_rejected")
|
||||
validated = tuple(validate_relative_path_syntax(item) for item in paths)
|
||||
if len(set(validated)) != len(validated):
|
||||
raise PathPolicyError("isolated_writer_path_policy_paths_rejected")
|
||||
maximum = raw["max_content_bytes"]
|
||||
if not isinstance(maximum, int) or isinstance(maximum, bool) or not 1 <= maximum <= 1_048_576:
|
||||
raise PathPolicyError("isolated_writer_path_policy_size_rejected")
|
||||
profile = raw["content_profile"]
|
||||
if profile not in SUPPORTED_CONTENT_PROFILES:
|
||||
raise PathPolicyError("isolated_writer_path_policy_profile_rejected")
|
||||
operations[name] = OperationPolicy(validated, maximum, profile)
|
||||
return ServicePathPolicy(
|
||||
schema_version=1,
|
||||
policy_id=document["policy_id"],
|
||||
audience=document["audience"],
|
||||
repository_identity=document["repository_identity"],
|
||||
allowed_branch=document["allowed_branch"],
|
||||
allowed_operations=operations,
|
||||
sha256=hashlib.sha256(canonical).hexdigest(),
|
||||
)
|
||||
|
||||
|
||||
def load_path_policy(
|
||||
path: Path,
|
||||
*,
|
||||
expected_owner_uid: int = 0,
|
||||
expected_group_gid: int | None = None,
|
||||
expected_parent_mode: int = 0o750,
|
||||
expected_file_mode: int = 0o640,
|
||||
) -> ServicePathPolicy:
|
||||
lexical = Path(os.path.abspath(str(path)))
|
||||
if lexical.is_symlink():
|
||||
raise PathPolicyError("isolated_writer_path_policy_symlink_rejected")
|
||||
try:
|
||||
parent_info = lexical.parent.stat(follow_symlinks=False)
|
||||
file_info = lexical.stat(follow_symlinks=False)
|
||||
except FileNotFoundError:
|
||||
raise PathPolicyError("isolated_writer_path_policy_missing") from None
|
||||
if stat.S_ISLNK(parent_info.st_mode) or not stat.S_ISDIR(parent_info.st_mode):
|
||||
raise PathPolicyError("isolated_writer_path_policy_parent_rejected")
|
||||
if stat.S_ISLNK(file_info.st_mode) or not stat.S_ISREG(file_info.st_mode):
|
||||
raise PathPolicyError("isolated_writer_path_policy_file_rejected")
|
||||
if lexical.resolve(strict=True) != lexical:
|
||||
raise PathPolicyError("isolated_writer_path_policy_symlink_rejected")
|
||||
if (
|
||||
parent_info.st_uid != expected_owner_uid
|
||||
or stat.S_IMODE(parent_info.st_mode) != expected_parent_mode
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_policy_parent_permissions_rejected")
|
||||
if (
|
||||
file_info.st_uid != expected_owner_uid
|
||||
or stat.S_IMODE(file_info.st_mode) != expected_file_mode
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_policy_permissions_rejected")
|
||||
if expected_group_gid is not None and (
|
||||
parent_info.st_gid != expected_group_gid or file_info.st_gid != expected_group_gid
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_path_policy_group_rejected")
|
||||
if file_info.st_size <= 0 or file_info.st_size > MAX_POLICY_BYTES:
|
||||
raise PathPolicyError("isolated_writer_path_policy_file_size_rejected")
|
||||
raw = lexical.read_bytes()
|
||||
try:
|
||||
document = json.loads(raw.decode("utf-8"))
|
||||
except (UnicodeDecodeError, json.JSONDecodeError):
|
||||
raise PathPolicyError("isolated_writer_path_policy_json_rejected") from None
|
||||
canonical = _canonical_json(document)
|
||||
if raw != canonical:
|
||||
raise PathPolicyError("isolated_writer_path_policy_not_canonical")
|
||||
return _parse_policy(document, canonical)
|
||||
|
||||
|
||||
@lru_cache(maxsize=1)
|
||||
def configured_path_policy() -> ServicePathPolicy | None:
|
||||
configured = os.getenv("AIOS_GITOPS_PATH_POLICY_FILE", "").strip()
|
||||
if not configured:
|
||||
return None
|
||||
if not Path(configured).is_absolute():
|
||||
raise PathPolicyError("isolated_writer_path_policy_path_rejected")
|
||||
try:
|
||||
gitops_gid = grp.getgrnam("gitops").gr_gid
|
||||
except KeyError:
|
||||
raise PathPolicyError("isolated_writer_path_policy_group_rejected") from None
|
||||
loaded = load_path_policy(Path(configured), expected_group_gid=gitops_gid)
|
||||
if loaded.audience != os.getenv("AIOS_GITOPS_SERVICE_AUDIENCE", ""):
|
||||
raise PathPolicyError("isolated_writer_path_policy_audience_rejected")
|
||||
if loaded.repository_identity != os.getenv("AIOS_GITOPS_REPOSITORY_IDENTITY", ""):
|
||||
raise PathPolicyError("isolated_writer_path_policy_repository_rejected")
|
||||
if loaded.allowed_branch != os.getenv("AIOS_GITOPS_ALLOWED_BRANCH", ""):
|
||||
raise PathPolicyError("isolated_writer_path_policy_branch_rejected")
|
||||
return loaded
|
||||
|
||||
|
||||
def clear_path_policy_cache() -> None:
|
||||
configured_path_policy.cache_clear()
|
||||
|
||||
|
||||
def require_service_path(operation: str, path: str) -> OperationPolicy:
|
||||
loaded = configured_path_policy()
|
||||
if loaded is None:
|
||||
raise PathPolicyError("isolated_writer_service_path_policy_required")
|
||||
return loaded.require_exact_path(operation, path)
|
||||
|
||||
|
||||
def configured_path_policy_sha256() -> str | None:
|
||||
loaded = configured_path_policy()
|
||||
return None if loaded is None else loaded.sha256
|
||||
|
||||
|
||||
def validate_content(operation: str, path: str, content: str) -> None:
|
||||
selected = require_service_path(operation, path)
|
||||
try:
|
||||
encoded = content.encode("utf-8", errors="strict")
|
||||
except (AttributeError, UnicodeEncodeError):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected") from None
|
||||
if len(encoded) > selected.max_content_bytes:
|
||||
raise PathPolicyError("isolated_writer_service_content_too_large")
|
||||
if selected.content_profile == "systemd-codex-review-worker-v1":
|
||||
_validate_systemd_codex_review_worker(content)
|
||||
return
|
||||
raise PathPolicyError("isolated_writer_path_policy_profile_rejected")
|
||||
|
||||
|
||||
def _validate_systemd_codex_review_worker(content: str) -> None:
|
||||
if not isinstance(content, str):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
try:
|
||||
content.encode("utf-8", errors="strict")
|
||||
except UnicodeEncodeError:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected") from None
|
||||
if (
|
||||
"\x00" in content
|
||||
or "\r" in content
|
||||
or _SECRET_RE.search(content)
|
||||
or not content.endswith("\n")
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
|
||||
sections: set[str] = set()
|
||||
values: dict[tuple[str, str], list[str]] = {}
|
||||
section: str | None = None
|
||||
for line in content.splitlines():
|
||||
if len(line.encode("utf-8")) > _SYSTEMD_MAX_LINE_BYTES:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
if not line:
|
||||
continue
|
||||
if line[0].isspace() or line.startswith(("#", ";")):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
if line.startswith("[") and line.endswith("]"):
|
||||
candidate = line[1:-1]
|
||||
if (
|
||||
not _SYSTEMD_NAME_RE.fullmatch(candidate)
|
||||
or candidate not in _SYSTEMD_ALLOWED_DIRECTIVES
|
||||
or candidate in sections
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
sections.add(candidate)
|
||||
section = candidate
|
||||
continue
|
||||
if section is None or "=" not in line:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
directive, value = line.split("=", 1)
|
||||
if (
|
||||
not _SYSTEMD_NAME_RE.fullmatch(directive)
|
||||
or directive not in _SYSTEMD_ALLOWED_DIRECTIVES[section]
|
||||
or not value
|
||||
or value != value.strip()
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
key = (section, directive)
|
||||
if key in values and key not in _SYSTEMD_MULTI_DIRECTIVES:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
values.setdefault(key, []).append(value)
|
||||
|
||||
if sections != set(_SYSTEMD_ALLOWED_DIRECTIVES):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
if set(values) != set(_SYSTEMD_EXACT_SINGLE_VALUES) | set(
|
||||
_SYSTEMD_EXACT_MULTI_VALUES
|
||||
):
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
for key, expected in _SYSTEMD_EXACT_SINGLE_VALUES.items():
|
||||
if values.get(key) != [expected]:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
for key, expected in _SYSTEMD_EXACT_MULTI_VALUES.items():
|
||||
observed = values.get(key, [])
|
||||
if len(observed) != len(set(observed)) or tuple(observed) != expected:
|
||||
raise PathPolicyError("isolated_writer_systemd_profile_rejected")
|
||||
@@ -0,0 +1,241 @@
|
||||
"""Digest-only, task-scoped token registry for isolated writers."""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import hashlib
|
||||
import hmac
|
||||
import json
|
||||
import os
|
||||
import grp
|
||||
import pwd
|
||||
import secrets
|
||||
import sqlite3
|
||||
import stat
|
||||
import threading
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
_REGISTRY_INIT_LOCK = threading.Lock()
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
|
||||
|
||||
def token_digest(token: str) -> str:
|
||||
return hashlib.sha256(token.encode("utf-8")).hexdigest()
|
||||
|
||||
|
||||
class TokenRegistry:
|
||||
def __init__(self, path: Path | str):
|
||||
self.path = Path(path)
|
||||
self._prepare()
|
||||
|
||||
def _prepare(self) -> None:
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
if self.path.parent.is_symlink() or self.path.is_symlink():
|
||||
raise PermissionError("writer_token_registry_symlink_rejected")
|
||||
with _REGISTRY_INIT_LOCK:
|
||||
with self._connect() as db:
|
||||
db.executescript(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS token_grants (
|
||||
token_id TEXT PRIMARY KEY,
|
||||
token_digest TEXT NOT NULL UNIQUE,
|
||||
grant_json TEXT NOT NULL,
|
||||
revoked INTEGER NOT NULL DEFAULT 0,
|
||||
created_at TEXT NOT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS token_uses (
|
||||
token_id TEXT NOT NULL,
|
||||
operation TEXT NOT NULL,
|
||||
use_count INTEGER NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY(token_id, operation),
|
||||
FOREIGN KEY(token_id) REFERENCES token_grants(token_id)
|
||||
);
|
||||
"""
|
||||
)
|
||||
os.chmod(self.path, 0o600)
|
||||
|
||||
def _connect(self) -> sqlite3.Connection:
|
||||
db = sqlite3.connect(self.path, timeout=30, isolation_level=None)
|
||||
db.row_factory = sqlite3.Row
|
||||
db.execute("PRAGMA journal_mode=WAL")
|
||||
db.execute("PRAGMA synchronous=FULL")
|
||||
db.execute("PRAGMA foreign_keys=ON")
|
||||
return db
|
||||
|
||||
def issue(self, grant: dict[str, Any], token: str | None = None) -> tuple[str, dict[str, Any]]:
|
||||
value = token or secrets.token_urlsafe(32)
|
||||
if len(value.encode("utf-8")) < 32:
|
||||
raise ValueError("writer_token_entropy_insufficient")
|
||||
record = dict(grant)
|
||||
record["schema_version"] = 2
|
||||
record["token_digest"] = token_digest(value)
|
||||
record["revoked"] = False
|
||||
record.setdefault("created_at", utc_now())
|
||||
required = (
|
||||
"token_id",
|
||||
"audience",
|
||||
"task_id",
|
||||
"source_cidrs",
|
||||
"allowed_branch",
|
||||
"approved_base_oid",
|
||||
"allowed_operations",
|
||||
"allowed_paths",
|
||||
"not_before",
|
||||
"expires_at",
|
||||
"max_uses",
|
||||
"issued_by",
|
||||
)
|
||||
if any(not record.get(field) for field in required):
|
||||
raise ValueError("writer_token_grant_incomplete")
|
||||
encoded = json.dumps(record, sort_keys=True, separators=(",", ":"))
|
||||
with self._connect() as db:
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
try:
|
||||
db.execute(
|
||||
"""
|
||||
INSERT INTO token_grants(token_id, token_digest, grant_json, revoked, created_at)
|
||||
VALUES(?,?,?,?,?)
|
||||
""",
|
||||
(
|
||||
str(record["token_id"]),
|
||||
str(record["token_digest"]),
|
||||
encoded,
|
||||
0,
|
||||
str(record["created_at"]),
|
||||
),
|
||||
)
|
||||
db.execute("COMMIT")
|
||||
except Exception:
|
||||
db.execute("ROLLBACK")
|
||||
raise
|
||||
return value, record
|
||||
|
||||
def find(self, token: str) -> dict[str, Any] | None:
|
||||
candidate = token_digest(token)
|
||||
with self._connect() as db:
|
||||
rows = db.execute(
|
||||
"SELECT token_digest, grant_json, revoked FROM token_grants"
|
||||
).fetchall()
|
||||
match = None
|
||||
for row in rows:
|
||||
if hmac.compare_digest(str(row["token_digest"]), candidate):
|
||||
match = dict(json.loads(str(row["grant_json"])))
|
||||
match["revoked"] = bool(row["revoked"])
|
||||
return match
|
||||
|
||||
def consume(self, token_id: str, operation: str, maximum: int) -> int:
|
||||
if maximum < 1:
|
||||
raise PermissionError("writer_token_operation_exhausted")
|
||||
with self._connect() as db:
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
try:
|
||||
row = db.execute(
|
||||
"SELECT revoked FROM token_grants WHERE token_id=?",
|
||||
(token_id,),
|
||||
).fetchone()
|
||||
if row is None or bool(row["revoked"]):
|
||||
raise PermissionError("writer_token_revoked")
|
||||
used_row = db.execute(
|
||||
"SELECT use_count FROM token_uses WHERE token_id=? AND operation=?",
|
||||
(token_id, operation),
|
||||
).fetchone()
|
||||
used = int(used_row["use_count"]) if used_row else 0
|
||||
if used >= maximum:
|
||||
raise PermissionError("writer_token_operation_exhausted")
|
||||
current = used + 1
|
||||
db.execute(
|
||||
"""
|
||||
INSERT INTO token_uses(token_id, operation, use_count)
|
||||
VALUES(?,?,?)
|
||||
ON CONFLICT(token_id, operation)
|
||||
DO UPDATE SET use_count=excluded.use_count
|
||||
""",
|
||||
(token_id, operation, current),
|
||||
)
|
||||
db.execute("COMMIT")
|
||||
return current
|
||||
except Exception:
|
||||
db.execute("ROLLBACK")
|
||||
raise
|
||||
|
||||
def revoke(self, token_id: str) -> bool:
|
||||
with self._connect() as db:
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
changed = db.execute(
|
||||
"UPDATE token_grants SET revoked=1 WHERE token_id=? AND revoked=0",
|
||||
(token_id,),
|
||||
).rowcount
|
||||
db.execute("COMMIT")
|
||||
return bool(changed)
|
||||
|
||||
def usage(self, token_id: str, operation: str) -> int:
|
||||
with self._connect() as db:
|
||||
row = db.execute(
|
||||
"SELECT use_count FROM token_uses WHERE token_id=? AND operation=?",
|
||||
(token_id, operation),
|
||||
).fetchone()
|
||||
return int(row["use_count"]) if row else 0
|
||||
|
||||
|
||||
def _write_secret_file(
|
||||
path: Path,
|
||||
token: str,
|
||||
*,
|
||||
owner: str | None = None,
|
||||
group: str | None = None,
|
||||
) -> None:
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
if path.parent.is_symlink() or path.is_symlink():
|
||||
raise PermissionError("writer_token_file_symlink_rejected")
|
||||
flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL
|
||||
if hasattr(os, "O_NOFOLLOW"):
|
||||
flags |= os.O_NOFOLLOW
|
||||
fd = os.open(path, flags, 0o600)
|
||||
try:
|
||||
if not stat.S_ISREG(os.fstat(fd).st_mode):
|
||||
raise PermissionError("writer_token_file_not_regular")
|
||||
if owner is not None or group is not None:
|
||||
uid = pwd.getpwnam(owner).pw_uid if owner is not None else -1
|
||||
gid = grp.getgrnam(group).gr_gid if group is not None else -1
|
||||
os.fchown(fd, uid, gid)
|
||||
os.write(fd, token.encode("utf-8"))
|
||||
os.fsync(fd)
|
||||
finally:
|
||||
os.close(fd)
|
||||
|
||||
|
||||
def main(argv: list[str] | None = None) -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--registry", required=True)
|
||||
sub = parser.add_subparsers(dest="command", required=True)
|
||||
issue = sub.add_parser("issue")
|
||||
issue.add_argument("--grant-file", required=True)
|
||||
issue.add_argument("--token-file", required=True)
|
||||
issue.add_argument("--owner")
|
||||
issue.add_argument("--group")
|
||||
revoke = sub.add_parser("revoke")
|
||||
revoke.add_argument("--token-id", required=True)
|
||||
args = parser.parse_args(argv)
|
||||
registry = TokenRegistry(args.registry)
|
||||
if args.command == "issue":
|
||||
grant = json.loads(Path(args.grant_file).read_text(encoding="utf-8"))
|
||||
token, record = registry.issue(grant)
|
||||
_write_secret_file(
|
||||
Path(args.token_file),
|
||||
token,
|
||||
owner=args.owner,
|
||||
group=args.group,
|
||||
)
|
||||
print(json.dumps({"token_id": record["token_id"], "created": True}, sort_keys=True))
|
||||
return 0
|
||||
changed = registry.revoke(args.token_id)
|
||||
print(json.dumps({"token_id": args.token_id, "revoked": changed}, sort_keys=True))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -1,33 +0,0 @@
|
||||
"""Portal operations API domain layer.
|
||||
No secrets. Designed for user/group_admin/owner portal integration.
|
||||
"""
|
||||
|
||||
ROLES = ("user", "group_admin", "owner")
|
||||
|
||||
|
||||
class PortalOpsAPI:
|
||||
def dashboard(self, role):
|
||||
if role not in ROLES:
|
||||
raise ValueError("invalid role")
|
||||
return {
|
||||
"role": role,
|
||||
"modules": self.modules(role),
|
||||
"status": "ok"
|
||||
}
|
||||
|
||||
def modules(self, role):
|
||||
common = ["profile", "alerts", "approvals", "audit"]
|
||||
if role == "user":
|
||||
return common + ["tasks", "usage"]
|
||||
if role == "group_admin":
|
||||
return common + ["group_users", "group_quota"]
|
||||
return common + ["system", "gitops", "runtime", "security", "models"]
|
||||
|
||||
def approval(self, request_id, action):
|
||||
return {"request_id": request_id, "action": action, "state": "recorded"}
|
||||
|
||||
def audit_event(self, actor, action):
|
||||
return {"actor": actor, "action": action, "recorded": True}
|
||||
|
||||
def alert(self, alert_id, level):
|
||||
return {"id": alert_id, "level": level, "state": "open"}
|
||||
@@ -1,493 +0,0 @@
|
||||
"""Three-role portal RBAC, workflow, alert, audit, and owner cockpit services.
|
||||
|
||||
This module is intentionally framework-neutral so it can be used by FastAPI routes,
|
||||
unit tests, CLI checks, and future Hermes/OpenClaw agents without importing runtime
|
||||
secrets or web framework globals.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Iterable
|
||||
from uuid import uuid4
|
||||
|
||||
ROLE_USER = "user"
|
||||
ROLE_GROUP_ADMIN = "group_admin"
|
||||
ROLE_OWNER = "owner"
|
||||
ROLES = (ROLE_USER, ROLE_GROUP_ADMIN, ROLE_OWNER)
|
||||
|
||||
SCOPE_SELF = "self"
|
||||
SCOPE_GROUP = "group"
|
||||
SCOPE_GLOBAL = "global"
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PortalContext:
|
||||
user_id: str
|
||||
role: str = ROLE_USER
|
||||
group_id: str | None = None
|
||||
display_name: str | None = None
|
||||
|
||||
def natural_scope(self) -> str:
|
||||
if self.role == ROLE_OWNER:
|
||||
return SCOPE_GLOBAL
|
||||
if self.role == ROLE_GROUP_ADMIN:
|
||||
return SCOPE_GROUP
|
||||
return SCOPE_SELF
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PortalResource:
|
||||
scope: str
|
||||
owner_user_id: str | None = None
|
||||
group_id: str | None = None
|
||||
resource_type: str = "portal"
|
||||
resource_id: str | None = None
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class RBACDecision:
|
||||
allowed: bool
|
||||
reason: str
|
||||
role: str
|
||||
scope: str
|
||||
action: str
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class ApprovalRequest:
|
||||
id: str
|
||||
request_type: str
|
||||
requester_id: str
|
||||
scope: str
|
||||
group_id: str | None = None
|
||||
target: str | None = None
|
||||
payload: dict[str, Any] = field(default_factory=dict)
|
||||
state: str = "pending"
|
||||
decided_by: str | None = None
|
||||
decision_reason: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class AlertRecord:
|
||||
id: str
|
||||
level: str
|
||||
message: str
|
||||
scope: str
|
||||
group_id: str | None = None
|
||||
owner_user_id: str | None = None
|
||||
source: str = "portal"
|
||||
state: str = "open"
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class AuditEvent:
|
||||
id: str
|
||||
actor_id: str
|
||||
action: str
|
||||
scope: str
|
||||
group_id: str | None = None
|
||||
resource_type: str = "portal"
|
||||
resource_id: str | None = None
|
||||
outcome: str = "success"
|
||||
detail: dict[str, Any] = field(default_factory=dict)
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PortalModule:
|
||||
key: str
|
||||
title: str
|
||||
route: str
|
||||
permission: str
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
ROLE_PERMISSIONS: dict[str, set[str]] = {
|
||||
ROLE_USER: {
|
||||
"portal.dashboard.read:self",
|
||||
"portal.profile.read:self",
|
||||
"portal.tasks.read:self",
|
||||
"portal.usage.read:self",
|
||||
"portal.alerts.read:self",
|
||||
"portal.approvals.create:self",
|
||||
"portal.approvals.read:self",
|
||||
"portal.audit.read:self",
|
||||
},
|
||||
ROLE_GROUP_ADMIN: {
|
||||
"portal.dashboard.read:self",
|
||||
"portal.dashboard.read:group",
|
||||
"portal.profile.read:self",
|
||||
"portal.tasks.read:self",
|
||||
"portal.usage.read:self",
|
||||
"portal.alerts.read:self",
|
||||
"portal.alerts.read:group",
|
||||
"portal.approvals.create:self",
|
||||
"portal.approvals.read:self",
|
||||
"portal.approvals.read:group",
|
||||
"portal.approvals.decide:group",
|
||||
"portal.audit.read:self",
|
||||
"portal.audit.read:group",
|
||||
"portal.group.users.read:group",
|
||||
"portal.group.quota.read:group",
|
||||
"portal.group.quota.write:group",
|
||||
},
|
||||
ROLE_OWNER: {
|
||||
"portal.*:*",
|
||||
},
|
||||
}
|
||||
|
||||
ROLE_MODULES: dict[str, tuple[PortalModule, ...]] = {
|
||||
ROLE_USER: (
|
||||
PortalModule("profile", "个人中心", "/portal/user/profile", "portal.profile.read:self"),
|
||||
PortalModule("tasks", "任务", "/portal/user/tasks", "portal.tasks.read:self"),
|
||||
PortalModule("usage", "用量", "/portal/user/usage", "portal.usage.read:self"),
|
||||
PortalModule("alerts", "告警", "/portal/user/alerts", "portal.alerts.read:self"),
|
||||
PortalModule("approvals", "审批", "/portal/user/approvals", "portal.approvals.read:self"),
|
||||
PortalModule("audit", "审计", "/portal/user/audit", "portal.audit.read:self"),
|
||||
),
|
||||
ROLE_GROUP_ADMIN: (
|
||||
PortalModule("group_users", "组用户", "/portal/group_admin/users", "portal.group.users.read:group"),
|
||||
PortalModule("group_quota", "组配额", "/portal/group_admin/quota", "portal.group.quota.read:group"),
|
||||
PortalModule("alerts", "组告警", "/portal/group_admin/alerts", "portal.alerts.read:group"),
|
||||
PortalModule("approvals", "组审批", "/portal/group_admin/approvals", "portal.approvals.read:group"),
|
||||
PortalModule("audit", "组审计", "/portal/group_admin/audit", "portal.audit.read:group"),
|
||||
),
|
||||
ROLE_OWNER: (
|
||||
PortalModule("system", "系统驾驶舱", "/portal/owner/system", "portal.system.read:global"),
|
||||
PortalModule("gitops", "GitOps", "/portal/owner/gitops", "portal.gitops.read:global"),
|
||||
PortalModule("runtime", "运行时", "/portal/owner/runtime", "portal.runtime.read:global"),
|
||||
PortalModule("security", "安全", "/portal/owner/security", "portal.security.read:global"),
|
||||
PortalModule("models", "模型", "/portal/owner/models", "portal.models.read:global"),
|
||||
PortalModule("approvals", "全局审批", "/portal/owner/approvals", "portal.approvals.read:global"),
|
||||
PortalModule("alerts", "全局告警", "/portal/owner/alerts", "portal.alerts.read:global"),
|
||||
PortalModule("audit", "全局审计", "/portal/owner/audit", "portal.audit.read:global"),
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
class PortalRBACService:
|
||||
"""Enforces user=self, group_admin=group, owner=global access."""
|
||||
|
||||
def __init__(self, permissions: dict[str, set[str]] | None = None):
|
||||
self.permissions = permissions or ROLE_PERMISSIONS
|
||||
|
||||
def authorize(self, ctx: PortalContext, action: str, resource: PortalResource | None = None) -> RBACDecision:
|
||||
if ctx.role not in ROLES:
|
||||
return RBACDecision(False, "unknown_role", ctx.role, SCOPE_SELF, action)
|
||||
|
||||
target = resource or PortalResource(scope=ctx.natural_scope(), owner_user_id=ctx.user_id, group_id=ctx.group_id)
|
||||
if ctx.role == ROLE_OWNER:
|
||||
return RBACDecision(True, "owner_global_allow", ctx.role, target.scope, action)
|
||||
|
||||
if target.scope == SCOPE_GLOBAL:
|
||||
return RBACDecision(False, "global_scope_requires_owner", ctx.role, target.scope, action)
|
||||
|
||||
if ctx.role == ROLE_USER:
|
||||
if target.scope != SCOPE_SELF or target.owner_user_id not in (None, ctx.user_id):
|
||||
return RBACDecision(False, "user_limited_to_self", ctx.role, target.scope, action)
|
||||
return self._permission_decision(ctx.role, action, SCOPE_SELF)
|
||||
|
||||
if ctx.role == ROLE_GROUP_ADMIN:
|
||||
if target.scope == SCOPE_SELF and target.owner_user_id in (None, ctx.user_id):
|
||||
return self._permission_decision(ctx.role, action, SCOPE_SELF)
|
||||
if target.scope == SCOPE_GROUP and ctx.group_id and target.group_id == ctx.group_id:
|
||||
return self._permission_decision(ctx.role, action, SCOPE_GROUP)
|
||||
return RBACDecision(False, "group_admin_limited_to_own_group", ctx.role, target.scope, action)
|
||||
|
||||
return RBACDecision(False, "deny_by_default", ctx.role, target.scope, action)
|
||||
|
||||
def visible_modules(self, ctx: PortalContext) -> list[dict[str, Any]]:
|
||||
modules = ROLE_MODULES.get(ctx.role, ())
|
||||
visible: list[dict[str, Any]] = []
|
||||
for module in modules:
|
||||
action, scope = module.permission.split(":", 1)
|
||||
resource = PortalResource(scope=scope, owner_user_id=ctx.user_id, group_id=ctx.group_id)
|
||||
if self.authorize(ctx, action, resource).allowed:
|
||||
visible.append(module.to_dict())
|
||||
return visible
|
||||
|
||||
def _permission_decision(self, role: str, action: str, scope: str) -> RBACDecision:
|
||||
permissions = self.permissions.get(role, set())
|
||||
if "portal.*:*" in permissions or f"{action}:{scope}" in permissions:
|
||||
return RBACDecision(True, "permission_match", role, scope, action)
|
||||
return RBACDecision(False, "permission_missing", role, scope, action)
|
||||
|
||||
|
||||
class PortalRepository:
|
||||
"""Small deterministic repository used for domain tests and route integration.
|
||||
|
||||
Production deployments can replace this repository with a SQL-backed adapter while
|
||||
preserving the service contract.
|
||||
"""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.approvals: dict[str, ApprovalRequest] = {}
|
||||
self.alerts: dict[str, AlertRecord] = {}
|
||||
self.audit_events: list[AuditEvent] = []
|
||||
|
||||
def create_approval(self, ctx: PortalContext, request_type: str, payload: dict[str, Any] | None = None, target: str | None = None) -> ApprovalRequest:
|
||||
approval = ApprovalRequest(
|
||||
id=f"apr_{uuid4().hex[:12]}",
|
||||
request_type=request_type,
|
||||
requester_id=ctx.user_id,
|
||||
scope=ctx.natural_scope(),
|
||||
group_id=ctx.group_id,
|
||||
target=target,
|
||||
payload=payload or {},
|
||||
)
|
||||
self.approvals[approval.id] = approval
|
||||
self.append_audit(ctx, "portal.approvals.create", approval.scope, approval.group_id, "approval", approval.id)
|
||||
return approval
|
||||
|
||||
def decide_approval(self, ctx: PortalContext, approval_id: str, decision: str, reason: str | None = None) -> ApprovalRequest:
|
||||
if decision not in {"approved", "rejected"}:
|
||||
raise ValueError("decision must be approved or rejected")
|
||||
approval = self.approvals[approval_id]
|
||||
approval.state = decision
|
||||
approval.decided_by = ctx.user_id
|
||||
approval.decision_reason = reason
|
||||
approval.updated_at = utc_now()
|
||||
self.append_audit(ctx, f"portal.approvals.{decision}", approval.scope, approval.group_id, "approval", approval.id)
|
||||
return approval
|
||||
|
||||
def create_alert(self, ctx: PortalContext, level: str, message: str, scope: str | None = None, source: str = "portal") -> AlertRecord:
|
||||
if level not in {"info", "warning", "high", "critical"}:
|
||||
raise ValueError("invalid alert level")
|
||||
alert_scope = scope or ctx.natural_scope()
|
||||
alert = AlertRecord(
|
||||
id=f"alt_{uuid4().hex[:12]}",
|
||||
level=level,
|
||||
message=message,
|
||||
scope=alert_scope,
|
||||
group_id=ctx.group_id if alert_scope == SCOPE_GROUP else None,
|
||||
owner_user_id=ctx.user_id if alert_scope == SCOPE_SELF else None,
|
||||
source=source,
|
||||
)
|
||||
self.alerts[alert.id] = alert
|
||||
self.append_audit(ctx, "portal.alerts.create", alert.scope, alert.group_id, "alert", alert.id)
|
||||
return alert
|
||||
|
||||
def resolve_alert(self, ctx: PortalContext, alert_id: str) -> AlertRecord:
|
||||
alert = self.alerts[alert_id]
|
||||
alert.state = "resolved"
|
||||
alert.updated_at = utc_now()
|
||||
self.append_audit(ctx, "portal.alerts.resolve", alert.scope, alert.group_id, "alert", alert.id)
|
||||
return alert
|
||||
|
||||
def append_audit(
|
||||
self,
|
||||
ctx: PortalContext,
|
||||
action: str,
|
||||
scope: str | None = None,
|
||||
group_id: str | None = None,
|
||||
resource_type: str = "portal",
|
||||
resource_id: str | None = None,
|
||||
outcome: str = "success",
|
||||
detail: dict[str, Any] | None = None,
|
||||
) -> AuditEvent:
|
||||
event = AuditEvent(
|
||||
id=f"aud_{uuid4().hex[:12]}",
|
||||
actor_id=ctx.user_id,
|
||||
action=action,
|
||||
scope=scope or ctx.natural_scope(),
|
||||
group_id=group_id or ctx.group_id,
|
||||
resource_type=resource_type,
|
||||
resource_id=resource_id,
|
||||
outcome=outcome,
|
||||
detail=detail or {},
|
||||
)
|
||||
self.audit_events.append(event)
|
||||
return event
|
||||
|
||||
def list_approvals(self, ctx: PortalContext) -> list[ApprovalRequest]:
|
||||
return [a for a in self.approvals.values() if self._visible(ctx, a.scope, a.requester_id, a.group_id)]
|
||||
|
||||
def list_alerts(self, ctx: PortalContext) -> list[AlertRecord]:
|
||||
return [a for a in self.alerts.values() if self._visible(ctx, a.scope, a.owner_user_id, a.group_id)]
|
||||
|
||||
def list_audit(self, ctx: PortalContext) -> list[AuditEvent]:
|
||||
return [a for a in self.audit_events if self._visible(ctx, a.scope, a.actor_id, a.group_id)]
|
||||
|
||||
def _visible(self, ctx: PortalContext, scope: str, owner_user_id: str | None, group_id: str | None) -> bool:
|
||||
if ctx.role == ROLE_OWNER:
|
||||
return True
|
||||
if scope == SCOPE_SELF:
|
||||
return owner_user_id in (None, ctx.user_id)
|
||||
if ctx.role == ROLE_GROUP_ADMIN and scope == SCOPE_GROUP:
|
||||
return bool(ctx.group_id and group_id == ctx.group_id)
|
||||
return False
|
||||
|
||||
|
||||
class PortalDashboardService:
|
||||
def __init__(self, repo: PortalRepository | None = None, rbac: PortalRBACService | None = None):
|
||||
self.repo = repo or PortalRepository()
|
||||
self.rbac = rbac or PortalRBACService()
|
||||
|
||||
def dashboard(self, ctx: PortalContext) -> dict[str, Any]:
|
||||
resource = PortalResource(scope=ctx.natural_scope(), owner_user_id=ctx.user_id, group_id=ctx.group_id)
|
||||
decision = self.rbac.authorize(ctx, "portal.dashboard.read", resource)
|
||||
if not decision.allowed:
|
||||
return {"status": "forbidden", "decision": decision.to_dict(), "modules": []}
|
||||
return {
|
||||
"status": "ok",
|
||||
"role": ctx.role,
|
||||
"scope": ctx.natural_scope(),
|
||||
"user_id": ctx.user_id,
|
||||
"group_id": ctx.group_id,
|
||||
"modules": self.rbac.visible_modules(ctx),
|
||||
"counters": {
|
||||
"approvals": len(self.repo.list_approvals(ctx)),
|
||||
"alerts": len([a for a in self.repo.list_alerts(ctx) if a.state == "open"]),
|
||||
"audit_events": len(self.repo.list_audit(ctx)),
|
||||
},
|
||||
}
|
||||
|
||||
def owner_cockpit(self, ctx: PortalContext, runtime: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
decision = self.rbac.authorize(ctx, "portal.system.read", PortalResource(scope=SCOPE_GLOBAL))
|
||||
if not decision.allowed:
|
||||
return {"status": "forbidden", "decision": decision.to_dict()}
|
||||
runtime = runtime or {}
|
||||
return {
|
||||
"status": "ok",
|
||||
"scope": SCOPE_GLOBAL,
|
||||
"runtime": {
|
||||
"service": runtime.get("service", "unknown"),
|
||||
"status": runtime.get("status", "unknown"),
|
||||
"workspace_branch": runtime.get("workspace_branch"),
|
||||
},
|
||||
"gitops": {
|
||||
"mode": runtime.get("mode", "git_patch_only"),
|
||||
"sync_status": runtime.get("sync_status", "unknown"),
|
||||
},
|
||||
"security": {
|
||||
"human_shortlinks": "login_required",
|
||||
"secrets_in_git": False,
|
||||
"direct_main_push": False,
|
||||
},
|
||||
"models": {
|
||||
"custom_llm": bool(runtime.get("custom_llm", True)),
|
||||
"user_priority": bool(runtime.get("user_model_priority", True)),
|
||||
},
|
||||
"ops": {
|
||||
"open_alerts": len([a for a in self.repo.alerts.values() if a.state == "open"]),
|
||||
"pending_approvals": len([a for a in self.repo.approvals.values() if a.state == "pending"]),
|
||||
"audit_events": len(self.repo.audit_events),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
class PortalOpsService:
|
||||
def __init__(self, repo: PortalRepository | None = None, rbac: PortalRBACService | None = None):
|
||||
self.repo = repo or PortalRepository()
|
||||
self.rbac = rbac or PortalRBACService()
|
||||
self.dashboard_service = PortalDashboardService(self.repo, self.rbac)
|
||||
|
||||
def check_rbac(self, ctx: PortalContext, action: str, resource: PortalResource | None = None) -> dict[str, Any]:
|
||||
return self.rbac.authorize(ctx, action, resource).to_dict()
|
||||
|
||||
def dashboard(self, ctx: PortalContext) -> dict[str, Any]:
|
||||
return self.dashboard_service.dashboard(ctx)
|
||||
|
||||
def owner_cockpit(self, ctx: PortalContext, runtime: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
return self.dashboard_service.owner_cockpit(ctx, runtime)
|
||||
|
||||
def create_approval(self, ctx: PortalContext, request_type: str, payload: dict[str, Any] | None = None, target: str | None = None) -> dict[str, Any]:
|
||||
decision = self.rbac.authorize(ctx, "portal.approvals.create", PortalResource(scope=ctx.natural_scope(), owner_user_id=ctx.user_id, group_id=ctx.group_id))
|
||||
if not decision.allowed:
|
||||
return {"status": "forbidden", "decision": decision.to_dict()}
|
||||
approval = self.repo.create_approval(ctx, request_type, payload, target)
|
||||
return {"status": "ok", "approval": approval.to_dict()}
|
||||
|
||||
def decide_approval(self, ctx: PortalContext, approval_id: str, decision_value: str, reason: str | None = None) -> dict[str, Any]:
|
||||
approval = self.repo.approvals[approval_id]
|
||||
decision = self.rbac.authorize(ctx, "portal.approvals.decide", PortalResource(scope=approval.scope, group_id=approval.group_id, owner_user_id=approval.requester_id))
|
||||
if not decision.allowed:
|
||||
return {"status": "forbidden", "decision": decision.to_dict()}
|
||||
updated = self.repo.decide_approval(ctx, approval_id, decision_value, reason)
|
||||
return {"status": "ok", "approval": updated.to_dict()}
|
||||
|
||||
def create_alert(self, ctx: PortalContext, level: str, message: str, scope: str | None = None, source: str = "portal") -> dict[str, Any]:
|
||||
requested_scope = scope or ctx.natural_scope()
|
||||
decision = self.rbac.authorize(ctx, "portal.alerts.read", PortalResource(scope=requested_scope, group_id=ctx.group_id, owner_user_id=ctx.user_id))
|
||||
if not decision.allowed:
|
||||
return {"status": "forbidden", "decision": decision.to_dict()}
|
||||
alert = self.repo.create_alert(ctx, level, message, requested_scope, source)
|
||||
return {"status": "ok", "alert": alert.to_dict()}
|
||||
|
||||
def list_alerts(self, ctx: PortalContext) -> dict[str, Any]:
|
||||
return {"status": "ok", "alerts": [a.to_dict() for a in self.repo.list_alerts(ctx)]}
|
||||
|
||||
def list_approvals(self, ctx: PortalContext) -> dict[str, Any]:
|
||||
return {"status": "ok", "approvals": [a.to_dict() for a in self.repo.list_approvals(ctx)]}
|
||||
|
||||
def list_audit(self, ctx: PortalContext) -> dict[str, Any]:
|
||||
return {"status": "ok", "audit": [a.to_dict() for a in self.repo.list_audit(ctx)]}
|
||||
|
||||
def run_self_loop(self) -> dict[str, Any]:
|
||||
owner = PortalContext("owner", ROLE_OWNER)
|
||||
group_admin = PortalContext("admin", ROLE_GROUP_ADMIN, "g1")
|
||||
user = PortalContext("user", ROLE_USER, "g1")
|
||||
self.create_alert(owner, "info", "self-loop-started", SCOPE_GLOBAL, "self_loop")
|
||||
approval = self.create_approval(user, "model_priority_change", {"model": "default"}, "model_priority")
|
||||
approval_id = approval["approval"]["id"]
|
||||
decision = self.decide_approval(group_admin, approval_id, "approved", "self-loop group approval")
|
||||
return {
|
||||
"status": "ok",
|
||||
"checks": {
|
||||
"user_dashboard": self.dashboard(user)["status"] == "ok",
|
||||
"group_admin_dashboard": self.dashboard(group_admin)["status"] == "ok",
|
||||
"owner_cockpit": self.owner_cockpit(owner)["status"] == "ok",
|
||||
"approval_decision": decision["status"] == "ok",
|
||||
"audit_written": len(self.repo.audit_events) >= 3,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def build_context(user_id: str, role: str = ROLE_USER, group_id: str | None = None, display_name: str | None = None) -> PortalContext:
|
||||
return PortalContext(user_id=user_id, role=role, group_id=group_id, display_name=display_name)
|
||||
|
||||
|
||||
__all__ = [
|
||||
"ROLE_USER",
|
||||
"ROLE_GROUP_ADMIN",
|
||||
"ROLE_OWNER",
|
||||
"ROLES",
|
||||
"SCOPE_SELF",
|
||||
"SCOPE_GROUP",
|
||||
"SCOPE_GLOBAL",
|
||||
"PortalContext",
|
||||
"PortalResource",
|
||||
"RBACDecision",
|
||||
"ApprovalRequest",
|
||||
"AlertRecord",
|
||||
"AuditEvent",
|
||||
"PortalRBACService",
|
||||
"PortalRepository",
|
||||
"PortalDashboardService",
|
||||
"PortalOpsService",
|
||||
"build_context",
|
||||
]
|
||||
@@ -1,239 +0,0 @@
|
||||
"""HTTP routes for the three-role user portal.
|
||||
|
||||
The router is FastAPI-compatible but keeps handlers as plain functions so tests and
|
||||
agent self-checks can exercise the contract without booting an ASGI server.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
try: # pragma: no cover - optional runtime dependency
|
||||
from fastapi import APIRouter, Header, HTTPException
|
||||
except Exception: # pragma: no cover - test/runtime fallback
|
||||
APIRouter = None
|
||||
Header = None
|
||||
HTTPException = RuntimeError
|
||||
|
||||
from .portal_rbac_ops import (
|
||||
ROLE_GROUP_ADMIN,
|
||||
ROLE_OWNER,
|
||||
ROLE_USER,
|
||||
SCOPE_GLOBAL,
|
||||
PortalOpsService,
|
||||
PortalResource,
|
||||
build_context,
|
||||
)
|
||||
|
||||
portal_ops_service = PortalOpsService()
|
||||
|
||||
|
||||
def context_from_headers(
|
||||
user_id: str | None = None,
|
||||
role: str | None = None,
|
||||
group_id: str | None = None,
|
||||
display_name: str | None = None,
|
||||
):
|
||||
return build_context(
|
||||
user_id=user_id or "anonymous",
|
||||
role=role or ROLE_USER,
|
||||
group_id=group_id,
|
||||
display_name=display_name,
|
||||
)
|
||||
|
||||
|
||||
def get_portal_dashboard(role: str, user_id: str = "anonymous", group_id: str | None = None) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.dashboard(ctx)
|
||||
|
||||
|
||||
def get_owner_system_cockpit(user_id: str = "owner", runtime: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=ROLE_OWNER)
|
||||
return portal_ops_service.owner_cockpit(ctx, runtime)
|
||||
|
||||
|
||||
def check_portal_rbac(
|
||||
role: str,
|
||||
action: str,
|
||||
user_id: str = "anonymous",
|
||||
group_id: str | None = None,
|
||||
scope: str | None = None,
|
||||
owner_user_id: str | None = None,
|
||||
resource_group_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
resource = PortalResource(
|
||||
scope=scope or ctx.natural_scope(),
|
||||
owner_user_id=owner_user_id or user_id,
|
||||
group_id=resource_group_id or group_id,
|
||||
)
|
||||
return portal_ops_service.check_rbac(ctx, action, resource)
|
||||
|
||||
|
||||
def create_portal_approval(
|
||||
role: str,
|
||||
request_type: str,
|
||||
user_id: str = "anonymous",
|
||||
group_id: str | None = None,
|
||||
payload: dict[str, Any] | None = None,
|
||||
target: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.create_approval(ctx, request_type, payload, target)
|
||||
|
||||
|
||||
def decide_portal_approval(
|
||||
approval_id: str,
|
||||
decision: str,
|
||||
role: str,
|
||||
user_id: str,
|
||||
group_id: str | None = None,
|
||||
reason: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.decide_approval(ctx, approval_id, decision, reason)
|
||||
|
||||
|
||||
def list_portal_alerts(role: str, user_id: str = "anonymous", group_id: str | None = None) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.list_alerts(ctx)
|
||||
|
||||
|
||||
def create_portal_alert(
|
||||
role: str,
|
||||
level: str,
|
||||
message: str,
|
||||
user_id: str = "anonymous",
|
||||
group_id: str | None = None,
|
||||
scope: str | None = None,
|
||||
source: str = "portal",
|
||||
) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.create_alert(ctx, level, message, scope, source)
|
||||
|
||||
|
||||
def list_portal_approvals(role: str, user_id: str = "anonymous", group_id: str | None = None) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.list_approvals(ctx)
|
||||
|
||||
|
||||
def list_portal_audit_events(role: str, user_id: str = "anonymous", group_id: str | None = None) -> dict[str, Any]:
|
||||
ctx = context_from_headers(user_id=user_id, role=role, group_id=group_id)
|
||||
return portal_ops_service.list_audit(ctx)
|
||||
|
||||
|
||||
def run_portal_self_loop() -> dict[str, Any]:
|
||||
return portal_ops_service.run_self_loop()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
|
||||
router = APIRouter(prefix="/portal", tags=["portal"])
|
||||
|
||||
@router.get("/dashboard", operation_id="getPortalDashboard")
|
||||
def dashboard(
|
||||
x_user_id: str | None = Header(default=None),
|
||||
x_portal_role: str | None = Header(default=None),
|
||||
x_group_id: str | None = Header(default=None),
|
||||
):
|
||||
return get_portal_dashboard(x_portal_role or ROLE_USER, x_user_id or "anonymous", x_group_id)
|
||||
|
||||
@router.post("/rbac/check", operation_id="checkPortalRBAC")
|
||||
def rbac_check(payload: dict[str, Any]):
|
||||
return check_portal_rbac(
|
||||
role=payload.get("role", ROLE_USER),
|
||||
action=payload["action"],
|
||||
user_id=payload.get("user_id", "anonymous"),
|
||||
group_id=payload.get("group_id"),
|
||||
scope=payload.get("scope"),
|
||||
owner_user_id=payload.get("owner_user_id"),
|
||||
resource_group_id=payload.get("resource_group_id"),
|
||||
)
|
||||
|
||||
@router.post("/approvals", operation_id="createPortalApproval")
|
||||
def create_approval(payload: dict[str, Any]):
|
||||
return create_portal_approval(
|
||||
role=payload.get("role", ROLE_USER),
|
||||
request_type=payload["request_type"],
|
||||
user_id=payload.get("user_id", "anonymous"),
|
||||
group_id=payload.get("group_id"),
|
||||
payload=payload.get("payload"),
|
||||
target=payload.get("target"),
|
||||
)
|
||||
|
||||
@router.post("/approvals/{approval_id}/decision", operation_id="decidePortalApproval")
|
||||
def decide_approval(approval_id: str, payload: dict[str, Any]):
|
||||
return decide_portal_approval(
|
||||
approval_id=approval_id,
|
||||
decision=payload["decision"],
|
||||
role=payload.get("role", ROLE_GROUP_ADMIN),
|
||||
user_id=payload.get("user_id", "anonymous"),
|
||||
group_id=payload.get("group_id"),
|
||||
reason=payload.get("reason"),
|
||||
)
|
||||
|
||||
@router.get("/approvals", operation_id="listPortalApprovals")
|
||||
def approvals(
|
||||
x_user_id: str | None = Header(default=None),
|
||||
x_portal_role: str | None = Header(default=None),
|
||||
x_group_id: str | None = Header(default=None),
|
||||
):
|
||||
return list_portal_approvals(x_portal_role or ROLE_USER, x_user_id or "anonymous", x_group_id)
|
||||
|
||||
@router.get("/alerts", operation_id="listPortalAlerts")
|
||||
def alerts(
|
||||
x_user_id: str | None = Header(default=None),
|
||||
x_portal_role: str | None = Header(default=None),
|
||||
x_group_id: str | None = Header(default=None),
|
||||
):
|
||||
return list_portal_alerts(x_portal_role or ROLE_USER, x_user_id or "anonymous", x_group_id)
|
||||
|
||||
@router.post("/alerts", operation_id="createPortalAlert")
|
||||
def create_alert(payload: dict[str, Any]):
|
||||
return create_portal_alert(
|
||||
role=payload.get("role", ROLE_USER),
|
||||
level=payload["level"],
|
||||
message=payload["message"],
|
||||
user_id=payload.get("user_id", "anonymous"),
|
||||
group_id=payload.get("group_id"),
|
||||
scope=payload.get("scope"),
|
||||
source=payload.get("source", "portal"),
|
||||
)
|
||||
|
||||
@router.get("/audit", operation_id="listPortalAuditEvents")
|
||||
def audit(
|
||||
x_user_id: str | None = Header(default=None),
|
||||
x_portal_role: str | None = Header(default=None),
|
||||
x_group_id: str | None = Header(default=None),
|
||||
):
|
||||
return list_portal_audit_events(x_portal_role or ROLE_USER, x_user_id or "anonymous", x_group_id)
|
||||
|
||||
@router.get("/owner/system", operation_id="getOwnerSystemCockpit")
|
||||
def owner_system(x_user_id: str | None = Header(default=None)):
|
||||
return get_owner_system_cockpit(x_user_id or "owner")
|
||||
|
||||
@router.post("/self-loop", operation_id="runPortalSelfLoop")
|
||||
def self_loop():
|
||||
return run_portal_self_loop()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = [
|
||||
"router",
|
||||
"build_router",
|
||||
"context_from_headers",
|
||||
"get_portal_dashboard",
|
||||
"get_owner_system_cockpit",
|
||||
"check_portal_rbac",
|
||||
"create_portal_approval",
|
||||
"decide_portal_approval",
|
||||
"list_portal_alerts",
|
||||
"list_portal_approvals",
|
||||
"list_portal_audit_events",
|
||||
"run_portal_self_loop",
|
||||
]
|
||||
@@ -1,69 +0,0 @@
|
||||
"""Production acceptance gate for self-loop promotion.
|
||||
|
||||
The gate verifies runtime, GitOps policy, portal readiness, and security rules
|
||||
before any promotion request can proceed.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GateCheck:
|
||||
name: str
|
||||
passed: bool
|
||||
detail: str
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProductionGateResult:
|
||||
status: str
|
||||
checks: tuple[GateCheck, ...]
|
||||
owner_approval_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"checks": [c.to_dict() for c in self.checks],
|
||||
"owner_approval_required": self.owner_approval_required,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class ProductionAcceptanceGate:
|
||||
def evaluate(
|
||||
self,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
acceptance: dict[str, Any],
|
||||
owner_approval_required: bool = True,
|
||||
) -> ProductionGateResult:
|
||||
checks = (
|
||||
GateCheck("runtime_active", runtime.get("status") == "active", "runtime status"),
|
||||
GateCheck("git_patch_only", baseline.get("update_mode") == "git_patch_only", "patch-only policy"),
|
||||
GateCheck("no_direct_main_push", baseline.get("codex_gitops", {}).get("direct_main_push") is False, "main push guard"),
|
||||
GateCheck("acceptance_passed", acceptance.get("status") in {"pass", "waiting_owner_gate"}, "acceptance pipeline"),
|
||||
GateCheck("no_secrets", baseline.get("codex_gitops", {}).get("api_keys_in_git") is False, "secret policy"),
|
||||
)
|
||||
passed = all(check.passed for check in checks)
|
||||
if not passed:
|
||||
status = "blocked"
|
||||
elif owner_approval_required:
|
||||
status = "waiting_owner_approval"
|
||||
else:
|
||||
status = "ready_for_promotion"
|
||||
return ProductionGateResult(status, checks, owner_approval_required)
|
||||
|
||||
|
||||
__all__ = ["GateCheck", "ProductionGateResult", "ProductionAcceptanceGate"]
|
||||
@@ -0,0 +1,92 @@
|
||||
"""Agent adapters for AIOS Search Gateway.
|
||||
|
||||
All runtime agents should call SearchGatewayAgentAdapter instead of performing
|
||||
ad-hoc network search. This gives consistent provider fallback, profile
|
||||
resolution, evidence capture, audit and event visibility.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from typing import Any
|
||||
|
||||
from .search_gateway_orchestrator import SearchGatewayOrchestrator
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentSearchContext:
|
||||
agent: str
|
||||
user_id: str | None = None
|
||||
group_id: str | None = None
|
||||
role: str = "user"
|
||||
group_profile: dict[str, Any] | None = None
|
||||
user_profile: dict[str, Any] | None = None
|
||||
session_profile: dict[str, Any] | None = None
|
||||
authorized_sources: list[str] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SearchGatewayAgentAdapter:
|
||||
def __init__(self, orchestrator: SearchGatewayOrchestrator | None = None):
|
||||
self.orchestrator = orchestrator or SearchGatewayOrchestrator()
|
||||
|
||||
def search(
|
||||
self,
|
||||
query: str,
|
||||
context: AgentSearchContext,
|
||||
intent: str = "general",
|
||||
region: str | None = None,
|
||||
time_range: str | None = None,
|
||||
data_type: str | None = None,
|
||||
domain_profiles: list[str] | None = None,
|
||||
user_scope: str = "public",
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
payload = {
|
||||
"query": query,
|
||||
"requester": context.agent,
|
||||
"intent": intent,
|
||||
"region": region,
|
||||
"time_range": time_range,
|
||||
"data_type": data_type,
|
||||
"domain_profiles": domain_profiles or [],
|
||||
"user_scope": user_scope,
|
||||
"authorized_sources": context.authorized_sources,
|
||||
"group_profile": context.group_profile,
|
||||
"user_profile": context.user_profile,
|
||||
"session_profile": context.session_profile,
|
||||
"correlation_id": correlation_id,
|
||||
}
|
||||
return self.orchestrator.execute(payload)
|
||||
|
||||
|
||||
class OpenClawSearchClient(SearchGatewayAgentAdapter):
|
||||
def search_public(self, query: str, context: AgentSearchContext, **kwargs) -> dict[str, Any]:
|
||||
return self.search(query, context, user_scope="public", **kwargs)
|
||||
|
||||
|
||||
class HermesSearchClient(SearchGatewayAgentAdapter):
|
||||
def delegate_search(self, query: str, context: AgentSearchContext, **kwargs) -> dict[str, Any]:
|
||||
return self.search(query, context, **kwargs)
|
||||
|
||||
|
||||
class CodexSearchClient(SearchGatewayAgentAdapter):
|
||||
def technical_search(self, query: str, context: AgentSearchContext, **kwargs) -> dict[str, Any]:
|
||||
return self.search(query, context, intent=kwargs.pop("intent", "software_library"), **kwargs)
|
||||
|
||||
|
||||
class CustomGPTSearchClient(SearchGatewayAgentAdapter):
|
||||
def user_search(self, query: str, context: AgentSearchContext, **kwargs) -> dict[str, Any]:
|
||||
return self.search(query, context, **kwargs)
|
||||
|
||||
|
||||
__all__ = [
|
||||
"AgentSearchContext",
|
||||
"SearchGatewayAgentAdapter",
|
||||
"OpenClawSearchClient",
|
||||
"HermesSearchClient",
|
||||
"CodexSearchClient",
|
||||
"CustomGPTSearchClient",
|
||||
]
|
||||
@@ -0,0 +1,73 @@
|
||||
"""Architect governance integration for Search Gateway.
|
||||
|
||||
Search Gateway is a shared platform capability. The Architect Agent periodically
|
||||
reviews provider health, external search/browser capabilities, cost, security and
|
||||
privacy impact, then emits C/R/V recommendations.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchArchitectureFinding:
|
||||
finding_id: str
|
||||
title: str
|
||||
impact: str
|
||||
recommendation: str
|
||||
evidence: list[str] = field(default_factory=list)
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchArchitectureDecision:
|
||||
status: str
|
||||
version_bump: str
|
||||
reason: str
|
||||
findings: list[SearchArchitectureFinding]
|
||||
owner_gate_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"version_bump": self.version_bump,
|
||||
"reason": self.reason,
|
||||
"findings": [f.to_dict() for f in self.findings],
|
||||
"owner_gate_required": self.owner_gate_required,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class SearchArchitectIntegration:
|
||||
def review(self, signals: dict[str, Any]) -> SearchArchitectureDecision:
|
||||
findings: list[SearchArchitectureFinding] = []
|
||||
if signals.get("provider_breaking_change"):
|
||||
findings.append(SearchArchitectureFinding("search-provider-breaking", "Provider breaking change", "breaking", "owner_review"))
|
||||
if signals.get("new_search_capability"):
|
||||
findings.append(SearchArchitectureFinding("search-new-capability", "New search capability available", "architecture", "evaluate_adoption"))
|
||||
if signals.get("cost_increase"):
|
||||
findings.append(SearchArchitectureFinding("search-cost", "Search provider cost increase", "minor", "optimize_provider_order"))
|
||||
if signals.get("security_advisory"):
|
||||
findings.append(SearchArchitectureFinding("search-security", "Search security advisory", "breaking", "owner_review"))
|
||||
|
||||
if any(f.impact == "breaking" for f in findings):
|
||||
return SearchArchitectureDecision("action_required", "V", "breaking search ecosystem/security change", findings, True)
|
||||
if any(f.impact == "architecture" for f in findings):
|
||||
return SearchArchitectureDecision("optimization_recommended", "R", "new search capability may improve architecture", findings, True)
|
||||
if findings:
|
||||
return SearchArchitectureDecision("minor_change_recommended", "C", "compatible provider optimization", findings, False)
|
||||
return SearchArchitectureDecision("no_action", "none", "no relevant search architecture change", findings, False)
|
||||
|
||||
|
||||
__all__ = ["SearchArchitectureFinding", "SearchArchitectureDecision", "SearchArchitectIntegration"]
|
||||
@@ -0,0 +1,27 @@
|
||||
"""Audit storage for Search Gateway executions."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
|
||||
class SearchAuditStore:
|
||||
def __init__(self, root: str = "runtime/search-gateway/audit"):
|
||||
self.root = Path(root)
|
||||
self.root.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def append(self, record: dict[str, Any]) -> str:
|
||||
path = self.root / f"{record.get('request_id', 'search')}.json"
|
||||
path.write_text(json.dumps(record, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
return str(path)
|
||||
|
||||
def list_recent(self) -> list[dict[str, Any]]:
|
||||
result = []
|
||||
for path in sorted(self.root.glob("*.json")):
|
||||
result.append(json.loads(path.read_text(encoding="utf-8")))
|
||||
return result[-50:]
|
||||
|
||||
|
||||
__all__ = ["SearchAuditStore"]
|
||||
@@ -0,0 +1,118 @@
|
||||
"""Search Gateway event bridge.
|
||||
|
||||
Publishes normalized search lifecycle events into the AIOS Agent Event Bus when a
|
||||
bus is available, with an in-memory fallback for tests and offline runs.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Protocol
|
||||
from uuid import uuid4
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class SearchEventPublisher(Protocol):
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
...
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchEvent:
|
||||
id: str
|
||||
kind: str
|
||||
source: str
|
||||
target: str
|
||||
summary: str
|
||||
payload: dict[str, Any]
|
||||
correlation_id: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class InMemorySearchEventBus:
|
||||
def __init__(self):
|
||||
self.events: list[dict[str, Any]] = []
|
||||
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
event = SearchEvent(
|
||||
id=f"search_evt_{uuid4().hex[:12]}",
|
||||
kind=kind,
|
||||
source=source,
|
||||
target=target,
|
||||
summary=summary,
|
||||
payload=payload,
|
||||
correlation_id=correlation_id,
|
||||
).to_dict()
|
||||
self.events.append(event)
|
||||
return event
|
||||
|
||||
|
||||
class SearchEventBridge:
|
||||
def __init__(self, bus: SearchEventPublisher | None = None):
|
||||
self.bus = bus or InMemorySearchEventBus()
|
||||
|
||||
def search_started(self, request: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="search_started",
|
||||
source=request.get("requester", "unknown"),
|
||||
target="search-gateway",
|
||||
summary=request.get("query", "search started"),
|
||||
payload=request,
|
||||
correlation_id=request.get("correlation_id"),
|
||||
)
|
||||
|
||||
def provider_attempted(self, request_id: str, attempt: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="search_provider_attempted",
|
||||
source="search-gateway",
|
||||
target=attempt.get("provider", "unknown"),
|
||||
summary=f"provider {attempt.get('provider', 'unknown')} {attempt.get('status', 'attempted')}",
|
||||
payload=attempt,
|
||||
correlation_id=request_id,
|
||||
)
|
||||
|
||||
def fallback_triggered(self, request_id: str, reason: str) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="search_fallback_triggered",
|
||||
source="search-gateway",
|
||||
target="search-provider-router",
|
||||
summary=reason,
|
||||
payload={"reason": reason},
|
||||
correlation_id=request_id,
|
||||
)
|
||||
|
||||
def search_completed(self, response: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="search_completed",
|
||||
source="search-gateway",
|
||||
target=response.get("requester", "requester"),
|
||||
summary=f"search {response.get('status', 'completed')}",
|
||||
payload=response,
|
||||
correlation_id=response.get("request_id"),
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["SearchEvent", "InMemorySearchEventBus", "SearchEventBridge"]
|
||||
@@ -0,0 +1,252 @@
|
||||
"""Governed general-purpose Search Gateway for AIOS.
|
||||
|
||||
The gateway coordinates query planning, provider routing, fallback, evidence
|
||||
normalization and compliance checks. It is provider-agnostic: runtime workers plug
|
||||
in public or explicitly authorized search providers.
|
||||
|
||||
Search is a shared capability. Groups and users may customize provider order,
|
||||
trusted domains, query expansion hints and domain profiles, but customization may
|
||||
not override hard authorization, privacy, safety or audit rules.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Protocol
|
||||
from uuid import uuid4
|
||||
|
||||
from .search_profile_resolver import DomainQueryProfileRegistry, SearchProfile, SearchProfileResolver
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchRequest:
|
||||
query: str
|
||||
requester: str
|
||||
intent: str = "general"
|
||||
region: str | None = None
|
||||
time_range: str | None = None
|
||||
data_type: str | None = None
|
||||
user_scope: str = "public"
|
||||
authorized_sources: list[str] = field(default_factory=list)
|
||||
domain_profiles: list[str] = field(default_factory=list)
|
||||
group_profile: dict[str, Any] | None = None
|
||||
user_profile: dict[str, Any] | None = None
|
||||
session_profile: dict[str, Any] | None = None
|
||||
correlation_id: str | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchEvidence:
|
||||
title: str
|
||||
url: str | None
|
||||
source: str
|
||||
snippet: str
|
||||
evidence_type: str = "web"
|
||||
confidence: str = "medium"
|
||||
retrieved_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchProviderAttempt:
|
||||
provider: str
|
||||
status: str
|
||||
result_count: int = 0
|
||||
reason: str = ""
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchResponse:
|
||||
request_id: str
|
||||
status: str
|
||||
answer: str
|
||||
evidence: list[SearchEvidence]
|
||||
attempts: list[SearchProviderAttempt]
|
||||
confidence: str
|
||||
expanded_queries: list[str] = field(default_factory=list)
|
||||
resolved_profile: dict[str, Any] | None = None
|
||||
need_clarification: list[str] = field(default_factory=list)
|
||||
blocked_reasons: list[str] = field(default_factory=list)
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"request_id": self.request_id,
|
||||
"status": self.status,
|
||||
"answer": self.answer,
|
||||
"evidence": [e.to_dict() for e in self.evidence],
|
||||
"attempts": [a.to_dict() for a in self.attempts],
|
||||
"confidence": self.confidence,
|
||||
"expanded_queries": self.expanded_queries,
|
||||
"resolved_profile": self.resolved_profile,
|
||||
"need_clarification": self.need_clarification,
|
||||
"blocked_reasons": self.blocked_reasons,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class SearchProvider(Protocol):
|
||||
name: str
|
||||
|
||||
def search(self, request: SearchRequest, queries: list[str]) -> tuple[list[SearchEvidence], SearchProviderAttempt]:
|
||||
...
|
||||
|
||||
|
||||
class QueryPlanner:
|
||||
def __init__(self, domain_registry: DomainQueryProfileRegistry | None = None):
|
||||
self.domain_registry = domain_registry or DomainQueryProfileRegistry()
|
||||
|
||||
def expand(self, request: SearchRequest, profile: SearchProfile) -> list[str]:
|
||||
base = request.query.strip()
|
||||
queries = [base]
|
||||
if request.region:
|
||||
queries.append(f"{request.region} {base}")
|
||||
if request.time_range:
|
||||
queries.append(f"{base} {request.time_range}")
|
||||
domain_profiles = list(dict.fromkeys([request.intent] + request.domain_profiles + profile.domain_profiles))
|
||||
hints = list(profile.query_expansion_hints) + self.domain_registry.hints_for(domain_profiles)
|
||||
for hint in hints:
|
||||
queries.append(f"{base} {hint}")
|
||||
for domain in profile.trusted_domains:
|
||||
queries.append(f"site:{domain} {base}")
|
||||
return list(dict.fromkeys([q for q in queries if q]))
|
||||
|
||||
|
||||
class SearchPolicyGuard:
|
||||
"""Blocks non-public or unauthorized collection patterns."""
|
||||
|
||||
FORBIDDEN_TERMS = (
|
||||
"绕过登录",
|
||||
"绕过验证码",
|
||||
"验证码绕过",
|
||||
"破解登录",
|
||||
"个人成绩",
|
||||
"学生隐私",
|
||||
"受保护平台批量爬取",
|
||||
)
|
||||
|
||||
def evaluate(self, request: SearchRequest, profile: SearchProfile) -> list[str]:
|
||||
q = request.query.lower()
|
||||
reasons: list[str] = []
|
||||
for term in self.FORBIDDEN_TERMS:
|
||||
if term.lower() in q:
|
||||
reasons.append(f"blocked_term:{term}")
|
||||
if request.user_scope not in {"public", "authorized_user_file", "authorized_link", "internal_archive"}:
|
||||
reasons.append(f"unsupported_scope:{request.user_scope}")
|
||||
if request.data_type in {"personal_grade", "student_private_data", "private_person_data"} and request.user_scope != "authorized_user_file":
|
||||
reasons.append("private_data_requires_user_authorized_file")
|
||||
if not profile.audit_required:
|
||||
reasons.append("audit_cannot_be_disabled")
|
||||
if not profile.fallback_required:
|
||||
reasons.append("fallback_cannot_be_disabled")
|
||||
return reasons
|
||||
|
||||
|
||||
class SearchGateway:
|
||||
def __init__(self, providers: list[SearchProvider] | None = None):
|
||||
self.providers = providers or []
|
||||
self.profile_resolver = SearchProfileResolver()
|
||||
self.planner = QueryPlanner()
|
||||
self.guard = SearchPolicyGuard()
|
||||
|
||||
def search(self, request: SearchRequest) -> SearchResponse:
|
||||
request_id = request.correlation_id or f"search_{uuid4().hex[:12]}"
|
||||
profile = self.profile_resolver.resolve(request.group_profile, request.user_profile, request.session_profile)
|
||||
expanded_queries = self.planner.expand(request, profile)
|
||||
blocked = self.guard.evaluate(request, profile)
|
||||
if blocked:
|
||||
return SearchResponse(
|
||||
request_id=request_id,
|
||||
status="blocked",
|
||||
answer="该搜索请求涉及未授权访问、验证码/登录绕过、受保护平台批量抓取或个人隐私数据,已阻断。可改为搜索公开网页、官方公告、公开文档,或处理用户授权上传的文件/链接。",
|
||||
evidence=[],
|
||||
attempts=[],
|
||||
confidence="high",
|
||||
expanded_queries=expanded_queries,
|
||||
resolved_profile=profile.to_dict(),
|
||||
blocked_reasons=blocked,
|
||||
)
|
||||
|
||||
evidence: list[SearchEvidence] = []
|
||||
attempts: list[SearchProviderAttempt] = []
|
||||
providers = self._ordered_providers(profile)
|
||||
for provider in providers:
|
||||
try:
|
||||
provider_evidence, attempt = provider.search(request, expanded_queries)
|
||||
evidence.extend(provider_evidence)
|
||||
attempts.append(attempt)
|
||||
if provider_evidence:
|
||||
break
|
||||
except Exception as exc:
|
||||
attempts.append(SearchProviderAttempt(provider=getattr(provider, "name", "unknown"), status="failed", reason=str(exc)))
|
||||
|
||||
if evidence:
|
||||
return SearchResponse(
|
||||
request_id=request_id,
|
||||
status="found",
|
||||
answer="已找到公开或授权来源结果。",
|
||||
evidence=evidence,
|
||||
attempts=attempts,
|
||||
confidence=self._confidence(evidence),
|
||||
expanded_queries=expanded_queries,
|
||||
resolved_profile=profile.to_dict(),
|
||||
)
|
||||
|
||||
return SearchResponse(
|
||||
request_id=request_id,
|
||||
status="not_found",
|
||||
answer="未找到足够可靠的公开或授权结果;已记录 provider 尝试和失败原因。",
|
||||
evidence=[],
|
||||
attempts=attempts,
|
||||
confidence="low",
|
||||
expanded_queries=expanded_queries,
|
||||
resolved_profile=profile.to_dict(),
|
||||
need_clarification=self._clarification(request),
|
||||
)
|
||||
|
||||
def _ordered_providers(self, profile: SearchProfile) -> list[SearchProvider]:
|
||||
if not self.providers:
|
||||
return []
|
||||
by_name = {provider.name: provider for provider in self.providers}
|
||||
ordered = [by_name[name] for name in profile.provider_order if name in by_name]
|
||||
remaining = [provider for provider in self.providers if provider.name not in {p.name for p in ordered}]
|
||||
return ordered + remaining
|
||||
|
||||
def _confidence(self, evidence: list[SearchEvidence]) -> str:
|
||||
if any(e.confidence == "high" for e in evidence):
|
||||
return "high"
|
||||
if evidence:
|
||||
return "medium"
|
||||
return "low"
|
||||
|
||||
def _clarification(self, request: SearchRequest) -> list[str]:
|
||||
if request.intent == "education_exam_data":
|
||||
return ["请补充学校名称、联考名称、年级、科目,以及需要试卷/答案还是成绩统计。"]
|
||||
if request.intent in {"company_research", "policy_regulation", "software_library", "product_research"}:
|
||||
return ["请补充主体名称、地区/版本、时间范围、需要的数据类型或可信来源范围。"]
|
||||
return ["请补充更具体的主体、平台、地区、时间、数据类型或授权文件/链接。"]
|
||||
|
||||
|
||||
__all__ = [
|
||||
"SearchRequest",
|
||||
"SearchEvidence",
|
||||
"SearchProviderAttempt",
|
||||
"SearchResponse",
|
||||
"SearchProvider",
|
||||
"QueryPlanner",
|
||||
"SearchPolicyGuard",
|
||||
"SearchGateway",
|
||||
]
|
||||
@@ -0,0 +1,65 @@
|
||||
"""API endpoints for AIOS Search Gateway."""
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .search_gateway import SearchGateway, SearchRequest
|
||||
from .search_gateway_dashboard import SearchGatewayDashboard
|
||||
|
||||
|
||||
gateway = SearchGateway()
|
||||
dashboard = SearchGatewayDashboard()
|
||||
|
||||
|
||||
def search_gateway_request(payload: dict[str, Any]) -> dict[str, Any]:
|
||||
request = SearchRequest(**payload)
|
||||
return gateway.search(request).to_dict()
|
||||
|
||||
|
||||
def get_search_gateway_status() -> dict[str, Any]:
|
||||
return {
|
||||
"module": "search-gateway",
|
||||
"status": "ready",
|
||||
"providers_configured": len(gateway.providers),
|
||||
"policy_guard": "enabled",
|
||||
"profile_customization": "enabled",
|
||||
"fallback_required_when_provider_unavailable": True,
|
||||
}
|
||||
|
||||
|
||||
def get_search_gateway_overview() -> dict[str, Any]:
|
||||
return dashboard.overview()
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/search", tags=["search-gateway"])
|
||||
|
||||
@router.get("/status", operation_id="getSearchGatewayStatus")
|
||||
def status():
|
||||
return get_search_gateway_status()
|
||||
|
||||
@router.get("/overview", operation_id="getSearchGatewayOverview")
|
||||
def overview():
|
||||
return get_search_gateway_overview()
|
||||
|
||||
@router.post("/query", operation_id="runSearchGatewayQuery")
|
||||
def query(payload: dict[str, Any]):
|
||||
return search_gateway_request(payload)
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = [
|
||||
"router",
|
||||
"search_gateway_request",
|
||||
"get_search_gateway_status",
|
||||
"get_search_gateway_overview",
|
||||
]
|
||||
@@ -0,0 +1,85 @@
|
||||
"""Search Gateway Web UI dashboard model."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchDashboardMetric:
|
||||
key: str
|
||||
title: str
|
||||
value: Any
|
||||
status: str = "ok"
|
||||
detail: str = ""
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchDashboardPanel:
|
||||
key: str
|
||||
title: str
|
||||
metrics: list[SearchDashboardMetric] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"key": self.key,
|
||||
"title": self.title,
|
||||
"metrics": [m.to_dict() for m in self.metrics],
|
||||
}
|
||||
|
||||
|
||||
class SearchGatewayDashboard:
|
||||
def overview(self, search_runs: list[dict[str, Any]] | None = None, providers: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
search_runs = search_runs or []
|
||||
providers = providers or []
|
||||
blocked = [r for r in search_runs if r.get("status") == "blocked"]
|
||||
not_found = [r for r in search_runs if r.get("status") == "not_found"]
|
||||
provider_failures = [p for p in providers if p.get("status") == "failed"]
|
||||
panels = [
|
||||
SearchDashboardPanel(
|
||||
"search_health",
|
||||
"搜索健康度",
|
||||
[
|
||||
SearchDashboardMetric("total_runs", "搜索请求数", len(search_runs)),
|
||||
SearchDashboardMetric("not_found", "未找到结果", len(not_found), "warn" if not_found else "ok"),
|
||||
SearchDashboardMetric("blocked", "合规阻断", len(blocked), "warn" if blocked else "ok"),
|
||||
],
|
||||
),
|
||||
SearchDashboardPanel(
|
||||
"provider_health",
|
||||
"Provider 可用性",
|
||||
[
|
||||
SearchDashboardMetric("providers", "Provider 数量", len(providers)),
|
||||
SearchDashboardMetric("provider_failures", "Provider 失败", len(provider_failures), "warn" if provider_failures else "ok"),
|
||||
],
|
||||
),
|
||||
SearchDashboardPanel(
|
||||
"evidence_quality",
|
||||
"证据质量",
|
||||
[
|
||||
SearchDashboardMetric("with_evidence", "有证据的回答", len([r for r in search_runs if r.get("evidence")])) ,
|
||||
SearchDashboardMetric("fallback_required", "要求多源降级", True),
|
||||
],
|
||||
),
|
||||
]
|
||||
return {
|
||||
"module": "search-gateway",
|
||||
"route": "/admin/ai-evolution/search",
|
||||
"title": "AIOS 联网搜索治理中心",
|
||||
"status": "attention_required" if provider_failures else "healthy",
|
||||
"generated_at": utc_now(),
|
||||
"panels": [p.to_dict() for p in panels],
|
||||
"recent_runs": search_runs[-20:],
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["SearchDashboardMetric", "SearchDashboardPanel", "SearchGatewayDashboard"]
|
||||
@@ -0,0 +1,41 @@
|
||||
"""Runtime orchestrator joining Search Gateway, registry, audit and events."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from .search_audit_store import SearchAuditStore
|
||||
from .search_event_bridge import SearchEventBridge
|
||||
from .search_gateway import SearchGateway, SearchRequest
|
||||
from .search_provider_registry import SearchProviderRegistry
|
||||
|
||||
|
||||
class SearchGatewayOrchestrator:
|
||||
def __init__(self):
|
||||
self.registry = SearchProviderRegistry()
|
||||
self.audit = SearchAuditStore()
|
||||
self.events = SearchEventBridge()
|
||||
self.gateway = SearchGateway(self.registry.ordered())
|
||||
|
||||
def execute(self, payload: dict[str, Any]) -> dict[str, Any]:
|
||||
request = SearchRequest(**payload)
|
||||
self.events.search_started(request.to_dict())
|
||||
response = self.gateway.search(request)
|
||||
result = response.to_dict()
|
||||
for attempt in result.get("attempts", []):
|
||||
self.events.provider_attempted(result["request_id"], attempt)
|
||||
if len(result.get("attempts", [])) > 1:
|
||||
self.events.fallback_triggered(result["request_id"], "multiple providers attempted")
|
||||
self.audit.append(result)
|
||||
self.events.search_completed(result)
|
||||
return result
|
||||
|
||||
def status(self) -> dict[str, Any]:
|
||||
return {
|
||||
"registry": self.registry.status(),
|
||||
"audit": "enabled",
|
||||
"events": "enabled",
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["SearchGatewayOrchestrator"]
|
||||
@@ -0,0 +1,124 @@
|
||||
"""Search profile resolver for general-purpose AIOS Search Gateway.
|
||||
|
||||
The Search Gateway is a shared platform capability. Groups and users may customize
|
||||
provider preference, query expansion hints, trusted sources and domain profiles on
|
||||
top of the shared base profile. Customization is intentionally layered and cannot
|
||||
override hard safety, authorization or audit rules.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from typing import Any
|
||||
|
||||
|
||||
HARD_BLOCKED_BEHAVIORS = {
|
||||
"bypass_login",
|
||||
"bypass_captcha",
|
||||
"scrape_private_student_grades",
|
||||
"scrape_student_private_data",
|
||||
"bulk_scrape_protected_platforms",
|
||||
"collect_data_without_authorization",
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchProfile:
|
||||
profile_id: str
|
||||
scope: str
|
||||
provider_order: list[str] = field(default_factory=lambda: [
|
||||
"cache",
|
||||
"official_site",
|
||||
"general_web",
|
||||
"vertical_source",
|
||||
"browser_fetch",
|
||||
"user_authorized_file",
|
||||
"internal_archive",
|
||||
])
|
||||
trusted_domains: list[str] = field(default_factory=list)
|
||||
query_expansion_hints: list[str] = field(default_factory=list)
|
||||
domain_profiles: list[str] = field(default_factory=list)
|
||||
blocked_behaviors: set[str] = field(default_factory=lambda: set(HARD_BLOCKED_BEHAVIORS))
|
||||
audit_required: bool = True
|
||||
fallback_required: bool = True
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = asdict(self)
|
||||
data["blocked_behaviors"] = sorted(self.blocked_behaviors)
|
||||
return data
|
||||
|
||||
|
||||
class SearchProfileResolver:
|
||||
"""Resolves base -> group -> user -> session search preferences."""
|
||||
|
||||
def base_profile(self) -> SearchProfile:
|
||||
return SearchProfile(profile_id="base", scope="global")
|
||||
|
||||
def resolve(
|
||||
self,
|
||||
group_profile: dict[str, Any] | None = None,
|
||||
user_profile: dict[str, Any] | None = None,
|
||||
session_profile: dict[str, Any] | None = None,
|
||||
) -> SearchProfile:
|
||||
profile = self.base_profile().to_dict()
|
||||
for overlay in (group_profile, user_profile, session_profile):
|
||||
if overlay:
|
||||
profile = self._merge(profile, overlay)
|
||||
profile["blocked_behaviors"] = set(HARD_BLOCKED_BEHAVIORS)
|
||||
profile["audit_required"] = True
|
||||
profile["fallback_required"] = True
|
||||
return SearchProfile(**profile)
|
||||
|
||||
def _merge(self, base: dict[str, Any], overlay: dict[str, Any]) -> dict[str, Any]:
|
||||
merged = dict(base)
|
||||
if overlay.get("provider_order"):
|
||||
merged["provider_order"] = list(overlay["provider_order"])
|
||||
for list_key in ("trusted_domains", "query_expansion_hints", "domain_profiles"):
|
||||
merged[list_key] = self._dedupe(list(merged.get(list_key, [])) + list(overlay.get(list_key, [])))
|
||||
merged["profile_id"] = overlay.get("profile_id", merged.get("profile_id", "custom"))
|
||||
merged["scope"] = overlay.get("scope", merged.get("scope", "custom"))
|
||||
return merged
|
||||
|
||||
def _dedupe(self, items: list[str]) -> list[str]:
|
||||
return list(dict.fromkeys([item for item in items if item]))
|
||||
|
||||
|
||||
class DomainQueryProfileRegistry:
|
||||
"""Optional domain-specific expansions for the general Search Gateway."""
|
||||
|
||||
DEFAULT_PROFILES = {
|
||||
"education_exam_data": [
|
||||
"学校 年级 科目 试卷 答案 成绩统计",
|
||||
"联考 月考 期中 期末 质量检测",
|
||||
],
|
||||
"policy_regulation": [
|
||||
"官方 通知 政策 解读 实施细则",
|
||||
"site:gov.cn OR site:edu.cn",
|
||||
],
|
||||
"software_library": [
|
||||
"release notes changelog migration guide",
|
||||
"official documentation GitHub issues",
|
||||
],
|
||||
"product_research": [
|
||||
"specs review comparison price availability",
|
||||
"official page manual support",
|
||||
],
|
||||
"company_research": [
|
||||
"official announcement press release filings",
|
||||
"leadership product financial report",
|
||||
],
|
||||
}
|
||||
|
||||
def hints_for(self, domain_profiles: list[str]) -> list[str]:
|
||||
hints: list[str] = []
|
||||
for profile in domain_profiles:
|
||||
hints.extend(self.DEFAULT_PROFILES.get(profile, []))
|
||||
return list(dict.fromkeys(hints))
|
||||
|
||||
|
||||
__all__ = [
|
||||
"HARD_BLOCKED_BEHAVIORS",
|
||||
"SearchProfile",
|
||||
"SearchProfileResolver",
|
||||
"DomainQueryProfileRegistry",
|
||||
]
|
||||
@@ -0,0 +1,121 @@
|
||||
"""Provider registry for the general AIOS Search Gateway.
|
||||
|
||||
The registry makes provider availability explicit and auditable. Provider
|
||||
implementations are pluggable: production can register real public search,
|
||||
official-site, vertical-source, browser-fetch, authorized-file or archive
|
||||
providers without changing the Search Gateway core.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from typing import Any
|
||||
|
||||
from .search_gateway import SearchEvidence, SearchProviderAttempt, SearchRequest
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchProviderConfig:
|
||||
name: str
|
||||
provider_type: str
|
||||
enabled: bool = True
|
||||
requires_secret: bool = False
|
||||
supports_public_web: bool = True
|
||||
supports_authorized_sources: bool = False
|
||||
health: str = "unknown"
|
||||
metadata: dict[str, Any] = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class NullSearchProvider:
|
||||
"""Safe placeholder provider used until runtime wires a real adapter."""
|
||||
|
||||
def __init__(self, config: SearchProviderConfig):
|
||||
self.config = config
|
||||
self.name = config.name
|
||||
|
||||
def search(self, request: SearchRequest, queries: list[str]):
|
||||
return [], SearchProviderAttempt(
|
||||
provider=self.name,
|
||||
status="not_configured" if self.config.enabled else "disabled",
|
||||
result_count=0,
|
||||
reason="provider adapter not wired in runtime",
|
||||
)
|
||||
|
||||
|
||||
class StaticArchiveProvider:
|
||||
"""Small deterministic provider for tests and internal archived evidence."""
|
||||
|
||||
name = "internal_archive"
|
||||
|
||||
def __init__(self, records: list[dict[str, Any]] | None = None):
|
||||
self.records = records or []
|
||||
|
||||
def search(self, request: SearchRequest, queries: list[str]):
|
||||
evidence: list[SearchEvidence] = []
|
||||
for record in self.records:
|
||||
haystack = " ".join([record.get("title", ""), record.get("snippet", ""), record.get("tags", "")]).lower()
|
||||
if any(q.lower() in haystack for q in queries):
|
||||
evidence.append(
|
||||
SearchEvidence(
|
||||
title=record.get("title", "archive result"),
|
||||
url=record.get("url"),
|
||||
source=self.name,
|
||||
snippet=record.get("snippet", ""),
|
||||
evidence_type="internal_archive",
|
||||
confidence=record.get("confidence", "medium"),
|
||||
)
|
||||
)
|
||||
return evidence, SearchProviderAttempt(provider=self.name, status="ok", result_count=len(evidence))
|
||||
|
||||
|
||||
class SearchProviderRegistry:
|
||||
DEFAULT_PROVIDER_CONFIGS = [
|
||||
SearchProviderConfig("cache", "cache", supports_public_web=False),
|
||||
SearchProviderConfig("official_site", "official_site"),
|
||||
SearchProviderConfig("general_web", "general_web"),
|
||||
SearchProviderConfig("vertical_source", "vertical_source"),
|
||||
SearchProviderConfig("browser_fetch", "browser_fetch"),
|
||||
SearchProviderConfig("user_authorized_file", "authorized_file", supports_public_web=False, supports_authorized_sources=True),
|
||||
SearchProviderConfig("internal_archive", "archive", supports_public_web=False),
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
self.configs: dict[str, SearchProviderConfig] = {}
|
||||
self.providers: dict[str, Any] = {}
|
||||
for config in self.DEFAULT_PROVIDER_CONFIGS:
|
||||
self.register_config(config)
|
||||
|
||||
def register_config(self, config: SearchProviderConfig) -> None:
|
||||
self.configs[config.name] = config
|
||||
self.providers.setdefault(config.name, NullSearchProvider(config))
|
||||
|
||||
def register_provider(self, name: str, provider: Any, config: SearchProviderConfig | None = None) -> None:
|
||||
if config:
|
||||
self.configs[name] = config
|
||||
elif name not in self.configs:
|
||||
self.configs[name] = SearchProviderConfig(name=name, provider_type="custom")
|
||||
self.providers[name] = provider
|
||||
|
||||
def ordered(self, order: list[str] | None = None) -> list[Any]:
|
||||
order = order or list(self.configs)
|
||||
result = [self.providers[name] for name in order if name in self.providers and self.configs[name].enabled]
|
||||
result.extend([provider for name, provider in self.providers.items() if name not in order and self.configs[name].enabled])
|
||||
return result
|
||||
|
||||
def status(self) -> dict[str, Any]:
|
||||
return {
|
||||
"providers": [self.configs[name].to_dict() for name in sorted(self.configs)],
|
||||
"enabled": len([c for c in self.configs.values() if c.enabled]),
|
||||
"configured": len([name for name, provider in self.providers.items() if not isinstance(provider, NullSearchProvider)]),
|
||||
}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"SearchProviderConfig",
|
||||
"NullSearchProvider",
|
||||
"StaticArchiveProvider",
|
||||
"SearchProviderRegistry",
|
||||
]
|
||||
@@ -1,59 +0,0 @@
|
||||
"""Self-evolution reporting for release and owner review."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class EvolutionReport:
|
||||
status: str
|
||||
improvements: list[str]
|
||||
risks: list[str]
|
||||
metrics: dict[str, Any]
|
||||
recommendations: list[str]
|
||||
created_at: str = utc_now()
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfEvolutionReporter:
|
||||
def generate(
|
||||
self,
|
||||
supervisor: dict[str, Any],
|
||||
failure_memory: dict[str, Any],
|
||||
adaptive_policy: dict[str, Any],
|
||||
) -> EvolutionReport:
|
||||
failures = failure_memory.get("top_failures", [])
|
||||
risks = []
|
||||
if failures:
|
||||
risks.append("recurring failures require owner-visible review")
|
||||
if adaptive_policy.get("automation_level") == "analysis_only":
|
||||
risks.append("automation reduced due to recurrence")
|
||||
return EvolutionReport(
|
||||
status="ready_for_review",
|
||||
improvements=[
|
||||
"self-loop supervisor enabled",
|
||||
"failure memory accumulated",
|
||||
"adaptive policy active",
|
||||
],
|
||||
risks=risks,
|
||||
metrics={
|
||||
"failure_records": len(failure_memory.get("records", {})),
|
||||
"supervisor_cycles": supervisor.get("state", {}).get("cycles", 0),
|
||||
},
|
||||
recommendations=[
|
||||
"continue low-risk autonomous patches",
|
||||
"review owner-gated promotion requests",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["EvolutionReport", "SelfEvolutionReporter"]
|
||||
@@ -1,89 +0,0 @@
|
||||
"""Event hooks that trigger autonomous self-loop jobs."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .adaptive_policy import AdaptivePolicy
|
||||
from .failure_memory import FailureMemory
|
||||
from .self_loop_scheduler import SelfLoopScheduler
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SelfLoopEvent:
|
||||
source: str
|
||||
event_type: str
|
||||
goal: str
|
||||
runtime: dict[str, Any] = field(default_factory=dict)
|
||||
baseline: dict[str, Any] = field(default_factory=dict)
|
||||
detail: str = ""
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopEventHook:
|
||||
SUPPORTED_EVENTS = {
|
||||
"runtime_unhealthy",
|
||||
"gitops_drift",
|
||||
"test_failed",
|
||||
"portal_gap_detected",
|
||||
"acceptance_failed",
|
||||
}
|
||||
|
||||
def __init__(self, scheduler: SelfLoopScheduler | None = None, memory: FailureMemory | None = None, policy: AdaptivePolicy | None = None):
|
||||
self.scheduler = scheduler or SelfLoopScheduler()
|
||||
self.memory = memory or FailureMemory()
|
||||
self.policy = policy or AdaptivePolicy()
|
||||
|
||||
def parse(self, payload: dict[str, Any]) -> SelfLoopEvent:
|
||||
return SelfLoopEvent(
|
||||
source=str(payload.get("source", "unknown")),
|
||||
event_type=str(payload.get("event_type", "unknown")),
|
||||
goal=str(payload.get("goal", "investigate self-loop event")),
|
||||
runtime=dict(payload.get("runtime", {})),
|
||||
baseline=dict(payload.get("baseline", {})),
|
||||
detail=str(payload.get("detail", "")),
|
||||
)
|
||||
|
||||
def handle(self, payload: dict[str, Any]) -> dict[str, Any]:
|
||||
event = self.parse(payload)
|
||||
if event.event_type not in self.SUPPORTED_EVENTS:
|
||||
return {
|
||||
"status": "ignored",
|
||||
"reason": "unsupported_event",
|
||||
"event": event.to_dict(),
|
||||
}
|
||||
|
||||
if event.event_type in {"test_failed", "acceptance_failed", "runtime_unhealthy"}:
|
||||
self.memory.record_failure(
|
||||
component=event.source,
|
||||
reason=event.event_type,
|
||||
detail=event.detail,
|
||||
severity="high",
|
||||
remediation_hint="run self-loop diagnosis and generate patch plan",
|
||||
)
|
||||
|
||||
decision = self.policy.evaluate(self.memory, event.runtime, event.baseline, event.goal)
|
||||
options = self.policy.apply_to_scheduler(decision)
|
||||
job = self.scheduler.enqueue(
|
||||
goal=event.goal,
|
||||
runtime=event.runtime,
|
||||
baseline=event.baseline,
|
||||
max_attempts=options["max_attempts"],
|
||||
)
|
||||
return {
|
||||
"status": "queued",
|
||||
"event": event.to_dict(),
|
||||
"policy": decision.to_dict(),
|
||||
"job": job.to_dict(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["SelfLoopEvent", "SelfLoopEventHook"]
|
||||
@@ -1,222 +0,0 @@
|
||||
"""Autonomous self-loop executor.
|
||||
|
||||
This layer turns probe/plan reports into safe execution outcomes. It does not
|
||||
bypass owner governance: high-risk or restricted actions are blocked at the owner
|
||||
approval gate and emitted as explicit pending work.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Callable
|
||||
|
||||
from .autonomous_self_loop import AutonomousSelfLoop, RemediationStep, SelfLoopReport
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ExecutionResult:
|
||||
step_id: str
|
||||
action: str
|
||||
status: str
|
||||
reason: str
|
||||
risk: str
|
||||
requires_owner_approval: bool
|
||||
output: dict[str, Any] = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TestResult:
|
||||
name: str
|
||||
status: str
|
||||
detail: str = ""
|
||||
|
||||
def passed(self) -> bool:
|
||||
return self.status == "pass"
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class ExecutionReport:
|
||||
status: str
|
||||
report_id: str
|
||||
actions: list[ExecutionResult]
|
||||
tests: list[TestResult]
|
||||
owner_approval_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"report_id": self.report_id,
|
||||
"actions": [a.to_dict() for a in self.actions],
|
||||
"tests": [t.to_dict() for t in self.tests],
|
||||
"owner_approval_required": self.owner_approval_required,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
class SelfLoopTestRunner:
|
||||
"""Deterministic self-loop checks that avoid shell execution and secrets."""
|
||||
|
||||
def run(self, runtime: dict[str, Any], baseline: dict[str, Any]) -> list[TestResult]:
|
||||
return [
|
||||
self._runtime_active(runtime),
|
||||
self._patch_only_policy(baseline),
|
||||
self._owner_gate_policy(baseline),
|
||||
self._portal_domain_smoke(),
|
||||
]
|
||||
|
||||
def _runtime_active(self, runtime: dict[str, Any]) -> TestResult:
|
||||
if runtime.get("status") == "active":
|
||||
return TestResult("runtime_active", "pass", "runtime reports active")
|
||||
return TestResult("runtime_active", "fail", "runtime is not active")
|
||||
|
||||
def _patch_only_policy(self, baseline: dict[str, Any]) -> TestResult:
|
||||
if baseline.get("update_mode") == "git_patch_only":
|
||||
return TestResult("git_patch_only", "pass", "patch-only updates enforced")
|
||||
return TestResult("git_patch_only", "fail", "update mode is not git_patch_only")
|
||||
|
||||
def _owner_gate_policy(self, baseline: dict[str, Any]) -> TestResult:
|
||||
codex_gitops = baseline.get("codex_gitops", {})
|
||||
if codex_gitops.get("direct_main_push") is False:
|
||||
return TestResult("owner_gate", "pass", "direct main push disabled")
|
||||
return TestResult("owner_gate", "fail", "direct main push must remain disabled")
|
||||
|
||||
def _portal_domain_smoke(self) -> TestResult:
|
||||
try:
|
||||
from .portal_rbac_ops import ROLE_OWNER, PortalOpsService, build_context
|
||||
|
||||
service = PortalOpsService()
|
||||
result = service.owner_cockpit(build_context("owner", ROLE_OWNER))
|
||||
if result.get("status") == "ok":
|
||||
return TestResult("portal_domain_smoke", "pass", "owner cockpit domain service responds")
|
||||
return TestResult("portal_domain_smoke", "fail", "owner cockpit returned non-ok")
|
||||
except Exception as exc: # pragma: no cover - defensive smoke output
|
||||
return TestResult("portal_domain_smoke", "fail", f"portal smoke failed: {type(exc).__name__}")
|
||||
|
||||
|
||||
class SelfLoopAgentExecutor:
|
||||
"""Executes safe self-loop steps and gates restricted ones."""
|
||||
|
||||
SAFE_ACTIONS = {
|
||||
"health_probe",
|
||||
"test_execution",
|
||||
"failure_classification",
|
||||
"patch_plan_generation",
|
||||
"report_generation",
|
||||
"create-low-risk-patch",
|
||||
}
|
||||
|
||||
RESTRICTED_ACTIONS = {
|
||||
"request-runtime-recovery",
|
||||
"commit-policy-patch",
|
||||
"commit-security-policy",
|
||||
"commit-runtime-config",
|
||||
"commit-portal-config",
|
||||
"production-promotion",
|
||||
"permission-escalation",
|
||||
"secret-rotation",
|
||||
}
|
||||
|
||||
def __init__(self, loop: AutonomousSelfLoop | None = None, test_runner: SelfLoopTestRunner | None = None):
|
||||
self.loop = loop or AutonomousSelfLoop(owner_approval_required=True)
|
||||
self.test_runner = test_runner or SelfLoopTestRunner()
|
||||
self.handlers: dict[str, Callable[[RemediationStep], dict[str, Any]]] = {
|
||||
"create-low-risk-patch": self._create_low_risk_patch_manifest,
|
||||
"patch_plan_generation": self._patch_plan_manifest,
|
||||
"report_generation": self._report_manifest,
|
||||
}
|
||||
|
||||
def execute_step(self, step: RemediationStep) -> ExecutionResult:
|
||||
if step.requires_owner_approval or step.action in self.RESTRICTED_ACTIONS:
|
||||
return ExecutionResult(
|
||||
step.id,
|
||||
step.action,
|
||||
"blocked_owner_gate",
|
||||
"restricted action requires owner approval",
|
||||
step.risk,
|
||||
True,
|
||||
{"title": step.title},
|
||||
)
|
||||
if step.risk not in {"low"}:
|
||||
return ExecutionResult(
|
||||
step.id,
|
||||
step.action,
|
||||
"blocked_risk_gate",
|
||||
"only low-risk autonomous actions are allowed",
|
||||
step.risk,
|
||||
True,
|
||||
{"title": step.title},
|
||||
)
|
||||
handler = self.handlers.get(step.action, self._safe_noop_manifest)
|
||||
return ExecutionResult(
|
||||
step.id,
|
||||
step.action,
|
||||
"executed",
|
||||
"safe autonomous action executed",
|
||||
step.risk,
|
||||
False,
|
||||
handler(step),
|
||||
)
|
||||
|
||||
def execute_report(self, report: SelfLoopReport, runtime: dict[str, Any], baseline: dict[str, Any]) -> ExecutionReport:
|
||||
actions = [self.execute_step(step) for step in report.remediation]
|
||||
tests = self.test_runner.run(runtime, baseline)
|
||||
owner_approval_required = self.loop.owner_approval_required or any(a.requires_owner_approval for a in actions)
|
||||
failed_tests = [t for t in tests if not t.passed()]
|
||||
if failed_tests:
|
||||
status = "failed_tests"
|
||||
elif owner_approval_required:
|
||||
status = "waiting_owner_gate"
|
||||
else:
|
||||
status = "completed"
|
||||
return ExecutionReport(status, report.id, actions, tests, owner_approval_required)
|
||||
|
||||
def run_once(self, runtime: dict[str, Any], baseline: dict[str, Any]) -> dict[str, Any]:
|
||||
report = self.loop.evaluate(runtime, baseline)
|
||||
execution = self.execute_report(report, runtime, baseline)
|
||||
acceptance = self.loop.acceptance(report)
|
||||
owner_approval_required = execution.owner_approval_required or acceptance["owner_approval_required"]
|
||||
return {
|
||||
"status": execution.status,
|
||||
"can_unattended_continue": execution.status == "completed" and not owner_approval_required,
|
||||
"owner_approval_required": owner_approval_required,
|
||||
"plan": report.to_dict(),
|
||||
"execution": execution.to_dict(),
|
||||
}
|
||||
|
||||
def _create_low_risk_patch_manifest(self, step: RemediationStep) -> dict[str, Any]:
|
||||
return {
|
||||
"patch_intent": step.title,
|
||||
"branch_policy": "patch-only",
|
||||
"direct_main_push": False,
|
||||
"secrets_in_git": False,
|
||||
}
|
||||
|
||||
def _patch_plan_manifest(self, step: RemediationStep) -> dict[str, Any]:
|
||||
return {"plan": step.title, "action": step.action}
|
||||
|
||||
def _report_manifest(self, step: RemediationStep) -> dict[str, Any]:
|
||||
return {"report": step.title, "generated": True}
|
||||
|
||||
def _safe_noop_manifest(self, step: RemediationStep) -> dict[str, Any]:
|
||||
return {"noop": True, "title": step.title}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"ExecutionResult",
|
||||
"TestResult",
|
||||
"ExecutionReport",
|
||||
"SelfLoopTestRunner",
|
||||
"SelfLoopAgentExecutor",
|
||||
]
|
||||
@@ -1,58 +0,0 @@
|
||||
"""Adapter manifest for controlled GitOps Actions execution.
|
||||
|
||||
The adapter produces an action plan consumed by the GitOps bridge. It does not
|
||||
embed credentials and does not perform direct repository writes.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_patch_executor import PatchBundle
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class GitOpsActionPlan:
|
||||
action: str
|
||||
branch: str
|
||||
operations: tuple[dict[str, Any], ...]
|
||||
owner_approval_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopGitOpsAdapter:
|
||||
def build_action_plan(self, bundle: PatchBundle) -> GitOpsActionPlan:
|
||||
operations = tuple(
|
||||
{
|
||||
"operation": "commitFile",
|
||||
"path": patch_file.path,
|
||||
"checksum": patch_file.checksum(),
|
||||
}
|
||||
for patch_file in bundle.files
|
||||
)
|
||||
return GitOpsActionPlan(
|
||||
action="gitops_patch_apply",
|
||||
branch=bundle.branch,
|
||||
operations=operations,
|
||||
owner_approval_required=bundle.owner_approval_required,
|
||||
)
|
||||
|
||||
def validate_action_plan(self, plan: GitOpsActionPlan) -> dict[str, Any]:
|
||||
return {
|
||||
"valid": plan.branch.startswith("patch/") and plan.action == "gitops_patch_apply",
|
||||
"branch": plan.branch,
|
||||
"owner_approval_required": plan.owner_approval_required,
|
||||
"operations": len(plan.operations),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["GitOpsActionPlan", "SelfLoopGitOpsAdapter"]
|
||||
@@ -1,142 +0,0 @@
|
||||
"""Multi-agent self-loop orchestration.
|
||||
|
||||
Coordinates planning, implementation proposals, and validation feedback from
|
||||
Hermes/OpenClaw/CodexBridge-style agents without storing credentials or bypassing
|
||||
GitOps governance.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_executor import SelfLoopAgentExecutor
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentProfile:
|
||||
name: str
|
||||
role: str
|
||||
weight: int
|
||||
capabilities: tuple[str, ...]
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentTask:
|
||||
task_id: str
|
||||
goal: str
|
||||
task_type: str
|
||||
risk: str = "low"
|
||||
payload: dict[str, Any] = field(default_factory=dict)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentResponse:
|
||||
agent: str
|
||||
status: str
|
||||
proposal: dict[str, Any]
|
||||
confidence: float
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AgentVote:
|
||||
agent: str
|
||||
approve: bool
|
||||
weight: int
|
||||
reason: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class PatchManifest:
|
||||
branch_policy: str
|
||||
files: list[str]
|
||||
tests: list[str]
|
||||
approvals_required: bool
|
||||
generated_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopAgentOrchestrator:
|
||||
AGENTS = (
|
||||
AgentProfile("Hermes", "planner", 2, ("analysis", "planning", "risk")),
|
||||
AgentProfile("OpenClaw", "implementation", 2, ("code", "patch", "test")),
|
||||
AgentProfile("CodexBridge", "validation", 2, ("gitops", "validation", "acceptance")),
|
||||
)
|
||||
|
||||
def __init__(self, executor: SelfLoopAgentExecutor | None = None):
|
||||
self.executor = executor or SelfLoopAgentExecutor()
|
||||
|
||||
def dispatch(self, task: AgentTask) -> list[AgentResponse]:
|
||||
responses = []
|
||||
for agent in self.AGENTS:
|
||||
if agent.role == "planner":
|
||||
proposal = {"risk": task.risk, "plan": "classify issue and produce remediation steps"}
|
||||
elif agent.role == "implementation":
|
||||
proposal = {"patch": True, "branch_policy": "patch-only", "goal": task.goal}
|
||||
else:
|
||||
proposal = {"validation": ["tests", "gitops_policy", "acceptance_report"]}
|
||||
responses.append(AgentResponse(agent.name, "ready", proposal, 0.9))
|
||||
return responses
|
||||
|
||||
def vote(self, responses: list[AgentResponse]) -> dict[str, Any]:
|
||||
votes = []
|
||||
total = 0
|
||||
approved = 0
|
||||
for response in responses:
|
||||
profile = next(a for a in self.AGENTS if a.name == response.agent)
|
||||
approve = response.status == "ready"
|
||||
votes.append(AgentVote(response.agent, approve, profile.weight, "ready" if approve else "rejected"))
|
||||
total += profile.weight
|
||||
approved += profile.weight if approve else 0
|
||||
return {
|
||||
"approved": approved >= total / 2,
|
||||
"approval_weight": approved,
|
||||
"total_weight": total,
|
||||
"votes": [asdict(v) for v in votes],
|
||||
}
|
||||
|
||||
def create_patch_manifest(self, task: AgentTask, requires_approval: bool) -> PatchManifest:
|
||||
return PatchManifest(
|
||||
branch_policy="patch-only",
|
||||
files=[
|
||||
"active-runtime/app",
|
||||
"openapi",
|
||||
"tests",
|
||||
],
|
||||
tests=[
|
||||
"self_loop_executor",
|
||||
"portal_self_loop",
|
||||
"acceptance_pipeline",
|
||||
],
|
||||
approvals_required=requires_approval or task.risk != "low",
|
||||
)
|
||||
|
||||
def run_cycle(self, runtime: dict[str, Any], baseline: dict[str, Any], goal: str) -> dict[str, Any]:
|
||||
task = AgentTask("self-loop-cycle", goal, "remediation")
|
||||
executor_result = self.executor.run_once(runtime, baseline)
|
||||
responses = self.dispatch(task)
|
||||
decision = self.vote(responses)
|
||||
manifest = self.create_patch_manifest(task, executor_result["owner_approval_required"])
|
||||
return {
|
||||
"status": "ready_for_patch" if decision["approved"] else "blocked_agent_vote",
|
||||
"executor": executor_result,
|
||||
"agents": [asdict(r) for r in responses],
|
||||
"vote": decision,
|
||||
"patch_manifest": manifest.to_dict(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"AgentProfile",
|
||||
"AgentTask",
|
||||
"AgentResponse",
|
||||
"SelfLoopAgentOrchestrator",
|
||||
"PatchManifest",
|
||||
]
|
||||
@@ -1,284 +0,0 @@
|
||||
"""Self-loop patch executor and acceptance pipeline.
|
||||
|
||||
This module converts multi-agent self-loop decisions into GitOps-safe patch
|
||||
bundles, validates policy, runs deterministic acceptance checks, and prepares a
|
||||
promotion request. It intentionally does not push main, rotate secrets, or bypass
|
||||
owner approval.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from hashlib import sha256
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_orchestrator import SelfLoopAgentOrchestrator
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
def stable_id(*parts: str) -> str:
|
||||
digest = sha256("::".join(parts).encode("utf-8")).hexdigest()[:12]
|
||||
return f"slp_{digest}"
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PatchFile:
|
||||
path: str
|
||||
content: str
|
||||
purpose: str
|
||||
|
||||
def checksum(self) -> str:
|
||||
return sha256(self.content.encode("utf-8")).hexdigest()
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = asdict(self)
|
||||
data["sha256"] = self.checksum()
|
||||
return data
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PatchBundle:
|
||||
id: str
|
||||
branch: str
|
||||
risk: str
|
||||
goal: str
|
||||
files: tuple[PatchFile, ...]
|
||||
owner_approval_required: bool
|
||||
direct_main_push: bool = False
|
||||
secrets_in_git: bool = False
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"id": self.id,
|
||||
"branch": self.branch,
|
||||
"risk": self.risk,
|
||||
"goal": self.goal,
|
||||
"files": [f.to_dict() for f in self.files],
|
||||
"owner_approval_required": self.owner_approval_required,
|
||||
"direct_main_push": self.direct_main_push,
|
||||
"secrets_in_git": self.secrets_in_git,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AcceptanceCheck:
|
||||
name: str
|
||||
status: str
|
||||
detail: str
|
||||
required: bool = True
|
||||
|
||||
def passed(self) -> bool:
|
||||
return self.status == "pass" or not self.required
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AcceptanceReport:
|
||||
status: str
|
||||
patch_id: str
|
||||
checks: tuple[AcceptanceCheck, ...]
|
||||
owner_approval_required: bool
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"patch_id": self.patch_id,
|
||||
"checks": [c.to_dict() for c in self.checks],
|
||||
"owner_approval_required": self.owner_approval_required,
|
||||
"created_at": self.created_at,
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PromotionRequest:
|
||||
status: str
|
||||
patch_id: str
|
||||
branch: str
|
||||
reason: str
|
||||
owner_approval_required: bool
|
||||
acceptance: AcceptanceReport
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"status": self.status,
|
||||
"patch_id": self.patch_id,
|
||||
"branch": self.branch,
|
||||
"reason": self.reason,
|
||||
"owner_approval_required": self.owner_approval_required,
|
||||
"acceptance": self.acceptance.to_dict(),
|
||||
}
|
||||
|
||||
|
||||
class PatchPolicyValidator:
|
||||
"""Validates GitOps safety constraints before any patch is promoted."""
|
||||
|
||||
FORBIDDEN_PATH_PREFIXES = (
|
||||
".git/",
|
||||
"secrets/",
|
||||
"private/",
|
||||
)
|
||||
SECRET_MARKERS = (
|
||||
"BEGIN PRIVATE KEY",
|
||||
"api_key=",
|
||||
"password=",
|
||||
"token=",
|
||||
"secret=",
|
||||
)
|
||||
|
||||
def validate(self, bundle: PatchBundle) -> tuple[AcceptanceCheck, ...]:
|
||||
checks: list[AcceptanceCheck] = []
|
||||
checks.append(self._patch_only(bundle))
|
||||
checks.append(self._no_direct_main_push(bundle))
|
||||
checks.append(self._no_secret_files(bundle))
|
||||
checks.append(self._file_paths_safe(bundle))
|
||||
checks.append(self._content_safe(bundle))
|
||||
return tuple(checks)
|
||||
|
||||
def _patch_only(self, bundle: PatchBundle) -> AcceptanceCheck:
|
||||
if bundle.branch.startswith("patch/"):
|
||||
return AcceptanceCheck("patch_branch_policy", "pass", "branch is patch-scoped")
|
||||
return AcceptanceCheck("patch_branch_policy", "fail", "branch must start with patch/")
|
||||
|
||||
def _no_direct_main_push(self, bundle: PatchBundle) -> AcceptanceCheck:
|
||||
if bundle.direct_main_push is False:
|
||||
return AcceptanceCheck("no_direct_main_push", "pass", "direct main push disabled")
|
||||
return AcceptanceCheck("no_direct_main_push", "fail", "direct main push is not allowed")
|
||||
|
||||
def _no_secret_files(self, bundle: PatchBundle) -> AcceptanceCheck:
|
||||
if bundle.secrets_in_git is False:
|
||||
return AcceptanceCheck("no_secrets_in_git", "pass", "bundle declares no secrets")
|
||||
return AcceptanceCheck("no_secrets_in_git", "fail", "secrets must not be stored in Git")
|
||||
|
||||
def _file_paths_safe(self, bundle: PatchBundle) -> AcceptanceCheck:
|
||||
unsafe = [f.path for f in bundle.files if f.path.startswith(self.FORBIDDEN_PATH_PREFIXES)]
|
||||
if not unsafe:
|
||||
return AcceptanceCheck("safe_file_paths", "pass", "all file paths are allowed")
|
||||
return AcceptanceCheck("safe_file_paths", "fail", f"unsafe paths: {unsafe}")
|
||||
|
||||
def _content_safe(self, bundle: PatchBundle) -> AcceptanceCheck:
|
||||
flagged: list[str] = []
|
||||
for patch_file in bundle.files:
|
||||
content_lower = patch_file.content.lower()
|
||||
for marker in self.SECRET_MARKERS:
|
||||
if marker.lower() in content_lower:
|
||||
flagged.append(patch_file.path)
|
||||
break
|
||||
if not flagged:
|
||||
return AcceptanceCheck("safe_file_content", "pass", "no secret markers detected")
|
||||
return AcceptanceCheck("safe_file_content", "fail", f"secret-like markers detected: {flagged}")
|
||||
|
||||
|
||||
class AcceptancePipeline:
|
||||
def __init__(self, validator: PatchPolicyValidator | None = None):
|
||||
self.validator = validator or PatchPolicyValidator()
|
||||
|
||||
def run(self, bundle: PatchBundle, executor_result: dict[str, Any]) -> AcceptanceReport:
|
||||
checks = list(self.validator.validate(bundle))
|
||||
checks.extend(self._executor_checks(executor_result))
|
||||
status = "pass" if all(c.passed() for c in checks) else "fail"
|
||||
if status == "pass" and bundle.owner_approval_required:
|
||||
status = "waiting_owner_gate"
|
||||
return AcceptanceReport(status, bundle.id, tuple(checks), bundle.owner_approval_required)
|
||||
|
||||
def _executor_checks(self, executor_result: dict[str, Any]) -> tuple[AcceptanceCheck, ...]:
|
||||
execution = executor_result.get("execution", {})
|
||||
tests = execution.get("tests", [])
|
||||
checks: list[AcceptanceCheck] = []
|
||||
for test in tests:
|
||||
checks.append(AcceptanceCheck(
|
||||
name=f"executor_{test.get('name', 'unknown')}",
|
||||
status="pass" if test.get("status") == "pass" else "fail",
|
||||
detail=test.get("detail", ""),
|
||||
))
|
||||
if not checks:
|
||||
checks.append(AcceptanceCheck("executor_tests_present", "fail", "no executor tests were reported"))
|
||||
return tuple(checks)
|
||||
|
||||
|
||||
class SelfLoopPatchExecutor:
|
||||
def __init__(self, orchestrator: SelfLoopAgentOrchestrator | None = None, pipeline: AcceptancePipeline | None = None):
|
||||
self.orchestrator = orchestrator or SelfLoopAgentOrchestrator()
|
||||
self.pipeline = pipeline or AcceptancePipeline()
|
||||
|
||||
def build_patch_bundle(self, cycle: dict[str, Any], goal: str, branch: str = "patch/autonomous-self-loop") -> PatchBundle:
|
||||
executor = cycle.get("executor", {})
|
||||
owner_approval_required = bool(executor.get("owner_approval_required"))
|
||||
manifest = cycle.get("patch_manifest", {})
|
||||
risk = "medium" if owner_approval_required else "low"
|
||||
patch_id = stable_id(branch, goal, cycle.get("status", "unknown"))
|
||||
files = (
|
||||
PatchFile(
|
||||
path=f"patches/{patch_id}.self-loop.json",
|
||||
purpose="self-loop patch manifest",
|
||||
content=self._manifest_content(patch_id, goal, cycle, manifest),
|
||||
),
|
||||
)
|
||||
return PatchBundle(
|
||||
id=patch_id,
|
||||
branch=branch,
|
||||
risk=risk,
|
||||
goal=goal,
|
||||
files=files,
|
||||
owner_approval_required=owner_approval_required or bool(manifest.get("approvals_required")),
|
||||
)
|
||||
|
||||
def run_cycle_to_promotion(
|
||||
self,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
goal: str,
|
||||
branch: str = "patch/autonomous-self-loop",
|
||||
) -> dict[str, Any]:
|
||||
cycle = self.orchestrator.run_cycle(runtime, baseline, goal)
|
||||
bundle = self.build_patch_bundle(cycle, goal, branch)
|
||||
acceptance = self.pipeline.run(bundle, cycle.get("executor", {}))
|
||||
promotion = self.prepare_promotion(bundle, acceptance)
|
||||
return {
|
||||
"status": promotion.status,
|
||||
"cycle": cycle,
|
||||
"patch_bundle": bundle.to_dict(),
|
||||
"acceptance": acceptance.to_dict(),
|
||||
"promotion": promotion.to_dict(),
|
||||
}
|
||||
|
||||
def prepare_promotion(self, bundle: PatchBundle, acceptance: AcceptanceReport) -> PromotionRequest:
|
||||
if acceptance.status == "fail":
|
||||
return PromotionRequest("blocked_failed_acceptance", bundle.id, bundle.branch, "acceptance failed", True, acceptance)
|
||||
if acceptance.owner_approval_required:
|
||||
return PromotionRequest("waiting_owner_approval", bundle.id, bundle.branch, "owner approval required", True, acceptance)
|
||||
return PromotionRequest("ready_for_auto_merge", bundle.id, bundle.branch, "low-risk patch passed acceptance", False, acceptance)
|
||||
|
||||
def _manifest_content(self, patch_id: str, goal: str, cycle: dict[str, Any], manifest: dict[str, Any]) -> str:
|
||||
lines = [
|
||||
"{",
|
||||
f' "id": "{patch_id}",',
|
||||
f' "goal": "{goal}",',
|
||||
f' "status": "{cycle.get("status", "unknown")}",',
|
||||
f' "branch_policy": "{manifest.get("branch_policy", "patch-only")}",',
|
||||
' "direct_main_push": false,',
|
||||
' "secrets_in_git": false,',
|
||||
f' "owner_approval_required": {str(bool(manifest.get("approvals_required"))).lower()}',
|
||||
"}",
|
||||
]
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
__all__ = [
|
||||
"PatchFile",
|
||||
"PatchBundle",
|
||||
"AcceptanceCheck",
|
||||
"AcceptanceReport",
|
||||
"PromotionRequest",
|
||||
"PatchPolicyValidator",
|
||||
"AcceptancePipeline",
|
||||
"SelfLoopPatchExecutor",
|
||||
]
|
||||
@@ -1,140 +0,0 @@
|
||||
"""Runtime API wiring for autonomous self-loop jobs.
|
||||
|
||||
This module exposes plain functions and an optional FastAPI router for portal,
|
||||
webhook, and worker integrations. It keeps all writes behind patch-only GitOps
|
||||
plans and never stores secrets.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
try: # pragma: no cover - optional runtime dependency
|
||||
from fastapi import APIRouter, Header
|
||||
except Exception: # pragma: no cover - fallback for unit tests
|
||||
APIRouter = None
|
||||
Header = None
|
||||
|
||||
from .production_acceptance_gate import ProductionAcceptanceGate
|
||||
from .self_loop_scheduler import SelfLoopScheduler, TriggerType
|
||||
|
||||
scheduler = SelfLoopScheduler()
|
||||
production_gate = ProductionAcceptanceGate()
|
||||
|
||||
|
||||
def enqueue_self_loop_job(
|
||||
goal: str,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
trigger: str = "event",
|
||||
branch: str = "patch/autonomous-self-loop",
|
||||
) -> dict[str, Any]:
|
||||
job = scheduler.enqueue(goal, runtime, baseline, TriggerType(trigger), branch)
|
||||
return {"status": "queued", "job": job.to_dict()}
|
||||
|
||||
|
||||
def run_self_loop_job(job_id: str) -> dict[str, Any]:
|
||||
return {"status": "ok", "job": scheduler.run_job(job_id)}
|
||||
|
||||
|
||||
def tick_self_loop_jobs(limit: int = 1) -> dict[str, Any]:
|
||||
return {"status": "ok", "jobs": scheduler.tick(limit), "snapshot": scheduler.snapshot().to_dict()}
|
||||
|
||||
|
||||
def list_self_loop_jobs() -> dict[str, Any]:
|
||||
return {"status": "ok", "jobs": [job.to_dict() for job in scheduler.jobs.values()]}
|
||||
|
||||
|
||||
def get_self_loop_job(job_id: str) -> dict[str, Any]:
|
||||
job = scheduler.jobs.get(job_id)
|
||||
if not job:
|
||||
return {"status": "not_found", "job_id": job_id}
|
||||
return {"status": "ok", "job": job.to_dict()}
|
||||
|
||||
|
||||
def run_self_loop_once(
|
||||
goal: str,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
branch: str = "patch/autonomous-self-loop",
|
||||
) -> dict[str, Any]:
|
||||
job = scheduler.enqueue(goal, runtime, baseline, TriggerType.MANUAL, branch, max_attempts=1)
|
||||
return run_self_loop_job(job.id)
|
||||
|
||||
|
||||
def evaluate_self_loop_production_gate(
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
acceptance: dict[str, Any],
|
||||
owner_approval_required: bool = True,
|
||||
) -> dict[str, Any]:
|
||||
result = production_gate.evaluate(runtime, baseline, acceptance, owner_approval_required)
|
||||
return {"status": "ok", "gate": result.to_dict()}
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
|
||||
router = APIRouter(prefix="/self-loop", tags=["self-loop"])
|
||||
|
||||
@router.post("/jobs", operation_id="enqueueSelfLoopJob")
|
||||
def enqueue_job(payload: dict[str, Any]):
|
||||
return enqueue_self_loop_job(
|
||||
goal=payload["goal"],
|
||||
runtime=payload.get("runtime", {}),
|
||||
baseline=payload.get("baseline", {}),
|
||||
trigger=payload.get("trigger", "event"),
|
||||
branch=payload.get("branch", "patch/autonomous-self-loop"),
|
||||
)
|
||||
|
||||
@router.get("/jobs", operation_id="listSelfLoopJobs")
|
||||
def jobs():
|
||||
return list_self_loop_jobs()
|
||||
|
||||
@router.get("/jobs/{job_id}", operation_id="getSelfLoopJob")
|
||||
def get_job(job_id: str):
|
||||
return get_self_loop_job(job_id)
|
||||
|
||||
@router.post("/jobs/{job_id}/run", operation_id="runSelfLoopJob")
|
||||
def run_job(job_id: str):
|
||||
return run_self_loop_job(job_id)
|
||||
|
||||
@router.post("/tick", operation_id="tickSelfLoopJobs")
|
||||
def tick(payload: dict[str, Any] | None = None):
|
||||
return tick_self_loop_jobs((payload or {}).get("limit", 1))
|
||||
|
||||
@router.post("/run-once", operation_id="runSelfLoopOnce")
|
||||
def run_once(payload: dict[str, Any]):
|
||||
return run_self_loop_once(
|
||||
goal=payload["goal"],
|
||||
runtime=payload.get("runtime", {}),
|
||||
baseline=payload.get("baseline", {}),
|
||||
branch=payload.get("branch", "patch/autonomous-self-loop"),
|
||||
)
|
||||
|
||||
@router.post("/production-gate", operation_id="evaluateSelfLoopProductionGate")
|
||||
def production_gate_route(payload: dict[str, Any]):
|
||||
return evaluate_self_loop_production_gate(
|
||||
runtime=payload.get("runtime", {}),
|
||||
baseline=payload.get("baseline", {}),
|
||||
acceptance=payload.get("acceptance", {}),
|
||||
owner_approval_required=payload.get("owner_approval_required", True),
|
||||
)
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = [
|
||||
"router",
|
||||
"build_router",
|
||||
"enqueue_self_loop_job",
|
||||
"run_self_loop_job",
|
||||
"tick_self_loop_jobs",
|
||||
"list_self_loop_jobs",
|
||||
"get_self_loop_job",
|
||||
"run_self_loop_once",
|
||||
"evaluate_self_loop_production_gate",
|
||||
]
|
||||
@@ -1,163 +0,0 @@
|
||||
"""Autonomous self-loop scheduler.
|
||||
|
||||
Schedules event-triggered and interval-style self-loop cycles. The scheduler is
|
||||
framework-neutral and deterministic: production code can invoke tick() from a
|
||||
cron, worker, or webhook handler without giving the module direct access to
|
||||
secrets, shell commands, or main-branch writes.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from enum import Enum
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
from .self_loop_patch_executor import SelfLoopPatchExecutor
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class TriggerType(str, Enum):
|
||||
INTERVAL = "interval"
|
||||
EVENT = "event"
|
||||
MANUAL = "manual"
|
||||
|
||||
|
||||
class JobStatus(str, Enum):
|
||||
PENDING = "pending"
|
||||
RUNNING = "running"
|
||||
COMPLETED = "completed"
|
||||
WAITING_OWNER = "waiting_owner"
|
||||
FAILED = "failed"
|
||||
RETRY_PENDING = "retry_pending"
|
||||
|
||||
|
||||
@dataclass
|
||||
class SelfLoopJob:
|
||||
id: str
|
||||
goal: str
|
||||
trigger: TriggerType
|
||||
runtime: dict[str, Any]
|
||||
baseline: dict[str, Any]
|
||||
branch: str = "patch/autonomous-self-loop"
|
||||
status: JobStatus = JobStatus.PENDING
|
||||
attempts: int = 0
|
||||
max_attempts: int = 3
|
||||
last_error: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
result: dict[str, Any] | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = asdict(self)
|
||||
data["trigger"] = self.trigger.value
|
||||
data["status"] = self.status.value
|
||||
return data
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SchedulerSnapshot:
|
||||
pending: int
|
||||
running: int
|
||||
completed: int
|
||||
waiting_owner: int
|
||||
failed: int
|
||||
retry_pending: int
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopScheduler:
|
||||
"""Small in-process scheduler used by runtime workers and tests."""
|
||||
|
||||
def __init__(self, executor: SelfLoopPatchExecutor | None = None):
|
||||
self.executor = executor or SelfLoopPatchExecutor()
|
||||
self.jobs: dict[str, SelfLoopJob] = {}
|
||||
|
||||
def enqueue(
|
||||
self,
|
||||
goal: str,
|
||||
runtime: dict[str, Any],
|
||||
baseline: dict[str, Any],
|
||||
trigger: TriggerType | str = TriggerType.EVENT,
|
||||
branch: str = "patch/autonomous-self-loop",
|
||||
max_attempts: int = 3,
|
||||
) -> SelfLoopJob:
|
||||
trigger_value = trigger if isinstance(trigger, TriggerType) else TriggerType(trigger)
|
||||
job = SelfLoopJob(
|
||||
id=f"job_{uuid4().hex[:12]}",
|
||||
goal=goal,
|
||||
trigger=trigger_value,
|
||||
runtime=runtime,
|
||||
baseline=baseline,
|
||||
branch=branch,
|
||||
max_attempts=max_attempts,
|
||||
)
|
||||
self.jobs[job.id] = job
|
||||
return job
|
||||
|
||||
def tick(self, limit: int = 1) -> list[dict[str, Any]]:
|
||||
runnable = [j for j in self.jobs.values() if j.status in {JobStatus.PENDING, JobStatus.RETRY_PENDING}]
|
||||
results: list[dict[str, Any]] = []
|
||||
for job in runnable[:limit]:
|
||||
results.append(self.run_job(job.id))
|
||||
return results
|
||||
|
||||
def run_job(self, job_id: str) -> dict[str, Any]:
|
||||
job = self.jobs[job_id]
|
||||
job.status = JobStatus.RUNNING
|
||||
job.attempts += 1
|
||||
job.updated_at = utc_now()
|
||||
try:
|
||||
result = self.executor.run_cycle_to_promotion(job.runtime, job.baseline, job.goal, job.branch)
|
||||
job.result = result
|
||||
promotion_status = result.get("promotion", {}).get("status")
|
||||
if promotion_status == "waiting_owner_approval":
|
||||
job.status = JobStatus.WAITING_OWNER
|
||||
elif promotion_status == "ready_for_auto_merge":
|
||||
job.status = JobStatus.COMPLETED
|
||||
elif job.attempts < job.max_attempts:
|
||||
job.status = JobStatus.RETRY_PENDING
|
||||
job.last_error = promotion_status or "promotion_not_ready"
|
||||
else:
|
||||
job.status = JobStatus.FAILED
|
||||
job.last_error = promotion_status or "promotion_failed"
|
||||
except Exception as exc: # pragma: no cover - defensive runtime guard
|
||||
job.last_error = f"{type(exc).__name__}: {exc}"
|
||||
job.status = JobStatus.RETRY_PENDING if job.attempts < job.max_attempts else JobStatus.FAILED
|
||||
job.updated_at = utc_now()
|
||||
return job.to_dict()
|
||||
|
||||
def retry_failed(self) -> list[str]:
|
||||
retry_ids: list[str] = []
|
||||
for job in self.jobs.values():
|
||||
if job.status == JobStatus.FAILED and job.attempts < job.max_attempts:
|
||||
job.status = JobStatus.RETRY_PENDING
|
||||
job.updated_at = utc_now()
|
||||
retry_ids.append(job.id)
|
||||
return retry_ids
|
||||
|
||||
def snapshot(self) -> SchedulerSnapshot:
|
||||
statuses = [job.status for job in self.jobs.values()]
|
||||
return SchedulerSnapshot(
|
||||
pending=statuses.count(JobStatus.PENDING),
|
||||
running=statuses.count(JobStatus.RUNNING),
|
||||
completed=statuses.count(JobStatus.COMPLETED),
|
||||
waiting_owner=statuses.count(JobStatus.WAITING_OWNER),
|
||||
failed=statuses.count(JobStatus.FAILED),
|
||||
retry_pending=statuses.count(JobStatus.RETRY_PENDING),
|
||||
)
|
||||
|
||||
|
||||
__all__ = [
|
||||
"TriggerType",
|
||||
"JobStatus",
|
||||
"SelfLoopJob",
|
||||
"SchedulerSnapshot",
|
||||
"SelfLoopScheduler",
|
||||
]
|
||||
@@ -1,77 +0,0 @@
|
||||
"""Long-running supervisor model for autonomous self-loop runtime."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_event_hooks import SelfLoopEventHook
|
||||
from .failure_memory import FailureMemory
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass
|
||||
class SupervisorState:
|
||||
running: bool = False
|
||||
cycles: int = 0
|
||||
last_cycle: str | None = None
|
||||
last_status: str = "idle"
|
||||
heartbeat: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopSupervisor:
|
||||
def __init__(self, hook: SelfLoopEventHook | None = None, memory: FailureMemory | None = None):
|
||||
self.memory = memory or FailureMemory()
|
||||
self.hook = hook or SelfLoopEventHook(memory=self.memory)
|
||||
self.state = SupervisorState()
|
||||
|
||||
def start(self) -> dict[str, Any]:
|
||||
self.state.running = True
|
||||
self.state.last_status = "running"
|
||||
self.state.heartbeat = utc_now()
|
||||
return self.status()
|
||||
|
||||
def stop(self) -> dict[str, Any]:
|
||||
self.state.running = False
|
||||
self.state.last_status = "stopped"
|
||||
self.state.heartbeat = utc_now()
|
||||
return self.status()
|
||||
|
||||
def heartbeat(self) -> dict[str, Any]:
|
||||
self.state.heartbeat = utc_now()
|
||||
return self.status()
|
||||
|
||||
def handle_event(self, payload: dict[str, Any]) -> dict[str, Any]:
|
||||
if not self.state.running:
|
||||
self.start()
|
||||
self.state.cycles += 1
|
||||
self.state.last_cycle = utc_now()
|
||||
result = self.hook.handle(payload)
|
||||
self.state.last_status = result.get("status", "unknown")
|
||||
self.state.heartbeat = utc_now()
|
||||
return result
|
||||
|
||||
def tick(self, events: list[dict[str, Any]]) -> dict[str, Any]:
|
||||
results = [self.handle_event(event) for event in events]
|
||||
return {
|
||||
"status": "ok",
|
||||
"supervisor": self.status(),
|
||||
"events": results,
|
||||
"failure_memory": self.memory.export(),
|
||||
}
|
||||
|
||||
def status(self) -> dict[str, Any]:
|
||||
return {
|
||||
"state": self.state.to_dict(),
|
||||
"failure_memory_size": len(self.memory.records),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["SupervisorState", "SelfLoopSupervisor"]
|
||||
@@ -1,70 +0,0 @@
|
||||
"""Resident worker model for self-loop supervision.
|
||||
|
||||
Provides a daemon-friendly lifecycle without forcing an infinite loop inside the
|
||||
application. A process manager can call start/run_cycle/stop and persist state.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
from .self_loop_supervisor import SelfLoopSupervisor
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
@dataclass
|
||||
class WorkerState:
|
||||
running: bool = False
|
||||
cycles: int = 0
|
||||
last_error: str | None = None
|
||||
started_at: str | None = None
|
||||
heartbeat: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SelfLoopWorker:
|
||||
def __init__(self, supervisor: SelfLoopSupervisor | None = None):
|
||||
self.supervisor = supervisor or SelfLoopSupervisor()
|
||||
self.state = WorkerState()
|
||||
|
||||
def start(self) -> dict[str, Any]:
|
||||
self.state.running = True
|
||||
self.state.started_at = utc_now()
|
||||
self.state.heartbeat = utc_now()
|
||||
self.supervisor.start()
|
||||
return self.status()
|
||||
|
||||
def run_cycle(self, events: list[dict[str, Any]]) -> dict[str, Any]:
|
||||
if not self.state.running:
|
||||
self.start()
|
||||
try:
|
||||
result = self.supervisor.tick(events)
|
||||
self.state.cycles += 1
|
||||
self.state.heartbeat = utc_now()
|
||||
return result
|
||||
except Exception as exc:
|
||||
self.state.last_error = f"{type(exc).__name__}: {exc}"
|
||||
self.state.heartbeat = utc_now()
|
||||
raise
|
||||
|
||||
def stop(self) -> dict[str, Any]:
|
||||
self.state.running = False
|
||||
self.supervisor.stop()
|
||||
self.state.heartbeat = utc_now()
|
||||
return self.status()
|
||||
|
||||
def status(self) -> dict[str, Any]:
|
||||
return {
|
||||
"worker": self.state.to_dict(),
|
||||
"supervisor": self.supervisor.status(),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["WorkerState", "SelfLoopWorker"]
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,564 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Execution-readiness adapters and the fail-closed Shadow controller service."""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import base64
|
||||
import dataclasses
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import threading
|
||||
import time
|
||||
from http import HTTPStatus
|
||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||
from pathlib import Path
|
||||
from typing import Any, Callable, Mapping, Protocol
|
||||
from urllib.parse import parse_qs, urlparse
|
||||
|
||||
from cryptography.hazmat.primitives.asymmetric.ed25519 import (
|
||||
Ed25519PrivateKey,
|
||||
)
|
||||
|
||||
from silent_release_controller import _sanitize, utc_now
|
||||
from silent_release_hardening import (
|
||||
BuilderAttestation,
|
||||
CapabilityAuthorizationError,
|
||||
ReleaseRecoveryWorker,
|
||||
SignedApprovalVerifier,
|
||||
SignedReleasePlanApproval,
|
||||
SilentReleaseActionService,
|
||||
TrustedCandidateBundle,
|
||||
_canonical_json,
|
||||
_durable_json,
|
||||
_safe_child,
|
||||
)
|
||||
|
||||
|
||||
class BuilderSigner(Protocol):
|
||||
@property
|
||||
def key_id(self) -> str:
|
||||
...
|
||||
|
||||
def sign(self, payload: bytes) -> bytes:
|
||||
...
|
||||
|
||||
|
||||
class LocalTestBuilderSigner:
|
||||
"""Ephemeral in-memory signer. It is forbidden for production execution."""
|
||||
|
||||
test_only = True
|
||||
|
||||
def __init__(self, key_id: str, private_key: Ed25519PrivateKey):
|
||||
self._key_id = str(key_id)
|
||||
self._private_key = private_key
|
||||
|
||||
@property
|
||||
def key_id(self) -> str:
|
||||
return self._key_id
|
||||
|
||||
@classmethod
|
||||
def generate(
|
||||
cls, key_id: str = "shadow-builder-test-key"
|
||||
) -> "LocalTestBuilderSigner":
|
||||
return cls(key_id, Ed25519PrivateKey.generate())
|
||||
|
||||
@property
|
||||
def public_key(self):
|
||||
return self._private_key.public_key()
|
||||
|
||||
def sign(self, payload: bytes) -> bytes:
|
||||
return self._private_key.sign(payload)
|
||||
|
||||
|
||||
class ExternalKmsBuilderSigner:
|
||||
"""Signer facade whose private operation remains in KMS/HSM."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
key_id: str,
|
||||
credential_reference: str,
|
||||
sign_callback: Callable[[str, bytes], bytes],
|
||||
):
|
||||
if not str(credential_reference).startswith(
|
||||
("kms://", "hsm://", "secret-manager://")
|
||||
):
|
||||
raise ValueError("production builder requires a KMS/HSM reference")
|
||||
self._key_id = str(key_id)
|
||||
self.credential_reference = str(credential_reference)
|
||||
self._sign_callback = sign_callback
|
||||
|
||||
@property
|
||||
def key_id(self) -> str:
|
||||
return self._key_id
|
||||
|
||||
def sign(self, payload: bytes) -> bytes:
|
||||
return bytes(self._sign_callback(self.credential_reference, payload))
|
||||
|
||||
|
||||
class SignedTrustedBuilderAdapter:
|
||||
"""Signs evidence produced by a trusted collector, never caller evidence."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
collector: Callable[[Mapping[str, Any]], TrustedCandidateBundle],
|
||||
signer: BuilderSigner,
|
||||
):
|
||||
self.collector = collector
|
||||
self.signer = signer
|
||||
|
||||
def build(self, intent: Mapping[str, Any]) -> TrustedCandidateBundle:
|
||||
forbidden = {
|
||||
"artifact_sha256",
|
||||
"canary",
|
||||
"checks",
|
||||
"manifest_sha256",
|
||||
"tests",
|
||||
"tree_oid",
|
||||
}
|
||||
if forbidden.intersection(intent):
|
||||
raise CapabilityAuthorizationError(
|
||||
"trusted builder rejects caller-supplied evidence"
|
||||
)
|
||||
unsigned = self.collector(dict(intent))
|
||||
if unsigned.attestation is not None:
|
||||
raise CapabilityAuthorizationError(
|
||||
"collector cannot self-attest its evidence"
|
||||
)
|
||||
candidate = unsigned.candidate
|
||||
test_sha = hashlib.sha256(
|
||||
_canonical_json(_sanitize(candidate.tests))
|
||||
).hexdigest()
|
||||
canary_sha = hashlib.sha256(
|
||||
_canonical_json(_sanitize(candidate.canary))
|
||||
).hexdigest()
|
||||
attestation_id = "builder-attestation-" + hashlib.sha256(
|
||||
(
|
||||
candidate.candidate_id
|
||||
+ "\0"
|
||||
+ candidate.source_commit
|
||||
+ "\0"
|
||||
+ candidate.artifact_sha256
|
||||
).encode("utf-8")
|
||||
).hexdigest()[:24]
|
||||
attestation = BuilderAttestation(
|
||||
builder_attestation_id=attestation_id,
|
||||
builder_key_id=self.signer.key_id,
|
||||
source_commit=candidate.source_commit,
|
||||
tree_oid=candidate.tree_oid,
|
||||
artifact_sha256=candidate.artifact_sha256,
|
||||
manifest_sha256=candidate.manifest_sha256,
|
||||
package_closure_sha256=(
|
||||
unsigned.release_plan.deployment.package_closure_sha256
|
||||
),
|
||||
test_evidence_sha256=test_sha,
|
||||
canary_evidence_sha256=canary_sha,
|
||||
issued_at=utc_now(),
|
||||
signature="",
|
||||
)
|
||||
attestation = dataclasses.replace(
|
||||
attestation,
|
||||
signature=base64.b64encode(
|
||||
self.signer.sign(attestation.canonical_bytes())
|
||||
).decode("ascii"),
|
||||
)
|
||||
return dataclasses.replace(unsigned, attestation=attestation)
|
||||
|
||||
|
||||
class ApprovalBackendAdapter(Protocol):
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
...
|
||||
|
||||
def verify(
|
||||
self,
|
||||
approval: SignedReleasePlanApproval,
|
||||
*,
|
||||
candidate,
|
||||
release_plan,
|
||||
policy_sha256: str,
|
||||
) -> SignedReleasePlanApproval:
|
||||
...
|
||||
|
||||
|
||||
class LocalTestApprovalSigner:
|
||||
"""Test-only approval signer used solely for Shadow acceptance."""
|
||||
|
||||
test_only = True
|
||||
|
||||
def __init__(self, key_id: str, private_key: Ed25519PrivateKey):
|
||||
self.key_id = str(key_id)
|
||||
self.private_key = private_key
|
||||
|
||||
@classmethod
|
||||
def generate(
|
||||
cls, key_id: str = "shadow-owner-test-key"
|
||||
) -> "LocalTestApprovalSigner":
|
||||
return cls(key_id, Ed25519PrivateKey.generate())
|
||||
|
||||
def sign(
|
||||
self, approval: SignedReleasePlanApproval
|
||||
) -> SignedReleasePlanApproval:
|
||||
unsigned = dataclasses.replace(
|
||||
approval, key_id=self.key_id, signature=""
|
||||
)
|
||||
return dataclasses.replace(
|
||||
unsigned,
|
||||
signature=base64.b64encode(
|
||||
self.private_key.sign(unsigned.canonical_bytes())
|
||||
).decode("ascii"),
|
||||
)
|
||||
|
||||
|
||||
class ProductionApprovalBackendAdapter:
|
||||
"""Verification-only production adapter configured by a secret/KMS ref."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
verifier: SignedApprovalVerifier,
|
||||
credential_reference: str,
|
||||
):
|
||||
if not str(credential_reference).startswith(
|
||||
("kms://", "hsm://", "secret-manager://")
|
||||
):
|
||||
raise ValueError(
|
||||
"production approval backend requires a KMS/secret reference"
|
||||
)
|
||||
self.verifier = verifier
|
||||
self.credential_reference = str(credential_reference)
|
||||
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
return True
|
||||
|
||||
def verify(
|
||||
self,
|
||||
approval: SignedReleasePlanApproval,
|
||||
*,
|
||||
candidate,
|
||||
release_plan,
|
||||
policy_sha256: str,
|
||||
) -> SignedReleasePlanApproval:
|
||||
return self.verifier.verify_release_plan(
|
||||
approval, candidate, release_plan, policy_sha256
|
||||
)
|
||||
|
||||
|
||||
class UnavailableProductionApprovalBackend:
|
||||
credential_reference = None
|
||||
|
||||
@property
|
||||
def available(self) -> bool:
|
||||
return False
|
||||
|
||||
def verify(self, *args, **kwargs):
|
||||
raise CapabilityAuthorizationError(
|
||||
"production approval backend is not configured"
|
||||
)
|
||||
|
||||
|
||||
class LeaderLock:
|
||||
def __init__(self, path: Path):
|
||||
self.path = Path(path)
|
||||
self.handle = None
|
||||
|
||||
def __enter__(self):
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
os.chmod(self.path.parent, 0o700)
|
||||
self.handle = self.path.open("a+", encoding="utf-8")
|
||||
os.chmod(self.path, 0o600)
|
||||
try:
|
||||
import fcntl
|
||||
|
||||
fcntl.flock(
|
||||
self.handle.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB
|
||||
)
|
||||
except BlockingIOError as exc:
|
||||
self.handle.close()
|
||||
self.handle = None
|
||||
raise RuntimeError("silent release leader is already active") from exc
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc, tb):
|
||||
if self.handle is not None:
|
||||
try:
|
||||
import fcntl
|
||||
|
||||
fcntl.flock(self.handle.fileno(), fcntl.LOCK_UN)
|
||||
finally:
|
||||
self.handle.close()
|
||||
self.handle = None
|
||||
|
||||
|
||||
class PersistentSilentReleaseController:
|
||||
"""Idempotent main-event controller with durable startup/recovery reports."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
root: Path,
|
||||
service: SilentReleaseActionService,
|
||||
*,
|
||||
main_probe: Callable[[], str],
|
||||
recovery_worker: ReleaseRecoveryWorker | None = None,
|
||||
):
|
||||
self.root = Path(root)
|
||||
self.service = service
|
||||
self.main_probe = main_probe
|
||||
self.recovery_worker = recovery_worker
|
||||
self.leader_path = self.root / "controller.leader.lock"
|
||||
self.status_path = self.root / "controller-status.json"
|
||||
|
||||
def startup_verify(self) -> dict[str, Any]:
|
||||
checked = 0
|
||||
failed = 0
|
||||
for journal in sorted(self.service.sagas.root.glob("*.events.jsonl")):
|
||||
candidate_id = journal.name[: -len(".events.jsonl")]
|
||||
saga = self.service.sagas.load(candidate_id)
|
||||
checked += 1
|
||||
if not saga.journal_integrity:
|
||||
failed += 1
|
||||
status = {
|
||||
"checked_sagas": checked,
|
||||
"execution_enabled": self.service.execution_enabled,
|
||||
"failed_closed": failed,
|
||||
"shadow_mode": not self.service.execution_enabled,
|
||||
"side_effects_executed": False,
|
||||
"status": "READY" if failed == 0 else "FAIL_CLOSED",
|
||||
}
|
||||
_durable_json(self.status_path, status)
|
||||
return status
|
||||
|
||||
def run_once(self) -> dict[str, Any]:
|
||||
with LeaderLock(self.leader_path):
|
||||
startup = self.startup_verify()
|
||||
if startup["status"] != "READY":
|
||||
result = {
|
||||
"execution_enabled": self.service.execution_enabled,
|
||||
"intent": None,
|
||||
"notification": None,
|
||||
"recovery": None,
|
||||
"shadow_mode": not self.service.execution_enabled,
|
||||
"side_effects_executed": False,
|
||||
"startup": startup,
|
||||
"status": "FAIL_CLOSED",
|
||||
}
|
||||
_durable_json(self.status_path, result)
|
||||
return _sanitize(result)
|
||||
source_commit = str(self.main_probe())
|
||||
event_id = f"main-{source_commit}"
|
||||
intent = self.service.create_release_intent(
|
||||
{"event_id": event_id, "source_commit": source_commit}
|
||||
)
|
||||
notification = None
|
||||
if intent.get("candidate_id"):
|
||||
notification = self.service.ensure_owner_notification(
|
||||
str(intent["candidate_id"])
|
||||
)
|
||||
recovery = (
|
||||
self.recovery_worker.run_once()
|
||||
if self.recovery_worker is not None
|
||||
else self.service.get_recovery_status()
|
||||
)
|
||||
result = {
|
||||
"execution_enabled": self.service.execution_enabled,
|
||||
"intent": intent,
|
||||
"notification": notification,
|
||||
"recovery": recovery,
|
||||
"shadow_mode": not self.service.execution_enabled,
|
||||
"side_effects_executed": False,
|
||||
"startup": startup,
|
||||
}
|
||||
_durable_json(self.status_path, result)
|
||||
return _sanitize(result)
|
||||
|
||||
|
||||
class ShadowActionHandler(BaseHTTPRequestHandler):
|
||||
service: SilentReleaseActionService
|
||||
controller: PersistentSilentReleaseController
|
||||
|
||||
def log_message(self, fmt, *args):
|
||||
return
|
||||
|
||||
def _json(self, payload: Mapping[str, Any], status=HTTPStatus.OK):
|
||||
body = json.dumps(_sanitize(dict(payload)), sort_keys=True).encode()
|
||||
self.send_response(int(status))
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.send_header("Content-Length", str(len(body)))
|
||||
self.end_headers()
|
||||
self.wfile.write(body)
|
||||
|
||||
def _body(self) -> dict[str, Any]:
|
||||
size = int(self.headers.get("Content-Length", "0"))
|
||||
if size > 1024 * 1024:
|
||||
raise ValueError("request body is too large")
|
||||
return json.loads(self.rfile.read(size) or b"{}")
|
||||
|
||||
def do_GET(self):
|
||||
parsed = urlparse(self.path)
|
||||
query = parse_qs(parsed.query)
|
||||
candidate_id = str((query.get("candidate_id") or [""])[0])
|
||||
try:
|
||||
if parsed.path == "/healthz":
|
||||
return self._json(
|
||||
{
|
||||
"execution_enabled": False,
|
||||
"shadow_mode": True,
|
||||
"side_effects_executed": False,
|
||||
"status": "ok",
|
||||
}
|
||||
)
|
||||
routes = {
|
||||
"/getReleaseCandidate": self.service.get_release_candidate,
|
||||
"/getReleasePlan": self.service.get_release_plan,
|
||||
"/getReleaseAcceptance": self.service.get_acceptance,
|
||||
"/getReleaseSaga": self.service.get_release_saga,
|
||||
"/getCapabilityStatus": self.service.get_capability_status,
|
||||
}
|
||||
if parsed.path in routes:
|
||||
return self._json(routes[parsed.path](candidate_id))
|
||||
if parsed.path == "/getRecoveryStatus":
|
||||
return self._json(self.service.get_recovery_status())
|
||||
self._json({"error": "not_found"}, HTTPStatus.NOT_FOUND)
|
||||
except (ValueError, FileNotFoundError) as exc:
|
||||
self._json(
|
||||
{"error": type(exc).__name__}, HTTPStatus.BAD_REQUEST
|
||||
)
|
||||
|
||||
def do_POST(self):
|
||||
parsed = urlparse(self.path)
|
||||
try:
|
||||
body = self._body()
|
||||
if parsed.path == "/createReleaseIntent":
|
||||
return self._json(self.service.create_release_intent(body))
|
||||
if parsed.path in {
|
||||
"/submitSignedApproval",
|
||||
"/submitOwnerApproval",
|
||||
}:
|
||||
return self._json(self.service.submit_owner_approval(body))
|
||||
if parsed.path == "/startDeployment":
|
||||
return self._json(
|
||||
self.service.start_deployment(
|
||||
str(body.get("candidate_id") or "")
|
||||
)
|
||||
)
|
||||
self._json({"error": "not_found"}, HTTPStatus.NOT_FOUND)
|
||||
except (ValueError, FileNotFoundError, CapabilityAuthorizationError) as exc:
|
||||
self._json(
|
||||
{"error": type(exc).__name__}, HTTPStatus.BAD_REQUEST
|
||||
)
|
||||
|
||||
|
||||
def git_main_probe(repository: Path) -> Callable[[], str]:
|
||||
repository = Path(repository)
|
||||
|
||||
def probe() -> str:
|
||||
completed = subprocess.run(
|
||||
[
|
||||
"git",
|
||||
f"--git-dir={repository}",
|
||||
"rev-parse",
|
||||
"refs/heads/main",
|
||||
],
|
||||
check=True,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=15,
|
||||
env={"PATH": os.environ.get("PATH", "")},
|
||||
)
|
||||
return completed.stdout.strip()
|
||||
|
||||
return probe
|
||||
|
||||
|
||||
def serve_shadow(
|
||||
*,
|
||||
state_root: Path,
|
||||
repository: Path,
|
||||
host: str,
|
||||
port: int,
|
||||
poll_seconds: float,
|
||||
) -> None:
|
||||
service = SilentReleaseActionService.shadow(state_root)
|
||||
controller = PersistentSilentReleaseController(
|
||||
state_root,
|
||||
service,
|
||||
main_probe=git_main_probe(repository),
|
||||
)
|
||||
controller.run_once()
|
||||
stop = threading.Event()
|
||||
|
||||
def controller_loop() -> None:
|
||||
while not stop.wait(poll_seconds):
|
||||
try:
|
||||
controller.run_once()
|
||||
except Exception as exc: # fail closed and keep the API available
|
||||
_durable_json(
|
||||
controller.status_path,
|
||||
{
|
||||
"error": type(exc).__name__,
|
||||
"execution_enabled": False,
|
||||
"shadow_mode": True,
|
||||
"side_effects_executed": False,
|
||||
"status": "FAIL_CLOSED",
|
||||
},
|
||||
)
|
||||
|
||||
handler = type(
|
||||
"ConfiguredShadowActionHandler",
|
||||
(ShadowActionHandler,),
|
||||
{"service": service, "controller": controller},
|
||||
)
|
||||
server = ThreadingHTTPServer((host, port), handler)
|
||||
api_thread = threading.Thread(
|
||||
target=server.serve_forever,
|
||||
name="silent-release-shadow-api",
|
||||
daemon=False,
|
||||
)
|
||||
controller_thread = threading.Thread(
|
||||
target=controller_loop,
|
||||
name="silent-release-shadow-controller",
|
||||
daemon=True,
|
||||
)
|
||||
api_thread.start()
|
||||
controller_thread.start()
|
||||
try:
|
||||
while api_thread.is_alive():
|
||||
api_thread.join(timeout=1)
|
||||
finally:
|
||||
stop.set()
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
controller_thread.join(timeout=max(1.0, poll_seconds + 1.0))
|
||||
|
||||
|
||||
def main() -> None:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--state-root", required=True, type=Path)
|
||||
parser.add_argument("--repository", required=True, type=Path)
|
||||
parser.add_argument("--host", default="127.0.0.1")
|
||||
parser.add_argument("--port", default=18891, type=int)
|
||||
parser.add_argument("--poll-seconds", default=30.0, type=float)
|
||||
arguments = parser.parse_args()
|
||||
if arguments.poll_seconds <= 0:
|
||||
raise SystemExit("poll seconds must be positive")
|
||||
if os.environ.get("AIOS_GITOPS_WRITES_ENABLED", "false").lower() != "false":
|
||||
raise SystemExit("GitOps writes must remain disabled")
|
||||
if (
|
||||
os.environ.get(
|
||||
"AIOS_SILENT_RELEASE_EXECUTION_ENABLED", "false"
|
||||
).lower()
|
||||
!= "false"
|
||||
):
|
||||
raise SystemExit("Silent Release execution must remain disabled")
|
||||
serve_shadow(
|
||||
state_root=arguments.state_root,
|
||||
repository=arguments.repository,
|
||||
host=arguments.host,
|
||||
port=arguments.port,
|
||||
poll_seconds=arguments.poll_seconds,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,265 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>AI Evolution Dashboard</title>
|
||||
<style>
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif; background: #0d1117; color: #c9d1d9; height: 100vh; overflow: hidden; }
|
||||
.app { display: flex; height: 100vh; }
|
||||
.sidebar { width: 260px; background: #161b22; border-right: 1px solid #30363d; padding: 20px; display: flex; flex-direction: column; gap: 16px; }
|
||||
.sidebar h1 { font-size: 18px; color: #f0f6fc; border-bottom: 1px solid #30363d; padding-bottom: 12px; margin-bottom: 8px; }
|
||||
.sidebar-nav { list-style: none; display: flex; flex-direction: column; gap: 4px; }
|
||||
.sidebar-nav li { padding: 8px 12px; border-radius: 6px; cursor: pointer; font-size: 14px; color: #8b949e; }
|
||||
.sidebar-nav li:hover, .sidebar-nav li.active { background: #1f6feb22; color: #58a6ff; }
|
||||
.sidebar-nav li i { margin-right: 8px; }
|
||||
.main { flex: 1; padding: 24px; overflow-y: auto; }
|
||||
.main-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 24px; }
|
||||
.main-header h2 { font-size: 20px; }
|
||||
.status-badge { padding: 4px 12px; border-radius: 12px; font-size: 12px; font-weight: 600; text-transform: uppercase; }
|
||||
.status-badge.ok { background: #1b3a2d; color: #3fb950; border: 1px solid #3fb95044; }
|
||||
.status-badge.degraded { background: #3a2e1b; color: #d29922; border: 1px solid #d2992244; }
|
||||
.status-badge.fail { background: #3a1b1b; color: #f85149; border: 1px solid #f8514944; }
|
||||
.card { background: #161b22; border: 1px solid #30363d; border-radius: 8px; padding: 16px; margin-bottom: 16px; }
|
||||
.card-title { font-size: 14px; color: #8b949e; margin-bottom: 8px; }
|
||||
.card-value { font-size: 28px; font-weight: 700; color: #f0f6fc; }
|
||||
.row { display: flex; gap: 16px; }
|
||||
.col { flex: 1; }
|
||||
.grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 16px; }
|
||||
pre { white-space: pre-wrap; word-break: break-word; }
|
||||
.command-item { padding: 12px; margin-bottom: 8px; border-radius: 6px; background: #0d1117; border: 1px solid #21262d; }
|
||||
.command-item .meta { display: flex; gap: 8px; align-items: center; font-size: 12px; color: #8b949e; }
|
||||
.command-item .name { font-size: 14px; color: #58a6ff; font-weight: 600; }
|
||||
.command-item .state { font-size: 11px; padding: 2px 8px; border-radius: 10px; text-transform: uppercase; }
|
||||
.state-active { background: #1b3a2d; color: #3fb950; }
|
||||
.state-running { background: #3a2e1b; color: #d29922; }
|
||||
.state-completed { background: #1b3a2d; color: #3fb950; }
|
||||
.state-failed { background: #3a1b1b; color: #f85149; }
|
||||
.loading { text-align: center; padding: 40px; color: #8b949e; }
|
||||
.error { padding: 20px; background: #3a1b1b; border: 1px solid #f8514944; border-radius: 8px; color: #f85149; margin-bottom: 16px; }
|
||||
.version-item { padding: 8px 12px; background: #0d1117; border: 1px solid #21262d; border-radius: 6px; margin-bottom: 4px; display: flex; justify-content: space-between; }
|
||||
.version-item .tag { color: #58a6ff; font-weight: 600; }
|
||||
.version-item .name { color: #8b949e; font-size: 13px; }
|
||||
.agent-item { background: #0d1117; border: 1px solid #21262d; border-radius: 6px; margin-bottom: 8px; padding: 12px; }
|
||||
.agent-item .agent-title { font-size: 14px; font-weight: 600; color: #c9d1d9; margin-bottom: 4px; }
|
||||
.agent-item .agent-meta { font-size: 12px; color: #8b949e; }
|
||||
.agent-run-item { padding: 8px 12px; margin-bottom: 4px; border-radius: 4px; background: #0d1117; border: 1px solid #21262d; display: flex; justify-content: space-between; align-items: center; }
|
||||
.agent-run-item .run-id { color: #58a6ff; font-size: 13px; font-weight: 600; }
|
||||
.agent-run-item .source { color: #8b949e; font-size: 12px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app" class="app">
|
||||
<div class="sidebar">
|
||||
<h1>🕹️ AI Evolution Dashboard</h1>
|
||||
<ul class="sidebar-nav">
|
||||
<li class="active" onclick="showPanel('overview')"><i>📊</i> Overview</li>
|
||||
<li onclick="showPanel('versions')"><i>🏷️</i> Versions</li>
|
||||
<li onclick="showPanel('commands')"><i>⚡</i> Commands</li>
|
||||
<li onclick="showPanel('agents')"><i>🤖</i> Agent Runs</li>
|
||||
<li onclick="showPanel('arch-owner')"><i>🔐</i> Owner Gate</li>
|
||||
<li onclick="showPanel('arch-approve')"><i>✓</i> Approve Changes</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="main">
|
||||
<div id="panel-overview" class="panel">
|
||||
<div class="main-header">
|
||||
<h2>System Overview</h2>
|
||||
<div id="header-status" class="status-badge">Loading...</div>
|
||||
</div>
|
||||
<div id="loading" class="loading">Loading...</div>
|
||||
<div id="error" class="error" style="display:none;"></div>
|
||||
<div id="content">
|
||||
<div class="row">
|
||||
<div class="col"><div class="card"><div class="card-title">Current Baseline</div><div id="base" class="card-value">-</div></div></div>
|
||||
<div class="col"><div class="card"><div class="card-title">Git Branch</div><div id="branch" class="card-value">-</div></div></div>
|
||||
<div class="col"><div class="card"><div class="card-title">Uptime</div><div id="uptime" class="card-value">-</div></div></div>
|
||||
</div>
|
||||
<div class="card" style="margin-top:16px">
|
||||
<div class="card-title">Event Bus Status</div>
|
||||
<pre id="bus-status">-</pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="panel-versions" class="panel" style="display:none;">
|
||||
<div class="main-header"><h2>Version Timeline</h2></div>
|
||||
<div id="versions-list">Loading...</div>
|
||||
</div>
|
||||
<div id="panel-commands" class="panel" style="display:none;">
|
||||
<div class="main-header"><h2>Command Lookup</h2></div>
|
||||
<div id="commands-list">Loading...</div>
|
||||
</div>
|
||||
<div id="panel-agents" class="panel" style="display:none;">
|
||||
<div class="main-header"><h2>Recent Agent Executions</h2></div>
|
||||
<div id="panel-arch-owner" class="panel" style="display:none;">
|
||||
<div class="main-header"><h2>🔐 Architecture Owner Gate</h2></div>
|
||||
<div id="arch-owner-content">Loading...</div>
|
||||
</div>
|
||||
<div id="panel-arch-approve" class="panel" style="display:none;">
|
||||
<div class="main-header"><h2>✓ Approve Architecture Changes</h2></div>
|
||||
<div id="arch-approve-content">Loading...</div>
|
||||
</div>
|
||||
<div id="agents-list">Loading...</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
async function fetchData() {
|
||||
const r = await fetch('/admin/ai-evolution/api/data');
|
||||
const data = await r.json();
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
document.getElementById('error').style.display = 'none';
|
||||
document.getElementById('content').style.display = '';
|
||||
|
||||
const hs = document.getElementById('header-status');
|
||||
hs.className = 'status-badge ' + (data.healthy ? 'ok' : 'fail');
|
||||
hs.textContent = data.healthy ? '▪ operational' : '⚠ degraded';
|
||||
|
||||
document.getElementById('base').textContent = data.baseline || '-';
|
||||
document.getElementById('branch').textContent = data.main_branch || 'main';
|
||||
document.getElementById('uptime').textContent = data.uptime || '-';
|
||||
document.getElementById('bus-status').textContent = data.bus ? JSON.stringify(data.bus, null, 2) : 'no event bus data';
|
||||
}
|
||||
|
||||
async function loadVersions() {
|
||||
const el = document.getElementById('versions-list');
|
||||
el.innerHTML = '<div class="loading">Loading versions...</div>';
|
||||
try {
|
||||
const r = await fetch('/admin/ai-evolution/api/versions');
|
||||
const data = await r.json();
|
||||
if (data.error) { el.innerHTML = '<div class="error">' + data.error + '</div>'; return; }
|
||||
let html = '<div class="grid">';
|
||||
for (const v of data.versions || []) {
|
||||
html += '<div class="card"><div class="card-title">' + v.tag + '</div><div class="card-value">' + (v.version || v.tag) + '</div></div>';
|
||||
}
|
||||
html += '</div>';
|
||||
el.innerHTML = html;
|
||||
} catch(e) {
|
||||
el.innerHTML = '<div class="error">Failed to load versions: ' + e.message + '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
async function loadCommands() {
|
||||
const el = document.getElementById('commands-list');
|
||||
el.innerHTML = '<div class="loading">Loading commands...</div>';
|
||||
try {
|
||||
const r = await fetch('/admin/ai-evolution/api/data');
|
||||
const data = await r.json();
|
||||
let cmds = data.commands || [];
|
||||
let html = '<div style="display:flex;gap:24px;margin-bottom:16px;">';
|
||||
html += '<div><div class="card"><div class="card-title">Total</div><div class="card-value">' + cmds.length + '</div></div></div>';
|
||||
html += '<div><div class="card"><div class="card-title">By Category</div>';
|
||||
const cats = {};
|
||||
for (const c of cmds) { const k = c.category || 'uncategorized'; cats[k] = (cats[k] || 0) + 1; }
|
||||
for (const [k, v] of Object.entries(cats)) html += '<div style="font-size:14px;color:#8b949e;margin:4px 0;">' + k + ': ' + v + '</div>';
|
||||
html += '</div></div></div>';
|
||||
for (const cmd of cmds.slice().reverse()) {
|
||||
html += '<div class="command-item"><div class="meta">' + cmd.category + ' | ' + cmd.filename + '</div><div class="name">' + cmd.title + '</div><div style="font-size:13px;color:#c9d1d9;margin-top:4px;">' + cmd.summary + '</div></div>';
|
||||
}
|
||||
el.innerHTML = html;
|
||||
} catch(e) {
|
||||
el.innerHTML = '<div class="error">Failed to load commands: ' + e.message + '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
async function loadAgents() {
|
||||
const el = document.getElementById('agents-list');
|
||||
el.innerHTML = '<div class="loading">Loading agent runs...</div>';
|
||||
try {
|
||||
const r = await fetch('/admin/ai-evolution/api/agents');
|
||||
const data = await r.json();
|
||||
if (data.error) { el.innerHTML = '<div class="error">' + data.error + '</div>'; return; }
|
||||
let html = '';
|
||||
for (const agent of data.agents || []) {
|
||||
html += '<div class="agent-item"><div class="agent-title">' + agent.name + ' <span class="state state-' + (agent.status === 'running' ? 'running' : (agent.status === 'ok' ? 'completed' : 'failed')) + '">' + agent.status + '</span></div><div class="agent-meta">' + (agent.runs || 0) + ' runs | last: ' + (agent.last_run || '-') + '</div></div>';
|
||||
}
|
||||
el.innerHTML = html || '<div style="padding:24px;color:#8b949e;">No agent runs recorded yet.</div>';
|
||||
} catch(e) {
|
||||
el.innerHTML = '<div class="error">Failed to load agents: ' + e.message + '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
function showPanel(name) {
|
||||
|
||||
async function loadOwnerGate() {
|
||||
const el = document.getElementById('arch-owner-content');
|
||||
el.innerHTML = '<div class="loading">Loading owner gate data...</div>';
|
||||
try {
|
||||
const r = await fetch('/admin/ai-evolution/api/owner-gate');
|
||||
const data = await r.json();
|
||||
let html = '<div class="row">';
|
||||
html += '<div class="col"><div class="card"><div class="card-title">Pending Requests</div><div class="card-value">' + data.pending_count + '</div></div></div>';
|
||||
html += '<div class="col"><div class="card"><div class="card-title">Approved</div><div class="card-value">' + data.approved_count + '</div></div></div>';
|
||||
html += '<div class="col"><div class="card"><div class="card-title">Rejected</div><div class="card-value">' + data.rejected_count + '</div></div></div>';
|
||||
html += '</div>';
|
||||
html += '<div class="card"><div class="card-title">Pending Approval Requests</div>';
|
||||
if (data.pending_requests && data.pending_requests.length) {
|
||||
for (const req of data.pending_requests) {
|
||||
html += '<div class="command-item">';
|
||||
html += '<div class="name">' + (req.title || req.change_id) + '</div>';
|
||||
html += '<div class="meta">ID: ' + req.change_id + ' | Risk: ' + req.risk + '</div>';
|
||||
html += '<div style="font-size:13px;color:#c9d1d9;margin-top:4px;">' + (req.reason || '') + '</div>';
|
||||
html += '</div>';
|
||||
}
|
||||
} else {
|
||||
html += '<div style="color:#8b949e;padding:12px;">No pending requests.</div>';
|
||||
}
|
||||
html += '</div>';
|
||||
el.innerHTML = html;
|
||||
} catch(e) {
|
||||
el.innerHTML = '<div class="error">Failed to load: ' + e.message + '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
async function loadApprove() {
|
||||
const el = document.getElementById('arch-approve-content');
|
||||
el.innerHTML = '<div class="loading">Loading pending approvals...</div>';
|
||||
try {
|
||||
const r = await fetch('/admin/ai-evolution/api/owner-gate');
|
||||
const data = await r.json();
|
||||
let html = '';
|
||||
if (data.pending_requests && data.pending_requests.length) {
|
||||
html += '<div class="card"><div class="card-title">Pending changes requiring your approval</div>';
|
||||
for (const req of data.pending_requests) {
|
||||
html += '<div class="command-item">';
|
||||
html += '<div class="name">' + (req.title || req.change_id) + '</div>';
|
||||
html += '<div class="meta">Risk: <strong>' + req.risk + '</strong></div>';
|
||||
html += '<div style="font-size:13px;color:#c9d1d9;margin:8px 0;">' + (req.reason || '') + '</div>';
|
||||
html += '<div style="display:flex;gap:8px;">';
|
||||
html += '<button onclick="ownerAction.classList.add('\'approved\');this.disabled=true" style="padding:6px 16px;background:#238636;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:13px;">✓ Approve</button>';
|
||||
html += '</div></div>';
|
||||
}
|
||||
html += '</div>';
|
||||
} else {
|
||||
html += '<div class="card"><div style="padding:24px;text-align:center;color:#8b949e;">✅ All changes processed. No pending approval requests.</div></div>';
|
||||
}
|
||||
el.innerHTML = html;
|
||||
} catch(e) {
|
||||
el.innerHTML = '<div class="error">Failed to load: ' + e.message + '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
document.querySelectorAll('.panel').forEach(p => p.style.display = 'none');
|
||||
document.getElementById('panel-' + name).style.display = '';
|
||||
document.querySelectorAll('.sidebar-nav li').forEach(li => li.classList.remove('active'));
|
||||
document.querySelector('.sidebar-nav li:nth-child(' + ({overview:1,versions:2,commands:3,agents:4}[name] || 1) + ')').classList.add('active');
|
||||
if (name === 'overview') {
|
||||
document.getElementById('panel-overview').innerHTML = '<div class="main-header"><h2>System Overview</h2><div id="header-status" class="status-badge">Loading...</div></div><div id="loading" class="loading">Loading...</div><div id="error" class="error" style="display:none;"></div><div id="content"><div class="row"><div class="col"><div class="card"><div class="card-title">Current Baseline</div><div id="base" class="card-value">-</div></div></div><div class="col"><div class="card"><div class="card-title">Git Branch</div><div id="branch" class="card-value">-</div></div></div><div class="col"><div class="card"><div class="card-title">Uptime</div><div id="uptime" class="card-value">-</div></div></div></div><div class="card" style="margin-top:16px"><div class="card-title">Event Bus Status</div><pre id="bus-status">-</pre></div></div>';
|
||||
fetchData();
|
||||
}
|
||||
const loaders = {
|
||||
'arch-owner': loadOwnerGate,
|
||||
'arch-approve': loadApprove,
|
||||
versions: loadVersions,
|
||||
commands: loadCommands,
|
||||
agents: loadAgents,
|
||||
};
|
||||
const fn = loaders[name];
|
||||
if (fn) fn();
|
||||
}
|
||||
|
||||
fetchData();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,41 @@
|
||||
"""Task Center action API model for Web UI buttons."""
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .task_lifecycle import TaskLifecycle
|
||||
|
||||
|
||||
lifecycle = TaskLifecycle()
|
||||
|
||||
|
||||
def get_task_actions(task: dict[str, Any], role: str) -> dict[str, Any]:
|
||||
return {
|
||||
"task_id": task.get("task_id"),
|
||||
"actions": lifecycle.available_actions(task, role),
|
||||
}
|
||||
|
||||
|
||||
def execute_task_action(task: dict[str, Any], action: str, role: str, reason: str | None = None):
|
||||
return lifecycle.transition(task, action, role, reason)
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/tasks", tags=["task-actions"])
|
||||
|
||||
@router.post("/{task_id}/actions/{action}", operation_id="executeTaskAction")
|
||||
def action(task_id: str, action: str, payload: dict[str, Any]):
|
||||
return execute_task_action(payload.get("task", {}), action, payload.get("role", "user"), payload.get("reason"))
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_task_actions", "execute_task_action"]
|
||||
@@ -0,0 +1,115 @@
|
||||
"""AIOS Task Center domain model.
|
||||
|
||||
The Task Center gives owners and authorized users a single Web UI page showing:
|
||||
who assigned a task, who is executing it, progress, elapsed time, remaining
|
||||
work, and whether completion notifications were sent.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
def parse_time(value: str | None) -> datetime | None:
|
||||
if not value:
|
||||
return None
|
||||
return datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TaskNotificationStatus:
|
||||
required: bool = True
|
||||
sent: bool = False
|
||||
channel: str | None = None
|
||||
sent_at: str | None = None
|
||||
recipient_scope: str | None = None
|
||||
last_error: str | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TaskProgress:
|
||||
percent: int = 0
|
||||
current_step: str = "pending"
|
||||
completed_steps: list[str] = field(default_factory=list)
|
||||
remaining_steps: list[str] = field(default_factory=list)
|
||||
blocked_reason: str | None = None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AIOSTaskRecord:
|
||||
task_id: str
|
||||
title: str
|
||||
assigned_by: str
|
||||
executor: str
|
||||
source: str
|
||||
status: str = "pending"
|
||||
priority: str = "normal"
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
started_at: str | None = None
|
||||
updated_at: str = field(default_factory=utc_now)
|
||||
completed_at: str | None = None
|
||||
progress: TaskProgress = field(default_factory=TaskProgress)
|
||||
notification: TaskNotificationStatus = field(default_factory=TaskNotificationStatus)
|
||||
owner_gate_required: bool = False
|
||||
owner_gate_status: str | None = None
|
||||
evidence: list[str] = field(default_factory=list)
|
||||
|
||||
def elapsed_seconds(self) -> int:
|
||||
start = parse_time(self.started_at) or parse_time(self.created_at)
|
||||
end = parse_time(self.completed_at) or datetime.now(timezone.utc)
|
||||
return int((end - start).total_seconds()) if start else 0
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = asdict(self)
|
||||
data["elapsed_seconds"] = self.elapsed_seconds()
|
||||
data["progress"] = self.progress.to_dict()
|
||||
data["notification"] = self.notification.to_dict()
|
||||
return data
|
||||
|
||||
|
||||
class TaskCenter:
|
||||
def summarize(self, tasks: list[AIOSTaskRecord] | list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
raw_tasks = tasks or []
|
||||
task_dicts = [t.to_dict() if hasattr(t, "to_dict") else dict(t) for t in raw_tasks]
|
||||
active = [t for t in task_dicts if t.get("status") in {"running", "pending", "blocked"}]
|
||||
blocked = [t for t in task_dicts if t.get("status") == "blocked"]
|
||||
completed = [t for t in task_dicts if t.get("status") == "completed"]
|
||||
notification_pending = [
|
||||
t for t in completed
|
||||
if t.get("notification", {}).get("required") and not t.get("notification", {}).get("sent")
|
||||
]
|
||||
return {
|
||||
"module": "task-center",
|
||||
"route": "/admin/ai-evolution/tasks",
|
||||
"title": "AIOS 任务中心",
|
||||
"status": "attention_required" if blocked or notification_pending else "healthy",
|
||||
"generated_at": utc_now(),
|
||||
"summary": {
|
||||
"total": len(task_dicts),
|
||||
"active": len(active),
|
||||
"blocked": len(blocked),
|
||||
"completed": len(completed),
|
||||
"notification_pending": len(notification_pending),
|
||||
},
|
||||
"tasks": sorted(task_dicts, key=lambda t: t.get("updated_at", ""), reverse=True),
|
||||
}
|
||||
|
||||
|
||||
__all__ = [
|
||||
"TaskNotificationStatus",
|
||||
"TaskProgress",
|
||||
"AIOSTaskRecord",
|
||||
"TaskCenter",
|
||||
]
|
||||
@@ -0,0 +1,34 @@
|
||||
"""Task Center API."""
|
||||
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
from fastapi import APIRouter
|
||||
except Exception:
|
||||
APIRouter = None
|
||||
|
||||
from .task_center import TaskCenter
|
||||
|
||||
|
||||
task_center = TaskCenter()
|
||||
|
||||
|
||||
def get_task_overview(tasks: list[dict[str, Any]] | None = None):
|
||||
return task_center.summarize(tasks)
|
||||
|
||||
|
||||
def build_router():
|
||||
if APIRouter is None:
|
||||
return None
|
||||
router = APIRouter(prefix="/admin/ai-evolution/tasks", tags=["task-center"])
|
||||
|
||||
@router.get("/overview", operation_id="getTaskCenterOverview")
|
||||
def overview():
|
||||
return get_task_overview()
|
||||
|
||||
return router
|
||||
|
||||
|
||||
router = build_router()
|
||||
|
||||
__all__ = ["router", "get_task_overview"]
|
||||
@@ -0,0 +1,81 @@
|
||||
"""Task Center visualization model."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
|
||||
class TaskDashboardView:
|
||||
def build(self, tasks: list[dict[str, Any]] | None = None) -> dict[str, Any]:
|
||||
tasks = tasks or []
|
||||
return {
|
||||
"module": "task-center",
|
||||
"route": "/admin/ai-evolution/tasks",
|
||||
"title": "AIOS Task Center",
|
||||
"views": {
|
||||
"kanban": self._kanban(tasks),
|
||||
"timeline": self._timeline(tasks),
|
||||
"flow": self._flow(tasks),
|
||||
"statistics": self._statistics(tasks),
|
||||
},
|
||||
"tasks": [self._task_card(task) for task in tasks],
|
||||
}
|
||||
|
||||
def _task_card(self, task: dict[str, Any]) -> dict[str, Any]:
|
||||
return {
|
||||
"task_id": task.get("task_id"),
|
||||
"title": task.get("title"),
|
||||
"assigned_by": task.get("assigned_by"),
|
||||
"executor": task.get("executor"),
|
||||
"status": task.get("status"),
|
||||
"progress": task.get("progress", {}),
|
||||
"elapsed_seconds": task.get("elapsed_seconds", 0),
|
||||
"remaining_steps": task.get("progress", {}).get("remaining_steps", []),
|
||||
"notification": task.get("notification", {}),
|
||||
"actions": [
|
||||
"start",
|
||||
"update_progress",
|
||||
"block",
|
||||
"request_approval",
|
||||
"approve",
|
||||
"reject",
|
||||
"retry",
|
||||
"complete",
|
||||
"notify",
|
||||
"close",
|
||||
],
|
||||
}
|
||||
|
||||
def _kanban(self, tasks):
|
||||
columns = {"pending": [], "running": [], "blocked": [], "waiting_approval": [], "completed": []}
|
||||
for task in tasks:
|
||||
columns.setdefault(task.get("status", "pending"), []).append(task.get("task_id"))
|
||||
return columns
|
||||
|
||||
def _timeline(self, tasks):
|
||||
return [
|
||||
{
|
||||
"task_id": task.get("task_id"),
|
||||
"updated_at": task.get("updated_at"),
|
||||
"status": task.get("status"),
|
||||
}
|
||||
for task in tasks
|
||||
]
|
||||
|
||||
def _flow(self, tasks):
|
||||
return {
|
||||
"nodes": ["created", "assigned", "running", "blocked", "approval", "completed", "closed"],
|
||||
"task_count": len(tasks),
|
||||
}
|
||||
|
||||
def _statistics(self, tasks):
|
||||
return {
|
||||
"total": len(tasks),
|
||||
"running": len([t for t in tasks if t.get("status") == "running"]),
|
||||
"blocked": len([t for t in tasks if t.get("status") == "blocked"]),
|
||||
"waiting_approval": len([t for t in tasks if t.get("status") == "waiting_approval"]),
|
||||
"completed": len([t for t in tasks if t.get("status") == "completed"]),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["TaskDashboardView"]
|
||||
@@ -0,0 +1,129 @@
|
||||
"""Task Center event bridge.
|
||||
|
||||
Converts task lifecycle actions and agent execution events into normalized AIOS
|
||||
Task Center events. Uses duck-typed Agent Event Bus publisher when available and
|
||||
an in-memory fallback for tests/offline runs.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Protocol
|
||||
from uuid import uuid4
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class TaskEventPublisher(Protocol):
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
...
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TaskEvent:
|
||||
id: str
|
||||
kind: str
|
||||
source: str
|
||||
target: str
|
||||
summary: str
|
||||
payload: dict[str, Any]
|
||||
correlation_id: str | None = None
|
||||
created_at: str = field(default_factory=utc_now)
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class InMemoryTaskEventBus:
|
||||
def __init__(self):
|
||||
self.events: list[dict[str, Any]] = []
|
||||
|
||||
def publish(
|
||||
self,
|
||||
kind: str,
|
||||
source: str,
|
||||
target: str,
|
||||
summary: str,
|
||||
payload: dict[str, Any],
|
||||
correlation_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
event = TaskEvent(
|
||||
id=f"task_evt_{uuid4().hex[:12]}",
|
||||
kind=kind,
|
||||
source=source,
|
||||
target=target,
|
||||
summary=summary,
|
||||
payload=payload,
|
||||
correlation_id=correlation_id,
|
||||
).to_dict()
|
||||
self.events.append(event)
|
||||
return event
|
||||
|
||||
|
||||
class TaskEventBridge:
|
||||
def __init__(self, bus: TaskEventPublisher | None = None):
|
||||
self.bus = bus or InMemoryTaskEventBus()
|
||||
|
||||
def task_created(self, task: dict[str, Any]) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="task_created",
|
||||
source=task.get("assigned_by", "unknown"),
|
||||
target=task.get("executor", "task-center"),
|
||||
summary=task.get("title", "task created"),
|
||||
payload=task,
|
||||
correlation_id=task.get("task_id"),
|
||||
)
|
||||
|
||||
def task_updated(self, task: dict[str, Any], action: str) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="task_updated",
|
||||
source=task.get("executor", "task-center"),
|
||||
target="task-center",
|
||||
summary=f"task {action}: {task.get('status')}",
|
||||
payload={"action": action, "task": task},
|
||||
correlation_id=task.get("task_id"),
|
||||
)
|
||||
|
||||
def task_blocked(self, task: dict[str, Any], reason: str) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="task_blocked",
|
||||
source=task.get("executor", "unknown"),
|
||||
target="owner-gate",
|
||||
summary=reason,
|
||||
payload={"task": task, "reason": reason},
|
||||
correlation_id=task.get("task_id"),
|
||||
)
|
||||
|
||||
def approval_requested(self, task: dict[str, Any], reason: str) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="task_approval_requested",
|
||||
source=task.get("executor", "unknown"),
|
||||
target="owner-gate",
|
||||
summary=reason,
|
||||
payload={"task": task, "reason": reason},
|
||||
correlation_id=task.get("task_id"),
|
||||
)
|
||||
|
||||
def notification_sent(self, task: dict[str, Any], channel: str) -> dict[str, Any]:
|
||||
return self.bus.publish(
|
||||
kind="task_notification_sent",
|
||||
source="notification-agent",
|
||||
target=task.get("assigned_by", "owner"),
|
||||
summary=f"notification sent via {channel}",
|
||||
payload={"task": task, "channel": channel},
|
||||
correlation_id=task.get("task_id"),
|
||||
)
|
||||
|
||||
|
||||
__all__ = ["TaskEvent", "InMemoryTaskEventBus", "TaskEventBridge"]
|
||||
@@ -0,0 +1,147 @@
|
||||
"""AIOS Task Lifecycle.
|
||||
|
||||
Defines a governed task state machine for task creation, assignment, execution,
|
||||
blocking, approval, retry, completion, notification and closure.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
|
||||
|
||||
def utc_now() -> str:
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
TERMINAL_STATES = {"completed", "cancelled", "failed", "closed"}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TaskTransition:
|
||||
action: str
|
||||
from_states: set[str]
|
||||
to_state: str
|
||||
required_role: str = "agent"
|
||||
requires_reason: bool = False
|
||||
notify: bool = False
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = asdict(self)
|
||||
data["from_states"] = sorted(self.from_states)
|
||||
return data
|
||||
|
||||
|
||||
class TaskLifecycle:
|
||||
"""Central task state machine."""
|
||||
|
||||
TRANSITIONS = {
|
||||
"assign": TaskTransition("assign", {"new", "pending"}, "assigned", "dispatcher"),
|
||||
"start": TaskTransition("start", {"assigned", "pending"}, "running", "executor"),
|
||||
"update_progress": TaskTransition("update_progress", {"running"}, "running", "executor"),
|
||||
"block": TaskTransition("block", {"running", "assigned", "pending"}, "blocked", "executor", requires_reason=True, notify=True),
|
||||
"request_approval": TaskTransition("request_approval", {"running", "blocked"}, "waiting_approval", "executor", requires_reason=True, notify=True),
|
||||
"approve": TaskTransition("approve", {"waiting_approval"}, "approved", "owner", notify=True),
|
||||
"reject": TaskTransition("reject", {"waiting_approval"}, "rejected", "owner", requires_reason=True, notify=True),
|
||||
"resume": TaskTransition("resume", {"blocked", "approved"}, "running", "executor"),
|
||||
"retry": TaskTransition("retry", {"failed", "blocked"}, "running", "executor", notify=True),
|
||||
"complete": TaskTransition("complete", {"running", "approved"}, "completed", "executor", notify=True),
|
||||
"notify": TaskTransition("notify", {"completed"}, "completed", "notifier"),
|
||||
"close": TaskTransition("close", {"completed", "cancelled", "failed"}, "closed", "owner"),
|
||||
"cancel": TaskTransition("cancel", {"new", "pending", "assigned", "running", "blocked", "waiting_approval"}, "cancelled", "owner", requires_reason=True, notify=True),
|
||||
"fail": TaskTransition("fail", {"running", "assigned"}, "failed", "executor", requires_reason=True, notify=True),
|
||||
}
|
||||
|
||||
ROLE_ORDER = {
|
||||
"user": 1,
|
||||
"agent": 2,
|
||||
"executor": 3,
|
||||
"dispatcher": 4,
|
||||
"notifier": 4,
|
||||
"group_admin": 5,
|
||||
"owner": 9,
|
||||
}
|
||||
|
||||
def available_actions(self, task: dict[str, Any], role: str) -> list[dict[str, Any]]:
|
||||
state = task.get("status", "new")
|
||||
actions = []
|
||||
for name, transition in self.TRANSITIONS.items():
|
||||
allowed_state = state in transition.from_states
|
||||
allowed_role = self._role_allows(role, transition.required_role)
|
||||
actions.append({
|
||||
"action": name,
|
||||
"label": self._label(name),
|
||||
"enabled": allowed_state and allowed_role,
|
||||
"from_state": state,
|
||||
"to_state": transition.to_state,
|
||||
"required_role": transition.required_role,
|
||||
"requires_reason": transition.requires_reason,
|
||||
"notify": transition.notify,
|
||||
"disabled_reason": None if allowed_state and allowed_role else self._disabled_reason(allowed_state, allowed_role, transition),
|
||||
})
|
||||
return actions
|
||||
|
||||
def transition(self, task: dict[str, Any], action: str, actor_role: str, reason: str | None = None) -> dict[str, Any]:
|
||||
if action not in self.TRANSITIONS:
|
||||
raise ValueError(f"unknown task action: {action}")
|
||||
transition = self.TRANSITIONS[action]
|
||||
state = task.get("status", "new")
|
||||
if state not in transition.from_states:
|
||||
raise ValueError(f"action {action} not allowed from state {state}")
|
||||
if not self._role_allows(actor_role, transition.required_role):
|
||||
raise PermissionError(f"role {actor_role} cannot execute {action}; requires {transition.required_role}")
|
||||
if transition.requires_reason and not reason:
|
||||
raise ValueError(f"action {action} requires reason")
|
||||
updated = dict(task)
|
||||
updated["status"] = transition.to_state
|
||||
updated["updated_at"] = utc_now()
|
||||
history = list(updated.get("history", []))
|
||||
history.append({
|
||||
"action": action,
|
||||
"from": state,
|
||||
"to": transition.to_state,
|
||||
"actor_role": actor_role,
|
||||
"reason": reason,
|
||||
"ts": utc_now(),
|
||||
})
|
||||
updated["history"] = history
|
||||
if action == "complete":
|
||||
updated["completed_at"] = utc_now()
|
||||
notification = dict(updated.get("notification", {}))
|
||||
notification.setdefault("required", True)
|
||||
notification.setdefault("sent", False)
|
||||
updated["notification"] = notification
|
||||
return updated
|
||||
|
||||
def _role_allows(self, role: str, required: str) -> bool:
|
||||
return self.ROLE_ORDER.get(role, 0) >= self.ROLE_ORDER.get(required, 0)
|
||||
|
||||
def _label(self, action: str) -> str:
|
||||
labels = {
|
||||
"assign": "分配任务",
|
||||
"start": "开始执行",
|
||||
"update_progress": "更新进度",
|
||||
"block": "标记阻塞",
|
||||
"request_approval": "请求审批",
|
||||
"approve": "批准",
|
||||
"reject": "拒绝",
|
||||
"resume": "继续执行",
|
||||
"retry": "重试",
|
||||
"complete": "标记完成",
|
||||
"notify": "发送通知",
|
||||
"close": "关闭任务",
|
||||
"cancel": "取消任务",
|
||||
"fail": "标记失败",
|
||||
}
|
||||
return labels.get(action, action)
|
||||
|
||||
def _disabled_reason(self, allowed_state: bool, allowed_role: bool, transition: TaskTransition) -> str:
|
||||
if not allowed_state:
|
||||
return "当前状态不允许该操作"
|
||||
if not allowed_role:
|
||||
return f"需要角色: {transition.required_role}"
|
||||
return "不可用"
|
||||
|
||||
|
||||
__all__ = ["TaskTransition", "TaskLifecycle", "TERMINAL_STATES"]
|
||||
@@ -0,0 +1,50 @@
|
||||
"""Task Center orchestrator.
|
||||
|
||||
Coordinates task ingestion, persistence, lifecycle updates, events and statistics.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from .task_event_bridge import TaskEventBridge
|
||||
from .task_source_ingestor import TaskSourceIngestor
|
||||
from .task_statistics import TaskStatistics
|
||||
from .task_store import TaskStore
|
||||
|
||||
|
||||
class TaskOrchestrator:
|
||||
def __init__(self):
|
||||
self.ingestor = TaskSourceIngestor()
|
||||
self.store = TaskStore()
|
||||
self.events = TaskEventBridge()
|
||||
self.statistics = TaskStatistics()
|
||||
|
||||
def create_from_command(self, path: str, bucket: str = "active") -> dict[str, Any]:
|
||||
task = self.ingestor.command_file_to_task(path, bucket)
|
||||
self.store.append(task)
|
||||
self.events.task_created(task)
|
||||
return task
|
||||
|
||||
def create_from_agent_execution(self, record: dict[str, Any]) -> dict[str, Any]:
|
||||
task = self.ingestor.agent_execution_to_task(record)
|
||||
self.store.append(task)
|
||||
self.events.task_created(task)
|
||||
return task
|
||||
|
||||
def sync_event(self, event: dict[str, Any]) -> dict[str, Any] | None:
|
||||
task = self.ingestor.event_to_task(event)
|
||||
if task:
|
||||
self.store.append(task)
|
||||
self.events.task_updated(task, event.get("kind", "event"))
|
||||
return task
|
||||
|
||||
def dashboard(self) -> dict[str, Any]:
|
||||
tasks = self.store.latest()
|
||||
return {
|
||||
"tasks": tasks,
|
||||
"statistics": self.statistics.summarize(tasks),
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["TaskOrchestrator"]
|
||||
@@ -0,0 +1,21 @@
|
||||
"""Task Plane runtime package."""
|
||||
|
||||
from .models import (
|
||||
EvidenceEnvelope,
|
||||
ProbeEvidence,
|
||||
ProbeOutcome,
|
||||
TaskPlan,
|
||||
TaskRecord,
|
||||
TaskStatus,
|
||||
TaskStateTransitionError,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"EvidenceEnvelope",
|
||||
"ProbeEvidence",
|
||||
"ProbeOutcome",
|
||||
"TaskPlan",
|
||||
"TaskRecord",
|
||||
"TaskStatus",
|
||||
"TaskStateTransitionError",
|
||||
]
|
||||
@@ -0,0 +1,17 @@
|
||||
"""Adapters for executing tasks via worker backends."""
|
||||
|
||||
from .base import WorkerAdapter
|
||||
from .openclaw import OpenClawAdapter
|
||||
from .codex import CodexAdapter
|
||||
from .hermes import HermesAdapter
|
||||
from .a2a import A2AAdapter
|
||||
from .systemd_worker import SystemdWorkerAdapter
|
||||
|
||||
__all__ = [
|
||||
"WorkerAdapter",
|
||||
"OpenClawAdapter",
|
||||
"CodexAdapter",
|
||||
"HermesAdapter",
|
||||
"A2AAdapter",
|
||||
"SystemdWorkerAdapter",
|
||||
]
|
||||
@@ -0,0 +1,31 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from .base import WorkerAdapter
|
||||
|
||||
|
||||
class A2AAdapter(WorkerAdapter):
|
||||
worker_name = "a2a"
|
||||
|
||||
def capabilities(self) -> list[str]:
|
||||
return ["task.exchange", "agent.handoff"]
|
||||
|
||||
def claim(self, task):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "claimed"}
|
||||
|
||||
def execute(self, task, claim):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "SHADOW_VERIFIED", "claim_id": claim.claim_id, "execution_mode": "shadow", "production_side_effects": False}
|
||||
|
||||
def heartbeat(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "alive"}
|
||||
|
||||
def report_progress(self, claim, progress):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "progress": progress}
|
||||
|
||||
def probe(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": claim.status}
|
||||
|
||||
def cancel(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "cancelled"}
|
||||
|
||||
def collect_result(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "result": "not_collected"}
|
||||
@@ -0,0 +1,41 @@
|
||||
"""Base worker adapter contract."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import abc
|
||||
|
||||
|
||||
class WorkerAdapter(abc.ABC):
|
||||
worker_name = "base"
|
||||
|
||||
@abc.abstractmethod
|
||||
def capabilities(self) -> list[str]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def claim(self, task):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def execute(self, task, claim):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def heartbeat(self, claim):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def report_progress(self, claim, progress):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def probe(self, claim):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def cancel(self, claim):
|
||||
raise NotImplementedError
|
||||
|
||||
@abc.abstractmethod
|
||||
def collect_result(self, claim):
|
||||
raise NotImplementedError
|
||||
@@ -0,0 +1,31 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from .base import WorkerAdapter
|
||||
|
||||
|
||||
class CodexAdapter(WorkerAdapter):
|
||||
worker_name = "codex"
|
||||
|
||||
def capabilities(self) -> list[str]:
|
||||
return ["code.read", "code.write.patch", "test.python", "review.security"]
|
||||
|
||||
def claim(self, task):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "claimed"}
|
||||
|
||||
def execute(self, task, claim):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "SHADOW_VERIFIED", "claim_id": claim.claim_id, "execution_mode": "shadow", "production_side_effects": False}
|
||||
|
||||
def heartbeat(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "alive"}
|
||||
|
||||
def report_progress(self, claim, progress):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "progress": progress}
|
||||
|
||||
def probe(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": claim.status}
|
||||
|
||||
def cancel(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "cancelled"}
|
||||
|
||||
def collect_result(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "result": "not_collected"}
|
||||
@@ -0,0 +1,31 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from .base import WorkerAdapter
|
||||
|
||||
|
||||
class HermesAdapter(WorkerAdapter):
|
||||
worker_name = "hermes"
|
||||
|
||||
def capabilities(self) -> list[str]:
|
||||
return ["architecture.review", "policy.review", "threat.model"]
|
||||
|
||||
def claim(self, task):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "claimed"}
|
||||
|
||||
def execute(self, task, claim):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "SHADOW_VERIFIED", "claim_id": claim.claim_id, "execution_mode": "shadow", "production_side_effects": False}
|
||||
|
||||
def heartbeat(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "alive"}
|
||||
|
||||
def report_progress(self, claim, progress):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "progress": progress}
|
||||
|
||||
def probe(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": claim.status}
|
||||
|
||||
def cancel(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "cancelled"}
|
||||
|
||||
def collect_result(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "result": "not_collected"}
|
||||
@@ -0,0 +1,31 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from .base import WorkerAdapter
|
||||
|
||||
|
||||
class OpenClawAdapter(WorkerAdapter):
|
||||
worker_name = "openclaw"
|
||||
|
||||
def capabilities(self) -> list[str]:
|
||||
return ["code.read", "code.write.patch", "test.execute", "runtime.shadow"]
|
||||
|
||||
def claim(self, task):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "claimed"}
|
||||
|
||||
def execute(self, task, claim):
|
||||
return {"worker": self.worker_name, "task_id": task.task_id, "status": "SHADOW_VERIFIED", "claim_id": claim.claim_id, "execution_mode": "shadow", "production_side_effects": False}
|
||||
|
||||
def heartbeat(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "alive"}
|
||||
|
||||
def report_progress(self, claim, progress):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "progress": progress}
|
||||
|
||||
def probe(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": claim.status}
|
||||
|
||||
def cancel(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "status": "cancelled"}
|
||||
|
||||
def collect_result(self, claim):
|
||||
return {"worker": self.worker_name, "claim_id": claim.claim_id, "result": "not_collected"}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user