@pennyfarthing/core 10.4.0 → 11.0.0

package/packages/core/dist/cli/utils/settings-merge.js

@@ -0,0 +1,303 @@
+/**
+ * Shared merge model for settings.local.json
+ * Enables multi-framework coexistence with namespace isolation.
+ *
+ * Story 98-11: Settings.local.json shared merge model for multi-framework coexistence
+ *
+ * Each framework contributes its settings under a namespace key.
+ * The merge engine combines contributions into a flat output that
+ * Claude Code can consume unchanged.
+ */
+// =============================================================================
+// Schema Version
+// =============================================================================
+export const SHARED_SETTINGS_VERSION = 2;
+// =============================================================================
+// Internal helpers
+// =============================================================================
+/**
+ * Serialise a HookEntry to a string key for dedup purposes.
+ */
+function hookEntryKey(entry) {
+    const cmds = entry.hooks.map(h => h.command).join('|');
+    return `${entry.matcher ?? ''}::${cmds}`;
+}
+/**
+ * Re-compute merged output fields from contributions and framework metadata.
+ */
+function remerge(settings) {
+    settings.hooks = mergeHooks(settings._contributions);
+    settings.permissions = mergePermissions(settings._contributions);
+    settings.statusLine = resolveScalar(settings._contributions, settings._frameworks, 'statusLine');
+    settings.context_budget = resolveScalar(settings._contributions, settings._frameworks, 'context_budget');
+}
+// =============================================================================
+// Core Functions
+// =============================================================================
+/**
+ * Create an empty SharedSettings structure.
+ */
+export function createEmptySharedSettings() {
+    return {
+        _version: SHARED_SETTINGS_VERSION,
+        _frameworks: {},
+        _contributions: {},
+        hooks: {},
+        permissions: { allow: [] },
+    };
+}
+/**
+ * Add or update a framework's contribution to the shared settings.
+ * Re-merges all contributions after updating.
+ */
+export function contributeFrameworkSettings(settings, frameworkId, contribution) {
+    const result = JSON.parse(JSON.stringify(settings));
+    // Store contribution
+    result._contributions[frameworkId] = JSON.parse(JSON.stringify(contribution));
+    // Store/update framework metadata — preserve existing installed_at on updates
+    const existing = result._frameworks[frameworkId];
+    result._frameworks[frameworkId] = {
+        version: contribution.version,
+        installed_at: existing?.installed_at ?? new Date().toISOString(),
+        ...(existing?.priority != null ? { priority: existing.priority } : {}),
+    };
+    // Recompute merged output
+    remerge(result);
+    // Detect conflicts
+    const conflicts = detectConflicts(result._contributions);
+    return { settings: result, conflicts };
+}
+/**
+ * Remove a framework's contribution from the shared settings.
+ * Re-merges remaining contributions.
+ */
+export function removeFrameworkSettings(settings, frameworkId) {
+    const result = JSON.parse(JSON.stringify(settings));
+    if (!(frameworkId in result._contributions)) {
+        return result;
+    }
+    delete result._contributions[frameworkId];
+    delete result._frameworks[frameworkId];
+    // Recompute merged output
+    remerge(result);
+    return result;
+}
+/**
+ * Merge all framework hook contributions into a unified hooks object.
+ * Hooks from different frameworks are concatenated per hook type.
+ * Duplicate commands within same framework are deduplicated.
+ */
+export function mergeHooks(contributions) {
+    const merged = {};
+    for (const frameworkId of Object.keys(contributions)) {
+        const hooks = contributions[frameworkId].hooks;
+        if (!hooks)
+            continue;
+        for (const hookType of Object.keys(hooks)) {
+            if (!merged[hookType]) {
+                merged[hookType] = [];
+            }
+            // Deduplicate within this framework
+            const seen = new Set();
+            for (const entry of hooks[hookType]) {
+                const key = hookEntryKey(entry);
+                if (seen.has(key))
+                    continue;
+                seen.add(key);
+                merged[hookType].push(JSON.parse(JSON.stringify(entry)));
+            }
+        }
+    }
+    return merged;
+}
+/**
+ * Merge all framework permission contributions into a unified allow list.
+ * Permissions are unioned, deduplicated, and sorted alphabetically.
+ */
+export function mergePermissions(contributions) {
+    const allPerms = new Set();
+    for (const frameworkId of Object.keys(contributions)) {
+        const perms = contributions[frameworkId].permissions;
+        if (!perms?.allow)
+            continue;
+        for (const p of perms.allow) {
+            allPerms.add(p);
+        }
+    }
+    return { allow: [...allPerms].sort() };
+}
+/**
+ * Resolve scalar values (statusLine, context_budget) from multiple frameworks.
+ * Uses framework priority (lower number = higher priority).
+ * Falls back to alphabetical ordering if priority is equal.
+ */
+export function resolveScalar(contributions, frameworks, key) {
+    // Collect frameworks that contribute this key
+    const candidates = [];
+    for (const frameworkId of Object.keys(contributions)) {
+        const val = contributions[frameworkId][key];
+        if (val !== undefined && val !== null) {
+            candidates.push({ frameworkId, value: val });
+        }
+    }
+    if (candidates.length === 0)
+        return undefined;
+    // Sort by priority (lower = higher priority), then alphabetical
+    candidates.sort((a, b) => {
+        const aPri = frameworks[a.frameworkId]?.priority ?? Infinity;
+        const bPri = frameworks[b.frameworkId]?.priority ?? Infinity;
+        if (aPri !== bPri)
+            return aPri - bPri;
+        return a.frameworkId.localeCompare(b.frameworkId);
+    });
+    return candidates[0].value;
+}
+/**
+ * Detect conflicts between framework contributions.
+ * Returns list of conflicts found.
+ */
+export function detectConflicts(contributions) {
+    const conflicts = [];
+    const frameworkIds = Object.keys(contributions);
+    if (frameworkIds.length < 2)
+        return [];
+    // Check for duplicate hook commands across frameworks
+    // Build a map of command → list of frameworks
+    const hookCommandMap = {};
+    for (const fwId of frameworkIds) {
+        const hooks = contributions[fwId].hooks;
+        if (!hooks)
+            continue;
+        for (const hookType of Object.keys(hooks)) {
+            if (!hookCommandMap[hookType])
+                hookCommandMap[hookType] = {};
+            for (const entry of hooks[hookType]) {
+                for (const h of entry.hooks) {
+                    if (!hookCommandMap[hookType][h.command]) {
+                        hookCommandMap[hookType][h.command] = [];
+                    }
+                    if (!hookCommandMap[hookType][h.command].includes(fwId)) {
+                        hookCommandMap[hookType][h.command].push(fwId);
+                    }
+                }
+            }
+        }
+    }
+    for (const hookType of Object.keys(hookCommandMap)) {
+        for (const command of Object.keys(hookCommandMap[hookType])) {
+            const fws = hookCommandMap[hookType][command];
+            if (fws.length > 1) {
+                conflicts.push({
+                    type: 'hook_duplicate',
+                    frameworks: [...fws],
+                    key: `hooks.${hookType}`,
+                    detail: `Duplicate hook command "${command}" in ${hookType} from frameworks: ${fws.join(', ')}`,
+                });
+            }
+        }
+    }
+    // Check for scalar collisions (statusLine, context_budget)
+    for (const scalarKey of ['statusLine', 'context_budget']) {
+        const contributors = [];
+        for (const fwId of frameworkIds) {
+            if (contributions[fwId][scalarKey] !== undefined) {
+                contributors.push(fwId);
+            }
+        }
+        if (contributors.length > 1) {
+            conflicts.push({
+                type: 'scalar_collision',
+                frameworks: contributors,
+                key: scalarKey,
+                detail: `Multiple frameworks contribute ${scalarKey}: ${contributors.join(', ')}`,
+            });
+        }
+    }
+    return conflicts;
+}
+/**
+ * Migrate a legacy (v1) settings.local.json to the shared (v2) format.
+ * The existing content is attributed to the specified framework.
+ */
+export function migrateToSharedFormat(legacySettings, frameworkId, frameworkVersion) {
+    const settings = createEmptySharedSettings();
+    // Extract known fields into a contribution
+    const contribution = {
+        version: frameworkVersion,
+    };
+    if (legacySettings.hooks && typeof legacySettings.hooks === 'object') {
+        contribution.hooks = legacySettings.hooks;
+    }
+    if (legacySettings.permissions && typeof legacySettings.permissions === 'object') {
+        contribution.permissions = legacySettings.permissions;
+    }
+    if (legacySettings.statusLine && typeof legacySettings.statusLine === 'object') {
+        contribution.statusLine = legacySettings.statusLine;
+    }
+    if (legacySettings.context_budget && typeof legacySettings.context_budget === 'object') {
+        contribution.context_budget = legacySettings.context_budget;
+    }
+    // Store contribution and metadata
+    settings._contributions[frameworkId] = contribution;
+    settings._frameworks[frameworkId] = {
+        version: frameworkVersion,
+        installed_at: new Date().toISOString(),
+    };
+    // Recompute merged output
+    remerge(settings);
+    return settings;
+}
+/**
+ * Check if a settings object is in the shared (v2) format.
+ */
+export function isSharedFormat(settings) {
+    if (typeof settings !== 'object' || settings === null)
+        return false;
+    return settings._version === SHARED_SETTINGS_VERSION;
+}
+/**
+ * Export the merged settings in Claude Code-compatible flat format.
+ * Strips internal _version, _frameworks, _contributions fields.
+ */
+export function toFlatFormat(settings) {
+    const flat = {};
+    flat.hooks = JSON.parse(JSON.stringify(settings.hooks));
+    flat.permissions = JSON.parse(JSON.stringify(settings.permissions));
+    if (settings.statusLine) {
+        flat.statusLine = JSON.parse(JSON.stringify(settings.statusLine));
+    }
+    if (settings.context_budget) {
+        flat.context_budget = JSON.parse(JSON.stringify(settings.context_budget));
+    }
+    return flat;
+}
+/**
+ * Validate a SharedSettings structure.
+ */
+export function validateSharedSettings(settings) {
+    const errors = [];
+    if (typeof settings !== 'object' || settings === null) {
+        return { valid: false, errors: ['Settings must be a non-null object'] };
+    }
+    const s = settings;
+    if (s._version === undefined) {
+        errors.push('Missing _version field');
+    }
+    else if (s._version !== SHARED_SETTINGS_VERSION) {
+        errors.push(`Invalid _version: expected ${SHARED_SETTINGS_VERSION}, got ${s._version}`);
+    }
+    if (s._frameworks === undefined || typeof s._frameworks !== 'object' || s._frameworks === null) {
+        errors.push('Missing or invalid _frameworks field');
+    }
+    if (s._contributions === undefined || typeof s._contributions !== 'object' || s._contributions === null) {
+        errors.push('Missing or invalid _contributions field');
+    }
+    if (s.hooks === undefined || typeof s.hooks !== 'object') {
+        errors.push('Missing or invalid hooks field');
+    }
+    if (s.permissions === undefined || typeof s.permissions !== 'object') {
+        errors.push('Missing or invalid permissions field');
+    }
+    return { valid: errors.length === 0, errors };
+}
+//# sourceMappingURL=settings-merge.js.map

package/packages/core/dist/cli/utils/settings-merge.js.map

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

package/packages/core/dist/cli/utils/settings-merge.test.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Tests for Story 98-11: Settings.local.json shared merge model for multi-framework coexistence
+ *
+ * Acceptance Criteria:
+ * AC1: Namespace/section approach — each framework contributes settings under its own key
+ * AC2: Merge conflict resolution — hooks concatenated, permissions unioned, scalars priority-based
+ * AC3: Migration from legacy v1 format to v2 shared format
+ * AC4: Rollback — removing a framework cleanly extracts its contributions
+ * AC5: Backward compatibility — v2 exports flat format compatible with Claude Code
+ * AC6: Validation and error handling
+ *
+ * Run with: cd packages/core && npm run build && npm test
+ */
+export {};
+//# sourceMappingURL=settings-merge.test.d.ts.map

package/packages/core/dist/cli/utils/settings-merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings-merge.test.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/settings-merge.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG"}