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

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

@@ -12,7 +12,8 @@ import { withResolvedCatalogPlugin, withResolvedMultiSourceCatalog, formatPlugin
 import { coercePluginConfigUpdates, inspectPluginConfigResetTarget, listNamespacedPluginConfigStoreIdentities, readPluginConfigStore, resolveConfigRead, resolveEffectivePluginConfig, resolvePluginConfigStorePath, } from '../utils/plugin-config.js';
 import { assertProjectSharedConfigPathVisible } from '../utils/project-boundary.js';
 import { readPluginIntentState } from '../utils/plugin-intent-state.js';
-import { applyPluginConfigWrite, replayConfigRuntimeWrites, resetPluginConfigWithHelper, } from '../utils/plugin-config-write.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';
@@ -118,18 +119,32 @@ export function configAffectedStatusTargets(targets, pluginId, configScope) {
         .sort((left, right) => `${left.platform}\0${left.scope}`
         .localeCompare(`${right.platform}\0${right.scope}`, 'en'));
 }
-function configSharedNativeRenderTargets(plugin, changedKeys) {
-    const changed = changedKeys ? new Set(changedKeys) : undefined;
+function configRetrySharedNativeRenderTargets(plugin) {
     return (plugin.manifest.artifacts?.targets ?? []).flatMap((target) => target.platform === 'codex'
         && target.target === 'codex.skill'
         && target.delivery.mode === 'codex-native'
         && target.skillKey
-        && (changed
-            ? target.refreshKeys.some((key) => changed.has(key))
-            : target.refreshKeys.length > 0)
+        && target.refreshKeys.length > 0
         ? [{ id: target.id, skillKey: target.skillKey, refreshKeys: [...target.refreshKeys] }]
         : []);
 }
+function configImpactVisibleTargets(pluginName, targets) {
+    return targets.map((target) => ({
+        pluginName,
+        platform: target.platform,
+        scope: target.scope,
+    }));
+}
+function configIntentRequestsApply(intent) {
+    if (!intent.apply)
+        return false;
+    if (intent.retryApply === true)
+        return true;
+    if (intent.changes)
+        return intent.changes.length > 0;
+    return Object.keys(intent.updates ?? {}).length > 0
+        || (intent.removeKeys?.length ?? 0) > 0;
+}
 function operationReviewStale(message) {
     return new TuiOperationBlockedError('operationReviewStale', `operationReviewStale: ${message}`);
 }
@@ -770,10 +785,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             if (target.kind === 'special') {
                 throw new TuiOperationBlockedError('configResetTargetUnsupported', '设置目标是特殊文件系统节点，不能自动重置。请手动移动后重试。');
             }
-            let source;
+            const relevantTargets = sessionStatusResult
+                ? configAffectedStatusTargets(sessionStatusResult.payload.targets, intent.pluginId, intent.scope)
+                : [];
+            const relevantRevisions = (sessionStatusResult?.targetRevisions ?? []).filter((revision) => relevantTargets.some((statusTarget) => statusTarget.platform === revision.platform
+                && statusTarget.scope === revision.scope
+                && statusTarget.pluginId === revision.pluginId));
+            let selected;
             try {
                 const packageInfo = await readCliPackageInfo();
-                source = await withResolvedCatalogPlugin({
+                selected = await withResolvedCatalogPlugin({
                     selector: intent.pluginId,
                     cliVersion: packageInfo.version,
                     env: context.env,
@@ -781,16 +802,23 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         ? { operationContext: sessionContextForPlugin(intent.pluginId) }
                         : {}),
                     ...(signal ? { signal } : {}),
-                    consume: async ({ plugin, source: resolvedSource }) => sourceEvidenceForPlugin(resolvedSource, plugin.manifest.name),
+                    consume: async ({ plugin, source: resolvedSource }) => ({
+                        source: sourceEvidenceForPlugin(resolvedSource, plugin.manifest.name),
+                        impact: await analyzePluginConfigMutationImpact({
+                            plugin,
+                            scope: intent.scope,
+                            cwd: context.cwd,
+                            env: context.env,
+                            visibleTargets: configImpactVisibleTargets(plugin.manifest.name, relevantTargets),
+                            mutation: { kind: 'reset' },
+                        }),
+                    }),
                 });
             }
             catch {
-                source = undefined;
+                selected = undefined;
             }
             signal?.throwIfAborted();
-            const relevantTargets = sessionStatusResult
-                ? configAffectedStatusTargets(sessionStatusResult.payload.targets, intent.pluginId, intent.scope)
-                : [];
             await preparation?.reporter.emit('evidence');
             return {
                 catalog: sessionStatusResult ? {
@@ -800,11 +828,20 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     configDigest: 'config-reset-offline',
                     compositeDigest: 'config-reset-target',
                 },
-                ...(source ? { source } : {}),
+                ...(selected ? { source: selected.source } : {}),
+                ...(sessionStatusResult ? {
+                    targetFingerprint: statusTargetFingerprint(relevantTargets, relevantRevisions),
+                } : {}),
                 config: {
                     scope: intent.scope,
-                    storeDigest: target.fingerprint,
-                    affectedTargets: relevantTargets.map(({ platform, scope }) => ({ platform, scope })),
+                    storeDigest: selected?.impact.storeDigest ?? target.fingerprint,
+                    impactState: selected?.impact.impactState ?? 'unknown',
+                    ...(selected?.impact.noEffectiveChange ? { noEffectiveChange: true } : {}),
+                    affectedTargets: (selected?.impact.affectedTargets
+                        ?? relevantTargets).map(({ platform, scope }) => ({ platform, scope })),
+                    ...((selected?.impact.sharedNativeRenderTargets.length ?? 0) > 0
+                        ? { sharedNativeRenderTargets: selected.impact.sharedNativeRenderTargets }
+                        : {}),
                 },
                 resetTarget: {
                     sourceId: parsed.sourceId,
@@ -1281,12 +1318,14 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             if (configSnapshot.digest !== sessionStatusResult.payload.catalog.configDigest) {
                 throw operationReviewStale('准备设置确认期间来源配置发生变化。');
             }
+            const relevantTargets = configAffectedStatusTargets(sessionStatusResult.payload.targets, intent.pluginId, intent.scope);
+            const preparedCatalogOperation = catalogOperation;
             const selected = await withResolvedCatalogPlugin({
                 selector: intent.pluginId,
                 cliVersion: packageInfo.version,
                 configSnapshot,
                 env: context.env,
-                ...(catalogOperation ? { operationContext: catalogOperation } : {}),
+                operationContext: preparedCatalogOperation,
                 ...(signal ? { signal } : {}),
                 consume: async ({ plugin, source }) => {
                     if (!plugin.manifest.config) {
@@ -1304,35 +1343,56 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             }
                         }
                     }
+                    const impact = intent.retryApply ? undefined : await analyzePluginConfigMutationImpact({
+                        plugin,
+                        scope: intent.scope,
+                        cwd: context.cwd,
+                        env: context.env,
+                        visibleTargets: configImpactVisibleTargets(plugin.manifest.name, relevantTargets),
+                        mutation: {
+                            kind: 'patch',
+                            updates: intent.updates,
+                            removeKeys: intent.removeKeys,
+                        },
+                    });
+                    const affectedTargets = intent.retryApply
+                        ? configImpactVisibleTargets(plugin.manifest.name, relevantTargets)
+                        : impact.affectedTargets;
                     return {
                         pluginName: plugin.manifest.name,
                         source: sourceEvidenceForPlugin(source, plugin.manifest.name),
-                        sharedNativeRenderTargets: intent.kind === 'configSave'
-                            ? configSharedNativeRenderTargets(plugin, intent.retryApply
-                                ? undefined
-                                : [
-                                    ...Object.keys(intent.updates ?? {}),
-                                    ...(intent.removeKeys ?? []),
-                                ])
+                        impact,
+                        preApplyAuthorization: configIntentRequestsApply(intent)
+                            ? (await resolveConfigPreApplyAuthorization({
+                                plugin,
+                                scope: intent.scope,
+                                cwd: context.cwd,
+                                env: context.env,
+                                applyTargets: affectedTargets,
+                                nativeCliRunner: context.nativeCliRunner,
+                                rebuildRuntime: {
+                                    catalogOperationContext: preparedCatalogOperation,
+                                    expectedGenerationSetDigest: preparedCatalogOperation.generationSetDigest,
+                                    inventoryCatalogSourceReferences: operationInventory,
+                                },
+                            })).targets
                             : [],
+                        sharedNativeRenderTargets: intent.retryApply
+                            ? configRetrySharedNativeRenderTargets(plugin)
+                            : impact.sharedNativeRenderTargets,
                     };
                 },
             });
-            const store = await readPluginConfigStore({
-                sourceId: selected.source?.sourceId ?? parsePluginId(intent.pluginId).sourceId,
-                ...(selected.source?.sourceIdentity
-                    ? { sourceIdentity: selected.source.sourceIdentity }
-                    : {}),
-                ...(selected.source?.logicalIdentity
-                    ? { logicalIdentity: selected.source.logicalIdentity }
-                    : {}),
+            const retryStore = intent.retryApply ? await readPluginConfigStore({
+                sourceId: selected.source.sourceId,
+                sourceIdentity: selected.source.sourceIdentity,
+                logicalIdentity: selected.source.logicalIdentity,
                 pluginName: selected.pluginName,
                 scope: intent.scope,
                 cwd: context.cwd,
                 env: context.env,
-            });
+            }) : undefined;
             signal?.throwIfAborted();
-            const relevantTargets = configAffectedStatusTargets(sessionStatusResult.payload.targets, intent.pluginId, intent.scope);
             const relevantRevisions = (sessionStatusResult.targetRevisions ?? []).filter((revision) => relevantTargets.some((target) => target.platform === revision.platform
                 && target.scope === revision.scope
                 && target.pluginId === revision.pluginId));
@@ -1348,8 +1408,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 config: {
                     scope: intent.scope,
                     ...(selected.source?.manifestDigest ? { schemaIdentity: selected.source.manifestDigest } : {}),
-                    storeDigest: digest({ exists: store.exists, rawDigest: store.rawDigest }),
-                    affectedTargets: relevantTargets.map(({ platform, scope }) => ({ platform, scope })),
+                    storeDigest: selected.impact?.storeDigest
+                        ?? digest({ exists: retryStore?.exists, rawDigest: retryStore?.rawDigest }),
+                    impactState: selected.impact?.impactState ?? 'known',
+                    ...(selected.impact?.noEffectiveChange ? { noEffectiveChange: true } : {}),
+                    affectedTargets: (selected.impact?.affectedTargets
+                        ?? relevantTargets).map(({ platform, scope }) => ({ platform, scope })),
+                    ...(selected.preApplyAuthorization.length > 0
+                        ? { preApplyAuthorization: selected.preApplyAuthorization }
+                        : {}),
                     ...(selected.sharedNativeRenderTargets.length > 0
                         ? { sharedNativeRenderTargets: selected.sharedNativeRenderTargets }
                         : {}),
@@ -1430,6 +1497,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 throw operationReviewStale('离线清理现场证据已消失或无法验证。');
             }
         }
+        const configVisibleTargets = intent.kind === 'configSave'
+            ? configAffectedStatusTargets(status.payload.targets, intent.pluginId, intent.scope)
+            : [];
         const selected = offlineCleanupTarget
             ? {
                 pluginName: offlineCleanupTarget.pluginName,
@@ -1464,16 +1534,48 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             }
                         }
                     }
+                    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,
+                                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'
-                            ? configSharedNativeRenderTargets(plugin, intent.retryApply
-                                ? undefined
-                                : [
-                                    ...Object.keys(intent.updates ?? {}),
-                                    ...(intent.removeKeys ?? []),
-                                ])
+                            ? intent.retryApply
+                                ? configRetrySharedNativeRenderTargets(plugin)
+                                : impact.sharedNativeRenderTargets
                             : [],
                     };
                 },
@@ -1566,7 +1668,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         await preparation?.reporter.emit('evidence');
         signal?.throwIfAborted();
         const evidenceTargets = intent.kind === 'configSave'
-            ? configAffectedStatusTargets(status.payload.targets, intent.pluginId, intent.scope)
+            ? configVisibleTargets
             : status.payload.targets;
         const evidenceRevisions = intent.kind === 'configSave'
             ? (status.targetRevisions ?? []).filter((revision) => evidenceTargets.some((target) => target.platform === revision.platform
@@ -1591,7 +1693,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             targetFingerprint: statusTargetFingerprint(evidenceTargets, evidenceRevisions),
         };
         if (intent.kind === 'configSave') {
-            const store = await readPluginConfigStore({
+            const impact = 'impact' in selected ? selected.impact : undefined;
+            const retryStore = intent.retryApply ? await readPluginConfigStore({
                 sourceId: selected.source.sourceId,
                 sourceIdentity: selected.source.sourceIdentity,
                 ...('logicalIdentity' in selected.source
@@ -1601,15 +1704,19 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 scope: intent.scope,
                 cwd: context.cwd,
                 env: context.env,
-            });
+            }) : undefined;
             signal?.throwIfAborted();
             evidence.config = {
                 scope: intent.scope,
                 ...('manifestDigest' in selected.source
                     ? { schemaIdentity: selected.source.manifestDigest }
                     : {}),
-                storeDigest: digest({ exists: store.exists, rawDigest: store.rawDigest }),
-                affectedTargets: evidenceTargets.map(({ platform, scope }) => ({ platform, scope })),
+                storeDigest: impact?.storeDigest
+                    ?? digest({ exists: retryStore?.exists, rawDigest: retryStore?.rawDigest }),
+                impactState: impact?.impactState ?? 'known',
+                ...(impact?.noEffectiveChange ? { noEffectiveChange: true } : {}),
+                affectedTargets: (impact?.affectedTargets
+                    ?? evidenceTargets).map(({ platform, scope }) => ({ platform, scope })),
                 ...(intent.scope === 'project' ? {
                     shareability: await inspectConfigShareability({
                         sourceId: selected.source.sourceId,
@@ -1623,6 +1730,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     && selected.sharedNativeRenderTargets.length > 0
                     ? { sharedNativeRenderTargets: selected.sharedNativeRenderTargets }
                     : {}),
+                ...('preApplyAuthorization' in selected
+                    && selected.preApplyAuthorization.length > 0
+                    ? { preApplyAuthorization: selected.preApplyAuthorization }
+                    : {}),
             };
         }
         if (catalogOperation)
@@ -2343,6 +2454,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 runtime: {
                                     ...context,
                                     awHomeMutationToken,
+                                    preApplyConfirmed: true,
                                     inventoryCatalogSourceReferences: groupInventory,
                                     expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
                                     ...(executionPreview.operationPlan ? {
@@ -2436,6 +2548,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...context,
                             ...(codexObservationSession ? { codexObservationSession } : {}),
                             awHomeMutationToken,
+                            preApplyConfirmed: true,
                             inventoryCatalogSourceReferences: operationInventory,
                             ...(expectedEvidence.operationPlan
                                 ? { expectedPlanFingerprint: expectedEvidence.operationPlan.planFingerprint }
@@ -2490,7 +2603,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                             consume: async ({ plugin, source }) => {
                                 assertSourceEvidenceMatches(currentSource, sourceEvidenceForPlugin(source, plugin.manifest.name));
-                                const applyTargets = intent.apply
+                                const applyTargets = intent.retryApply || intent.apply
                                     ? currentEvidence.config?.affectedTargets.map((target) => ({
                                         pluginName: plugin.manifest.name,
                                         platform: target.platform,
@@ -2519,6 +2632,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         awHomeMutationToken,
                                         applyTargets,
                                         sharedNativeApplyConfirmed: true,
+                                        preApplyConfirmed: true,
+                                        preApplyAuthorizedTargets: expectedEvidence.config?.preApplyAuthorization ?? [],
                                     })
                                     : await applyPluginConfigWrite({
                                         plugin,
@@ -2543,6 +2658,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         applyTargets,
                                         request: { updates: intent.updates, removeKeys: intent.removeKeys },
                                         sharedNativeApplyConfirmed: true,
+                                        preApplyConfirmed: true,
+                                        preApplyAuthorizedTargets: expectedEvidence.config?.preApplyAuthorization ?? [],
                                     });
                                 return { ...result, operationRebuildResults };
                             },