fix: resolve all merge conflict markers from feat/zeroclaw-compliance-agent
Build + Deploy / build-admin-compliance (push) Successful in 2m7s
Build + Deploy / build-backend-compliance (push) Failing after 5m21s
Build + Deploy / build-ai-sdk (push) Successful in 53s
Build + Deploy / build-developer-portal (push) Successful in 1m18s
Build + Deploy / build-tts (push) Successful in 1m42s
Build + Deploy / build-document-crawler (push) Successful in 45s
Build + Deploy / build-dsms-gateway (push) Successful in 27s
Build + Deploy / build-dsms-node (push) Successful in 19s
CI / branch-name (push) Has been skipped
Build + Deploy / trigger-orca (push) Has been skipped
CI / guardrail-integrity (push) Has been skipped
CI / loc-budget (push) Failing after 19s
CI / secret-scan (push) Has been skipped
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / nodejs-build (push) Successful in 3m6s
CI / dep-audit (push) Has been skipped
CI / sbom-scan (push) Has been skipped
CI / test-go (push) Successful in 55s
CI / test-python-backend (push) Successful in 44s
CI / test-python-document-crawler (push) Successful in 30s
CI / test-python-dsms-gateway (push) Successful in 26s
CI / validate-canonical-controls (push) Successful in 18s

9 files had conflict markers from the branch merge. All resolved keeping
the feature branch version. Also split agent_scan_routes.py (534→367 LOC)
by extracting Pydantic models to agent_scan_models.py.

[guardrail-change]

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Benjamin Admin
2026-05-11 12:15:07 +02:00
parent e03a86a9bb
commit 02ff96f74e
13 changed files with 123 additions and 777 deletions
@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
/**
* Playwright config for testing against live Mac Mini instance.
* No webServer — assumes https://macmini:3007 is already running.
@@ -7,17 +5,10 @@
* Usage: npx playwright test --config=e2e/playwright-live.config.ts
*/
>>>>>>> feat/zeroclaw-compliance-agent
import { defineConfig, devices } from '@playwright/test'
export default defineConfig({
testDir: './specs',
<<<<<<< HEAD
timeout: 30000,
use: {
baseURL: 'https://macmini:3007',
ignoreHTTPSErrors: true,
=======
fullyParallel: true,
retries: 0,
workers: 3,
@@ -30,16 +21,12 @@ export default defineConfig({
ignoreHTTPSErrors: true,
screenshot: 'on',
trace: 'on-first-retry',
>>>>>>> feat/zeroclaw-compliance-agent
},
projects: [
{ name: 'chromium', use: { ...devices['Desktop Chrome'] } },
],
<<<<<<< HEAD
=======
outputDir: 'e2e/test-results',
timeout: 20000,
expect: { timeout: 5000 },
// No webServer — we test against the live instance
>>>>>>> feat/zeroclaw-compliance-agent
})