@skillsmith/mcp-server 0.3.3 → 0.3.5

package/dist/src/tools/install.conflict.test.js

@@ -0,0 +1,354 @@
+/**
+ * @fileoverview Unit Tests for Conflict Detection and Resolution
+ * @module @skillsmith/mcp-server/tools/install.conflict.test
+ * @see SMI-1868, SMI-1879
+ *
+ * Tests cover:
+ * - checkForConflicts: Detect local modifications before update
+ * - handleMergeAction: Three-way merge with conflict resolution
+ *
+ * Related test files:
+ * - install.conflict-helpers.test.ts: hashContent, detectModifications, backups
+ * - merge.test.ts: computeDiff, threeWayMerge
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import * as fs from 'fs/promises';
+// Import functions under test
+import { hashContent } from './install.conflict-helpers.js';
+import { checkForConflicts, handleMergeAction } from './install.conflict.js';
+// Mock fs module
+vi.mock('fs/promises');
+const mockedFs = vi.mocked(fs);
+// Import the mocked helpers for configuration in tests
+import * as helpersModule from './install.helpers.js';
+// Mock install.helpers for updateManifestSafely
+vi.mock('./install.helpers.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        detectModifications: vi.fn(),
+        createSkillBackup: vi.fn().mockResolvedValue('/backup/path'),
+        storeOriginal: vi.fn().mockResolvedValue(undefined),
+        loadOriginal: vi.fn(),
+        cleanupOldBackups: vi.fn().mockResolvedValue(undefined),
+        updateManifestSafely: vi.fn().mockResolvedValue(undefined),
+    };
+});
+const mockedHelpers = vi.mocked(helpersModule);
+// ============================================================================
+// Tests for checkForConflicts
+// ============================================================================
+describe('checkForConflicts', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should proceed when skill has no originalContentHash', async () => {
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    // No originalContentHash
+                },
+            },
+        };
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+    });
+    it('should proceed when skill is not modified', async () => {
+        const content = 'Original content';
+        const originalHash = hashContent(content);
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    originalContentHash: originalHash,
+                },
+            },
+        };
+        // Configure mock to return no modification
+        mockedHelpers.detectModifications.mockResolvedValue({
+            modified: false,
+            currentHash: originalHash,
+            originalHash: originalHash,
+        });
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+    });
+    it('should return conflict info when modified and no action specified', async () => {
+        const originalContent = 'Original content';
+        const modifiedContent = 'Modified content';
+        const originalHash = hashContent(originalContent);
+        const modifiedHash = hashContent(modifiedContent);
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    originalContentHash: originalHash,
+                },
+            },
+        };
+        // Configure mock to return modified
+        mockedHelpers.detectModifications.mockResolvedValue({
+            modified: true,
+            currentHash: modifiedHash,
+            originalHash: originalHash,
+        });
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
+        expect(result.shouldProceed).toBe(false);
+        expect(result.earlyReturn).toBeDefined();
+        expect(result.earlyReturn.conflict).toBeDefined();
+        expect(result.earlyReturn.conflict.hasLocalModifications).toBe(true);
+        expect(result.earlyReturn.requiresAction).toContain('overwrite');
+        expect(result.earlyReturn.requiresAction).toContain('merge');
+        expect(result.earlyReturn.requiresAction).toContain('cancel');
+    });
+    it('should cancel when action is cancel', async () => {
+        const originalContent = 'Original content';
+        const modifiedContent = 'Modified content';
+        const originalHash = hashContent(originalContent);
+        const modifiedHash = hashContent(modifiedContent);
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    originalContentHash: originalHash,
+                },
+            },
+        };
+        // Configure mock to return modified
+        mockedHelpers.detectModifications.mockResolvedValue({
+            modified: true,
+            currentHash: modifiedHash,
+            originalHash: originalHash,
+        });
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'cancel', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(false);
+        expect(result.earlyReturn).toBeDefined();
+        expect(result.earlyReturn.error).toContain('cancelled');
+    });
+    it('should create backup when action is overwrite', async () => {
+        const originalContent = 'Original content';
+        const modifiedContent = 'Modified content';
+        const originalHash = hashContent(originalContent);
+        const modifiedHash = hashContent(modifiedContent);
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    originalContentHash: originalHash,
+                },
+            },
+        };
+        // Configure mocks
+        mockedHelpers.detectModifications.mockResolvedValue({
+            modified: true,
+            currentHash: modifiedHash,
+            originalHash: originalHash,
+        });
+        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'overwrite', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+        expect(result.backupPath).toBeDefined();
+    });
+    it('should proceed for merge action', async () => {
+        const originalContent = 'Original content';
+        const modifiedContent = 'Modified content';
+        const originalHash = hashContent(originalContent);
+        const modifiedHash = hashContent(modifiedContent);
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                    originalContentHash: originalHash,
+                },
+            },
+        };
+        // Configure mock to return modified
+        mockedHelpers.detectModifications.mockResolvedValue({
+            modified: true,
+            currentHash: modifiedHash,
+            originalHash: originalHash,
+        });
+        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'merge', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+    });
+});
+// ============================================================================
+// Tests for handleMergeAction
+// ============================================================================
+describe('handleMergeAction', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should fallback to overwrite when no original content found', async () => {
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                },
+            },
+        };
+        // loadOriginal returns null
+        mockedHelpers.loadOriginal.mockResolvedValue(null);
+        mockedFs.readFile.mockResolvedValue('Current content'); // current content
+        const result = await handleMergeAction('test-skill', '/path/to/skill', 'Upstream content', manifest, 'owner', 'repo', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+    });
+    it('should return merged content on clean merge', async () => {
+        const originalContent = `Line 1
+Line 2
+Line 3`;
+        const currentContent = `Line 1
+Local Line 2
+Line 3`;
+        const upstreamContent = `Line 1
+Line 2
+Upstream Line 3`;
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                },
+            },
+        };
+        // loadOriginal returns original content
+        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
+        // current content read from fs
+        mockedFs.readFile.mockResolvedValue(currentContent);
+        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(true);
+        expect(result.mergedContent).toBeDefined();
+        expect(result.mergedContent).toContain('Local Line 2');
+        expect(result.mergedContent).toContain('Upstream Line 3');
+    });
+    it('should handle deleted local file as a conflict', async () => {
+        const originalContent = 'Original content';
+        const upstreamContent = 'Upstream content';
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                },
+            },
+        };
+        // loadOriginal returns original content
+        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
+        // current content - file deleted (throws ENOENT, treated as empty)
+        const error = new Error('ENOENT');
+        error.code = 'ENOENT';
+        mockedFs.readFile.mockRejectedValue(error);
+        // createSkillBackup mock
+        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
+        // fs operations for writing conflict file
+        mockedFs.mkdir.mockResolvedValue(undefined);
+        mockedFs.writeFile.mockResolvedValue(undefined);
+        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
+        // When local is deleted (empty) and upstream differs from original,
+        // this is a conflict since both sides modified the content differently
+        expect(result.shouldProceed).toBe(false);
+        expect(result.backupPath).toBeDefined();
+        expect(result.earlyReturn).toBeDefined();
+        expect(result.earlyReturn.mergeResult).toBeDefined();
+        expect(result.earlyReturn.mergeResult.conflicts).toBeDefined();
+    });
+    it('should create backup and write conflict markers on merge conflict', async () => {
+        const originalContent = 'Original content';
+        const currentContent = 'Local version';
+        const upstreamContent = 'Upstream version';
+        const manifest = {
+            version: '1.0.0',
+            installedSkills: {
+                'test-skill': {
+                    id: 'owner/test-skill',
+                    name: 'test-skill',
+                    version: '1.0.0',
+                    source: 'github:owner/test-skill',
+                    installPath: '/path/to/skill',
+                    installedAt: '2025-01-01',
+                    lastUpdated: '2025-01-01',
+                },
+            },
+        };
+        // loadOriginal returns original content
+        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
+        // current content read from fs
+        mockedFs.readFile.mockResolvedValue(currentContent);
+        // createSkillBackup mock
+        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
+        // fs operations for writing conflict file
+        mockedFs.mkdir.mockResolvedValue(undefined);
+        mockedFs.writeFile.mockResolvedValue(undefined);
+        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
+        expect(result.shouldProceed).toBe(false);
+        expect(result.backupPath).toBeDefined();
+        expect(result.earlyReturn).toBeDefined();
+        expect(result.earlyReturn.mergeResult).toBeDefined();
+        expect(result.earlyReturn.mergeResult.conflicts.length).toBeGreaterThan(0);
+        expect(result.earlyReturn.tips).toBeDefined();
+        expect(result.earlyReturn.tips).toContainEqual(expect.stringContaining('conflict'));
+    });
+});
+//# sourceMappingURL=install.conflict.test.js.map

package/dist/src/tools/install.conflict.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install.conflict.test.js","sourceRoot":"","sources":["../../../src/tools/install.conflict.test.ts"],"names":[],"mappings":"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"}

package/dist/src/tools/install.d.ts

@@ -11,50 +11,10 @@
  * - Optional file fetching (README.md, examples.md, config.json)
  *
  * Skills are installed to ~/.claude/skills/ and tracked in ~/.skillsmith/manifest.json
- *
- * @example
- * // Install from owner/repo format
- * const result = await installSkill({ skillId: 'anthropic/commit' });
- *
- * @example
- * // Install from GitHub URL
- * const result = await installSkill({
- *   skillId: 'https://github.com/user/repo/tree/main/skills/my-skill'
- * });
- *
- * @example
- * // Force reinstall with security scan skip
- * const result = await installSkill({
- *   skillId: 'community/helper',
- *   force: true,
- *   skipScan: true // Not recommended
- * });
  */
-import { z } from 'zod';
-import { type ScanReport } from '@skillsmith/core';
 import type { ToolContext } from '../context.js';
-export declare const installInputSchema: z.ZodObject<{
-    skillId: z.ZodString;
-    force: z.ZodDefault<z.ZodBoolean>;
-    skipScan: z.ZodDefault<z.ZodBoolean>;
-}, "strip", z.ZodTypeAny, {
-    skillId: string;
-    force: boolean;
-    skipScan: boolean;
-}, {
-    skillId: string;
-    force?: boolean | undefined;
-    skipScan?: boolean | undefined;
-}>;
-export type InstallInput = z.infer<typeof installInputSchema>;
-export interface InstallResult {
-    success: boolean;
-    skillId: string;
-    installPath: string;
-    securityReport?: ScanReport;
-    tips?: string[];
-    error?: string;
-}
+import { type InstallInput, type InstallResult } from './install.types.js';
+export { installInputSchema, type InstallInput, type InstallResult } from './install.types.js';
 /**
  * Install a skill from GitHub to the local Claude Code skills directory.
  *
@@ -73,24 +33,6 @@ export interface InstallResult {
  * @param input.force - Force reinstall if skill already exists (default: false)
  * @param input.skipScan - Skip security scan (default: false, not recommended)
  * @returns Promise resolving to installation result with success status
- *
- * @example
- * // Successful installation
- * const result = await installSkill({ skillId: 'anthropic/commit' });
- * if (result.success) {
- *   console.log(`Installed to ${result.installPath}`);
- *   result.tips?.forEach(tip => console.log(tip));
- * }
- *
- * @example
- * // Handle security scan failure
- * const result = await installSkill({ skillId: 'untrusted/skill' });
- * if (!result.success && result.securityReport) {
- *   console.log('Security issues found:');
- *   result.securityReport.findings.forEach(f =>
- *     console.log(`  ${f.severity}: ${f.message}`)
- *   );
- * }
  */
 export declare function installSkill(input: InstallInput, _context?: ToolContext): Promise<InstallResult>;
 /**
@@ -114,6 +56,15 @@ export declare const installTool: {
                 type: string;
                 description: string;
             };
+            skipOptimize: {
+                type: string;
+                description: string;
+            };
+            conflictAction: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
         };
         required: string[];
     };

package/dist/src/tools/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/tools/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAInE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAIhD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;EAI7B,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAG7D,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,UAAU,CAAA;IAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AA2PD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,YAAY,EACnB,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,aAAa,CAAC,CAgMxB;AAED;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;CAsBvB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/tools/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAIhD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,aAAa,EAEnB,MAAM,oBAAoB,CAAA;AAoB3B,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAE9F;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,YAAY,EACnB,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,aAAa,CAAC,CAsYxB;AAED;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCvB,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist/src/tools/install.helpers.d.ts

@@ -0,0 +1,83 @@
+/**
+ * @fileoverview Install Tool Helper Functions
+ * @module @skillsmith/mcp-server/tools/install.helpers
+ */
+import type { ToolContext } from '../context.js';
+import { type SkillManifest, type ParsedSkillId, type ParsedRepoUrl, type RegistrySkillInfo } from './install.types.js';
+/**
+ * Acquire a file lock for manifest operations
+ * SMI-1533: Prevents race conditions during concurrent installs
+ */
+export declare function acquireManifestLock(): Promise<void>;
+/**
+ * Release the manifest lock
+ */
+export declare function releaseManifestLock(): Promise<void>;
+/**
+ * Load or create manifest
+ */
+export declare function loadManifest(): Promise<SkillManifest>;
+/**
+ * Save manifest
+ * SMI-1533: Uses atomic write pattern with lock
+ */
+export declare function saveManifest(manifest: SkillManifest): Promise<void>;
+/**
+ * SMI-1533: Safely update manifest with locking
+ * Prevents race conditions during concurrent install operations
+ */
+export declare function updateManifestSafely(updateFn: (manifest: SkillManifest) => SkillManifest): Promise<void>;
+/**
+ * Parse skill ID or URL to get components
+ * SMI-1491: Added isRegistryId flag to detect registry skill IDs vs direct GitHub URLs
+ */
+export declare function parseSkillId(input: string): ParsedSkillId;
+/**
+ * Parse repo_url from registry to extract GitHub components
+ * SMI-1491: Handles various GitHub URL formats stored in registry
+ */
+export declare function parseRepoUrl(repoUrl: string): ParsedRepoUrl;
+/**
+ * Look up skill in registry to get repo_url
+ * SMI-1491: Enables install to work with registry IDs like "author/skill-name"
+ *
+ * Follows API-first pattern: tries live API, falls back to local DB
+ */
+export declare function lookupSkillFromRegistry(skillId: string, context: ToolContext): Promise<RegistrySkillInfo | null>;
+/**
+ * Fetch file from GitHub
+ * SMI-1491: Added optional branch parameter to use branch from repo_url
+ */
+export declare function fetchFromGitHub(owner: string, repo: string, filePath: string, branch?: string): Promise<string>;
+/** Validation result for SKILL.md */
+export interface SkillMdValidation {
+    valid: boolean;
+    errors: string[];
+}
+/**
+ * Validate SKILL.md content
+ */
+export declare function validateSkillMd(content: string): SkillMdValidation;
+/**
+ * Generate post-install tips
+ */
+export declare function generateTips(skillName: string): string[];
+/**
+ * SMI-1788: Optimization info type for tips generation
+ * SMI-1803: Exported for external use
+ */
+export interface OptimizationInfoForTips {
+    optimized: boolean;
+    subSkills?: string[];
+    subagentGenerated?: boolean;
+    subagentPath?: string;
+    tokenReductionPercent?: number;
+    originalLines?: number;
+    optimizedLines?: number;
+}
+/**
+ * SMI-1788: Generate post-install tips with optimization info
+ */
+export declare function generateOptimizedTips(skillName: string, optimizationInfo: OptimizationInfoForTips, claudeMdSnippet?: string): string[];
+export { hashContent, type ModificationResult, detectModifications, createSkillBackup, storeOriginal, loadOriginal, cleanupOldBackups, getBackupsDir, } from './install.conflict-helpers.js';
+//# sourceMappingURL=install.helpers.d.ts.map

package/dist/src/tools/install.helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"install.helpers.d.ts","sourceRoot":"","sources":["../../../src/tools/install.helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAA;AAa3B;;;GAGG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoCzD;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzD;AAMD;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,CAU3D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,aAAa,GACnD,OAAO,CAAC,IAAI,CAAC,CASf;AAMD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAsCzD;AAQD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAiC3D;AAMD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAgCnC;AAMD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,MAAe,GACtB,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAMD,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAiBlE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAOxD;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,uBAAuB,EACzC,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CAmDV;AAQD,OAAO,EACL,WAAW,EACX,KAAK,kBAAkB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,aAAa,GACd,MAAM,+BAA+B,CAAA"}