@open-agent-toolkit/cli 0.1.73 → 0.1.76

package/dist/commands/init/index.js

@@ -6,15 +6,17 @@ import { applyOatCoreGitignore, } from '../init/gitignore.js';
 import { applyGitignore } from '../local/apply.js';
 import { addLocalPaths } from '../local/manage.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 { PROVIDER_CONFIG_REMEDIATION } from '../shared/messages.js';
 import { withScopeOption } from '../shared/scope-option.js';
 import { confirmAction, inputWithDefault, selectManyWithAbort, selectWithAbort, } from '../shared/shared.prompts.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, saveSyncConfig, } from '../../config/index.js';
-import { detectDefaultBranch, readUserConfig, readOatConfig, resolveLocalPaths, writeOatConfig, } from '../../config/oat-config.js';
+import { detectDefaultBranch, readOatConfig, resolveLocalPaths, writeOatConfig, } from '../../config/oat-config.js';
+import { resolveUserSyncConfig } from '../../config/user-sync-config.js';
 import { detectStrays, filterKnownStrays, } from '../../drift/index.js';
-import { configureLocalHooksPath, getHookInstallInfo, installHook, isHookInstalled, scanCanonical, uninstallHook, } from '../../engine/index.js';
+import { configureLocalHooksPath, getHookInstallInfo, installHook, isHookInstalled, scanBundledManagedAgents, scanCanonical, uninstallHook, } from '../../engine/index.js';
 import { dirExists, fileExists } from '../../fs/io.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../fs/paths.js';
 import { normalizeToPosixPath } from '../../fs/paths.js';
@@ -24,8 +26,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, getConfigAwareAdapters, getSyncMappings, } from '../../providers/shared/index.js';
+import { getActiveAdapters, getConfigAwareAdapters, } from '../../providers/shared/index.js';
+import { getAdoptionSources } from '../../providers/shared/adapter.utils.js';
 import { Command } from 'commander';
 import { detectExistingDocs, } from './detect-docs.js';
 import { createInitToolsCommand, runInitToolsWithDefaults, } from './tools/index.js';
@@ -49,15 +53,43 @@ async function ensureCanonicalDirectories(scopeRoot, scope) {
         await mkdir(join(scopeRoot, '.agents', 'rules'), { recursive: true });
     }
 }
-async function collectStraysDefault(scopeRoot, scope, manifest, canonicalEntries, activeAdapters) {
+async function collectStraysDefault(scopeRoot, scope, manifest, canonicalEntries, activeAdapters, userConfigDir = join(scopeRoot, '.oat')) {
     const adaptersToScan = activeAdapters ??
         (await getActiveAdapters(getDefaultAdapters(), scopeRoot));
     const candidates = [];
+    const hasMaterializationAdapter = adaptersToScan.some((adapter) => adapter.name === 'codex' || adapter.name === 'cursor');
+    const materializationCanonicalEntries = scope === 'user' && hasMaterializationAdapter
+        ? [...canonicalEntries, ...(await scanBundledManagedAgents())]
+        : canonicalEntries;
+    const codexExtensionPlan = adaptersToScan.some((adapter) => adapter.name === 'codex')
+        ? await computeCodexProjectExtensionPlan(scopeRoot, materializationCanonicalEntries, undefined, { userConfigDir })
+        : undefined;
+    const cursorExtensionPlan = adaptersToScan.some((adapter) => adapter.name === 'cursor')
+        ? await computeCursorProjectExtensionPlan(scopeRoot, materializationCanonicalEntries, 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 adaptersToScan) {
-        const mappings = getSyncMappings(adapter, scope);
-        for (const mapping of mappings) {
-            const providerDir = join(scopeRoot, mapping.providerDir);
-            const strays = await detectStrays(adapter.name, providerDir, manifest, canonicalEntries, mapping);
+        const adoptionSources = getAdoptionSources(adapter, scope);
+        for (const source of adoptionSources) {
+            const providerDir = join(scopeRoot, source.directory);
+            const strays = filterMaterializationManagedStrays((await detectStrays(adapter.name, providerDir, manifest, canonicalEntries, source.mapping)).map((report) => ({ provider: adapter.name, report })), materializationPlans).map((candidate) => candidate.report);
             for (const report of strays) {
                 if (report.state.status !== 'stray') {
                     continue;
@@ -65,14 +97,12 @@ async function collectStraysDefault(scopeRoot, scope, manifest, canonicalEntries
                 candidates.push({
                     provider: adapter.name,
                     report,
-                    mapping,
+                    mapping: source.mapping,
                 });
             }
         }
     }
-    if (scope === 'project' &&
-        adaptersToScan.some((adapter) => adapter.name === 'codex')) {
-        const codexExtensionPlan = await computeCodexProjectExtensionPlan(scopeRoot, canonicalEntries);
+    if (adaptersToScan.some((adapter) => adapter.name === 'codex')) {
         const codexStrays = await detectCodexRoleStrays(scopeRoot, canonicalEntries, new Set(codexExtensionPlan.managedRoles));
         for (const stray of codexStrays) {
             candidates.push({
@@ -131,7 +161,7 @@ function createDependencies() {
         async loadSyncConfig(configPath) {
             return loadSyncConfig(configPath, DEFAULT_SYNC_CONFIG);
         },
-        readUserConfig,
+        resolveUserSyncConfig,
         saveSyncConfig,
         getConfigAwareAdapters,
         applyOatCoreGitignore,
@@ -146,6 +176,7 @@ function createDependencies() {
         fileExists,
         inputWithDefault,
         selectWithAbort,
+        applyCursorSkillDisposition,
         runGuidedSetup: runGuidedSetupImpl,
         runToolPacks: runInitToolsWithDefaults,
         async runProviderSync(projectRoot) {
@@ -427,12 +458,13 @@ async function runInitCommand(context, dependencies, hookFlag, setupFlag) {
     let projectRoot = null;
     let oatDirExistedBefore = true;
     const scopeSummaries = [];
+    let migrationAborted = false;
     for (const scope of scopes) {
         const scopeRoot = await dependencies.resolveScopeRoot(scope, context);
         const syncConfigPath = join(scopeRoot, '.oat', 'sync', 'config.json');
         const userConfigDir = join(context.home, '.oat');
         let syncConfig = await dependencies.loadSyncConfig(syncConfigPath);
-        const userConfig = await dependencies.readUserConfig(userConfigDir);
+        const userSyncConfig = await dependencies.resolveUserSyncConfig(userConfigDir);
         let activeAdaptersForStrays;
         if (scope === 'project') {
             projectRoot = scopeRoot;
@@ -481,51 +513,105 @@ async function runInitCommand(context, dependencies, hookFlag, setupFlag) {
             manifest = createEmptyManifest();
         }
         const canonicalEntries = await dependencies.scanCanonical(scopeRoot, scope);
-        const collectedStrays = await dependencies.collectStrays(scopeRoot, scope, manifest, canonicalEntries, activeAdaptersForStrays);
+        const collectedStrays = await dependencies.collectStrays(scopeRoot, scope, manifest, canonicalEntries, activeAdaptersForStrays, userConfigDir);
         const { candidates: strays } = filterKnownStrays({
             reports: collectedStrays.map((stray) => stray.report),
             candidates: collectedStrays,
             knownStrays: {
                 project: syncConfig.knownStrays,
-                user: userConfig.knownStrays,
+                user: userSyncConfig.knownStrays,
             },
         });
         let straysAdopted = 0;
+        let codexStrayAdopted = false;
+        const cursorSkillStrays = strays.filter(isCursorSkillCandidate);
+        const ordinaryStrays = strays.filter((stray) => !isCursorSkillCandidate(stray));
         if (!context.interactive && strays.length > 0) {
             context.logger.warn(ADOPT_REMEDIATION);
         }
-        if (context.interactive && strays.length > 0) {
-            const choices = strays.map((stray, index) => ({
-                label: formatStrayChoiceLabel(scope, stray.report.providerPath, stray.provider),
-                value: String(index),
-                description: formatPathForScope(scope, stray.report.providerPath),
-            }));
-            const selectedValues = await dependencies.selectManyWithAbort(`Select stray entries to adopt [${scope}]`, choices, { interactive: context.interactive });
-            const selectedIndices = new Set((selectedValues ?? []).map((value) => Number.parseInt(value, 10)));
-            let codexStrayAdopted = false;
-            for (const [index, stray] of strays.entries()) {
-                if (!selectedIndices.has(index)) {
-                    continue;
+        if (context.interactive && strays.length > 0 && !migrationAborted) {
+            for (const stray of cursorSkillStrays) {
+                const disposition = await dependencies.selectWithAbort(`Migrate Cursor skill [${scope}]: ${formatPathForScope(scope, stray.report.providerPath)}`, [
+                    {
+                        label: 'Adopt into canonical',
+                        value: 'adopt',
+                        description: `Move to ${stray.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 {
-                    manifest = await dependencies.adoptStray(scopeRoot, stray, manifest);
-                    straysAdopted += 1;
-                    codexStrayAdopted = codexStrayAdopted || stray.provider === 'codex';
+                    manifest = await dependencies.applyCursorSkillDisposition(scopeRoot, stray, manifest, disposition, syncConfigPath);
+                    if (disposition === 'adopt') {
+                        straysAdopted += 1;
+                    }
+                    else {
+                        context.logger.success(`Kept Cursor-only [${scope}]: ${formatPathForScope(scope, stray.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(scope, stray.report.providerPath)}. Replace canonical content with stray content?`, { interactive: context.interactive });
                     if (!shouldReplace) {
-                        context.logger.warn(`Skipped conflicting stray entry [${scope}]: ${formatPathForScope(scope, stray.report.providerPath)}`);
+                        context.logger.warn(`Skipped conflicting Cursor skill [${scope}]: ${formatPathForScope(scope, stray.report.providerPath)}`);
                         continue;
                     }
-                    manifest = await dependencies.adoptStray(scopeRoot, stray, manifest, {
-                        replaceCanonical: true,
-                    });
+                    manifest = await dependencies.applyCursorSkillDisposition(scopeRoot, stray, manifest, disposition, syncConfigPath, { replaceCanonical: true });
                     straysAdopted += 1;
-                    codexStrayAdopted = codexStrayAdopted || stray.provider === 'codex';
+                }
+            }
+            if (!migrationAborted && ordinaryStrays.length > 0) {
+                const selectedValues = await dependencies.selectManyWithAbort(`Select stray entries to adopt [${scope}]`, ordinaryStrays.map((stray, index) => ({
+                    label: formatStrayChoiceLabel(scope, stray.report.providerPath, stray.provider),
+                    value: String(index),
+                    description: formatPathForScope(scope, stray.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, stray] of ordinaryStrays.entries()) {
+                        if (!selectedIndices.has(index)) {
+                            continue;
+                        }
+                        try {
+                            manifest = await dependencies.adoptStray(scopeRoot, stray, manifest);
+                            straysAdopted += 1;
+                            codexStrayAdopted =
+                                codexStrayAdopted || stray.provider === 'codex';
+                        }
+                        catch (error) {
+                            if (!isAdoptionConflictError(error)) {
+                                throw error;
+                            }
+                            const shouldReplace = await dependencies.confirmAction(`Conflict detected for ${formatPathForScope(scope, stray.report.providerPath)}. Replace canonical content with stray content?`, { interactive: context.interactive });
+                            if (!shouldReplace) {
+                                context.logger.warn(`Skipped conflicting stray entry [${scope}]: ${formatPathForScope(scope, stray.report.providerPath)}`);
+                                continue;
+                            }
+                            manifest = await dependencies.adoptStray(scopeRoot, stray, manifest, {
+                                replaceCanonical: true,
+                            });
+                            straysAdopted += 1;
+                            codexStrayAdopted =
+                                codexStrayAdopted || stray.provider === 'codex';
+                        }
+                    }
                 }
             }
             if (codexStrayAdopted && scope === 'project') {
@@ -535,6 +621,11 @@ async function runInitCommand(context, dependencies, hookFlag, setupFlag) {
                     computeExtensionPlan: computeCodexProjectExtensionPlan,
                     applyExtensionPlan: applyCodexProjectExtensionPlan,
                 });
+                if (activeAdaptersForStrays?.some((adapter) => adapter.name === 'cursor')) {
+                    const refreshedCanonical = await dependencies.scanCanonical(scopeRoot, scope);
+                    const cursorPlan = await computeCursorProjectExtensionPlan(scopeRoot, refreshedCanonical, undefined, { userConfigDir });
+                    await applyCursorProjectExtensionPlan(scopeRoot, cursorPlan);
+                }
             }
             if (straysAdopted > 0) {
                 context.logger.success(`Adopted ${straysAdopted} stray entr${straysAdopted === 1 ? 'y' : 'ies'} [${scope}].`);

package/dist/commands/project/dispatch-ceiling/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/dispatch-ceiling/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAa9B,OAAO,EAUL,KAAK,uBAAuB,EAY7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAiC5C,UAAU,2BAA2B;IACnC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAqmFD,wBAAgB,mCAAmC,CACjD,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAkGT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/dispatch-ceiling/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAa9B,OAAO,EAUL,KAAK,uBAAuB,EAY7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAiC5C,UAAU,2BAA2B;IACnC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAmnFD,wBAAgB,mCAAmC,CACjD,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAkGT"}

package/dist/commands/project/dispatch-ceiling/index.js

@@ -210,10 +210,10 @@ function uncappedPreferredTier(provider, role, preferredValue) {
 }
 function dispatchValueFromRouteTarget(target) {
     const adapter = getCeilingAdapter(target.harness);
-    if (adapter.mechanism === 'pinned-variant') {
+    if (adapter.selectionAxis === 'model-effort') {
         return target.effort ?? null;
     }
-    if (adapter.mechanism === 'model-arg') {
+    if (adapter.selectionAxis === 'model' || adapter.selectionAxis === 'tier') {
         return target.model ?? null;
     }
     return null;
@@ -226,7 +226,7 @@ function routeTargetFromBareValue(provider, value, routeIndex, routeLength) {
         routeIndex,
         routeLength,
     };
-    if (adapter.mechanism === 'pinned-variant') {
+    if (adapter.selectionAxis === 'model-effort') {
         target.effort = value;
     }
     else {
@@ -398,13 +398,15 @@ function candidatePrimaryTarget(provider, tier, candidate) {
         throw new Error(`Malformed ${provider} candidate ordering in ${tier}: direct dispatch role names are not candidate models.`);
     }
     const targetAdapter = getCeilingAdapter(target.harness);
-    if (targetAdapter.mechanism === 'pinned-variant' &&
+    if (targetAdapter.selectionAxis === 'model-effort' &&
         (!target.model ||
             !target.effort ||
             !CODEX_VALUES.includes(target.effort))) {
         throw new Error(`Malformed ${provider} candidate ordering in ${tier}: Codex candidates require a model and supported effort.`);
     }
-    if (targetAdapter.mechanism === 'model-arg' && !target.model) {
+    if ((targetAdapter.selectionAxis === 'model' ||
+        targetAdapter.selectionAxis === 'tier') &&
+        !target.model) {
         throw new Error(`Malformed ${provider} candidate ordering in ${tier}: model-argument candidates require a model.`);
     }
     return target;
@@ -1053,7 +1055,7 @@ function selectDispatchValue(provider, role, policy, preferredValue) {
         target: selectedTarget,
     };
 }
-function hasCodexVariantDispatchArgs(dispatchArgs) {
+function hasVariantDispatchArgs(dispatchArgs) {
     return (dispatchArgs !== null &&
         'variant' in dispatchArgs &&
         typeof dispatchArgs.variant === 'string' &&
@@ -1065,20 +1067,26 @@ function hasModelDispatchArgs(dispatchArgs) {
         typeof dispatchArgs.model === 'string' &&
         dispatchArgs.model.length > 0);
 }
-function modelAxis(selection, dispatchArgs) {
+function modelAxis(provider, selection, dispatchArgs) {
     if (selection.target?.model && dispatchArgs) {
         return `selected:${selection.target.model}`;
     }
     if (hasModelDispatchArgs(dispatchArgs)) {
         return `selected:${dispatchArgs.model}`;
     }
+    if (provider === 'cursor' &&
+        hasVariantDispatchArgs(dispatchArgs) &&
+        selection.target === null &&
+        selection.selectedValue) {
+        return `selected:${selection.selectedValue}`;
+    }
     if (selection.selectionMode === 'inherit-default') {
         return 'inherited';
     }
     return 'unresolved';
 }
 function codexEffortAxis(selection, dispatchArgs) {
-    if (hasCodexVariantDispatchArgs(dispatchArgs) && selection.target?.effort) {
+    if (hasVariantDispatchArgs(dispatchArgs) && selection.target?.effort) {
         return `selected:${selection.target.effort}`;
     }
     if (selection.selectionMode === 'inherit-default' ||
@@ -1149,7 +1157,7 @@ function buildProviderResolution(provider, policy, role, orchestratorTier, prefe
         mode,
         mechanism: adapter.mechanism,
         dispatchArgs,
-        modelAxis: modelAxis(selection, dispatchArgs),
+        modelAxis: modelAxis(provider, selection, dispatchArgs),
         effortAxis: provider === 'codex'
             ? codexEffortAxis(selection, dispatchArgs)
             : 'not-applicable',

package/dist/commands/remove/skill/remove-skill.d.ts

@@ -3,6 +3,7 @@ import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { type SyncConfig } from '../../../config/sync-config.js';
 import { type Manifest } from '../../../manifest/index.js';
 import { type ConfigAwareAdaptersResult, type PathMapping, type ProviderAdapter } from '../../../providers/shared/index.js';
+import type { AdoptionSource } from '../../../providers/shared/adapter.types.js';
 import type { ConcreteScope, Scope } from '../../../shared/types.js';
 import { Command } from 'commander';
 export interface RemoveSkillDependencies {
@@ -14,6 +15,7 @@ export interface RemoveSkillDependencies {
     getAdapters: () => ProviderAdapter[];
     getConfigAwareAdapters: (adapters: ProviderAdapter[], scopeRoot: string, config: SyncConfig) => Promise<ConfigAwareAdaptersResult>;
     getSyncMappings: (adapter: ProviderAdapter, scope: Scope) => PathMapping[];
+    getAdoptionSources: (adapter: ProviderAdapter, scope: Scope) => AdoptionSource[];
     pathExists: (path: string) => Promise<boolean>;
     removeDirectory: (path: string) => Promise<void>;
 }

package/dist/commands/remove/skill/remove-skill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-skill.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skill/remove-skill.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EACL,iBAAiB,EAElB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,KAAK,yBAAyB,EAG9B,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8BpC,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,eAAe,EAAE,CAAC;IACrC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,KACf,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;IAC3E,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,wBAAgB,oCAAoC,IAAI,uBAAuB,CAgC9E;AAgKD,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,OAAO,CAAC,CAsDlB;AAED,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwCT"}
+{"version":3,"file":"remove-skill.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skill/remove-skill.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EACL,iBAAiB,EAElB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,KAAK,yBAAyB,EAG9B,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8BpC,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,eAAe,EAAE,CAAC;IACrC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,KACf,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;IAC3E,kBAAkB,EAAE,CAClB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,KAAK,KACT,cAAc,EAAE,CAAC;IACtB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,wBAAgB,oCAAoC,IAAI,uBAAuB,CAiC9E;AAuLD,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,OAAO,CAAC,CAsDlB;AAED,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwCT"}

package/dist/commands/remove/skill/remove-skill.js

@@ -13,6 +13,7 @@ import { copilotAdapter } from '../../../providers/copilot/index.js';
 import { cursorAdapter } from '../../../providers/cursor/index.js';
 import { geminiAdapter } from '../../../providers/gemini/index.js';
 import { getConfigAwareAdapters, getSyncMappings, } from '../../../providers/shared/index.js';
+import { getAdoptionSources } from '../../../providers/shared/adapter.utils.js';
 import { Command } from 'commander';
 export function createDefaultRemoveSkillDependencies() {
     return {
@@ -39,6 +40,7 @@ export function createDefaultRemoveSkillDependencies() {
         },
         getConfigAwareAdapters,
         getSyncMappings,
+        getAdoptionSources,
         async pathExists(path) {
             return (await fileExists(path)) || (await dirExists(path));
         },
@@ -76,10 +78,10 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
     const managedProviderViews = [];
     const unmanagedProviderViews = [];
     for (const adapter of activeAdapters) {
-        const mappings = dependencies
+        const syncMappings = dependencies
             .getSyncMappings(adapter, scope)
             .filter((mapping) => mapping.contentType === 'skill');
-        for (const mapping of mappings) {
+        for (const mapping of syncMappings) {
             const relativePath = join(mapping.providerDir, skillName);
             const absolutePath = join(scopeRoot, relativePath);
             const hasManifestEntry = manifest.entries.some((entry) => entry.canonicalPath === canonicalRelativePath &&
@@ -101,6 +103,22 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
                 });
             }
         }
+        const syncProviderDirs = new Set(syncMappings.map((mapping) => mapping.providerDir));
+        const localAdoptionSources = dependencies
+            .getAdoptionSources(adapter, scope)
+            .filter((source) => source.contentType === 'skill' &&
+            !syncProviderDirs.has(source.directory));
+        for (const source of localAdoptionSources) {
+            const relativePath = join(source.directory, skillName);
+            const absolutePath = join(scopeRoot, relativePath);
+            if (await dependencies.pathExists(absolutePath)) {
+                unmanagedProviderViews.push({
+                    provider: adapter.name,
+                    absolutePath,
+                    relativePath,
+                });
+            }
+        }
     }
     return {
         scope,

package/dist/commands/shared/adopt-stray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adopt-stray.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/adopt-stray.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,YAAY,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,UAAU,iBAAiB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAEzE;AAWD,wBAAsB,qBAAqB,CACzC,UAAU,SAAS,sBAAsB,EAEzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,QAAQ,CAAC,CA0EnB"}
+{"version":3,"file":"adopt-stray.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/adopt-stray.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,YAAY,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,UAAU,iBAAiB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAEzE;AAWD,wBAAsB,qBAAqB,CACzC,UAAU,SAAS,sBAAsB,EAEzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,QAAQ,CAAC,CA8EnB"}

package/dist/commands/shared/adopt-stray.js

@@ -53,6 +53,9 @@ export async function adoptStrayToCanonical(scopeRoot, stray, manifest, options
     else {
         await rename(providerAbsolutePath, canonicalAbsolutePath);
     }
+    if (stray.mapping.nativeRead) {
+        return manifest;
+    }
     const strategy = await createSymlink(canonicalAbsolutePath, providerAbsolutePath, undefined, isFile);
     const canonicalPath = toPosixPath(relative(scopeRoot, canonicalAbsolutePath));
     const providerPath = toPosixPath(relative(scopeRoot, providerAbsolutePath));

package/dist/commands/shared/codex-strays.d.ts

@@ -1,5 +1,6 @@
 import type { CanonicalEntry } from '../../engine/index.js';
 import type { CodexExtensionPlan } from '../../providers/codex/codec/sync-extension.js';
+import type { MaterializationPlan } from '../../providers/shared/index.js';
 export interface CodexRoleStray {
     roleName: string;
     providerPath: string;
@@ -11,6 +12,14 @@ export interface CodexRegenerationDependencies {
     computeExtensionPlan: (scopeRoot: string, canonicalEntries: CanonicalEntry[]) => Promise<CodexExtensionPlan>;
     applyExtensionPlan: (scopeRoot: string, plan: CodexExtensionPlan) => Promise<unknown>;
 }
+interface ProviderStrayCandidate {
+    provider: string;
+    report: {
+        providerPath: string;
+    };
+}
+export declare function filterMaterializationManagedStrays<TCandidate extends ProviderStrayCandidate>(candidates: TCandidate[], plans: readonly MaterializationPlan[]): TCandidate[];
 export declare function detectCodexRoleStrays(scopeRoot: string, canonicalEntries: CanonicalEntry[], managedRoleNames?: Set<string>): Promise<CodexRoleStray[]>;
 export declare function regenerateCodexAfterAdoption({ scopeRoot, scanCanonical, computeExtensionPlan, applyExtensionPlan, }: CodexRegenerationDependencies): Promise<void>;
+export {};
 //# sourceMappingURL=codex-strays.d.ts.map

package/dist/commands/shared/codex-strays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-strays.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/codex-strays.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,oBAAoB,EAAE,CACpB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,cAAc,EAAE,KAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,kBAAkB,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,kBAAkB,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAgJD,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,gBAAgB,GAAE,GAAG,CAAC,MAAM,CAAa,GACxC,OAAO,CAAC,cAAc,EAAE,CAAC,CAuB3B;AAED,wBAAsB,4BAA4B,CAAC,EACjD,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,kBAAkB,GACnB,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/C"}
+{"version":3,"file":"codex-strays.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/codex-strays.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,oBAAoB,EAAE,CACpB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,cAAc,EAAE,KAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,kBAAkB,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,kBAAkB,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;CAClC;AAED,wBAAgB,kCAAkC,CAChD,UAAU,SAAS,sBAAsB,EAEzC,UAAU,EAAE,UAAU,EAAE,EACxB,KAAK,EAAE,SAAS,mBAAmB,EAAE,GACpC,UAAU,EAAE,CAed;AAgJD,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,gBAAgB,GAAE,GAAG,CAAC,MAAM,CAAa,GACxC,OAAO,CAAC,cAAc,EAAE,CAAC,CAuB3B;AAED,wBAAsB,4BAA4B,CAAC,EACjD,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,kBAAkB,GACnB,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/C"}

package/dist/commands/shared/codex-strays.js

@@ -2,6 +2,10 @@ import { readdir, readFile, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import TOML from '@iarna/toml';
 import { isOatManagedCodexRoleFile } from '../../providers/codex/codec/shared.js';
+export function filterMaterializationManagedStrays(candidates, plans) {
+    const managedPaths = new Set(plans.flatMap((plan) => plan.operations.map((operation) => `${plan.provider}|${operation.path.replaceAll('\\', '/')}`)));
+    return candidates.filter((candidate) => !managedPaths.has(`${candidate.provider}|${candidate.report.providerPath.replaceAll('\\', '/')}`));
+}
 function canonicalRoleNames(canonicalEntries) {
     return new Set(canonicalEntries
         .filter((entry) => entry.type === 'agent' && entry.isFile)

package/dist/commands/shared/cursor-skill-disposition.d.ts

@@ -0,0 +1,17 @@
+import type { Manifest } from '../../manifest/manifest.types.js';
+import type { PathMapping } from '../../providers/shared/adapter.types.js';
+export type CursorSkillDisposition = 'adopt' | 'keep';
+export interface CursorSkillCandidate {
+    provider: string;
+    report: {
+        providerPath: string;
+    };
+    mapping: PathMapping;
+}
+interface ApplyCursorSkillDispositionOptions {
+    replaceCanonical?: boolean;
+}
+export declare function isCursorSkillCandidate(candidate: CursorSkillCandidate): boolean;
+export declare function applyCursorSkillDisposition(scopeRoot: string, candidate: CursorSkillCandidate, manifest: Manifest, disposition: CursorSkillDisposition, syncConfigPath: string, options?: ApplyCursorSkillDispositionOptions): Promise<Manifest>;
+export {};
+//# sourceMappingURL=cursor-skill-disposition.d.ts.map

package/dist/commands/shared/cursor-skill-disposition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-skill-disposition.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/cursor-skill-disposition.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAInE,MAAM,MAAM,sBAAsB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEtD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,kCAAkC;IAC1C,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,oBAAoB,GAC9B,OAAO,CAST;AAED,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,oBAAoB,EAC/B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,sBAAsB,EACnC,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,kCAAuC,GAC/C,OAAO,CAAC,QAAQ,CAAC,CAcnB"}

package/dist/commands/shared/cursor-skill-disposition.js

@@ -0,0 +1,41 @@
+import { access } from 'node:fs/promises';
+import { basename, relative, resolve } from 'node:path';
+import { appendKnownStray } from '../../config/sync-config.js';
+import { CliError } from '../../errors/index.js';
+import { toPosixPath } from '../../fs/paths.js';
+import { adoptStrayToCanonical } from './adopt-stray.js';
+export function isCursorSkillCandidate(candidate) {
+    const providerPath = toPosixPath(candidate.report.providerPath);
+    return (candidate.provider === 'cursor' &&
+        candidate.mapping.contentType === 'skill' &&
+        candidate.mapping.nativeRead &&
+        (providerPath === '.cursor/skills' ||
+            providerPath.startsWith('.cursor/skills/')));
+}
+export async function applyCursorSkillDisposition(scopeRoot, candidate, manifest, disposition, syncConfigPath, options = {}) {
+    if (!isCursorSkillCandidate(candidate)) {
+        throw new CliError(`Cannot apply a Cursor skill disposition to ${candidate.report.providerPath}.`);
+    }
+    if (disposition === 'adopt') {
+        return adoptStrayToCanonical(scopeRoot, candidate, manifest, options);
+    }
+    await assertCursorOnlyNameAvailable(scopeRoot, candidate);
+    await appendKnownStray(syncConfigPath, candidate.report.providerPath);
+    return manifest;
+}
+async function assertCursorOnlyNameAvailable(scopeRoot, candidate) {
+    const canonicalPath = resolve(scopeRoot, candidate.mapping.canonicalDir, basename(candidate.report.providerPath));
+    if (!(await pathExists(canonicalPath))) {
+        return;
+    }
+    throw new CliError(`Cannot keep ${candidate.report.providerPath} Cursor-only because canonical skill ${toPosixPath(relative(scopeRoot, canonicalPath))} has the same name. Rename one skill, then run the command again.`);
+}
+async function pathExists(path) {
+    try {
+        await access(path);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

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

@@ -1,13 +1,15 @@
 import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
 import { type CodexRoleStray } from '../shared/codex-strays.js';
-import { type MultiSelectChoice, type PromptContext } from '../shared/shared.prompts.js';
+import { type CursorSkillDisposition } from '../shared/cursor-skill-disposition.js';
+import { type MultiSelectChoice, type PromptContext, type SelectChoice } from '../shared/shared.prompts.js';
 import { type SyncConfig } from '../../config/index.js';
-import { type UserConfig } from '../../config/oat-config.js';
 import { type CopyTransform, type DriftReport } from '../../drift/index.js';
 import { type CanonicalEntry } from '../../engine/index.js';
 import type { Manifest } from '../../manifest/index.js';
 import { type CodexExtensionPlan } from '../../providers/codex/codec/sync-extension.js';
+import { type CursorExtensionPlan } from '../../providers/cursor/codec/sync-extension.js';
 import { type PathMapping, type ProviderAdapter } from '../../providers/shared/index.js';
+import type { AdoptionSource } from '../../providers/shared/adapter.types.js';
 import { type ConcreteScope, type Scope } from '../../shared/types.js';
 import { Command } from 'commander';
 interface StatusDependencies {
@@ -15,26 +17,36 @@ interface StatusDependencies {
     resolveScopeRoot: (scope: ConcreteScope, context: CommandContext) => Promise<string>;
     loadManifest: (manifestPath: string) => Promise<Manifest>;
     loadSyncConfig: (configPath: string) => Promise<SyncConfig>;
-    readUserConfig: (userConfigDir: string) => Promise<UserConfig>;
+    resolveUserSyncConfig: (userConfigDir: string) => Promise<SyncConfig>;
     saveManifest: (manifestPath: string, manifest: Manifest) => Promise<void>;
     scanCanonical: (scopeRoot: string, scope: ConcreteScope) => Promise<CanonicalEntry[]>;
-    scanBundledManagedCodexAgents: () => Promise<CanonicalEntry[]>;
+    scanBundledManagedAgents: () => Promise<CanonicalEntry[]>;
     getAdapters: () => ProviderAdapter[];
     getActiveAdapters: (adapters: ProviderAdapter[], scopeRoot: string) => Promise<ProviderAdapter[]>;
     getSyncMappings: (adapter: ProviderAdapter, scope: Scope) => PathMapping[];
+    getAdoptionSources: (adapter: ProviderAdapter, scope: Scope) => AdoptionSource[];
     detectDrift: (entry: Manifest['entries'][number], scopeRoot: string, copyTransform?: CopyTransform) => Promise<DriftReport>;
-    detectStrays: (provider: string, providerDir: string, manifest: Manifest, canonicalEntries: CanonicalEntry[], mapping?: Pick<PathMapping, 'contentType' | 'providerExtension'>) => Promise<DriftReport[]>;
+    detectStrays: (provider: string, providerDir: string, manifest: Manifest, canonicalEntries: CanonicalEntry[], mapping?: Pick<PathMapping, 'contentType' | 'nativeRead' | 'providerExtension'>) => Promise<DriftReport[]>;
     detectCodexRoleStrays: (scopeRoot: string, canonicalEntries: CanonicalEntry[], managedRoleNames?: Set<string>) => Promise<CodexRoleStray[]>;
     computeCodexProjectExtensionPlan: (scopeRoot: string, canonicalEntries: CanonicalEntry[], allowedCanonicalPaths?: string[], options?: {
         userConfigDir?: string;
         env?: NodeJS.ProcessEnv;
     }) => Promise<CodexExtensionPlan>;
     applyCodexProjectExtensionPlan: (scopeRoot: string, plan: CodexExtensionPlan) => Promise<unknown>;
+    computeCursorProjectExtensionPlan: (scopeRoot: string, canonicalEntries: CanonicalEntry[], allowedCanonicalPaths?: string[], options?: {
+        userConfigDir?: string;
+        env?: NodeJS.ProcessEnv;
+    }) => Promise<CursorExtensionPlan>;
+    applyCursorProjectExtensionPlan: (scopeRoot: string, plan: CursorExtensionPlan) => Promise<unknown>;
     selectManyWithAbort: <T extends string>(message: string, choices: MultiSelectChoice<T>[], ctx: PromptContext) => Promise<T[] | null>;
+    selectWithAbort: <T extends string>(message: string, choices: SelectChoice<T>[], ctx: PromptContext) => Promise<T | null>;
     confirmAction: (message: string, ctx: PromptContext) => Promise<boolean>;
     adoptStray: (scopeRoot: string, stray: StatusStrayCandidate, manifest: Manifest, options?: {
         replaceCanonical?: boolean;
     }) => Promise<Manifest>;
+    applyCursorSkillDisposition: (scopeRoot: string, stray: StatusStrayCandidate, manifest: Manifest, disposition: CursorSkillDisposition, syncConfigPath: string, options?: {
+        replaceCanonical?: boolean;
+    }) => Promise<Manifest>;
     formatStatusTable: (reports: DriftReport[]) => string;
 }
 interface StatusStrayCandidate {