omnara 0.1.4 → 0.1.6

package/dist/orchestrator/agent-orchestrator.d.ts

@@ -1,7 +1,7 @@
 import { type AgentClient } from './ai-client.js';
 import { Session } from './session.js';
 import { WorkerManager } from './worker-manager.js';
-import type { InboundMessage, OutboundMessage } from './types.js';
+import type { InboundMessage, OutboundMessage } from './orchestrator-types.js';
 interface AgentOrchestratorDependencies {
     createMainClient?: () => AgentClient;
     createWorkerClient?: () => AgentClient;
@@ -23,11 +23,14 @@ export declare class AgentOrchestrator {
     private readonly sessions;
     private readonly clients;
     private readonly toolUseMap;
+    private mainCodingSessionId;
+    readonly voiceSessionIds: Set<string>;
     private started;
     constructor(dependencies?: AgentOrchestratorDependencies);
     ensureSessionExists(sessionId: string): Session;
     getSession(sessionId: string): Session | undefined;
     getWorkerManager(): WorkerManager;
+    setMainCodingSessionId(sessionId: string): void;
     addClient(adapter: AgentOrchestratorClientAdapter): AgentOrchestratorConnection;
     start(): Promise<void>;
     stop(): Promise<void>;

package/dist/orchestrator/orchestrator-prompt.d.ts

@@ -1,2 +1,8 @@
-export declare const ORCHESTRATOR_SYSTEM_PROMPT: string;
-export default ORCHESTRATOR_SYSTEM_PROMPT;
+/**
+ * System prompt for the main orchestrator agent.
+ *
+ * The orchestrator's role is to coordinate and delegate work, not to execute tasks directly.
+ * It should ALWAYS use workers to handle all implementation work.
+ */
+import ORCHESTRATOR_SYSTEM_PROMPT from './orchestrator-prompt.md';
+export { ORCHESTRATOR_SYSTEM_PROMPT };

package/dist/orchestrator/{types.d.ts → orchestrator-types.d.ts}

@@ -1,16 +1,30 @@
+/**
+ * Internal orchestrator message types for communication between components
+ * These are NOT wire protocol types - they're internal to the orchestrator
+ *
+ * For wire protocol types (sent over WebSocket), use:
+ * - ControlMessage from @omnara/shared-js/schemas
+ * - MessageEnvelope from @omnara/shared-js/schemas
+ */
 import { z } from 'zod';
 export declare const inboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"chat">;
     sessionId: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
+    senderId: z.ZodOptional<z.ZodString>;
+    senderKind: z.ZodOptional<z.ZodEnum<["user", "agent_session"]>>;
 }, "strip", z.ZodTypeAny, {
     type: "chat";
     text: string;
     sessionId?: string | undefined;
+    senderId?: string | undefined;
+    senderKind?: "user" | "agent_session" | undefined;
 }, {
     type: "chat";
     text: string;
     sessionId?: string | undefined;
+    senderId?: string | undefined;
+    senderKind?: "user" | "agent_session" | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"session_init">;
     sessionId: z.ZodString;

package/dist/orchestrator/session.d.ts

@@ -1,5 +1,5 @@
 import type { AgentClient } from './ai-client.js';
-import type { SessionSubscriber } from './types.js';
+import type { SessionSubscriber } from './orchestrator-types.js';
 type StreamEvent = {
     type: string;
     [key: string]: unknown;

package/dist/orchestrator/tools/worker-tools.d.ts

@@ -2,6 +2,7 @@ import type { WorkerManager } from '../worker-manager.js';
 interface WorkerMcpContext {
     resolveSessionIdBySdk: (sdkSessionId?: string) => string | undefined;
     resolveSessionIdByToolUse: (toolUseId: string) => string | undefined;
+    getMainCodingSessionId: () => string | null;
 }
 export declare function createWorkerMcpServer(workerManager: WorkerManager, context: WorkerMcpContext): import("@anthropic-ai/claude-agent-sdk").McpSdkServerConfigWithInstance;
 export {};

package/dist/orchestrator/utils/session-logger.d.ts

@@ -1,4 +1,4 @@
-import type { OutboundMessage } from '../types.js';
+import type { OutboundMessage } from '../orchestrator-types.js';
 export type SessionLogger = {
     logInbound: (payload: unknown) => void;
     logOutbound: (message: OutboundMessage) => void;

package/dist/relay/relay-bridge.d.ts

@@ -22,6 +22,7 @@ export declare class RelayBridge extends EventEmitter {
     private authProviderPromise;
     private userSessionId;
     private currentAgentSessionId;
+    private browserOpened;
     constructor(orchestrator: AgentOrchestrator, options: RelayBridgeOptions);
     start(): Promise<void>;
     stop(): Promise<void>;

package/dist/utils/browser.d.ts

@@ -0,0 +1 @@
+export declare function tryOpenBrowser(url: string): void;

package/dist/utils/claude-code-check.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Checks if Claude Code is installed and available in the system
+ */
+export declare function checkClaudeCodeInstallation(): boolean;
+/**
+ * Displays a warning message if Claude Code is not installed
+ */
+export declare function displayClaudeCodeWarning(): void;
+/**
+ * Performs the Claude Code check and displays warning if needed
+ * @param options - Optional configuration for the check
+ * @returns boolean indicating if Claude Code is installed
+ */
+export declare function performClaudeCodeCheck(options?: {
+    silent?: boolean;
+    exitOnMissing?: boolean;
+}): boolean;
+/**
+ * Gets Claude Code version if installed
+ */
+export declare function getClaudeCodeVersion(): string | null;

package/dist/utils/logger.d.ts

@@ -0,0 +1,127 @@
+/**
+ * Logger utility for controlling console output based on environment
+ *
+ * Production detection:
+ * 1. NODE_ENV === 'production'
+ * 2. OMNARA_LOG_LEVEL === 'none' or 'error'
+ * 3. Running from compiled dist/ directory (not tsx/ts-node)
+ */
+/**
+ * Log levels for controlling output verbosity
+ */
+export declare enum LogLevel {
+    NONE = 0,
+    ERROR = 1,
+    WARN = 2,
+    INFO = 3,
+    DEBUG = 4,
+    VERBOSE = 5
+}
+/**
+ * Detects if the CLI is running in production mode
+ */
+export declare function isProduction(): boolean;
+/**
+ * Gets the current log level from environment or defaults
+ */
+export declare function getLogLevel(): LogLevel;
+/**
+ * Logger interface that extends Console but can be controlled
+ */
+export interface Logger extends Console {
+    important(...args: any[]): void;
+    success(...args: any[]): void;
+}
+/**
+ * Creates a controlled logger instance
+ */
+export declare class ControlledLogger implements Logger {
+    private logLevel;
+    private forceOutput;
+    private _console;
+    Console: typeof console.Console;
+    constructor(options?: {
+        logLevel?: LogLevel;
+        forceOutput?: boolean;
+    });
+    /**
+     * Standard log output (INFO level)
+     */
+    log(...args: any[]): void;
+    /**
+     * Error output (always shown unless NONE)
+     */
+    error(...args: any[]): void;
+    /**
+     * Warning output
+     */
+    warn(...args: any[]): void;
+    /**
+     * Info level output
+     */
+    info(...args: any[]): void;
+    /**
+     * Debug output (only in development)
+     */
+    debug(...args: any[]): void;
+    /**
+     * Verbose/trace output
+     */
+    trace(...args: any[]): void;
+    /**
+     * Important messages that should always be shown to user
+     * (authentication status, connection info, etc.)
+     */
+    important(...args: any[]): void;
+    /**
+     * Success messages that should typically be shown
+     */
+    success(...args: any[]): void;
+    /**
+     * Check if a message should be logged at the given level
+     */
+    private shouldLog;
+    /**
+     * Update the log level dynamically
+     */
+    setLogLevel(level: LogLevel): void;
+    /**
+     * Get current log level
+     */
+    getLogLevel(): LogLevel;
+    assert(condition?: boolean, ...data: any[]): void;
+    clear(): void;
+    count(label?: string): void;
+    countReset(label?: string): void;
+    dir(item?: any, options?: any): void;
+    dirxml(...data: any[]): void;
+    group(...data: any[]): void;
+    groupCollapsed(...data: any[]): void;
+    groupEnd(): void;
+    table(tabularData?: any, properties?: string[]): void;
+    time(label?: string): void;
+    timeEnd(label?: string): void;
+    timeLog(label?: string, ...data: any[]): void;
+    timeStamp(label?: string): void;
+    profile(label?: string): void;
+    profileEnd(label?: string): void;
+}
+/**
+ * Global logger instance
+ */
+export declare const logger: ControlledLogger;
+/**
+ * Creates a logger for a specific component
+ */
+export declare function createLogger(componentName?: string, options?: {
+    logLevel?: LogLevel;
+    forceOutput?: boolean;
+}): Logger;
+/**
+ * Helper to extract error messages consistently
+ */
+export declare function extractErrorMessage(error: unknown): string;
+/**
+ * Print current logger configuration (useful for debugging)
+ */
+export declare function printLoggerConfig(): void;

package/dist/utils/version-check.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Checks if a newer version is available and logs a message if so.
+ * This function is non-blocking and will not throw errors.
+ */
+export declare function checkForUpdates(): Promise<void>;
+/**
+ * Checks for updates in the background without blocking
+ */
+export declare function checkForUpdatesInBackground(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnara",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "description": "Command-line interface for Omnara.",
   "main": "dist/cli.js",
@@ -9,11 +9,13 @@
     "omnara": "./bin/omnara.js"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.json && npm run copy-assets",
-    "copy-assets": "cp -r src/orchestrator/*.md dist/orchestrator/",
+    "build": "npm run build:types && node build.mjs && npm run copy-assets",
+    "build:types": "tsc --emitDeclarationOnly --project tsconfig.json",
+    "copy-assets": "mkdir -p dist/orchestrator && cp -r src/orchestrator/*.md dist/orchestrator/",
+    "preinstall": "node scripts/preinstall.js",
     "dev": "tsx watch src/cli.ts",
     "test": "tsx --test \"tests/**/*.ts\" \"tests/*.ts\"",
-    "typecheck": "tsc -p tsconfig.test.json",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint --format unix \"src/**/*.ts\" \"tests/**/*.ts\"",
     "lint:fix": "eslint --format unix --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
     "format": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\"",
@@ -31,23 +33,28 @@
   "files": [
     "dist",
     "bin",
+    "scripts",
     "README.md"
   ],
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.1.23",
     "@anthropic-ai/sdk": "^0.67.0",
     "@modelcontextprotocol/sdk": "^1.20.1",
-    "@omnara/shared-js": "file:../shared-js",
     "@supabase/supabase-js": "^2.76.1",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^2.1.1",
+    "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "ws": "^8.18.3",
     "zod": "^3.25.76"
   },
   "devDependencies": {
+    "@omnara/shared-js": "file:../shared-js",
     "@types/node": "^20.11.30",
     "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^8.46.2",
     "@typescript-eslint/parser": "^8.46.2",
+    "esbuild": "^0.25.12",
     "eslint": "^9.38.0",
     "eslint-formatter-unix": "^8.40.0",
     "json-schema-to-typescript": "^14.0.1",

package/scripts/preinstall.js

@@ -0,0 +1,141 @@
+#!/usr/bin/env node
+
+import { execSync } from 'child_process';
+
+/**
+ * Preinstall script to uninstall old omnara packages (pip and brew).
+ * This ensures a clean migration to the npm package.
+ */
+
+function log(message) {
+  console.log(`[omnara preinstall] ${message}`);
+}
+
+function checkPipCommand() {
+  const pipCommands = ['pip3', 'pip'];
+  
+  for (const cmd of pipCommands) {
+    try {
+      execSync(`${cmd} --version`, { stdio: 'ignore' });
+      return cmd;
+    } catch {
+      // Command not found, try next
+    }
+  }
+  
+  return null;
+}
+
+function isPipPackageInstalled(pipCommand) {
+  try {
+    execSync(`${pipCommand} show omnara`, { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function uninstallPipPackage(pipCommand) {
+  try {
+    log(`Detected old omnara pip package in ${pipCommand}. Uninstalling...`);
+    
+    // Try without sudo first
+    try {
+      execSync(`${pipCommand} uninstall -y omnara`, { stdio: 'inherit' });
+      log(`Successfully uninstalled old omnara pip package from ${pipCommand}.`);
+      return true;
+    } catch (firstError) {
+      // If that fails, try with sudo
+      log('Permission denied. Attempting with sudo...');
+      try {
+        execSync(`sudo ${pipCommand} uninstall -y omnara`, { stdio: 'inherit' });
+        log(`Successfully uninstalled old omnara pip package from ${pipCommand} (with sudo).`);
+        return true;
+      } catch (sudoError) {
+        throw sudoError;
+      }
+    }
+  } catch (error) {
+    log(`Warning: Failed to uninstall pip package from ${pipCommand}: ${error.message}`);
+    log('You may need to manually run: sudo ' + pipCommand + ' uninstall omnara');
+    return false;
+  }
+}
+
+function checkBrewCommand() {
+  try {
+    execSync('brew --version', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function isBrewPackageInstalled() {
+  try {
+    execSync('brew list omnara', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function uninstallBrewPackage() {
+  try {
+    log('Detected old omnara brew package. Uninstalling...');
+    execSync('brew uninstall omnara', { stdio: 'inherit' });
+    log('Successfully uninstalled old omnara brew package.');
+    return true;
+  } catch (error) {
+    log(`Warning: Failed to uninstall brew package: ${error.message}`);
+    return false;
+  }
+}
+
+function main() {
+  log('Checking for old omnara installations...');
+  
+  // Check for pip packages - check BOTH pip and pip3
+  log('Checking for pip packages...');
+  const pipCommands = ['pip3', 'pip'];
+  let foundAnyPip = false;
+  
+  for (const pipCmd of pipCommands) {
+    try {
+      execSync(`${pipCmd} --version`, { stdio: 'ignore' });
+      foundAnyPip = true;
+      log(`Found ${pipCmd} command`);
+      
+      if (isPipPackageInstalled(pipCmd)) {
+        uninstallPipPackage(pipCmd);
+      } else {
+        log(`No old omnara package found in ${pipCmd}.`);
+      }
+    } catch {
+      // Command not found, skip
+    }
+  }
+  
+  if (!foundAnyPip) {
+    log('pip/pip3 not found. Skipping pip package check.');
+  }
+  
+  // Check for brew package
+  log('Checking for brew package...');
+  if (!checkBrewCommand()) {
+    log('brew not found. Skipping brew package check.');
+  } else {
+    log('Found brew command');
+    
+    if (isBrewPackageInstalled()) {
+      uninstallBrewPackage();
+    } else {
+      log('No old brew package found.');
+    }
+  }
+  
+  log('Package check complete. Continuing with installation.');
+}
+
+main();
+

package/scripts/test-preinstall.js

@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+
+/**
+ * Test script for preinstall.js
+ * This simulates various scenarios to ensure the preinstall script works correctly.
+ */
+
+import { execSync } from 'child_process';
+import { readFileSync } from 'fs';
+
+console.log('='.repeat(60));
+console.log('Testing preinstall.js');
+console.log('='.repeat(60));
+
+// Test 0: Verify package.json configuration
+console.log('\n[TEST 0] Verifying package.json configuration...');
+try {
+  const packageJson = JSON.parse(readFileSync('package.json', 'utf8'));
+  
+  // Check if preinstall script exists
+  if (packageJson.scripts?.preinstall) {
+    console.log('✅ preinstall script found in package.json');
+    console.log(`   Command: ${packageJson.scripts.preinstall}`);
+  } else {
+    console.error('❌ preinstall script NOT found in package.json');
+    process.exit(1);
+  }
+  
+  // Check if scripts directory is included in files
+  if (packageJson.files?.includes('scripts')) {
+    console.log('✅ scripts directory included in package files');
+  } else {
+    console.error('❌ scripts directory NOT included in package files');
+    process.exit(1);
+  }
+} catch (error) {
+  console.error('❌ Failed to read package.json:', error.message);
+  process.exit(1);
+}
+
+// Test 1: Check if the script runs without errors
+console.log('\n[TEST 1] Running preinstall.js...');
+try {
+  execSync('node scripts/preinstall.js', { 
+    stdio: 'inherit',
+    cwd: process.cwd()
+  });
+  console.log('✅ Script executed successfully');
+} catch (error) {
+  console.error('❌ Script failed:', error.message);
+  process.exit(1);
+}
+
+// Test 2: Check if pip/pip3 is available and check BOTH
+console.log('\n[TEST 2] Checking pip availability...');
+const pipCommands = ['pip3', 'pip'];
+let pipFound = false;
+for (const cmd of pipCommands) {
+  try {
+    execSync(`${cmd} --version`, { stdio: 'ignore' });
+    console.log(`✅ Found ${cmd}`);
+    pipFound = true;
+    
+    // Check if omnara pip package is installed
+    try {
+      const result = execSync(`${cmd} show omnara`, { encoding: 'utf8', stdio: 'pipe' });
+      console.log(`⚠️  Warning: omnara pip package IS installed in ${cmd}`);
+      console.log('   Package info:', result.split('\n')[0]);
+    } catch {
+      console.log(`✅ No omnara pip package found in ${cmd} (good)`);
+    }
+  } catch {
+    // Command not found
+  }
+}
+if (!pipFound) {
+  console.log('ℹ️  No pip/pip3 found on system');
+}
+
+// Test 3: Check if brew is available
+console.log('\n[TEST 3] Checking brew availability...');
+try {
+  execSync('brew --version', { stdio: 'ignore' });
+  console.log('✅ Found brew');
+  
+  // Check if omnara brew package is installed
+  try {
+    execSync('brew list omnara', { stdio: 'ignore' });
+    console.log('⚠️  Warning: omnara brew package IS installed');
+  } catch {
+    console.log('✅ No omnara brew package found (good)');
+  }
+} catch {
+  console.log('ℹ️  No brew found on system');
+}
+
+// Test 4: Verify script file permissions
+console.log('\n[TEST 4] Checking script permissions...');
+try {
+  const fs = await import('fs');
+  const stats = fs.statSync('scripts/preinstall.js');
+  const mode = (stats.mode & parseInt('777', 8)).toString(8);
+  console.log(`✅ Script permissions: ${mode}`);
+} catch (error) {
+  console.error('❌ Could not check permissions:', error.message);
+}
+
+console.log('\n' + '='.repeat(60));
+console.log('Test Summary:');
+console.log('='.repeat(60));
+console.log('✅ All tests passed! The preinstall script is ready to use.');
+console.log('\nThe script will automatically run when users install with:');
+console.log('  npm install -g omnara');
+console.log('\nWhat the preinstall script does:');
+console.log('  1. Checks both pip3 AND pip for old omnara packages');
+console.log('  2. Checks brew for old omnara packages');
+console.log('  3. Uninstalls any found packages (using sudo if needed)');
+console.log('  4. Continues with npm installation');
+console.log('\nTo test the full installation flow:');
+console.log('  1. Build: npm run build');
+console.log('  2. Pack: npm pack');
+console.log('  3. Install: npm install -g omnara-0.1.4.tgz');
+console.log('  4. Verify: omnara --version');
+console.log('='.repeat(60));
+

package/dist/auth/auth-provider.js

@@ -1,56 +0,0 @@
-import { CredentialsStore } from './credentials-store.js';
-import { ensureAuthContext } from './credential-manager.js';
-import { performVerificationLogin } from './login-flow.js';
-import { normalizeBaseUrl } from '../http/api-client.js';
-export class AuthProvider {
-    options;
-    cached = null;
-    backendUrl;
-    constructor(options) {
-        this.options = options;
-        this.backendUrl = normalizeBaseUrl(options.backendUrl);
-    }
-    async getAuthContext() {
-        const auth = await this.loadAuthContext();
-        this.cached = auth;
-        return auth;
-    }
-    async getAccessToken() {
-        const auth = await this.getAuthContext();
-        return auth.accessToken;
-    }
-    async loadAuthContext() {
-        try {
-            return await ensureAuthContext(this.options.store, this.backendUrl);
-        }
-        catch (error) {
-            if (!shouldAttemptLogin(error)) {
-                throw error;
-            }
-            this.options.logger?.log('Opening browser to authenticate…');
-            await performVerificationLogin({
-                backendUrlOption: this.backendUrl,
-                frontendUrlOption: this.options.frontendUrl,
-                store: this.options.store,
-            });
-            return await ensureAuthContext(this.options.store, this.backendUrl);
-        }
-    }
-}
-function shouldAttemptLogin(error) {
-    if (!(error instanceof Error)) {
-        return false;
-    }
-    const message = error.message.toLowerCase();
-    return (message.includes('no credentials found') ||
-        message.includes('run `omnara auth login` first') ||
-        message.includes('refresh token expired') ||
-        message.includes('refresh token unavailable') ||
-        message.includes('access token expired'));
-}
-export async function createAuthProvider(options) {
-    const provider = new AuthProvider(options);
-    await provider.getAuthContext();
-    return provider;
-}
-//# sourceMappingURL=auth-provider.js.map

package/dist/auth/auth-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-provider.js","sourceRoot":"","sources":["../../src/auth/auth-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAoB,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AASzD,MAAM,OAAO,YAAY;IAIM;IAHrB,MAAM,GAAuB,IAAI,CAAC;IACzB,UAAU,CAAS;IAEpC,YAA6B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QACvD,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC;YACH,OAAO,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,KAAK,CAAC;YACd,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAC7D,MAAM,wBAAwB,CAAC;gBAC7B,gBAAgB,EAAE,IAAI,CAAC,UAAU;gBACjC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBAC3C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC,CAAC;YACH,OAAO,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;CACF;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,CACL,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QACxC,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC;QACjD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC7C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CACzC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA4B;IACnE,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC"}