@lesliechan721/aw 0.1.0-beta.55 → 0.1.0-beta.57

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

@@ -5,7 +5,7 @@ import { catalogFileMode } from '@lesliechan721/aw-plugin-core';
 import { COMMAND_PRODUCER_RECORD_FILE, getManagedCommandArtifactTargets, getCommandPackageId } from '@lesliechan721/aw-plugin-core/manifest';
 import os from 'node:os';
 import { commandSetsForProducer, createManagedCommandReferenceResolver, discoverRetainedManagedCommandPackages, retainedManagedCommandPackageResult, managedCommandProducerIdentity, prepareManagedCommandPackage, resolveSkillManagedCommandReferences, } from '../utils/managed-command-materialization.js';
-import { managedCommandDiagnostic, ManagedCommandError, publishManagedCommandBindings, revokeManagedCommandBindings, syncManagedCommandPackage, readInstalledCommandProducer, listManagedCommands } from '../utils/managed-command-store.js';
+import { assertManagedCommandBindingIdentities, normalizeInstalledCommandProducer, managedCommandDiagnostic, ManagedCommandError, publishManagedCommandBindings, revokeManagedCommandBindings, syncManagedCommandPackage, readInstalledCommandProducer, listManagedCommands } from '../utils/managed-command-store.js';
 import { injectInstalledRuntimeConfig, carryRuntimeConfigNativeReceipt } from '../utils/runtime-config.js';
 import { resolveCodexSkillsRelativeRoot } from '../utils/codex-skills-root.js';
 import { resolveClaudeSkillsRelativeRoot } from '../utils/claude-skills-root.js';
@@ -19,6 +19,7 @@ import { createCodexSkillExpectedTree, createCodexSkillStagingTreeContentDigest,
 import { AW_PLUGIN_REQUIREMENTS_RECEIPT_PATH, createDynamicSkillExpectedTree, createDynamicSkillTreeContentDigest, readDynamicSkillTree, validateSkillDirectory, writeDynamicSkillTree, } from '../utils/dynamic-skill-tree.js';
 import { parseCodexSharedHooksFile, serializeTrackedHookGroupIdentity, } from '../utils/hooks-contract.js';
 import { buildCodexMarketplaceAddInvocation, buildCodexMarketplaceRemoveInvocation, buildCodexPluginAddInvocation, buildCodexPluginRemoveInvocation, CodexProjectConfigNotEffectiveError, runNativeCliChecked, SYSTEM_CODEX_MANAGER, } from '../utils/native-cli.js';
+import { attachSafeOperationError, readSafeOperationError } from '../utils/safe-operation-diagnostic.js';
 import { OWNED_TEXT_HEADER_PREFIX, createSharedOwnerToken, createSkillOwnerMarkerContent, parseSharedOwnerToken, parseOwnedTextHeader, readSkillOwnerMarker, renderOwnedTextFile, inspectOwnedComponents, writeOwnedTextFile, } from '../utils/ownership.js';
 import { resolveArtifactRenderConfig, resolveArtifactRendererTarget, runArtifactRenderer, } from '../utils/artifact-renderer.js';
 import { createArtifactConfigDigest, validateArtifactPlan, } from '../utils/artifact-plan.js';
@@ -301,7 +302,7 @@ async function executeCodexReconcileActivationsInSession(options) {
         for (const pluginId of observedActivationPluginIds) {
             const marketplaceName = codexMarketplaceFromPluginId(pluginId);
             const observationScope = options.observationScopeByMarketplace?.get(marketplaceName)
-                ?? (options.plans.some((plan) => plan.requirement.requiresProjectPluginContract)
+                ?? (options.plans.some((plan) => plan.requirement.scope === 'project')
                     ? 'both'
                     : 'user');
             const registration = await inspectCodexPluginRegistrationLive({
@@ -443,7 +444,7 @@ export async function postcheckCodexReconcileActivations(options) {
             try {
                 const marketplaceName = codexMarketplaceFromPluginId(check.codexPluginId);
                 const observationScope = options.observationScopeByMarketplace?.get(marketplaceName)
-                    ?? (options.plans.some((plan) => plan.requirement.requiresProjectPluginContract)
+                    ?? (options.plans.some((plan) => plan.requirement.scope === 'project')
                         ? 'both'
                         : 'user');
                 const registration = await inspectCodexPluginRegistrationLive({
@@ -3536,6 +3537,22 @@ async function applyPlannedOperationAction(action) {
 }
 function createNativeDriver(options) {
     const runner = options.context.nativeCliRunner;
+    const preflightCommandBindings = async (targets) => {
+        const producers = [];
+        for (const target of targets)
+            for (const action of target.operationActions ?? []) {
+                if (action.kind === 'syncManagedCommandPackage') {
+                    producers.push({ producer: action.producer, sets: action.sets });
+                }
+                else if (action.kind === 'materializeNativeSkill'
+                    || (action.kind === 'writeOwnedArtifact' && action.artifactKind === 'skill-directory')) {
+                    const file = action.files?.find((entry) => entry.relativePath === COMMAND_PRODUCER_RECORD_FILE);
+                    if (file)
+                        producers.push(normalizeInstalledCommandProducer(JSON.parse(Buffer.from(file.contentBase64, 'base64').toString('utf8'))));
+                }
+            }
+        await assertManagedCommandBindingIdentities({ producers, env: options.context.env });
+    };
     const revokeAtRoot = async (root, recursive = false, platform) => {
         const listed = await listManagedCommands(options.context.env);
         const producers = new Map();
@@ -3674,6 +3691,7 @@ function createNativeDriver(options) {
                 }
                 if (materializing.length === 0)
                     return;
+                await preflightCommandBindings(materializing);
                 const first = materializing[0];
                 if (!first.catalog)
                     throw new Error('Missing rebuild target catalog data.');
@@ -3983,6 +4001,11 @@ function createNativeDriver(options) {
                         return;
                     const target = findTarget(component);
                     await prepareNativeGroup(target);
+                    const pluginId = `${target.identity.pluginName}@${locator.marketplaceName}`;
+                    const stateKey = codexStateKey(target, pluginId);
+                    if (codexNativeStates.get(stateKey) === 'present'
+                        && pendingCodexNativeStates.get(stateKey) !== 'absent')
+                        return;
                     codexMutationMarketplaces.add(locator.marketplaceName);
                     await runObservedCodexMutation({
                         marketplaceName: locator.marketplaceName,
@@ -4138,6 +4161,7 @@ function createNativeDriver(options) {
                     : 'user'))));
         },
         preflightMutation: async (target) => {
+            await preflightCommandBindings([target]);
             if (!target.codexNativeObservationExpectation
                 && !target.codexNativeSensitivePreflightRequired)
                 return;
@@ -4312,8 +4336,16 @@ function createNativeDriver(options) {
                         mutation: () => runNativeCliChecked(buildCodexPluginRemoveInvocation(requireCodexManager(currentCodexManager()), component.pluginId, target.identity.cwd, options.context.env), runner),
                     });
                 }
-                catch {
-                    throw new Error(`codexNativeRemoveFailed: ${CODEX_REMOVE_RECOVERY}`);
+                catch (error) {
+                    const diagnostic = readSafeOperationError(error);
+                    throw attachSafeOperationError(new Error(`codexNativeRemoveFailed: ${CODEX_REMOVE_RECOVERY}`), {
+                        code: 'codexNativeRemoveFailed',
+                        safeMessage: `Codex plugin removal did not complete. ${CODEX_REMOVE_RECOVERY}`,
+                        ...(diagnostic?.exitCode === undefined ? {} : { exitCode: diagnostic.exitCode }),
+                        ...(diagnostic ? {
+                            cause: { code: diagnostic.code, safeMessage: diagnostic.safeMessage },
+                        } : {}),
+                    });
                 }
                 pendingCodexNativeStates.set(stateKey, 'absent');
                 const postcheck = async () => {
@@ -4493,6 +4525,7 @@ function createNativeDriver(options) {
             }
         },
         writeArtifacts: async (target) => {
+            await preflightCommandBindings([target]);
             await publishPackages(target);
             for (const operationAction of target.operationActions ?? []) {
                 if (operationAction.kind === 'writeOwnedArtifact'