@open-agent-toolkit/cli 0.1.74 → 0.1.76

package/dist/commands/status/index.js

@@ -2,11 +2,12 @@ import { basename, join, relative } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
 import { adoptStrayToCanonical, isAdoptionConflictError, } from '../shared/adopt-stray.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, scanBundledManagedAgents, scanCanonical, } from '../../engine/index.js';
 import { normalizeToPosixPath, resolveProjectRoot, resolveScopeRoot, } from '../../fs/paths.js';
@@ -19,6 +20,7 @@ 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';
@@ -35,7 +37,7 @@ const DEFAULT_DEPENDENCIES = {
     async loadSyncConfig(configPath) {
         return loadSyncConfig(configPath, DEFAULT_SYNC_CONFIG);
     },
-    readUserConfig,
+    resolveUserSyncConfig,
     saveManifest,
     scanCanonical,
     scanBundledManagedAgents,
@@ -50,6 +52,7 @@ const DEFAULT_DEPENDENCIES = {
     },
     getActiveAdapters,
     getSyncMappings,
+    getAdoptionSources,
     detectDrift,
     detectStrays,
     detectCodexRoleStrays,
@@ -58,8 +61,10 @@ const DEFAULT_DEPENDENCIES = {
     computeCursorProjectExtensionPlan,
     applyCursorProjectExtensionPlan,
     selectManyWithAbort,
+    selectWithAbort,
     confirmAction,
     adoptStray: adoptStrayDefault,
+    applyCursorSkillDisposition,
     formatStatusTable,
 };
 function entryInsideMapping(entryProviderPath, mappingProviderDir) {
@@ -125,11 +130,11 @@ 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);
@@ -170,6 +175,7 @@ async function collectScopeReports(scope, context, dependencies) {
     ];
     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) {
@@ -212,9 +218,9 @@ async function collectScopeReports(scope, context, dependencies) {
                 });
             }
         }
-        for (const mapping of mappings) {
-            const providerDir = join(scopeRoot, mapping.providerDir);
-            const strays = filterMaterializationManagedStrays((await dependencies.detectStrays(adapter.name, providerDir, manifest, canonicalEntries, mapping)).map((report) => ({ provider: adapter.name, report })), materializationPlans).map((candidate) => candidate.report);
+        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') {
@@ -223,7 +229,7 @@ async function collectScopeReports(scope, context, dependencies) {
                 strayCandidates.push({
                     provider: adapter.name,
                     report: stray,
-                    mapping,
+                    mapping: source.mapping,
                 });
             }
         }
@@ -287,13 +293,14 @@ 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,
@@ -340,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') {
@@ -395,11 +458,16 @@ async function runStatusCommand(context, dependencies, options = {}) {
                 }
                 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/config/oat-config.d.ts

@@ -133,7 +133,6 @@ export interface OatLocalConfig {
 export interface UserConfig {
     version: number;
     activeIdea?: string | null;
-    knownStrays?: string[];
     updateNotifications?: boolean;
     workflow?: OatWorkflowConfig;
 }

package/dist/config/oat-config.d.ts.map

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

package/dist/config/oat-config.js

@@ -5,6 +5,7 @@ import { atomicWriteJson, dirExists, fileExists } from '../fs/io.js';
 import { normalizeToPosixPath, validateRealPathWithinScope } from '../fs/paths.js';
 import { normalizeDispatchMatrix, } from './dispatch-matrix.js';
 import { parseJsonConfig } from './json.js';
+import { resolveUserSyncConfig } from './user-sync-config.js';
 export { VALID_DISPATCH_MATRIX_TIERS, isCodexMaterializedRouteTarget, isWorkflowDispatchCandidateLadder, isWorkflowDispatchFallbackRoute, toWorkflowDispatchCandidateLadder, validateDispatchRouteTarget, } from './dispatch-matrix.js';
 export const MIN_GATE_TIMEOUT_MS = 1_000;
 export const MAX_GATE_TIMEOUT_MS = 14_400_000;
@@ -397,24 +398,6 @@ function trimNonEmptyString(value) {
     const trimmed = value.trim();
     return trimmed.length > 0 ? trimmed : undefined;
 }
-function normalizeKnownStrayPath(pathValue) {
-    const trimmed = pathValue.trim();
-    if (!trimmed) {
-        return undefined;
-    }
-    const normalized = trimPathValue(normalizeToPosixPath(trimmed));
-    return normalized && normalized !== '.' ? normalized : undefined;
-}
-function normalizeKnownStrays(value) {
-    if (!Array.isArray(value)) {
-        return undefined;
-    }
-    const normalized = value
-        .filter((pathValue) => typeof pathValue === 'string')
-        .map((pathValue) => normalizeKnownStrayPath(pathValue))
-        .filter((pathValue) => pathValue !== undefined);
-    return normalized.length > 0 ? [...new Set(normalized)].sort() : undefined;
-}
 export function normalizeProjectPath(repoRoot, pathValue) {
     if (pathValue == null) {
         return null;
@@ -717,6 +700,13 @@ export async function clearActiveProject(repoRoot, options) {
 function getUserConfigPath(userConfigDir) {
     return join(userConfigDir, 'config.json');
 }
+const USER_CONFIG_OWNED_KEYS = new Set([
+    'version',
+    'activeIdea',
+    'updateNotifications',
+    'workflow',
+    'knownStrays',
+]);
 function normalizeUserConfig(parsed) {
     const next = { ...DEFAULT_USER_CONFIG };
     if (!isRecord(parsed)) {
@@ -728,10 +718,6 @@ function normalizeUserConfig(parsed) {
                 ? parsed.activeIdea.trim()
                 : null;
     }
-    const knownStrays = normalizeKnownStrays(parsed.knownStrays);
-    if (knownStrays) {
-        next.knownStrays = knownStrays;
-    }
     if (typeof parsed.updateNotifications === 'boolean') {
         next.updateNotifications = parsed.updateNotifications;
     }
@@ -741,6 +727,21 @@ function normalizeUserConfig(parsed) {
     }
     return next;
 }
+async function readUnknownUserConfigFields(configPath) {
+    try {
+        const parsed = parseJsonConfig(await readFile(configPath, 'utf8'), configPath);
+        if (!isRecord(parsed)) {
+            return {};
+        }
+        return Object.fromEntries(Object.entries(parsed).filter(([key]) => !USER_CONFIG_OWNED_KEYS.has(key)));
+    }
+    catch (error) {
+        if (isMissingFileError(error)) {
+            return {};
+        }
+        throw error;
+    }
+}
 export async function readUserConfig(userConfigDir) {
     const configPath = getUserConfigPath(userConfigDir);
     try {
@@ -756,8 +757,10 @@ export async function readUserConfig(userConfigDir) {
 }
 export async function writeUserConfig(userConfigDir, config) {
     const configPath = getUserConfigPath(userConfigDir);
+    await resolveUserSyncConfig(userConfigDir);
+    const unknownFields = await readUnknownUserConfigFields(configPath);
     const normalized = normalizeUserConfig(config);
-    await atomicWriteJson(configPath, normalized);
+    await atomicWriteJson(configPath, { ...unknownFields, ...normalized });
 }
 export async function resolveActiveIdea(repoRoot, userConfigDir) {
     const localConfig = await readOatLocalConfig(repoRoot);

package/dist/config/sync-config.d.ts

@@ -26,19 +26,19 @@ export declare const SyncConfigSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     version: 1;
     defaultStrategy: "symlink" | "copy" | "auto";
+    knownStrays?: string[] | undefined;
     providers?: Record<string, {
         strategy?: "symlink" | "copy" | "auto" | undefined;
         enabled?: boolean | undefined;
     }> | undefined;
-    knownStrays?: string[] | undefined;
 }, {
     version: 1;
     defaultStrategy: "symlink" | "copy" | "auto";
+    knownStrays?: string[] | undefined;
     providers?: Record<string, {
         strategy?: "symlink" | "copy" | "auto" | undefined;
         enabled?: boolean | undefined;
     }> | undefined;
-    knownStrays?: string[] | undefined;
 }>;
 export type ProviderSyncConfig = z.infer<typeof ProviderConfigSchema>;
 export type SyncConfig = z.infer<typeof SyncConfigSchema> & {
@@ -46,8 +46,12 @@ export type SyncConfig = z.infer<typeof SyncConfigSchema> & {
     providers: Record<string, ProviderSyncConfig>;
 };
 export declare const DEFAULT_SYNC_CONFIG: SyncConfig;
+export declare function normalizeKnownStrayPath(pathValue: string): string | undefined;
+export declare function normalizeKnownStrays(paths: readonly string[] | undefined): string[];
+export declare function mergeKnownStrays(...pathSets: ReadonlyArray<readonly string[] | undefined>): string[];
 export declare function loadSyncConfig(configPath: string, defaults?: SyncConfig): Promise<SyncConfig>;
 export declare function saveSyncConfig(configPath: string, config: SyncConfig): Promise<SyncConfig>;
 export declare function setProviderEnabled(configPath: string, providerName: string, enabled: boolean): Promise<SyncConfig>;
+export declare function appendKnownStray(configPath: string, pathValue: string): Promise<SyncConfig>;
 export {};
 //# sourceMappingURL=sync-config.d.ts.map

package/dist/config/sync-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-config.d.ts","sourceRoot":"","sources":["../../src/config/sync-config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,QAAA,MAAM,oBAAoB;;;;;;;;;EAGxB,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK3B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAC1D,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAKjC,CAAC;AA6EF,wBAAsB,cAAc,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,UAAgC,GACzC,OAAO,CAAC,UAAU,CAAC,CA6BrB;AAED,wBAAsB,cAAc,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,UAAU,CAAC,CAWrB;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAcrB"}
+{"version":3,"file":"sync-config.d.ts","sourceRoot":"","sources":["../../src/config/sync-config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,QAAA,MAAM,oBAAoB;;;;;;;;;EAGxB,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK3B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAC1D,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAKjC,CAAC;AAkBF,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACnC,MAAM,EAAE,CAMV;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,QAAQ,EAAE,aAAa,CAAC,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC,GACxD,MAAM,EAAE,CAEV;AAqCD,wBAAsB,cAAc,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,UAAgC,GACzC,OAAO,CAAC,UAAU,CAAC,CA6BrB;AAED,wBAAsB,cAAc,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,UAAU,CAAC,CAWrB;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,UAAU,CAAC,CAcrB"}

package/dist/config/sync-config.js

@@ -31,7 +31,7 @@ function mergeProviderConfigs(base, override) {
     }
     return merged;
 }
-function normalizeKnownStrayPath(pathValue) {
+export function normalizeKnownStrayPath(pathValue) {
     const trimmed = pathValue.trim();
     if (!trimmed) {
         return undefined;
@@ -41,20 +41,20 @@ function normalizeKnownStrayPath(pathValue) {
         .replace(/^\.\//, '');
     return normalized && normalized !== '.' ? normalized : undefined;
 }
-function normalizeKnownStrays(paths) {
+export function normalizeKnownStrays(paths) {
     const normalized = paths
         ?.map((pathValue) => normalizeKnownStrayPath(pathValue))
         .filter((pathValue) => pathValue !== undefined);
     return [...new Set(normalized ?? [])].sort();
 }
+export function mergeKnownStrays(...pathSets) {
+    return normalizeKnownStrays(pathSets.flatMap((paths) => paths ?? []));
+}
 function normalizeConfig(config, defaults) {
     return {
         version: 1,
         defaultStrategy: config.defaultStrategy ?? defaults.defaultStrategy,
-        knownStrays: normalizeKnownStrays([
-            ...defaults.knownStrays,
-            ...(config.knownStrays ?? []),
-        ]),
+        knownStrays: mergeKnownStrays(defaults.knownStrays, config.knownStrays),
         providers: mergeProviderConfigs(defaults.providers, config.providers ?? {}),
     };
 }
@@ -117,3 +117,15 @@ export async function setProviderEnabled(configPath, providerName, enabled) {
     };
     return saveSyncConfig(configPath, next);
 }
+export async function appendKnownStray(configPath, pathValue) {
+    const current = await loadSyncConfig(configPath, DEFAULT_SYNC_CONFIG);
+    const knownStrays = mergeKnownStrays(current.knownStrays, [pathValue]);
+    if (knownStrays.length === current.knownStrays.length &&
+        knownStrays.every((path, index) => path === current.knownStrays[index])) {
+        return current;
+    }
+    return saveSyncConfig(configPath, {
+        ...current,
+        knownStrays,
+    });
+}

package/dist/config/user-sync-config.d.ts

@@ -0,0 +1,11 @@
+import { type SyncConfig } from './sync-config.js';
+interface UserSyncConfigDependencies {
+    readFile: (path: string, encoding: 'utf8') => Promise<string>;
+    atomicWriteJson: (path: string, data: unknown) => Promise<void>;
+    loadSyncConfig: (path: string) => Promise<SyncConfig>;
+    saveSyncConfig: (path: string, config: SyncConfig) => Promise<SyncConfig>;
+}
+export declare function getUserSyncConfigPath(userConfigDir: string): string;
+export declare function resolveUserSyncConfig(userConfigDir: string, overrides?: Partial<UserSyncConfigDependencies>): Promise<SyncConfig>;
+export {};
+//# sourceMappingURL=user-sync-config.d.ts.map

package/dist/config/user-sync-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-sync-config.d.ts","sourceRoot":"","sources":["../../src/config/user-sync-config.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,KAAK,UAAU,EAChB,MAAM,eAAe,CAAC;AAEvB,UAAU,0BAA0B;IAClC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3E;AASD,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAsB,qBAAqB,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAClD,OAAO,CAAC,UAAU,CAAC,CAgCrB"}

package/dist/config/user-sync-config.js

@@ -0,0 +1,61 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { atomicWriteJson } from '../fs/io.js';
+import { parseJsonConfig } from './json.js';
+import { DEFAULT_SYNC_CONFIG, loadSyncConfig, mergeKnownStrays, saveSyncConfig, } from './sync-config.js';
+const DEFAULT_DEPENDENCIES = {
+    readFile,
+    atomicWriteJson,
+    loadSyncConfig: (path) => loadSyncConfig(path, DEFAULT_SYNC_CONFIG),
+    saveSyncConfig,
+};
+export function getUserSyncConfigPath(userConfigDir) {
+    return join(userConfigDir, 'sync', 'config.json');
+}
+export async function resolveUserSyncConfig(userConfigDir, overrides = {}) {
+    const dependencies = {
+        ...DEFAULT_DEPENDENCIES,
+        ...overrides,
+    };
+    const legacyConfigPath = join(userConfigDir, 'config.json');
+    const syncConfigPath = getUserSyncConfigPath(userConfigDir);
+    const syncConfig = await dependencies.loadSyncConfig(syncConfigPath);
+    const legacyConfig = await readLegacyConfig(legacyConfigPath, dependencies.readFile);
+    if (!legacyConfig || !hasOwn(legacyConfig, 'knownStrays')) {
+        return syncConfig;
+    }
+    const legacyKnownStrays = Array.isArray(legacyConfig.knownStrays)
+        ? legacyConfig.knownStrays.filter((value) => typeof value === 'string')
+        : [];
+    const migratedSyncConfig = await dependencies.saveSyncConfig(syncConfigPath, {
+        ...syncConfig,
+        knownStrays: mergeKnownStrays(syncConfig.knownStrays, legacyKnownStrays),
+    });
+    const { knownStrays: _legacyKnownStrays, ...preservedLegacyConfig } = legacyConfig;
+    await dependencies.atomicWriteJson(legacyConfigPath, preservedLegacyConfig);
+    return migratedSyncConfig;
+}
+async function readLegacyConfig(configPath, read) {
+    try {
+        const parsed = parseJsonConfig(await read(configPath, 'utf8'), configPath);
+        return isRecord(parsed) ? parsed : null;
+    }
+    catch (error) {
+        if (isMissingFileError(error)) {
+            return null;
+        }
+        throw error;
+    }
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function hasOwn(value, key) {
+    return Object.prototype.hasOwnProperty.call(value, key);
+}
+function isMissingFileError(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        error.code === 'ENOENT');
+}

package/dist/drift/strays.d.ts

@@ -3,5 +3,5 @@ import type { Manifest } from '../manifest/manifest.types.js';
 import type { PathMapping } from '../providers/shared/adapter.types.js';
 import type { DriftReport } from './drift.types.js';
 export declare function inferScopeRoot(providerDir: string): string;
-export declare function detectStrays(provider: string, providerDir: string, manifest: Manifest, canonicalEntries: CanonicalEntry[], mapping?: Pick<PathMapping, 'contentType' | 'providerExtension'>): Promise<DriftReport[]>;
+export declare function detectStrays(provider: string, providerDir: string, manifest: Manifest, canonicalEntries: CanonicalEntry[], mapping?: Pick<PathMapping, 'contentType' | 'nativeRead' | 'providerExtension'>): Promise<DriftReport[]>;
 //# sourceMappingURL=strays.d.ts.map

package/dist/drift/strays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strays.d.ts","sourceRoot":"","sources":["../../src/drift/strays.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAkBjD,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAoB1D;AAkJD,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,cAAc,EAAE,EAClC,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,mBAAmB,CAAC,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC,CA0DxB"}
+{"version":3,"file":"strays.d.ts","sourceRoot":"","sources":["../../src/drift/strays.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAkBjD,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAoB1D;AAkJD,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,cAAc,EAAE,EAClC,OAAO,CAAC,EAAE,IAAI,CACZ,WAAW,EACX,aAAa,GAAG,YAAY,GAAG,mBAAmB,CACnD,GACA,OAAO,CAAC,WAAW,EAAE,CAAC,CA6DxB"}

package/dist/drift/strays.js

@@ -164,7 +164,8 @@ export async function detectStrays(provider, providerDir, manifest, canonicalEnt
         const canonicalName = contentType === 'rule'
             ? canonicalRuleNameForProviderEntry(entry.name, mapping)
             : entry.name;
-        if (isCanonicalEntry(canonicalName, contentType, canonicalEntries)) {
+        if (!mapping?.nativeRead &&
+            isCanonicalEntry(canonicalName, contentType, canonicalEntries)) {
             continue;
         }
         reports.push({

package/dist/engine/compute-plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compute-plan.d.ts","sourceRoot":"","sources":["../../src/engine/compute-plan.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIvE,OAAO,KAAK,EACV,WAAW,EAEX,QAAQ,EAET,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,UAAU,mBAAmB;IAC3B,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC;AA+PD,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,SAAS,EAAE,iBAAiB,EAC5B,qBAAqB,GACtB,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuHzC"}
+{"version":3,"file":"compute-plan.d.ts","sourceRoot":"","sources":["../../src/engine/compute-plan.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,KAAK,EACV,WAAW,EAEX,QAAQ,EAET,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,UAAU,mBAAmB;IAC3B,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC;AA0dD,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,SAAS,EAAE,iBAAiB,EAC5B,qBAAqB,GACtB,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsIzC"}