@open-agent-toolkit/cli 0.2.51 → 0.2.52

package/dist/commands/tools/update/update-tools.js

@@ -1,6 +1,8 @@
 import { join } from 'node:path';
-import { hasScopedPackPlacementEvidence, inventoryScopedPack, } from '../../tools/shared/pack-inventory.js';
+import { hasScopedPackRealizationEvidence, packScopeFactsFromInventory, projectPackEvidence, } from '../../tools/shared/pack-evidence.js';
+import { inventoryScopedPack } from '../../tools/shared/pack-inventory.js';
 import {} from '../../tools/shared/pack-lifecycle.js';
+import { evaluatePackLifecycleOutcome, resolveAdditivePackScopeSelection, } from '../../tools/shared/pack-lifecycle-outcome.js';
 import { getPackDefinition } from '../../tools/shared/pack-manifest.js';
 function getBundledPackAssets(pack, scope) {
     const assets = getPackDefinition(pack).assets.filter(({ scopes, ownership }) => scopes.includes(scope) && ownership[scope] === 'managed');
@@ -47,7 +49,7 @@ export async function updateTools(target, scopes, cwd, home, dryRun, dependencie
                     scopeRoot,
                     assetsRoot,
                 });
-                if (!hasScopedPackPlacementEvidence(before))
+                if (!hasScopedPackRealizationEvidence(before))
                     continue;
                 requests.push({
                     pack: definition.name,
@@ -63,6 +65,7 @@ export async function updateTools(target, scopes, cwd, home, dryRun, dependencie
             return result;
         }
         const lifecycle = await dependencies.reconcilePacks(requests, { dryRun });
+        result.lifecycle = updateLifecycleOutcomes(lifecycle);
         result.plans.push(...lifecycle.map(({ plan }) => plan));
         for (const entry of lifecycle) {
             const definition = getPackDefinition(entry.request.pack);
@@ -243,6 +246,65 @@ export async function updateTools(target, scopes, cwd, home, dryRun, dependencie
     }
     return result;
 }
+function updateLifecycleOutcomes(results) {
+    const verifiable = results.filter(({ apply }) => apply === null || ('inventory' in apply && apply.inventory !== undefined));
+    const packs = [...new Set(verifiable.map(({ request }) => request.pack))];
+    return packs.map((pack) => {
+        const lifecycle = verifiable.filter(({ request }) => request.pack === pack);
+        const requestedScopes = lifecycle.map(({ request }) => request.scope);
+        const finalScopes = lifecycle.map(({ apply, before }) => apply?.inventory ?? before);
+        const finalEvidence = projectPackEvidence({
+            canonical: null,
+            scopes: finalScopes.map(packScopeFactsFromInventory),
+        });
+        const selection = resolveAdditivePackScopeSelection({
+            pack,
+            requested: requestedScopes.includes('project') && requestedScopes.includes('user')
+                ? 'both'
+                : requestedScopes[0],
+            knownRealizedScopes: lifecycle
+                .filter(({ before }) => hasScopedPackRealizationEvidence(before))
+                .map(({ request }) => request.scope),
+            unknownScopes: [],
+        });
+        if (lifecycle.every(({ apply }) => apply === null)) {
+            return {
+                schemaVersion: 1,
+                selection,
+                canonical: { status: 'unchanged', results: lifecycle },
+                sync: { scopes: [], status: 'not-run', providers: [] },
+                finalEvidence,
+                status: 'complete',
+                recovery: [],
+            };
+        }
+        return evaluatePackLifecycleOutcome({
+            selection,
+            lifecycle,
+            sync: { scopes: [], status: 'not-run', providers: [] },
+            finalEvidence,
+        });
+    });
+}
+export function failedUpdateLifecycleOutcomes(target, scopes, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return getSelectedDefinitions(target).map(({ name: pack }) => ({
+        schemaVersion: 1,
+        selection: {
+            pack,
+            requested: scopes.includes('project') && scopes.includes('user')
+                ? 'both'
+                : scopes[0],
+            retainedRealizedScopes: [],
+            targetScopes: scopes,
+        },
+        canonical: { status: 'failed', results: [] },
+        sync: { scopes: [], status: 'not-run', providers: [] },
+        finalEvidence: null,
+        status: 'failed',
+        recovery: [{ code: 'canonical-apply-failed', message }],
+    }));
+}
 function getSelectedDefinitions(target) {
     return target.kind === 'pack'
         ? [getPackDefinition(target.pack)]

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

@@ -10,6 +10,11 @@ export interface OatDocumentationConfig {
 export interface OatGitConfig {
     defaultBranch?: string;
 }
+/**
+ * Known project config keys. Unknown siblings written by a newer OAT are not
+ * described here, but they are preserved verbatim across read-mutate-write:
+ * see the FR10 merge in `normalizeOatConfig`.
+ */
 export interface OatProjectsConfig {
     root?: string;
     defaultScope?: 'shared' | 'local' | 'synced';

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

@@ -630,11 +630,23 @@ function normalizeOatConfig(parsed, configPath = '.oat/config.json') {
         if (rawDefaultScope !== undefined && defaultScope === undefined) {
             throw new CliError(`Invalid projects.defaultScope in ${configPath}: "${String(rawDefaultScope)}". Expected one of: shared, local, synced. Repair it with oat config set projects.defaultScope <shared|local|synced>.`, 2);
         }
-        if (root || defaultScope) {
-            next.projects = {
-                ...(root ? { root } : {}),
-                ...(defaultScope ? { defaultScope } : {}),
-            };
+        // FR10: retain unknown siblings. Normalization previously rebuilt this
+        // subtree from the two known keys, so any field a newer OAT wrote was
+        // destroyed by the next read-mutate-write cycle — which every project-scope
+        // pack install performs. The values come from JSON.parse, so they are
+        // JSON-safe by construction; known keys are normalized and overwrite the
+        // raw ones, and everything else is carried through untouched.
+        // Built with `Object.fromEntries` rather than assignment: `preserved[key]`
+        // invokes the legacy prototype setter for a key named `__proto__`, so a
+        // valid JSON sibling with that name would silently vanish.
+        const preserved = Object.fromEntries(Object.entries(parsed.projects).filter(([key]) => key !== 'root' && key !== 'defaultScope'));
+        const normalized = {
+            ...preserved,
+            ...(root ? { root } : {}),
+            ...(defaultScope ? { defaultScope } : {}),
+        };
+        if (Object.keys(normalized).length > 0) {
+            next.projects = normalized;
         }
     }
     if (isRecord(parsed.git)) {

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

@@ -7,5 +7,6 @@ interface UserSyncConfigDependencies {
 }
 export declare function getUserSyncConfigPath(userConfigDir: string): string;
 export declare function resolveUserSyncConfig(userConfigDir: string, overrides?: Partial<UserSyncConfigDependencies>): Promise<SyncConfig>;
+export declare function updateUserSyncConfig(userConfigDir: string, update: (current: SyncConfig) => SyncConfig, overrides?: Partial<UserSyncConfigDependencies>): Promise<SyncConfig>;
 export {};
 //# sourceMappingURL=user-sync-config.d.ts.map

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

@@ -1 +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"}
+{"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;AAED,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,UAAU,EAC3C,SAAS,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAClD,OAAO,CAAC,UAAU,CAAC,CAUrB"}

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

@@ -35,6 +35,14 @@ export async function resolveUserSyncConfig(userConfigDir, overrides = {}) {
     await dependencies.atomicWriteJson(legacyConfigPath, preservedLegacyConfig);
     return migratedSyncConfig;
 }
+export async function updateUserSyncConfig(userConfigDir, update, overrides = {}) {
+    const dependencies = {
+        ...DEFAULT_DEPENDENCIES,
+        ...overrides,
+    };
+    const current = await resolveUserSyncConfig(userConfigDir, dependencies);
+    return dependencies.saveSyncConfig(getUserSyncConfigPath(userConfigDir), update(current));
+}
 async function readLegacyConfig(configPath, read) {
     try {
         const parsed = parseJsonConfig(await read(configPath, 'utf8'), configPath);

package/dist/drift/detector.d.ts

@@ -1,7 +1,7 @@
-import type { ManifestEntry } from '../manifest/manifest.types.js';
+import type { ManifestEntryV2 } from '../manifest/manifest.types.js';
 import type { DriftReport } from './drift.types.js';
 export interface CopyTransform {
     transformCanonical: (content: string, canonicalPath: string) => string;
 }
-export declare function detectDrift(entry: ManifestEntry, scopeRoot: string, copyTransform?: CopyTransform): Promise<DriftReport>;
+export declare function detectDrift(entry: ManifestEntryV2, scopeRoot: string, copyTransform?: CopyTransform): Promise<DriftReport>;
 //# sourceMappingURL=detector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../src/drift/detector.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;CACxE;AAcD,wBAAsB,WAAW,CAC/B,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,WAAW,CAAC,CAkFtB"}
+{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../src/drift/detector.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;CACxE;AAcD,wBAAsB,WAAW,CAC/B,KAAK,EAAE,eAAe,EACtB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,WAAW,CAAC,CAoGtB"}

package/dist/drift/detector.js

@@ -1,5 +1,6 @@
 import { lstat, readFile, readlink, stat } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
+import { proveCollectionIdentity } from '../engine/collection-sync.js';
 import { computeContentHash, computeStringHash } from '../manifest/hash.js';
 function createReport(entry, state) {
     return {
@@ -12,6 +13,23 @@ function createReport(entry, state) {
 export async function detectDrift(entry, scopeRoot, copyTransform) {
     const providerPath = resolve(scopeRoot, entry.providerPath);
     const canonicalPath = resolve(scopeRoot, entry.canonicalPath);
+    if (entry.strategy === 'collection') {
+        const proof = await proveCollectionIdentity({
+            root: scopeRoot,
+            canonicalDir: dirname(canonicalPath),
+            providerDir: dirname(providerPath),
+        });
+        if (proof.status === 'exact-link') {
+            return createReport(entry, { status: 'in_sync' });
+        }
+        if (proof.status === 'absent') {
+            return createReport(entry, { status: 'missing' });
+        }
+        return createReport(entry, {
+            status: 'drifted',
+            reason: proof.reason === 'broken-link' ? 'broken' : 'replaced',
+        });
+    }
     // Missing check must run first, before strategy-specific branches.
     let providerStat;
     try {

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,CACZ,WAAW,EACX,aAAa,GAAG,YAAY,GAAG,mBAAmB,CACnD,GACA,OAAO,CAAC,WAAW,EAAE,CAAC,CA6DxB"}
+{"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,CAuExB"}

package/dist/drift/strays.js

@@ -138,6 +138,11 @@ export async function detectStrays(provider, providerDir, manifest, canonicalEnt
     const scopeRoot = inferScopeRoot(providerDir);
     const reports = [];
     const resolvedProviderDir = resolve(providerDir);
+    const providerDirRelative = toScopeRelative(resolvedProviderDir, scopeRoot);
+    if (manifest.collections.some((collection) => collection.provider === provider &&
+        collection.providerDir === providerDirRelative)) {
+        return reports;
+    }
     const entries = await readProviderEntries(resolvedProviderDir);
     for (const entry of entries) {
         if (!entry.isDirectory() && !entry.isSymbolicLink() && !entry.isFile()) {

package/dist/engine/collection-sync.d.ts

@@ -0,0 +1,14 @@
+import type { ManifestV2 } from '../manifest/manifest.types.js';
+import type { CollectionIdentityProof, CollectionProjectionPlan } from './engine.types.js';
+interface CollectionIdentityInput {
+    root: string;
+    canonicalDir: string;
+    providerDir: string;
+}
+export declare function proveCollectionIdentity({ root, canonicalDir, providerDir, }: CollectionIdentityInput): Promise<CollectionIdentityProof>;
+export declare function collectionProofMatches(planned: CollectionIdentityProof, current: CollectionIdentityProof): boolean;
+export declare function projectCollectionOwnership(manifest: ManifestV2, plan: CollectionProjectionPlan, verifiedProof: Extract<CollectionIdentityProof, {
+    status: 'exact-link';
+}>): Promise<ManifestV2>;
+export {};
+//# sourceMappingURL=collection-sync.d.ts.map

package/dist/engine/collection-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collection-sync.d.ts","sourceRoot":"","sources":["../../src/engine/collection-sync.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE5E,OAAO,KAAK,EACV,uBAAuB,EAEvB,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AAGxB,UAAU,uBAAuB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AA4FD,wBAAsB,uBAAuB,CAAC,EAC5C,IAAI,EACJ,YAAY,EACZ,WAAW,GACZ,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgH5D;AAcD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAoBT;AAkBD,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,wBAAwB,EAC9B,aAAa,EAAE,OAAO,CAAC,uBAAuB,EAAE;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC,GACxE,OAAO,CAAC,UAAU,CAAC,CA2ErB"}

package/dist/engine/collection-sync.js

@@ -0,0 +1,282 @@
+import { createHash } from 'node:crypto';
+import { lstat, readdir, readlink, realpath } from 'node:fs/promises';
+import { dirname, isAbsolute, relative, resolve, sep } from 'node:path';
+import { assertSafeProviderCollectionPath } from './provider-path-safety.js';
+function isMissingPathError(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        error.code === 'ENOENT');
+}
+function pathIdentity(stat) {
+    const type = stat.isDirectory()
+        ? 'directory'
+        : stat.isSymbolicLink()
+            ? 'symlink'
+            : undefined;
+    if (type === undefined) {
+        return undefined;
+    }
+    return {
+        device: String(stat.dev),
+        inode: String(stat.ino),
+        type,
+        modifiedAtNanoseconds: String('mtimeNs' in stat ? stat.mtimeNs : Math.round(stat.mtimeMs * 1_000_000)),
+    };
+}
+function pathInside(parent, candidate) {
+    const relativePath = relative(resolve(parent), resolve(candidate));
+    return (relativePath === '' ||
+        (!isAbsolute(relativePath) &&
+            relativePath !== '..' &&
+            !relativePath.startsWith(`..${sep}`)));
+}
+async function entrySetDigest(directory) {
+    const hash = createHash('sha256');
+    async function visit(current) {
+        const names = (await readdir(current)).sort();
+        for (const name of names) {
+            const path = resolve(current, name);
+            const relativePath = relative(directory, path).replaceAll('\\', '/');
+            const stat = await lstat(path);
+            if (stat.isDirectory()) {
+                hash.update(`directory\0${relativePath}\0`);
+                await visit(path);
+            }
+            else if (stat.isFile()) {
+                hash.update(`file\0${relativePath}\0${stat.size}\0${stat.mtimeMs}\0`);
+            }
+            else if (stat.isSymbolicLink()) {
+                hash.update(`symlink\0${relativePath}\0${await readlink(path)}\0`);
+            }
+            else {
+                hash.update(`other\0${relativePath}\0`);
+            }
+        }
+    }
+    await visit(directory);
+    return hash.digest('hex');
+}
+async function nearestExistingParent(root, path) {
+    let candidate = dirname(path);
+    while (pathInside(root, candidate)) {
+        try {
+            const identity = pathIdentity(await lstat(candidate));
+            return identity?.type === 'directory' ? identity : undefined;
+        }
+        catch (error) {
+            if (!isMissingPathError(error)) {
+                return undefined;
+            }
+        }
+        if (resolve(candidate) === resolve(root)) {
+            break;
+        }
+        candidate = dirname(candidate);
+    }
+    return undefined;
+}
+export async function proveCollectionIdentity({ root, canonicalDir, providerDir, }) {
+    const checkedAt = new Date().toISOString();
+    try {
+        await assertSafeProviderCollectionPath(root, canonicalDir, providerDir);
+    }
+    catch {
+        return { status: 'ineligible', reason: 'unsafe-ancestry', checkedAt };
+    }
+    let canonicalStat;
+    try {
+        canonicalStat = await lstat(canonicalDir);
+    }
+    catch {
+        return { status: 'ineligible', reason: 'identity-unavailable', checkedAt };
+    }
+    const canonicalDirectory = pathIdentity(canonicalStat);
+    if (canonicalDirectory?.type !== 'directory') {
+        return {
+            status: 'ineligible',
+            reason: 'identity-unavailable',
+            observedIdentity: canonicalDirectory,
+            checkedAt,
+        };
+    }
+    let providerStat;
+    try {
+        providerStat = await lstat(providerDir);
+    }
+    catch (error) {
+        if (isMissingPathError(error)) {
+            const providerParent = await nearestExistingParent(root, providerDir);
+            if (providerParent !== undefined) {
+                return {
+                    status: 'absent',
+                    canonicalDirectory,
+                    providerParent,
+                    checkedAt,
+                };
+            }
+        }
+        return { status: 'ineligible', reason: 'identity-unavailable', checkedAt };
+    }
+    const observedIdentity = pathIdentity(providerStat);
+    if (!providerStat.isSymbolicLink()) {
+        return {
+            status: 'ineligible',
+            reason: providerStat.isDirectory()
+                ? 'real-directory'
+                : 'identity-unavailable',
+            observedIdentity,
+            checkedAt,
+        };
+    }
+    let linkText;
+    let resolvedTarget;
+    let realTarget;
+    let canonicalTarget;
+    try {
+        linkText = await readlink(providerDir);
+        resolvedTarget = resolve(dirname(providerDir), linkText);
+        realTarget = await realpath(providerDir);
+        canonicalTarget = await realpath(canonicalDir);
+    }
+    catch {
+        return {
+            status: 'ineligible',
+            reason: 'broken-link',
+            observedIdentity,
+            checkedAt,
+        };
+    }
+    if (realTarget !== canonicalTarget) {
+        return {
+            status: 'ineligible',
+            reason: 'foreign-target',
+            observedIdentity,
+            checkedAt,
+        };
+    }
+    try {
+        const canonicalDigest = await entrySetDigest(canonicalDir);
+        const providerDigest = await entrySetDigest(providerDir);
+        if (canonicalDigest !== providerDigest) {
+            return {
+                status: 'ineligible',
+                reason: 'divergent-entries',
+                observedIdentity,
+                checkedAt,
+            };
+        }
+        return {
+            status: 'exact-link',
+            providerLink: observedIdentity,
+            canonicalDirectory,
+            linkTextKind: isAbsolute(linkText) ? 'absolute' : 'relative',
+            linkText,
+            resolvedTarget,
+            entrySetDigest: canonicalDigest,
+            checkedAt,
+        };
+    }
+    catch {
+        return {
+            status: 'ineligible',
+            reason: 'identity-unavailable',
+            observedIdentity,
+            checkedAt,
+        };
+    }
+}
+function identitiesMatch(left, right) {
+    return (left.device === right.device &&
+        left.inode === right.inode &&
+        left.type === right.type &&
+        left.modifiedAtNanoseconds === right.modifiedAtNanoseconds);
+}
+export function collectionProofMatches(planned, current) {
+    if (planned.status !== current.status) {
+        return false;
+    }
+    if (planned.status === 'absent' && current.status === 'absent') {
+        return (identitiesMatch(planned.canonicalDirectory, current.canonicalDirectory) &&
+            identitiesMatch(planned.providerParent, current.providerParent));
+    }
+    if (planned.status === 'exact-link' && current.status === 'exact-link') {
+        return (identitiesMatch(planned.providerLink, current.providerLink) &&
+            identitiesMatch(planned.canonicalDirectory, current.canonicalDirectory) &&
+            planned.linkText === current.linkText &&
+            planned.resolvedTarget === current.resolvedTarget &&
+            planned.entrySetDigest === current.entrySetDigest);
+    }
+    return false;
+}
+function inferScopeRoot(canonicalDir) {
+    const normalized = canonicalDir.replaceAll('\\', '/');
+    const marker = '/.agents/';
+    const markerIndex = normalized.indexOf(marker);
+    if (markerIndex === -1) {
+        throw new Error(`Cannot infer collection scope root from canonical path: ${canonicalDir}`);
+    }
+    return resolve(normalized.slice(0, markerIndex));
+}
+function manifestRelativePath(scopeRoot, path) {
+    return relative(scopeRoot, path).replaceAll('\\', '/');
+}
+export async function projectCollectionOwnership(manifest, plan, verifiedProof) {
+    const scopeRoot = inferScopeRoot(plan.canonicalDir);
+    const canonicalDir = manifestRelativePath(scopeRoot, plan.canonicalDir);
+    const providerDir = manifestRelativePath(scopeRoot, plan.providerDir);
+    const collectionId = createHash('sha256')
+        .update(`${plan.provider}\0${plan.contentType}\0${canonicalDir}\0${providerDir}`)
+        .digest('hex')
+        .slice(0, 24);
+    const lastVerified = verifiedProof.checkedAt;
+    const inheritedKeys = new Set(plan.inheritedEntries.map((canonicalPath) => `${canonicalPath}::${plan.provider}`));
+    const retainedEntries = manifest.entries.filter((entry) => !inheritedKeys.has(`${entry.canonicalPath}::${entry.provider}`));
+    const inheritedEntries = await Promise.all(plan.inheritedEntries.map(async (canonicalPath) => {
+        const suffix = canonicalPath.slice(canonicalDir.length + 1);
+        const canonicalStat = await lstat(resolve(scopeRoot, canonicalPath));
+        return {
+            canonicalPath,
+            providerPath: `${providerDir}/${suffix}`,
+            provider: plan.provider,
+            contentType: plan.contentType,
+            strategy: 'collection',
+            collectionId,
+            contentHash: null,
+            isFile: canonicalStat.isFile(),
+            lastSynced: lastVerified,
+        };
+    }));
+    const collections = manifest.collections.filter((collection) => !(collection.provider === plan.provider &&
+        collection.contentType === plan.contentType &&
+        collection.canonicalDir === canonicalDir &&
+        collection.providerDir === providerDir));
+    const createdLink = plan.ownership === 'oat-created'
+        ? plan.action === 'create-collection-link'
+            ? {
+                device: verifiedProof.providerLink.device,
+                inode: verifiedProof.providerLink.inode,
+                linkText: verifiedProof.linkText,
+            }
+            : plan.createdLink
+        : undefined;
+    return {
+        ...manifest,
+        entries: [...retainedEntries, ...inheritedEntries],
+        collections: [
+            ...collections,
+            {
+                id: collectionId,
+                provider: plan.provider,
+                contentType: plan.contentType,
+                canonicalDir,
+                providerDir,
+                linkTarget: canonicalDir,
+                ownership: plan.ownership === 'none' ? 'adopted-exact' : plan.ownership,
+                ...(createdLink === undefined ? {} : { createdLink }),
+                lastVerified,
+            },
+        ],
+        lastUpdated: lastVerified,
+    };
+}

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

@@ -1,6 +1,7 @@
 import type { SyncConfig } from '../config/sync-config.js';
 import type { Manifest, ManifestEntry } from '../manifest/manifest.types.js';
 import type { ProviderAdapter } from '../providers/shared/adapter.types.js';
+import type { ContentType } from '../shared/types.js';
 import type { EngineScope, RemovalSyncPlanEntry, SyncPlan } from './engine.types.js';
 import type { CanonicalEntry } from './scanner.js';
 interface ComputeSyncPlanArgs {
@@ -11,8 +12,14 @@ interface ComputeSyncPlanArgs {
     config: SyncConfig;
     scopeRoot?: string;
     allowedCanonicalPaths?: string[];
+    extensionOwnedCanonicalPathsByProvider?: Readonly<Record<string, readonly string[]>>;
+    collectionAliasEligibleMappings?: readonly {
+        provider: string;
+        contentType: ContentType;
+    }[];
+    collectionAliasCreationAvailable?: boolean;
 }
 export declare function classifyObsoleteMappingRetirement(manifestEntry: ManifestEntry, scopeRoot: string): Promise<RemovalSyncPlanEntry>;
-export declare function computeSyncPlan({ canonical, adapters, manifest, scope, config, scopeRoot: explicitScopeRoot, allowedCanonicalPaths, }: ComputeSyncPlanArgs): Promise<SyncPlan>;
+export declare function computeSyncPlan({ canonical, adapters, manifest, scope, config, scopeRoot: explicitScopeRoot, allowedCanonicalPaths, extensionOwnedCanonicalPathsByProvider, collectionAliasEligibleMappings, collectionAliasCreationAvailable, }: ComputeSyncPlanArgs): Promise<SyncPlan>;
 export {};
 //# sourceMappingURL=compute-plan.d.ts.map

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":"AAkBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,QAAQ,EAET,MAAM,gBAAgB,CAAC;AAGxB,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;AAiPD,wBAAsB,iCAAiC,CACrD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAqG/B;AAiID,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,CAyIzC"}
+{"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,EACV,QAAQ,EACR,aAAa,EAGd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,OAAO,KAAK,EAEV,WAAW,EACX,oBAAoB,EACpB,QAAQ,EAET,MAAM,gBAAgB,CAAC;AAGxB,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;IACjC,sCAAsC,CAAC,EAAE,QAAQ,CAC/C,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAClC,CAAC;IACF,+BAA+B,CAAC,EAAE,SAAS;QACzC,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,CAAC;KAC1B,EAAE,CAAC;IACJ,gCAAgC,CAAC,EAAE,OAAO,CAAC;CAC5C;AAqTD,wBAAsB,iCAAiC,CACrD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAqG/B;AAiID,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,MAAM,EACN,SAAS,EAAE,iBAAiB,EAC5B,qBAAqB,EACrB,sCAAsC,EACtC,+BAAoC,EACpC,gCAAwC,GACzC,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4bzC"}