@open-agent-toolkit/cli 0.2.30 → 0.2.32

package/dist/commands/project/archive/archive-utils.js

@@ -7,6 +7,7 @@ import { CliError } from '../../../errors/cli-error.js';
 import { copyDirectory, copySingleFile, dirExists, ensureDir, fileExists, } from '../../../fs/io.js';
 import { loadExplainerPackageCoverage } from './explainer-package-coverage.js';
 import { loadExplainerSourceBacklinks, } from './explainer-source-backlinks.js';
+import { loadExplainerTerminalEvidence } from './explainer-terminal-evidence.js';
 const execFileAsync = promisify(execFileCallback);
 export const ARCHIVE_SNAPSHOT_METADATA_FILENAME = '.oat-archive-source.json';
 /**
@@ -564,6 +565,25 @@ async function readVerifiedRunMode(runRoot) {
     }
     return request.mode;
 }
+async function verifyProjectRecapTerminalEvidence(runRoot, manifest, expected) {
+    if (!['built-needs-review', 'failed'].includes(manifest.outcome)) {
+        return null;
+    }
+    try {
+        const terminalEvidence = await loadExplainerTerminalEvidence();
+        const verified = await terminalEvidence.readTerminalEvidenceFile(runRoot, {
+            manifest,
+            ...(expected && {
+                expectedBytes: expected.bytes,
+                expectedHash: expected.hash,
+            }),
+        });
+        return { bytes: verified.bytes, hash: verified.hash };
+    }
+    catch {
+        throw new CliError('Selected project recap requires valid confined terminal evidence before archival.');
+    }
+}
 async function loadVerifiedProjectRecap(projectPath, projectRecapRun) {
     const sourceRunRoot = await resolveSelectedProjectRecapRun(projectPath, projectRecapRun);
     const manifestContents = await readFile(join(sourceRunRoot, 'manifest.json'), 'utf8');
@@ -571,9 +591,6 @@ async function loadVerifiedProjectRecap(projectPath, projectRecapRun) {
     if (manifest.recipe.id !== 'project-recap') {
         throw new CliError('Selected project recap manifest recipe must be exactly `project-recap`.');
     }
-    if (manifest.outcome === 'built-needs-review') {
-        throw new CliError('Selected project recap is built-needs-review and requires a passing visual review before archival.');
-    }
     const verifiedArtifactCount = await verifyProjectRecapImmutableHashes(sourceRunRoot, manifest);
     const runMode = await readVerifiedRunMode(sourceRunRoot);
     const packageCoverage = await loadExplainerPackageCoverage();
@@ -605,11 +622,29 @@ async function loadVerifiedProjectRecap(projectPath, projectRecapRun) {
         artifact.hash !== manifest.immutableHashes[artifact.renderedPath])) {
         throw new CliError('Selected project recap artifact hashes do not match the immutable package.');
     }
+    const terminalEvidence = await verifyProjectRecapTerminalEvidence(sourceRunRoot, manifest);
+    const exactCoverage = packageCoverage;
+    if (typeof exactCoverage.permissibleRunPackagePaths !== 'function' ||
+        typeof exactCoverage.enforceRunPackageInventory !== 'function') {
+        throw new CliError('Bundled explainer package coverage does not provide the exact run inventory.');
+    }
+    try {
+        await exactCoverage.enforceRunPackageInventory(sourceRunRoot, manifest, {
+            includeTerminalEvidence: terminalEvidence !== null,
+        });
+    }
+    catch {
+        throw new CliError('Selected project recap package inventory is invalid.');
+    }
     return {
         sourceRunRoot,
         manifestContents,
         manifest,
         verifiedArtifactCount,
+        terminalEvidence,
+        packagePaths: exactCoverage.permissibleRunPackagePaths(manifest, {
+            includeTerminalEvidence: terminalEvidence !== null,
+        }),
     };
 }
 export async function verifySelectedProjectRecapForArchive(projectPath, projectRecapRun) {
@@ -621,25 +656,40 @@ async function exportSelectedProjectRecap(options, snapshotName, dependencies) {
         return null;
     }
     const verified = await loadVerifiedProjectRecap(options.projectPath, selectedRun);
-    const { sourceRunRoot, manifestContents: sourceManifestContents, manifest: sourceManifest, } = verified;
+    const { sourceRunRoot, manifestContents: sourceManifestContents, terminalEvidence: sourceTerminalEvidence, packagePaths, } = verified;
     const exportRoot = join(options.repoRoot, '.oat', 'repo', 'reference', 'project-recaps', snapshotName);
     if (await pathExists(exportRoot)) {
         throw new CliError(`Project recap export destination \`${exportRoot}\` already exists; refusing to overwrite it.`);
     }
     const temporaryRoot = `${exportRoot}.tmp-${randomUUID()}`;
     const makeDir = dependencies.ensureDir ?? ensureDir;
-    const copyProjectDirectory = dependencies.copyDirectory ?? copyDirectory;
+    const copyFile = dependencies.copySingleFile ?? copySingleFile;
     const removePath = dependencies.removePath ??
         (async (target, removeOptions) => rm(target, removeOptions));
     const renamePath = dependencies.renamePath ?? rename;
     await makeDir(dirname(exportRoot));
     try {
-        await copyProjectDirectory(sourceRunRoot, temporaryRoot);
+        for (const relativePath of packagePaths) {
+            const destination = join(temporaryRoot, relativePath);
+            await makeDir(dirname(destination));
+            await copyFile(join(sourceRunRoot, relativePath), destination);
+        }
         const stagedManifestContents = await readFile(join(temporaryRoot, 'manifest.json'), 'utf8');
         if (stagedManifestContents !== sourceManifestContents) {
             throw new CliError('Selected project recap manifest changed while staging the export.');
         }
-        const verifiedArtifactCount = await verifyProjectRecapImmutableHashes(temporaryRoot, sourceManifest);
+        const stagedManifest = await parseProjectRecapManifest(stagedManifestContents);
+        const verifiedArtifactCount = await verifyProjectRecapImmutableHashes(temporaryRoot, stagedManifest);
+        const stagedTerminalEvidence = await verifyProjectRecapTerminalEvidence(temporaryRoot, stagedManifest, sourceTerminalEvidence ?? undefined);
+        const exactCoverage = (await loadExplainerPackageCoverage());
+        try {
+            await exactCoverage.enforceRunPackageInventory(temporaryRoot, stagedManifest, {
+                includeTerminalEvidence: stagedTerminalEvidence !== null,
+            });
+        }
+        catch {
+            throw new CliError('Staged project recap package inventory is invalid.');
+        }
         await renamePath(temporaryRoot, exportRoot);
         return {
             sourceRunRoot,

package/dist/commands/project/archive/explainer-terminal-evidence.d.ts

@@ -0,0 +1,29 @@
+declare const TERMINAL_EVIDENCE_VERSION = "explainer-kit.terminal-evidence/v1";
+export interface ExplainerTerminalEvidence {
+    TERMINAL_EVIDENCE_VERSION: typeof TERMINAL_EVIDENCE_VERSION;
+    assertTerminalEvidence: (evidence: unknown, context: {
+        manifest: unknown;
+    }) => unknown;
+    readTerminalEvidenceFile: (runRoot: string, context: {
+        manifest: unknown;
+        expectedBytes?: Uint8Array;
+        expectedHash?: string;
+    }) => Promise<{
+        evidence: unknown;
+        bytes: Buffer;
+        hash: string;
+    }>;
+    writeTerminalEvidence: (run: {
+        runId: string;
+        slug: string;
+        runRoot: string;
+    }, input: {
+        outcome: string;
+        manifest: unknown;
+        reasons: unknown[];
+        evidenceDisposition: string;
+    }) => Promise<string>;
+}
+export declare function loadExplainerTerminalEvidence(): Promise<ExplainerTerminalEvidence>;
+export {};
+//# sourceMappingURL=explainer-terminal-evidence.d.ts.map

package/dist/commands/project/archive/explainer-terminal-evidence.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"explainer-terminal-evidence.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/archive/explainer-terminal-evidence.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,yBAAyB,uCAAuC,CAAC;AAEvE,MAAM,WAAW,yBAAyB;IACxC,yBAAyB,EAAE,OAAO,yBAAyB,CAAC;IAC5D,sBAAsB,EAAE,CACtB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC;IACb,wBAAwB,EAAE,CACxB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;QAClB,aAAa,CAAC,EAAE,UAAU,CAAC;QAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,KACE,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjE,qBAAqB,EAAE,CACrB,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EACrD,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,mBAAmB,EAAE,MAAM,CAAC;KAC7B,KACE,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAID,wBAAgB,6BAA6B,IAAI,OAAO,CAAC,yBAAyB,CAAC,CAGlF"}

package/dist/commands/project/archive/explainer-terminal-evidence.js

@@ -0,0 +1,37 @@
+import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { CliError } from '../../../errors/cli-error.js';
+import { resolveAssetsRoot } from '../../../fs/assets.js';
+const TERMINAL_EVIDENCE_VERSION = 'explainer-kit.terminal-evidence/v1';
+let cachedTerminalEvidence;
+export function loadExplainerTerminalEvidence() {
+    cachedTerminalEvidence ??= loadGeneratedTerminalEvidence();
+    return cachedTerminalEvidence;
+}
+async function loadGeneratedTerminalEvidence() {
+    const assetsRoot = await resolveAssetsRoot();
+    const skillRoot = join(assetsRoot, 'skills', 'explainer-kit');
+    let contract;
+    let records;
+    try {
+        [contract, records] = await Promise.all([
+            import(pathToFileURL(join(skillRoot, 'scripts', 'lib', 'terminal-evidence.mjs')).href),
+            import(pathToFileURL(join(skillRoot, 'scripts', 'lib', 'records.mjs')).href),
+        ]);
+    }
+    catch {
+        throw new CliError('Bundled explainer terminal evidence could not be loaded.', 2);
+    }
+    if (contract.TERMINAL_EVIDENCE_VERSION !== TERMINAL_EVIDENCE_VERSION ||
+        typeof contract.assertTerminalEvidence !== 'function' ||
+        typeof contract.readTerminalEvidenceFile !== 'function' ||
+        typeof records.writeTerminalEvidence !== 'function') {
+        throw new CliError(`Bundled assets must provide ${TERMINAL_EVIDENCE_VERSION} validation and writing.`, 2);
+    }
+    return {
+        TERMINAL_EVIDENCE_VERSION,
+        assertTerminalEvidence: contract.assertTerminalEvidence,
+        readTerminalEvidenceFile: contract.readTerminalEvidenceFile,
+        writeTerminalEvidence: records.writeTerminalEvidence,
+    };
+}

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

@@ -1,7 +1,8 @@
 import { type CommandContext } from '../../../app/command-context.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { type SyncConfig } from '../../../config/sync-config.js';
-import { type Manifest } from '../../../manifest/index.js';
+import { type RemovalSyncPlanEntry } from '../../../engine/index.js';
+import { type Manifest, type ManifestEntry } 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';
@@ -16,7 +17,9 @@ export interface RemoveSkillDependencies {
     getConfigAwareAdapters: (adapters: ProviderAdapter[], scopeRoot: string, config: SyncConfig) => Promise<ConfigAwareAdaptersResult>;
     getSyncMappings: (adapter: ProviderAdapter, scope: Scope) => PathMapping[];
     getAdoptionSources: (adapter: ProviderAdapter, scope: Scope) => AdoptionSource[];
+    classifyObsoleteMappingRetirement: (manifestEntry: ManifestEntry, scopeRoot: string) => Promise<RemovalSyncPlanEntry>;
     pathExists: (path: string) => Promise<boolean>;
+    pathEntryExists: (path: string) => Promise<boolean>;
     removeDirectory: (path: string) => Promise<void>;
 }
 export declare function createDefaultRemoveSkillDependencies(): RemoveSkillDependencies;

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,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"}
+{"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;AAC7B,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,eAAe,CAAC;AAGvB,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,aAAa,EAGnB,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;AA+BpC,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,iCAAiC,EAAE,CACjC,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,wBAAgB,oCAAoC,IAAI,uBAAuB,CA0C9E;AAwND,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

@@ -1,11 +1,12 @@
-import { rm } from 'node:fs/promises';
+import { lstat, rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
 import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, } from '../../../config/sync-config.js';
+import { classifyObsoleteMappingRetirement, } from '../../../engine/index.js';
 import { dirExists, fileExists } from '../../../fs/io.js';
-import { resolveProjectRoot, resolveScopeRoot } from '../../../fs/paths.js';
+import { resolveProjectRoot, resolveScopeRoot, toPosixPath } from '../../../fs/paths.js';
 import { loadManifest, removeEntry, saveManifest, } from '../../../manifest/index.js';
 import { claudeAdapter } from '../../../providers/claude/index.js';
 import { codexAdapter } from '../../../providers/codex/index.js';
@@ -41,9 +42,19 @@ export function createDefaultRemoveSkillDependencies() {
         getConfigAwareAdapters,
         getSyncMappings,
         getAdoptionSources,
+        classifyObsoleteMappingRetirement,
         async pathExists(path) {
             return (await fileExists(path)) || (await dirExists(path));
         },
+        async pathEntryExists(path) {
+            try {
+                await lstat(path);
+                return true;
+            }
+            catch {
+                return false;
+            }
+        },
         async removeDirectory(path) {
             await rm(path, { recursive: true, force: true });
         },
@@ -77,6 +88,7 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
     const { activeAdapters } = await dependencies.getConfigAwareAdapters(adapters, scopeRoot, config);
     const managedProviderViews = [];
     const unmanagedProviderViews = [];
+    const manifestProvidersToRemove = new Set();
     for (const adapter of activeAdapters) {
         const syncMappings = dependencies
             .getSyncMappings(adapter, scope)
@@ -88,6 +100,7 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
                 entry.provider === adapter.name);
             const providerPathExists = await dependencies.pathExists(absolutePath);
             if (hasManifestEntry) {
+                manifestProvidersToRemove.add(adapter.name);
                 managedProviderViews.push({
                     provider: adapter.name,
                     absolutePath,
@@ -111,7 +124,32 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
         for (const source of localAdoptionSources) {
             const relativePath = join(source.directory, skillName);
             const absolutePath = join(scopeRoot, relativePath);
-            if (await dependencies.pathExists(absolutePath)) {
+            const legacyManifestEntry = manifest.entries.find((entry) => adapter.name === 'copilot' &&
+                entry.canonicalPath === canonicalRelativePath &&
+                entry.provider === adapter.name &&
+                entry.providerPath === toPosixPath(relativePath));
+            if (legacyManifestEntry) {
+                manifestProvidersToRemove.add(adapter.name);
+                const [retirement, providerPathExists] = await Promise.all([
+                    dependencies.classifyObsoleteMappingRetirement(legacyManifestEntry, scopeRoot),
+                    dependencies.pathEntryExists(absolutePath),
+                ]);
+                if (retirement.operation === 'remove') {
+                    managedProviderViews.push({
+                        provider: adapter.name,
+                        absolutePath,
+                        relativePath,
+                    });
+                }
+                else if (providerPathExists) {
+                    unmanagedProviderViews.push({
+                        provider: adapter.name,
+                        absolutePath,
+                        relativePath,
+                    });
+                }
+            }
+            else if (await dependencies.pathExists(absolutePath)) {
                 unmanagedProviderViews.push({
                     provider: adapter.name,
                     absolutePath,
@@ -129,6 +167,7 @@ async function buildScopePlan(scope, scopeRoot, skillName, dependencies) {
         canonicalAbsolutePath,
         managedProviderViews: dedupeViews(managedProviderViews),
         unmanagedProviderViews: dedupeViews(unmanagedProviderViews),
+        manifestProvidersToRemove: [...manifestProvidersToRemove],
     };
 }
 function logDryRun(context, plan) {
@@ -164,8 +203,8 @@ async function applyPlan(context, plan, dependencies) {
         await dependencies.removeDirectory(view.absolutePath);
     }
     let nextManifest = plan.manifest;
-    for (const view of plan.managedProviderViews) {
-        nextManifest = removeEntry(nextManifest, plan.canonicalRelativePath, view.provider);
+    for (const provider of plan.manifestProvidersToRemove) {
+        nextManifest = removeEntry(nextManifest, plan.canonicalRelativePath, provider);
     }
     await dependencies.saveManifest(plan.manifestPath, nextManifest);
     context.logger.info(`[apply][${plan.scope}] removed ${plan.canonicalRelativePath}`);

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

@@ -17,6 +17,11 @@ interface AdoptStrayOptions {
     replaceCanonical?: boolean;
 }
 export declare function isAdoptionConflictError(error: unknown): error is CliError;
+export declare class AdoptionSourceUnavailableError extends CliError {
+    readonly kind: 'adoption-source-unavailable';
+    constructor(message: string);
+}
+export declare function isAdoptionSourceUnavailableError(error: unknown): error is AdoptionSourceUnavailableError;
 export declare function adoptStrayToCanonical<TCandidate extends StrayAdoptionCandidate>(scopeRoot: string, stray: TCandidate, manifest: Manifest, options?: AdoptStrayOptions): Promise<Manifest>;
 export {};
 //# sourceMappingURL=adopt-stray.d.ts.map

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,CA8EnB"}
+{"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,CAMzE;AAED,qBAAa,8BAA+B,SAAQ,QAAQ;IAC1D,QAAQ,CAAC,IAAI,EAAG,6BAA6B,CAAU;IAEvD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,8BAA8B,CAEzC;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,CA0FnB"}

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

@@ -9,7 +9,19 @@ import { addEntry } from '../../manifest/manager.js';
 import { importCanonicalAgentFromCodexRole } from '../../providers/codex/codec/import-from-codex.js';
 import { canonicalRuleNameForProviderEntry } from '../../rules/canonical/index.js';
 export function isAdoptionConflictError(error) {
-    return error instanceof CliError && error.message.startsWith('Cannot adopt ');
+    return (error instanceof CliError &&
+        !isAdoptionSourceUnavailableError(error) &&
+        error.message.startsWith('Cannot adopt '));
+}
+export class AdoptionSourceUnavailableError extends CliError {
+    kind = 'adoption-source-unavailable';
+    constructor(message) {
+        super(message);
+        this.name = 'AdoptionSourceUnavailableError';
+    }
+}
+export function isAdoptionSourceUnavailableError(error) {
+    return error instanceof AdoptionSourceUnavailableError;
 }
 async function pathExists(path) {
     try {
@@ -21,12 +33,21 @@ async function pathExists(path) {
     }
 }
 export async function adoptStrayToCanonical(scopeRoot, stray, manifest, options = {}) {
+    const providerAbsolutePath = resolve(scopeRoot, stray.report.providerPath);
+    let providerStat;
+    try {
+        providerStat = await stat(providerAbsolutePath);
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT') {
+            throw error;
+        }
+        throw new AdoptionSourceUnavailableError(`Cannot adopt ${toPosixPath(relative(scopeRoot, providerAbsolutePath))}: the path is missing or a broken symlink. Remove it or restore its target, then run the command again.`);
+    }
+    const isFile = providerStat.isFile();
     if (stray.adoption?.kind === 'codex_role') {
         return adoptCodexRoleStrayToCanonical(scopeRoot, stray, manifest, options);
     }
-    const providerAbsolutePath = resolve(scopeRoot, stray.report.providerPath);
-    const providerStat = await stat(providerAbsolutePath);
-    const isFile = providerStat.isFile();
     if (isFile && stray.mapping.contentType === 'rule') {
         return adoptRuleStrayToCanonical(scopeRoot, stray, manifest, options);
     }

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

@@ -0,0 +1,22 @@
+import type { Manifest } from '../../manifest/manifest.types.js';
+import type { PathMapping } from '../../providers/shared/adapter.types.js';
+export type NativeSkillDisposition = 'adopt' | 'keep';
+export interface NativeSkillCandidate {
+    provider: string;
+    report: {
+        providerPath: string;
+    };
+    mapping: PathMapping;
+}
+export interface NativeSkillProviderDetails {
+    displayName: string;
+    sourceDir: string;
+}
+interface ApplyNativeSkillDispositionOptions {
+    replaceCanonical?: boolean;
+}
+export declare function getNativeSkillProviderDetails(candidate: NativeSkillCandidate): NativeSkillProviderDetails | null;
+export declare function isNativeSkillCandidate(candidate: NativeSkillCandidate): boolean;
+export declare function applyNativeSkillDisposition(scopeRoot: string, candidate: NativeSkillCandidate, manifest: Manifest, disposition: NativeSkillDisposition, syncConfigPath: string, options?: ApplyNativeSkillDispositionOptions): Promise<Manifest>;
+export {};
+//# sourceMappingURL=native-skill-disposition.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"native-skill-disposition.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/native-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,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,kCAAkC;IAC1C,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAOD,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,oBAAoB,GAC9B,0BAA0B,GAAG,IAAI,CAqBnC;AAQD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,oBAAoB,GAC9B,OAAO,CAET;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,CAenB"}

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

@@ -0,0 +1,60 @@
+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';
+const NATIVE_SKILL_PROVIDER_DISPLAY_NAMES = {
+    copilot: 'Copilot',
+    cursor: 'Cursor',
+};
+export function getNativeSkillProviderDetails(candidate) {
+    if (candidate.mapping.contentType !== 'skill' ||
+        !candidate.mapping.nativeRead) {
+        return null;
+    }
+    const providerPath = toPosixPath(candidate.report.providerPath);
+    const sourceDir = candidate.mapping.adoptionSourceDirs?.find((directory) => providerPath === directory || providerPath.startsWith(`${directory}/`));
+    if (!sourceDir) {
+        return null;
+    }
+    const displayName = NATIVE_SKILL_PROVIDER_DISPLAY_NAMES[candidate.provider] ??
+        formatProviderName(candidate.provider);
+    return { displayName, sourceDir };
+}
+function formatProviderName(provider) {
+    return provider.length === 0
+        ? 'Provider'
+        : `${provider.charAt(0).toUpperCase()}${provider.slice(1)}`;
+}
+export function isNativeSkillCandidate(candidate) {
+    return getNativeSkillProviderDetails(candidate) !== null;
+}
+export async function applyNativeSkillDisposition(scopeRoot, candidate, manifest, disposition, syncConfigPath, options = {}) {
+    const provider = getNativeSkillProviderDetails(candidate);
+    if (!provider) {
+        throw new CliError(`Cannot apply a native skill disposition to ${candidate.report.providerPath}.`);
+    }
+    if (disposition === 'adopt') {
+        return adoptStrayToCanonical(scopeRoot, candidate, manifest, options);
+    }
+    await assertProviderOnlyNameAvailable(scopeRoot, candidate, provider);
+    await appendKnownStray(syncConfigPath, candidate.report.providerPath);
+    return manifest;
+}
+async function assertProviderOnlyNameAvailable(scopeRoot, candidate, provider) {
+    const canonicalPath = resolve(scopeRoot, candidate.mapping.canonicalDir, basename(candidate.report.providerPath));
+    if (!(await pathExists(canonicalPath))) {
+        return;
+    }
+    throw new CliError(`Cannot keep ${candidate.report.providerPath} ${provider.displayName}-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,6 +1,6 @@
 import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
 import { type CodexRoleStray } from '../shared/codex-strays.js';
-import { type CursorSkillDisposition } from '../shared/cursor-skill-disposition.js';
+import { type NativeSkillDisposition } from '../shared/native-skill-disposition.js';
 import { type MultiSelectChoice, type PromptContext, type SelectChoice } from '../shared/shared.prompts.js';
 import { type SyncConfig } from '../../config/index.js';
 import { type CopyTransform, type DriftReport } from '../../drift/index.js';
@@ -44,7 +44,7 @@ interface StatusDependencies {
     adoptStray: (scopeRoot: string, stray: StatusStrayCandidate, manifest: Manifest, options?: {
         replaceCanonical?: boolean;
     }) => Promise<Manifest>;
-    applyCursorSkillDisposition: (scopeRoot: string, stray: StatusStrayCandidate, manifest: Manifest, disposition: CursorSkillDisposition, syncConfigPath: string, options?: {
+    applyNativeSkillDisposition: (scopeRoot: string, stray: StatusStrayCandidate, manifest: Manifest, disposition: NativeSkillDisposition, syncConfigPath: string, options?: {
         replaceCanonical?: boolean;
     }) => Promise<Manifest>;
     formatStatusTable: (reports: DriftReport[]) => string;

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,8 +1,8 @@
 import { basename, join, relative } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
-import { adoptStrayToCanonical, isAdoptionConflictError, } from '../shared/adopt-stray.js';
+import { adoptStrayToCanonical, isAdoptionConflictError, isAdoptionSourceUnavailableError, } from '../shared/adopt-stray.js';
 import { detectCodexRoleStrays, filterMaterializationManagedStrays, regenerateCodexAfterAdoption, } from '../shared/codex-strays.js';
-import { applyCursorSkillDisposition, isCursorSkillCandidate, } from '../shared/cursor-skill-disposition.js';
+import { applyNativeSkillDisposition, getNativeSkillProviderDetails, isNativeSkillCandidate, } from '../shared/native-skill-disposition.js';
 import { withScopeOption } from '../shared/scope-option.js';
 import { confirmAction, selectManyWithAbort, selectWithAbort, } from '../shared/shared.prompts.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
@@ -64,7 +64,7 @@ const DEFAULT_DEPENDENCIES = {
     selectWithAbort,
     confirmAction,
     adoptStray: adoptStrayDefault,
-    applyCursorSkillDisposition,
+    applyNativeSkillDisposition,
     formatStatusTable,
 };
 function entryInsideMapping(entryProviderPath, mappingProviderDir) {
@@ -355,19 +355,20 @@ async function runStatusCommand(context, dependencies, options = {}) {
                 let manifestChanged = false;
                 let adoptedCount = 0;
                 let codexStrayAdopted = false;
-                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)}`, [
+                const nativeSkillStrays = scopeCollection.strayCandidates.filter(isNativeSkillCandidate);
+                const ordinaryStrays = scopeCollection.strayCandidates.filter((stray) => !isNativeSkillCandidate(stray));
+                for (const strayCandidate of nativeSkillStrays) {
+                    const provider = getNativeSkillProviderDetails(strayCandidate);
+                    const disposition = await dependencies.selectWithAbort(`Migrate ${provider.displayName} 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',
+                            label: `Keep ${provider.displayName}-only`,
                             value: 'keep',
-                            description: 'Leave in .cursor/skills and remember this choice.',
+                            description: `Leave in ${provider.sourceDir} and remember this choice.`,
                         },
                     ], { interactive: context.interactive });
                     if (disposition === null) {
@@ -376,15 +377,19 @@ async function runStatusCommand(context, dependencies, options = {}) {
                     }
                     try {
                         scopeCollection.manifest =
-                            await dependencies.applyCursorSkillDisposition(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, disposition, scopeCollection.syncConfigPath);
+                            await dependencies.applyNativeSkillDisposition(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)}.`);
+                            context.logger.success(`Kept ${provider.displayName}-only [${scopeCollection.scope}]: ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
                         }
                     }
                     catch (error) {
+                        if (isAdoptionSourceUnavailableError(error)) {
+                            context.logger.warn(error.message);
+                            continue;
+                        }
                         if (error instanceof Error &&
                             error.message.startsWith('Cannot keep ')) {
                             context.logger.warn(error.message);
@@ -395,11 +400,11 @@ async function runStatusCommand(context, dependencies, options = {}) {
                         }
                         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 Cursor skill [${scopeCollection.scope}] ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
+                            context.logger.warn(`Skipped adopting conflicting ${provider.displayName} skill [${scopeCollection.scope}] ${formatPathForScope(scopeCollection.scope, strayCandidate.report.providerPath)}.`);
                             continue;
                         }
                         scopeCollection.manifest =
-                            await dependencies.applyCursorSkillDisposition(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, disposition, scopeCollection.syncConfigPath, { replaceCanonical: true });
+                            await dependencies.applyNativeSkillDisposition(scopeCollection.scopeRoot, strayCandidate, scopeCollection.manifest, disposition, scopeCollection.syncConfigPath, { replaceCanonical: true });
                         adoptedCount += 1;
                     }
                 }
@@ -426,6 +431,10 @@ async function runStatusCommand(context, dependencies, options = {}) {
                                     codexStrayAdopted || strayCandidate.provider === 'codex';
                             }
                             catch (error) {
+                                if (isAdoptionSourceUnavailableError(error)) {
+                                    context.logger.warn(error.message);
+                                    continue;
+                                }
                                 if (!isAdoptionConflictError(error)) {
                                     throw error;
                                 }

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

@@ -26,11 +26,13 @@ export interface OatExplainerDefaultsConfig {
     themeBundlePath?: string;
 }
 export type OatExplainerPublishProvider = 's3-static';
+export type OatExplainerPublicAccess = 'public' | 'protected';
 export interface OatExplainerPublishConfig {
     provider?: OatExplainerPublishProvider;
     s3Uri?: string;
     publicBaseUrl?: string;
     awsRegion?: string;
+    publicAccess?: OatExplainerPublicAccess;
     awsProfile?: string;
 }
 export interface OatExplainersConfig {