@open-agent-toolkit/cli 0.1.73 → 0.1.76

package/dist/commands/status/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/status/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/status/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/status/index.js

@@ -1,14 +1,15 @@
 import { basename, join, relative } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
 import { adoptStrayToCanonical, isAdoptionConflictError, } from '../shared/adopt-stray.js';
-import { detectCodexRoleStrays, regenerateCodexAfterAdoption, } from '../shared/codex-strays.js';
+import { detectCodexRoleStrays, filterMaterializationManagedStrays, regenerateCodexAfterAdoption, } from '../shared/codex-strays.js';
+import { applyCursorSkillDisposition, isCursorSkillCandidate, } from '../shared/cursor-skill-disposition.js';
 import { withScopeOption } from '../shared/scope-option.js';
-import { confirmAction, selectManyWithAbort, } from '../shared/shared.prompts.js';
+import { confirmAction, selectManyWithAbort, selectWithAbort, } from '../shared/shared.prompts.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, } from '../../config/index.js';
-import { readUserConfig } from '../../config/oat-config.js';
+import { resolveUserSyncConfig } from '../../config/user-sync-config.js';
 import { detectDrift, detectStrays, filterKnownStrays, } from '../../drift/index.js';
-import { HOOK_DRIFT_WARNING, HOOK_STRAY_INFO, scanBundledManagedCodexAgents, scanCanonical, } from '../../engine/index.js';
+import { HOOK_DRIFT_WARNING, HOOK_STRAY_INFO, scanBundledManagedAgents, scanCanonical, } from '../../engine/index.js';
 import { normalizeToPosixPath, resolveProjectRoot, resolveScopeRoot, } from '../../fs/paths.js';
 import { loadManifest, saveManifest } from '../../manifest/manager.js';
 import { claudeAdapter } from '../../providers/claude/index.js';
@@ -16,8 +17,10 @@ import { codexAdapter } from '../../providers/codex/index.js';
 import { applyCodexProjectExtensionPlan, computeCodexProjectExtensionPlan, } from '../../providers/codex/codec/sync-extension.js';
 import { copilotAdapter } from '../../providers/copilot/index.js';
 import { cursorAdapter } from '../../providers/cursor/index.js';
+import { applyCursorProjectExtensionPlan, computeCursorProjectExtensionPlan, } from '../../providers/cursor/codec/sync-extension.js';
 import { geminiAdapter } from '../../providers/gemini/index.js';
 import { getActiveAdapters, getSyncMappings, } from '../../providers/shared/index.js';
+import { getAdoptionSources } from '../../providers/shared/adapter.utils.js';
 import { SCOPE_CONTENT_TYPES, } from '../../shared/types.js';
 import { formatStatusTable } from '../../ui/output.js';
 import { Command } from 'commander';
@@ -34,10 +37,10 @@ const DEFAULT_DEPENDENCIES = {
     async loadSyncConfig(configPath) {
         return loadSyncConfig(configPath, DEFAULT_SYNC_CONFIG);
     },
-    readUserConfig,
+    resolveUserSyncConfig,
     saveManifest,
     scanCanonical,
-    scanBundledManagedCodexAgents,
+    scanBundledManagedAgents,
     getAdapters() {
         return [
             claudeAdapter,
@@ -49,14 +52,19 @@ const DEFAULT_DEPENDENCIES = {
     },
     getActiveAdapters,
     getSyncMappings,
+    getAdoptionSources,
     detectDrift,
     detectStrays,
     detectCodexRoleStrays,
     computeCodexProjectExtensionPlan,
     applyCodexProjectExtensionPlan,
+    computeCursorProjectExtensionPlan,
+    applyCursorProjectExtensionPlan,
     selectManyWithAbort,
+    selectWithAbort,
     confirmAction,
     adoptStray: adoptStrayDefault,
+    applyCursorSkillDisposition,
     formatStatusTable,
 };
 function entryInsideMapping(entryProviderPath, mappingProviderDir) {
@@ -122,19 +130,52 @@ async function collectScopeReports(scope, context, dependencies) {
     const manifestPath = join(scopeRoot, '.oat', 'sync', 'manifest.json');
     const syncConfigPath = join(scopeRoot, '.oat', 'sync', 'config.json');
     const userConfigDir = join(context.home, '.oat');
-    const [manifest, canonicalEntries, syncConfig, userConfig] = await Promise.all([
+    const [manifest, canonicalEntries, syncConfig, userSyncConfig] = await Promise.all([
         dependencies.loadManifest(manifestPath),
         dependencies.scanCanonical(scopeRoot, scope),
         dependencies.loadSyncConfig(syncConfigPath),
-        dependencies.readUserConfig(userConfigDir),
+        dependencies.resolveUserSyncConfig(userConfigDir),
     ]);
     const adapters = dependencies.getAdapters();
     const activeAdapters = await dependencies.getActiveAdapters(adapters, scopeRoot);
     const reports = [];
     const strayCandidates = [];
     const trackedCanonicalByProvider = new Set(manifest.entries.map((entry) => `${entry.provider}|${normalizeToPosixPath(entry.canonicalPath)}`));
+    const activeProviderNames = new Set(activeAdapters.map((adapter) => adapter.name));
+    const extensionCanonicalEntries = scope === 'user' &&
+        (activeProviderNames.has('codex') || activeProviderNames.has('cursor'))
+        ? [
+            ...canonicalEntries,
+            ...(await dependencies.scanBundledManagedAgents()),
+        ]
+        : canonicalEntries;
+    const codexExtensionPlan = activeProviderNames.has('codex')
+        ? await dependencies.computeCodexProjectExtensionPlan(scopeRoot, extensionCanonicalEntries, undefined, { userConfigDir })
+        : undefined;
+    const cursorExtensionPlan = activeProviderNames.has('cursor')
+        ? await dependencies.computeCursorProjectExtensionPlan(scopeRoot, extensionCanonicalEntries, undefined, { userConfigDir })
+        : undefined;
+    const materializationPlans = [
+        ...(codexExtensionPlan
+            ? [
+                {
+                    provider: 'codex',
+                    operations: codexExtensionPlan.operations.map((operation) => ({
+                        ...operation,
+                        provider: 'codex',
+                        entryName: operation.roleName,
+                    })),
+                    managedEntries: codexExtensionPlan.managedRoles,
+                    aggregateHash: codexExtensionPlan.aggregateConfigHash,
+                    metadata: codexExtensionPlan.metadata,
+                },
+            ]
+            : []),
+        ...(cursorExtensionPlan ? [cursorExtensionPlan] : []),
+    ];
     for (const adapter of activeAdapters) {
         const mappings = dependencies.getSyncMappings(adapter, scope);
+        const adoptionSources = dependencies.getAdoptionSources(adapter, scope);
         const mappingContentTypes = new Set(mappings.map((mapping) => mapping.contentType));
         for (const entry of manifest.entries) {
             if (entry.provider !== adapter.name) {
@@ -177,9 +218,9 @@ async function collectScopeReports(scope, context, dependencies) {
                 });
             }
         }
-        for (const mapping of mappings) {
-            const providerDir = join(scopeRoot, mapping.providerDir);
-            const strays = await dependencies.detectStrays(adapter.name, providerDir, manifest, canonicalEntries, mapping);
+        for (const source of adoptionSources) {
+            const providerDir = join(scopeRoot, source.directory);
+            const strays = filterMaterializationManagedStrays((await dependencies.detectStrays(adapter.name, providerDir, manifest, canonicalEntries, source.mapping)).map((report) => ({ provider: adapter.name, report })), materializationPlans).map((candidate) => candidate.report);
             reports.push(...strays);
             for (const stray of strays) {
                 if (stray.state.status !== 'stray') {
@@ -188,29 +229,22 @@ async function collectScopeReports(scope, context, dependencies) {
                 strayCandidates.push({
                     provider: adapter.name,
                     report: stray,
-                    mapping,
+                    mapping: source.mapping,
                 });
             }
         }
     }
-    if (activeAdapters.some((adapter) => adapter.name === 'codex')) {
-        const codexCanonicalEntries = scope === 'user'
-            ? [
-                ...canonicalEntries,
-                ...(await dependencies.scanBundledManagedCodexAgents()),
-            ]
-            : canonicalEntries;
-        const codexExtensionPlan = await dependencies.computeCodexProjectExtensionPlan(scopeRoot, codexCanonicalEntries, undefined, { userConfigDir: join(context.home, '.oat') });
-        for (const operation of codexExtensionPlan.operations) {
+    for (const extensionPlan of materializationPlans) {
+        for (const operation of extensionPlan.operations) {
             if (operation.action === 'skip') {
                 continue;
             }
             if (operation.target === 'role') {
                 reports.push({
-                    canonical: operation.roleName
-                        ? `.agents/agents/${operation.roleName}.md`
+                    canonical: operation.entryName
+                        ? `.agents/agents/${operation.entryName}.md`
                         : null,
-                    provider: 'codex',
+                    provider: extensionPlan.provider,
                     providerPath: operation.path,
                     state: operation.action === 'create'
                         ? { status: 'missing' }
@@ -220,12 +254,14 @@ async function collectScopeReports(scope, context, dependencies) {
             else {
                 reports.push({
                     canonical: null,
-                    provider: 'codex',
+                    provider: extensionPlan.provider,
                     providerPath: operation.path,
                     state: { status: 'drifted', reason: 'modified' },
                 });
             }
         }
+    }
+    if (codexExtensionPlan) {
         const codexStrays = await dependencies.detectCodexRoleStrays(scopeRoot, canonicalEntries, new Set(codexExtensionPlan.managedRoles));
         for (const codexStray of codexStrays) {
             const report = {
@@ -257,16 +293,18 @@ async function collectScopeReports(scope, context, dependencies) {
         candidates: strayCandidates,
         knownStrays: {
             project: syncConfig.knownStrays,
-            user: userConfig.knownStrays,
+            user: userSyncConfig.knownStrays,
         },
     });
     return {
         scope,
         scopeRoot,
         manifestPath,
+        syncConfigPath,
         manifest,
         reports: filtered.reports,
         strayCandidates: filtered.candidates,
+        activeAdapterNames: activeAdapters.map((adapter) => adapter.name),
     };
 }
 async function runStatusCommand(context, dependencies, options = {}) {
@@ -309,44 +347,100 @@ async function runStatusCommand(context, dependencies, options = {}) {
     }
     if (summary.stray > 0) {
         if (context.interactive) {
+            let migrationAborted = false;
             for (const scopeCollection of scopeCollections) {
                 if (scopeCollection.strayCandidates.length === 0) {
                     continue;
                 }
                 let manifestChanged = false;
-                const selectedValues = await dependencies.selectManyWithAbort(`Select stray entries to adopt [${scopeCollection.scope}]`, scopeCollection.strayCandidates.map((strayCandidate, index) => ({
-                    label: formatStrayChoiceLabel(scopeCollection.scope, strayCandidate.report.providerPath, strayCandidate.provider),
-                    value: String(index),
-                    description: formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath),
-                })), { interactive: context.interactive });
-                const selectedIndices = new Set((selectedValues ?? []).map((value) => Number.parseInt(value, 10)));
                 let adoptedCount = 0;
                 let codexStrayAdopted = false;
-                for (const [index, strayCandidate,] of scopeCollection.strayCandidates.entries()) {
-                    if (!selectedIndices.has(index)) {
-                        continue;
+                const cursorSkillStrays = scopeCollection.strayCandidates.filter(isCursorSkillCandidate);
+                const ordinaryStrays = scopeCollection.strayCandidates.filter((stray) => !isCursorSkillCandidate(stray));
+                for (const strayCandidate of cursorSkillStrays) {
+                    const disposition = await dependencies.selectWithAbort(`Migrate Cursor skill [${scopeCollection.scope}]: ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}`, [
+                        {
+                            label: 'Adopt into canonical',
+                            value: 'adopt',
+                            description: `Move to ${strayCandidate.mapping.canonicalDir}.`,
+                        },
+                        {
+                            label: 'Keep Cursor-only',
+                            value: 'keep',
+                            description: 'Leave in .cursor/skills and remember this choice.',
+                        },
+                    ], { interactive: context.interactive });
+                    if (disposition === null) {
+                        migrationAborted = true;
+                        break;
                     }
                     try {
-                        scopeCollection.manifest = await dependencies.adoptStray(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest);
-                        adoptedCount += 1;
-                        manifestChanged = true;
-                        codexStrayAdopted =
-                            codexStrayAdopted || strayCandidate.provider === 'codex';
+                        scopeCollection.manifest =
+                            await dependencies.applyCursorSkillDisposition(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, disposition, scopeCollection.syncConfigPath);
+                        if (disposition === 'adopt') {
+                            adoptedCount += 1;
+                        }
+                        else {
+                            context.logger.success(`Kept Cursor-only [${scopeCollection.scope}]: ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
+                        }
                     }
                     catch (error) {
-                        if (!isAdoptionConflictError(error)) {
+                        if (error instanceof Error &&
+                            error.message.startsWith('Cannot keep ')) {
+                            context.logger.warn(error.message);
+                            continue;
+                        }
+                        if (!isAdoptionConflictError(error) || disposition !== 'adopt') {
                             throw error;
                         }
                         const shouldReplace = await dependencies.confirmAction(`Conflict detected for ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}. Replace canonical with stray content?`, { interactive: context.interactive });
                         if (!shouldReplace) {
-                            context.logger.warn(`Skipped adopting conflicting stray [${scopeCollection.scope}] ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
+                            context.logger.warn(`Skipped adopting conflicting Cursor skill [${scopeCollection.scope}] ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
                             continue;
                         }
-                        scopeCollection.manifest = await dependencies.adoptStray(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, { replaceCanonical: true });
+                        scopeCollection.manifest =
+                            await dependencies.applyCursorSkillDisposition(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, disposition, scopeCollection.syncConfigPath, { replaceCanonical: true });
                         adoptedCount += 1;
-                        manifestChanged = true;
-                        codexStrayAdopted =
-                            codexStrayAdopted || strayCandidate.provider === 'codex';
+                    }
+                }
+                if (!migrationAborted && ordinaryStrays.length > 0) {
+                    const selectedValues = await dependencies.selectManyWithAbort(`Select stray entries to adopt [${scopeCollection.scope}]`, ordinaryStrays.map((strayCandidate, index) => ({
+                        label: formatStrayChoiceLabel(scopeCollection.scope, strayCandidate.report.providerPath, strayCandidate.provider),
+                        value: String(index),
+                        description: formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath),
+                    })), { interactive: context.interactive });
+                    if (selectedValues === null) {
+                        migrationAborted = true;
+                    }
+                    else {
+                        const selectedIndices = new Set(selectedValues.map((value) => Number.parseInt(value, 10)));
+                        for (const [index, strayCandidate] of ordinaryStrays.entries()) {
+                            if (!selectedIndices.has(index)) {
+                                continue;
+                            }
+                            try {
+                                scopeCollection.manifest = await dependencies.adoptStray(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest);
+                                adoptedCount += 1;
+                                manifestChanged = true;
+                                codexStrayAdopted =
+                                    codexStrayAdopted || strayCandidate.provider === 'codex';
+                            }
+                            catch (error) {
+                                if (!isAdoptionConflictError(error)) {
+                                    throw error;
+                                }
+                                const shouldReplace = await dependencies.confirmAction(`Conflict detected for ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}. Replace canonical with stray content?`, { interactive: context.interactive });
+                                if (!shouldReplace) {
+                                    context.logger.warn(`Skipped adopting conflicting stray [${scopeCollection.scope}] ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
+                                    continue;
+                                }
+                                scopeCollection.manifest = await dependencies.adoptStray(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, { replaceCanonical: true });
+                                adoptedCount += 1;
+                                manifestChanged = true;
+                                codexStrayAdopted =
+                                    codexStrayAdopted || strayCandidate.provider === 'codex';
+                            }
+                        }
                     }
                 }
                 if (codexStrayAdopted && scopeCollection.scope === 'project') {
@@ -356,14 +450,24 @@ async function runStatusCommand(context, dependencies, options = {}) {
                         computeExtensionPlan: dependencies.computeCodexProjectExtensionPlan,
                         applyExtensionPlan: dependencies.applyCodexProjectExtensionPlan,
                     });
+                    if (scopeCollection.activeAdapterNames.includes('cursor')) {
+                        const canonicalEntries = await dependencies.scanCanonical(scopeCollection.scopeRoot, scopeCollection.scope);
+                        const cursorPlan = await dependencies.computeCursorProjectExtensionPlan(scopeCollection.scopeRoot, canonicalEntries, undefined, { userConfigDir: join(context.home, '.oat') });
+                        await dependencies.applyCursorProjectExtensionPlan(scopeCollection.scopeRoot, cursorPlan);
+                    }
                 }
                 if (manifestChanged) {
                     await dependencies.saveManifest(scopeCollection.manifestPath, scopeCollection.manifest);
+                }
+                if (adoptedCount > 0) {
                     context.logger.success(`Adopted ${adoptedCount} stray entr${adoptedCount === 1 ? 'y' : 'ies'} [${scopeCollection.scope}].`);
                 }
-                else {
+                else if (!migrationAborted) {
                     context.logger.info(`No stray entries adopted [${scopeCollection.scope}].`);
                 }
+                if (migrationAborted) {
+                    break;
+                }
             }
         }
         else if (!context.json) {

package/dist/commands/sync/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAgEtB,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,aAAa,EAAE,EAC3B,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,IAAI,CAAC,CA8Ef"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAyEtB,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,aAAa,EAAE,EAC3B,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,IAAI,CAAC,CAyGf"}

package/dist/commands/sync/apply.js

@@ -2,11 +2,13 @@ import { OAT_VERSION } from '../../shared/oat-version.js';
 import { countPlannedOperations } from './sync.utils.js';
 function countSkippedEntries(scopePlans) {
     return scopePlans.reduce((total, scopePlan) => {
-        const codexSkipped = scopePlan.codexExtension?.operations.filter((operation) => operation.action === 'skip').length ?? 0;
+        const extensionSkipped = scopePlan.materializationExtensions.reduce((count, extension) => count +
+            extension.operations.filter((operation) => operation.action === 'skip')
+                .length, 0);
         return (total +
             scopePlan.plan.entries.filter((entry) => entry.operation === 'skip')
                 .length +
-            codexSkipped);
+            extensionSkipped);
     }, 0);
 }
 function buildSummary(scopePlans, applied, failed) {
@@ -28,15 +30,19 @@ function formatAppliedOutput(scopePlans, dependencies) {
     return scopePlans
         .map((scopePlan) => {
         const syncOutput = dependencies.formatSyncPlan(scopePlan.plan, true);
-        const codexExtension = scopePlan.codexExtension;
-        if (!codexExtension) {
+        if (scopePlan.materializationExtensions.length === 0) {
             return `Scope: ${scopePlan.scope}\n${syncOutput}`;
         }
-        const codexLines = codexExtension.operations.map((operation) => {
-            const role = operation.roleName ? ` (${operation.roleName})` : '';
-            return `- codex:${operation.target}:${operation.action} ${operation.path}${role} (${operation.reason})`;
+        const extensionSections = scopePlan.materializationExtensions.map((extension) => {
+            const lines = extension.operations.map((operation) => {
+                const entry = operation.entryName
+                    ? ` (${operation.entryName})`
+                    : '';
+                return `- ${operation.provider}:${operation.target}:${operation.action} ${operation.path}${entry} (${operation.reason})`;
+            });
+            return `${extension.provider} extension (applied)\n${lines.join('\n')}`;
         });
-        return `Scope: ${scopePlan.scope}\n${syncOutput}\n\nCodex extension (applied)\n${codexLines.join('\n')}`;
+        return `Scope: ${scopePlan.scope}\n${syncOutput}\n\n${extensionSections.join('\n\n')}`;
     })
         .join('\n\n');
 }
@@ -45,10 +51,10 @@ export async function runSyncApply(context, scopePlans, dependencies) {
     let failed = 0;
     for (const scopePlan of scopePlans) {
         const hasSyncEntries = scopePlan.plan.entries.length > 0 || scopePlan.plan.removals.length > 0;
-        const hasCodexPlannedOperations = scopePlan.codexExtensionPlan?.operations.some((operation) => operation.action !== 'skip') ?? false;
+        const hasExtensionPlannedOperations = scopePlan.materializationExtensionPlans.some((plan) => plan.operations.some((operation) => operation.action !== 'skip'));
         const shouldRefreshManifestVersion = scopePlan.manifest.oatVersion !== OAT_VERSION;
         if (!hasSyncEntries &&
-            !hasCodexPlannedOperations &&
+            !hasExtensionPlannedOperations &&
             !shouldRefreshManifestVersion) {
             continue;
         }
@@ -57,17 +63,22 @@ export async function runSyncApply(context, scopePlans, dependencies) {
             applied += result.applied;
             failed += result.failed;
         }
-        if (scopePlan.codexExtensionPlan && hasCodexPlannedOperations) {
-            const codexResult = await dependencies.applyCodexProjectExtensionPlan(scopePlan.scopeRoot, scopePlan.codexExtensionPlan);
-            applied += codexResult.applied;
-            failed += codexResult.failed;
-            if (scopePlan.codexExtension) {
-                scopePlan.codexExtension = {
-                    ...scopePlan.codexExtension,
-                    applied: codexResult.applied,
-                    failed: codexResult.failed,
-                    skipped: codexResult.skipped,
-                };
+        for (const plan of scopePlan.materializationExtensionPlans) {
+            if (!plan.operations.some((operation) => operation.action !== 'skip')) {
+                continue;
+            }
+            const extension = dependencies
+                .getMaterializationExtensions()
+                .find((candidate) => candidate.provider === plan.provider);
+            if (!extension) {
+                throw new Error(`Materialization extension ${plan.provider} disappeared before apply.`);
+            }
+            const result = await dependencies.applyMaterializationExtensionPlan(extension, scopePlan.scopeRoot, plan);
+            applied += result.applied;
+            failed += result.failed;
+            const summary = scopePlan.materializationExtensions.find((candidate) => candidate.provider === plan.provider);
+            if (summary) {
+                Object.assign(summary, result);
             }
         }
     }
@@ -75,9 +86,23 @@ export async function runSyncApply(context, scopePlans, dependencies) {
     const providerMismatches = scopePlans
         .map((scopePlan) => scopePlan.providerMismatches)
         .filter((mismatch) => mismatch !== undefined);
-    const codexExtensions = scopePlans
-        .map((scopePlan) => scopePlan.codexExtension)
-        .filter((extension) => extension !== undefined);
+    const materializationExtensions = scopePlans.flatMap((scopePlan) => scopePlan.materializationExtensions);
+    const codexExtensions = materializationExtensions
+        .filter((extension) => extension.provider === 'codex')
+        .map((extension) => ({
+        operations: extension.operations.map((operation) => ({
+            action: operation.action,
+            target: operation.target,
+            path: operation.path,
+            reason: operation.reason,
+            roleName: operation.entryName,
+        })),
+        managedRoles: extension.managedEntries,
+        aggregateConfigHash: extension.aggregateHash,
+        applied: extension.applied,
+        failed: extension.failed,
+        skipped: extension.skipped,
+    }));
     if (context.json) {
         context.logger.json({
             scope: context.scope,
@@ -85,6 +110,7 @@ export async function runSyncApply(context, scopePlans, dependencies) {
             plans: scopePlans.map((scopePlan) => scopePlan.plan),
             summary,
             providerMismatches,
+            materializationExtensions,
             codexExtensions,
         });
     }

package/dist/commands/sync/dry-run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/dry-run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAExB,MAAM,cAAc,CAAC;AA+DtB,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,aAAa,EAAE,EAC3B,YAAY,EAAE,uBAAuB,GACpC,IAAI,CA6BN"}
+{"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/dry-run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAiEtB,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,aAAa,EAAE,EAC3B,YAAY,EAAE,uBAAuB,GACpC,IAAI,CA2CN"}

package/dist/commands/sync/dry-run.js

@@ -5,24 +5,25 @@ function summarize(scopePlans) {
         applied: 0,
         failed: 0,
         skipped: scopePlans.reduce((total, scopePlan) => {
-            const codexSkipped = scopePlan.codexExtension?.operations.filter((operation) => operation.action === 'skip').length ?? 0;
+            const extensionSkipped = scopePlan.materializationExtensions.reduce((count, extension) => count +
+                extension.operations.filter((operation) => operation.action === 'skip').length, 0);
             return (total +
                 scopePlan.plan.entries.filter((entry) => entry.operation === 'skip')
                     .length +
-                codexSkipped);
+                extensionSkipped);
         }, 0),
     };
 }
-function formatCodexExtension(scopePlan) {
-    const codexExtension = scopePlan.codexExtension;
-    if (!codexExtension) {
-        return '';
-    }
-    const lines = codexExtension.operations.map((operation) => {
-        const role = operation.roleName ? ` (${operation.roleName})` : '';
-        return `- codex:${operation.target}:${operation.action} ${operation.path}${role} (${operation.reason})`;
-    });
-    return `Codex extension (dry-run)\n${lines.join('\n')}`;
+function formatMaterializationExtensions(scopePlan) {
+    return scopePlan.materializationExtensions
+        .map((extension) => {
+        const lines = extension.operations.map((operation) => {
+            const entry = operation.entryName ? ` (${operation.entryName})` : '';
+            return `- ${operation.provider}:${operation.target}:${operation.action} ${operation.path}${entry} (${operation.reason})`;
+        });
+        return `${extension.provider} extension (dry-run)\n${lines.join('\n')}`;
+    })
+        .join('\n\n');
 }
 function formatDryRunOutput(scopePlans, dependencies) {
     if (scopePlans.length === 0) {
@@ -35,9 +36,9 @@ function formatDryRunOutput(scopePlans, dependencies) {
     return scopePlans
         .map((scopePlan) => {
         const syncOutput = dependencies.formatSyncPlan(scopePlan.plan, false);
-        const codexOutput = formatCodexExtension(scopePlan);
-        return codexOutput
-            ? `Scope: ${scopePlan.scope}\n${syncOutput}\n\n${codexOutput}`
+        const extensionOutput = formatMaterializationExtensions(scopePlan);
+        return extensionOutput
+            ? `Scope: ${scopePlan.scope}\n${syncOutput}\n\n${extensionOutput}`
             : `Scope: ${scopePlan.scope}\n${syncOutput}`;
     })
         .join('\n\n');
@@ -47,9 +48,20 @@ export function runSyncDryRun(context, scopePlans, dependencies) {
     const providerMismatches = scopePlans
         .map((scopePlan) => scopePlan.providerMismatches)
         .filter((mismatch) => mismatch !== undefined);
-    const codexExtensions = scopePlans
-        .map((scopePlan) => scopePlan.codexExtension)
-        .filter((extension) => extension !== undefined);
+    const materializationExtensions = scopePlans.flatMap((scopePlan) => scopePlan.materializationExtensions);
+    const codexExtensions = materializationExtensions
+        .filter((extension) => extension.provider === 'codex')
+        .map((extension) => ({
+        operations: extension.operations.map((operation) => ({
+            action: operation.action,
+            target: operation.target,
+            path: operation.path,
+            reason: operation.reason,
+            roleName: operation.entryName,
+        })),
+        managedRoles: extension.managedEntries,
+        aggregateConfigHash: extension.aggregateHash,
+    }));
     if (context.json) {
         context.logger.json({
             scope: context.scope,
@@ -57,6 +69,7 @@ export function runSyncDryRun(context, scopePlans, dependencies) {
             plans: scopePlans.map((scopePlan) => scopePlan.plan),
             summary,
             providerMismatches,
+            materializationExtensions,
             codexExtensions,
         });
     }

package/dist/commands/sync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AA4CA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAI5C,OAAO,KAAK,EAEV,uBAAuB,EAExB,MAAM,cAAc,CAAC;AA6TtB,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CA6BT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AA0CA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAI5C,OAAO,KAAK,EAEV,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAwUtB,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CA6BT"}