Merge remote-tracking branch 'origin/main' into codex/ai-automation-codebase-review-20260710

This commit is contained in:
ogt
2026-07-17 10:52:00 +08:00
10 changed files with 187 additions and 198 deletions

View File

@@ -692,7 +692,7 @@ _CATALOG: tuple[dict[str, Any], ...] = (
"approval_required": False,
"risk_level": "medium",
"canonical_asset_id": "service:openclaw:host188",
"catalog_revision": "2026-07-17-openclaw-callback-overlay-v2",
"catalog_revision": "2026-07-17-openclaw-callback-user-overlay-v3",
"cross_domain_fallback_allowed": False,
},
{

View File

@@ -249,63 +249,53 @@ _POSTCONDITION_REGISTRY: dict[str, tuple[AssetPostcondition, ...]] = {
"configuration",
"host_188",
"set -euo pipefail; "
"root=/var/lib/awoooi-controlled-apply/openclaw-callback-forwarder/"
"root=/home/ollama/.local/share/awoooi-controlled-apply/"
"openclaw-callback-forwarder/"
"payloads/ffc45311b6403b30cb6ae6e1aa83dae1a047e9c9 && "
"manifest=\"$root/manifest.json\" && "
"test -d \"$root\" && test ! -L \"$root\" && "
"test \"$(stat -c '%u:%g:%a' \"$root\")\" = '0:0:755' && "
"test \"$(stat -c '%U:%G:%a' \"$root\")\" = 'ollama:ollama:755' && "
"test -f \"$manifest\" && test ! -L \"$manifest\" && "
"test \"$(stat -c '%u:%g:%a' \"$manifest\")\" = '0:0:444' && "
"test \"$(stat -c '%U:%G:%a' \"$manifest\")\" = 'ollama:ollama:444' && "
"test \"$(sha256sum \"$manifest\" | cut -d' ' -f1)\" = "
"f06df6f3163e5ae7bf999624b011a3ae0bff096c9d0c8cb4c43f8b40be43ae2b",
"dafeb467b744ee7e80dc043d51f9e5d7e6905a58103f1710d519b553b56c6e48",
),
AssetPostcondition(
"host_188_openclaw_callback_overlay_enabled",
"configuration",
"host_188",
"set -euo pipefail; "
"drop=/etc/systemd/system/clawbot.service.d/"
"20-awoooi-callback-forwarder.conf && "
"override=/etc/awoooi/openclaw-callback-forwarder/"
"docker-compose.callback.yml && "
"COMPOSE_FILE_key=COMPOSE_FILE && "
"test \"$COMPOSE_FILE_key\" = 'COMPOSE_FILE' && "
"wd=$(systemctl show clawbot.service --property=WorkingDirectory "
"--value) && "
"test -f \"$drop\" && test ! -L \"$drop\" && "
"test \"$(stat -c '%u:%g:%a' \"$drop\")\" = '0:0:644' && "
"drop_sha=$(sha256sum \"$drop\" | cut -d' ' -f1) && "
"case \"$wd:$drop_sha\" in "
"'/home/ollama/clawbot-v5:"
"419fb4f249f7e1370fbca87086fd725e57b1f5cf54da2f84caf9a21fea7111e3'"
"|'/opt/openclaw:"
"4a78d414e4b591f54232fab04529861a6042718a7627c4e17ccd5cc0cbd485f9') "
"true ;; *) false ;; esac && "
"test \"$wd\" = '/home/ollama/clawbot-v5' && "
"override=\"$wd/docker-compose.override.yml\" && "
"test -f \"$override\" && test ! -L \"$override\" && "
"test \"$(stat -c '%u:%g:%a' \"$override\")\" = '0:0:444' && "
"test \"$(stat -c '%U:%G:%a' \"$override\")\" = "
"'ollama:ollama:444' && "
"test \"$(sha256sum \"$override\" | cut -d' ' -f1)\" = "
"f6fa7f6724c35f86f1c8dafac07e2680231dfa29a5d45534ed0515c58ac2de77",
"8f6b7e8a0d6746c1331e99910656e64deebf67c9582bab3e1d36f71bb7a253c0",
),
AssetPostcondition(
"host_188_openclaw_callback_payload_runtime",
"configuration",
"host_188",
"set -euo pipefail; "
"root=/var/lib/awoooi-controlled-apply/openclaw-callback-forwarder/"
"root=/home/ollama/.local/share/awoooi-controlled-apply/"
"openclaw-callback-forwarder/"
"payloads/ffc45311b6403b30cb6ae6e1aa83dae1a047e9c9 && "
"telegram=\"$root/app/bot/telegram.py\" && "
"config=\"$root/app/core/config.py\" && "
"forwarder=\"$root/app/services/telegram_callback_forwarder.py\" && "
"test -f \"$telegram\" && test ! -L \"$telegram\" && "
"test \"$(stat -c '%u:%g:%a' \"$telegram\")\" = '0:0:444' && "
"test \"$(stat -c '%U:%G:%a' \"$telegram\")\" = 'ollama:ollama:444' && "
"test \"$(sha256sum \"$telegram\" | cut -d' ' -f1)\" = "
"af9600f32305ae73184651a8d3437063d7c8d35e3c3eb0910a2e27ac874c9302 && "
"test -f \"$config\" && test ! -L \"$config\" && "
"test \"$(stat -c '%u:%g:%a' \"$config\")\" = '0:0:444' && "
"test \"$(stat -c '%U:%G:%a' \"$config\")\" = 'ollama:ollama:444' && "
"test \"$(sha256sum \"$config\" | cut -d' ' -f1)\" = "
"e1b8b633f7b4780d3078d6c42a55e49d200255d3597a34e0cd2fd649b84eaea1 && "
"test -f \"$forwarder\" && test ! -L \"$forwarder\" && "
"test \"$(stat -c '%u:%g:%a' \"$forwarder\")\" = '0:0:444' && "
"test \"$(stat -c '%U:%G:%a' \"$forwarder\")\" = 'ollama:ollama:444' && "
"test \"$(sha256sum \"$forwarder\" | cut -d' ' -f1)\" = "
"0d7693e34f63db4491d974f9f76a3a1c793d32cda193cb55ed3d8c86297b4fe3 && "
"ids=$(docker ps -q "