fix: resolve all merge conflict markers from feat/zeroclaw-compliance-agent

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>
2026-05-11 12:15:07 +02:00
parent e03a86a9bb
commit 02ff96f74e
13 changed files with 123 additions and 777 deletions
@@ -18,11 +18,7 @@ export async function POST(request: NextRequest) {
      method: 'POST',
      headers: { 'Content-Type': 'application/json' },
      body,
-<<<<<<< HEAD
-      signal: AbortSignal.timeout(30000), // 30s — just needs to start the job
-=======
      signal: AbortSignal.timeout(300000), // 5 min — multi-page scan + LLM calls
->>>>>>> feat/zeroclaw-compliance-agent
    })

    if (!response.ok) {