mstro-app 0.4.39 → 0.4.43

package/server/services/websocket/skill-handlers.ts

@@ -12,7 +12,7 @@ import type { SkillEntry, WSContext } from './types.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const SYSTEM_AGENTS_DIR = join(__dirname, '..', 'plan', 'agents');
-const USER_SKILLS_DIR = join(homedir(), '.claude', 'skills');
+export const USER_SKILLS_DIR = join(homedir(), '.claude', 'skills');
 
 const PLATFORM_COMMANDS: SkillEntry[] = [
 	{
@@ -118,14 +118,14 @@ function scanSystemAgents(agentsDir: string, seen: Set<string>): SkillEntry[] {
 	return entries;
 }
 
-export function handleListSkills(ctx: HandlerContext, ws: WSContext, workingDir: string): void {
-	const skills: SkillEntry[] = [...PLATFORM_COMMANDS];
-	const seen = new Set(skills.map(s => s.name));
+export function collectAllSkills(workingDir: string): SkillEntry[] {
+	const skills: SkillEntry[] = [];
+	const seen = new Set<string>();
 
+	// 1. Project skills (highest priority — override everything)
 	const projectSkillsDir = findSkillsDir(workingDir);
 	if (projectSkillsDir) {
-		const projectSkills = scanProjectSkills(projectSkillsDir);
-		for (const s of projectSkills) {
+		for (const s of scanProjectSkills(projectSkillsDir)) {
 			if (!seen.has(s.name)) {
 				skills.push(s);
 				seen.add(s.name);
@@ -133,12 +133,27 @@ export function handleListSkills(ctx: HandlerContext, ws: WSContext, workingDir:
 		}
 	}
 
+	// 2. User skills (override platform commands and system agents)
 	skills.push(...scanUserSkills(USER_SKILLS_DIR, seen));
-
 	for (const s of skills) seen.add(s.name);
+
+	// 3. Platform commands (only if not overridden by an external skill)
+	for (const cmd of PLATFORM_COMMANDS) {
+		if (!seen.has(cmd.name)) {
+			skills.push(cmd);
+			seen.add(cmd.name);
+		}
+	}
+
+	// 4. System agents (lowest priority)
 	skills.push(...scanSystemAgents(SYSTEM_AGENTS_DIR, seen));
 
 	skills.sort((a, b) => a.name.localeCompare(b.name));
+	return skills;
+}
+
+export function handleListSkills(ctx: HandlerContext, ws: WSContext, workingDir: string): void {
+	const skills = collectAllSkills(workingDir);
 	ctx.send(ws, { type: 'skillsList', data: { skills } });
 }
 
@@ -155,43 +170,37 @@ function extractSkillContent(fileContent: string): string {
 interface SkillFile {
 	content: string;
 	skillDir: string;
+	source: 'project' | 'user' | 'system';
+}
+
+function tryReadSkillFile(filePath: string, skillDir: string, userInvocableOnly: boolean, source: SkillFile['source']): SkillFile | null {
+	if (!existsSync(filePath)) return null;
+	try {
+		const content = readFileSync(filePath, 'utf-8');
+		if (userInvocableOnly && parseFrontmatter(content)['user-invocable'] === 'false') return null;
+		return { content, skillDir, source };
+	} catch { return null; }
 }
 
 /**
- * Find and read a skill's SKILL.md by name. Checks project skills first, then system agents.
- * Returns the raw file content and the skill directory, or null if not found.
+ * Find and read a skill's SKILL.md by name. Checks project skills first, then user skills, then system agents.
+ * When `userInvocableOnly` is true, skips entries with `user-invocable: false` and continues
+ * to the next source — this ensures internal-only project skills don't shadow user skills.
  */
-function findSkillContent(skillName: string, workingDir: string): SkillFile | null {
-	// Project skills: .claude/skills/<name>/SKILL.md
+function findSkillContent(skillName: string, workingDir: string, userInvocableOnly = false): SkillFile | null {
 	const projectSkillsDir = findSkillsDir(workingDir);
 	if (projectSkillsDir) {
 		const skillDir = join(projectSkillsDir, skillName);
-		const skillFile = join(skillDir, 'SKILL.md');
-		if (existsSync(skillFile)) {
-			try {
-				return { content: readFileSync(skillFile, 'utf-8'), skillDir };
-			} catch { /* fall through */ }
-		}
+		const found = tryReadSkillFile(join(skillDir, 'SKILL.md'), skillDir, userInvocableOnly, 'project');
+		if (found) return found;
 	}
 
-	// User skills: ~/.claude/skills/<name>/SKILL.md
 	const userSkillDir = join(USER_SKILLS_DIR, skillName);
-	const userSkillFile = join(userSkillDir, 'SKILL.md');
-	if (existsSync(userSkillFile)) {
-		try {
-			return { content: readFileSync(userSkillFile, 'utf-8'), skillDir: userSkillDir };
-		} catch { /* fall through */ }
-	}
+	const found = tryReadSkillFile(join(userSkillDir, 'SKILL.md'), userSkillDir, userInvocableOnly, 'user');
+	if (found) return found;
 
-	// System agents: <agents-dir>/<name>.md
 	const agentFile = join(SYSTEM_AGENTS_DIR, `${skillName}.md`);
-	if (existsSync(agentFile)) {
-		try {
-			return { content: readFileSync(agentFile, 'utf-8'), skillDir: SYSTEM_AGENTS_DIR };
-		} catch { /* fall through */ }
-	}
-
-	return null;
+	return tryReadSkillFile(agentFile, SYSTEM_AGENTS_DIR, userInvocableOnly, 'system');
 }
 
 /**
@@ -250,7 +259,9 @@ function fillArgumentVariables(content: string, userArgs: string): string {
  * Also handles fenced ```! blocks for multi-line commands.
  * Runs in the skill's working directory with a short timeout.
  */
-function executeInlineShellCommands(content: string, workingDir: string): string {
+function executeInlineShellCommands(content: string, workingDir: string, source: 'system' | 'user' | 'project'): string {
+	if (source !== 'system' && source !== 'user') return content;
+
 	// Fenced ```! blocks — multi-line shell execution
 	let result = content.replace(/```!\n([\s\S]*?)```/g, (_, block: string) => {
 		const cmd = block.trim();
@@ -305,7 +316,7 @@ function parseSlashCommand(trimmed: string): { skillName: string; userArgs: stri
 const CLAUDE_SKILL_DIR_RE = /\$\{CLAUDE_SKILL_DIR}/g;
 const CLAUDE_SESSION_ID_RE = /\$\{CLAUDE_SESSION_ID}/g;
 
-function processSkillContent(rawContent: string, userArgs: string, skillDir: string, workingDir: string): string {
+function processSkillContent(rawContent: string, userArgs: string, skillDir: string, workingDir: string, source: 'system' | 'user' | 'project'): string {
 	let content = extractSkillContent(rawContent);
 
 	content = fillTemplateVariables(content, {
@@ -322,7 +333,7 @@ function processSkillContent(rawContent: string, userArgs: string, skillDir: str
 	content = content.replace(CLAUDE_SESSION_ID_RE, `mstro-${Date.now()}`);
 
 	if (/!`[^`]+`/.test(content) || /```!\n/.test(content)) {
-		content = executeInlineShellCommands(content, workingDir);
+		content = executeInlineShellCommands(content, workingDir, source);
 	}
 
 	if (userArgs && !hasArgumentsPlaceholder && !rawContent.includes('{{dirPath}}')) {
@@ -336,12 +347,11 @@ export function resolveSkillPrompt(prompt: string, workingDir: string): Resolved
 	const parsed = parseSlashCommand(prompt.trim());
 	if (!parsed) return null;
 
-	const found = findSkillContent(parsed.skillName, workingDir);
+	// Only resolve user-invocable skills — internal-only skills (user-invocable: false)
+	// are skipped so they don't shadow external skills with the same name.
+	const found = findSkillContent(parsed.skillName, workingDir, true);
 	if (!found) return null;
 
-	const fm = parseFrontmatter(found.content);
-	if (fm['user-invocable'] === 'false') return null;
-
-	const skillPrompt = processSkillContent(found.content, parsed.userArgs, found.skillDir, workingDir);
+	const skillPrompt = processSkillContent(found.content, parsed.userArgs, found.skillDir, workingDir, found.source);
 	return { prompt: skillPrompt, skillName: parsed.skillName, userArgs: parsed.userArgs };
 }

package/server/services/websocket/skill-watcher.ts

@@ -0,0 +1,79 @@
+// Copyright (c) 2025-present Mstro, Inc. All rights reserved.
+// Licensed under the MIT License. See LICENSE file for details.
+
+import { type FSWatcher, watch } from 'node:fs';
+import { findSkillsDir } from '../../utils/paths.js';
+import type { HandlerContext } from './handler-context.js';
+import { collectAllSkills, USER_SKILLS_DIR } from './skill-handlers.js';
+
+export class SkillsWatcher {
+  private userWatcher: FSWatcher | null = null;
+  private projectWatcher: FSWatcher | null = null;
+  private debounceTimer: ReturnType<typeof setTimeout> | null = null;
+  private lastSkillsHash = '';
+  private started = false;
+
+  constructor(
+    private readonly workingDir: string,
+    private readonly ctx: HandlerContext,
+  ) {}
+
+  start(): void {
+    if (this.started) return;
+
+    this.lastSkillsHash = this.computeHash();
+
+    try {
+      this.userWatcher = watch(USER_SKILLS_DIR, { recursive: true }, (_event, filename) => {
+        if (!filename || !filename.endsWith('.md')) return;
+        this.debounce();
+      });
+      this.userWatcher.on('error', () => { /* directory deleted or inaccessible */ });
+    } catch { /* directory missing or recursive watch unsupported */ }
+
+    const projectSkillsDir = findSkillsDir(this.workingDir);
+    if (projectSkillsDir) {
+      try {
+        this.projectWatcher = watch(projectSkillsDir, { recursive: true }, (_event, filename) => {
+          if (!filename || !filename.endsWith('.md')) return;
+          this.debounce();
+        });
+        this.projectWatcher.on('error', () => { /* directory deleted or inaccessible */ });
+      } catch { /* directory missing or recursive watch unsupported */ }
+    }
+
+    this.started = true;
+  }
+
+  stop(): void {
+    if (this.userWatcher) { this.userWatcher.close(); this.userWatcher = null; }
+    if (this.projectWatcher) { this.projectWatcher.close(); this.projectWatcher = null; }
+    if (this.debounceTimer) { clearTimeout(this.debounceTimer); this.debounceTimer = null; }
+    this.started = false;
+  }
+
+  private debounce(): void {
+    if (this.debounceTimer) clearTimeout(this.debounceTimer);
+    this.debounceTimer = setTimeout(() => {
+      this.handleChange();
+    }, 250);
+  }
+
+  private handleChange(): void {
+    try {
+      const skills = collectAllSkills(this.workingDir);
+      const hash = JSON.stringify(skills.map(s => `${s.name}:${s.source}:${s.description}`));
+      if (hash === this.lastSkillsHash) return;
+      this.lastSkillsHash = hash;
+
+      this.ctx.broadcastToAll({ type: 'skillsList', data: { skills } });
+    } catch {
+      // Ignore errors from partial writes or missing files
+    }
+  }
+
+  private computeHash(): string {
+    const skills = collectAllSkills(this.workingDir);
+    return JSON.stringify(skills.map(s => `${s.name}:${s.source}:${s.description}`));
+  }
+}

package/server/services/websocket/types.ts

@@ -52,10 +52,6 @@ const PlanBoardMessages = ['planCreateBoard', 'planUpdateBoard', 'planArchiveBoa
 
 const PlanSprintMessages = ['planCreateSprint', 'planActivateSprint', 'planCompleteSprint', 'planGetSprintArtifacts'] as const;
 
-const DeployMessages = ['deployCreate', 'deployStop', 'deployResume', 'deployDelete', 'deployList', 'deployGetStatus', 'deployUpdateConfig', 'deploySetApiKey', 'deployValidateApiKey'] as const;
-
-const DeployRelayMessages = ['deployHttpRequest', 'deployUsageReport', 'deployAiHealthUpdate'] as const;
-
 const SkillMessages = ['listSkills', 'chatToBoard'] as const;
 
 type WebSocketMessageType =
@@ -75,8 +71,6 @@ type WebSocketMessageType =
   | typeof PlanMessages[number]
   | typeof PlanBoardMessages[number]
   | typeof PlanSprintMessages[number]
-  | typeof DeployMessages[number]
-  | typeof DeployRelayMessages[number]
   | typeof SkillMessages[number];
 
 export interface WebSocketMessage {
@@ -121,10 +115,6 @@ const PlanBoardResponseMessages = ['planBoardCreated', 'planBoardUpdated', 'plan
 
 const PlanSprintResponseMessages = ['planSprintCreated', 'planSprintUpdated', 'planSprintCompleted', 'planSprintArtifacts', 'planReviewProgress'] as const;
 
-const DeployResponseMessages = ['deployCreated', 'deployStopped', 'deployResumed', 'deployDeleted', 'deployListResult', 'deployStatusResult', 'deployConfigUpdated', 'deployApiKeyStatus', 'deployError'] as const;
-
-const DeployRelayResponseMessages = ['deployHttpResponse', 'deployHttpResponseChunk', 'deployStatus', 'deployUsageReportAck', 'deployAiHealthAck'] as const;
-
 const SkillResponseMessages = ['skillsList', 'chatToBoardCreated'] as const;
 
 type WebSocketResponseType =
@@ -144,8 +134,6 @@ type WebSocketResponseType =
   | typeof PlanResponseMessages[number]
   | typeof PlanBoardResponseMessages[number]
   | typeof PlanSprintResponseMessages[number]
-  | typeof DeployResponseMessages[number]
-  | typeof DeployRelayResponseMessages[number]
   | typeof SkillResponseMessages[number];
 
 export interface WebSocketResponse {
@@ -468,302 +456,3 @@ export interface WorktreeMergeResult {
   conflictFiles?: string[];
 }
 
-// ============================================================================
-// Deploy Types
-// ============================================================================
-
-/**
- * Deployment status
- */
-export type DeploymentStatus = 'running' | 'stopped' | 'error' | 'starting' | 'stopping';
-
-/**
- * Deployment configuration
- */
-export interface DeployConfig {
-  /** Subdomain for the deployment (e.g. "my-app" -> my-app.mstro.app) */
-  subdomain: string;
-  /** Local port to expose */
-  port: number;
-  /** Whether AI features are enabled for this deployment */
-  aiEnabled: boolean;
-  /** Custom domain if configured */
-  customDomain?: string;
-}
-
-/**
- * Deployment info returned in responses
- */
-export interface DeploymentInfo {
-  /** Unique deployment identifier */
-  deploymentId: string;
-  /** Deployment configuration */
-  config: DeployConfig;
-  /** Current deployment status */
-  status: DeploymentStatus;
-  /** Public URL of the deployment */
-  url: string;
-  /** When the deployment was created (ISO string) */
-  createdAt: string;
-  /** When the deployment was last updated (ISO string) */
-  updatedAt: string;
-}
-
-/**
- * Message data for deployCreate request
- */
-export interface DeployCreateData {
-  /** Subdomain for the deployment */
-  subdomain: string;
-  /** Local port to expose */
-  port: number;
-  /** Whether AI features are enabled */
-  aiEnabled: boolean;
-}
-
-/**
- * Message data for deployStop request
- */
-export interface DeployStopData {
-  /** ID of the deployment to stop */
-  deploymentId: string;
-}
-
-/**
- * Message data for deployResume request
- */
-export interface DeployResumeData {
-  /** ID of the deployment to resume */
-  deploymentId: string;
-}
-
-/**
- * Message data for deployDelete request
- */
-export interface DeployDeleteData {
-  /** ID of the deployment to delete */
-  deploymentId: string;
-}
-
-/**
- * Message data for deployGetStatus request
- */
-export interface DeployGetStatusData {
-  /** ID of the deployment to get status for */
-  deploymentId: string;
-}
-
-/**
- * Message data for deployUpdateConfig request
- */
-export interface DeployUpdateConfigData {
-  /** ID of the deployment to update */
-  deploymentId: string;
-  /** Partial config to update */
-  config: Partial<DeployConfig>;
-}
-
-/**
- * Message data for deploySetApiKey request
- * Note: API key transits via WSS but is never stored or logged by the server relay
- */
-export interface DeploySetApiKeyData {
-  /** The API key to set */
-  apiKey: string;
-}
-
-/**
- * Response data for deployCreated
- */
-export interface DeployCreatedResponse {
-  /** The created deployment */
-  deployment: DeploymentInfo;
-}
-
-/**
- * Response data for deployStopped
- */
-export interface DeployStoppedResponse {
-  /** ID of the stopped deployment */
-  deploymentId: string;
-}
-
-/**
- * Response data for deployResumed
- */
-export interface DeployResumedResponse {
-  /** ID of the resumed deployment */
-  deploymentId: string;
-}
-
-/**
- * Response data for deployDeleted
- */
-export interface DeployDeletedResponse {
-  /** ID of the deleted deployment */
-  deploymentId: string;
-}
-
-/**
- * Response data for deployListResult
- */
-export interface DeployListResultResponse {
-  /** All deployments for this orchestra */
-  deployments: DeploymentInfo[];
-}
-
-/**
- * Response data for deployStatusResult
- */
-export interface DeployStatusResultResponse {
-  /** The requested deployment */
-  deployment: DeploymentInfo;
-}
-
-/**
- * Response data for deployConfigUpdated
- */
-export interface DeployConfigUpdatedResponse {
-  /** The updated deployment */
-  deployment: DeploymentInfo;
-}
-
-/**
- * Response data for deployApiKeyStatus
- * Note: Never includes the full API key — only the last four characters
- */
-export interface DeployApiKeyStatusResponse {
-  /** Validation status of the API key */
-  status: 'valid' | 'invalid' | 'missing' | 'rate_limited';
-  /** Last four characters of the API key (for display) */
-  lastFour?: string;
-  /** Where the key was detected from */
-  source?: 'env' | 'stored';
-}
-
-/**
- * Response data for deployError
- */
-export interface DeployErrorResponse {
-  /** Error message */
-  error: string;
-  /** The deployment ID that caused the error, if applicable */
-  deploymentId?: string;
-}
-
-// ============================================================================
-// Deploy HTTP Relay Types
-// ============================================================================
-
-/**
- * Message data for deployHttpRequest (server→cli)
- * Represents an inbound HTTP request to be handled by the CLI
- */
-export interface DeployHttpRequestData {
-  /** UUID for correlating this request with its response */
-  requestId: string;
-  /** HTTP method (GET, POST, PUT, DELETE, etc.) */
-  method: string;
-  /** Request URL path with query string (e.g. "/api/hello?name=world") */
-  url: string;
-  /** HTTP request headers */
-  headers: Record<string, string>;
-  /** HTTP request body (may be undefined for GET/HEAD) */
-  body?: string;
-  /** ID of the deployment this request is for */
-  deploymentId: string;
-  /** Local port of the developer's server to proxy to */
-  port: number;
-}
-
-/**
- * Response data for deployHttpResponse (cli→server)
- * The CLI's response to a proxied HTTP request
- */
-export interface DeployHttpResponseData {
-  /** UUID matching the original deployHttpRequest */
-  requestId: string;
-  /** HTTP status code */
-  status: number;
-  /** HTTP response headers */
-  headers: Record<string, string>;
-  /** HTTP response body */
-  body?: string;
-}
-
-/**
- * Response data for deployHttpResponseChunk (cli→server)
- * A chunk of a large HTTP response streamed over multiple WebSocket messages
- */
-export interface DeployHttpResponseChunkData {
-  /** UUID matching the original deployHttpRequest */
-  requestId: string;
-  /** Zero-based index of this chunk */
-  chunkIndex: number;
-  /** Total number of chunks (known after reading the full response) */
-  totalChunks: number;
-  /** Base64-encoded chunk data */
-  data: string;
-  /** Whether this is the last chunk */
-  isLast: boolean;
-  /** HTTP status code (sent with first chunk) */
-  status?: number;
-  /** HTTP response headers (sent with first chunk) */
-  headers?: Record<string, string>;
-}
-
-/**
- * Response data for deployStatus (cli→server)
- * Status update for a deployment
- */
-export interface DeployStatusData {
-  /** ID of the deployment */
-  deploymentId: string;
-  /** Current status of the deployment */
-  status: DeploymentStatus;
-}
-
-// ============================================================================
-// Deploy Usage & Health Types
-// ============================================================================
-
-/**
- * Message data for deployUsageReport (cli→server)
- * Sent after each AI execution. Contains metadata only — never prompts or responses.
- */
-export interface DeployUsageReportData {
-  /** ID of the deployment */
-  deploymentId: string;
-  /** End user who triggered the execution */
-  endUserId: string;
-  /** AI capability used */
-  capability: 'headless' | 'pm-board';
-  /** Total tokens consumed (input + output) */
-  tokensUsed: number;
-  /** Model used for execution */
-  model: string;
-  /** Execution duration in milliseconds */
-  durationMs: number;
-  /** Optional board ID if capability was pm-board */
-  boardId?: string;
-}
-
-/**
- * AI health status values
- */
-export type DeployAiHealthStatus = 'healthy' | 'invalid_key' | 'no_credits' | 'rate_limited' | 'unknown_error';
-
-/**
- * Message data for deployAiHealthUpdate (cli→server)
- * Sent when the CLI detects an API key or AI service issue.
- */
-export interface DeployAiHealthUpdateData {
-  /** ID of the deployment */
-  deploymentId: string;
-  /** Current AI health status */
-  status: DeployAiHealthStatus;
-  /** Human-readable error message */
-  message: string;
-  /** Whether AI features are currently disabled locally */
-  aiDisabled: boolean;
-}

package/dist/server/services/deploy/ai-broker.d.ts

@@ -1,63 +0,0 @@
-import { Hono } from 'hono';
-import { type HealthUpdateData, type UsageReportData } from './headless-session-handler.js';
-export interface AiBrokerInvokeBody {
-    capability: 'headless' | 'pm-board';
-    deploymentId: string;
-    endUserId: string;
-    prompt: string;
-    boardTemplateId?: string;
-    systemPrompt?: string;
-    allowedTools?: string[];
-    model?: string;
-}
-interface DeployTokenRecord {
-    deploymentId: string;
-    tokenHash: string;
-    capabilities: ('headless' | 'pm-board')[];
-    rateLimit: {
-        maxRequestsPerMinute: number | null;
-        maxConcurrentSessions: number;
-    };
-    aiConfig: {
-        aiEnabled: boolean;
-        defaultSystemPrompt: string | null;
-        defaultModel: string;
-        maxTokensPerRequest: number | null;
-        workingDir: string;
-        allowedBoardTemplateIds: string[];
-        maxConcurrentBoardExecutions: number;
-        maxBoardExecutionsPerMinute: number | null;
-    };
-    /** When set, the deployment requires payment and this URL is returned on 402 */
-    paymentUrl?: string;
-    /** Whether the deployment is currently active */
-    enabled: boolean;
-}
-export declare function registerDeployToken(record: DeployTokenRecord): void;
-export declare function unregisterDeployToken(deploymentId: string): void;
-export declare function getDeployTokenRecord(deploymentId: string): DeployTokenRecord | undefined;
-/**
- * Update rate limit and AI config on an existing deploy token record.
- * Called when the server syncs updated deployment config to the CLI.
- */
-export declare function updateDeployTokenConfig(deploymentId: string, updates: {
-    maxRequestsPerMinute?: number | null;
-    maxConcurrentSessions?: number;
-    maxTokensPerRequest?: number | null;
-    aiEnabled?: boolean;
-}): boolean;
-type UsageReportListener = (report: UsageReportData) => void;
-type HealthUpdateListener = (update: HealthUpdateData) => void;
-/**
- * Register a listener for deploy usage reports.
- * Called from the server setup to wire usage reports to the platform connection.
- */
-export declare function setDeployUsageReportListener(listener: UsageReportListener): void;
-/**
- * Register a listener for deploy AI health updates.
- * Called from the server setup to wire health updates to the platform connection.
- */
-export declare function setDeployHealthUpdateListener(listener: HealthUpdateListener): void;
-export declare function createAiBrokerRoutes(): Hono;
-export {};
-//# sourceMappingURL=ai-broker.d.ts.map

package/dist/server/services/deploy/ai-broker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ai-broker.d.ts","sourceRoot":"","sources":["../../../../server/services/deploy/ai-broker.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAgB,IAAI,EAAE,MAAM,MAAM,CAAC;AAO1C,OAAO,EAGL,KAAK,gBAAgB,EAErB,KAAK,eAAe,EACrB,MAAM,+BAA+B,CAAC;AAIvC,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,GAAG,UAAU,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,iBAAiB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE;QACT,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,qBAAqB,EAAE,MAAM,CAAC;KAC/B,CAAC;IACF,QAAQ,EAAE;QACR,SAAS,EAAE,OAAO,CAAC;QACnB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,YAAY,EAAE,MAAM,CAAC;QACrB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,UAAU,EAAE,MAAM,CAAC;QACnB,uBAAuB,EAAE,MAAM,EAAE,CAAC;QAClC,4BAA4B,EAAE,MAAM,CAAC;QACrC,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5C,CAAC;IACF,gFAAgF;IAChF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;CAClB;AAWD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAEnE;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAExF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;IACP,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GACA,OAAO,CAkBT;AAID,KAAK,mBAAmB,GAAG,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;AAC7D,KAAK,oBAAoB,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;AAK/D;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAEhF;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAElF;AA8ID,wBAAgB,oBAAoB,IAAI,IAAI,CAoD3C"}