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
@@ -93,17 +93,11 @@ export function CookieBannerOverlay() {

  return (
    <>
-<<<<<<< HEAD
-      {/* Non-blocking banner — no overlay, no pointer-events blocking */}
-      <div className="fixed bottom-0 left-16 xl:left-64 right-0 z-50 pointer-events-none">
-        <div className="max-w-3xl mx-auto m-4 bg-white rounded-2xl shadow-2xl border border-gray-200 overflow-hidden pointer-events-auto">
-=======
      {/* Overlay — leaves sidebar (left 64px/16px) accessible */}
      <div className="fixed inset-0 ml-16 xl:ml-64 bg-black/30 z-[9998]" onClick={() => setIsOpen(false)} />

      <div className="fixed bottom-0 left-0 right-0 z-[9999]">
        <div className="max-w-3xl mx-auto m-4 bg-white rounded-2xl shadow-2xl border border-gray-200 overflow-hidden">
->>>>>>> feat/zeroclaw-compliance-agent

          {/* Header with EWR toggle + close button */}
          <div className="px-6 pt-5 pb-3">