fix: resolve all merge conflict markers from feat/zeroclaw-compliance-agent
Build + Deploy / build-backend-compliance (push) Failing after 5m21s
Build + Deploy / build-admin-compliance (push) Successful in 2m7s
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
@@ -6,24 +6,6 @@ import { TemplateContext } from './contextBridge'
export const CATEGORIES: { key: string; label: string; types: string[] | null }[] = [
{ key: 'all', label: 'Alle', types: null },
<<<<<<< HEAD
{ key: 'privacy_policy', label: 'Datenschutz', types: ['privacy_policy'] },
{ key: 'terms', label: 'AGB', types: ['terms_of_service', 'agb', 'clause'] },
{ key: 'impressum', label: 'Impressum', types: ['impressum'] },
{ key: 'dpa', label: 'AVV/DPA', types: ['dpa'] },
{ key: 'nda', label: 'NDA', types: ['nda'] },
{ key: 'sla', label: 'SLA', types: ['sla'] },
{ key: 'acceptable_use', label: 'AUP', types: ['acceptable_use'] },
{ key: 'widerruf', label: 'Widerruf', types: ['widerruf'] },
{ key: 'cookie', label: 'Cookie', types: ['cookie_policy', 'cookie_banner'] },
{ key: 'cloud', label: 'Cloud', types: ['cloud_service_agreement'] },
{ key: 'misc', label: 'Weitere', types: ['community_guidelines', 'copyright_policy', 'data_usage_clause'] },
{ key: 'dsfa', label: 'DSFA', types: ['dsfa'] },
{ key: 'dsr', label: 'DSR-Prozesse', types: [
'dsr_process_art15', 'dsr_process_art16', 'dsr_process_art17',
'dsr_process_art18', 'dsr_process_art19', 'dsr_process_art20', 'dsr_process_art21',
]},
=======
// ── Nach Nutzungskontext sortiert ──────────────────────────────────────
@@ -82,7 +64,6 @@ export const CATEGORIES: { key: string; label: string; types: string[] | null }[
{ key: 'vendor', label: 'Lieferanten / Vendor', types: ['vendor_risk_management_policy', 'third_party_security_policy', 'supplier_security_policy', 'dpa'] },
{ key: 'bcm', label: 'BCM / Notfall', types: ['business_continuity_policy', 'disaster_recovery_policy', 'crisis_management_policy', 'incident_response_plan'] },
>>>>>>> feat/zeroclaw-compliance-agent
]
// =============================================================================
@@ -88,79 +88,6 @@ function DocumentGeneratorPageInner() {
}
}, [state?.companyProfile])
<<<<<<< HEAD
// ── MODULE WIRING: CookieBanner → CONSENT + FEATURES ─────────────────────
useEffect(() => {
const banner = state?.cookieBanner
if (!banner) return
const cats = banner.categories || []
const analyticsTools = cats
.filter((c) => c.id === 'analytics' || c.id === 'statistics')
.flatMap((c) => c.cookies?.map((ck) => ck.name) ?? [])
const marketingTools = cats
.filter((c) => c.id === 'marketing')
.flatMap((c) => c.cookies?.map((ck) => ck.name) ?? [])
const hasFunctional = cats.some((c) => c.id === 'functional')
setContext((prev) => ({
...prev,
CONSENT: {
...prev.CONSENT,
ANALYTICS_TOOLS: analyticsTools.length > 0 ? analyticsTools.join(', ') : prev.CONSENT.ANALYTICS_TOOLS,
MARKETING_PARTNERS: marketingTools.length > 0 ? marketingTools.join(', ') : prev.CONSENT.MARKETING_PARTNERS,
},
FEATURES: {
...prev.FEATURES,
CMP_NAME: 'BreakPilot CMP',
CMP_LOGS_CONSENTS: true,
HAS_FUNCTIONAL_COOKIES: hasFunctional || prev.FEATURES.HAS_FUNCTIONAL_COOKIES,
CONSENT_WITHDRAWAL_PATH: 'Footer-Link "Cookie-Einstellungen"',
},
}))
}, [state?.cookieBanner])
// ── MODULE WIRING: Loeschfristen → PRIVACY retention ──────────────────────
useEffect(() => {
const policies = state?.retentionPolicies
if (!policies || policies.length === 0) return
const maxMonths = policies.reduce((max, p) => {
const match = p.retentionPeriod?.match(/(\d+)\s*(Monat|Jahr|Tag)/i)
if (!match) return max
const val = parseInt(match[1], 10)
const unit = match[2].toLowerCase()
const months = unit.startsWith('jahr') ? val * 12 : unit.startsWith('tag') ? Math.ceil(val / 30) : val
return Math.max(max, months)
}, 0)
if (maxMonths > 0) {
setContext((prev) => ({
...prev,
PRIVACY: { ...prev.PRIVACY, ANALYTICS_RETENTION_MONTHS: maxMonths },
}))
}
}, [state?.retentionPolicies])
// ── MODULE WIRING: UseCases → FEATURES flags ─────────────────────────────
useEffect(() => {
const useCases = state?.useCases
if (!useCases || useCases.length === 0) return
const allText = useCases.map((uc) => `${uc.name} ${uc.description}`).join(' ').toLowerCase()
const hasAccount = allText.includes('account') || allText.includes('konto') || allText.includes('registrier')
const hasPayments = allText.includes('zahlung') || allText.includes('payment') || allText.includes('stripe') || allText.includes('paypal')
const hasNewsletter = allText.includes('newsletter') || allText.includes('mailchimp') || allText.includes('e-mail-marketing')
const hasSocial = allText.includes('social') || allText.includes('linkedin') || allText.includes('facebook') || allText.includes('instagram')
setContext((prev) => ({
...prev,
FEATURES: {
...prev.FEATURES,
HAS_ACCOUNT: hasAccount || prev.FEATURES.HAS_ACCOUNT,
HAS_PAYMENTS: hasPayments || prev.FEATURES.HAS_PAYMENTS,
HAS_NEWSLETTER: hasNewsletter || prev.FEATURES.HAS_NEWSLETTER,
HAS_SOCIAL_MEDIA: hasSocial || prev.FEATURES.HAS_SOCIAL_MEDIA,
},
}))
}, [state?.useCases])
=======
// Pre-fill TOM/DPA context from Compliance Scope Engine
useEffect(() => {
const scopeLevel = state?.complianceScope?.determinedLevel
@@ -173,7 +100,6 @@ function DocumentGeneratorPageInner() {
}))
}
}, [state?.complianceScope?.determinedLevel, state?.companyProfile])
>>>>>>> feat/zeroclaw-compliance-agent
// Pre-fill extra placeholders from Einwilligungen data points
useEffect(() => {