@lesliechan721/aw 0.1.0-beta.6 → 0.1.0-beta.8

package/dist/src/commands/rebuild-integration.js

@@ -14,12 +14,11 @@ import { buildCodexMarketplaceAddInvocation, buildCodexMarketplaceListInvocation
 import { OWNED_TEXT_HEADER_PREFIX, createSharedOwnerToken, createSkillOwnerMarkerContent, parseSharedOwnerToken, parseOwnedTextHeader, readSkillOwnerMarker, inspectOwnedComponents, writeOwnedTextFile, } from '../utils/ownership.js';
 import { resolveArtifactRenderConfig, runArtifactRenderer } from '../utils/artifact-renderer.js';
 import { validateArtifactPlan } from '../utils/artifact-plan.js';
-import { readPluginManifest } from '../utils/manifest.js';
+import { createAwPluginRequirementsReceipt, readPluginManifest, } from '../utils/manifest.js';
 import { resolvePlatformEntries } from '../utils/platform-entries.js';
 import { resolveAwHome, resolveClaudePaths, resolveCodexPaths, resolveRepoRoot, getCodexHome, } from '../utils/paths.js';
 import { runLifecycleScript } from '../utils/plugin-scripts.js';
-import { atomicRemoveConfigFile, atomicReplaceConfigFile, withConfigFileLock, } from '../utils/plugin-config.js';
-import { withActiveMarketplaceLifecycleLease, withActiveMarketplaceRuntimeLease, } from '../utils/active-marketplace-runtime-lock.js';
+import { atomicRemoveConfigFile, atomicReplaceConfigFile, withConfigFileMutation, } from '../utils/plugin-config.js';
 import { readCatalogSourcesConfigSnapshot } from '../utils/catalog-sources.js';
 import { getNamespacedMarketplaceName, projectMarketplaceManifestForPlatform, replayNamespacedCodexSkillOverlays, } from '../utils/local-marketplace.js';
 import { cleanupOrphanNamespacedMarketplaceRoot, commitMarketplaceGenerationBackup, } from '../utils/orphan-marketplace-cleanup.js';
@@ -29,6 +28,17 @@ import { assertCanonicalProjectManagedRoots } from '../utils/project-boundary.js
 import { findCodexRoleNameConflict, resolveCodexRoleNamespace, } from '../utils/codex-roles.js';
 const MARKETPLACE_NAME = 'aw';
 const MCP_OWNER_ENV = 'AW_AGENT_WORKFLOWS_OWNER';
+function requirementsReceipt(plugin) {
+    const receipt = createAwPluginRequirementsReceipt({ name: plugin.manifest.name, version: plugin.manifest.version }, plugin.manifest.requires?.aw.capabilities ?? []);
+    return Buffer.from(`${JSON.stringify(receipt, null, 2)}\n`, 'utf8');
+}
+function requireCodexManager(manager) {
+    if (!manager) {
+        throw new Error('codexManagerRequired: Codex native operation has no resolved manager.');
+    }
+    return manager;
+}
+const CODEX_REMOVE_RECOVERY = 'Codex residue was retained. Retry cleanup or uninstall, upgrade AW, or install a compatible official Codex CLI.';
 function ownerIdentity(plugin, artifactKey, platform, scope) {
     return { owner: 'agent-workflows', plugin, artifactKey, platform, scope };
 }
@@ -60,7 +70,7 @@ function pathComponent(options) {
     return {
         ...options,
         validateHealth: async () => {
-            await validateSkillDirectory(options.path, options.identity.platform === 'codex' ? 'codex.skill' : 'claude.skill', { ownerMarkerPolicy: 'ignore' });
+            await validateSkillDirectory(options.path, options.identity.platform === 'codex' ? 'codex.skill' : 'claude.skill', { ownerMarkerPolicy: 'ignore', requirementsReceiptPolicy: 'allow' });
         },
     };
 }
@@ -278,7 +288,7 @@ function renderCodexHookGroups(groups) {
     return `${JSON.stringify({ hooks }, null, 2)}\n`;
 }
 export async function applyCodexHookGroupsTransactionFile(hooksPath, update, testHooks) {
-    return withConfigFileLock({
+    return withConfigFileMutation({
         filePath: hooksPath,
         allowedRoot: path.dirname(hooksPath),
         action: async () => {
@@ -536,6 +546,8 @@ async function scanOwnedTextFiles(options) {
             }
             if (parsed?.identity.plugin !== options.pluginName
                 || (options.sourceId !== undefined && parsed.identity.sourceId !== options.sourceId)
+                || (options.sourceIdentity !== undefined
+                    && parsed.identity.sourceIdentity !== options.sourceIdentity)
                 || parsed.identity.platform !== options.platform
                 || parsed.identity.scope !== options.scope)
                 continue;
@@ -566,6 +578,7 @@ async function scanOwnedSkills(options) {
             }).catch(() => null);
             if (marker?.plugin === options.pluginName
                 && (options.sourceId === undefined || marker.sourceId === options.sourceId)
+                && (options.sourceIdentity === undefined || marker.sourceIdentity === options.sourceIdentity)
                 && marker.platform === options.platform
                 && marker.scope === options.scope) {
                 output.push(pathComponent({
@@ -853,6 +866,7 @@ async function buildBundledCodexSkillWrites(options) {
                 content: { files: {} },
             },
             sourceDirs: [skillSource],
+            sourceRequirementsReceiptPolicy: 'allow',
         });
         const skillPath = path.join(targetRoot, entry.name);
         const canRecoverPristine = options.scope === 'user'
@@ -903,6 +917,8 @@ async function buildClaudeWrites(options) {
             artifact,
             sourceDirs: dynamic.sourceDirs(artifact),
             requireReadme: true,
+            requirementsReceipt: requirementsReceipt(options.plugin),
+            sourceRequirementsReceiptPolicy: 'allow',
         });
         writes.push(dynamicSkillWrite({
             ...options,
@@ -971,6 +987,8 @@ async function buildCodexWrites(options) {
             artifact,
             sourceDirs: dynamic.sourceDirs(artifact),
             requireReadme: true,
+            requirementsReceipt: requirementsReceipt(options.plugin),
+            sourceRequirementsReceiptPolicy: 'allow',
         });
         writes.push(dynamicSkillWrite({
             ...options,
@@ -1608,6 +1626,23 @@ async function inspectCodexNativeResidue(options) {
                 installedVersions: [], cacheVersions: [], enabled: false,
             };
 }
+export async function codexNativeRemovalRequired(options) {
+    const residue = await inspectCodexNativeResidue(options);
+    if (residue.state === 'present')
+        return true;
+    if (residue.state === 'foreign')
+        return false;
+    const marketplaceName = options.marketplaceName ?? MARKETPLACE_NAME;
+    const marketplaceRoot = options.marketplaceRoot ?? resolveAwHome(options.env);
+    const config = await readCodexConfigFile(resolveCodexPaths(options.cwd, 'user', options.env).configTomlPath);
+    const marketplace = config.snapshot.marketplaces[marketplaceName];
+    const canonical = marketplace?.sourceType === 'local'
+        && !marketplace.sourcePointsToManifest
+        && path.normalize(marketplace.source ?? '') === path.normalize(marketplaceRoot);
+    if (!canonical)
+        return false;
+    return (await discoverCodexNativeResidueNames(options)).length === 0;
+}
 export async function discoverCodexNativeResidueNames(options) {
     const marketplaceName = options.marketplaceName ?? MARKETPLACE_NAME;
     const marketplaceRoot = options.marketplaceRoot ?? resolveAwHome(options.env);
@@ -1633,6 +1668,8 @@ export async function discoverCodexNativeResidueNames(options) {
     const cacheRoot = path.join(getCodexHome(options.env), 'plugins', 'cache', marketplaceName);
     const cacheEntries = await readdirCodexResidueIfPresent(cacheRoot).catch((error) => probeFailure(cacheRoot, error));
     for (const entry of cacheEntries) {
+        if (entry.isFile())
+            continue;
         const entryPath = path.join(cacheRoot, entry.name);
         const pluginName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(entry.name)
             ? entry.name
@@ -1807,8 +1844,13 @@ function createCodexMarketplaceComponent(options) {
                 || currentResidue.state === 'present'
                 || await hasRemainingPlugins())
                 return;
-            await runNativeCliChecked(buildCodexMarketplaceRemoveInvocation(options.marketplaceName, options.cwd, options.env), options.runner);
-            await runNativeCliChecked(buildCodexMarketplaceListInvocation(options.cwd, options.env), options.runner);
+            try {
+                await runNativeCliChecked(buildCodexMarketplaceRemoveInvocation(requireCodexManager(options.codexManager), options.marketplaceName, options.cwd, options.env), options.runner);
+                await runNativeCliChecked(buildCodexMarketplaceListInvocation(requireCodexManager(options.codexManager), options.cwd, options.env), options.runner);
+            }
+            catch {
+                throw new Error(`codexNativeRemoveFailed: ${CODEX_REMOVE_RECOVERY}`);
+            }
         },
     };
 }
@@ -2412,7 +2454,7 @@ async function mirrorCatalog(catalog, env, target) {
 }
 function createNativeDriver(options) {
     const runner = options.context.nativeCliRunner;
-    const materializeLeaseHeld = new WeakSet();
+    const codexManager = options.context.codexManager;
     const mirrorTransactions = new WeakMap();
     const finalizeNamespacedCleanup = async (target) => {
         const { sourceId, sourceIdentity, marketplaceRoot, marketplaceName } = target.identity;
@@ -2427,53 +2469,13 @@ function createNativeDriver(options) {
         });
     };
     return {
-        withOwnershipLease: (target, operation) => (!options.context.runtimeLeaseHeld
-            && target.identity.platform === 'codex'
-            && target.identity.scope === 'user'
-            && !materializeLeaseHeld.has(target)
-            ? withActiveMarketplaceRuntimeLease(options.context.env, operation)
-            : operation()),
-        withMaterializeLease: (target, operation) => {
-            if (!target.identity.sourceId)
-                return operation();
-            if (options.context.runtimeLeaseHeld && !options.context.lifecycleLeaseHeld) {
-                throw new Error('lockOrderViolation: namespaced materialization cannot acquire lifecycle after runtime.');
-            }
-            const runOperation = async () => {
-                const previousRuntimeHeld = options.context.runtimeLeaseHeld;
-                options.context.runtimeLeaseHeld = true;
-                materializeLeaseHeld.add(target);
-                try {
-                    if (options.context.expectedCatalogConfigDigest) {
-                        const current = await readCatalogSourcesConfigSnapshot(options.context.env);
-                        if (current.digest !== options.context.expectedCatalogConfigDigest) {
-                            throw new Error('catalogSourceConflict: catalog source config changed before owner publication.');
-                        }
-                    }
-                    return await operation();
-                }
-                finally {
-                    materializeLeaseHeld.delete(target);
-                    options.context.runtimeLeaseHeld = previousRuntimeHeld;
-                }
-            };
-            const withRuntime = () => options.context.runtimeLeaseHeld
-                ? runOperation()
-                : withActiveMarketplaceRuntimeLease(options.context.env, runOperation);
-            if (options.context.lifecycleLeaseHeld)
-                return withRuntime();
-            return withActiveMarketplaceLifecycleLease(options.context.env, async () => {
-                const previousLifecycleHeld = options.context.lifecycleLeaseHeld;
-                options.context.lifecycleLeaseHeld = true;
-                try {
-                    return await withRuntime();
-                }
-                finally {
-                    options.context.lifecycleLeaseHeld = previousLifecycleHeld;
-                }
-            });
-        },
         preflightMaterialize: async (target) => {
+            if (target.identity.sourceId && options.context.expectedCatalogConfigDigest) {
+                const current = await readCatalogSourcesConfigSnapshot(options.context.env);
+                if (current.digest !== options.context.expectedCatalogConfigDigest) {
+                    throw new Error('catalogSourceConflict: catalog source config changed before owner publication.');
+                }
+            }
             if (target.identity.platform === 'claude') {
                 await assertNoClaudeUnboundNativeNameCollision({
                     pluginName: target.identity.pluginName,
@@ -2594,7 +2596,12 @@ function createNativeDriver(options) {
                 }
                 if (before.state === 'absent')
                     return;
-                await runNativeCliChecked(buildCodexPluginRemoveInvocation(component.pluginId, target.identity.cwd, options.context.env), runner);
+                try {
+                    await runNativeCliChecked(buildCodexPluginRemoveInvocation(requireCodexManager(codexManager), component.pluginId, target.identity.cwd, options.context.env), runner);
+                }
+                catch {
+                    throw new Error(`codexNativeRemoveFailed: ${CODEX_REMOVE_RECOVERY}`);
+                }
                 const residue = await inspectCodexNativeResidue({
                     pluginName: target.identity.pluginName,
                     cwd: target.identity.cwd,
@@ -2603,7 +2610,7 @@ function createNativeDriver(options) {
                     marketplaceRoot: target.identity.marketplaceRoot,
                 });
                 if (residue.state !== 'absent') {
-                    throw new Error(`Codex native remove 后仍有残留：${residue.labels.join('，')}`);
+                    throw new Error(`codexNativeRemoveIncomplete: ${CODEX_REMOVE_RECOVERY}`);
                 }
             }
             else {
@@ -2686,11 +2693,11 @@ function createNativeDriver(options) {
                         const config = await readCodexConfigFile(resolveCodexPaths(target.identity.cwd, 'user', options.context.env).configTomlPath);
                         const marketplace = config.snapshot.marketplaces[marketplaceName];
                         if (path.normalize(marketplace?.source ?? '') !== path.normalize(marketplaceRoot)) {
-                            await runNativeCliChecked(buildCodexMarketplaceAddInvocation(marketplaceRoot, target.identity.cwd, options.context.env), runner);
+                            await runNativeCliChecked(buildCodexMarketplaceAddInvocation(requireCodexManager(codexManager), marketplaceRoot, target.identity.cwd, options.context.env), runner);
                         }
-                        await runNativeCliChecked(buildCodexMarketplaceListInvocation(target.identity.cwd, options.context.env), runner);
-                        await runNativeCliChecked(buildCodexPluginAddInvocation(pluginId, target.identity.cwd, options.context.env), runner);
-                        await runNativeCliChecked(buildCodexPluginListInvocation(target.identity.cwd, options.context.env), runner);
+                        await runNativeCliChecked(buildCodexMarketplaceListInvocation(requireCodexManager(codexManager), target.identity.cwd, options.context.env), runner);
+                        await runNativeCliChecked(buildCodexPluginAddInvocation(requireCodexManager(codexManager), pluginId, target.identity.cwd, options.context.env), runner);
+                        await runNativeCliChecked(buildCodexPluginListInvocation(requireCodexManager(codexManager), target.identity.cwd, options.context.env), runner);
                         await assertCodexNativeInstallState({
                             pluginName: target.identity.pluginName,
                             pluginVersion: target.identity.pluginVersion,
@@ -2739,11 +2746,7 @@ function createNativeDriver(options) {
                     }
                 }
             };
-            await (target.identity.sourceId
-                && !options.context.runtimeLeaseHeld
-                && !materializeLeaseHeld.has(target)
-                ? withActiveMarketplaceRuntimeLease(options.context.env, writeGeneration)
-                : writeGeneration());
+            await writeGeneration();
         },
         writeArtifacts: async (target) => {
             const plan = options.plans.get(target);
@@ -2754,11 +2757,7 @@ function createNativeDriver(options) {
                     await write.write();
                 return plan.writes.map((write) => write.artifact);
             };
-            return !options.context.runtimeLeaseHeld
-                && !materializeLeaseHeld.has(target)
-                && target.identity.platform === 'codex' && target.identity.scope === 'user'
-                ? withActiveMarketplaceRuntimeLease(options.context.env, writeAll)
-                : writeAll();
+            return writeAll();
         },
         runLifecycle: async (invocation) => {
             await runLifecycleScript({
@@ -2901,11 +2900,7 @@ export function createRebuildIntegration(options) {
                 platform: input.platform,
                 scope: input.scope,
             })));
-            const scannedSkills = (await (input.platform === 'codex'
-                && input.scope === 'user'
-                && input.readOnlyInspectionPlan !== true
-                ? withActiveMarketplaceRuntimeLease(options.context.env, scanSkills)
-                : scanSkills())).flat();
+            const scannedSkills = (await scanSkills()).flat();
             const historicalComponents = await buildHistoricalComponents({
                 sourceId: input.sourceId,
                 sourceIdentity: input.sourceIdentity,
@@ -2939,7 +2934,8 @@ export function createRebuildIntegration(options) {
                 });
             const nativeRequired = input.platform === 'claude'
                 || (input.scope === 'user' && requiresCodexNativePlugin(input.plugin, input.scope));
-            const nativeCleanupCandidate = input.platform === 'claude' || input.scope === 'user';
+            const nativeCleanupCandidate = (input.platform === 'claude' || input.scope === 'user')
+                && input.includeNativeCleanupCandidate !== false;
             const nativePlugin = (nativeRequired || nativeCleanupCandidate)
                 ? [{
                         kind: 'native-plugin',
@@ -2953,6 +2949,7 @@ export function createRebuildIntegration(options) {
             const marketplace = input.platform === 'codex' && input.scope === 'user'
                 ? [createCodexMarketplaceComponent({
                         pluginName: input.plugin.manifest.name,
+                        codexManager: options.context.codexManager,
                         cwd: input.cwd,
                         env: options.context.env,
                         runner: options.context.nativeCliRunner,