opkg 0.6.1 → 0.7.0

package/dist/core/save/save-candidate-loader.js.map

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

package/dist/core/save/save-conflict-analyzer.js

@@ -0,0 +1,150 @@
+import { FILE_PATTERNS } from '../../constants/index.js';
+/**
+ * Analyze a candidate group and determine resolution strategy
+ *
+ * This function examines the workspace candidates and determines:
+ * - Whether any action is needed
+ * - What type of conflict exists (if any)
+ * - What resolution strategy to use
+ */
+export function analyzeGroup(group, force) {
+    const registryPath = group.registryPath;
+    const hasLocal = !!group.local;
+    const workspaceCandidates = group.workspace;
+    const workspaceCandidateCount = workspaceCandidates.length;
+    // Check if this is a root file (AGENTS.md or similar)
+    const isRootFile = registryPath === FILE_PATTERNS.AGENTS_MD ||
+        workspaceCandidates.some(c => c.isRootFile);
+    // Check if any candidates are platform-specific
+    const hasPlatformCandidates = workspaceCandidates.some(c => c.platform && c.platform !== 'ai');
+    // No workspace candidates - nothing to save
+    if (workspaceCandidateCount === 0) {
+        return {
+            registryPath,
+            type: 'no-action-needed',
+            workspaceCandidateCount: 0,
+            uniqueWorkspaceCandidates: [],
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: false,
+            isRootFile,
+            hasPlatformCandidates: false,
+            recommendedStrategy: 'skip'
+        };
+    }
+    // Deduplicate workspace candidates by content hash
+    const uniqueWorkspace = deduplicateCandidates(workspaceCandidates);
+    // Check if workspace content differs from local
+    const localMatchesWorkspace = hasLocal && uniqueWorkspace.length === 1
+        ? uniqueWorkspace[0].contentHash === group.local.contentHash
+        : false;
+    // No change needed - workspace identical to source
+    if (localMatchesWorkspace) {
+        return {
+            registryPath,
+            type: 'no-change-needed',
+            workspaceCandidateCount,
+            uniqueWorkspaceCandidates: uniqueWorkspace,
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: true,
+            isRootFile,
+            hasPlatformCandidates,
+            recommendedStrategy: 'skip'
+        };
+    }
+    // Single workspace candidate or all identical - auto write
+    if (uniqueWorkspace.length === 1) {
+        return {
+            registryPath,
+            type: 'auto-write',
+            workspaceCandidateCount,
+            uniqueWorkspaceCandidates: uniqueWorkspace,
+            hasLocalCandidate: hasLocal,
+            localMatchesWorkspace: false,
+            isRootFile,
+            hasPlatformCandidates,
+            recommendedStrategy: 'write-single'
+        };
+    }
+    // Multiple differing workspace candidates - needs resolution
+    // Strategy depends on force flag
+    const recommendedStrategy = force ? 'force-newest' : 'interactive';
+    return {
+        registryPath,
+        type: 'needs-resolution',
+        workspaceCandidateCount,
+        uniqueWorkspaceCandidates: uniqueWorkspace,
+        hasLocalCandidate: hasLocal,
+        localMatchesWorkspace: false,
+        isRootFile,
+        hasPlatformCandidates,
+        recommendedStrategy
+    };
+}
+/**
+ * Deduplicate candidates by content hash
+ *
+ * Returns only candidates with unique content, preserving order.
+ * First occurrence of each unique hash is kept.
+ */
+export function deduplicateCandidates(candidates) {
+    const seen = new Set();
+    const unique = [];
+    for (const candidate of candidates) {
+        if (seen.has(candidate.contentHash)) {
+            continue;
+        }
+        seen.add(candidate.contentHash);
+        unique.push(candidate);
+    }
+    return unique;
+}
+/**
+ * Check if workspace content differs from local
+ *
+ * Returns true if any workspace candidate has different content than local.
+ */
+export function hasContentDifference(local, workspace) {
+    if (!local)
+        return true; // No local means creation, which is a difference
+    if (workspace.length === 0)
+        return false; // No workspace means no change
+    // Check if any workspace candidate differs from local
+    return workspace.some(w => w.contentHash !== local.contentHash);
+}
+/**
+ * Get newest candidate by mtime
+ *
+ * Returns the candidate with the most recent modification time.
+ * If multiple have the same mtime, returns the first one.
+ */
+export function getNewestCandidate(candidates) {
+    if (candidates.length === 0) {
+        throw new Error('Cannot get newest candidate from empty array');
+    }
+    if (candidates.length === 1) {
+        return candidates[0];
+    }
+    let newest = candidates[0];
+    for (let i = 1; i < candidates.length; i++) {
+        if (candidates[i].mtime > newest.mtime) {
+            newest = candidates[i];
+        }
+    }
+    return newest;
+}
+/**
+ * Sort candidates by mtime (newest first) and display path
+ *
+ * Used to establish a consistent ordering for conflict resolution.
+ */
+export function sortCandidatesByMtime(candidates) {
+    return [...candidates].sort((a, b) => {
+        // Sort by mtime descending (newest first)
+        if (b.mtime !== a.mtime) {
+            return b.mtime - a.mtime;
+        }
+        // Tie-breaker: sort by display path alphabetically
+        return a.displayPath.localeCompare(b.displayPath);
+    });
+}
+//# sourceMappingURL=save-conflict-analyzer.js.map

package/dist/core/save/save-conflict-analyzer.js.map

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

package/dist/core/save/save-conflict-resolution.js

@@ -1,17 +1,22 @@
 import { dirname, join } from 'path';
 import { FILE_PATTERNS } from '../../constants/index.js';
 import { readPackageIndex, isDirKey } from '../../utils/package-index-yml.js';
-import { ensureDir, exists, isDirectory, readTextFile, writeTextFile, remove } from '../../utils/fs.js';
+import { ensureDir, exists, isDirectory, readTextFile, writeTextFile } from '../../utils/fs.js';
 import { normalizeRegistryPath, } from '../../utils/registry-entry-filter.js';
 import { UTF8_ENCODING } from './constants.js';
 import { createPlatformSpecificRegistryPath } from '../../utils/platform-specific-paths.js';
 import { logger } from '../../utils/logger.js';
 import { discoverWorkspaceRootSaveCandidates, loadLocalRootSaveCandidates } from './root-save-candidates.js';
-import { buildFrontmatterMergePlans, applyFrontmatterMergePlans, getOverrideRelativePath, } from './save-yml-resolution.js';
+import { buildFrontmatterMergePlans, applyFrontmatterMergePlans, } from './save-yml-resolution.js';
 import { loadLocalCandidates, discoverWorkspaceCandidates } from './save-candidate-loader.js';
-import { buildCandidateGroups, pruneWorkspaceCandidatesWithLocalPlatformVariants, resolveGroup, resolveRootGroup } from './save-conflict-resolver.js';
+// Using deprecated compatibility layer from save-conflict-resolver.ts
+// TODO: Migrate this file to use new modular architecture
+import { buildCandidateGroups, resolveGroup, resolveRootGroup } from './save-conflict-resolver.js';
+import { pruneExistingPlatformCandidates as pruneWorkspaceCandidatesWithLocalPlatformVariants } from './save-platform-handler.js';
 import { readPackageFilesForRegistry } from '../../utils/package-copy.js';
 import { composeMarkdown } from '../../utils/markdown-frontmatter.js';
+import { saveWorkspaceFilesWithFlows, shouldUseFlowsForSave, getFlowSaveStatistics } from './flow-based-saver.js';
+import { getDetectedPlatforms } from '../platforms.js';
 export async function resolvePackageFilesWithConflicts(packageContext, options = {}) {
     const cwd = process.cwd();
     const packageFilesDir = packageContext.packageFilesDir;
@@ -19,13 +24,30 @@ export async function resolvePackageFilesWithConflicts(packageContext, options =
     if (!(await exists(packageFilesDir)) || !(await isDirectory(packageFilesDir))) {
         return [];
     }
-    const [localPlatformCandidates, workspacePlatformCandidates, localRootCandidates, workspaceRootCandidates] = await Promise.all([
-        loadLocalCandidates(packageRootDir),
+    const [localPlatformCandidates, initialWorkspacePlatformCandidates, localRootCandidates, workspaceRootCandidates] = await Promise.all([
+        loadLocalCandidates(packageRootDir, cwd),
         discoverWorkspaceCandidates(cwd, packageContext.config.name),
         loadLocalRootSaveCandidates(packageRootDir, packageContext.config.name),
         discoverWorkspaceRootSaveCandidates(cwd, packageContext.config.name)
     ]);
+    let workspacePlatformCandidates = initialWorkspacePlatformCandidates;
     const localCandidates = [...localPlatformCandidates, ...localRootCandidates];
+    // Try flow-based save for platforms that support it
+    const detectedPlatforms = await getDetectedPlatforms(cwd);
+    const hasFlowPlatforms = detectedPlatforms.some(p => shouldUseFlowsForSave(p, cwd));
+    if (hasFlowPlatforms) {
+        logger.debug(`Attempting flow-based save for ${workspacePlatformCandidates.length} workspace files`);
+        const flowResult = await saveWorkspaceFilesWithFlows(workspacePlatformCandidates, packageRootDir, cwd, { force: options.force, dryRun: false });
+        const stats = getFlowSaveStatistics(flowResult);
+        logger.debug(`Flow-based save: ${stats.written} written, ${stats.skipped} skipped, ${stats.errors} errors`);
+        // Remove successfully processed files from workspace candidates
+        // so they don't go through legacy conflict resolution
+        const processedPaths = new Set(flowResult.fileResults
+            .filter(r => r.success && !r.skipped)
+            .map(r => r.sourceWorkspacePath));
+        workspacePlatformCandidates = workspacePlatformCandidates.filter(c => !processedPaths.has(c.fullPath));
+        logger.debug(`${processedPaths.size} files processed by flows, ${workspacePlatformCandidates.length} remaining for legacy save`);
+    }
     const indexRecord = await readPackageIndex(cwd, packageContext.config.name, packageContext.location);
     if (!indexRecord || Object.keys(indexRecord.files ?? {}).length === 0) {
         // No index yet (first save) – run root-only conflict resolution so prompts are shown for CLAUDE.md, WARP.md, etc.
@@ -207,18 +229,10 @@ export async function resolvePackageFilesWithConflicts(packageContext, options =
                 await writeTextFile(targetPath, contentToWrite, UTF8_ENCODING);
                 logger.debug(`Wrote platform-specific file: ${platformRegistryPath}`);
                 if (pathsWithFrontmatterPlans.has(group.registryPath)) {
-                    const overrideRelativePath = getOverrideRelativePath(group.registryPath, platform);
-                    if (overrideRelativePath) {
-                        const overrideFullPath = join(packageRootDir, overrideRelativePath);
-                        if (await exists(overrideFullPath)) {
-                            await remove(overrideFullPath);
-                            logger.debug(`Removed redundant platform override: ${overrideRelativePath}`);
-                        }
-                    }
                     const plan = frontmatterPlanMap.get(group.registryPath);
                     if (plan) {
                         plan.workspaceEntries = plan.workspaceEntries.filter(entry => entry.platform !== platform);
-                        plan.platformOverrides.delete(platform);
+                        plan.platformDiffs.delete(platform);
                         if (plan.workspaceEntries.length === 0) {
                             frontmatterPlanMap.delete(group.registryPath);
                             pathsWithFrontmatterPlans.delete(group.registryPath);

package/dist/core/save/save-conflict-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-conflict-resolution.js","sourceRoot":"","sources":["../../../src/core/save/save-conflict-resolution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"save-conflict-resolution.js","sourceRoot":"","sources":["../../../src/core/save/save-conflict-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChG,OAAO,EACL,qBAAqB,GACtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EACL,mCAAmC,EACnC,2BAA2B,EAC5B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAC9F,sEAAsE;AACtE,0DAA0D;AAC1D,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,+BAA+B,IAAI,iDAAiD,EAAE,MAAM,4BAA4B,CAAC;AAClI,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAMvD,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,cAA8B,EAC9B,UAAyC,EAAE;IAE3C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;IACvD,MAAM,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC;IAErD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CACJ,uBAAuB,EACvB,kCAAkC,EAClC,mBAAmB,EACnB,uBAAuB,CACxB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,mBAAmB,CAAC,cAAc,EAAE,GAAG,CAAC;QACxC,2BAA2B,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5D,2BAA2B,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;QACvE,mCAAmC,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;KACrE,CAAC,CAAC;IAEH,IAAI,2BAA2B,GAAG,kCAAkC,CAAC;IAErE,MAAM,eAAe,GAAG,CAAC,GAAG,uBAAuB,EAAE,GAAG,mBAAmB,CAAC,CAAC;IAE7E,oDAAoD;IACpD,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAEpF,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,CAAC,KAAK,CAAC,kCAAkC,2BAA2B,CAAC,MAAM,kBAAkB,CAAC,CAAC;QAErG,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAClD,2BAA2B,EAC3B,cAAc,EACd,GAAG,EACH,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CACxC,CAAC;QAEF,MAAM,KAAK,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CACV,oBAAoB,KAAK,CAAC,OAAO,aAAa,KAAK,CAAC,OAAO,aAAa,KAAK,CAAC,MAAM,SAAS,CAC9F,CAAC;QAEF,gEAAgE;QAChE,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,UAAU,CAAC,WAAW;aACnB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CACnC,CAAC;QAEF,2BAA2B,GAAG,2BAA2B,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CACrC,CAAC;QAEF,MAAM,CAAC,KAAK,CACV,GAAG,cAAc,CAAC,IAAI,8BAA8B,2BAA2B,CAAC,MAAM,4BAA4B,CACnH,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAErG,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtE,kHAAkH;QAClH,MAAM,UAAU,GAAG,oBAAoB,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;QAEtF,+FAA+F;QAC/F,MAAM,iDAAiD,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAEpF,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YAEhD,4CAA4C;YAC5C,mDAAmD;YACnD,wDAAwD;YACxD,MAAM,qBAAqB,GACzB,YAAY;gBACZ,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;YAEvF,kFAAkF;YAClF,2CAA2C;YAC3C,IAAI,CAAC,YAAY,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;YACzE,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC;YAEnD,kEAAkE;YAClE,MAAM,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAE7F,uEAAuE;YACvE,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;gBACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;gBACpC,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,IAAI;oBAAE,SAAS;gBAE7C,MAAM,oBAAoB,GAAG,kCAAkC,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAC9F,IAAI,CAAC,oBAAoB;oBAAE,SAAS;gBAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;gBAC9D,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;oBAErC,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU;wBACzC,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;wBACrD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;oBAEtB,IAAI,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC7B,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;wBACtE,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;4BACvC,SAAS;wBACX,CAAC;oBACH,CAAC;oBAED,MAAM,aAAa,CAAC,UAAU,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;oBAC/D,MAAM,CAAC,KAAK,CAAC,iCAAiC,oBAAoB,EAAE,CAAC,CAAC;gBACxE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,0CAA0C,oBAAoB,KAAK,KAAK,EAAE,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC;QACH,CAAC;QAED,uEAAuE;QACvE,OAAO,MAAM,2BAA2B,CAAC,cAAc,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACrB,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACpE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,MAAM,+BAA+B,GAAG,CAAC,YAAoB,EAAW,EAAE;QACxE,MAAM,cAAc,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QAC3D,IAAI,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC;IAEF,MAAM,mCAAmC,GAAG,2BAA2B,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACzF,+BAA+B,CAAC,SAAS,CAAC,YAAY,CAAC,CACxD,CAAC;IAEF,MAAM,+BAA+B,GAAG,uBAAuB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACjF,SAAS,CAAC,UAAU,IAAI,+BAA+B,CAAC,SAAS,CAAC,YAAY,CAAC,CAChF,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,GAAG,mCAAmC,EAAE,GAAG,+BAA+B,CAAC,CAAC;IAEzG,MAAM,MAAM,GAAG,oBAAoB,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAC1E,IAAI,gBAAgB,GAAG,MAAM,0BAA0B,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAChF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5F,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;IAErE,+FAA+F;IAC/F,MAAM,iDAAiD,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAEhF,iEAAiE;IACjE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/B,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhD,MAAM,qBAAqB,GACzB,YAAY;YACZ,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;QAEvF,kFAAkF;QAClF,0BAA0B;QAC1B,IAAI,CAAC,YAAY,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC5C,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAClB,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,SAAS;YAC9C,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAEvF,MAAM,UAAU,GAAG,cAAc;YAC/B,CAAC,CAAC,MAAM,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC;YACvD,CAAC,CAAC,MAAM,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC;QAEnD,IAAI,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,SAAS,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;YAC3E,MAAM,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC7F,kEAAkE;QACpE,CAAC;aAAM,IAAI,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7D,wEAAwE;YACxE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;gBAClE,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,OAAO,CAAC;gBAElE,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC5D,MAAM,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC;oBACjD,MAAM,cAAc,GAAG,eAAe,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;oBAExE,IAAI,CAAC;wBACH,MAAM,aAAa,CAAC,UAAU,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;wBAC/D,MAAM,CAAC,KAAK,CACV,+DAA+D,KAAK,CAAC,YAAY,EAAE,CACpF,CAAC;oBACJ,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;oBACpF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBACrE,qDAAqD;gBACrD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC5D,IAAI,CAAC;oBACH,MAAM,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;oBAClE,MAAM,CAAC,KAAK,CAAC,6CAA6C,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;gBAClF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,uCAAuC,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACxB,iEAAiE;gBACjE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC5D,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;oBACrC,MAAM,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;oBAClE,MAAM,CAAC,KAAK,CAAC,6CAA6C,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;gBAClF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,yCAAyC,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;gBACvF,CAAC;YACH,CAAC;QACH,CAAC;QAED,yEAAyE;QACzE,sFAAsF;QACtF,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YACpC,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACnC,SAAS;YACX,CAAC;YAED,MAAM,oBAAoB,GAAG,kCAAkC,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC9F,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;YAE9D,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBAErC,sFAAsF;gBACtF,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU;oBACzC,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;oBACrD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;gBAEtB,IAAI,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7B,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;oBACtE,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;wBACvC,SAAS;oBACX,CAAC;gBACH,CAAC;gBAED,MAAM,aAAa,CAAC,UAAU,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;gBAC/D,MAAM,CAAC,KAAK,CAAC,iCAAiC,oBAAoB,EAAE,CAAC,CAAC;gBAEtE,IAAI,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;oBACtD,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBACxD,IAAI,IAAI,EAAE,CAAC;wBACT,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;wBAC3F,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;wBACpC,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACvC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BAC9C,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;wBACvD,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,0CAA0C,oBAAoB,KAAK,KAAK,EAAE,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAED,+FAA+F;IAC/F,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrF,MAAM,0BAA0B,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IACnE,OAAO,MAAM,2BAA2B,CAAC,cAAc,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,cAAsB,EACtB,WAAmB,EACnB,cAAyC,EACzC,SAAwB;IAExB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,CAAC,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACxE,MAAM,YAAY,GAAG,WAAW,CAAC;IAEjC,IAAI,CAAC;QACH,IAAI,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YACtE,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,wBAAwB,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;gBAChE,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,aAAa,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,6BAA6B,aAAa,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC"}

package/dist/core/save/save-conflict-resolver.js

@@ -1,277 +1,33 @@
-import { join } from 'path';
-import { exists } from '../../utils/fs.js';
-import { DIR_PATTERNS, FILE_PATTERNS } from '../../constants/index.js';
-import { logger } from '../../utils/logger.js';
-import { safePrompts, promptPlatformSpecificSelection, getContentPreview } from '../../utils/prompts.js';
-import { createPlatformSpecificRegistryPath } from '../../utils/platform-specific-paths.js';
-import { getOverrideRelativePath } from './save-yml-resolution.js';
-export function buildCandidateGroups(localCandidates, workspaceCandidates) {
-    const map = new Map();
-    for (const candidate of localCandidates) {
-        const group = ensureGroup(map, candidate.registryPath);
-        group.local = candidate;
-    }
-    for (const candidate of workspaceCandidates) {
-        const group = ensureGroup(map, candidate.registryPath);
-        group.workspace.push(candidate);
-    }
-    return Array.from(map.values());
-}
-export async function pruneWorkspaceCandidatesWithLocalPlatformVariants(packageDir, groups) {
-    for (const group of groups) {
-        if (!group.local) {
-            continue;
-        }
-        const filtered = [];
-        const isUniversalSubdirPath = group.registryPath.startsWith(`${DIR_PATTERNS.OPENPACKAGE}/`);
-        for (const candidate of group.workspace) {
-            const platform = candidate.platform;
-            if (!platform || platform === 'ai') {
-                filtered.push(candidate);
-                continue;
-            }
-            const platformRegistryPath = createPlatformSpecificRegistryPath(group.registryPath, platform);
-            if (!platformRegistryPath) {
-                filtered.push(candidate);
-                continue;
-            }
-            const platformFullPath = join(packageDir, platformRegistryPath);
-            const hasPlatformFile = await exists(platformFullPath);
-            let hasPlatformOverride = false;
-            let overrideRelative = null;
-            if (group.registryPath.endsWith(FILE_PATTERNS.MD_FILES)) {
-                overrideRelative = getOverrideRelativePath(group.registryPath, platform);
-                if (overrideRelative) {
-                    const overrideFullPath = join(packageDir, overrideRelative);
-                    hasPlatformOverride = await exists(overrideFullPath);
-                }
-            }
-            // For universal subdir content (e.g. .openpackage/agents/foo.md), we should not
-            // suppress workspace candidates just because a YAML override exists; overrides
-            // are frontmatter-only. We still want body conflicts from workspace to be seen.
-            //
-            // We only prune due to overrides for non-universal paths; for universal paths,
-            // we only prune when there is an actual platform-specific file.
-            const shouldPrune = hasPlatformFile || (!isUniversalSubdirPath && hasPlatformOverride);
-            if (shouldPrune) {
-                const reason = hasPlatformFile
-                    ? platformRegistryPath
-                    : overrideRelative;
-                logger.debug(`Skipping workspace candidate ${candidate.displayPath} for ${group.registryPath} ` +
-                    `because local platform-specific data (${reason}) already exists`);
-                continue;
-            }
-            filtered.push(candidate);
-        }
-        group.workspace = filtered;
-    }
-}
-export async function resolveRootGroup(group, force) {
-    const orderedCandidates = [];
-    if (group.local) {
-        orderedCandidates.push(group.local);
-    }
-    if (group.workspace.length > 0) {
-        const sortedWorkspace = [...group.workspace].sort((a, b) => {
-            if (b.mtime !== a.mtime) {
-                return b.mtime - a.mtime;
-            }
-            return a.displayPath.localeCompare(b.displayPath);
-        });
-        orderedCandidates.push(...sortedWorkspace);
-    }
-    if (orderedCandidates.length === 0) {
-        return undefined;
-    }
-    const uniqueCandidates = dedupeByHash(orderedCandidates);
-    if (uniqueCandidates.length === 1) {
-        return {
-            selection: uniqueCandidates[0],
-            platformSpecific: []
-        };
-    }
-    if (group.local) {
-        const localCandidate = group.local;
-        const differsFromAnyWorkspace = group.workspace.some(w => w.contentHash !== localCandidate.contentHash);
-        if (differsFromAnyWorkspace) {
-            const latestWorkspaceMtime = group.workspace.length > 0 ? Math.max(...group.workspace.map(w => w.mtime)) : 0;
-            if (localCandidate.mtime >= latestWorkspaceMtime) {
-                return {
-                    selection: localCandidate,
-                    platformSpecific: []
-                };
-            }
-            if (force) {
-                logger.info(`Force-selected local version for ${group.registryPath}`);
-                return {
-                    selection: localCandidate,
-                    platformSpecific: []
-                };
-            }
-            return await promptForCandidate(group.registryPath, uniqueCandidates);
-        }
-    }
-    if (force) {
-        const selected = pickLatestByMtime(uniqueCandidates);
-        logger.info(`Force-selected ${selected.displayPath} for ${group.registryPath}`);
-        return {
-            selection: selected,
-            platformSpecific: []
-        };
-    }
-    return await promptForCandidate(group.registryPath, uniqueCandidates);
-}
-export async function resolveGroup(group, force) {
-    const orderedCandidates = [];
-    if (group.local) {
-        orderedCandidates.push(group.local);
-    }
-    if (group.workspace.length > 0) {
-        const sortedWorkspace = [...group.workspace].sort((a, b) => {
-            if (b.mtime !== a.mtime) {
-                return b.mtime - a.mtime;
-            }
-            return a.displayPath.localeCompare(b.displayPath);
-        });
-        orderedCandidates.push(...sortedWorkspace);
-    }
-    if (orderedCandidates.length === 0) {
-        return undefined;
-    }
-    const uniqueCandidates = dedupeByHash(orderedCandidates);
-    if (uniqueCandidates.length === 1) {
-        return {
-            selection: uniqueCandidates[0],
-            platformSpecific: []
-        };
-    }
-    if (group.local) {
-        const localCandidate = group.local;
-        const differsFromAnyWorkspace = group.workspace.some(w => w.contentHash !== localCandidate.contentHash);
-        if (differsFromAnyWorkspace) {
-            const latestWorkspaceMtime = group.workspace.length > 0
-                ? Math.max(...group.workspace.map(w => w.mtime))
-                : 0;
-            if (localCandidate.mtime >= latestWorkspaceMtime) {
-                return {
-                    selection: localCandidate,
-                    platformSpecific: []
-                };
-            }
-            if (!force) {
-                return await promptForCandidate(group.registryPath, uniqueCandidates);
-            }
-            logger.info(`Force-selected local version for ${group.registryPath}`);
-            return {
-                selection: localCandidate,
-                platformSpecific: []
-            };
-        }
-    }
-    if (force) {
-        const selected = pickLatestByMtime(uniqueCandidates);
-        logger.info(`Force-selected ${selected.displayPath} for ${group.registryPath}`);
-        return {
-            selection: selected,
-            platformSpecific: []
-        };
-    }
-    return await promptForCandidate(group.registryPath, uniqueCandidates);
-}
-function ensureGroup(map, registryPath) {
-    let group = map.get(registryPath);
-    if (!group) {
-        group = {
-            registryPath,
-            workspace: []
-        };
-        map.set(registryPath, group);
-    }
-    return group;
-}
-function dedupeByHash(candidates) {
-    const seen = new Set();
-    const unique = [];
-    for (const candidate of candidates) {
-        if (seen.has(candidate.contentHash)) {
-            continue;
-        }
-        seen.add(candidate.contentHash);
-        unique.push(candidate);
-    }
-    return unique;
-}
-function pickLatestByMtime(candidates) {
-    let best = candidates[0];
-    for (let i = 1; i < candidates.length; i += 1) {
-        const current = candidates[i];
-        if (current.mtime > best.mtime) {
-            best = current;
-        }
-    }
-    return best;
-}
-async function promptForCandidate(registryPath, candidates) {
-    console.log(`\n⚠️  Conflict detected for ${registryPath}:`);
-    candidates.forEach(candidate => {
-        console.log(`  • ${formatCandidateLabel(candidate)}`);
-    });
-    const platformEligibleWorkspace = candidates.filter(candidate => candidate.source === 'workspace' && candidate.platform && candidate.platform !== 'ai');
-    let markedPlatformSpecific = [];
-    if (platformEligibleWorkspace.length > 0) {
-        const options = await Promise.all(platformEligibleWorkspace.map(async (candidate) => ({
-            platform: candidate.platform ?? 'workspace',
-            sourcePath: candidate.fullPath,
-            preview: await getContentPreview(candidate.fullPath),
-            registryPath: candidate.displayPath
-        })));
-        const indices = await promptPlatformSpecificSelection(options, 'Select workspace files to mark as platform-specific:', 'Unselected files remain candidates for universal content');
-        const markedIndexSet = new Set(indices);
-        markedPlatformSpecific = platformEligibleWorkspace.filter((_, idx) => markedIndexSet.has(idx));
-    }
-    const markedSet = new Set(markedPlatformSpecific);
-    const local = candidates.find(candidate => candidate.source === 'local');
-    const remainingWorkspace = candidates.filter(candidate => candidate.source === 'workspace' && !markedSet.has(candidate));
-    const universalChoices = [...(local ? [local] : []), ...remainingWorkspace];
-    const resolvePlatformSpecific = (selection) => {
-        if (!markedSet.has(selection)) {
-            return markedPlatformSpecific;
-        }
-        return markedPlatformSpecific.filter(candidate => candidate !== selection);
-    };
-    if (universalChoices.length === 0) {
-        const fallbackSelection = candidates[0];
-        return {
-            selection: fallbackSelection,
-            platformSpecific: resolvePlatformSpecific(fallbackSelection)
-        };
-    }
-    if (universalChoices.length === 1) {
-        const selection = universalChoices[0];
-        return {
-            selection,
-            platformSpecific: resolvePlatformSpecific(selection)
-        };
-    }
-    const response = await safePrompts({
-        type: 'select',
-        name: 'selectedIndex',
-        message: `Choose universal content to save for ${registryPath}:`,
-        choices: universalChoices.map((candidate, index) => ({
-            title: formatCandidateLabel(candidate),
-            value: index
-        })),
-        hint: 'Use arrow keys to compare options and press Enter to select'
-    });
-    const selectedIndex = response.selectedIndex;
-    const selection = universalChoices[selectedIndex];
-    return {
-        selection,
-        platformSpecific: resolvePlatformSpecific(selection)
-    };
-}
-function formatCandidateLabel(candidate) {
-    const prefix = candidate.source === 'local' ? 'Package' : 'Workspace';
-    return `${prefix}: ${candidate.displayPath}`;
+/**
+ * DEPRECATED: This file is being phased out in favor of:
+ * - save-conflict-analyzer.ts (analysis logic)
+ * - save-resolution-executor.ts (execution logic)
+ * - save-interactive-resolver.ts (UI logic)
+ * - save-group-builder.ts (group building)
+ *
+ * Kept for backward compatibility during migration.
+ * Will be removed in future version.
+ */
+import { buildCandidateGroups } from './save-group-builder.js';
+import { analyzeGroup } from './save-conflict-analyzer.js';
+import { executeResolution } from './save-resolution-executor.js';
+import { pruneExistingPlatformCandidates } from './save-platform-handler.js';
+// Re-export for backward compatibility
+export { buildCandidateGroups, pruneExistingPlatformCandidates };
+/**
+ * @deprecated Use analyzeGroup + executeResolution instead
+ */
+export async function resolveGroup(group, force, packageRoot) {
+    const analysis = analyzeGroup(group, force);
+    // For backward compatibility, use empty string if packageRoot not provided
+    return executeResolution(group, analysis, packageRoot || '');
+}
+/**
+ * @deprecated Use analyzeGroup + executeResolution instead
+ */
+export async function resolveRootGroup(group, force, packageRoot) {
+    const analysis = analyzeGroup(group, force);
+    // For backward compatibility, use empty string if packageRoot not provided
+    return executeResolution(group, analysis, packageRoot || '');
 }
 //# sourceMappingURL=save-conflict-resolver.js.map

package/dist/core/save/save-conflict-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-conflict-resolver.js","sourceRoot":"","sources":["../../../src/core/save/save-conflict-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"save-conflict-resolver.js","sourceRoot":"","sources":["../../../src/core/save/save-conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAE7E,uCAAuC;AACvC,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,CAAC;AAEjE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAAU,EACV,KAAc,EACd,WAAoB;IAEpB,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,2EAA2E;IAC3E,OAAO,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAU,EACV,KAAc,EACd,WAAoB;IAEpB,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,2EAA2E;IAC3E,OAAO,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;AAC/D,CAAC"}