@georgedong32/ccs 7.67.0 → 8.0.0

package/dist/config/loader/defaults-merger.js

@@ -0,0 +1,278 @@
+"use strict";
+/**
+ * defaults-merger.ts
+ *
+ * mergeWithDefaults function extracted from unified-config-loader.ts
+ * (Phase 4 split — issue #1164).
+ *
+ * Pure transform: no I/O, no side effects. Merges a partial UnifiedConfig
+ * with defaults, filling in missing sections.
+ *
+ * Circular-import note: this module imports from normalizers.ts (Phase 2)
+ * and io-locks.ts (Phase 1) is NOT imported here, so there is no cycle.
+ * io-locks.ts callbacks (mergeWithDefaults, validateCompositeVariants) are
+ * now replaced with direct imports in unified-config-loader.ts (Phase 6).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeWithDefaults = void 0;
+const unified_config_types_1 = require("../unified-config-types");
+const normalizers_1 = require("./normalizers");
+const normalizers_2 = require("./normalizers");
+const image_analysis_backend_resolver_1 = require("../../utils/hooks/image-analysis-backend-resolver");
+const types_1 = require("../../utils/websearch/types");
+// ---------------------------------------------------------------------------
+// mergeWithDefaults
+// ---------------------------------------------------------------------------
+function normalizeOptionalString(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+/**
+ * Merge partial config with defaults.
+ * Preserves existing data while filling in missing sections.
+ */
+function mergeWithDefaults(partial) {
+    const defaults = (0, unified_config_types_1.createEmptyUnifiedConfig)();
+    const continuity = (0, normalizers_2.normalizeContinuityConfig)(partial);
+    return {
+        version: partial.version ?? defaults.version,
+        setup_completed: partial.setup_completed,
+        default: partial.default ?? defaults.default,
+        accounts: partial.accounts ?? defaults.accounts,
+        profiles: partial.profiles ?? defaults.profiles,
+        cliproxy: {
+            ...partial.cliproxy,
+            oauth_accounts: partial.cliproxy?.oauth_accounts ?? defaults.cliproxy.oauth_accounts,
+            providers: defaults.cliproxy.providers, // Always use defaults for providers
+            variants: partial.cliproxy?.variants ?? defaults.cliproxy.variants,
+            logging: {
+                enabled: partial.cliproxy?.logging?.enabled ?? defaults.cliproxy.logging?.enabled ?? false,
+                request_log: partial.cliproxy?.logging?.request_log ?? defaults.cliproxy.logging?.request_log ?? false,
+            },
+            safety: {
+                antigravity_ack_bypass: partial.cliproxy?.safety?.antigravity_ack_bypass ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SAFETY_CONFIG.antigravity_ack_bypass,
+            },
+            // Kiro browser behavior setting (optional)
+            kiro_no_incognito: partial.cliproxy?.kiro_no_incognito,
+            // Auth config - preserve user values, no defaults (uses constants as fallback)
+            auth: partial.cliproxy?.auth,
+            // Background token refresh config (optional)
+            token_refresh: partial.cliproxy?.token_refresh,
+            // Backend selection - validate and preserve user choice (original vs plus)
+            backend: partial.cliproxy?.backend === 'original' || partial.cliproxy?.backend === 'plus'
+                ? partial.cliproxy.backend
+                : undefined, // Invalid values become undefined (defaults to 'original' at runtime)
+            management_panel_repository: normalizeOptionalString(partial.cliproxy?.management_panel_repository),
+            // Auto-sync - default to true
+            auto_sync: partial.cliproxy?.auto_sync ?? defaults.cliproxy.auto_sync ?? true,
+            routing: {
+                strategy: partial.cliproxy?.routing?.strategy === 'fill-first' ||
+                    partial.cliproxy?.routing?.strategy === 'round-robin'
+                    ? partial.cliproxy.routing.strategy
+                    : defaults.cliproxy.routing?.strategy,
+                session_affinity: typeof partial.cliproxy?.routing?.session_affinity === 'boolean'
+                    ? partial.cliproxy.routing.session_affinity
+                    : defaults.cliproxy.routing?.session_affinity,
+                session_affinity_ttl: (0, normalizers_1.normalizeSessionAffinityTtl)(partial.cliproxy?.routing?.session_affinity_ttl, defaults.cliproxy.routing?.session_affinity_ttl ?? '1h'),
+            },
+        },
+        proxy: {
+            port: partial.proxy?.port ?? unified_config_types_1.DEFAULT_OPENAI_COMPAT_PROXY_CONFIG.port,
+            profile_ports: partial.proxy?.profile_ports ?? {
+                ...unified_config_types_1.DEFAULT_OPENAI_COMPAT_PROXY_CONFIG.profile_ports,
+            },
+            routing: {
+                default: partial.proxy?.routing?.default ?? defaults.proxy?.routing?.default,
+                background: partial.proxy?.routing?.background ?? defaults.proxy?.routing?.background,
+                think: partial.proxy?.routing?.think ?? defaults.proxy?.routing?.think,
+                longContext: partial.proxy?.routing?.longContext ?? defaults.proxy?.routing?.longContext,
+                webSearch: partial.proxy?.routing?.webSearch ?? defaults.proxy?.routing?.webSearch,
+                longContextThreshold: partial.proxy?.routing?.longContextThreshold ??
+                    defaults.proxy?.routing?.longContextThreshold,
+            },
+        },
+        logging: {
+            enabled: partial.logging?.enabled ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.enabled,
+            level: partial.logging?.level ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.level,
+            rotate_mb: partial.logging?.rotate_mb ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.rotate_mb,
+            retain_days: partial.logging?.retain_days ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.retain_days,
+            redact: partial.logging?.redact ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.redact,
+            live_buffer_size: partial.logging?.live_buffer_size ?? unified_config_types_1.DEFAULT_LOGGING_CONFIG.live_buffer_size,
+        },
+        preferences: {
+            ...defaults.preferences,
+            ...partial.preferences,
+        },
+        websearch: {
+            enabled: partial.websearch?.enabled ?? defaults.websearch?.enabled ?? true,
+            providers: {
+                exa: {
+                    enabled: partial.websearch?.providers?.exa?.enabled ?? false,
+                    max_results: partial.websearch?.providers?.exa?.max_results ?? 5,
+                },
+                tavily: {
+                    enabled: partial.websearch?.providers?.tavily?.enabled ?? false,
+                    max_results: partial.websearch?.providers?.tavily?.max_results ?? 5,
+                },
+                brave: {
+                    enabled: partial.websearch?.providers?.brave?.enabled ?? false,
+                    max_results: partial.websearch?.providers?.brave?.max_results ?? 5,
+                },
+                searxng: {
+                    enabled: partial.websearch?.providers?.searxng?.enabled ?? false,
+                    url: (0, types_1.normalizeSearxngBaseUrl)(partial.websearch?.providers?.searxng?.url) ?? '',
+                    max_results: partial.websearch?.providers?.searxng?.max_results ?? 5,
+                },
+                duckduckgo: {
+                    enabled: partial.websearch?.providers?.duckduckgo?.enabled ?? true,
+                    max_results: partial.websearch?.providers?.duckduckgo?.max_results ?? 5,
+                },
+                gemini: {
+                    enabled: partial.websearch?.providers?.gemini?.enabled ??
+                        partial.websearch?.gemini?.enabled ?? // Legacy fallback
+                        false,
+                    model: partial.websearch?.providers?.gemini?.model ?? 'gemini-2.5-flash',
+                    timeout: partial.websearch?.providers?.gemini?.timeout ??
+                        partial.websearch?.gemini?.timeout ?? // Legacy fallback
+                        55,
+                },
+                opencode: {
+                    enabled: partial.websearch?.providers?.opencode?.enabled ?? false,
+                    model: partial.websearch?.providers?.opencode?.model ?? 'opencode/grok-code',
+                    timeout: partial.websearch?.providers?.opencode?.timeout ?? 90,
+                },
+                grok: {
+                    enabled: partial.websearch?.providers?.grok?.enabled ?? false,
+                    timeout: partial.websearch?.providers?.grok?.timeout ?? 55,
+                },
+            },
+            // Legacy fields (keep for backwards compatibility during read)
+            gemini: partial.websearch?.gemini,
+        },
+        // Copilot config - strictly opt-in, merge with defaults
+        copilot: {
+            enabled: partial.copilot?.enabled ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.enabled,
+            auto_start: partial.copilot?.auto_start ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.auto_start,
+            port: partial.copilot?.port ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.port,
+            account_type: partial.copilot?.account_type ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.account_type,
+            rate_limit: partial.copilot?.rate_limit ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.rate_limit,
+            wait_on_limit: partial.copilot?.wait_on_limit ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.wait_on_limit,
+            model: partial.copilot?.model ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.model,
+        },
+        // Cursor config - disabled by default, merge with defaults
+        cursor: {
+            enabled: partial.cursor?.enabled ?? unified_config_types_1.DEFAULT_CURSOR_CONFIG.enabled,
+            port: partial.cursor?.port ?? unified_config_types_1.DEFAULT_CURSOR_CONFIG.port,
+            auto_start: partial.cursor?.auto_start ?? unified_config_types_1.DEFAULT_CURSOR_CONFIG.auto_start,
+            ghost_mode: partial.cursor?.ghost_mode ?? unified_config_types_1.DEFAULT_CURSOR_CONFIG.ghost_mode,
+            model: partial.cursor?.model ?? unified_config_types_1.DEFAULT_CURSOR_CONFIG.model,
+            opus_model: partial.cursor?.opus_model,
+            sonnet_model: partial.cursor?.sonnet_model,
+            haiku_model: partial.cursor?.haiku_model,
+        },
+        // Global env - injected into all non-Claude subscription profiles
+        global_env: {
+            enabled: partial.global_env?.enabled ?? true,
+            env: partial.global_env?.env ?? { ...unified_config_types_1.DEFAULT_GLOBAL_ENV },
+        },
+        continuity,
+        // CLIProxy server config - remote/local CLIProxyAPI settings
+        cliproxy_server: {
+            remote: {
+                enabled: partial.cliproxy_server?.remote?.enabled ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.enabled,
+                host: partial.cliproxy_server?.remote?.host ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.host,
+                // Port is optional - undefined means use protocol default (443 for HTTPS, 8317 for HTTP)
+                port: partial.cliproxy_server?.remote?.port,
+                protocol: partial.cliproxy_server?.remote?.protocol ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.protocol,
+                auth_token: partial.cliproxy_server?.remote?.auth_token ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.auth_token,
+                // management_key is optional - falls back to auth_token when not set
+                management_key: partial.cliproxy_server?.remote?.management_key,
+            },
+            fallback: {
+                enabled: partial.cliproxy_server?.fallback?.enabled ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.fallback.enabled,
+                auto_start: partial.cliproxy_server?.fallback?.auto_start ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.fallback.auto_start,
+            },
+            local: {
+                port: partial.cliproxy_server?.local?.port ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.local.port,
+                auto_start: partial.cliproxy_server?.local?.auto_start ??
+                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.local.auto_start,
+            },
+        },
+        // Quota management config - hybrid auto+manual account selection
+        quota_management: {
+            mode: partial.quota_management?.mode ?? unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.mode,
+            auto: {
+                preflight_check: partial.quota_management?.auto?.preflight_check ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.preflight_check,
+                exhaustion_threshold: partial.quota_management?.auto?.exhaustion_threshold ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.exhaustion_threshold,
+                tier_priority: partial.quota_management?.auto?.tier_priority ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.tier_priority,
+                cooldown_minutes: partial.quota_management?.auto?.cooldown_minutes ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.cooldown_minutes,
+            },
+            manual: {
+                paused_accounts: partial.quota_management?.manual?.paused_accounts ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.paused_accounts,
+                forced_default: partial.quota_management?.manual?.forced_default ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.forced_default,
+                tier_lock: partial.quota_management?.manual?.tier_lock ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.tier_lock,
+            },
+            runtime_monitor: {
+                enabled: partial.quota_management?.runtime_monitor?.enabled ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.enabled,
+                normal_interval_seconds: partial.quota_management?.runtime_monitor?.normal_interval_seconds ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.normal_interval_seconds,
+                critical_interval_seconds: partial.quota_management?.runtime_monitor?.critical_interval_seconds ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.critical_interval_seconds,
+                warn_threshold: partial.quota_management?.runtime_monitor?.warn_threshold ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.warn_threshold,
+                exhaustion_threshold: partial.quota_management?.runtime_monitor?.exhaustion_threshold ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.exhaustion_threshold,
+                cooldown_minutes: partial.quota_management?.runtime_monitor?.cooldown_minutes ??
+                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.runtime_monitor.cooldown_minutes,
+            },
+        },
+        // Thinking config - auto/manual/off control for reasoning budget
+        thinking: {
+            mode: partial.thinking?.mode ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.mode,
+            override: partial.thinking?.override,
+            tier_defaults: {
+                opus: partial.thinking?.tier_defaults?.opus ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.tier_defaults.opus,
+                sonnet: partial.thinking?.tier_defaults?.sonnet ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.tier_defaults.sonnet,
+                haiku: partial.thinking?.tier_defaults?.haiku ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.tier_defaults.haiku,
+            },
+            provider_overrides: partial.thinking?.provider_overrides,
+            show_warnings: partial.thinking?.show_warnings ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.show_warnings,
+        },
+        channels: (0, normalizers_2.normalizeOfficialChannelsConfig)(partial),
+        // Dashboard auth config - disabled by default
+        dashboard_auth: {
+            enabled: partial.dashboard_auth?.enabled ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.enabled,
+            username: partial.dashboard_auth?.username ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.username,
+            password_hash: partial.dashboard_auth?.password_hash ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.password_hash,
+            session_timeout_hours: partial.dashboard_auth?.session_timeout_hours ??
+                unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.session_timeout_hours,
+        },
+        browser: (0, normalizers_1.canonicalizeBrowserConfig)(partial.browser),
+        // Image analysis config - enabled by default for CLIProxy providers
+        image_analysis: (0, image_analysis_backend_resolver_1.canonicalizeImageAnalysisConfig)({
+            enabled: partial.image_analysis?.enabled ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.enabled,
+            timeout: partial.image_analysis?.timeout ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.timeout,
+            provider_models: partial.image_analysis?.provider_models ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.provider_models,
+            fallback_backend: partial.image_analysis?.fallback_backend ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.fallback_backend,
+            profile_backends: partial.image_analysis?.profile_backends ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.profile_backends,
+        }),
+    };
+}
+exports.mergeWithDefaults = mergeWithDefaults;
+//# sourceMappingURL=defaults-merger.js.map

package/dist/config/loader/defaults-merger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaults-merger.js","sourceRoot":"","sources":["../../../src/config/loader/defaults-merger.ts"],"names":[],"mappings":"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"}

package/dist/config/loader/io-locks.d.ts

@@ -0,0 +1,76 @@
+/**
+ * io-locks.ts
+ *
+ * Path constants, lockfile management, and config I/O helpers extracted from
+ * unified-config-loader.ts (Phase 1 split — issue #1164).
+ *
+ * Forward-reference note: loadUnifiedConfigWithLockHeld and
+ * writeUnifiedConfigWithLockHeld depend on mergeWithDefaults,
+ * validateCompositeVariants, generateYamlHeader, and generateYamlWithComments
+ * which still live in unified-config-loader.ts (extracted in later phases).
+ * Those are passed as callbacks to avoid a circular import. Once Phases 2–3
+ * land in separate modules with no dependency on this file, they can be
+ * imported directly.
+ */
+import type { UnifiedConfig } from '../unified-config-types';
+export declare const CONFIG_YAML = "config.yaml";
+export declare const CONFIG_JSON = "config.json";
+export declare const CONFIG_LOCK = "config.yaml.lock";
+/** Lock is stale after this many milliseconds */
+export declare const LOCK_STALE_MS = 5000;
+export declare const GO_DURATION_SEGMENT: string;
+export declare const GO_DURATION_PATTERN: RegExp;
+/**
+ * Get path to unified config.yaml
+ */
+export declare function getConfigYamlPath(): string;
+/**
+ * Get path to legacy config.json
+ */
+export declare function getConfigJsonPath(): string;
+/**
+ * Acquire lockfile for config write operations.
+ * Returns a lock token if acquired, null if already locked by another process.
+ * Cleans up stale locks (older than LOCK_STALE_MS).
+ */
+export declare function acquireLock(): string | null;
+/**
+ * Release lockfile after config write operation.
+ */
+export declare function releaseLock(lockToken: string): void;
+/**
+ * Check if unified config.yaml exists
+ */
+export declare function hasUnifiedConfig(): boolean;
+/**
+ * Check if legacy config.json exists
+ */
+export declare function hasLegacyConfig(): boolean;
+/**
+ * Sync sleep helper for lock retry loops.
+ * Uses Atomics.wait when available to avoid CPU-intensive busy-wait.
+ */
+export declare function sleepSync(ms: number): void;
+/**
+ * Execute a callback while holding the config lock.
+ */
+export declare function withConfigWriteLock<T>(callback: () => T): T;
+/**
+ * Load unified config directly from disk while lock is already held.
+ * Falls back to empty config when file doesn't exist.
+ *
+ * Forward-reference: mergeWithDefaults and validateCompositeVariants are
+ * passed as callbacks to avoid a circular dependency. They will be imported
+ * directly once all phases are complete.
+ */
+export declare function loadUnifiedConfigWithLockHeld(mergeWithDefaults: (partial: Partial<UnifiedConfig>) => UnifiedConfig, validateCompositeVariants: (config: UnifiedConfig) => void): UnifiedConfig;
+/**
+ * Write unified config to disk while lock is already held.
+ * Uses atomic write (temp file + rename) to prevent corruption.
+ *
+ * Forward-reference: generateYamlHeader and generateYamlWithComments are
+ * passed as callbacks to avoid a circular dependency. They will be imported
+ * directly once all phases are complete.
+ */
+export declare function writeUnifiedConfigWithLockHeld(config: UnifiedConfig, generateYamlHeader: () => string, generateYamlWithComments: (config: UnifiedConfig) => string): void;
+//# sourceMappingURL=io-locks.d.ts.map

package/dist/config/loader/io-locks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"io-locks.d.ts","sourceRoot":"","sources":["../../../src/config/loader/io-locks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAYH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,iDAAiD;AACjD,eAAO,MAAM,aAAa,OAAO,CAAC;AAClC,eAAO,MAAM,mBAAmB,QAAwD,CAAC;AACzF,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAM3E;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AA0BD;;;;GAIG;AACH,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAuC3C;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAanD;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAMD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAS1C;AAMD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAwB3D;AAMD;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAC3C,iBAAiB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,aAAa,EACrE,yBAAyB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,GACzD,aAAa,CAgBf;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,EACrB,kBAAkB,EAAE,MAAM,MAAM,EAChC,wBAAwB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,MAAM,GAC1D,IAAI,CAwCN"}