@lesliechan721/aw 0.1.0-beta.11 → 0.1.0-beta.12

package/dist/src/commands/operation-planner.js

@@ -55,7 +55,16 @@ export function buildAllowedLifecycleActions(target) {
     if (target.state === 'blocked') {
         return recovery.filter((action) => action.id === 'cleanup' || action.id === 'uninstall');
     }
-    if (target.state === 'needsSync')
+    if (target.state === 'needsSync') {
+        if (target.recoveryActions.some((action) => action.command === 'manual')) {
+            return target.uninstallable === false ? [] : [{
+                    id: 'uninstall',
+                    pluginId: target.pluginId,
+                    platform: target.platform,
+                    scope: target.scope,
+                    reason: 'removeManagedContent',
+                }];
+        }
         return recovery.length > 0 ? recovery : [{
                 id: target.platform === 'codex' ? 'sync' : 'reinstall',
                 pluginId: target.pluginId,
@@ -63,6 +72,7 @@ export function buildAllowedLifecycleActions(target) {
                 scope: target.scope,
                 reason: 'savedSettingsNotApplied',
             }];
+    }
     const actions = [];
     if (target.revision?.state === 'upgradeAvailable') {
         actions.push({

package/dist/src/commands/operation-planner.js.map

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

package/dist/src/commands/rebuild-command.d.ts

@@ -33,6 +33,8 @@ export type RebuildCommandRuntime = Partial<RebuildExecutionContext> & {
     reviewPreflight?: (evidence: RebuildReviewPreflightEvidence) => Promise<void> | void;
     resolvedReviewEvidenceByPlugin?: Record<string, Omit<RebuildReviewPreflightEvidence, 'command' | 'identity'>>;
     previewOperationPlan?: boolean;
+    resolvePreApplyAuthorization?: boolean;
+    preApplyConfirmed?: boolean;
     scriptTimeoutMs?: number;
     directCli?: boolean;
     managedCodexAuthorizer?: ManagedCodexAuthorizer;
@@ -76,6 +78,16 @@ export interface RebuildCommandResult {
     operationPlan?: OperationPlan;
     codexManagerPreview?: CodexManagerPreview;
     offlineCleanupPlans?: OfflineCleanupTargetEvidence[];
+    preApplyAuthorization?: PreApplyAuthorizationTarget[];
+}
+export interface PreApplyAuthorizationTarget {
+    pluginId: string;
+    pluginName: string;
+    sourceId: string;
+    sourceIdentity: string;
+    platform: PlatformName;
+    scope: Scope;
+    relation: 'requested' | 'direct' | 'transitive';
 }
 export interface RebuildCommandTestHooks {
     afterTargetBuilt?: (options: {

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

@@ -369,6 +369,7 @@ async function runSingleSourceRebuildCommand(options) {
         expectedCatalogConfigDigest: options.runtime?.expectedCatalogConfigDigest,
         codexUserActivationDesired: options.runtime?.codexUserActivationDesired,
         codexObservationSession: options.runtime?.codexObservationSession,
+        preApplyExecutionCache: options.runtime?.preApplyExecutionCache,
     };
     const env = runtime.env;
     const selected = selectedPlatforms(options.commandOptions.platform);
@@ -498,12 +499,31 @@ async function runSingleSourceRebuildCommand(options) {
                     });
                 }
                 const driver = integration.driver;
+                let operationPreparation = options.execution?.operationPreparation;
+                if (options.execution?.skipPreApply
+                    && !operationPreparation
+                    && (options.command === 'install'
+                        || options.command === 'sync'
+                        || options.command === 'reinstall')) {
+                    const prepared = await prepareRebuildOperation({
+                        command: options.command,
+                        target,
+                        driver,
+                        skipPreApply: true,
+                        onActionEvent: (event) => emitRebuildActionEvent(runtime, event),
+                    });
+                    if (prepared.status === 'failed') {
+                        results.push(prepared.result);
+                        continue;
+                    }
+                    operationPreparation = prepared.preparation;
+                }
                 result = await executeRebuildOperation({
                     command: options.command,
                     target,
                     driver,
-                    ...(options.execution?.operationPreparation
-                        ? { preparation: options.execution.operationPreparation }
+                    ...(operationPreparation
+                        ? { preparation: operationPreparation }
                         : {}),
                     onActionEvent: (event) => emitRebuildActionEvent(runtime, event),
                 });
@@ -1903,6 +1923,7 @@ async function runRebuildCommandInSession(options) {
                     expectedCatalogConfigDigest: catalog.configDigest,
                     codexObservationSession: options.runtime?.codexObservationSession,
                     codexObservationScopeByMarketplace,
+                    preApplyExecutionCache: options.runtime?.preApplyExecutionCache,
                 };
                 const inspection = createRebuildIntegration({
                     context: executionContext,
@@ -1985,7 +2006,7 @@ async function runRebuildCommandInSession(options) {
                     }
                     return output;
                 };
-                const createPlan = async (inventory, codexManager) => {
+                const createPlan = async (inventory, codexManager, planOptions) => {
                     plannedCodexRegistrations = new Map();
                     plannedOwnedTextTargets = new Map();
                     plannedSkillMarkerTargets = new Map();
@@ -2252,7 +2273,8 @@ async function runRebuildCommandInSession(options) {
                             state = resolvedInspection.state;
                             errorCode ??= 'dependencyNotReady';
                         }
-                        if (entry.plugin.manifest.config?.fields
+                        if (!planOptions?.skipConfigValidation
+                            && entry.plugin.manifest.config?.fields
                             && (action === 'install' || action === 'reinstall')) {
                             const effective = resolvedScope === 'project'
                                 ? await resolveArtifactRenderConfig({
@@ -2893,6 +2915,33 @@ async function runRebuildCommandInSession(options) {
                         configDigests,
                     };
                 };
+                if (options.runtime?.resolvePreApplyAuthorization) {
+                    const authorizationPlan = await measureCommandPerformanceStage(options.runtime, 'dependency.plan', () => createPlan(stateInventory, undefined, { skipConfigValidation: true }));
+                    assertWriteInventoryComplete(stateInventory, exactOwnedTextTargets(authorizationPlan), exactSkillMarkerTargets(authorizationPlan));
+                    const preview = mergeRebuildCommandResults([]);
+                    preview.dependencyPlan = authorizationPlan;
+                    preview.preApplyAuthorization = executionSelections.flatMap(({ entry, platform }) => {
+                        const planned = authorizationPlan.targets.find((target) => target.pluginId === entry.pluginId && target.platform === platform);
+                        if (!planned || planned.action === 'block' || !entry.plugin.manifest.scripts?.preApply) {
+                            return [];
+                        }
+                        const relation = planned.relation === 'requested'
+                            ? 'requested'
+                            : planned.requiredBy.some((pluginId) => selectedIds.has(pluginId))
+                                ? 'direct'
+                                : 'transitive';
+                        return [{
+                                pluginId: entry.pluginId,
+                                pluginName: entry.plugin.manifest.name,
+                                sourceId: entry.source.sourceId,
+                                sourceIdentity: entry.source.sourceIdentity,
+                                platform,
+                                scope: planned.resolvedScope,
+                                relation,
+                            }];
+                    });
+                    return preview;
+                }
                 if (options.runtime?.previewOperationPlan) {
                     await options.runtime.onPreviewStage?.('dependencyPlan');
                     const initialPlan = await measureCommandPerformanceStage(options.runtime, 'dependency.plan', () => createPlan(stateInventory));
@@ -2972,6 +3021,18 @@ async function runRebuildCommandInSession(options) {
                 }
                 let lockedPlan = await measureCommandPerformanceStage(options.runtime, 'dependency.plan', () => createPlan(stateInventory));
                 assertWriteInventoryComplete(stateInventory, exactOwnedTextTargets(lockedPlan), exactSkillMarkerTargets(lockedPlan));
+                const lifecycleCommand = options.command === 'install'
+                    || options.command === 'sync'
+                    || options.command === 'reinstall';
+                const preApplyRequired = lifecycleCommand && executionSelections.some(({ entry, platform }) => entry.plugin.manifest.scripts?.preApply !== undefined
+                    && lockedPlan.targets.some((target) => target.pluginId === entry.pluginId
+                        && target.platform === platform
+                        && target.action !== 'block'));
+                if (preApplyRequired
+                    && options.commandOptions.yes !== true
+                    && options.runtime?.preApplyConfirmed !== true) {
+                    throw namespacedPreflightError('preApplyAuthorizationRequired: Running plugin preApply requires --yes or an accepted Review.', preflightTargets);
+                }
                 const provisionalLockedCodexPlans = await createCodexPlans(lockedPlan);
                 const codexManagerRequired = provisionalLockedCodexPlans.some((plan) => plan.sharedNativeActions.some((action) => action.action === 'install'
                     || action.action === 'replace'
@@ -2999,22 +3060,14 @@ async function runRebuildCommandInSession(options) {
                 }
                 if (options.runtime?.directCli
                     && options.commandOptions.yes !== true
-                    && (options.command === 'install'
-                        || options.command === 'sync'
-                        || options.command === 'reinstall')) {
+                    && lifecycleCommand) {
                     const sharedNativeImpact = lockedCodexPlans.some((plan) => plan.review.requiresConfirmation);
-                    const preApplyRequired = executionSelections.some(({ entry }) => entry.plugin.manifest.scripts?.preApply !== undefined);
-                    if (preApplyRequired || sharedNativeImpact) {
-                        throw namespacedPreflightError(preApplyRequired
-                            ? 'preApplyAuthorizationRequired: Running plugin preApply requires --yes.'
-                            : 'sharedNativeImpactAuthorizationRequired: Replacing or force-reinstalling shared Codex native state requires --yes.', preflightTargets);
+                    if (sharedNativeImpact) {
+                        throw namespacedPreflightError('sharedNativeImpactAuthorizationRequired: Replacing or force-reinstalling shared Codex native state requires --yes.', preflightTargets);
                     }
                 }
                 const operationPreparations = new Map();
                 const operationPreparationFailures = new Map();
-                const lifecycleCommand = options.command === 'install'
-                    || options.command === 'sync'
-                    || options.command === 'reinstall';
                 const executionCommandFor = (entry, platform) => {
                     const planned = lockedPlan.targets.find((target) => target.pluginId === entry.pluginId && target.platform === platform);
                     const desiredInCurrentScope = platform === 'codex'
@@ -3765,6 +3818,7 @@ async function runRebuildCommandInSession(options) {
                             operationPreparation: operationPreparations.get(`${entry.pluginId}\0${platform}`),
                             integration: lockedPreparation.integration,
                             preparationError: preparedTargetErrors.get(`${entry.pluginId}\0${platform}`),
+                            skipPreApply: reconcileDesiredCleanup,
                         },
                     });
                     if (reconcileDesiredCleanup) {
@@ -3992,8 +4046,9 @@ async function runRebuildCommandInSession(options) {
                         return {
                             ...target,
                             recoveryActions: [
-                                `run aw cleanup ${planned.pluginId} --platform ${planned.platform} --scope ${planned.preservedScope}`,
-                                `then run aw sync --all --platform ${planned.platform} --scope ${planned.resolvedScope}`,
+                                `remove every direct and indirect dependent of ${planned.pluginId} in consumer-first order; if dependencyStillRequired is reported, handle the other reported dependents first`,
+                                `then run aw cleanup ${planned.pluginId} --platform ${planned.platform} --scope ${planned.preservedScope}`,
+                                `then reinstall every removed root at its original platform and scope, selecting --dependency-scope ${planned.pluginId}#${planned.platform}=${planned.resolvedScope} during each install`,
                             ],
                         };
                     });