wave-agent-sdk 0.6.4 → 0.7.0

package/dist/managers/bashManager.d.ts

@@ -1,6 +1,5 @@
-import type { MessageManager } from "./messageManager.js";
+import { Container } from "../utils/container.js";
 export interface BashManagerOptions {
-    messageManager: MessageManager;
     workdir: string;
 }
 export interface CommandExecutionResult {
@@ -8,11 +7,12 @@ export interface CommandExecutionResult {
     output: string;
 }
 export declare class BashManager {
+    private container;
     private workdir;
-    private messageManager;
     isCommandRunning: boolean;
     private currentProcess;
-    constructor(options: BashManagerOptions);
+    constructor(container: Container, options: BashManagerOptions);
+    private get messageManager();
     private setCommandRunning;
     executeCommand(command: string): Promise<number>;
     abortCommand(): void;

package/dist/managers/bashManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bashManager.d.ts","sourceRoot":"","sources":["../../src/managers/bashManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAiB;IAChC,gBAAgB,UAAS;IAChC,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,EAAE,kBAAkB;IAKvC,OAAO,CAAC,iBAAiB;IAIZ,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyDtD,YAAY,IAAI,IAAI;CAO5B"}
+{"version":3,"file":"bashManager.d.ts","sourceRoot":"","sources":["../../src/managers/bashManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IAMpB,OAAO,CAAC,SAAS;IALnB,OAAO,CAAC,OAAO,CAAS;IACjB,gBAAgB,UAAS;IAChC,OAAO,CAAC,cAAc,CAA6B;gBAGzC,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,kBAAkB;IAK7B,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,CAAC,iBAAiB;IAIZ,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyDtD,YAAY,IAAI,IAAI;CAO5B"}

package/dist/managers/bashManager.js

@@ -1,10 +1,13 @@
 import { spawn } from "child_process";
 export class BashManager {
-    constructor(options) {
+    constructor(container, options) {
+        this.container = container;
         this.isCommandRunning = false;
         this.currentProcess = null;
         this.workdir = options.workdir;
-        this.messageManager = options.messageManager;
+    }
+    get messageManager() {
+        return this.container.get("MessageManager");
     }
     setCommandRunning(isRunning) {
         this.isCommandRunning = isRunning;

package/dist/managers/foregroundTaskManager.d.ts

@@ -1,6 +1,9 @@
 import { ForegroundTask, IForegroundTaskManager } from "../types/processes.js";
+import { Container } from "../utils/container.js";
 export declare class ForegroundTaskManager implements IForegroundTaskManager {
+    private container;
     private activeForegroundTasks;
+    constructor(container: Container);
     registerForegroundTask(task: ForegroundTask): void;
     unregisterForegroundTask(id: string): void;
     backgroundCurrentTask(): Promise<void>;

package/dist/managers/foregroundTaskManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"foregroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/foregroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,qBAAa,qBAAsB,YAAW,sBAAsB;IAClE,OAAO,CAAC,qBAAqB,CAAwB;IAE9C,sBAAsB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAIlD,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAMpC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C,cAAc,IAAI,OAAO;CAGjC"}
+{"version":3,"file":"foregroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/foregroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,qBAAa,qBAAsB,YAAW,sBAAsB;IAGtD,OAAO,CAAC,SAAS;IAF7B,OAAO,CAAC,qBAAqB,CAAwB;gBAEjC,SAAS,EAAE,SAAS;IAEjC,sBAAsB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAIlD,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAMpC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C,cAAc,IAAI,OAAO;CAGjC"}

package/dist/managers/foregroundTaskManager.js

@@ -1,5 +1,6 @@
 export class ForegroundTaskManager {
-    constructor() {
+    constructor(container) {
+        this.container = container;
         this.activeForegroundTasks = [];
     }
     registerForegroundTask(task) {

package/dist/managers/hookManager.d.ts

@@ -7,14 +7,14 @@
 import { type HookEvent, type HookExecutionContext, type ExtendedHookExecutionContext, type HookExecutionResult, type HookValidationResult } from "../types/hooks.js";
 import type { WaveConfiguration, PartialHookConfiguration } from "../types/configuration.js";
 import { HookMatcher } from "../utils/hookMatcher.js";
-import type { Logger } from "../types/index.js";
 import type { MessageManager } from "./messageManager.js";
+import { Container } from "../utils/container.js";
 export declare class HookManager {
+    private container;
     private configuration;
     private readonly matcher;
-    private readonly logger?;
     private readonly workdir;
-    constructor(workdir: string, matcher?: HookMatcher, logger?: Logger);
+    constructor(container: Container, workdir: string, matcher?: HookMatcher);
     /**
      * Load and merge hook configurations from user and project settings
      * Project settings take precedence over user settings

package/dist/managers/hookManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hookManager.d.ts","sourceRoot":"","sources":["../../src/managers/hookManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAI1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,qBAAa,WAAW;IACtB,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,WAA+B,EACxC,MAAM,CAAC,EAAE,MAAM;IAOjB;;;OAGG;IACH,iBAAiB,CACf,SAAS,CAAC,EAAE,wBAAwB,EACpC,YAAY,CAAC,EAAE,wBAAwB,GACtC,IAAI;IAyBP;;;OAGG;IACH,+BAA+B,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI,GAAG,IAAI;IAqC3E;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,GAC3D,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAyHjC;;;OAGG;IACH,kBAAkB,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,MAAM,GACtB;QACD,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAuCD;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsE3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAQ9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAWtD;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,oBAAoB;IA8DtE;;OAEG;IACH,OAAO,CAAC,4BAA4B;IAyCpC;;OAEG;IACH,gBAAgB,IAAI,wBAAwB,GAAG,SAAS;IAOxD;;OAEG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IA8BhC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;OAEG;IACH,OAAO,CAAC,aAAa;IAiCrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA2C3B;;OAEG;IACH,qBAAqB,IAAI;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KAC3C;IAgDD;;OAEG;IACH,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,IAAI;CAW3D"}
+{"version":3,"file":"hookManager.d.ts","sourceRoot":"","sources":["../../src/managers/hookManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAI1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,qBAAa,WAAW;IAMpB,OAAO,CAAC,SAAS;IALnB,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAGvB,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,WAA+B;IAM1C;;;OAGG;IACH,iBAAiB,CACf,SAAS,CAAC,EAAE,wBAAwB,EACpC,YAAY,CAAC,EAAE,wBAAwB,GACtC,IAAI;IAyBP;;;OAGG;IACH,+BAA+B,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI,GAAG,IAAI;IAqC3E;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,GAC3D,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAuHjC;;;OAGG;IACH,kBAAkB,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,MAAM,GACtB;QACD,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAuCD;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsE3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAQ9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAWtD;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,oBAAoB;IA8DtE;;OAEG;IACH,OAAO,CAAC,4BAA4B;IAyCpC;;OAEG;IACH,gBAAgB,IAAI,wBAAwB,GAAG,SAAS;IAOxD;;OAEG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IA8BhC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;OAEG;IACH,OAAO,CAAC,aAAa;IAiCrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA2C3B;;OAEG;IACH,qBAAqB,IAAI;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KAC3C;IAgDD;;OAEG;IACH,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,IAAI;CAW3D"}

package/dist/managers/hookManager.js

@@ -8,11 +8,12 @@ import { HookConfigurationError, isValidHookEvent, isValidHookEventConfig, } fro
 import { HookMatcher } from "../utils/hookMatcher.js";
 import { executeCommand, isCommandSafe } from "../services/hook.js";
 import { MessageSource } from "../types/index.js";
+import { logger } from "../utils/globalLogger.js";
 export class HookManager {
-    constructor(workdir, matcher = new HookMatcher(), logger) {
+    constructor(container, workdir, matcher = new HookMatcher()) {
+        this.container = container;
         this.workdir = workdir;
         this.matcher = matcher;
-        this.logger = logger;
     }
     /**
      * Load and merge hook configurations from user and project settings
@@ -41,7 +42,7 @@ export class HookManager {
      */
     loadConfigurationFromWaveConfig(waveConfig) {
         try {
-            this.logger?.debug(`[HookManager] Loading hooks configuration from pre-loaded config...`);
+            logger?.debug(`[HookManager] Loading hooks configuration from pre-loaded config...`);
             this.configuration = waveConfig?.hooks || undefined;
             // Validate the loaded configuration if it exists
             if (waveConfig?.hooks) {
@@ -50,7 +51,7 @@ export class HookManager {
                     throw new HookConfigurationError("provided configuration", validation.errors);
                 }
             }
-            this.logger?.debug(`[HookManager] Hooks configuration loaded successfully with ${Object.keys(waveConfig?.hooks || {}).length} event types`);
+            logger?.debug(`[HookManager] Hooks configuration loaded successfully with ${Object.keys(waveConfig?.hooks || {}).length} event types`);
         }
         catch (error) {
             // If loading fails, start with undefined configuration (no hooks)
@@ -60,7 +61,7 @@ export class HookManager {
                 throw error;
             }
             else {
-                this.logger?.warn(`[HookManager] Failed to load configuration, continuing with no hooks: ${error.message}`);
+                logger?.warn(`[HookManager] Failed to load configuration, continuing with no hooks: ${error.message}`);
             }
         }
     }
@@ -71,7 +72,7 @@ export class HookManager {
         // Validate execution context
         const contextValidation = this.validateExecutionContext(event, context);
         if (!contextValidation.valid) {
-            this.logger?.error(`[HookManager] Invalid execution context for ${event}: ${contextValidation.errors.join(", ")}`);
+            logger?.error(`[HookManager] Invalid execution context for ${event}: ${contextValidation.errors.join(", ")}`);
             return [
                 {
                     success: false,
@@ -82,38 +83,38 @@ export class HookManager {
             ];
         }
         if (!this.configuration) {
-            this.logger?.debug(`[HookManager] No configuration loaded, skipping ${event} hooks`);
+            logger?.debug(`[HookManager] No configuration loaded, skipping ${event} hooks`);
             return [];
         }
         const eventConfigs = this.configuration[event];
         if (!eventConfigs || eventConfigs.length === 0) {
-            this.logger?.debug(`[HookManager] No hooks configured for ${event} event`);
+            logger?.debug(`[HookManager] No hooks configured for ${event} event`);
             return [];
         }
-        this.logger?.debug(`[HookManager] Starting ${event} hook execution with ${eventConfigs.length} configurations`);
+        logger?.debug(`[HookManager] Starting ${event} hook execution with ${eventConfigs.length} configurations`);
         const results = [];
         const startTime = Date.now();
         for (let configIndex = 0; configIndex < eventConfigs.length; configIndex++) {
             const config = eventConfigs[configIndex];
             // Check if this config applies to the current context
             if (!this.configApplies(config, event, context.toolName)) {
-                this.logger?.debug(`[HookManager] Skipping configuration ${configIndex + 1}: matcher '${config.matcher}' does not match tool '${context.toolName}'`);
+                logger?.debug(`[HookManager] Skipping configuration ${configIndex + 1}: matcher '${config.matcher}' does not match tool '${context.toolName}'`);
                 continue;
             }
-            this.logger?.debug(`[HookManager] Executing configuration ${configIndex + 1} with ${config.hooks.length} commands (matcher: ${config.matcher || "any"})`);
+            logger?.debug(`[HookManager] Executing configuration ${configIndex + 1} with ${config.hooks.length} commands (matcher: ${config.matcher || "any"})`);
             // Execute all commands for this configuration
             for (let commandIndex = 0; commandIndex < config.hooks.length; commandIndex++) {
                 const hookCommand = config.hooks[commandIndex];
                 try {
-                    this.logger?.debug(`[HookManager] Executing command ${commandIndex + 1}/${config.hooks.length} in configuration ${configIndex + 1}`);
+                    logger?.debug(`[HookManager] Executing command ${commandIndex + 1}/${config.hooks.length} in configuration ${configIndex + 1}`);
                     const result = await executeCommand(hookCommand.command, context, undefined);
                     results.push(result);
                     // Report individual command result
                     if (result.success) {
-                        this.logger?.debug(`[HookManager] Command ${commandIndex + 1} completed successfully in ${result.duration}ms`);
+                        logger?.debug(`[HookManager] Command ${commandIndex + 1} completed successfully in ${result.duration}ms`);
                     }
                     else {
-                        this.logger?.debug(`[HookManager] Command ${commandIndex + 1} failed in ${result.duration}ms (exit code: ${result.exitCode}, timed out: ${result.timedOut})`);
+                        logger?.debug(`[HookManager] Command ${commandIndex + 1} failed in ${result.duration}ms (exit code: ${result.exitCode}, timed out: ${result.timedOut})`);
                     }
                     // Continue with next command even if this one fails
                     // This allows for non-critical hooks to fail without stopping the workflow
@@ -121,7 +122,7 @@ export class HookManager {
                 catch (error) {
                     // This should be rare as executor handles most errors
                     const errorMessage = error instanceof Error ? error.message : "Unknown execution error";
-                    this.logger?.error(`[HookManager] Unexpected error in command ${commandIndex + 1}: ${errorMessage}`);
+                    logger?.error(`[HookManager] Unexpected error in command ${commandIndex + 1}: ${errorMessage}`);
                     results.push({
                         success: false,
                         stderr: errorMessage,
@@ -134,7 +135,7 @@ export class HookManager {
         // Generate execution summary
         const totalDuration = Date.now() - startTime;
         const summary = this.generateExecutionSummary(event, results, totalDuration);
-        this.logger?.debug(`[HookManager] ${event} execution summary: ${summary}`);
+        logger?.debug(`[HookManager] ${event} execution summary: ${summary}`);
         return results;
     }
     /**
@@ -367,7 +368,7 @@ export class HookManager {
         }
         // Warn about event mismatch but don't fail validation
         if (context.event !== event) {
-            this.logger?.warn(`[HookManager] Context event '${context.event}' does not match requested event '${event}'`);
+            logger?.warn(`[HookManager] Context event '${context.event}' does not match requested event '${event}'`);
         }
         // Validate project directory
         if (!context.projectDir || typeof context.projectDir !== "string") {
@@ -389,7 +390,7 @@ export class HookManager {
             event === "Notification" ||
             event === "SubagentStop") &&
             context.toolName !== undefined) {
-            this.logger?.warn(`[HookManager] ${event} event has unexpected toolName in context: ${context.toolName}`);
+            logger?.warn(`[HookManager] ${event} event has unexpected toolName in context: ${context.toolName}`);
         }
         return {
             valid: errors.length === 0,
@@ -537,6 +538,6 @@ export class HookManager {
             this.configuration = {};
         }
         this.mergeHooksConfiguration(this.configuration, hooks);
-        this.logger?.debug(`Registered plugin hooks. Total event types: ${Object.keys(this.configuration).length}`);
+        logger?.debug(`Registered plugin hooks. Total event types: ${Object.keys(this.configuration).length}`);
     }
 }

package/dist/managers/liveConfigManager.d.ts

@@ -6,25 +6,15 @@
  * - Configuration file watching for settings.json files
  * - Coordination between file watchers and configuration updates
  */
-import type { Logger } from "../types/index.js";
-import type { HookManager } from "./hookManager.js";
-import type { PermissionManager } from "./permissionManager.js";
-import { ConfigurationService } from "../services/configurationService.js";
+import { Container } from "../utils/container.js";
 import type { WaveConfiguration } from "../types/configuration.js";
 export interface LiveConfigManagerOptions {
     workdir: string;
-    logger?: Logger;
-    hookManager?: HookManager;
-    permissionManager?: PermissionManager;
-    configurationService?: ConfigurationService;
 }
 export declare class LiveConfigManager {
+    private container;
     private readonly workdir;
-    private readonly logger?;
-    private readonly hookManager?;
-    private readonly permissionManager?;
     private isInitialized;
-    private readonly configurationService;
     private currentConfiguration;
     private lastValidConfiguration;
     private fileWatcher;
@@ -32,7 +22,10 @@ export declare class LiveConfigManager {
     private projectConfigPaths?;
     private isWatching;
     private reloadInProgress;
-    constructor(options: LiveConfigManagerOptions);
+    constructor(container: Container, options: LiveConfigManagerOptions);
+    private get hookManager();
+    private get permissionManager();
+    private get configurationService();
     /**
      * Initialize configuration watching
      * Maps to FR-004: System MUST watch settings.json files

package/dist/managers/liveConfigManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveConfigManager.d.ts","sourceRoot":"","sources":["../../src/managers/liveConfigManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAOhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAoB;IACvD,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAG5D,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAAkC;IAGhE,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAW;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,gBAAgB,CAAkB;gBAE9B,OAAO,EAAE,wBAAwB;IAW7C;;;;OAIG;YACW,kBAAkB;IA6DhC;;OAEG;IACH,uBAAuB,IAAI,iBAAiB,GAAG,IAAI;IAInD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/B;;;OAGG;YACW,mBAAmB;IAwNjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAK1C;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;OAEG;IACH,gBAAgB;;;;;;;;;;;;IAgBhB,OAAO,CAAC,sBAAsB;YAMhB,gBAAgB;IA8C9B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4F7B,OAAO,CAAC,aAAa;IAuDrB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAQ9B"}
+{"version":3,"file":"liveConfigManager.d.ts","sourceRoot":"","sources":["../../src/managers/liveConfigManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAInC,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,iBAAiB;IAgB1B,OAAO,CAAC,SAAS;IAfnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,aAAa,CAAkB;IAGvC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAAkC;IAGhE,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAW;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,gBAAgB,CAAkB;gBAGhC,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,wBAAwB;IAOnC,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAED,OAAO,KAAK,oBAAoB,GAE/B;IAED;;;;OAIG;YACW,kBAAkB;IA6DhC;;OAEG;IACH,uBAAuB,IAAI,iBAAiB,GAAG,IAAI;IAInD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/B;;;OAGG;YACW,mBAAmB;IAwNjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAK1C;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;OAEG;IACH,gBAAgB;;;;;;;;;;;;IAgBhB,OAAO,CAAC,sBAAsB;YAMhB,gBAAgB;IA8C9B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4F7B,OAAO,CAAC,aAAa;IAuDrB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAQ9B"}

package/dist/managers/liveConfigManager.js

@@ -10,10 +10,11 @@ import { existsSync } from "fs";
 import { FileWatcherService, } from "../services/fileWatcher.js";
 import { getProjectConfigPaths, getUserConfigPaths, } from "../utils/configPaths.js";
 import { isValidHookEvent, isValidHookEventConfig } from "../types/hooks.js";
-import { ConfigurationService } from "../services/configurationService.js";
 import { ensureGlobalGitIgnore } from "../utils/fileUtils.js";
+import { logger } from "../utils/globalLogger.js";
 export class LiveConfigManager {
-    constructor(options) {
+    constructor(container, options) {
+        this.container = container;
         this.isInitialized = false;
         // Configuration state
         this.currentConfiguration = null;
@@ -21,14 +22,18 @@ export class LiveConfigManager {
         this.isWatching = false;
         this.reloadInProgress = false;
         this.workdir = options.workdir;
-        this.logger = options.logger;
-        this.hookManager = options.hookManager;
-        this.permissionManager = options.permissionManager;
-        this.configurationService =
-            options.configurationService || new ConfigurationService();
-        this.fileWatcher = new FileWatcherService(this.logger);
+        this.fileWatcher = new FileWatcherService(logger);
         this.setupFileWatcherEvents();
     }
+    get hookManager() {
+        return this.container.get("HookManager");
+    }
+    get permissionManager() {
+        return this.container.get("PermissionManager");
+    }
+    get configurationService() {
+        return this.container.get("ConfigurationService");
+    }
     /**
      * Initialize configuration watching
      * Maps to FR-004: System MUST watch settings.json files
@@ -36,7 +41,7 @@ export class LiveConfigManager {
      */
     async initializeWatching(userPaths, projectPaths) {
         try {
-            this.logger?.debug("Live Config: Initializing configuration watching...");
+            logger?.debug("Live Config: Initializing configuration watching...");
             this.userConfigPaths = userPaths;
             this.projectConfigPaths = projectPaths;
             // Load initial configuration
@@ -44,11 +49,11 @@ export class LiveConfigManager {
             // Start watching user configs that exist
             for (const userPath of userPaths) {
                 if (existsSync(userPath)) {
-                    this.logger?.debug(`Live Config: Starting to watch user config: ${userPath}`);
+                    logger?.debug(`Live Config: Starting to watch user config: ${userPath}`);
                     await this.fileWatcher.watchFile(userPath, (event) => this.handleFileChange(event, "user"));
                 }
                 else {
-                    this.logger?.debug(`Live Config: User config file does not exist: ${userPath}`);
+                    logger?.debug(`Live Config: User config file does not exist: ${userPath}`);
                 }
             }
             // Start watching project configs that exist
@@ -58,20 +63,20 @@ export class LiveConfigManager {
                         if (projectPath.endsWith("settings.local.json")) {
                             await ensureGlobalGitIgnore("**/.wave/settings.local.json");
                         }
-                        this.logger?.debug(`Live Config: Starting to watch project config: ${projectPath}`);
+                        logger?.debug(`Live Config: Starting to watch project config: ${projectPath}`);
                         await this.fileWatcher.watchFile(projectPath, (event) => this.handleFileChange(event, "project"));
                     }
                     else {
-                        this.logger?.debug(`Live Config: Project config file does not exist: ${projectPath}`);
+                        logger?.debug(`Live Config: Project config file does not exist: ${projectPath}`);
                     }
                 }
             }
             this.isWatching = true;
-            this.logger?.debug("Live Config: Configuration watching initialized successfully");
+            logger?.debug("Live Config: Configuration watching initialized successfully");
         }
         catch (error) {
             const errorMessage = `Failed to initialize configuration watching: ${error.message}`;
-            this.logger?.error(`Live Config: ${errorMessage}`);
+            logger?.error(`Live Config: ${errorMessage}`);
             throw new Error(errorMessage);
         }
     }
@@ -86,7 +91,7 @@ export class LiveConfigManager {
      */
     async initialize() {
         if (this.isInitialized) {
-            this.logger?.debug("Already initialized");
+            logger?.debug("Already initialized");
             return;
         }
         try {
@@ -95,10 +100,10 @@ export class LiveConfigManager {
             // Initialize configuration watching
             await this.initializeWatching(userPaths, projectPaths);
             this.isInitialized = true;
-            this.logger?.debug("Live configuration management initialized with file watching");
+            logger?.debug("Live configuration management initialized with file watching");
         }
         catch (error) {
-            this.logger?.error(`Failed to initialize: ${error.message}`);
+            logger?.error(`Failed to initialize: ${error.message}`);
             throw error;
         }
     }
@@ -110,7 +115,7 @@ export class LiveConfigManager {
             return;
         }
         try {
-            this.logger?.debug("Live Config: Shutting down configuration manager...");
+            logger?.debug("Live Config: Shutting down configuration manager...");
             this.isWatching = false;
             // Cleanup file watcher
             await this.fileWatcher.cleanup();
@@ -118,10 +123,10 @@ export class LiveConfigManager {
             this.currentConfiguration = null;
             this.lastValidConfiguration = null;
             this.isInitialized = false;
-            this.logger?.debug("Live configuration management shutdown completed");
+            logger?.debug("Live configuration management shutdown completed");
         }
         catch (error) {
-            this.logger?.error(`Error during shutdown: ${error.message}`);
+            logger?.error(`Error during shutdown: ${error.message}`);
             throw error;
         }
     }
@@ -131,26 +136,26 @@ export class LiveConfigManager {
      */
     async reloadConfiguration() {
         if (this.reloadInProgress) {
-            this.logger?.debug("Live Config: Reload already in progress, skipping");
+            logger?.debug("Live Config: Reload already in progress, skipping");
             return this.currentConfiguration || {};
         }
         this.reloadInProgress = true;
         try {
-            this.logger?.debug("Live Config: Reloading configuration from files...");
+            logger?.debug("Live Config: Reloading configuration from files...");
             // Load merged configuration using ConfigurationService
             const loadResult = await this.configurationService.loadMergedConfiguration(this.workdir);
             const newConfig = loadResult.configuration;
             // Check for errors during loading
             if (!loadResult.success) {
                 const errorMessage = loadResult.error || "Configuration loading failed with unknown error";
-                this.logger?.error(`Live Config: Configuration loading failed: ${errorMessage}`);
+                logger?.error(`Live Config: Configuration loading failed: ${errorMessage}`);
                 // Log warnings if any
                 if (loadResult.warnings && loadResult.warnings.length > 0) {
-                    this.logger?.warn(`Live Config: Configuration warnings: ${loadResult.warnings.join("; ")}`);
+                    logger?.warn(`Live Config: Configuration warnings: ${loadResult.warnings.join("; ")}`);
                 }
                 // Use fallback configuration if available
                 if (this.lastValidConfiguration) {
-                    this.logger?.debug("Live Config: Using previous valid configuration due to loading errors");
+                    logger?.debug("Live Config: Using previous valid configuration due to loading errors");
                     this.currentConfiguration = this.lastValidConfiguration;
                     // Apply environment variables to configuration service if configured
                     if (this.lastValidConfiguration.env) {
@@ -163,35 +168,35 @@ export class LiveConfigManager {
                     return this.currentConfiguration;
                 }
                 else {
-                    this.logger?.warn("Live Config: No previous valid configuration available, using empty config");
+                    logger?.warn("Live Config: No previous valid configuration available, using empty config");
                     this.currentConfiguration = {};
                     return this.currentConfiguration;
                 }
             }
             // Log success with detailed information
             if (newConfig) {
-                this.logger?.debug(`Live Config: Configuration loaded successfully from ${loadResult.sourcePath || "merged sources"}`);
+                logger?.debug(`Live Config: Configuration loaded successfully from ${loadResult.sourcePath || "merged sources"}`);
                 // Log detailed configuration info
                 const hookCount = Object.keys(newConfig.hooks || {}).length;
                 const envCount = Object.keys(newConfig.env || {}).length;
-                this.logger?.debug(`Live Config: Loaded ${hookCount} hook events and ${envCount} environment variables`);
+                logger?.debug(`Live Config: Loaded ${hookCount} hook events and ${envCount} environment variables`);
             }
             else {
-                this.logger?.debug("Live Config: No configuration found (using empty configuration)");
+                logger?.debug("Live Config: No configuration found (using empty configuration)");
             }
             // Log warnings from successful loading
             if (loadResult.warnings && loadResult.warnings.length > 0) {
-                this.logger?.warn(`Live Config: Configuration warnings: ${loadResult.warnings.join("; ")}`);
+                logger?.warn(`Live Config: Configuration warnings: ${loadResult.warnings.join("; ")}`);
             }
             // Validate new configuration if it exists
             if (newConfig) {
                 const validation = this.validateConfiguration(newConfig);
                 if (!validation.valid) {
                     const errorMessage = `Configuration validation failed: ${validation.errors.join(", ")}`;
-                    this.logger?.error(`Live Config: ${errorMessage}`);
+                    logger?.error(`Live Config: ${errorMessage}`);
                     // Use previous valid configuration for error recovery
                     if (this.lastValidConfiguration) {
-                        this.logger?.debug("Live Config: Using previous valid configuration due to validation errors");
+                        logger?.debug("Live Config: Using previous valid configuration due to validation errors");
                         this.currentConfiguration = this.lastValidConfiguration;
                         // Apply environment variables to configuration service if configured
                         if (this.lastValidConfiguration.env) {
@@ -204,7 +209,7 @@ export class LiveConfigManager {
                         return this.currentConfiguration;
                     }
                     else {
-                        this.logger?.warn("Live Config: No previous valid configuration available, using empty config");
+                        logger?.warn("Live Config: No previous valid configuration available, using empty config");
                         this.currentConfiguration = {};
                         return this.currentConfiguration;
                     }
@@ -217,7 +222,7 @@ export class LiveConfigManager {
             // Save as last valid configuration if it's valid and not empty
             if (newConfig && (newConfig.hooks || newConfig.env)) {
                 this.lastValidConfiguration = { ...newConfig };
-                this.logger?.debug("Live Config: Saved current configuration as last valid backup");
+                logger?.debug("Live Config: Saved current configuration as last valid backup");
             }
             // Note: Environment variables are already applied by loadMergedConfiguration()
             // No need to set them again here as currentConfiguration === newConfig
@@ -240,15 +245,15 @@ export class LiveConfigManager {
                     this.permissionManager.updateAdditionalDirectories(this.currentConfiguration.permissions.additionalDirectories);
                 }
             }
-            this.logger?.debug(`Live Config: Configuration reload completed successfully with ${Object.keys(newConfig?.hooks || {}).length} event types and ${Object.keys(newConfig?.env || {}).length} environment variables`);
+            logger?.debug(`Live Config: Configuration reload completed successfully with ${Object.keys(newConfig?.hooks || {}).length} event types and ${Object.keys(newConfig?.env || {}).length} environment variables`);
             return this.currentConfiguration;
         }
         catch (error) {
             const errorMessage = `Configuration reload failed with exception: ${error.message}`;
-            this.logger?.error(`Live Config: ${errorMessage}`);
+            logger?.error(`Live Config: ${errorMessage}`);
             // Use previous valid configuration for error recovery
             if (this.lastValidConfiguration) {
-                this.logger?.debug("Live Config: Using previous valid configuration due to reload exception");
+                logger?.debug("Live Config: Using previous valid configuration due to reload exception");
                 this.currentConfiguration = this.lastValidConfiguration;
                 // Apply environment variables to configuration service if configured
                 if (this.lastValidConfiguration.env) {
@@ -260,7 +265,7 @@ export class LiveConfigManager {
                 }
             }
             else {
-                this.logger?.warn("Live Config: No previous valid configuration available, using empty config");
+                logger?.warn("Live Config: No previous valid configuration available, using empty config");
                 this.currentConfiguration = {};
             }
             return this.currentConfiguration;
@@ -273,7 +278,7 @@ export class LiveConfigManager {
      * Reload configuration from files (public method)
      */
     async reload() {
-        this.logger?.debug("Manually reloading configuration...");
+        logger?.debug("Manually reloading configuration...");
         return await this.reloadConfiguration();
     }
     /**
@@ -302,22 +307,22 @@ export class LiveConfigManager {
     }
     setupFileWatcherEvents() {
         this.fileWatcher.on("watcherError", (error) => {
-            this.logger?.error(`Live Config: File watcher error: ${error.message}`);
+            logger?.error(`Live Config: File watcher error: ${error.message}`);
         });
     }
     async handleFileChange(event, source) {
-        this.logger?.debug(`Live Config: File ${event.type} detected for ${source} config: ${event.path}`);
+        logger?.debug(`Live Config: File ${event.type} detected for ${source} config: ${event.path}`);
         try {
             // Handle file deletion
             if (event.type === "delete") {
-                this.logger?.debug(`Live Config: ${source} config file deleted: ${event.path}`);
+                logger?.debug(`Live Config: ${source} config file deleted: ${event.path}`);
                 // Reload configuration without the deleted file
                 await this.reloadConfiguration();
                 return;
             }
             // Handle file creation or modification
             if (event.type === "change" || event.type === "create") {
-                this.logger?.debug(`Live Config: ${source} config file ${event.type}: ${event.path}`);
+                logger?.debug(`Live Config: ${source} config file ${event.type}: ${event.path}`);
                 if (source === "project" &&
                     event.path.endsWith("settings.local.json") &&
                     event.type === "create") {
@@ -330,7 +335,7 @@ export class LiveConfigManager {
             }
         }
         catch (error) {
-            this.logger?.error(`Live Config: Error handling file change for ${source} config: ${error.message}`);
+            logger?.error(`Live Config: Error handling file change for ${source} config: ${error.message}`);
         }
     }
     /**

package/dist/managers/lspManager.d.ts

@@ -1,5 +1,6 @@
 import { ChildProcess } from "child_process";
-import { Logger, LspServerConfig, ILspManager } from "../types/index.js";
+import { LspServerConfig, ILspManager } from "../types/index.js";
+import { Container } from "../utils/container.js";
 interface LspProcess {
     process: ChildProcess;
     config: LspServerConfig;
@@ -13,13 +14,11 @@ interface LspProcess {
     openedFiles: Set<string>;
 }
 export declare class LspManager implements ILspManager {
+    private container;
     private processes;
     private workdir;
-    private logger?;
     private config;
-    constructor(options?: {
-        logger?: Logger;
-    });
+    constructor(container: Container);
     initialize(workdir: string): Promise<void>;
     registerServer(language: string, config: LspServerConfig): void;
     private loadConfig;

package/dist/managers/lspManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lspManager.d.ts","sourceRoot":"","sources":["../../src/managers/lspManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAC;AACpD,OAAO,EACL,MAAM,EAEN,eAAe,EACf,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAI3B,UAAU,UAAU;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE,CAC1E,CAAC;IACF,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,qBAAa,UAAW,YAAW,WAAW;IAC5C,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,MAAM,CAAiB;gBAEnB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO;IAIvC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;YAKjD,UAAU;IAclB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YA0BvD,WAAW;IAoGzB,OAAO,CAAC,aAAa;YAiBP,WAAW;YA0CX,gBAAgB;IAgBxB,OAAO,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoJ5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB/B"}
+{"version":3,"file":"lspManager.d.ts","sourceRoot":"","sources":["../../src/managers/lspManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAC;AACpD,OAAO,EAEL,eAAe,EACf,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,UAAU,UAAU;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE,CAC1E,CAAC;IACF,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAID,qBAAa,UAAW,YAAW,WAAW;IAKhC,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,MAAM,CAAiB;gBAEX,SAAS,EAAE,SAAS;IAElC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;YAKjD,UAAU;IAclB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YA0BvD,WAAW;IAgGzB,OAAO,CAAC,aAAa;YAiBP,WAAW;YA0CX,gBAAgB;IAgBxB,OAAO,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoJ5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB/B"}