From d18ea8145fc107f538fde49935a11fac6f13dd6f Mon Sep 17 00:00:00 2001 From: Robert DeVore Date: Mon, 12 Oct 2026 12:09:13 -0400 Subject: [PATCH 1/2] Pin Watchdog 1.2.1 in integration and release checks --- .github/workflows/ci.yml | 10 +++++++++- .github/workflows/release.yml | 12 ++++++++++-- docs/integration-matrix.md | 2 +- docs/live-provider-verification.md | 4 ++++ release/dependencies.json | 2 +- tests/relay_watchdog_real_smoke.sh | 3 ++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86a0369..94251a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,11 +60,19 @@ jobs: ref: f0c95b66fbc74057481ef228961eb6e69ff8886a path: kujo-agents token: ${{ secrets.KUJO_ECOSYSTEM_TOKEN || github.token }} + - name: Install Watchdog runtime + id: watchdog-runtime + uses: kujolang/kujo/.github/actions/setup-kujo@fc53093f35e4236682bbbf5ab1ccc8d2b4df990c + with: + version: v1.6.0 + - name: Select Watchdog runtime for integration checks + shell: bash + run: echo "RELAY_WATCHDOG_KUJO_BIN=${{ steps.watchdog-runtime.outputs.kujo-path }}" >> "$GITHUB_ENV" - name: Checkout Watchdog uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 with: repository: kujolang/watchdog - ref: 7c46cd0bf1680d037c24506be4ed0a2405a9841f + ref: 9e82e8f5b05edca948f6a432ae517031388296e6 path: watchdog token: ${{ secrets.KUJO_ECOSYSTEM_TOKEN || github.token }} - name: Checkout PackWrite diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d14599b..ad51404 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -170,11 +170,19 @@ jobs: ref: f0c95b66fbc74057481ef228961eb6e69ff8886a path: kujo-agents token: ${{ secrets.KUJO_ECOSYSTEM_TOKEN || github.token }} + - name: Install Watchdog runtime + id: watchdog-runtime + uses: kujolang/kujo/.github/actions/setup-kujo@fc53093f35e4236682bbbf5ab1ccc8d2b4df990c + with: + version: v1.6.0 + - name: Select Watchdog runtime for integration checks + shell: bash + run: echo "RELAY_WATCHDOG_KUJO_BIN=${{ steps.watchdog-runtime.outputs.kujo-path }}" >> "$GITHUB_ENV" - name: Checkout Watchdog source identity uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 with: repository: kujolang/watchdog - ref: 7c46cd0bf1680d037c24506be4ed0a2405a9841f + ref: 9e82e8f5b05edca948f6a432ae517031388296e6 path: watchdog token: ${{ secrets.KUJO_ECOSYSTEM_TOKEN || github.token }} - name: Checkout PackWrite @@ -244,7 +252,7 @@ jobs: RELAY_WATCHDOG_API_TOKEN: ${{ secrets.RELAY_WATCHDOG_API_TOKEN }} RELAY_WATCHDOG_UPSTREAM_PROFILE: ${{ vars.RELAY_WATCHDOG_UPSTREAM_PROFILE }} RELAY_WATCHDOG_VERIFY: "true" - RELAY_WATCHDOG_DEPLOYED_REVISION: 7c46cd0bf1680d037c24506be4ed0a2405a9841f + RELAY_WATCHDOG_DEPLOYED_REVISION: ${{ vars.RELAY_WATCHDOG_DEPLOYED_REVISION }} RELAY_LIVE_MODEL: ${{ vars.RELAY_LIVE_MODEL }} RELAY_LIVE_PROVIDER: openai-compatible RELAY_LIVE_MISSION: /tmp/relay-live-mission.json diff --git a/docs/integration-matrix.md b/docs/integration-matrix.md index 05b7eed..0d33c6f 100644 --- a/docs/integration-matrix.md +++ b/docs/integration-matrix.md @@ -12,7 +12,7 @@ This matrix separates required local v1 dependencies, optional proven integratio | RunLedger | `1.0.0` / `5cf186c9b56b540970f75e33a06f50d3dac833a8` | required and proven locally | start/finish lifecycle receipt and correlation | hosted ledger or custody guarantee | | ChangeBucket | `1.0.0` / `373ac51a572bd3bb0510ac718ac1bab065c84735` | required and proven locally | bounded change report required for completion | organization-specific change approval | | Eval | `1.0.0` / `dce9d030a3547803dab876b404c44c25b247dde1` | required and proven locally | deterministic acceptance result required for completion | general model-quality certification | -| Watchdog | `1.0.0` / `7c46cd0bf1680d037c24506be4ed0a2405a9841f` | optional and proven with local server/stub; external proof blocked until approved | mandatory live route, auth posture, request-ID correlation, usage reconciliation, secret-safe evidence | silent bypass, arbitrary provider certification, hosted proxy operation | +| Watchdog | `1.2.1` / `9e82e8f5b05edca948f6a432ae517031388296e6` | optional and proven with local server/stub; external proof blocked until approved | mandatory live route, auth posture, request-ID correlation, usage reconciliation, secret-safe evidence | silent bypass, arbitrary provider certification, hosted proxy operation | | Workcell | `1.0.0` / `28d2c4a3b8d317fedd5e20be618f98bd3859eaea` | required exact-candidate release gate | bounded no-network success/failure execution, manifest and receipt verification when rerun | VM isolation, compromised-daemon defense, universal certification | | Kennel | `1.0.0` / `6df043c3ba0bde4445cc8f8f7d4c01c60c9c6d7e` | required release gate | manifest validation and public export declaration | package publication during preparation | | ShipCheck | `1.0.0` / `2768e3040e766b0befd354db4427afc4c7a81899` | required release gate | 16-check repository readiness gate | test, provider, platform, or security certification | diff --git a/docs/live-provider-verification.md b/docs/live-provider-verification.md index e9059b0..69a20cf 100644 --- a/docs/live-provider-verification.md +++ b/docs/live-provider-verification.md @@ -42,3 +42,7 @@ The release owner must verify: - the proof does not claim compatibility with other providers or models. If approval, credentials, Watchdog API visibility, usage fields, or an external provider are unavailable, record `blocked` in the launch checklist and release manifest. Never substitute fixture or stub evidence. + +## Watchdog release pin + +The current integration pin is Watchdog 1.2.1. Local CI starts it with a separate Kujo 1.6.0 runtime through `RELAY_WATCHDOG_KUJO_BIN`; Relay keeps its own runtime contract. Before running external proof, deploy that exact Watchdog commit and set the GitHub Actions variable `RELAY_WATCHDOG_DEPLOYED_REVISION` to the observed deployed commit. The workflow compares that value with `release/dependencies.json`; a source checkout alone is not deployment evidence. diff --git a/release/dependencies.json b/release/dependencies.json index 5a77101..06fc45b 100644 --- a/release/dependencies.json +++ b/release/dependencies.json @@ -6,7 +6,7 @@ "ai-sdk": {"version": "1.0.0", "revision": "d3c6def0f7844f8b42bd92d3b176e80283af8e79", "required": true}, "agents-sdk": {"version": "1.0.0", "revision": "e92a61ec1df21c89ae26f411838b4669405a0765", "required": true}, "kujo-agents": {"version": "unreleased", "revision": "f0c95b66fbc74057481ef228961eb6e69ff8886a", "required": true}, - "watchdog": {"version": "1.0.0", "revision": "7c46cd0bf1680d037c24506be4ed0a2405a9841f", "required": false}, + "watchdog": {"version": "1.2.1", "revision": "9e82e8f5b05edca948f6a432ae517031388296e6", "required": false}, "packwrite": {"version": "1.0.0", "revision": "0cb9487e4c02218bb4a18efe68b8a0c22998f715", "required": true}, "runledger": {"version": "1.0.0", "revision": "5cf186c9b56b540970f75e33a06f50d3dac833a8", "required": true}, "changebucket": {"version": "1.0.0", "revision": "373ac51a572bd3bb0510ac718ac1bab065c84735", "required": true}, diff --git a/tests/relay_watchdog_real_smoke.sh b/tests/relay_watchdog_real_smoke.sh index ca9d8ff..8850e23 100755 --- a/tests/relay_watchdog_real_smoke.sh +++ b/tests/relay_watchdog_real_smoke.sh @@ -6,6 +6,7 @@ RELAY_TEST_TMP_ROOT="$(cd "${TMPDIR:-/tmp}" && pwd -P)" export RELAY_STATE_ROOT="${RELAY_STATE_ROOT:-$RELAY_TEST_TMP_ROOT/relay-test-state-${UID:-0}-$$}" KUJO="${KUJO:-${KUJO_BIN:-$ROOT/../kujo/target/release/kujo}}" WATCHDOG_ROOT="${RELAY_WATCHDOG_ROOT:-$ROOT/../watchdog}" +WATCHDOG_KUJO="${RELAY_WATCHDOG_KUJO_BIN:-$KUJO}" STUB_PORT="${RELAY_TEST_PORT:-18772}" WATCHDOG_PORT="${RELAY_WATCHDOG_TEST_PORT:-18773}" CORRELATION="relay-real-watchdog-correlation" @@ -27,7 +28,7 @@ WDG_API_AUTH_TOKEN=relay-api-token \ WDG_PROXY_AUTHZ_MODE=token \ WDG_PROXY_AUTHZ_TOKEN=relay-proxy-token \ WDG_DEPLOYMENT_PROFILE=local \ -"$KUJO" run --interpreter "$WATCHDOG_ROOT/dashboard_server.kujo" >"$WATCHDOG_LOG" 2>&1 & +"$WATCHDOG_KUJO" run --interpreter "$WATCHDOG_ROOT/dashboard_server.kujo" >"$WATCHDOG_LOG" 2>&1 & watchdog_pid=$! cleanup() { From 10439577241aa116822c412a03f6d6090699380f Mon Sep 17 00:00:00 2001 From: Robert DeVore Date: Mon, 12 Oct 2026 12:35:05 -0400 Subject: [PATCH 2/2] Report failing enterprise assertion locations without exposing payloads --- tests/relay_enterprise_smoke.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/relay_enterprise_smoke.sh b/tests/relay_enterprise_smoke.sh index 5fdce28..c0f31ce 100755 --- a/tests/relay_enterprise_smoke.sh +++ b/tests/relay_enterprise_smoke.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -euo pipefail +trap 'rc=$?; if [[ $- == *e* ]]; then printf "FAIL %s:%s (exit %s)\n" "${BASH_SOURCE[0]}" "$LINENO" "$rc" >&2; fi' ERR ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" KUJO="${KUJO:-${KUJO_BIN:-$ROOT/../kujo/target/release/kujo}}"