opkg 0.5.0 → 0.6.0
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.
- package/README.md +49 -8
- package/dist/commands/add.js +11 -276
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/init.js +73 -145
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.js +26 -668
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/pack.js +10 -137
- package/dist/commands/pack.js.map +1 -1
- package/dist/commands/push.js +14 -8
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/save.js +12 -167
- package/dist/commands/save.js.map +1 -1
- package/dist/commands/status.js +2 -2
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/uninstall.js +5 -5
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/constants/index.js +18 -45
- package/dist/constants/index.js.map +1 -1
- package/dist/constants/workspace.js +9 -0
- package/dist/constants/workspace.js.map +1 -0
- package/dist/core/add/add-conflict-handler.js +68 -0
- package/dist/core/add/add-conflict-handler.js.map +1 -0
- package/dist/core/add/add-pipeline.js +137 -0
- package/dist/core/add/add-pipeline.js.map +1 -0
- package/dist/core/add/package-index-updater.js +62 -33
- package/dist/core/add/package-index-updater.js.map +1 -1
- package/dist/core/add/platform-path-transformer.js +47 -0
- package/dist/core/add/platform-path-transformer.js.map +1 -0
- package/dist/core/add/source-collector.js +57 -0
- package/dist/core/add/source-collector.js.map +1 -0
- package/dist/core/dependency-resolver.js +3 -1
- package/dist/core/dependency-resolver.js.map +1 -1
- package/dist/core/directory.js +2 -2
- package/dist/core/directory.js.map +1 -1
- package/dist/core/discovery/file-discovery.js +55 -54
- package/dist/core/discovery/file-discovery.js.map +1 -1
- package/dist/core/discovery/platform-files-discovery.js +32 -17
- package/dist/core/discovery/platform-files-discovery.js.map +1 -1
- package/dist/core/install/bulk-install-pipeline.js +199 -0
- package/dist/core/install/bulk-install-pipeline.js.map +1 -0
- package/dist/core/install/canonical-plan.js +123 -0
- package/dist/core/install/canonical-plan.js.map +1 -0
- package/dist/core/install/dry-run.js +2 -2
- package/dist/core/install/dry-run.js.map +1 -1
- package/dist/core/install/index.js +3 -0
- package/dist/core/install/index.js.map +1 -0
- package/dist/core/install/install-errors.js +41 -0
- package/dist/core/install/install-errors.js.map +1 -0
- package/dist/core/install/install-flow.js +2 -5
- package/dist/core/install/install-flow.js.map +1 -1
- package/dist/core/install/install-pipeline.js +228 -0
- package/dist/core/install/install-pipeline.js.map +1 -0
- package/dist/core/install/install-reporting.js +99 -0
- package/dist/core/install/install-reporting.js.map +1 -0
- package/dist/core/install/platform-resolution.js +6 -6
- package/dist/core/install/platform-resolution.js.map +1 -1
- package/dist/core/install/remote-flow.js +67 -1
- package/dist/core/install/remote-flow.js.map +1 -1
- package/dist/core/openpackage.js +16 -8
- package/dist/core/openpackage.js.map +1 -1
- package/dist/core/package-context.js +246 -0
- package/dist/core/package-context.js.map +1 -0
- package/dist/core/package.js +3 -2
- package/dist/core/package.js.map +1 -1
- package/dist/core/platforms.js +126 -217
- package/dist/core/platforms.js.map +1 -1
- package/dist/core/registry/registry-rename.js +2 -1
- package/dist/core/registry/registry-rename.js.map +1 -1
- package/dist/core/registry.js +10 -3
- package/dist/core/registry.js.map +1 -1
- package/dist/core/remote-pull.js +2 -1
- package/dist/core/remote-pull.js.map +1 -1
- package/dist/core/save/constants.js +4 -0
- package/dist/core/save/constants.js.map +1 -1
- package/dist/core/save/name-resolution.js +31 -0
- package/dist/core/save/name-resolution.js.map +1 -0
- package/dist/core/save/package-detection.js +147 -0
- package/dist/core/save/package-detection.js.map +1 -0
- package/dist/core/save/package-saver.js +46 -43
- package/dist/core/save/package-saver.js.map +1 -1
- package/dist/core/save/package-yml-generator.js +50 -71
- package/dist/core/save/package-yml-generator.js.map +1 -1
- package/dist/core/save/root-save-candidates.js.map +1 -1
- package/dist/core/save/save-candidate-loader.js +89 -0
- package/dist/core/save/save-candidate-loader.js.map +1 -0
- package/dist/core/save/save-conflict-resolution.js +72 -410
- package/dist/core/save/save-conflict-resolution.js.map +1 -1
- package/dist/core/save/save-conflict-resolver.js +277 -0
- package/dist/core/save/save-conflict-resolver.js.map +1 -0
- package/dist/core/save/save-pipeline.js +151 -0
- package/dist/core/save/save-pipeline.js.map +1 -0
- package/dist/core/save/save-types.js +2 -0
- package/dist/core/save/save-types.js.map +1 -0
- package/dist/core/save/save-yml-resolution.js +77 -39
- package/dist/core/save/save-yml-resolution.js.map +1 -1
- package/dist/core/save/workspace-rename.js +6 -6
- package/dist/core/save/workspace-rename.js.map +1 -1
- package/dist/core/scoping/package-scoping.js +13 -1
- package/dist/core/scoping/package-scoping.js.map +1 -1
- package/dist/core/status/status-file-discovery.js +12 -30
- package/dist/core/status/status-file-discovery.js.map +1 -1
- package/dist/core/sync/platform-sync.js +7 -4
- package/dist/core/sync/platform-sync.js.map +1 -1
- package/dist/core/sync/root-files-sync.js +59 -1
- package/dist/core/sync/root-files-sync.js.map +1 -1
- package/dist/core/uninstall/uninstall-file-discovery.js +1 -2
- package/dist/core/uninstall/uninstall-file-discovery.js.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/utils/file-processing.js +5 -58
- package/dist/utils/file-processing.js.map +1 -1
- package/dist/utils/index-based-installer.js +15 -33
- package/dist/utils/index-based-installer.js.map +1 -1
- package/dist/utils/install-file-discovery.js +3 -3
- package/dist/utils/install-file-discovery.js.map +1 -1
- package/dist/utils/install-orchestrator.js +21 -21
- package/dist/utils/install-orchestrator.js.map +1 -1
- package/dist/utils/jsonc.js +44 -0
- package/dist/utils/jsonc.js.map +1 -0
- package/dist/utils/package-copy.js +199 -0
- package/dist/utils/package-copy.js.map +1 -0
- package/dist/utils/package-filters.js +125 -0
- package/dist/utils/package-filters.js.map +1 -0
- package/dist/utils/package-index-yml.js +15 -10
- package/dist/utils/package-index-yml.js.map +1 -1
- package/dist/utils/package-installation.js +4 -113
- package/dist/utils/package-installation.js.map +1 -1
- package/dist/utils/package-local-files.js +2 -35
- package/dist/utils/package-local-files.js.map +1 -1
- package/dist/utils/package-management.js +59 -37
- package/dist/utils/package-management.js.map +1 -1
- package/dist/utils/package-yml.js +24 -0
- package/dist/utils/package-yml.js.map +1 -1
- package/dist/utils/path-normalization.js +8 -53
- package/dist/utils/path-normalization.js.map +1 -1
- package/dist/utils/paths.js +17 -9
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/platform-file.js +16 -59
- package/dist/utils/platform-file.js.map +1 -1
- package/dist/utils/platform-mapper.js +29 -41
- package/dist/utils/platform-mapper.js.map +1 -1
- package/dist/utils/platform-specific-paths.js.map +1 -1
- package/dist/utils/platform-utils.js +28 -139
- package/dist/utils/platform-utils.js.map +1 -1
- package/dist/utils/platform-yaml-merge.js +13 -6
- package/dist/utils/platform-yaml-merge.js.map +1 -1
- package/dist/utils/registry-entry-filter.js +38 -24
- package/dist/utils/registry-entry-filter.js.map +1 -1
- package/dist/utils/registry-paths.js +10 -0
- package/dist/utils/registry-paths.js.map +1 -0
- package/dist/utils/root-file-installer.js +19 -0
- package/dist/utils/root-file-installer.js.map +1 -1
- package/dist/utils/root-file-registry.js.map +1 -1
- package/package.json +3 -2
- package/platforms.jsonc +178 -0
- package/specs/package/README.md +60 -0
- package/specs/package/nested-packages-and-parent-packages.md +79 -0
- package/specs/package/package-index-yml.md +171 -0
- package/specs/package/package-root-layout.md +78 -0
- package/specs/package/registry-payload-and-copy.md +77 -0
- package/specs/package/universal-content.md +144 -0
- package/specs/platforms.md +193 -0
- package/specs/save/README.md +40 -0
- package/specs/save/save-conflict-resolution.md +146 -0
- package/specs/save/save-file-discovery.md +101 -0
- package/specs/save/save-frontmatter-overrides.md +81 -0
- package/specs/save/save-modes-inputs.md +53 -0
- package/specs/save/save-naming-scoping.md +93 -0
- package/specs/save/save-package-detection.md +60 -0
- package/specs/save/save-registry-sync.md +126 -0
- package/dist/commands/release.js +0 -33
- package/dist/commands/release.js.map +0 -1
- package/dist/commands/tag.js +0 -311
- package/dist/commands/tag.js.map +0 -1
- package/dist/commands/update.js +0 -30
- package/dist/commands/update.js.map +0 -1
- package/dist/core/add/formula-index-updater.js +0 -290
- package/dist/core/add/formula-index-updater.js.map +0 -1
- package/dist/core/discovery/ai-files-discovery.js +0 -2
- package/dist/core/discovery/ai-files-discovery.js.map +0 -1
- package/dist/core/discovery/formula-files-discovery.js +0 -14
- package/dist/core/discovery/formula-files-discovery.js.map +0 -1
- package/dist/core/discovery/index-files-discovery.js +0 -91
- package/dist/core/discovery/index-files-discovery.js.map +0 -1
- package/dist/core/discovery/md-files-discovery.js +0 -82
- package/dist/core/discovery/md-files-discovery.js.map +0 -1
- package/dist/core/discovery/package-files-discovery.js +0 -14
- package/dist/core/discovery/package-files-discovery.js.map +0 -1
- package/dist/core/discovery/platform-discovery.js +0 -84
- package/dist/core/discovery/platform-discovery.js.map +0 -1
- package/dist/core/discovery/root-files-discovery.js +0 -2
- package/dist/core/discovery/root-files-discovery.js.map +0 -1
- package/dist/core/formula.js +0 -170
- package/dist/core/formula.js.map +0 -1
- package/dist/core/git-registry.js +0 -46
- package/dist/core/git-registry.js.map +0 -1
- package/dist/core/groundzero.js +0 -277
- package/dist/core/groundzero.js.map +0 -1
- package/dist/core/install/scenario.js +0 -11
- package/dist/core/install/scenario.js.map +0 -1
- package/dist/core/package-sync.js +0 -219
- package/dist/core/package-sync.js.map +0 -1
- package/dist/core/save/formula-file-generator.js +0 -167
- package/dist/core/save/formula-file-generator.js.map +0 -1
- package/dist/core/save/formula-saver.js +0 -52
- package/dist/core/save/formula-saver.js.map +0 -1
- package/dist/core/save/formula-yml-generator.js +0 -89
- package/dist/core/save/formula-yml-generator.js.map +0 -1
- package/dist/core/save/formula-yml-versioning.js +0 -108
- package/dist/core/save/formula-yml-versioning.js.map +0 -1
- package/dist/core/save/generic-file-sync.js +0 -38
- package/dist/core/save/generic-file-sync.js.map +0 -1
- package/dist/core/save/md-files-sync.js +0 -33
- package/dist/core/save/md-files-sync.js.map +0 -1
- package/dist/core/save/package-yml-versioning.js +0 -108
- package/dist/core/save/package-yml-versioning.js.map +0 -1
- package/dist/core/save/platform-sync.js +0 -95
- package/dist/core/save/platform-sync.js.map +0 -1
- package/dist/core/save/root-files-sync.js +0 -140
- package/dist/core/save/root-files-sync.js.map +0 -1
- package/dist/core/save/save-candidate-types.js +0 -2
- package/dist/core/save/save-candidate-types.js.map +0 -1
- package/dist/core/save/save-conflict-types.js +0 -2
- package/dist/core/save/save-conflict-types.js.map +0 -1
- package/dist/core/save/save-file-discovery.js +0 -5
- package/dist/core/save/save-file-discovery.js.map +0 -1
- package/dist/core/status-file-discovery.js +0 -175
- package/dist/core/status-file-discovery.js.map +0 -1
- package/dist/utils/discovery/file-processing.js +0 -156
- package/dist/utils/discovery/file-processing.js.map +0 -1
- package/dist/utils/discovery/formula-discovery.js +0 -211
- package/dist/utils/discovery/formula-discovery.js.map +0 -1
- package/dist/utils/discovery/platform-discovery.js +0 -2
- package/dist/utils/discovery/platform-discovery.js.map +0 -1
- package/dist/utils/formula-discovery.js +0 -102
- package/dist/utils/formula-discovery.js.map +0 -1
- package/dist/utils/formula-index-yml.js +0 -122
- package/dist/utils/formula-index-yml.js.map +0 -1
- package/dist/utils/formula-installation.js +0 -110
- package/dist/utils/formula-installation.js.map +0 -1
- package/dist/utils/formula-local-files.js +0 -38
- package/dist/utils/formula-local-files.js.map +0 -1
- package/dist/utils/formula-management.js +0 -191
- package/dist/utils/formula-management.js.map +0 -1
- package/dist/utils/formula-name.js +0 -97
- package/dist/utils/formula-name.js.map +0 -1
- package/dist/utils/formula-versioning.js +0 -109
- package/dist/utils/formula-versioning.js.map +0 -1
- package/dist/utils/formula-yml.js +0 -82
- package/dist/utils/formula-yml.js.map +0 -1
- package/dist/utils/git.js +0 -54
- package/dist/utils/git.js.map +0 -1
- package/dist/utils/id-based-discovery.js +0 -126
- package/dist/utils/id-based-discovery.js.map +0 -1
- package/dist/utils/id-based-installer.js +0 -249
- package/dist/utils/id-based-installer.js.map +0 -1
- package/dist/utils/index-yml-based-installer.js +0 -375
- package/dist/utils/index-yml-based-installer.js.map +0 -1
- package/dist/utils/index-yml.js +0 -124
- package/dist/utils/index-yml.js.map +0 -1
- package/dist/utils/md-frontmatter.js +0 -3
- package/dist/utils/md-frontmatter.js.map +0 -1
- package/dist/utils/package-link-yml.js +0 -92
- package/dist/utils/package-link-yml.js.map +0 -1
- package/dist/utils/platform-discovery.js +0 -2
- package/dist/utils/platform-discovery.js.map +0 -1
- package/dist/utils/platform-frontmatter-split.js +0 -15
- package/dist/utils/platform-frontmatter-split.js.map +0 -1
- package/dist/utils/timestamp-encoder.js +0 -13
- package/dist/utils/timestamp-encoder.js.map +0 -1
- package/dist/utils/wip-versioning.js +0 -24
- package/dist/utils/wip-versioning.js.map +0 -1
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
* Handles merging platform-specific frontmatter from workspace into universal files
|
|
4
4
|
* and platform-specific override files during save operations.
|
|
5
5
|
*/
|
|
6
|
-
import { join } from 'path';
|
|
6
|
+
import { dirname, join } from 'path';
|
|
7
7
|
import * as yaml from 'js-yaml';
|
|
8
|
-
import { FILE_PATTERNS } from '../../constants/index.js';
|
|
9
|
-
import { exists, readTextFile, writeTextFile
|
|
8
|
+
import { DIR_PATTERNS, FILE_PATTERNS } from '../../constants/index.js';
|
|
9
|
+
import { ensureDir, exists, readTextFile, writeTextFile } from '../../utils/fs.js';
|
|
10
10
|
import { getFileMtime } from '../../utils/file-processing.js';
|
|
11
11
|
import { safePrompts } from '../../utils/prompts.js';
|
|
12
12
|
import { logger } from '../../utils/logger.js';
|
|
@@ -16,8 +16,9 @@ import { UTF8_ENCODING } from './constants.js';
|
|
|
16
16
|
import { deepMerge } from '../../utils/platform-yaml-merge.js';
|
|
17
17
|
/**
|
|
18
18
|
* Build frontmatter merge plans for all markdown files with platform-specific variants.
|
|
19
|
+
* Uses the local universal frontmatter as the source of truth.
|
|
19
20
|
*/
|
|
20
|
-
export function buildFrontmatterMergePlans(groups) {
|
|
21
|
+
export async function buildFrontmatterMergePlans(packageDir, groups) {
|
|
21
22
|
const plans = [];
|
|
22
23
|
for (const group of groups) {
|
|
23
24
|
if (!group.registryPath.endsWith(FILE_PATTERNS.MD_FILES)) {
|
|
@@ -28,6 +29,10 @@ export function buildFrontmatterMergePlans(groups) {
|
|
|
28
29
|
if (!group.local) {
|
|
29
30
|
continue;
|
|
30
31
|
}
|
|
32
|
+
const universalPath = group.local.fullPath ?? join(packageDir, group.registryPath);
|
|
33
|
+
if (!(await exists(universalPath))) {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
31
36
|
const platformMap = new Map();
|
|
32
37
|
for (const candidate of group.workspace) {
|
|
33
38
|
if (!candidate.isMarkdown)
|
|
@@ -53,11 +58,15 @@ export function buildFrontmatterMergePlans(groups) {
|
|
|
53
58
|
markdownBody
|
|
54
59
|
});
|
|
55
60
|
}
|
|
56
|
-
const
|
|
61
|
+
const localUniversalFrontmatter = group.local.frontmatter
|
|
62
|
+
? normalizeFrontmatter(group.local.frontmatter)
|
|
63
|
+
: {};
|
|
57
64
|
const platformOverrides = new Map();
|
|
58
65
|
for (const entry of workspaceEntries) {
|
|
59
66
|
const base = cloneYaml(entry.frontmatter);
|
|
60
|
-
const override =
|
|
67
|
+
const override = Object.keys(localUniversalFrontmatter).length > 0
|
|
68
|
+
? subtractKeys(base, localUniversalFrontmatter)
|
|
69
|
+
: base;
|
|
61
70
|
const normalizedOverride = override && (!isPlainObject(override) || Object.keys(override).length > 0)
|
|
62
71
|
? override
|
|
63
72
|
: undefined;
|
|
@@ -66,7 +75,9 @@ export function buildFrontmatterMergePlans(groups) {
|
|
|
66
75
|
plans.push({
|
|
67
76
|
registryPath: group.registryPath,
|
|
68
77
|
workspaceEntries,
|
|
69
|
-
|
|
78
|
+
localUniversalFrontmatter: localUniversalFrontmatter && Object.keys(localUniversalFrontmatter).length > 0
|
|
79
|
+
? cloneYaml(localUniversalFrontmatter)
|
|
80
|
+
: undefined,
|
|
70
81
|
platformOverrides
|
|
71
82
|
});
|
|
72
83
|
}
|
|
@@ -124,13 +135,13 @@ function intersectFrontmatter(base, other) {
|
|
|
124
135
|
/**
|
|
125
136
|
* Get the relative path for a platform-specific override file.
|
|
126
137
|
*/
|
|
127
|
-
function getOverrideRelativePath(registryPath, platform) {
|
|
138
|
+
export function getOverrideRelativePath(registryPath, platform) {
|
|
128
139
|
const parsed = parseUniversalPath(registryPath, { allowPlatformSuffix: false });
|
|
129
140
|
if (!parsed) {
|
|
130
141
|
return null;
|
|
131
142
|
}
|
|
132
143
|
const base = parsed.relPath.replace(/\.md$/, '');
|
|
133
|
-
return `${parsed.universalSubdir}/${base}.${platform}.yml`;
|
|
144
|
+
return `${DIR_PATTERNS.OPENPACKAGE}/${parsed.universalSubdir}/${base}.${platform}.yml`;
|
|
134
145
|
}
|
|
135
146
|
/**
|
|
136
147
|
* Resolve override decisions for each platform, handling conflicts based on mtime.
|
|
@@ -171,39 +182,51 @@ export async function resolveOverrideDecisions(packageDir, plan) {
|
|
|
171
182
|
else {
|
|
172
183
|
localFrontmatter = undefined;
|
|
173
184
|
}
|
|
174
|
-
const
|
|
175
|
-
?
|
|
176
|
-
: localFrontmatter;
|
|
177
|
-
const normalizedLocal = adjustedLocal && (!isPlainObject(adjustedLocal) || Object.keys(adjustedLocal).length > 0)
|
|
178
|
-
? adjustedLocal
|
|
185
|
+
const normalizedLocal = localFrontmatter && (!isPlainObject(localFrontmatter) || Object.keys(localFrontmatter).length > 0)
|
|
186
|
+
? localFrontmatter
|
|
179
187
|
: undefined;
|
|
180
188
|
const normalizedWorkspace = workspaceFrontmatter && (!isPlainObject(workspaceFrontmatter) || Object.keys(workspaceFrontmatter).length > 0)
|
|
181
189
|
? workspaceFrontmatter
|
|
182
190
|
: undefined;
|
|
183
191
|
// Deep-merge-based equality: compare merged results (base + override)
|
|
184
192
|
// This matches the runtime behavior of mergePlatformYamlOverride
|
|
185
|
-
const baseForMerge = plan.
|
|
193
|
+
const baseForMerge = plan.localUniversalFrontmatter
|
|
194
|
+
? cloneYaml(plan.localUniversalFrontmatter)
|
|
195
|
+
: {};
|
|
186
196
|
const mergedWorkspace = deepMerge(cloneYaml(baseForMerge), normalizedWorkspace ?? {});
|
|
187
197
|
const mergedLocal = deepMerge(cloneYaml(baseForMerge), normalizedLocal ?? {});
|
|
188
198
|
const differs = !deepEqualYaml(mergedWorkspace, mergedLocal);
|
|
199
|
+
const hadConflict = differs && normalizedLocal !== undefined;
|
|
189
200
|
let finalFrontmatter = normalizedWorkspace;
|
|
190
201
|
let source = 'workspace';
|
|
202
|
+
let effectiveFrontmatter = mergedWorkspace;
|
|
191
203
|
if (differs && normalizedLocal !== undefined) {
|
|
192
204
|
if (localMtime !== undefined && workspaceMtime > localMtime) {
|
|
193
205
|
const decision = await promptYamlOverrideDecision(platform, plan.registryPath, entry.candidate.displayPath, relativePath);
|
|
194
206
|
if (decision === 'local') {
|
|
195
207
|
finalFrontmatter = normalizedLocal;
|
|
196
208
|
source = 'local';
|
|
209
|
+
effectiveFrontmatter = mergedLocal;
|
|
197
210
|
}
|
|
198
211
|
}
|
|
199
212
|
else if (localMtime !== undefined && localMtime >= workspaceMtime) {
|
|
200
213
|
finalFrontmatter = normalizedLocal;
|
|
201
214
|
source = 'local';
|
|
215
|
+
effectiveFrontmatter = mergedLocal;
|
|
216
|
+
}
|
|
217
|
+
else if (localMtime === undefined) {
|
|
218
|
+
// SAFETY: If we cannot determine mtime, preserve local data.
|
|
219
|
+
// The workspace local cache is the source of truth - when in doubt, don't discard it.
|
|
220
|
+
logger.debug(`Unable to determine mtime for override ${relativePath}, preserving local data as source of truth`);
|
|
221
|
+
finalFrontmatter = normalizedLocal;
|
|
222
|
+
source = 'local';
|
|
223
|
+
effectiveFrontmatter = mergedLocal;
|
|
202
224
|
}
|
|
203
225
|
}
|
|
204
226
|
else if (normalizedLocal !== undefined && normalizedWorkspace === undefined) {
|
|
205
227
|
finalFrontmatter = normalizedLocal;
|
|
206
228
|
source = 'local';
|
|
229
|
+
effectiveFrontmatter = mergedLocal;
|
|
207
230
|
}
|
|
208
231
|
resolutions.set(platform, {
|
|
209
232
|
platform,
|
|
@@ -213,7 +236,9 @@ export async function resolveOverrideDecisions(packageDir, plan) {
|
|
|
213
236
|
localFrontmatter: normalizedLocal,
|
|
214
237
|
localMtime,
|
|
215
238
|
finalFrontmatter,
|
|
216
|
-
source
|
|
239
|
+
source,
|
|
240
|
+
hadConflict,
|
|
241
|
+
effectiveFrontmatter
|
|
217
242
|
});
|
|
218
243
|
}
|
|
219
244
|
return resolutions;
|
|
@@ -239,27 +264,17 @@ async function promptYamlOverrideDecision(platform, registryPath, workspaceFileP
|
|
|
239
264
|
});
|
|
240
265
|
return response.choice;
|
|
241
266
|
}
|
|
242
|
-
/**
|
|
243
|
-
* Create a preview string from YAML data for display in prompts.
|
|
244
|
-
*/
|
|
245
|
-
function createYamlPreview(data) {
|
|
246
|
-
if (!data || (isPlainObject(data) && Object.keys(data).length === 0)) {
|
|
247
|
-
return '[empty]';
|
|
248
|
-
}
|
|
249
|
-
const yamlText = dumpYaml(data);
|
|
250
|
-
const lines = yamlText.split('\n');
|
|
251
|
-
if (lines.length <= 5) {
|
|
252
|
-
return yamlText;
|
|
253
|
-
}
|
|
254
|
-
return `${lines.slice(0, 5).join('\n')}…`;
|
|
255
|
-
}
|
|
256
267
|
/**
|
|
257
268
|
* Apply frontmatter merge plans: resolve conflicts, update universal files, and write overrides.
|
|
258
269
|
*/
|
|
259
270
|
export async function applyFrontmatterMergePlans(packageDir, plans) {
|
|
260
271
|
for (const plan of plans) {
|
|
261
|
-
|
|
262
|
-
|
|
272
|
+
const overrideDecisions = await resolveOverrideDecisions(packageDir, plan);
|
|
273
|
+
plan.overrideDecisions = overrideDecisions;
|
|
274
|
+
const hasConflicts = Array.from(overrideDecisions.values()).some(resolution => resolution.hadConflict);
|
|
275
|
+
if (!hasConflicts) {
|
|
276
|
+
await updateUniversalMarkdown(packageDir, plan);
|
|
277
|
+
}
|
|
263
278
|
await applyOverrideFiles(packageDir, plan);
|
|
264
279
|
}
|
|
265
280
|
}
|
|
@@ -273,9 +288,7 @@ async function updateUniversalMarkdown(packageDir, plan) {
|
|
|
273
288
|
}
|
|
274
289
|
const originalContent = await readTextFile(universalPath);
|
|
275
290
|
const split = splitFrontmatter(originalContent);
|
|
276
|
-
const desiredFrontmatter =
|
|
277
|
-
? cloneYaml(plan.universalFrontmatter)
|
|
278
|
-
: undefined;
|
|
291
|
+
const desiredFrontmatter = computeSharedFrontmatter(plan.workspaceEntries);
|
|
279
292
|
const updatedContent = composeMarkdown(desiredFrontmatter, split.body);
|
|
280
293
|
if (updatedContent !== originalContent) {
|
|
281
294
|
await writeTextFile(universalPath, updatedContent, UTF8_ENCODING);
|
|
@@ -294,16 +307,41 @@ async function applyOverrideFiles(packageDir, plan) {
|
|
|
294
307
|
if (!(await exists(universalPath))) {
|
|
295
308
|
return;
|
|
296
309
|
}
|
|
310
|
+
const universalContent = await readTextFile(universalPath);
|
|
311
|
+
const universalSplit = splitFrontmatter(universalContent);
|
|
312
|
+
const diskUniversalFrontmatter = universalSplit.frontmatter !== null
|
|
313
|
+
? normalizeFrontmatter(universalSplit.frontmatter)
|
|
314
|
+
: {};
|
|
297
315
|
for (const resolution of plan.overrideDecisions.values()) {
|
|
298
316
|
const overridePath = join(packageDir, resolution.relativePath);
|
|
299
|
-
const
|
|
300
|
-
|
|
317
|
+
const { hadConflict, source, effectiveFrontmatter } = resolution;
|
|
318
|
+
// Start from the resolved override (may be workspace or local)
|
|
319
|
+
const selectedFrontmatter = effectiveFrontmatter ?? {};
|
|
320
|
+
// Only when there was a YAML conflict AND user explicitly chose "Workspace",
|
|
321
|
+
// we should update the .yml file even if workspace override is empty.
|
|
322
|
+
// This ensures the local override is replaced with the workspace state.
|
|
323
|
+
const overrideDiff = subtractKeys(cloneYaml(selectedFrontmatter), diskUniversalFrontmatter);
|
|
324
|
+
const normalizedOverride = overrideDiff && (!isPlainObject(overrideDiff) || Object.keys(overrideDiff).length > 0)
|
|
325
|
+
? overrideDiff
|
|
326
|
+
: undefined;
|
|
327
|
+
const userChoseWorkspaceInConflict = hadConflict && source === 'workspace';
|
|
328
|
+
if (normalizedOverride === undefined) {
|
|
329
|
+
if (userChoseWorkspaceInConflict) {
|
|
330
|
+
await ensureDir(dirname(overridePath));
|
|
331
|
+
const emptyYaml = '{}\n';
|
|
332
|
+
if ((await exists(overridePath)) && (await readTextFile(overridePath)) === emptyYaml) {
|
|
333
|
+
continue;
|
|
334
|
+
}
|
|
335
|
+
await writeTextFile(overridePath, emptyYaml, UTF8_ENCODING);
|
|
336
|
+
continue;
|
|
337
|
+
}
|
|
301
338
|
if (await exists(overridePath)) {
|
|
302
|
-
|
|
339
|
+
logger.debug(`Preserving existing override file (computed frontmatter is empty): ${resolution.relativePath}`);
|
|
303
340
|
}
|
|
304
341
|
continue;
|
|
305
342
|
}
|
|
306
|
-
|
|
343
|
+
await ensureDir(dirname(overridePath));
|
|
344
|
+
const yamlContent = `${dumpYaml(normalizedOverride)}\n`;
|
|
307
345
|
if ((await exists(overridePath)) && (await readTextFile(overridePath)) === yamlContent) {
|
|
308
346
|
continue;
|
|
309
347
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-yml-resolution.js","sourceRoot":"","sources":["../../../src/core/save/save-yml-resolution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"save-yml-resolution.js","sourceRoot":"","sources":["../../../src/core/save/save-yml-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,14 @@ import { logger } from '../../utils/logger.js';
|
|
|
11
11
|
* Updates package.yml, markdown frontmatter, index.yml entries, root markers,
|
|
12
12
|
* package directory, and root package.yml dependencies.
|
|
13
13
|
*/
|
|
14
|
-
export async function applyWorkspacePackageRename(cwd,
|
|
15
|
-
const currentName =
|
|
14
|
+
export async function applyWorkspacePackageRename(cwd, packageContext, newName) {
|
|
15
|
+
const currentName = packageContext.config.name;
|
|
16
16
|
if (currentName === newName)
|
|
17
17
|
return;
|
|
18
18
|
logger.debug(`Renaming workspace package files`, { from: currentName, to: newName, cwd });
|
|
19
19
|
// Update package.yml with the new name before further processing
|
|
20
|
-
const updatedConfig = { ...
|
|
21
|
-
await writePackageYml(
|
|
20
|
+
const updatedConfig = { ...packageContext.config, name: newName };
|
|
21
|
+
await writePackageYml(packageContext.packageYmlPath, updatedConfig);
|
|
22
22
|
// Frontmatter and index.yml support removed - no metadata updates needed
|
|
23
23
|
// Update root files containing package markers
|
|
24
24
|
const rootFiles = await discoverAllRootFiles(cwd, currentName);
|
|
@@ -38,8 +38,8 @@ export async function applyWorkspacePackageRename(cwd, packageInfo, newName) {
|
|
|
38
38
|
// Update root package.yml dependencies (project package.yml)
|
|
39
39
|
await updateRootPackageYmlDependencies(cwd, currentName, newName);
|
|
40
40
|
// For sub-packages, move the directory to the new normalized name
|
|
41
|
-
if (
|
|
42
|
-
const currentDir = dirname(
|
|
41
|
+
if (packageContext.location !== 'root') {
|
|
42
|
+
const currentDir = dirname(packageContext.packageYmlPath);
|
|
43
43
|
const targetDir = getLocalPackageDir(cwd, newName);
|
|
44
44
|
if (currentDir !== targetDir) {
|
|
45
45
|
if (await exists(targetDir)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-rename.js","sourceRoot":"","sources":["../../../src/core/save/workspace-rename.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-rename.js","sourceRoot":"","sources":["../../../src/core/save/workspace-rename.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,21 @@ export function getLocalPart(name) {
|
|
|
20
20
|
/**
|
|
21
21
|
* Get all scoped package names in the local registry that share the same local name.
|
|
22
22
|
*/
|
|
23
|
+
const PACKAGE_LIST_CACHE_TTL_MS = 5000;
|
|
24
|
+
let cachedPackageList = null;
|
|
25
|
+
let cachedPackageListTimestamp = 0;
|
|
26
|
+
async function getCachedPackageList() {
|
|
27
|
+
const now = Date.now();
|
|
28
|
+
if (cachedPackageList && now - cachedPackageListTimestamp < PACKAGE_LIST_CACHE_TTL_MS) {
|
|
29
|
+
return cachedPackageList;
|
|
30
|
+
}
|
|
31
|
+
cachedPackageList = await listAllPackages();
|
|
32
|
+
cachedPackageListTimestamp = now;
|
|
33
|
+
return cachedPackageList;
|
|
34
|
+
}
|
|
23
35
|
export async function findScopedVariantsInRegistry(baseName) {
|
|
24
36
|
const normalizedBase = normalizePackageName(baseName);
|
|
25
|
-
const packages = await
|
|
37
|
+
const packages = await getCachedPackageList();
|
|
26
38
|
return packages.filter(candidate => {
|
|
27
39
|
const match = candidate.match(SCOPED_PACKAGE_REGEX);
|
|
28
40
|
if (!match) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-scoping.js","sourceRoot":"","sources":["../../../src/core/scoping/package-scoping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC/C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,QAAgB;IACjE,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"package-scoping.js","sourceRoot":"","sources":["../../../src/core/scoping/package-scoping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { join } from 'path';
|
|
2
|
-
import {
|
|
3
|
-
import { buildPlatformSearchConfig } from '../discovery/platform-discovery.js';
|
|
4
|
-
import { getPlatformDefinition, getAllPlatforms } from '../platforms.js';
|
|
2
|
+
import { getDetectedPlatforms, getPlatformDefinition, getAllPlatforms } from '../platforms.js';
|
|
5
3
|
import { exists, walkFiles, readTextFile } from '../../utils/fs.js';
|
|
6
4
|
import { extractPackageContentFromRootFile } from '../../utils/root-file-extractor.js';
|
|
7
5
|
/**
|
|
@@ -16,15 +14,10 @@ export async function discoverPackagesForStatus(packageNames) {
|
|
|
16
14
|
result.set(packageName, { aiFiles: [], platforms: {}, rootFiles: [] });
|
|
17
15
|
}
|
|
18
16
|
// Use same platform detection as uninstall
|
|
19
|
-
const
|
|
20
|
-
// Process each platform
|
|
21
|
-
for (const
|
|
22
|
-
|
|
23
|
-
await discoverAIForPackages(cwd, result, packageNames);
|
|
24
|
-
}
|
|
25
|
-
else {
|
|
26
|
-
await discoverPlatformForPackages(cwd, cfg.platform, result, packageNames);
|
|
27
|
-
}
|
|
17
|
+
const platforms = await getDetectedPlatforms(cwd);
|
|
18
|
+
// Process each platform
|
|
19
|
+
for (const platform of platforms) {
|
|
20
|
+
await discoverPlatformForPackages(cwd, platform, result, packageNames);
|
|
28
21
|
}
|
|
29
22
|
// Check root files for all packages
|
|
30
23
|
await discoverRootFilesForPackages(cwd, result, packageNames);
|
|
@@ -43,20 +36,6 @@ export async function discoverPackagesForStatus(packageNames) {
|
|
|
43
36
|
/**
|
|
44
37
|
* Discover AI files for requested packages using same logic as uninstall
|
|
45
38
|
*/
|
|
46
|
-
async function discoverAIForPackages(cwd, result, packageNames) {
|
|
47
|
-
const aiDir = PLATFORM_DIRS.AI;
|
|
48
|
-
const fullAIDir = join(cwd, aiDir);
|
|
49
|
-
if (!(await exists(fullAIDir)))
|
|
50
|
-
return;
|
|
51
|
-
// Use same file discovery as uninstall
|
|
52
|
-
for await (const filePath of walkFiles(fullAIDir)) {
|
|
53
|
-
if (!filePath.endsWith(FILE_PATTERNS.MD_FILES) && !filePath.endsWith(FILE_PATTERNS.MDC_FILES)) {
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
// Frontmatter support removed - cannot determine package ownership
|
|
57
|
-
}
|
|
58
|
-
// Index.yml support removed
|
|
59
|
-
}
|
|
60
39
|
/**
|
|
61
40
|
* Discover platform files for requested packages using same logic as uninstall
|
|
62
41
|
*/
|
|
@@ -68,10 +47,13 @@ async function discoverPlatformForPackages(cwd, platform, result, packageNames)
|
|
|
68
47
|
if (!(await exists(targetDir)))
|
|
69
48
|
continue;
|
|
70
49
|
for await (const fp of walkFiles(targetDir)) {
|
|
71
|
-
const allowedExts = subDef.
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
50
|
+
const allowedExts = subDef.exts;
|
|
51
|
+
if (allowedExts) {
|
|
52
|
+
if (allowedExts.length === 0)
|
|
53
|
+
continue;
|
|
54
|
+
if (!allowedExts.some((ext) => fp.endsWith(ext)))
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
75
57
|
// Frontmatter support removed - cannot determine package ownership
|
|
76
58
|
}
|
|
77
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-file-discovery.js","sourceRoot":"","sources":["../../../src/core/status/status-file-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"status-file-discovery.js","sourceRoot":"","sources":["../../../src/core/status/status-file-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,15 +7,18 @@ import { logger } from '../../utils/logger.js';
|
|
|
7
7
|
import { syncRootFiles } from './root-files-sync.js';
|
|
8
8
|
import { applyPlannedSyncForPackageFiles } from '../../utils/index-based-installer.js';
|
|
9
9
|
export async function performPlatformSync(cwd, packageName, packageVersion, packageFiles, options = {}) {
|
|
10
|
+
const { skipRootSync, packageLocation = 'nested', ...installOptions } = options;
|
|
10
11
|
const detectedPlatforms = await getDetectedPlatforms(cwd);
|
|
11
12
|
logger.debug(`Planning platform sync for package ${packageName}@${packageVersion} across ${detectedPlatforms.length} platforms`);
|
|
12
13
|
const syncOptions = {
|
|
13
|
-
...
|
|
14
|
-
dryRun:
|
|
14
|
+
...installOptions,
|
|
15
|
+
dryRun: installOptions?.dryRun ?? false,
|
|
15
16
|
resolvedPlatforms: detectedPlatforms
|
|
16
17
|
};
|
|
17
|
-
const plannerOutcome = await applyPlannedSyncForPackageFiles(cwd, packageName, packageVersion, packageFiles, detectedPlatforms, syncOptions);
|
|
18
|
-
const rootSyncResult =
|
|
18
|
+
const plannerOutcome = await applyPlannedSyncForPackageFiles(cwd, packageName, packageVersion, packageFiles, detectedPlatforms, syncOptions, packageLocation);
|
|
19
|
+
const rootSyncResult = skipRootSync
|
|
20
|
+
? { created: [], updated: [], skipped: [] }
|
|
21
|
+
: await syncRootFiles(cwd, packageFiles, packageName, detectedPlatforms);
|
|
19
22
|
return {
|
|
20
23
|
created: [...plannerOutcome.operation.installedFiles, ...rootSyncResult.created],
|
|
21
24
|
updated: [...plannerOutcome.operation.updatedFiles, ...rootSyncResult.updated],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-sync.js","sourceRoot":"","sources":["../../../src/core/sync/platform-sync.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"platform-sync.js","sourceRoot":"","sources":["../../../src/core/sync/platform-sync.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAA2B,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAiBvF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAW,EACX,WAAmB,EACnB,cAAsB,EACtB,YAA2B,EAC3B,UAA+B,EAAE;IAEjC,MAAM,EAAE,YAAY,EAAE,eAAe,GAAG,QAAQ,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;IAChF,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAE1D,MAAM,CAAC,KAAK,CACV,sCAAsC,WAAW,IAAI,cAAc,WAAW,iBAAiB,CAAC,MAAM,YAAY,CACnH,CAAC;IAEF,MAAM,WAAW,GAAmB;QAClC,GAAG,cAAc;QACjB,MAAM,EAAE,cAAc,EAAE,MAAM,IAAI,KAAK;QACvC,iBAAiB,EAAE,iBAAiB;KACrC,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D,GAAG,EACH,WAAW,EACX,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,eAAe,CAChB,CAAC;IAEF,MAAM,cAAc,GAAuB,YAAY;QACrD,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3C,CAAC,CAAC,MAAM,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAE3E,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC;QAChF,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC;QAC9E,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,YAAY;KAC/C,CAAC;AACJ,CAAC"}
|
|
@@ -26,8 +26,16 @@ export async function syncRootFiles(cwd, packageFiles, packageName, platforms) {
|
|
|
26
26
|
updated: [],
|
|
27
27
|
skipped: []
|
|
28
28
|
};
|
|
29
|
+
// Always sync universal AGENTS.md to ./AGENTS.md regardless of platform detection
|
|
30
|
+
const universalAgentsFile = packageFiles.find(file => getPathLeaf(file.path) === FILE_PATTERNS.AGENTS_MD);
|
|
31
|
+
if (universalAgentsFile) {
|
|
32
|
+
const agentsResult = await syncUniversalAgentsFile(cwd, universalAgentsFile, packageName);
|
|
33
|
+
result.created.push(...agentsResult.created);
|
|
34
|
+
result.updated.push(...agentsResult.updated);
|
|
35
|
+
result.skipped.push(...agentsResult.skipped);
|
|
36
|
+
}
|
|
29
37
|
if (platforms.length === 0) {
|
|
30
|
-
logger.debug('No platforms provided, skipping root file sync');
|
|
38
|
+
logger.debug('No platforms provided, skipping platform-specific root file sync');
|
|
31
39
|
return result;
|
|
32
40
|
}
|
|
33
41
|
// Filter package files to only root files
|
|
@@ -56,6 +64,56 @@ export async function syncRootFiles(cwd, packageFiles, packageName, platforms) {
|
|
|
56
64
|
result.skipped = Array.from(new Set(result.skipped));
|
|
57
65
|
return result;
|
|
58
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Sync universal AGENTS.md to ./AGENTS.md without requiring platform detection
|
|
69
|
+
*/
|
|
70
|
+
async function syncUniversalAgentsFile(cwd, rootFile, packageName) {
|
|
71
|
+
const result = {
|
|
72
|
+
created: [],
|
|
73
|
+
updated: [],
|
|
74
|
+
skipped: []
|
|
75
|
+
};
|
|
76
|
+
const sectionBody = rootFile.content.trim();
|
|
77
|
+
if (!sectionBody) {
|
|
78
|
+
logger.warn('Empty section for AGENTS.md, skipping universal sync');
|
|
79
|
+
result.skipped.push(rootFile.path);
|
|
80
|
+
return result;
|
|
81
|
+
}
|
|
82
|
+
const targetPath = `${cwd}/${FILE_PATTERNS.AGENTS_MD}`;
|
|
83
|
+
let existingContent = '';
|
|
84
|
+
let fileExists = false;
|
|
85
|
+
if (await exists(targetPath)) {
|
|
86
|
+
try {
|
|
87
|
+
existingContent = await readTextFile(targetPath, 'utf8');
|
|
88
|
+
fileExists = true;
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
logger.warn(`Failed to read existing AGENTS.md at ${targetPath}: ${error}`);
|
|
92
|
+
result.skipped.push(FILE_PATTERNS.AGENTS_MD);
|
|
93
|
+
return result;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
const existingSectionContent = fileExists
|
|
97
|
+
? extractPackageContentFromRootFile(existingContent, packageName)?.trim() ?? null
|
|
98
|
+
: null;
|
|
99
|
+
if (existingSectionContent !== null && existingSectionContent === sectionBody) {
|
|
100
|
+
logger.debug(`Universal AGENTS.md section unchanged at ${targetPath} (pkg: ${packageName})`);
|
|
101
|
+
return result;
|
|
102
|
+
}
|
|
103
|
+
const mergedContent = mergePackageContentIntoRootFile(existingContent, packageName, sectionBody);
|
|
104
|
+
await ensureDir(cwd);
|
|
105
|
+
await writeTextFile(targetPath, mergedContent, 'utf8');
|
|
106
|
+
const relativePath = relative(cwd, targetPath);
|
|
107
|
+
if (fileExists) {
|
|
108
|
+
result.updated.push(relativePath);
|
|
109
|
+
logger.debug(`Updated universal AGENTS.md at ${targetPath}`);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
result.created.push(relativePath);
|
|
113
|
+
logger.debug(`Created universal AGENTS.md at ${targetPath}`);
|
|
114
|
+
}
|
|
115
|
+
return result;
|
|
116
|
+
}
|
|
59
117
|
/**
|
|
60
118
|
* Check if a file path represents a root file
|
|
61
119
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root-files-sync.js","sourceRoot":"","sources":["../../../src/core/sync/root-files-sync.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"root-files-sync.js","sourceRoot":"","sources":["../../../src/core/sync/root-files-sync.ts"],"names":[],"mappings":"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"}
|