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
@@ -208,12 +208,8 @@ function SDKInnerLayout({ children }: { children: React.ReactNode }) {
      {/* Command Bar Modal */}
      {isCommandBarOpen && <CommandBar onClose={() => setCommandBarOpen(false)} />}

-<<<<<<< HEAD
-      {/* Module-specific FAB navigators are rendered by each module's layout */}
-=======
      {/* Pipeline Sidebar (FAB on mobile/tablet, fixed on desktop xl+) */}
      <SDKPipelineSidebar />
->>>>>>> feat/zeroclaw-compliance-agent

      {/* Compliance Advisor Widget — immer sichtbar, auch ohne Projekt */}
      <ComplianceAdvisorWidget currentStep={currentStep} />