npm - ai-dev-analytics - Versions diffs - 2.0.1 → 2.0.2 - Mend

ai-dev-analytics 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/cli/commands/doctor.d.ts.map +1 -1
package/dist/cli/commands/doctor.js +45 -2
package/dist/cli/commands/doctor.js.map +1 -1
package/dist/cli/commands/merge-data.d.ts +19 -0
package/dist/cli/commands/merge-data.d.ts.map +1 -0
package/dist/cli/commands/merge-data.js +624 -0
package/dist/cli/commands/merge-data.js.map +1 -0
package/dist/cli/commands/merge.d.ts +2 -0
package/dist/cli/commands/merge.d.ts.map +1 -0
package/dist/cli/commands/merge.js +82 -0
package/dist/cli/commands/merge.js.map +1 -0
package/dist/cli/index.js +6 -0
package/dist/cli/index.js.map +1 -1
package/package.json +1 -1

package/dist/cli/commands/doctor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"~~AAsBA~~,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,~~CAgH5C~~"}
1	+ {"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAqDA,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CA0H5C"}

package/dist/cli/commands/doctor.js CHANGED Viewed

@@ -1,7 +1,9 @@
 import { green, red, yellow, cyan, dim } from '../../utils/display.js';
-import { configPath } from '../../utils/paths.js';
-import { fileExists } from '../../utils/fs.js';
+import { configPath, aidaDir } from '../../utils/paths.js';
+import { fileExists, readText } from '../../utils/fs.js';
 import { inspectProject, inspectSecurity, normalizeProject } from '../../services/project-health.js';
+import { readdirSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
 function hasFixFlag() {
     return process.argv.slice(3).includes('--fix');
 }
@@ -19,6 +21,38 @@ function securityMode() {
 function line(ok, label, detail) {
     console.log(`${ok ? green('  ✓') : yellow('  !')} ${label}: ${detail}`);
 }
+function walkJsonFiles(rootDir) {
+    if (!fileExists(rootDir))
+        return [];
+    const results = [];
+    const stack = [rootDir];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        for (const name of readdirSync(current)) {
+            const fullPath = resolve(current, name);
+            const stat = statSync(fullPath);
+            if (stat.isDirectory())
+                stack.push(fullPath);
+            else if (name.endsWith('.json'))
+                results.push(fullPath);
+        }
+    }
+    return results;
+}
+function findConflictedFiles(projectRoot) {
+    const dir = aidaDir(projectRoot);
+    if (!fileExists(dir))
+        return [];
+    return walkJsonFiles(dir).filter((f) => {
+        try {
+            const raw = readText(f);
+            return raw.includes('<<<<<<<') || raw.includes('>>>>>>>');
+        }
+        catch {
+            return false;
+        }
+    });
+}
 export async function doctor() {
     const projectRoot = process.cwd();
     console.log(cyan('\n  AIDA Doctor\n'));
@@ -26,6 +60,15 @@ export async function doctor() {
         console.log(red('  AIDA not initialized. Run `npx aida init` first.\n'));
         return;
     }
+    const conflicted = findConflictedFiles(projectRoot);
+    if (conflicted.length > 0) {
+        console.log(yellow(`  ⚠ ${conflicted.length} AIDA JSON file(s) have unresolved git merge conflicts:`));
+        for (const f of conflicted) {
+            console.log(`    - ${f.replace(projectRoot + '/', '')}`);
+        }
+        console.log(yellow('\n  Run `aida merge` to auto-resolve conflicts before running doctor.\n'));
+        return;
+    }
     const fix = hasFixFlag();
     if (fix) {
         const normalized = normalizeProject(projectRoot);

package/dist/cli/commands/doctor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;~~AAClD~~,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;~~AAC/C~~,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;~~AAErG~~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"}
1	+ {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/merge-data.d.ts ADDED Viewed

@@ -0,0 +1,19 @@
+type MergeStatus = 'merged' | 'no-conflict' | 'missing' | 'error';
+interface MergeCountResult {
+    status: MergeStatus;
+    merged: number;
+    missing: number;
+    errors: number;
+}
+export interface MergeDataSummary {
+    memoryIndex: MergeCountResult;
+    moduleMemories: MergeCountResult;
+    contexts: MergeCountResult;
+    requirements: MergeCountResult;
+    runs: MergeCountResult;
+    rebuiltMemoryViews: boolean;
+}
+export declare function mergeAidaJsonData(projectRoot: string): MergeDataSummary;
+export declare function mergeData(): Promise<void>;
+export {};
+//# sourceMappingURL=merge-data.d.ts.map

package/dist/cli/commands/merge-data.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"merge-data.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/merge-data.ts"],"names":[],"mappings":"AAgDA,KAAK,WAAW,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,OAAO,CAAC;AAElE,UAAU,gBAAgB;IACxB,MAAM,EAAE,WAAW,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AA4iBD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,gBAAgB,CAAA;IAC7B,cAAc,EAAE,gBAAgB,CAAA;IAChC,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,YAAY,EAAE,gBAAgB,CAAA;IAC9B,IAAI,EAAE,gBAAgB,CAAA;IACtB,kBAAkB,EAAE,OAAO,CAAA;CAC5B;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAkEvE;AAcD,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CA0C/C"}

package/dist/cli/commands/merge-data.js ADDED Viewed

@@ -0,0 +1,624 @@
+import { readdirSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { green, red, yellow } from '../../utils/display.js';
+import { fileExists, readText, extractConflictSections, writeJson, } from '../../utils/fs.js';
+import { aidaDir, configPath, memoryIndexPath, moduleMemoriesDir, runsDir, } from '../../utils/paths.js';
+import { buildMemoryViews, loadMemoryIndex, loadModuleMemory, normalizeModuleKey, saveModuleMemory, } from '../../utils/memory.js';
+import { normalizeRunData, recalcMetrics, resolveCurrentTaskId } from '../../internal/runtime/state.js';
+function uniqueStrings(values) {
+    const result = [];
+    const seen = new Set();
+    for (const value of values) {
+        const normalized = `${value || ''}`.trim();
+        if (!normalized || seen.has(normalized))
+            continue;
+        seen.add(normalized);
+        result.push(normalized);
+    }
+    return result;
+}
+function latestIso(a, b) {
+    if (!a)
+        return b || '';
+    if (!b)
+        return a;
+    return new Date(a).getTime() >= new Date(b).getTime() ? a : b;
+}
+function pickLatestString(current, incoming, currentUpdatedAt, incomingUpdatedAt) {
+    const currentValue = (current || '').trim();
+    const incomingValue = (incoming || '').trim();
+    if (!currentValue)
+        return incomingValue;
+    if (!incomingValue)
+        return currentValue;
+    return latestIso(currentUpdatedAt, incomingUpdatedAt) === incomingUpdatedAt ? incomingValue : currentValue;
+}
+function parseConflictJsonObject(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed === 'null')
+        return null;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return null;
+    }
+}
+function hasConflict(filePath) {
+    if (!fileExists(filePath))
+        return false;
+    const raw = readText(filePath);
+    return raw.includes('<<<<<<<') || raw.includes('>>>>>>>');
+}
+function mergeByKey(items, keyOf, mergeItem) {
+    const map = new Map();
+    for (const item of items) {
+        const key = keyOf(item);
+        const existing = map.get(key);
+        map.set(key, existing ? mergeItem(existing, item) : item);
+    }
+    return [...map.values()];
+}
+function mergeIndexEntry(current, incoming) {
+    const useIncoming = latestIso(current.updatedAt, incoming.updatedAt) === incoming.updatedAt;
+    return {
+        key: current.key || incoming.key,
+        title: pickLatestString(current.title, incoming.title, current.updatedAt, incoming.updatedAt),
+        summary: pickLatestString(current.summary, incoming.summary, current.updatedAt, incoming.updatedAt),
+        keywords: uniqueStrings([...current.keywords, ...incoming.keywords]),
+        paths: uniqueStrings([...current.paths, ...incoming.paths]),
+        tickets: uniqueStrings([...(current.tickets || []), ...(incoming.tickets || [])]),
+        updatedAt: useIncoming ? incoming.updatedAt : current.updatedAt,
+    };
+}
+function mergeMemoryIndex(ours, theirs) {
+    const mergedModules = mergeByKey([...((ours?.items || ours?.modules || [])), ...((theirs?.items || theirs?.modules || []))], (item) => normalizeModuleKey(item.key), (current, incoming) => mergeIndexEntry({ ...current, key: normalizeModuleKey(current.key) }, { ...incoming, key: normalizeModuleKey(incoming.key) })).sort((a, b) => a.key.localeCompare(b.key));
+    return {
+        schemaVersion: '2.0',
+        updatedAt: latestIso(ours?.updatedAt, theirs?.updatedAt),
+        items: mergedModules,
+    };
+}
+function hydrateModuleMemoryFromIndex(projectRoot, entry) {
+    const moduleKey = normalizeModuleKey(entry.key);
+    if (!moduleKey)
+        return;
+    const existing = loadModuleMemory(projectRoot, moduleKey);
+    if (existing) {
+        saveModuleMemory(projectRoot, {
+            ...existing,
+            moduleKey,
+            title: existing.title || entry.title || moduleKey,
+            summary: existing.summary || entry.summary || '',
+            keywords: uniqueStrings([...(existing.keywords || []), moduleKey, entry.title, ...(entry.keywords || [])]),
+            entryFiles: uniqueStrings([...(existing.entryFiles || []), ...(entry.paths || [])]),
+            relatedPaths: uniqueStrings([...(existing.relatedPaths || []), ...(entry.paths || [])]),
+            updatedAt: latestIso(existing.updatedAt, entry.updatedAt) || existing.updatedAt || entry.updatedAt || new Date().toISOString(),
+        });
+        return;
+    }
+    saveModuleMemory(projectRoot, {
+        schemaVersion: '2.0',
+        moduleKey,
+        title: entry.title || moduleKey,
+        summary: entry.summary || '',
+        keywords: uniqueStrings([moduleKey, entry.title, ...(entry.keywords || [])]),
+        entryFiles: uniqueStrings(entry.paths || []),
+        relatedPaths: uniqueStrings(entry.paths || []),
+        dataFlow: [],
+        decisions: [],
+        constraints: [],
+        pitfalls: [],
+        relatedRules: [],
+        tickets: [],
+        changes: [],
+        updatedAt: entry.updatedAt || new Date().toISOString(),
+    });
+}
+function hydrateMissingModuleMemoriesFromIndex(projectRoot) {
+    const index = loadMemoryIndex(projectRoot);
+    for (const entry of index.items) {
+        hydrateModuleMemoryFromIndex(projectRoot, entry);
+    }
+}
+function mergeModuleMemoryRecord(current, incoming) {
+    const useIncoming = latestIso(current.updatedAt, incoming.updatedAt) === incoming.updatedAt;
+    const mergedTickets = mergeByKey([...current.tickets, ...incoming.tickets], (item) => `${item.ticket || ''}|${item.branch || ''}`, (left, right) => ({
+        ticket: left.ticket || right.ticket,
+        branch: left.branch || right.branch,
+        summary: pickLatestString(left.summary, right.summary, left.updatedAt, right.updatedAt),
+        updatedAt: latestIso(left.updatedAt, right.updatedAt),
+    }));
+    const mergedChanges = mergeByKey([...(current.changes || []), ...(incoming.changes || [])], (item) => item.ticket || item.branch
+        ? `${item.ticket || ''}|${item.branch || ''}`
+        : `${item.title || ''}|${item.summary}`, (left, right) => ({
+        ticket: left.ticket || right.ticket,
+        branch: left.branch || right.branch,
+        title: pickLatestString(left.title, right.title, left.updatedAt, right.updatedAt) || undefined,
+        summary: pickLatestString(left.summary, right.summary, left.updatedAt, right.updatedAt),
+        updatedAt: latestIso(left.updatedAt, right.updatedAt),
+    }));
+    return {
+        schemaVersion: '2.0',
+        moduleKey: current.moduleKey || incoming.moduleKey,
+        title: pickLatestString(current.title, incoming.title, current.updatedAt, incoming.updatedAt),
+        summary: pickLatestString(current.summary, incoming.summary, current.updatedAt, incoming.updatedAt),
+        keywords: uniqueStrings([...current.keywords, ...incoming.keywords]),
+        entryFiles: uniqueStrings([...current.entryFiles, ...incoming.entryFiles]),
+        relatedPaths: uniqueStrings([...current.relatedPaths, ...incoming.relatedPaths]),
+        dataFlow: uniqueStrings([...current.dataFlow, ...incoming.dataFlow]),
+        decisions: uniqueStrings([...current.decisions, ...incoming.decisions]),
+        constraints: uniqueStrings([...current.constraints, ...incoming.constraints]),
+        pitfalls: uniqueStrings([...current.pitfalls, ...incoming.pitfalls]),
+        relatedRules: uniqueStrings([...current.relatedRules, ...incoming.relatedRules]),
+        tickets: mergedTickets,
+        changes: mergedChanges,
+        updatedAt: useIncoming ? incoming.updatedAt : current.updatedAt,
+    };
+}
+function mergeRunContextRecord(current, incoming) {
+    const useIncoming = latestIso(current.updatedAt, incoming.updatedAt) === incoming.updatedAt;
+    return {
+        branch: current.branch || incoming.branch,
+        ticket: pickLatestString(current.ticket, incoming.ticket, current.updatedAt, incoming.updatedAt) || undefined,
+        title: pickLatestString(current.title, incoming.title, current.updatedAt, incoming.updatedAt),
+        summary: pickLatestString(current.summary, incoming.summary, current.updatedAt, incoming.updatedAt),
+        currentPhase: pickLatestString(current.currentPhase, incoming.currentPhase, current.updatedAt, incoming.updatedAt),
+        modules: uniqueStrings([...current.modules, ...incoming.modules]),
+        completed: uniqueStrings([...current.completed, ...incoming.completed]),
+        inProgress: uniqueStrings([...current.inProgress, ...incoming.inProgress]),
+        next: uniqueStrings([...current.next, ...incoming.next]),
+        decisions: uniqueStrings([...current.decisions, ...incoming.decisions]),
+        constraints: uniqueStrings([...current.constraints, ...incoming.constraints]),
+        keyFiles: uniqueStrings([...current.keyFiles, ...incoming.keyFiles]),
+        risks: uniqueStrings([...current.risks, ...incoming.risks]),
+        updatedAt: useIncoming ? incoming.updatedAt : current.updatedAt,
+    };
+}
+function mergeRequirementModule(current, incoming) {
+    return {
+        id: current.id || incoming.id,
+        name: pickLatestString(current.name, incoming.name),
+        description: pickLatestString(current.description, incoming.description),
+        assignee: incoming.assignee || current.assignee,
+    };
+}
+function mergeRequirementPhase(current, incoming) {
+    return {
+        phase: current.phase || incoming.phase,
+        file: current.file || incoming.file,
+        title: pickLatestString(current.title, incoming.title),
+        confirmedAt: latestIso(current.confirmedAt || undefined, incoming.confirmedAt || undefined) || null,
+    };
+}
+function mergeDeveloper(current, incoming) {
+    return {
+        name: current.name || incoming.name,
+        modules: uniqueStrings([...current.modules, ...incoming.modules]),
+        tasks: Math.max(current.tasks, incoming.tasks),
+        completedTasks: Math.max(current.completedTasks, incoming.completedTasks),
+        bugs: Math.max(current.bugs, incoming.bugs),
+        deviations: Math.max(current.deviations, incoming.deviations),
+        linesAdded: Math.max(current.linesAdded, incoming.linesAdded),
+        linesRemoved: Math.max(current.linesRemoved, incoming.linesRemoved),
+        firstPassRate: Math.max(current.firstPassRate, incoming.firstPassRate),
+        actualWorkSeconds: Math.max(current.actualWorkSeconds, incoming.actualWorkSeconds),
+        totalTokens: Math.max(current.totalTokens, incoming.totalTokens),
+    };
+}
+function mergeRequirementRecord(current, incoming) {
+    const developers = mergeByKey([...current.developers, ...incoming.developers], (item) => item.name, mergeDeveloper).sort((a, b) => a.name.localeCompare(b.name));
+    const modules = mergeByKey([...current.modules, ...incoming.modules], (item) => item.id || item.name, mergeRequirementModule);
+    const prdPhases = mergeByKey([...current.prdPhases, ...incoming.prdPhases], (item) => `${item.phase}|${item.file}`, mergeRequirementPhase);
+    const highlights = mergeByKey([...current.highlights, ...incoming.highlights], (item) => `${item.content}|${item.createdAt}`, (left) => left);
+    return {
+        branch: current.branch || incoming.branch,
+        title: pickLatestString(current.title, incoming.title, current.updatedAt, incoming.updatedAt),
+        summary: pickLatestString(current.summary, incoming.summary, current.updatedAt, incoming.updatedAt),
+        prdPhases,
+        modules,
+        highlights,
+        developers,
+        totals: {
+            tasks: developers.reduce((sum, item) => sum + item.tasks, 0),
+            completedTasks: developers.reduce((sum, item) => sum + item.completedTasks, 0),
+            bugs: developers.reduce((sum, item) => sum + item.bugs, 0),
+            deviations: developers.reduce((sum, item) => sum + item.deviations, 0),
+            linesAdded: developers.reduce((sum, item) => sum + item.linesAdded, 0),
+            linesRemoved: developers.reduce((sum, item) => sum + item.linesRemoved, 0),
+            totalTokens: developers.reduce((sum, item) => sum + item.totalTokens, 0),
+        },
+        createdAt: current.createdAt || incoming.createdAt,
+        updatedAt: latestIso(current.updatedAt, incoming.updatedAt),
+    };
+}
+const taskStatusRank = {
+    pending: 0,
+    'in-progress': 1,
+    done: 2,
+};
+function mergeTask(current, incoming) {
+    const currentRank = taskStatusRank[current.status];
+    const incomingRank = taskStatusRank[incoming.status];
+    const preferred = incomingRank >= currentRank ? incoming : current;
+    const other = preferred === incoming ? current : incoming;
+    return {
+        ...preferred,
+        title: pickLatestString(current.title, incoming.title),
+        stageName: pickLatestString(current.stageName, incoming.stageName),
+        prdPhase: pickLatestString(current.prdPhase, incoming.prdPhase),
+        acceptance: pickLatestString(current.acceptance, incoming.acceptance) || undefined,
+        createdAt: current.createdAt || incoming.createdAt,
+        startedAt: latestIso(current.startedAt, incoming.startedAt) || current.startedAt || incoming.startedAt,
+        completedAt: latestIso(current.completedAt || undefined, incoming.completedAt || undefined) || preferred.completedAt || other.completedAt || null,
+        status: currentRank === incomingRank ? preferred.status : (incomingRank > currentRank ? incoming.status : current.status),
+    };
+}
+function mergeBug(current, incoming) {
+    const status = current.status === 'fixed' || incoming.status === 'fixed' ? 'fixed' : 'open';
+    const severityOrder = { low: 0, medium: 1, high: 2, critical: 3 };
+    return {
+        ...current,
+        ...incoming,
+        title: pickLatestString(current.title, incoming.title),
+        severity: severityOrder[current.severity] >= severityOrder[incoming.severity] ? current.severity : incoming.severity,
+        source: current.source || incoming.source,
+        status,
+        files: uniqueStrings([...current.files, ...incoming.files]),
+        fix: pickLatestString(current.fix || undefined, incoming.fix || undefined) || null,
+        taskId: incoming.taskId || current.taskId || null,
+        reportedAt: current.reportedAt || incoming.reportedAt,
+        fixedAt: latestIso(current.fixedAt || undefined, incoming.fixedAt || undefined) || null,
+    };
+}
+function mergeDeviation(current, incoming) {
+    return {
+        ...current,
+        ...incoming,
+        title: pickLatestString(current.title, incoming.title),
+        aiOutput: pickLatestString(current.aiOutput, incoming.aiOutput) || undefined,
+        expectedOutput: pickLatestString(current.expectedOutput, incoming.expectedOutput) || undefined,
+        files: uniqueStrings([...current.files, ...incoming.files]),
+        ruleSedimented: incoming.ruleSedimented ?? current.ruleSedimented,
+        detectedAt: current.detectedAt || incoming.detectedAt,
+        fixedAt: latestIso(current.fixedAt || undefined, incoming.fixedAt || undefined) || null,
+    };
+}
+function mergeReview(current, incoming) {
+    const preferred = latestIso(current.reviewedAt, incoming.reviewedAt) === incoming.reviewedAt ? incoming : current;
+    return {
+        ...preferred,
+        taskId: incoming.taskId || current.taskId || null,
+        scope: pickLatestString(current.scope, incoming.scope),
+        result: preferred.result,
+        issueCount: Math.max(current.issueCount, incoming.issueCount),
+        issues: uniqueStrings([...(current.issues || []), ...(incoming.issues || [])]),
+        reviewedAt: preferred.reviewedAt,
+    };
+}
+function mergeRuleItem(current, incoming) {
+    const preferred = latestIso(current.sedimentedAt || undefined, incoming.sedimentedAt || undefined) === incoming.sedimentedAt ? incoming : current;
+    return {
+        ...preferred,
+        content: pickLatestString(current.content, incoming.content),
+        category: pickLatestString(current.category, incoming.category) || undefined,
+        sourceDeviation: incoming.sourceDeviation || current.sourceDeviation || null,
+        sedimentedAt: latestIso(current.sedimentedAt || undefined, incoming.sedimentedAt || undefined) || null,
+        file: pickLatestString(current.file, incoming.file),
+        status: incoming.status || current.status,
+    };
+}
+function mergeFileItem(current, incoming) {
+    const changeType = current.changeType === incoming.changeType
+        ? current.changeType
+        : (current.changeType === 'deleted' || incoming.changeType === 'deleted' ? 'deleted' : 'modified');
+    return {
+        path: current.path || incoming.path,
+        changeType,
+        linesAdded: Math.max(current.linesAdded, incoming.linesAdded),
+        linesRemoved: Math.max(current.linesRemoved, incoming.linesRemoved),
+        changeCount: Math.max(current.changeCount, incoming.changeCount),
+        lastModified: latestIso(current.lastModified, incoming.lastModified) || undefined,
+    };
+}
+function mergeWorkflow(current, incoming) {
+    const statusRank = {
+        pending: 0,
+        in_progress: 1,
+        completed: 2,
+        failed: 3,
+    };
+    const preferred = statusRank[incoming.status] >= statusRank[current.status] ? incoming : current;
+    return {
+        ...preferred,
+        stage: pickLatestString(current.stage, incoming.stage),
+        prdPhase: pickLatestString(current.prdPhase, incoming.prdPhase) || undefined,
+        startTime: current.startTime || incoming.startTime,
+        endTime: latestIso(current.endTime, incoming.endTime) || undefined,
+    };
+}
+function recalcRunSummary(data) {
+    data.summary.totalTasks = data.tasks.length;
+    data.summary.completedTasks = data.tasks.filter((item) => item.status === 'done').length;
+    data.summary.bugCount = data.bugs.length;
+    data.summary.deviationCount = data.deviations.length;
+    data.summary.reviewCount = data.reviews.length;
+    data.summary.reviewPassCount = data.reviews.filter((item) => item.result === 'pass').length;
+    data.summary.reviewFailCount = data.reviews.filter((item) => item.result === 'fail').length;
+    data.summary.rulesSedimented = data.rules.filter((item) => item.status !== 'pending').length;
+    data.summary.prdPhaseCount = uniqueStrings(data.tasks.map((item) => item.prdPhase)).length;
+    data.summary.filesChanged = data.files.length;
+    data.summary.linesAdded = data.files.reduce((sum, item) => sum + (item.linesAdded || 0), 0);
+    data.summary.linesRemoved = data.files.reduce((sum, item) => sum + (item.linesRemoved || 0), 0);
+}
+function mergeRunDataRecord(currentRaw, incomingRaw) {
+    const current = normalizeRunData(currentRaw);
+    const incoming = normalizeRunData(incomingRaw);
+    const merged = normalizeRunData({
+        ...current,
+        ...incoming,
+        meta: {
+            ...current.meta,
+            ...incoming.meta,
+            schemaVersion: incoming.meta.schemaVersion || current.meta.schemaVersion,
+            branch: current.meta.branch || incoming.meta.branch,
+            developer: current.meta.developer || incoming.meta.developer,
+            project: pickLatestString(current.meta.project, incoming.meta.project),
+            aiModel: pickLatestString(current.meta.aiModel, incoming.meta.aiModel),
+            aiTool: pickLatestString(current.meta.aiTool, incoming.meta.aiTool),
+            startTime: current.meta.startTime || incoming.meta.startTime,
+            endTime: latestIso(current.meta.endTime, incoming.meta.endTime) || undefined,
+            status: pickLatestString(current.meta.status, incoming.meta.status),
+            prdPhases: uniqueStrings([...(current.meta.prdPhases || []), ...(incoming.meta.prdPhases || [])]),
+        },
+        summary: { ...current.summary, ...incoming.summary },
+        metrics: { ...current.metrics, ...incoming.metrics },
+        context: {
+            ...current.context,
+            ...incoming.context,
+            currentStage: pickLatestString(current.context.currentStage, incoming.context.currentStage) || undefined,
+            currentPrdPhase: pickLatestString(current.context.currentPrdPhase, incoming.context.currentPrdPhase) || undefined,
+            currentTaskId: undefined,
+            lastUpdated: latestIso(current.context.lastUpdated, incoming.context.lastUpdated) || undefined,
+        },
+        tasks: mergeByKey([...current.tasks, ...incoming.tasks], (item) => item.taskId, mergeTask),
+        bugs: mergeByKey([...current.bugs, ...incoming.bugs], (item) => item.bugId, mergeBug),
+        deviations: mergeByKey([...current.deviations, ...incoming.deviations], (item) => item.deviationId, mergeDeviation),
+        reviews: mergeByKey([...current.reviews, ...incoming.reviews], (item) => item.reviewId, mergeReview),
+        rules: mergeByKey([...current.rules, ...incoming.rules], (item) => item.ruleId, mergeRuleItem),
+        files: mergeByKey([...current.files, ...incoming.files], (item) => item.path, mergeFileItem),
+        timeline: mergeByKey([...current.timeline, ...incoming.timeline], (item) => `${item.type}|${item.title}|${item.timestamp}`, (left) => left)
+            .sort((a, b) => a.timestamp.localeCompare(b.timestamp)),
+        workflow: mergeByKey([...current.workflow, ...incoming.workflow], (item) => `${item.stage}|${item.prdPhase || ''}`, mergeWorkflow),
+        events: mergeByKey([...current.events, ...incoming.events], (item) => `${item.type}|${item.time}|${JSON.stringify(item.data)}`, (left) => left)
+            .sort((a, b) => a.time.localeCompare(b.time)),
+        cost: {
+            ...current.cost,
+            ...incoming.cost,
+            totalTokens: Math.max(current.cost.totalTokens || 0, incoming.cost.totalTokens || 0),
+            estimatedManualHours: Math.max(current.cost.estimatedManualHours || 0, incoming.cost.estimatedManualHours || 0),
+            actualHours: Math.max(current.cost.actualHours || 0, incoming.cost.actualHours || 0),
+            tokenBreakdown: mergeByKey([...(current.cost.tokenBreakdown || []), ...(incoming.cost.tokenBreakdown || [])], (item) => item.stage, (left, right) => ({ stage: left.stage || right.stage, tokens: Math.max(left.tokens, right.tokens) })),
+            tokenDetail: current.cost.tokenDetail || incoming.cost.tokenDetail
+                ? {
+                    inputTokens: Math.max(current.cost.tokenDetail?.inputTokens || 0, incoming.cost.tokenDetail?.inputTokens || 0),
+                    outputTokens: Math.max(current.cost.tokenDetail?.outputTokens || 0, incoming.cost.tokenDetail?.outputTokens || 0),
+                    cacheCreationTokens: Math.max(current.cost.tokenDetail?.cacheCreationTokens || 0, incoming.cost.tokenDetail?.cacheCreationTokens || 0),
+                    cacheReadTokens: Math.max(current.cost.tokenDetail?.cacheReadTokens || 0, incoming.cost.tokenDetail?.cacheReadTokens || 0),
+                }
+                : undefined,
+        },
+        highlights: mergeByKey([...current.highlights, ...incoming.highlights], (item) => `${item.content}|${item.createdAt}`, (left) => left),
+    });
+    recalcRunSummary(merged);
+    merged.context.currentTaskId = resolveCurrentTaskId(merged.tasks);
+    const activeTask = merged.tasks.find((item) => item.taskId === merged.context.currentTaskId);
+    merged.context.currentStage = activeTask?.stageName;
+    merged.context.currentPrdPhase = activeTask?.prdPhase;
+    recalcMetrics(merged);
+    return merged;
+}
+function mergeConflictFile(filePath, mergeObjects) {
+    if (!fileExists(filePath))
+        return 'missing';
+    const raw = readText(filePath);
+    if (!raw.includes('<<<<<<<') && !raw.includes('>>>>>>>'))
+        return 'no-conflict';
+    const sections = extractConflictSections(raw);
+    if (!sections)
+        return 'error';
+    const ours = parseConflictJsonObject(sections.ours);
+    const theirs = parseConflictJsonObject(sections.theirs);
+    const merged = mergeObjects(ours, theirs);
+    writeJson(filePath, merged);
+    return 'merged';
+}
+function walkJsonTargets(rootDir, targetName) {
+    if (!fileExists(rootDir))
+        return [];
+    const results = [];
+    const stack = [rootDir];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        for (const name of readdirSync(current)) {
+            const fullPath = resolve(current, name);
+            const stat = statSync(fullPath);
+            if (stat.isDirectory())
+                stack.push(fullPath);
+            else if (name === targetName)
+                results.push(fullPath);
+        }
+    }
+    return results.sort();
+}
+function walkMemoryModuleFiles(rootDir) {
+    if (!fileExists(rootDir))
+        return [];
+    const results = [];
+    const stack = [rootDir];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        for (const name of readdirSync(current)) {
+            const fullPath = resolve(current, name);
+            const stat = statSync(fullPath);
+            if (stat.isDirectory())
+                stack.push(fullPath);
+            else if (name.endsWith('.json'))
+                results.push(fullPath);
+        }
+    }
+    return results.sort();
+}
+function mergeFixedFile(filePath, merger, counters) {
+    const status = mergeConflictFile(filePath, merger);
+    if (status === 'merged')
+        counters.merged++;
+    else if (status === 'missing')
+        counters.missing++;
+    else if (status === 'error')
+        counters.errors++;
+}
+function mergeModuleFiles(files, merger) {
+    const counters = { status: 'no-conflict', merged: 0, missing: 0, errors: 0 };
+    for (const filePath of files) {
+        if (!hasConflict(filePath))
+            continue;
+        const status = mergeConflictFile(filePath, (ours, theirs) => merger(ours, theirs));
+        if (status === 'merged')
+            counters.merged++;
+        else if (status === 'error')
+            counters.errors++;
+    }
+    counters.status = counters.errors > 0 ? 'error' : counters.merged > 0 ? 'merged' : 'no-conflict';
+    return counters;
+}
+function mergeRunFiles(files) {
+    const counters = { status: 'no-conflict', merged: 0, missing: 0, errors: 0 };
+    for (const filePath of files) {
+        if (!hasConflict(filePath))
+            continue;
+        const status = mergeConflictFile(filePath, (ours, theirs) => mergeRunDataRecord(ours, theirs));
+        if (status === 'merged')
+            counters.merged++;
+        else if (status === 'error')
+            counters.errors++;
+    }
+    counters.status = counters.errors > 0 ? 'error' : counters.merged > 0 ? 'merged' : 'no-conflict';
+    return counters;
+}
+export function mergeAidaJsonData(projectRoot) {
+    const summary = {
+        memoryIndex: { status: 'missing', merged: 0, missing: 1, errors: 0 },
+        moduleMemories: { status: 'missing', merged: 0, missing: 0, errors: 0 },
+        contexts: { status: 'missing', merged: 0, missing: 0, errors: 0 },
+        requirements: { status: 'missing', merged: 0, missing: 0, errors: 0 },
+        runs: { status: 'missing', merged: 0, missing: 0, errors: 0 },
+        rebuiltMemoryViews: false,
+    };
+    if (!fileExists(configPath(projectRoot)) || !fileExists(aidaDir(projectRoot))) {
+        return summary;
+    }
+    const memoryIndex = memoryIndexPath(projectRoot);
+    if (fileExists(memoryIndex)) {
+        summary.memoryIndex = { status: 'no-conflict', merged: 0, missing: 0, errors: 0 };
+        mergeFixedFile(memoryIndex, mergeMemoryIndex, summary.memoryIndex);
+        summary.memoryIndex.status = summary.memoryIndex.errors > 0 ? 'error' : summary.memoryIndex.merged > 0 ? 'merged' : 'no-conflict';
+    }
+    const moduleFiles = walkMemoryModuleFiles(moduleMemoriesDir(projectRoot));
+    summary.moduleMemories = moduleFiles.length === 0
+        ? { status: 'missing', merged: 0, missing: 0, errors: 0 }
+        : mergeModuleFiles(moduleFiles, mergeModuleMemoryRecord);
+    const contextFiles = walkJsonTargets(runsDir(projectRoot), 'context.json');
+    summary.contexts = { status: contextFiles.length === 0 ? 'missing' : 'no-conflict', merged: 0, missing: 0, errors: 0 };
+    for (const filePath of contextFiles) {
+        const status = mergeConflictFile(filePath, (ours, theirs) => mergeRunContextRecord(ours, theirs));
+        if (status === 'merged')
+            summary.contexts.merged++;
+        else if (status === 'error')
+            summary.contexts.errors++;
+    }
+    if (summary.contexts.status !== 'missing') {
+        summary.contexts.status = summary.contexts.errors > 0 ? 'error' : summary.contexts.merged > 0 ? 'merged' : 'no-conflict';
+    }
+    const requirementFiles = walkJsonTargets(runsDir(projectRoot), 'requirement.json');
+    summary.requirements = { status: requirementFiles.length === 0 ? 'missing' : 'no-conflict', merged: 0, missing: 0, errors: 0 };
+    for (const filePath of requirementFiles) {
+        const status = mergeConflictFile(filePath, (ours, theirs) => mergeRequirementRecord(ours, theirs));
+        if (status === 'merged')
+            summary.requirements.merged++;
+        else if (status === 'error')
+            summary.requirements.errors++;
+    }
+    if (summary.requirements.status !== 'missing') {
+        summary.requirements.status = summary.requirements.errors > 0 ? 'error' : summary.requirements.merged > 0 ? 'merged' : 'no-conflict';
+    }
+    const runFiles = walkJsonTargets(runsDir(projectRoot), 'run.json');
+    summary.runs = runFiles.length === 0 ? { status: 'missing', merged: 0, missing: 0, errors: 0 } : mergeRunFiles(runFiles);
+    const hasAnyMerge = [
+        summary.memoryIndex,
+        summary.moduleMemories,
+        summary.contexts,
+        summary.requirements,
+        summary.runs,
+    ].some((item) => item.status === 'merged');
+    if (hasAnyMerge) {
+        hydrateMissingModuleMemoriesFromIndex(projectRoot);
+        buildMemoryViews(projectRoot);
+        summary.rebuiltMemoryViews = true;
+    }
+    return summary;
+}
+function printLine(label, result) {
+    if (result.status === 'merged') {
+        console.log(`  ${label}: merged, ${result.merged} file(s)`);
+    }
+    else if (result.status === 'no-conflict') {
+        console.log(`  ${label}: no conflict`);
+    }
+    else if (result.status === 'missing') {
+        console.log(`  ${label}: missing`);
+    }
+    else {
+        console.log(`  ${label}: parse error`);
+    }
+}
+export async function mergeData() {
+    const projectRoot = process.cwd();
+    if (!fileExists(configPath(projectRoot))) {
+        console.log(red('\n  AIDA not initialized. Run `npx aida init` first.\n'));
+        return;
+    }
+    const summary = mergeAidaJsonData(projectRoot);
+    const hasError = [
+        summary.memoryIndex,
+        summary.moduleMemories,
+        summary.contexts,
+        summary.requirements,
+        summary.runs,
+    ].some((item) => item.status === 'error');
+    if (hasError) {
+        console.log(red('\n  AIDA data merge finished with parse errors. Resolve the remaining conflicted JSON manually.\n'));
+        return;
+    }
+    const changed = [
+        summary.memoryIndex,
+        summary.moduleMemories,
+        summary.contexts,
+        summary.requirements,
+        summary.runs,
+    ].some((item) => item.status === 'merged');
+    if (!changed) {
+        console.log(yellow('\n  No AIDA JSON conflicts detected.\n'));
+        return;
+    }
+    console.log(green('\n  ✓ AIDA data merge completed\n'));
+    printLine('memory index', summary.memoryIndex);
+    printLine('module memories', summary.moduleMemories);
+    printLine('branch contexts', summary.contexts);
+    printLine('requirements', summary.requirements);
+    printLine('run.json', summary.runs);
+    if (summary.rebuiltMemoryViews)
+        console.log('  memory views: rebuilt');
+    console.log('');
+}
+//# sourceMappingURL=merge-data.js.map

package/dist/cli/commands/merge-data.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"merge-data.js","sourceRoot":"","sources":["../../../src/cli/commands/merge-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACL,UAAU,EACV,QAAQ,EACR,uBAAuB,EACvB,SAAS,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,OAAO,EACP,UAAU,EACV,eAAe,EACf,iBAAiB,EAGjB,OAAO,GACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAgCxG,SAAS,aAAa,CAAC,MAAwC;IAC7D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,GAAG,KAAK,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS;QAClD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,CAAU,EAAE,CAAU;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA2B,EAAE,QAA4B,EAAE,gBAAyB,EAAE,iBAA0B;IACxI,MAAM,YAAY,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,IAAI,CAAC,YAAY;QAAE,OAAO,aAAa,CAAC;IACxC,IAAI,CAAC,aAAa;QAAE,OAAO,YAAY,CAAC;IACxC,OAAO,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,KAAK,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;AAC7G,CAAC;AAED,SAAS,uBAAuB,CAAI,GAAW;IAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAChD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IACnC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,UAAU,CAAI,KAAU,EAAE,KAA0B,EAAE,SAAyC;IACtG,MAAM,GAAG,GAAG,IAAI,GAAG,EAAa,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,eAAe,CAAC,OAA+B,EAAE,QAAgC;IACxF,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,SAAS,CAAC;IAC5F,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;QAChC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC7F,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QACnG,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,KAAK,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;QACjF,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAA8B,EAAE,MAAgC;IACxF,MAAM,aAAa,GAAG,UAAU,CAC9B,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,IAAK,IAAY,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,IAAK,MAAc,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,EAC5G,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EACtC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,eAAe,CACpC,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EACpD,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CACvD,CACF,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7C,OAAO;QACL,aAAa,EAAE,KAAK;QACpB,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC;QACxD,KAAK,EAAE,aAAa;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,WAAmB,EAAE,KAA6B;IACtF,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAC1D,IAAI,QAAQ,EAAE,CAAC;QACb,gBAAgB,CAAC,WAAW,EAAE;YAC5B,GAAG,QAAQ;YACX,SAAS;YACT,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,SAAS;YACjD,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,EAAE;YAChD,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;YAC1G,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;YACnF,YAAY,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;YACvF,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAC/H,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,gBAAgB,CAAC,WAAW,EAAE;QAC5B,aAAa,EAAE,KAAK;QACpB,SAAS;QACT,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,SAAS;QAC/B,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;QAC5B,QAAQ,EAAE,aAAa,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5E,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5C,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9C,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACvD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qCAAqC,CAAC,WAAmB;IAChE,MAAM,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IAC3C,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,4BAA4B,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,OAA2B,EAAE,QAA4B;IACxF,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,SAAS,CAAC;IAC5F,MAAM,aAAa,GAAG,UAAU,CAC9B,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,EACzC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,EACrD,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACnC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACnC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;QACvF,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;KACtD,CAAC,CACH,CAAC;IACF,MAAM,aAAa,GAAG,UAAU,CAC9B,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,EACzD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM;QAClC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE;QAC7C,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,EACzC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACnC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACnC,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS;QAC9F,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;QACvF,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;KACtD,CAAC,CACH,CAAC;IAEF,OAAO;QACL,aAAa,EAAE,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;QAClD,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC7F,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QACnG,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC1E,YAAY,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChF,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,SAAS,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvE,WAAW,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7E,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,YAAY,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChF,OAAO,EAAE,aAAa;QACtB,OAAO,EAAE,aAAa;QACtB,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAyB,EAAE,QAA0B;IAClF,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,SAAS,CAAC;IAC5F,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;QACzC,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS;QAC7G,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC7F,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QACnG,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAClH,OAAO,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjE,SAAS,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvE,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC1E,IAAI,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxD,SAAS,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvE,WAAW,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7E,QAAQ,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,KAAK,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3D,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,OAA0B,EAAE,QAA2B;IACrF,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE;QAC7B,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;QACnD,WAAW,EAAE,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC;QACxE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ;KAChD,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAA4B,EAAE,QAA6B;IACxF,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK;QACtC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;QACnC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW,IAAI,SAAS,EAAE,QAAQ,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,IAAI;KACpG,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAAyB,EAAE,QAA0B;IAC3E,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;QACnC,OAAO,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QAC9C,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC;QACzE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;QAC3C,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC7D,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC7D,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;QACnE,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC;QACtE,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,CAAC;QAClF,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAwB,EAAE,QAAyB;IACjF,MAAM,UAAU,GAAG,UAAU,CAC3B,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,EAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EACnB,cAAc,CACf,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,UAAU,CACxB,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,EACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAC9B,sBAAsB,CACvB,CAAC;IAEF,MAAM,SAAS,GAAG,UAAU,CAC1B,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,EAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,EACtC,qBAAqB,CACtB,CAAC;IAEF,MAAM,UAAU,GAAG,UAAU,CAC3B,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,EAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,EAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;IAEF,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;QACzC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC7F,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QACnG,SAAS;QACT,OAAO;QACP,UAAU;QACV,UAAU;QACV,MAAM,EAAE;YACN,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5D,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YAC9E,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YACtE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YACtE,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAC1E,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;SACzE;QACD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;QAClD,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,cAAc,GAAuC;IACzD,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,IAAI,EAAE,CAAC;CACR,CAAC;AAEF,SAAS,SAAS,CAAC,OAAiB,EAAE,QAAkB;IACtD,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,YAAY,IAAI,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IACnE,MAAM,KAAK,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC1D,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;QAClE,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAC/D,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,SAAS;QAClF,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;QAClD,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;QACtG,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW,IAAI,SAAS,EAAE,QAAQ,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,SAAS,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,IAAI;QACjJ,MAAM,EAAE,WAAW,KAAK,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;KAC1H,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,OAAgB,EAAE,QAAiB;IACnD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5F,MAAM,aAAa,GAAwC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACvG,OAAO;QACL,GAAG,OAAO;QACV,GAAG,QAAQ;QACX,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ;QACpH,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;QACzC,MAAM;QACN,KAAK,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,IAAI,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,IAAI;QAClF,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI;QACjD,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU;QACrD,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,IAAI;KACxF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAAsB,EAAE,QAAuB;IACrE,OAAO;QACL,GAAG,OAAO;QACV,GAAG,QAAQ;QACX,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS;QAC5E,cAAc,EAAE,gBAAgB,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,IAAI,SAAS;QAC9F,KAAK,EAAE,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3D,cAAc,EAAE,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc;QACjE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU;QACrD,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,IAAI;KACxF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,OAAmB,EAAE,QAAoB;IAC5D,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAClH,OAAO;QACL,GAAG,SAAS;QACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI;QACjD,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC7D,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,UAAU,EAAE,SAAS,CAAC,UAAU;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAiB,EAAE,QAAkB;IAC1D,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE,QAAQ,CAAC,YAAY,IAAI,SAAS,CAAC,KAAK,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAClJ,OAAO;QACL,GAAG,SAAS;QACZ,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;QAC5D,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS;QAC5E,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,IAAI,IAAI;QAC5E,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE,QAAQ,CAAC,YAAY,IAAI,SAAS,CAAC,IAAI,IAAI;QACtG,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;QACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;KAC1C,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAiB,EAAE,QAAkB;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU;QAC3D,CAAC,CAAC,OAAO,CAAC,UAAU;QACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACrG,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;QACnC,UAAU;QACV,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC7D,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;QACnE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC;QAChE,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,SAAS;KAClF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAsB,EAAE,QAAuB;IACpE,MAAM,UAAU,GAA4C;QAC1D,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC;KACV,CAAC;IACF,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IACjG,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtD,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS;QAC5E,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;QAClD,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,SAAS;KACnE,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAa;IACrC,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC5C,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IACzF,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACrD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/C,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAC5F,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAC5F,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC;IAC7F,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3F,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5F,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAmB,EAAE,WAAoB;IACnE,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,gBAAgB,CAAC;QAC9B,GAAG,OAAO;QACV,GAAG,QAAQ;QACX,IAAI,EAAE;YACJ,GAAG,OAAO,CAAC,IAAI;YACf,GAAG,QAAQ,CAAC,IAAI;YAChB,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa;YACxE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM;YACnD,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS;YAC5D,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YACtE,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YACtE,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACnE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS;YAC5D,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS;YAC5E,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACnE,SAAS,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;SAClG;QACD,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE;QACpD,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE;QACpD,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,OAAO;YAClB,GAAG,QAAQ,CAAC,OAAO;YACnB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,YAAkC,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAkC,CAAC,IAAI,SAAS;YACpJ,eAAe,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,eAAqC,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAqC,CAAC,IAAI,SAAS;YAC7J,aAAa,EAAE,SAAS;YACxB,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,WAAiC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAiC,CAAC,IAAI,SAAS;SAC3I;QACD,KAAK,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC;QAC1F,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;QACrF,UAAU,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC;QACnH,OAAO,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;QACpG,KAAK,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC;QAC9F,KAAK,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QAC5F,QAAQ,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;aACxI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACzD,QAAQ,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,aAAa,CAAC;QAClI,MAAM,EAAE,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;aAC5I,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,EAAE;YACJ,GAAG,OAAO,CAAC,IAAI;YACf,GAAG,QAAQ,CAAC,IAAI;YAChB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;YACpF,oBAAoB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC;YAC/G,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;YACpF,cAAc,EAAE,UAAU,CACxB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,EACjF,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EACpB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CACrG;YACD,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW;gBAChE,CAAC,CAAC;oBACA,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,IAAI,CAAC,CAAC;oBAC9G,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,IAAI,CAAC,CAAC;oBACjH,mBAAmB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,IAAI,CAAC,CAAC;oBACtI,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,CAAC;iBAC3H;gBACD,CAAC,CAAC,SAAS;SACd;QACD,UAAU,EAAE,UAAU,CAAgB,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;KACtJ,CAAC,CAAC;IAEH,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7F,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,EAAE,SAAS,CAAC;IACpD,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,EAAE,QAAQ,CAAC;IACtD,aAAa,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAgB,EAChB,YAAqD;IAErD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,aAAa,CAAC;IAC/E,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,QAAQ;QAAE,OAAO,OAAO,CAAC;IAC9B,MAAM,IAAI,GAAG,uBAAuB,CAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,uBAAuB,CAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,UAAkB;IAC1D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACxB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,WAAW,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBACxC,IAAI,IAAI,KAAK,UAAU;gBAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACxB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,WAAW,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,cAAc,CAAI,QAAgB,EAAE,MAA+C,EAAE,QAA0B;IACtH,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,IAAI,MAAM,KAAK,QAAQ;QAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;SACtC,IAAI,MAAM,KAAK,SAAS;QAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC7C,IAAI,MAAM,KAAK,OAAO;QAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAe,EAAE,MAAoF;IAC7H,MAAM,QAAQ,GAAqB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC/F,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;YAAE,SAAS;QACrC,MAAM,MAAM,GAAG,iBAAiB,CAC9B,QAAQ,EACR,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAA0B,EAAE,MAA4B,CAAC,CACnF,CAAC;QACF,IAAI,MAAM,KAAK,QAAQ;YAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;aACtC,IAAI,MAAM,KAAK,OAAO;YAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACjD,CAAC;IACD,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;IACjG,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAe;IACpC,MAAM,QAAQ,GAAqB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC/F,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;YAAE,SAAS;QACrC,MAAM,MAAM,GAAG,iBAAiB,CAAU,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAe,EAAE,MAAiB,CAAC,CAAC,CAAC;QAC9H,IAAI,MAAM,KAAK,QAAQ;YAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;aACtC,IAAI,MAAM,KAAK,OAAO;YAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACjD,CAAC;IACD,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;IACjG,OAAO,QAAQ,CAAC;AAClB,CAAC;AAWD,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,MAAM,OAAO,GAAqB;QAChC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QACpE,cAAc,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QACvE,QAAQ,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QACjE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QACrE,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QAC7D,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IAEF,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IACjD,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,WAAW,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAClF,cAAc,CAAoB,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACtF,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;IACpI,CAAC;IAED,MAAM,WAAW,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,cAAc,GAAG,WAAW,CAAC,MAAM,KAAK,CAAC;QAC/C,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QACzD,CAAC,CAAC,gBAAgB,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,cAAc,CAAC,CAAC;IAC3E,OAAO,CAAC,QAAQ,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IACvH,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,iBAAiB,CAAmB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAwB,EAAE,MAA0B,CAAC,CAAC,CAAC;QAC5J,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC9C,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzD,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;IAC3H,CAAC;IAED,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACnF,OAAO,CAAC,YAAY,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC/H,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,iBAAiB,CAAkB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAuB,EAAE,MAAyB,CAAC,CAAC,CAAC;QAC1J,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;aAClD,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IACD,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;IACvI,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC;IACnE,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEzH,MAAM,WAAW,GAAG;QAClB,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,QAAQ;QAChB,OAAO,CAAC,YAAY;QACpB,OAAO,CAAC,IAAI;KACb,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;IAE3C,IAAI,WAAW,EAAE,CAAC;QAChB,qCAAqC,CAAC,WAAW,CAAC,CAAC;QACnD,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAwB;IACxD,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,aAAa,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;IAC9D,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAElC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG;QACf,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,QAAQ;QAChB,OAAO,CAAC,YAAY;QACpB,OAAO,CAAC,IAAI;KACb,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC;IAC1C,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,mGAAmG,CAAC,CAAC,CAAC;QACtH,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG;QACd,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,QAAQ;QAChB,OAAO,CAAC,YAAY;QACpB,OAAO,CAAC,IAAI;KACb,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;IAE3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAC9D,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC;IACxD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/C,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACrD,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/C,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,OAAO,CAAC,kBAAkB;QAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}

package/dist/cli/commands/merge.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export declare function merge(): Promise<void>;
2	+ //# sourceMappingURL=merge.d.ts.map

package/dist/cli/commands/merge.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/merge.ts"],"names":[],"mappings":"AAkBA,wBAAsB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAoE3C"}

package/dist/cli/commands/merge.js ADDED Viewed

@@ -0,0 +1,82 @@
+import { green, red, yellow } from '../../utils/display.js';
+import { configPath } from '../../utils/paths.js';
+import { fileExists } from '../../utils/fs.js';
+import { buildProjectArtifacts } from '../../utils/ai-build.js';
+import { mergeRuleRegistry } from '../../utils/rules.js';
+import { mergeSkillRegistry } from '../../utils/skills.js';
+import { mergeAidaJsonData } from './merge-data.js';
+function printDataLine(lines, label, result) {
+    if (result.status === 'merged') {
+        lines.push(`  ${label}: merged, ${result.merged} file(s)`);
+    }
+    else if (result.status === 'no-conflict') {
+        lines.push(`  ${label}: no conflict`);
+    }
+    else if (result.status === 'missing') {
+        lines.push(`  ${label}: missing`);
+    }
+}
+export async function merge() {
+    const projectRoot = process.cwd();
+    if (!fileExists(configPath(projectRoot))) {
+        console.log(red('\n  AIDA not initialized. Run `npx aida init` first.\n'));
+        return;
+    }
+    const rules = mergeRuleRegistry(projectRoot);
+    const skills = mergeSkillRegistry(projectRoot);
+    const data = mergeAidaJsonData(projectRoot);
+    const dataHasError = [
+        data.memoryIndex,
+        data.moduleMemories,
+        data.contexts,
+        data.requirements,
+        data.runs,
+    ].some((item) => item.status === 'error');
+    if (rules.status === 'error' || skills.status === 'error' || dataHasError) {
+        console.log(red('\n  Merge finished with parse errors. Resolve the remaining conflicted file manually.\n'));
+        return;
+    }
+    const lines = [];
+    if (rules.status === 'merged') {
+        lines.push(`  rules.json: merged, ${rules.total} total (${rules.added} new)`);
+    }
+    else if (rules.status === 'no-conflict') {
+        lines.push('  rules.json: no conflict');
+    }
+    else if (rules.status === 'missing') {
+        lines.push('  rules.json: missing');
+    }
+    if (skills.status === 'merged') {
+        lines.push(`  skills.json: merged, ${skills.total} total (${skills.added} new)`);
+    }
+    else if (skills.status === 'no-conflict') {
+        lines.push('  skills.json: no conflict');
+    }
+    else if (skills.status === 'missing') {
+        lines.push('  skills.json: missing');
+    }
+    printDataLine(lines, 'memory index', data.memoryIndex);
+    printDataLine(lines, 'module memories', data.moduleMemories);
+    printDataLine(lines, 'branch contexts', data.contexts);
+    printDataLine(lines, 'requirements', data.requirements);
+    printDataLine(lines, 'run.json', data.runs);
+    const changed = rules.status === 'merged'
+        || skills.status === 'merged'
+        || data.memoryIndex.status === 'merged'
+        || data.moduleMemories.status === 'merged'
+        || data.contexts.status === 'merged'
+        || data.requirements.status === 'merged'
+        || data.runs.status === 'merged';
+    if (!changed) {
+        console.log(yellow('\n  No AIDA conflicts detected.\n'));
+        return;
+    }
+    if (rules.status === 'merged' || skills.status === 'merged') {
+        buildProjectArtifacts(projectRoot, [], { skipMcpConfig: true });
+    }
+    console.log(green('\n  ✓ AIDA merge completed\n'));
+    for (const line of lines)
+        console.log(line);
+    console.log('');
+}
+//# sourceMappingURL=merge.js.map

package/dist/cli/commands/merge.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/cli/commands/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,SAAS,aAAa,CAAC,KAAe,EAAE,KAAa,EAAE,MAA0C;IAC/F,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,aAAa,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAElC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAE5C,MAAM,YAAY,GAAG;QACnB,IAAI,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,YAAY;QACjB,IAAI,CAAC,IAAI;KACV,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC;IAE1C,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,IAAI,YAAY,EAAE,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,yFAAyF,CAAC,CAAC,CAAC;QAC5G,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,yBAAyB,KAAK,CAAC,KAAK,WAAW,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,KAAK,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC1C,CAAC;SAAM,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,0BAA0B,MAAM,CAAC,KAAK,WAAW,MAAM,CAAC,KAAK,OAAO,CAAC,CAAC;IACnF,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAC3C,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACvC,CAAC;IAED,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,aAAa,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7D,aAAa,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvD,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACxD,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,KAAK,QAAQ;WACpC,MAAM,CAAC,MAAM,KAAK,QAAQ;WAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,QAAQ;WACpC,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,QAAQ;WACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ;WACjC,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,QAAQ;WACrC,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAmC,CAAC,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC5D,qBAAqB,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACnD,KAAK,MAAM,IAAI,IAAI,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}

package/dist/cli/index.js CHANGED Viewed

@@ -60,6 +60,11 @@ async function main() {
             await skills();
             break;
         }
+        case 'merge': {
+            const { merge } = await import('./commands/merge.js');
+            await merge();
+            break;
+        }
         case 'mcp': {
             const { startMcpServer } = await import('../mcp/server.js');
             startMcpServer();
@@ -74,6 +79,7 @@ async function main() {
     aida mcp         Start MCP server (stdio mode, for AI tools)
     aida sync        Rebuild memory views and AI-tool artifacts from truth sources
     aida doctor      Inspect and normalize 2.0 JSON truth sources
+    aida merge       Resolve git merge conflicts in AIDA JSON files
     aida memory      Manage branch context and module memory
     aida rules       Manage project rules registry
     aida skills      Manage project skills registry

package/dist/cli/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAExB,SAAS,UAAU;IACjB,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG;QACjB,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC;QACxC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC;KAC5C,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;YACzD,IAAI,GAAG,CAAC,OAAO;gBAAE,OAAO,GAAG,CAAC,OAAO,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC;YACP,sBAAsB;QACxB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,SAAS,UAAU,EAAE,EAAE,CAAC,CAAC;YACrC,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACpD,MAAM,IAAI,EAAE,CAAC;YACb,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACpD,MAAM,IAAI,EAAE,CAAC;YACb,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACxD,MAAM,MAAM,EAAE,CAAC;YACf,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACxD,MAAM,MAAM,EAAE,CAAC;YACf,MAAM;QACR,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACtD,MAAM,KAAK,EAAE,CAAC;YACd,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACxD,MAAM,MAAM,EAAE,CAAC;YACf,MAAM;QACR,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAC5D,cAAc,EAAE,CAAC;YACjB,OAAO,CAAC,kDAAkD;QAC5D,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,OAAO,CAAC,GAAG,CAAC;UACR,UAAU,EAAE~~;;;;;;;;;;;CAWrB~~,CAAC,CAAC;QACC,CAAC;IACH,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ai-dev-analytics",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "AIDA 2.0 - AI asset truth-source management for rules, skills, memories, and summaries",
   "type": "module",
   "bin": {