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

package/dist/src/commands/rebuild-integration.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({
@@ -4000,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,
@@ -4330,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 () => {