@lesliechan721/aw 0.1.0-beta.15 → 0.1.0-beta.17

package/dist/src/tui/controller-runtime.js

@@ -15,7 +15,6 @@ import { readPluginIntentState } from '../utils/plugin-intent-state.js';
 import { applyPluginConfigWrite, replayConfigRuntimeWrites, resolveConfigPreApplyAuthorization, resetPluginConfigWithHelper, } from '../utils/plugin-config-write.js';
 import { analyzePluginConfigMutationImpact } from '../utils/plugin-config-impact.js';
 import { createBatchIntentCompatiblePlanFingerprint } from '../commands/operation-plan.js';
-import { offlineCleanupEvidenceFromInventory, offlineCleanupEvidenceMatches, } from '../commands/offline-cleanup-evidence.js';
 import { inventoryCatalogSourceReferences } from '../utils/catalog-source-references.js';
 import { operationEvidenceMatches, operationEvidenceFingerprint, TuiConfigInvalidStoreError, TuiController, TuiOperationBlockedError, } from './controller.js';
 import { buildConfigGroups, buildConfigPage, buildTuiViewModel, projectPlatformPlacement, } from './model.js';
@@ -265,10 +264,12 @@ function selectedBatchGroups(intent) {
     for (const target of uniqueTargets) {
         const pluginId = target.pluginId;
         const sourceId = parsePluginId(pluginId).sourceId;
-        const groupKey = [sourceId, target.platform, target.scope].join('\0');
+        const groupKey = intent.action === 'cleanup'
+            ? ['cleanup', target.platform, target.scope].join('\0')
+            : [sourceId, target.platform, target.scope].join('\0');
         const group = groups.get(groupKey) ?? {
             groupId: groupKey,
-            sourceId,
+            sourceId: intent.action === 'cleanup' ? 'offline' : sourceId,
             platform: target.platform,
             scope: target.scope,
             requestedPluginIds: [],
@@ -1554,6 +1555,41 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             await preparation?.reporter.emit('status');
             const selection = await resolveBatchGroups(intent, context.env, context.cwd, frozenBatchEvidence?.requestedPluginIds);
             signal?.throwIfAborted();
+            if (intent.action === 'cleanup') {
+                const groups = [];
+                for (const group of selection.groups) {
+                    signal?.throwIfAborted();
+                    const preview = await runBatchWriteGroup({
+                        intent,
+                        group,
+                        cwd: context.cwd,
+                        runtime: {
+                            ...context,
+                            inventoryCatalogSourceReferences: operationInventory,
+                            previewOperationPlan: true,
+                            ...(codexObservationSession ? { codexObservationSession } : {}),
+                            ...(preparation ? {
+                                onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
+                            } : {}),
+                        },
+                    });
+                    groups.push({ ...group, preview, executable: preview.operationPlan !== undefined });
+                }
+                await preparation?.reporter.emit('evidence');
+                signal?.throwIfAborted();
+                const evidence = {
+                    catalog: {
+                        configDigest: 'cleanup-offline',
+                        compositeDigest: digest(groups.map((group) => [
+                            group.groupId,
+                            group.preview.operationPlan?.planFingerprint,
+                        ])),
+                    },
+                    requestedPluginIds: selection.requestedPluginIds,
+                    groups,
+                };
+                return evidence;
+            }
             const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
             const groups = [];
             const ownsObservationSession = !codexObservationSession
@@ -1669,17 +1705,44 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             };
             return evidence;
         }
+        if (intent.kind === 'pluginWrite' && intent.action === 'cleanup') {
+            const preview = await cleanupWriteCommand([intent.pluginId], {
+                cwd: context.cwd,
+                platform: intent.platform,
+                scope: intent.scope,
+                force: intent.force === true,
+            }, {
+                ...context,
+                inventoryCatalogSourceReferences: operationInventory,
+                previewOperationPlan: true,
+                ...(codexObservationSession ? { codexObservationSession } : {}),
+                ...(preparation ? {
+                    onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
+                } : {}),
+            });
+            signal?.throwIfAborted();
+            if (!preview.operationPlan) {
+                throw new TuiOperationBlockedError('cleanupPlanUnavailable', '无法建立可信的清理计划。');
+            }
+            const offlineCleanupPlans = preview.offlineCleanupPlans ?? [];
+            await preparation?.reporter.emit('evidence');
+            return {
+                catalog: {
+                    configDigest: 'cleanup-offline',
+                    compositeDigest: preview.operationPlan.planFingerprint,
+                },
+                operationPlan: preview.operationPlan,
+                offlineCleanupPlans,
+                ...(offlineCleanupPlans.length === 1
+                    ? { offlineCleanup: offlineCleanupPlans[0] }
+                    : {}),
+                targetFingerprint: preview.operationPlan.planFingerprint,
+            };
+        }
         const packageInfo = await readCliPackageInfo();
-        const offlineCleanupReason = intent.kind === 'pluginWrite'
-            && intent.action === 'cleanup'
-            && intent.originIssue?.actionId === 'cleanup'
-            && (intent.originIssue?.category === 'sourceMissing'
-                || intent.originIssue?.category === 'sourceUnavailable')
-            ? intent.originIssue.category === 'sourceMissing' ? 'sourceMissing' : 'bundleUnavailable'
-            : undefined;
         let catalogOperation;
         let catalogOperationError;
-        if (!offlineCleanupReason && intent.kind !== 'portableInstall') {
+        if (intent.kind !== 'portableInstall') {
             try {
                 const sourceIds = [parsePluginId(intent.pluginId).sourceId];
                 catalogOperation = !freshCatalog && sessionCatalogOperationContext
@@ -1850,9 +1913,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             return evidence;
         }
         await preparation?.reporter.emit('status');
-        const statusCatalogOperation = offlineCleanupReason
-            ? undefined
-            : catalogOperation ?? (!freshCatalog ? sessionCatalogOperationContext : undefined);
+        const statusCatalogOperation = catalogOperation
+            ?? (!freshCatalog ? sessionCatalogOperationContext : undefined);
         const status = await statusCommandV7({
             plugins: [...new Set([intent.pluginId,
                     ...(intent.kind === 'pluginWrite' && intent.originIssue?.consumerPluginId
@@ -1877,7 +1939,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         if (catalogOperationError)
             throw catalogOperationError;
-        if (!offlineCleanupReason && !catalogOperation) {
+        if (!catalogOperation) {
             catalogOperation = await resolveCatalogOperationContext({
                 sourceIds: [parsePluginId(intent.pluginId).sourceId],
                 configSnapshot,
@@ -1889,122 +1951,80 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         let dependencyPlan;
         let codexReconcilePlans;
         let operationPlan;
-        let forceCleanupEvidence;
         await preparation?.reporter.emit('catalog');
-        const offlineCleanupTarget = offlineCleanupReason && intent.kind === 'pluginWrite'
-            ? status.payload.targets.find((target) => target.pluginId === intent.pluginId
-                && target.platform === intent.platform
-                && target.scope === intent.scope
-                && target.reasons.some((error) => error.code === offlineCleanupReason))
-            : undefined;
-        const catalogSource = offlineCleanupTarget
-            ? status.payload.catalog.sources.find((source) => source.id === offlineCleanupTarget.sourceId)
-            : undefined;
-        let offlineCleanup;
-        if (offlineCleanupReason && offlineCleanupTarget) {
-            await preparation?.reporter.emit('inventory');
-            const inventory = await operationInventory({
-                cwd: context.cwd,
-                env: context.env,
-            });
-            signal?.throwIfAborted();
-            offlineCleanup = offlineCleanupEvidenceFromInventory({
-                reason: offlineCleanupReason,
-                pluginId: offlineCleanupTarget.pluginId,
-                pluginName: offlineCleanupTarget.pluginName,
-                sourceId: offlineCleanupTarget.sourceId,
-                sourceIdentity: offlineCleanupTarget.sourceIdentity,
-                platform: offlineCleanupTarget.platform,
-                scope: offlineCleanupTarget.scope,
-                inventory,
-            }) ?? undefined;
-            if (!offlineCleanup) {
-                throw operationReviewStale('离线清理现场证据已消失或无法验证。');
-            }
-        }
         const configVisibleTargets = intent.kind === 'configSave'
             ? configAffectedStatusTargets(status.payload.targets, intent.pluginId, intent.scope)
             : [];
-        const selected = offlineCleanupTarget
-            ? {
-                pluginName: offlineCleanupTarget.pluginName,
-                source: {
-                    sourceId: offlineCleanupTarget.sourceId,
-                    sourceIdentity: offlineCleanupTarget.sourceIdentity,
-                    ...(catalogSource?.requestedRef ? { requestedRef: catalogSource.requestedRef } : {}),
-                    ...(catalogSource?.resolvedCommit ? { resolvedCommit: catalogSource.resolvedCommit } : {}),
-                },
-            }
-            : await withResolvedCatalogPlugin({
-                selector: intent.pluginId,
-                cliVersion: packageInfo.version,
-                configSnapshot,
-                env: context.env,
-                ...(catalogOperation ? { operationContext: catalogOperation } : {}),
-                ...(signal ? { signal } : {}),
-                consume: async ({ plugin, source }) => {
-                    if (preparation?.validateIntent && intent.kind === 'configSave') {
-                        await preparation.reporter.emit('config');
-                        if (!plugin.manifest.config) {
-                            throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
-                        }
-                        await coercePluginConfigUpdates({
-                            schema: plugin.manifest.config.fields,
-                            updates: intent.updates ?? {},
-                            cwd: context.cwd,
-                        });
-                        for (const key of intent.removeKeys ?? []) {
-                            if (!plugin.manifest.config.fields[key]) {
-                                throw new TuiOperationBlockedError('unknownConfigKey', '设置字段已变化，请重新检查。');
-                            }
+        const selected = await withResolvedCatalogPlugin({
+            selector: intent.pluginId,
+            cliVersion: packageInfo.version,
+            configSnapshot,
+            env: context.env,
+            ...(catalogOperation ? { operationContext: catalogOperation } : {}),
+            ...(signal ? { signal } : {}),
+            consume: async ({ plugin, source }) => {
+                if (preparation?.validateIntent && intent.kind === 'configSave') {
+                    await preparation.reporter.emit('config');
+                    if (!plugin.manifest.config) {
+                        throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
+                    }
+                    await coercePluginConfigUpdates({
+                        schema: plugin.manifest.config.fields,
+                        updates: intent.updates ?? {},
+                        cwd: context.cwd,
+                    });
+                    for (const key of intent.removeKeys ?? []) {
+                        if (!plugin.manifest.config.fields[key]) {
+                            throw new TuiOperationBlockedError('unknownConfigKey', '设置字段已变化，请重新检查。');
                         }
                     }
-                    const impact = intent.kind === 'configSave' && !intent.retryApply
-                        ? await analyzePluginConfigMutationImpact({
+                }
+                const impact = intent.kind === 'configSave' && !intent.retryApply
+                    ? await analyzePluginConfigMutationImpact({
+                        plugin,
+                        scope: intent.scope,
+                        cwd: context.cwd,
+                        env: context.env,
+                        visibleTargets: configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets),
+                        mutation: {
+                            kind: 'patch',
+                            updates: intent.updates,
+                            removeKeys: intent.removeKeys,
+                        },
+                    })
+                    : undefined;
+                return {
+                    pluginName: plugin.manifest.name,
+                    source: sourceEvidenceForPlugin(source, plugin.manifest.name),
+                    impact,
+                    preApplyAuthorization: intent.kind === 'configSave'
+                        && configIntentRequestsApply(intent)
+                        ? (await resolveConfigPreApplyAuthorization({
                             plugin,
                             scope: intent.scope,
                             cwd: context.cwd,
                             env: context.env,
-                            visibleTargets: configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets),
-                            mutation: {
-                                kind: 'patch',
-                                updates: intent.updates,
-                                removeKeys: intent.removeKeys,
+                            applyTargets: intent.retryApply
+                                ? configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets)
+                                : impact.affectedTargets,
+                            nativeCliRunner: context.nativeCliRunner,
+                            rebuildRuntime: {
+                                ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
+                                ...(catalogOperation?.generationSetDigest
+                                    ? { expectedGenerationSetDigest: catalogOperation.generationSetDigest }
+                                    : {}),
+                                inventoryCatalogSourceReferences: operationInventory,
                             },
-                        })
-                        : undefined;
-                    return {
-                        pluginName: plugin.manifest.name,
-                        source: sourceEvidenceForPlugin(source, plugin.manifest.name),
-                        impact,
-                        preApplyAuthorization: intent.kind === 'configSave'
-                            && configIntentRequestsApply(intent)
-                            ? (await resolveConfigPreApplyAuthorization({
-                                plugin,
-                                scope: intent.scope,
-                                cwd: context.cwd,
-                                env: context.env,
-                                applyTargets: intent.retryApply
-                                    ? configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets)
-                                    : impact.affectedTargets,
-                                nativeCliRunner: context.nativeCliRunner,
-                                rebuildRuntime: {
-                                    ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
-                                    ...(catalogOperation?.generationSetDigest
-                                        ? { expectedGenerationSetDigest: catalogOperation.generationSetDigest }
-                                        : {}),
-                                    inventoryCatalogSourceReferences: operationInventory,
-                                },
-                            })).targets
-                            : [],
-                        sharedNativeRenderTargets: intent.kind === 'configSave'
-                            ? intent.retryApply
-                                ? configRetrySharedNativeRenderTargets(plugin)
-                                : impact.sharedNativeRenderTargets
-                            : [],
-                    };
-                },
-            });
+                        })).targets
+                        : [],
+                    sharedNativeRenderTargets: intent.kind === 'configSave'
+                        ? intent.retryApply
+                            ? configRetrySharedNativeRenderTargets(plugin)
+                            : impact.sharedNativeRenderTargets
+                        : [],
+                };
+            },
+        });
         if (intent.kind === 'pluginWrite' && intent.expectedUpdate) {
             const revision = status.targetRevisions.find((entry) => entry.pluginId === intent.pluginId && entry.platform === intent.platform
                 && entry.scope === intent.scope);
@@ -2060,17 +2080,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             signal?.throwIfAborted();
             codexReconcilePlans = preview?.codexReconcilePlans;
             operationPlan = preview?.operationPlan;
-            if (intent.action === 'cleanup' && intent.force === true) {
-                const candidates = preview?.offlineCleanupPlans?.filter((candidate) => candidate.forceExclusive === true
-                    && candidate.pluginId === intent.pluginId
-                    && candidate.platform === intent.platform
-                    && candidate.scope === intent.scope
-                    && candidate.plan.actions.length > 0) ?? [];
-                if (candidates.length !== 1) {
-                    throw new TuiOperationBlockedError('forceCleanupPathUnavailable', '没有唯一且可验证的精确清理目标。');
-                }
-                [forceCleanupEvidence] = candidates;
-            }
             if (hasDeclaredDependencies
                 && (intent.action === 'install'
                     || intent.action === 'refreshAndSync'
@@ -2124,8 +2133,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     : {}),
             },
             source: selected.source,
-            ...(offlineCleanup ? { offlineCleanup } : {}),
-            ...(forceCleanupEvidence ? { offlineCleanup: forceCleanupEvidence } : {}),
             ...(dependencyPlan ? { dependencyPlan } : {}),
             ...(codexReconcilePlans ? { codexReconcilePlans } : {}),
             ...(operationPlan ? { operationPlan } : {}),
@@ -2857,7 +2864,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             requestedPluginIds: group.requestedPluginIds,
                             executable: group.executable,
                             planFingerprint: group.preview.operationPlan
-                                ? createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
+                                ? intent.action === 'cleanup'
+                                    ? group.preview.operationPlan.planFingerprint
+                                    : createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
                                 : undefined,
                         }));
                         const currentGroups = currentBatch.groups.map((group) => ({
@@ -2872,7 +2881,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 ?.executable === false
                                 ? undefined
                                 : group.preview.operationPlan
-                                    ? createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
+                                    ? intent.action === 'cleanup'
+                                        ? group.preview.operationPlan.planFingerprint
+                                        : createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
                                     : undefined,
                         }));
                         if (expectedBatch.catalog.configDigest !== currentBatch.catalog.configDigest
@@ -2884,6 +2895,12 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
                         const groupResults = [];
                         const completedTargetKeys = new Set();
+                        const expectedIntentDigests = new Map();
+                        for (const group of expectedBatch.groups) {
+                            for (const intentDigest of group.preview.operationPlan?.evidence.intentDigests ?? []) {
+                                expectedIntentDigests.set(intentDigest.scope, intentDigest.digest);
+                            }
+                        }
                         let executedGroupCount = 0;
                         const appendStoppedGroups = (startIndex, staleMessage) => {
                             for (const [offset, stopped] of expectedBatch.groups.slice(startIndex).entries()) {
@@ -2916,7 +2933,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 ? operationInventory
                                 : createOperationInventoryReader();
                             let executionPreview = current.preview;
-                            if (completedTargetKeys.size > 0) {
+                            if (completedTargetKeys.size > 0
+                                || (intent.action === 'cleanup' && executedGroupCount > 0)) {
                                 executionPreview = await runBatchWriteGroup({
                                     intent,
                                     group: current,
@@ -2925,12 +2943,17 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         ...context,
                                         awHomeMutationToken,
                                         inventoryCatalogSourceReferences: groupInventory,
-                                        expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                        ...(intent.action === 'cleanup' ? {} : {
+                                            expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                        }),
                                         previewOperationPlan: true,
                                         ...(codexObservationSession ? { codexObservationSession } : {}),
                                     },
                                 });
-                                if (!reviewed.preview.operationPlan || !executionPreview.operationPlan
+                                const cleanupIntentDigestChanged = intent.action === 'cleanup'
+                                    && executionPreview.operationPlan?.evidence.intentDigests.find((entry) => entry.scope === current.scope)?.digest !== expectedIntentDigests.get(current.scope);
+                                if (cleanupIntentDigestChanged
+                                    || !reviewed.preview.operationPlan || !executionPreview.operationPlan
                                     || createBatchIntentCompatiblePlanFingerprint(reviewed.preview.operationPlan, completedTargetKeys) !== createBatchIntentCompatiblePlanFingerprint(executionPreview.operationPlan, completedTargetKeys)) {
                                     appendStoppedGroups(groupIndex, '前序批量结果改变了这个组的实际写入计划。');
                                     break;
@@ -2946,7 +2969,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                     awHomeMutationToken,
                                     preApplyConfirmed: true,
                                     inventoryCatalogSourceReferences: groupInventory,
-                                    expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                    ...(intent.action === 'cleanup' ? {} : {
+                                        expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                    }),
                                     ...(executionPreview.operationPlan ? {
                                         expectedPlanFingerprint: executionPreview.operationPlan.planFingerprint,
                                     } : {}),
@@ -2962,6 +2987,11 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 appendStoppedGroups(groupIndex, '这个组的实际写入计划发生变化。');
                                 break;
                             }
+                            if (intent.action === 'cleanup') {
+                                for (const change of result.operationPlan?.intentChanges ?? []) {
+                                    expectedIntentDigests.set(change.scope, change.afterDigest);
+                                }
+                            }
                             executedGroupCount += 1;
                             for (const target of result.targetResults) {
                                 if (target.state === 'completed') {
@@ -3150,16 +3180,28 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             cleanup: cleanupWriteCommand,
                             sync: syncWriteCommand,
                         }[intent.action];
-                        const currentSource = currentEvidence.source;
-                        const offlineCleanup = currentEvidence.offlineCleanup;
-                        const reviewedOfflineCleanup = expectedEvidence.offlineCleanup;
-                        if ((offlineCleanup || reviewedOfflineCleanup)
-                            && (!offlineCleanup
-                                || !reviewedOfflineCleanup
-                                || !offlineCleanupEvidenceMatches(reviewedOfflineCleanup, offlineCleanup))) {
-                            throw new TuiOperationBlockedError('operationReviewStale', '确认后离线清理证据发生变化。');
+                        if (intent.action === 'cleanup') {
+                            if (!expectedEvidence.operationPlan || !currentEvidence.operationPlan
+                                || expectedEvidence.operationPlan.planFingerprint
+                                    !== currentEvidence.operationPlan.planFingerprint) {
+                                throw operationReviewStale('确认后清理计划发生变化。');
+                            }
+                            const result = await command([intent.pluginId], options, {
+                                ...context,
+                                ...(codexObservationSession ? { codexObservationSession } : {}),
+                                awHomeMutationToken,
+                                preApplyConfirmed: true,
+                                inventoryCatalogSourceReferences: operationInventory,
+                                expectedPlanFingerprint: expectedEvidence.operationPlan.planFingerprint,
+                                ...(expectedEvidence.codexManager?.state === 'requires-install'
+                                    ? { managedCodexAuthorizer: async () => true }
+                                    : {}),
+                            });
+                            throwIfWriteReviewStale(result);
+                            return result;
                         }
-                        if (!offlineCleanup && (!expectedEvidence.source || !currentSource)) {
+                        const currentSource = currentEvidence.source;
+                        if (!expectedEvidence.source || !currentSource) {
                             throw new TuiOperationBlockedError('operationReviewStale', '确认信息缺少来源身份。');
                         }
                         const result = await command([intent.pluginId], options, {
@@ -3179,9 +3221,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(expectedEvidence.codexManager?.state === 'requires-install'
                                 ? { managedCodexAuthorizer: async () => true }
                                 : {}),
-                            ...(reviewedOfflineCleanup
-                                ? { expectedOfflineCleanupEvidence: reviewedOfflineCleanup }
-                                : { reviewPreflight: (actual) => assertSourceEvidenceMatches(currentSource, actual) }),
+                            reviewPreflight: (actual) => assertSourceEvidenceMatches(currentSource, actual),
                         });
                         throwIfWriteReviewStale(result);
                         return result;