opkg 0.9.0 → 0.9.2

package/packages/core/dist/core/save/save-merge-extractor.d.ts

@@ -0,0 +1,61 @@
+/**
+ * Save Merge Extractor Module
+ *
+ * Provides utilities to extract package-specific contributions from merged files.
+ * This enables proper parity checking for files that were merged during installation.
+ *
+ * Key responsibilities:
+ * - Extract only the keys contributed by the package from merged JSON/YAML files
+ * - Support deep and shallow merge strategies
+ * - Handle composite merges (marker-based)
+ * - Enable accurate comparison between workspace and source for merged files
+ *
+ * @module save-merge-extractor
+ */
+import type { SaveCandidate } from './save-types.js';
+/**
+ * Extract result with extracted content and hash
+ */
+export interface ExtractResult {
+    success: boolean;
+    extractedContent?: string;
+    extractedHash?: string;
+    error?: string;
+}
+/**
+ * Extract package-specific contribution from a merged workspace file
+ *
+ * This function reverses the merge operation that occurred during installation,
+ * extracting only the keys/content that were contributed by the package.
+ *
+ * For deep/shallow merges:
+ * - Parses workspace file as JSON
+ * - Extracts only the keys specified in mergeKeys
+ * - Normalizes keys to extract at the appropriate level
+ * - Returns serialized JSON of just those keys
+ *
+ * For composite merges:
+ * - Not yet implemented (returns error)
+ * - Would need to extract content between package markers
+ *
+ * **Key Normalization**: The workspace index may track leaf keys like
+ * `mcp.github.type`, `mcp.github.url`, but we need to extract at the
+ * parent level `mcp.github`. This function automatically finds the
+ * common parent key to extract.
+ *
+ * @param candidate - Workspace candidate with merge metadata
+ * @returns Extract result with extracted content and hash
+ */
+export declare function extractPackageContribution(candidate: SaveCandidate): Promise<ExtractResult>;
+/**
+ * Extract content by merge keys from raw JSON content (non-candidate)
+ *
+ * Used to compare a workspace merged contribution to the corresponding
+ * subset of the local source content.
+ *
+ * @param content - JSON content string
+ * @param mergeKeys - Dot-notation keys to extract
+ * @returns Extract result with extracted content and hash
+ */
+export declare function extractContentByKeys(content: string, mergeKeys: string[]): Promise<ExtractResult>;
+//# sourceMappingURL=save-merge-extractor.d.ts.map

package/packages/core/dist/core/save/save-merge-extractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-merge-extractor.d.ts","sourceRoot":"","sources":["../../../src/core/save/save-merge-extractor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,aAAa,CAAC,CAoDxB;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,aAAa,CAAC,CAUxB"}

package/packages/core/dist/core/save/save-merge-extractor.js

@@ -0,0 +1,272 @@
+/**
+ * Save Merge Extractor Module
+ *
+ * Provides utilities to extract package-specific contributions from merged files.
+ * This enables proper parity checking for files that were merged during installation.
+ *
+ * Key responsibilities:
+ * - Extract only the keys contributed by the package from merged JSON/YAML files
+ * - Support deep and shallow merge strategies
+ * - Handle composite merges (marker-based)
+ * - Enable accurate comparison between workspace and source for merged files
+ *
+ * @module save-merge-extractor
+ */
+import { logger } from '../../utils/logger.js';
+import { calculateFileHash } from '../../utils/hash-utils.js';
+/**
+ * Extract package-specific contribution from a merged workspace file
+ *
+ * This function reverses the merge operation that occurred during installation,
+ * extracting only the keys/content that were contributed by the package.
+ *
+ * For deep/shallow merges:
+ * - Parses workspace file as JSON
+ * - Extracts only the keys specified in mergeKeys
+ * - Normalizes keys to extract at the appropriate level
+ * - Returns serialized JSON of just those keys
+ *
+ * For composite merges:
+ * - Not yet implemented (returns error)
+ * - Would need to extract content between package markers
+ *
+ * **Key Normalization**: The workspace index may track leaf keys like
+ * `mcp.github.type`, `mcp.github.url`, but we need to extract at the
+ * parent level `mcp.github`. This function automatically finds the
+ * common parent key to extract.
+ *
+ * @param candidate - Workspace candidate with merge metadata
+ * @returns Extract result with extracted content and hash
+ */
+export async function extractPackageContribution(candidate) {
+    // Only applicable to workspace candidates with merge metadata
+    if (candidate.source !== 'workspace') {
+        return {
+            success: false,
+            error: 'Extract only applies to workspace candidates'
+        };
+    }
+    if (!candidate.mergeStrategy || !candidate.mergeKeys || candidate.mergeKeys.length === 0) {
+        return {
+            success: false,
+            error: 'No merge metadata present'
+        };
+    }
+    const { mergeStrategy, mergeKeys, content } = candidate;
+    try {
+        switch (mergeStrategy) {
+            case 'deep':
+            case 'shallow':
+                // Normalize keys to find the common parent
+                const normalizedKeys = normalizeKeysToParent(mergeKeys);
+                return await extractFromJsonMerge(content, normalizedKeys);
+            case 'composite':
+                return {
+                    success: false,
+                    error: 'Composite merge extraction not yet implemented'
+                };
+            case 'replace':
+                // Replace strategy doesn't merge, so extraction not applicable
+                return {
+                    success: false,
+                    error: 'Replace strategy does not require extraction'
+                };
+            default:
+                return {
+                    success: false,
+                    error: `Unknown merge strategy: ${mergeStrategy}`
+                };
+        }
+    }
+    catch (error) {
+        logger.debug(`Failed to extract package contribution: ${error}`);
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error)
+        };
+    }
+}
+/**
+ * Extract content by merge keys from raw JSON content (non-candidate)
+ *
+ * Used to compare a workspace merged contribution to the corresponding
+ * subset of the local source content.
+ *
+ * @param content - JSON content string
+ * @param mergeKeys - Dot-notation keys to extract
+ * @returns Extract result with extracted content and hash
+ */
+export async function extractContentByKeys(content, mergeKeys) {
+    try {
+        const normalizedKeys = normalizeKeysToParent(mergeKeys);
+        return await extractFromJsonMerge(content, normalizedKeys);
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error)
+        };
+    }
+}
+/**
+ * Normalize tracked keys to find the common parent keys to extract
+ *
+ * During installation, the flow may track all leaf keys that were added:
+ * - `mcpServers.github.type`
+ * - `mcpServers.github.url`
+ * - `mcpServers.github.headers.Authorization`
+ *
+ * But for extraction, we want to extract at the parent level: `mcpServers.github`
+ *
+ * However, if keys are already at the parent level (e.g., `mcp.github`, `mcp.gitlab`),
+ * we should use them as-is without further normalization.
+ *
+ * Algorithm:
+ * 1. If all keys are already 2 levels deep or less, use them as-is
+ * 2. Otherwise, find the longest common prefix and extract unique parent keys
+ * 3. For leaf keys like `mcp.github.type`, `mcp.github.url`, extract `mcp.github`
+ *
+ * @param keys - Array of tracked keys (may be leaf keys)
+ * @returns Array of normalized parent keys to extract
+ */
+function normalizeKeysToParent(keys) {
+    if (keys.length === 0)
+        return [];
+    // Check if all keys are already at parent level (2 segments or less)
+    const allAtParentLevel = keys.every(key => key.split('.').length <= 2);
+    if (allAtParentLevel) {
+        // Keys are already at the right level - use them as-is
+        logger.debug(`Keys already at parent level - using as-is`, { keys });
+        return keys;
+    }
+    if (keys.length === 1) {
+        // Single key - extract first 2 levels if possible
+        const parts = keys[0].split('.');
+        if (parts.length >= 2) {
+            return [parts.slice(0, 2).join('.')];
+        }
+        return keys;
+    }
+    // Find the longest common prefix
+    const firstParts = keys[0].split('.');
+    let commonDepth = 0;
+    for (let depth = 0; depth < firstParts.length; depth++) {
+        const segment = firstParts[depth];
+        const allMatch = keys.every(key => {
+            const parts = key.split('.');
+            return parts.length > depth && parts[depth] === segment;
+        });
+        if (allMatch) {
+            commonDepth = depth + 1;
+        }
+        else {
+            break;
+        }
+    }
+    // Extract unique parent keys at the appropriate depth
+    // For leaf keys, extract at 2 levels (or common depth if deeper)
+    const normalized = new Set();
+    for (const key of keys) {
+        const parts = key.split('.');
+        // Use minimum of 2 levels or common depth + 1 (one level after common)
+        const targetDepth = Math.max(2, commonDepth + 1);
+        const extractDepth = Math.min(targetDepth, parts.length);
+        if (extractDepth >= 2) {
+            normalized.add(parts.slice(0, extractDepth).join('.'));
+        }
+        else if (parts.length > 0) {
+            // Fallback: use the key as-is
+            normalized.add(key);
+        }
+    }
+    const result = Array.from(normalized);
+    logger.debug(`Normalized ${keys.length} tracked keys to ${result.length} extraction key(s)`, { original: keys, normalized: result });
+    return result;
+}
+/**
+ * Extract specific keys from a JSON-merged file
+ *
+ * Given a JSON file that was merged during installation, extract only
+ * the keys that were contributed by the package.
+ *
+ * The mergeKeys use dot notation to specify nested keys:
+ * - "mcp.github" means extract data.mcp.github
+ * - "mcp.server1" means extract data.mcp.server1
+ * - etc.
+ *
+ * @param content - Full merged file content (JSON string)
+ * @param mergeKeys - Array of dot-notation keys to extract
+ * @returns Extract result with extracted content
+ */
+async function extractFromJsonMerge(content, mergeKeys) {
+    try {
+        // Parse the merged content
+        const merged = JSON.parse(content);
+        // Build an object containing only the package's keys
+        const extracted = {};
+        for (const keyPath of mergeKeys) {
+            const value = getNestedValue(merged, keyPath);
+            if (value !== undefined) {
+                setNestedValue(extracted, keyPath, value);
+            }
+        }
+        // Serialize the extracted content
+        // Use same formatting as JSON.stringify with 2-space indent to match
+        // how files are typically formatted
+        const extractedContent = JSON.stringify(extracted, null, 2) + '\n';
+        const extractedHash = await calculateFileHash(extractedContent);
+        logger.debug(`Extracted ${mergeKeys.length} key(s) from merged file`, { keys: mergeKeys });
+        return {
+            success: true,
+            extractedContent,
+            extractedHash
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error)
+        };
+    }
+}
+/**
+ * Get nested value from object using dot notation
+ *
+ * @param obj - Object to traverse
+ * @param keyPath - Dot-notation key path (e.g., "mcp.github")
+ * @returns Value at the path, or undefined if not found
+ */
+function getNestedValue(obj, keyPath) {
+    const keys = keyPath.split('.');
+    let current = obj;
+    for (const key of keys) {
+        if (current === null || current === undefined || typeof current !== 'object') {
+            return undefined;
+        }
+        current = current[key];
+    }
+    return current;
+}
+/**
+ * Set nested value in object using dot notation
+ *
+ * Creates intermediate objects as needed.
+ *
+ * @param obj - Object to modify
+ * @param keyPath - Dot-notation key path (e.g., "mcp.github")
+ * @param value - Value to set
+ */
+function setNestedValue(obj, keyPath, value) {
+    const keys = keyPath.split('.');
+    let current = obj;
+    for (let i = 0; i < keys.length - 1; i++) {
+        const key = keys[i];
+        if (!(key in current) || typeof current[key] !== 'object') {
+            current[key] = {};
+        }
+        current = current[key];
+    }
+    const lastKey = keys[keys.length - 1];
+    current[lastKey] = value;
+}
+//# sourceMappingURL=save-merge-extractor.js.map

package/packages/core/dist/core/save/save-merge-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-merge-extractor.js","sourceRoot":"","sources":["../../../src/core/save/save-merge-extractor.ts"],"names":[],"mappings":"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"}

package/packages/core/dist/core/save/save-platform-handler.d.ts

@@ -0,0 +1,51 @@
+import type { SaveCandidateGroup } from './save-types.js';
+/**
+ * Platform-specific candidate management
+ *
+ * This module handles the lifecycle of platform-specific candidates in the save pipeline.
+ * Primary responsibility: prune workspace candidates that would conflict with existing
+ * platform-specific files in the package source.
+ *
+ * @module save-platform-handler
+ */
+/**
+ * Prune workspace candidates that have existing platform files in source
+ *
+ * This function removes workspace candidates from groups when a platform-specific
+ * file already exists in the source. This prevents prompting the user to save
+ * content that would overwrite an existing platform file.
+ *
+ * **Rationale**: If a platform-specific file like `.cursor/tools/search.md` exists
+ * in the source, and the workspace has `.cursor/tools/search.md` with different
+ * content, we should not prompt to save it. The existing platform file takes precedence.
+ *
+ * **Example**:
+ * ```
+ * Before pruning:
+ *   Group { registryPath: "tools/calc.md",
+ *     local: { hash: "aaa" },
+ *     workspace: [
+ *       { platform: "cursor", hash: "bbb" },
+ *       { platform: "claude", hash: "ccc" }
+ *     ]
+ *   }
+ *
+ * Source structure:
+ *   tools/calc.md (universal)
+ *   .cursor/tools/calc.md (exists!)
+ *
+ * After pruning:
+ *   Group { registryPath: "tools/calc.md",
+ *     workspace: [
+ *       { platform: "claude", hash: "ccc" }  // cursor pruned
+ *     ]
+ *   }
+ * ```
+ *
+ * @param packageRoot - Absolute path to the package source directory
+ * @param groups - Array of candidate groups (mutated in-place)
+ *
+ * @mutates groups - Modifies workspace array in each group
+ */
+export declare function pruneExistingPlatformCandidates(packageRoot: string, groups: SaveCandidateGroup[]): Promise<void>;
+//# sourceMappingURL=save-platform-handler.d.ts.map

package/packages/core/dist/core/save/save-platform-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-platform-handler.d.ts","sourceRoot":"","sources":["../../../src/core/save/save-platform-handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAiB,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,kBAAkB,EAAE,GAC3B,OAAO,CAAC,IAAI,CAAC,CAqDf"}

package/packages/core/dist/core/save/save-platform-handler.js

@@ -0,0 +1,93 @@
+import { join } from 'path';
+import { exists } from '../../utils/fs.js';
+import { createPlatformSpecificRegistryPath } from '../platform/platform-specific-paths.js';
+import { logger } from '../../utils/logger.js';
+/**
+ * Platform-specific candidate management
+ *
+ * This module handles the lifecycle of platform-specific candidates in the save pipeline.
+ * Primary responsibility: prune workspace candidates that would conflict with existing
+ * platform-specific files in the package source.
+ *
+ * @module save-platform-handler
+ */
+/**
+ * Prune workspace candidates that have existing platform files in source
+ *
+ * This function removes workspace candidates from groups when a platform-specific
+ * file already exists in the source. This prevents prompting the user to save
+ * content that would overwrite an existing platform file.
+ *
+ * **Rationale**: If a platform-specific file like `.cursor/tools/search.md` exists
+ * in the source, and the workspace has `.cursor/tools/search.md` with different
+ * content, we should not prompt to save it. The existing platform file takes precedence.
+ *
+ * **Example**:
+ * ```
+ * Before pruning:
+ *   Group { registryPath: "tools/calc.md",
+ *     local: { hash: "aaa" },
+ *     workspace: [
+ *       { platform: "cursor", hash: "bbb" },
+ *       { platform: "claude", hash: "ccc" }
+ *     ]
+ *   }
+ *
+ * Source structure:
+ *   tools/calc.md (universal)
+ *   .cursor/tools/calc.md (exists!)
+ *
+ * After pruning:
+ *   Group { registryPath: "tools/calc.md",
+ *     workspace: [
+ *       { platform: "claude", hash: "ccc" }  // cursor pruned
+ *     ]
+ *   }
+ * ```
+ *
+ * @param packageRoot - Absolute path to the package source directory
+ * @param groups - Array of candidate groups (mutated in-place)
+ *
+ * @mutates groups - Modifies workspace array in each group
+ */
+export async function pruneExistingPlatformCandidates(packageRoot, groups) {
+    for (const group of groups) {
+        // No local file means no platform files could exist yet
+        // Skip pruning for new files
+        if (!group.local && !group.localRef) {
+            continue;
+        }
+        const filtered = [];
+        for (const candidate of group.workspace) {
+            const platform = candidate.platform;
+            // Keep non-platform candidates (universal files)
+            // 'ai' is treated as universal, not platform-specific
+            if (!platform || platform === 'ai') {
+                filtered.push(candidate);
+                continue;
+            }
+            // Construct platform-specific registry path
+            // e.g., "tools/search.md" + "cursor" -> ".cursor/tools/search.cursor.md"
+            const platformPath = createPlatformSpecificRegistryPath(group.registryPath, platform);
+            // If platform doesn't support this file type, keep candidate
+            if (!platformPath) {
+                filtered.push(candidate);
+                continue;
+            }
+            // Check if platform-specific file exists in source
+            const platformFullPath = join(packageRoot, platformPath);
+            const hasPlatformFile = await exists(platformFullPath);
+            if (hasPlatformFile) {
+                // Platform file exists - prune this candidate
+                logger.debug(`Pruning workspace candidate ${candidate.displayPath} for ${group.registryPath} ` +
+                    `(platform file ${platformPath} exists in source)`);
+                continue; // Don't add to filtered array
+            }
+            // No existing platform file - keep candidate for potential save
+            filtered.push(candidate);
+        }
+        // Replace workspace array with filtered candidates
+        group.workspace = filtered;
+    }
+}
+//# sourceMappingURL=save-platform-handler.js.map

package/packages/core/dist/core/save/save-platform-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-platform-handler.js","sourceRoot":"","sources":["../../../src/core/save/save-platform-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG/C;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,WAAmB,EACnB,MAA4B;IAE5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,wDAAwD;QACxD,6BAA6B;QAC7B,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;QAErC,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YAEpC,iDAAiD;YACjD,sDAAsD;YACtD,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACzB,SAAS;YACX,CAAC;YAED,4CAA4C;YAC5C,yEAAyE;YACzE,MAAM,YAAY,GAAG,kCAAkC,CACrD,KAAK,CAAC,YAAY,EAClB,QAAQ,CACT,CAAC;YAEF,6DAA6D;YAC7D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACzB,SAAS;YACX,CAAC;YAED,mDAAmD;YACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACzD,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAEvD,IAAI,eAAe,EAAE,CAAC;gBACpB,8CAA8C;gBAC9C,MAAM,CAAC,KAAK,CACV,+BAA+B,SAAS,CAAC,WAAW,QAAQ,KAAK,CAAC,YAAY,GAAG;oBACjF,kBAAkB,YAAY,oBAAoB,CACnD,CAAC;gBACF,SAAS,CAAC,8BAA8B;YAC1C,CAAC;YAED,gEAAgE;YAChE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QAED,mDAAmD;QACnD,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC7B,CAAC;AACH,CAAC"}

package/packages/core/dist/core/save/save-resolution-executor.d.ts

@@ -0,0 +1,40 @@
+import type { ConflictAnalysis } from './save-conflict-analyzer.js';
+import type { SaveCandidateGroup, ResolutionResult } from './save-types.js';
+import type { OutputPort } from '../ports/output.js';
+import type { PromptPort } from '../ports/prompt.js';
+/**
+ * Resolution Strategy Executor
+ *
+ * This module orchestrates the execution of resolution strategies based on conflict analysis.
+ * It delegates to specific resolution functions based on the recommended strategy.
+ *
+ * Strategies:
+ * - skip: No action needed
+ * - write-single: Single workspace candidate (auto-write)
+ * - write-newest: Multiple identical candidates (auto-write newest)
+ * - force-newest: Multiple differing candidates with force flag (auto-select newest)
+ * - interactive: Multiple differing candidates without force flag (prompt user)
+ *
+ * @module save-resolution-executor
+ */
+/**
+ * Execute resolution for a candidate group based on conflict analysis
+ *
+ * This is the primary entry point for resolution execution. It takes the analysis
+ * result and delegates to the appropriate resolution function based on the
+ * recommended strategy.
+ *
+ * **Flow**:
+ * 1. Check if strategy is 'skip' → return null (no action)
+ * 2. Sort candidates by mtime (newest first) for consistency
+ * 3. Dispatch to strategy-specific function
+ * 4. Return ResolutionResult
+ *
+ * @param group - The candidate group being resolved
+ * @param analysis - Conflict analysis with recommended strategy
+ * @param packageRoot - Package source absolute path (for parity checking)
+ * @param workspaceRoot - Workspace root for conversion
+ * @returns ResolutionResult with selection and platform-specific candidates, or null if skip
+ */
+export declare function executeResolution(group: SaveCandidateGroup, analysis: ConflictAnalysis, packageRoot: string, workspaceRoot: string, output?: OutputPort, prompt?: PromptPort): Promise<ResolutionResult | null>;
+//# sourceMappingURL=save-resolution-executor.d.ts.map

package/packages/core/dist/core/save/save-resolution-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-resolution-executor.d.ts","sourceRoot":"","sources":["../../../src/core/save/save-resolution-executor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,KAAK,EAAiB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,UAAU,EACnB,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAsClC"}