@lesliechan721/aw 0.1.0-beta.7 → 0.1.0-beta.9

package/dist/src/utils/catalog-public-error.js

@@ -5,13 +5,17 @@ const DEFAULT_ERROR_CODE = 'catalogSourceResolutionFailed';
 export class CatalogProviderCompatibilityError extends Error {
     sourceId;
     code;
+    requiredCapabilities;
+    missingCapabilities;
+    availableCapabilities;
     constructor(options) {
-        super(`Catalog source "${options.sourceId}" requires aw >= ${options.minAwVersion}.`);
+        super(`Catalog source "${options.sourceId}" requires unsupported AW capabilities: ${options.missingCapabilities.join(', ')}.`);
         this.name = 'CatalogProviderCompatibilityError';
         this.sourceId = options.sourceId;
-        this.code = options.selection === 'cliChannel'
-            ? 'awVersionTooLow'
-            : 'explicitCatalogIncompatible';
+        this.code = 'awCapabilityUnsupported';
+        this.requiredCapabilities = [...options.requiredCapabilities];
+        this.missingCapabilities = [...options.missingCapabilities];
+        this.availableCapabilities = [...options.availableCapabilities];
     }
 }
 function escapeRegExp(value) {
@@ -39,7 +43,6 @@ export function sanitizeCatalogSourceErrorMessage(message, env = process.env, se
             output = replaceRoot(output, root, '[catalog-source]');
     }
     for (const [root, replacement] of [
-        [path.join(awHome, 'catalog-cache'), '[catalog-state]'],
         [path.join(path.dirname(awHome), '.aw-local-marketplace-staging'), '[catalog-staging]'],
         [awHome, '[aw-state]'],
     ]) {
@@ -55,9 +58,7 @@ export function sanitizeCatalogSourceErrorMessage(message, env = process.env, se
     ].filter((value) => Boolean(value)))) {
         output = replaceRoot(output, tempRoot, '[temporary]');
     }
-    return output
-        .replace(/\.(?:materialize|path)-[^/\\\s"']+\.tmp/gu, '[catalog-materialization]')
-        .replace(/catalog-cache/gu, '[catalog-state]');
+    return output.replace(/\.(?:materialize|path)-[^/\\\s"']+\.tmp/gu, '[catalog-materialization]');
 }
 export function catalogSourceErrorCode(error) {
     const code = error.code;
@@ -79,6 +80,18 @@ export function sanitizeCatalogSourceError(error, env = process.env, sensitiveRo
     if ('inventory' in original) {
         sanitized.inventory = original.inventory;
     }
+    const originalCapabilities = original;
+    const sanitizedCapabilities = sanitized;
+    for (const field of [
+        'requiredCapabilities',
+        'missingCapabilities',
+        'availableCapabilities',
+    ]) {
+        const value = originalCapabilities[field];
+        if (Array.isArray(value) && value.every((entry) => typeof entry === 'string')) {
+            sanitizedCapabilities[field] = [...value];
+        }
+    }
     return sanitized;
 }
 //# sourceMappingURL=catalog-public-error.js.map

package/dist/src/utils/catalog-public-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-public-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-public-error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"catalog-public-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-public-error.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/catalog-runtime-projection.d.ts

@@ -10,6 +10,8 @@ export interface CatalogRuntimeExportResolution {
     source: string;
     sourcePath: string;
     sourceDigest: string;
+    requiredCapabilities: string[];
+    capabilitySetDigest: string;
     canonicalSource: CanonicalRuntimeSourceIdentity;
     supportedPlatforms: ReadonlySet<PlatformName>;
     virtual: boolean;
@@ -26,5 +28,6 @@ export declare function resolveRuntimeExportSource(options: {
     plugin: PluginMeta;
     name: string;
     source: string;
+    requiredCapabilities: readonly unknown[];
 }): Promise<CatalogRuntimeExportResolution>;
 export declare function createCatalogRuntimeImportResolver(plugins: readonly PluginMeta[]): CatalogRuntimeImportResolver;

package/dist/src/utils/catalog-runtime-projection.js

@@ -1,8 +1,5 @@
-import path from 'node:path';
-import fs from 'fs-extra';
-import { resolveCanonicalRuntimeSourceIdentity as resolveCoreRuntimeSourceIdentity, validateRuntimeExportSource, } from '@lesliechan721/aw-plugin-core/manifest';
+import { computeAwCapabilitySetDigest, normalizeAwCapabilities, validateRuntimeExportSource, } from '@lesliechan721/aw-plugin-core/manifest';
 import { calculateFileDigest } from './bundle-integrity.js';
-import { resolveCliPackageRoot } from './paths.js';
 import { resolveSupportedPlatforms } from './platform-support.js';
 export { resolveCanonicalRuntimeSourceIdentity, } from '@lesliechan721/aw-plugin-core/manifest';
 export async function resolveRuntimeExportSource(options) {
@@ -11,6 +8,7 @@ export async function resolveRuntimeExportSource(options) {
         name: options.name,
         source: options.source,
     });
+    const requiredCapabilities = normalizeAwCapabilities(options.requiredCapabilities, `buildConfig.runtimeExports export "${options.name}" requires.aw.capabilities`);
     return {
         provider: options.plugin.manifest.name,
         providerVersion: options.plugin.manifest.version,
@@ -18,44 +16,13 @@ export async function resolveRuntimeExportSource(options) {
         source: options.source,
         sourcePath: canonicalSource.sourceRealPath,
         sourceDigest: await calculateFileDigest(canonicalSource.sourceRealPath),
+        requiredCapabilities,
+        capabilitySetDigest: computeAwCapabilitySetDigest(requiredCapabilities),
         canonicalSource,
         supportedPlatforms: resolveSupportedPlatforms(options.plugin.manifest),
         virtual: false,
     };
 }
-async function resolveEvalVirtualExport(reference, purpose) {
-    if (purpose !== 'build' && purpose !== 'skill-runtime-file') {
-        throw new Error('Invalid catalog runtime import: virtual provider "@aw/agent-skill-eval" is only available to buildImports and skillRuntimeFiles.');
-    }
-    if (reference.export !== 'case-corpus-digest') {
-        throw new Error(`Invalid catalog runtime import: unknown @aw/agent-skill-eval export "${reference.export}".`);
-    }
-    const cliPackageRoot = resolveCliPackageRoot();
-    const packageRootCandidates = [
-        path.resolve(cliPackageRoot, '..', 'agent-skill-eval'),
-        path.join(cliPackageRoot, 'node_modules', '@lesliechan721', 'agent-skill-eval'),
-    ];
-    const packageRoot = packageRootCandidates.find((candidate) => fs.existsSync(path.join(candidate, 'package.json')));
-    if (!packageRoot) {
-        throw new Error('Invalid @aw/agent-skill-eval runtime export: package root is unavailable.');
-    }
-    const packageJson = await fs.readJson(path.join(packageRoot, 'package.json'));
-    if (typeof packageJson.version !== 'string' || packageJson.version.trim() === '') {
-        throw new Error('Invalid @aw/agent-skill-eval runtime export: package version is missing.');
-    }
-    const canonicalSource = await resolveCoreRuntimeSourceIdentity(packageRoot, './dist/corpus-digest.js', '@aw/agent-skill-eval runtime export "case-corpus-digest"');
-    return {
-        provider: '@aw/agent-skill-eval',
-        providerVersion: packageJson.version,
-        name: reference.export,
-        source: './dist/corpus-digest.js',
-        sourcePath: canonicalSource.sourceRealPath,
-        sourceDigest: await calculateFileDigest(canonicalSource.sourceRealPath),
-        canonicalSource,
-        supportedPlatforms: new Set(['claude', 'codex']),
-        virtual: true,
-    };
-}
 export function createCatalogRuntimeImportResolver(plugins) {
     const pluginsByName = new Map();
     for (const plugin of plugins) {
@@ -66,9 +33,6 @@ export function createCatalogRuntimeImportResolver(plugins) {
     return {
         async resolve({ consumer, reference, purpose, platform }) {
             if (reference.plugin.startsWith('@aw/')) {
-                if (reference.plugin === '@aw/agent-skill-eval') {
-                    return resolveEvalVirtualExport(reference, purpose);
-                }
                 throw new Error(`Invalid catalog runtime import: unknown reserved provider "${reference.plugin}".`);
             }
             if (reference.plugin === consumer.manifest.name) {
@@ -94,6 +58,7 @@ export function createCatalogRuntimeImportResolver(plugins) {
                 plugin: provider,
                 name: exports[0].name,
                 source: exports[0].source,
+                requiredCapabilities: exports[0].requires.aw.capabilities,
             });
             if (platform && !resolution.supportedPlatforms.has(platform)) {
                 throw new Error(`Invalid catalog runtime import: provider "${reference.plugin}" is unavailable for platform "${platform}".`);

package/dist/src/utils/catalog-runtime-projection.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-runtime-projection.js","sourceRoot":"","sources":["../../../src/utils/catalog-runtime-projection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"catalog-runtime-projection.js","sourceRoot":"","sources":["../../../src/utils/catalog-runtime-projection.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/catalog-snapshot.d.ts

@@ -1,8 +1,10 @@
-import type { CatalogManifestV4 } from '../types.js';
+import type { CatalogManifestV6 } from '../types.js';
 export interface CatalogSnapshotValidation {
     rootDir: string;
-    manifest: CatalogManifestV4;
+    manifest: CatalogManifestV6;
     manifestDigest: string;
     snapshotDigest: string;
 }
-export declare function validateCatalogSnapshot(rootDir: string): Promise<CatalogSnapshotValidation>;
+export declare function validateCatalogSnapshotTransport(rootDir: string): Promise<CatalogSnapshotValidation>;
+export declare function validateCatalogSnapshotComplete(rootDir: string): Promise<CatalogSnapshotValidation>;
+export declare function validateCatalogSnapshotPluginEntriesComplete(rootDir: string, pluginNames: readonly string[]): Promise<CatalogSnapshotValidation>;

package/dist/src/utils/catalog-snapshot.js

@@ -1,12 +1,20 @@
 import path from 'node:path';
-import { validateCatalogSnapshot as validateCoreCatalogSnapshot, } from '@lesliechan721/aw-plugin-core';
+import { validateCatalogSnapshotComplete as validateCoreCatalogSnapshotComplete, validateCatalogSnapshotPluginEntriesComplete as validateCoreCatalogSnapshotPluginEntriesComplete, validateCatalogSnapshotTransport as validateCoreCatalogSnapshotTransport, } from '@lesliechan721/aw-plugin-core';
 import { CURRENT_CATALOG_MANIFEST_FILE } from '../constants.js';
 import { calculateFileDigest } from './bundle-integrity.js';
-export async function validateCatalogSnapshot(rootDir) {
-    const validation = await validateCoreCatalogSnapshot(rootDir);
+async function withManifestDigest(validation) {
     return {
         ...validation,
         manifestDigest: await calculateFileDigest(path.join(validation.rootDir, CURRENT_CATALOG_MANIFEST_FILE)),
     };
 }
+export async function validateCatalogSnapshotTransport(rootDir) {
+    return withManifestDigest(await validateCoreCatalogSnapshotTransport(rootDir));
+}
+export async function validateCatalogSnapshotComplete(rootDir) {
+    return withManifestDigest(await validateCoreCatalogSnapshotComplete(rootDir));
+}
+export async function validateCatalogSnapshotPluginEntriesComplete(rootDir, pluginNames) {
+    return withManifestDigest(await validateCoreCatalogSnapshotPluginEntriesComplete(rootDir, pluginNames));
+}
 //# sourceMappingURL=catalog-snapshot.js.map

package/dist/src/utils/catalog-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-snapshot.js","sourceRoot":"","sources":["../../../src/utils/catalog-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,uBAAuB,IAAI,2BAA2B,GACvD,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAS5D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAe;IAC3D,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO;QACL,GAAG,UAAU;QACb,cAAc,EAAE,MAAM,mBAAmB,CACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,6BAA6B,CAAC,CAC7D;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"catalog-snapshot.js","sourceRoot":"","sources":["../../../src/utils/catalog-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,+BAA+B,IAAI,mCAAmC,EACtE,4CAA4C,IAAI,gDAAgD,EAChG,gCAAgC,IAAI,oCAAoC,GACzE,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAS5D,KAAK,UAAU,kBAAkB,CAC/B,UAA6D;IAE7D,OAAO;QACL,GAAG,UAAU;QACb,cAAc,EAAE,MAAM,mBAAmB,CACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,6BAA6B,CAAC,CAC7D;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,OAAe;IACpE,OAAO,kBAAkB,CAAC,MAAM,oCAAoC,CAAC,OAAO,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAC,OAAe;IACnE,OAAO,kBAAkB,CAAC,MAAM,mCAAmC,CAAC,OAAO,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4CAA4C,CAChE,OAAe,EACf,WAA8B;IAE9B,OAAO,kBAAkB,CAAC,MAAM,gDAAgD,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;AAC1G,CAAC"}

package/dist/src/utils/catalog-source-identity.d.ts

@@ -2,3 +2,4 @@ import type { CatalogSource, SourceIdentity } from '../types.js';
 export declare function canonicalizeCatalogGitUrl(value: string): string;
 export declare function canonicalizeCatalogPath(value: string, cwd: string): Promise<string>;
 export declare function calculateCatalogSourceIdentity(source: CatalogSource): Promise<SourceIdentity>;
+export declare function calculateCatalogSourceConfigFingerprint(source: CatalogSource): string;

package/dist/src/utils/catalog-source-identity.js

@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import fs from 'fs-extra';
-import { CATALOG_SOURCE_IDENTITY_VERSION } from '../constants.js';
+import { CATALOG_SOURCE_IDENTITY_VERSION, OFFICIAL_CATALOG_SOURCE_SSH_URL, OFFICIAL_CATALOG_SOURCE_URL, } from '../constants.js';
 const SCP_GIT_URL_PATTERN = /^([^@/:\s]+)@([^/:\s]+):(.+)$/;
 const ALLOWED_GIT_URL_PROTOCOLS = new Set(['file:', 'https:', 'ssh:']);
 function normalizeGitPath(pathname) {
@@ -61,6 +61,12 @@ export function canonicalizeCatalogGitUrl(value) {
     const port = url.port ? `:${url.port}` : '';
     return `${url.protocol}//${username}${url.hostname.toLowerCase()}${port}${normalizeGitPath(url.pathname)}`;
 }
+function logicalCatalogGitIdentityLocation(value) {
+    if (value === OFFICIAL_CATALOG_SOURCE_URL || value === OFFICIAL_CATALOG_SOURCE_SSH_URL) {
+        return canonicalizeCatalogGitUrl(OFFICIAL_CATALOG_SOURCE_URL);
+    }
+    return canonicalizeCatalogGitUrl(value);
+}
 function normalizeIdentitySubdir(subdir) {
     if (subdir === undefined)
         return null;
@@ -96,7 +102,7 @@ export async function canonicalizeCatalogPath(value, cwd) {
 export async function calculateCatalogSourceIdentity(source) {
     let location;
     if (source.type === 'git') {
-        location = canonicalizeCatalogGitUrl(source.url);
+        location = logicalCatalogGitIdentityLocation(source.url);
     }
     else if (source.type === 'path') {
         if (!path.isAbsolute(source.path)) {
@@ -115,4 +121,17 @@ export async function calculateCatalogSourceIdentity(source) {
     });
     return `sha256:${crypto.createHash('sha256').update(input).digest('hex')}`;
 }
+export function calculateCatalogSourceConfigFingerprint(source) {
+    const location = source.type === 'git'
+        ? canonicalizeCatalogGitUrl(source.url)
+        : path.normalize(source.path);
+    const input = JSON.stringify({
+        version: 1,
+        type: source.type,
+        location,
+        refPolicy: source.type === 'git' ? source.refPolicy : null,
+        subdir: normalizeIdentitySubdir(source.type === 'git' ? source.subdir : undefined),
+    });
+    return `sha256:${crypto.createHash('sha256').update(input).digest('hex')}`;
+}
 //# sourceMappingURL=catalog-source-identity.js.map

package/dist/src/utils/catalog-source-identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog-source-identity.js","sourceRoot":"","sources":["../../../src/utils/catalog-source-identity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"catalog-source-identity.js","sourceRoot":"","sources":["../../../src/utils/catalog-source-identity.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/catalog-source-references.d.ts

@@ -10,6 +10,8 @@ export interface CatalogSourceReference {
     platform?: string;
     scope?: string;
     projectKey?: string | null;
+    lifecycleMetadataIntegrityDigest?: string;
+    pluginVersion?: string;
 }
 export declare function canonicalMarketplaceRegistrationNames(references: readonly CatalogSourceReference[], sourceId: string): string[];
 export interface CatalogSourceReferenceInventory {
@@ -45,6 +47,11 @@ export declare function inventoryCatalogSourceReferences(options: {
     cwd: string;
     env?: NodeJS.ProcessEnv;
     includeHistoricalProjects?: boolean;
+    includeOrphanedCodexNativeResidue?: boolean;
+    codexNativeResidueTargets?: ReadonlyArray<{
+        sourceId?: string;
+        pluginName: string;
+    }>;
 }): Promise<CatalogSourceReferenceInventory>;
 export declare class LegacyCatalogStateUnsupportedError extends Error {
     readonly code = "legacyStateUnsupported";

package/dist/src/utils/catalog-source-references.js

@@ -6,8 +6,7 @@ import { readJsonFileIfExists } from './json.js';
 import { getClaudeHome, getCodexHome, canonicalizePathThroughExistingAncestorSync, resolveAwHome, resolveAwHomeCanonical, resolveRepoRootSync, } from './state-paths.js';
 import { OWNED_TEXT_HEADER_PREFIX, parseSharedOwnerToken, parseOwnedTextHeader, readSkillOwnerMarker, SKILL_OWNER_MARKER, } from './ownership.js';
 import { createLifecycleProjectLocationKey, inspectLifecycleActiveSnapshotForInventory, } from './lifecycle-active-store.js';
-import { CodexNativeResidueProbeError, discoverCodexNativeResidueNames, } from '../commands/rebuild-integration.js';
-import { parseCodexSharedHooksFile } from './hooks-contract.js';
+import { CodexNativeResidueProbeError, discoverCodexNativeResidueNames, inspectCodexNativeResidue, } from '../commands/rebuild-integration.js';
 import { sanitizeCatalogSourceErrorMessage } from './catalog-public-error.js';
 import { readPluginManifest } from './manifest.js';
 import { readStrictNamespacedMarketplaceRoot } from './local-marketplace.js';
@@ -341,7 +340,6 @@ export async function inventoryLegacyOwnerReferences(options) {
     const skillRoots = new Set([
         path.join(getCodexHome(env), 'skills'),
         path.join(getClaudeHome(env), 'skills'),
-        path.join(repoRoot, '.agents', 'skills'),
         path.join(repoRoot, '.claude', 'skills'),
     ]);
     const legacyPluginsRoot = path.join(awHome, 'plugins');
@@ -393,16 +391,17 @@ export async function inventoryLegacyOwnerReferences(options) {
     for (const configRoot of [
         getCodexHome(env),
         getClaudeHome(env),
-        path.join(repoRoot, '.codex'),
         path.join(repoRoot, '.claude'),
     ]) {
         references.push(...await findOwnedHeadersInDirectory(path.join(configRoot, 'rules'), new Set(['.md', '.rules']), true, errors, env, options.cwd), ...await findOwnedHeadersInDirectory(path.join(configRoot, 'agents'), new Set(['.md', '.toml']), true, errors, env, options.cwd));
     }
-    references.push(...await findOwnedHeadersInDirectory(path.join(repoRoot, '.agents', 'rules'), new Set(['.md']), false, errors, env, options.cwd), ...await findOwnedHeadersInDirectory(path.join(repoRoot, '.agents', 'agents'), new Set(['.md']), false, errors, env, options.cwd));
-    for (const filePath of [
-        path.join(getCodexHome(env), 'AGENTS.md'),
-        path.join(repoRoot, '.codex', 'AGENTS.md'),
+    for (const [directory, extensions] of [
+        [path.join(repoRoot, '.codex', 'rules'), new Set(['.md', '.rules'])],
+        [path.join(repoRoot, '.codex', 'agents'), new Set(['.md', '.toml'])],
     ]) {
+        references.push(...(await findOwnedHeadersInDirectory(directory, extensions, true, errors, env, options.cwd)).filter((reference) => reference.kind === 'namespacedOwner'));
+    }
+    for (const filePath of [path.join(getCodexHome(env), 'AGENTS.md')]) {
         const reference = await readOwnedHeaderReference(filePath, false, errors, env, options.cwd);
         if (reference)
             references.push(reference);
@@ -655,16 +654,9 @@ async function codexSharedOwnerReferences(filePath, scope, errors, env, cwd) {
             value,
             location: filePath,
         })),
-        ...Object.values(config.snapshot.mcpServers).flatMap((server) => {
-            const env = server.value?.env;
-            const value = isRecord(env) && typeof env.AW_AGENT_WORKFLOWS_OWNER === 'string'
-                ? env.AW_AGENT_WORKFLOWS_OWNER
-                : null;
-            return value ? [{ value, location: filePath }] : [];
-        }),
     ];
     const references = sharedOwnerTokenReferences(filePath, ownerValues.map((entry) => entry.value).filter((value) => value.startsWith('aw-owner-v2:')), errors, env, cwd);
-    for (const { value, location } of ownerValues) {
+    for (const { value, location } of scope === 'user' ? ownerValues : []) {
         if (value.startsWith('aw-owner-v2:') || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(value))
             continue;
         references.push({
@@ -696,43 +688,6 @@ async function claudeSharedOwnerReferences(filePath, scope, errors, env, cwd) {
     }
     return references;
 }
-async function codexHookOwnerReferences(filePath, errors, env, cwd) {
-    const raw = await readJsonFileIfExists(filePath);
-    if (!raw)
-        return [];
-    const parsed = parseCodexSharedHooksFile(raw);
-    const output = [];
-    for (const hook of parsed.managedIdentities) {
-        if (!hook.command.includes(OWNED_TEXT_HEADER_PREFIX))
-            continue;
-        let owner;
-        try {
-            owner = parseOwnedTextHeader(hook.command)?.identity;
-        }
-        catch (error) {
-            errors.push(inventoryError(error, filePath, 'ownerHeaderParse', env, cwd));
-            continue;
-        }
-        if (!owner)
-            continue;
-        output.push(owner.sourceId ? {
-            kind: 'namespacedOwner',
-            location: filePath,
-            sourceId: owner.sourceId,
-            sourceIdentity: owner.sourceIdentity,
-            pluginName: owner.plugin,
-            platform: owner.platform,
-            scope: owner.scope,
-        } : {
-            kind: 'legacyOwner',
-            location: filePath,
-            pluginName: owner.plugin,
-            platform: owner.platform,
-            scope: owner.scope,
-        });
-    }
-    return output;
-}
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -1138,6 +1093,8 @@ export async function inventoryCatalogSourceReferences(options) {
                     platform: snapshot.metadata.platform,
                     scope: snapshot.metadata.scope,
                     projectKey: snapshot.metadata.projectKey,
+                    lifecycleMetadataIntegrityDigest: snapshot.metadata.metadataIntegrityDigest,
+                    pluginVersion: snapshot.metadata.pluginVersion,
                 });
             }
         }
@@ -1150,7 +1107,6 @@ export async function inventoryCatalogSourceReferences(options) {
         [path.join(getClaudeHome(env), 'settings.json'), 'nativeStateRead', () => claudeSharedOwnerReferences(path.join(getClaudeHome(env), 'settings.json'), 'user', errors, env, options.cwd)],
         [path.join(resolveRepoRootSync(options.cwd), '.codex', 'config.toml'), 'nativeStateRead', () => codexSharedOwnerReferences(path.join(resolveRepoRootSync(options.cwd), '.codex', 'config.toml'), 'project', errors, env, options.cwd)],
         [path.join(resolveRepoRootSync(options.cwd), '.claude', 'settings.json'), 'nativeStateRead', () => claudeSharedOwnerReferences(path.join(resolveRepoRootSync(options.cwd), '.claude', 'settings.json'), 'project', errors, env, options.cwd)],
-        [path.join(resolveRepoRootSync(options.cwd), '.codex', 'hooks.json'), 'nativeStateRead', () => codexHookOwnerReferences(path.join(resolveRepoRootSync(options.cwd), '.codex', 'hooks.json'), errors, env, options.cwd)],
     ]) {
         references.push(...await inventoryRead({
             operation, absent: [], errors, location, kind, env, cwd: options.cwd,
@@ -1293,7 +1249,8 @@ export async function inventoryCatalogSourceReferences(options) {
             && !codexMarketplace.sourcePointsToManifest
             && path.normalize(codexMarketplace.source ?? '') === path.normalize(marketplaceRoot);
         const consumers = [];
-        if (marketplaceName !== null
+        if (options.includeOrphanedCodexNativeResidue === true
+            && marketplaceName !== null
             && (strictRoot !== null || (canonicalRoot && codexMarketplaceIsCanonical))) {
             let residueNames = [];
             try {
@@ -1319,6 +1276,38 @@ export async function inventoryCatalogSourceReferences(options) {
                 consumers.push({ pluginName, platform: 'codex', scope: 'user' });
             }
         }
+        else if (marketplaceName !== null
+            && (strictRoot !== null || (canonicalRoot && codexMarketplaceIsCanonical))) {
+            const exactPluginNames = [...new Set((options.codexNativeResidueTargets ?? []).flatMap((target) => (target.sourceId === undefined || target.sourceId === sourceEntry.name)
+                    ? [target.pluginName]
+                    : []))];
+            for (const pluginName of exactPluginNames) {
+                try {
+                    const residue = await inspectCodexNativeResidue({
+                        cwd: options.cwd,
+                        env,
+                        pluginName,
+                        marketplaceName,
+                        marketplaceRoot,
+                    });
+                    if (residue.state === 'present') {
+                        consumers.push({ pluginName, platform: 'codex', scope: 'user' });
+                    }
+                    else if (residue.state === 'foreign') {
+                        throw new Error('Codex native residue has foreign or incomplete identity evidence.');
+                    }
+                }
+                catch (error) {
+                    errors.push(inventoryError(error, path.join(getCodexHome(env), 'plugins', 'cache', marketplaceName, pluginName), 'nativeStateRead', env, options.cwd, {
+                        global: false,
+                        sourceId: sourceEntry.name,
+                        pluginName,
+                        platform: 'codex',
+                        scope: 'user',
+                    }));
+                }
+            }
+        }
         if (marketplaceName !== null && (strictRoot !== null || codexMarketplaceIsCanonical)) {
             for (const pluginId of Object.keys(codexConfig?.snapshot.plugins ?? {})) {
                 const pluginName = pluginNameFromMarketplaceId(pluginId, marketplaceName);