@lesliechan721/aw 0.1.0-beta.25 → 0.1.0-beta.27

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

@@ -11,7 +11,7 @@ import { readCatalogSourcesConfigSnapshot, recoverInvalidCatalogSourcesConfig, }
 import { withResolvedCatalogPlugin, withResolvedMultiSourceCatalog, formatPluginId, parsePluginId, } from '../utils/multi-source-catalog.js';
 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 { calculatePluginIntentDigest, 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';
@@ -24,6 +24,7 @@ import { projectCatalogSourceLocation } from '../utils/catalog-source-presentati
 import { calculateCatalogSourceConfigFingerprint, calculateCatalogSourceIdentity, } from '../utils/catalog-source-identity.js';
 import { checkAwCapabilitySupport, readPluginManifest } from '../utils/manifest.js';
 import { withAwHomeMutationLock } from '../utils/aw-home-mutation-lock.js';
+import { resolveCanonicalRepoProjectKey } from '../utils/state-paths.js';
 import { IMPLEMENTED_AW_CAPABILITIES } from '../commands/aw-capabilities.js';
 import { calculateCatalogGenerationSetDigest, resolveActiveCatalogGeneration, } from '../utils/catalog-generation-resolver.js';
 import { resolveCatalogOperationContext, resolvePartialCatalogOperationContext, selectCatalogOperationContext, } from '../utils/catalog-operation-context.js';
@@ -34,8 +35,10 @@ import { readCatalogGenerationState } from '../utils/catalog-generation-state.js
 import { CatalogGenerationError } from '../utils/catalog-generation-error.js';
 import { CatalogProviderCompatibilityError } from '../utils/catalog-public-error.js';
 import { loadCatalogGenerationViewModels } from './catalog-generation.js';
-import { installPortableSkills, preparePortableInstall, PortableCommandError, } from '../portable/commands.js';
+import { executePortableRetry, installPortableSkills, preparePortableInstall, preparePortableRetry, PortableCommandError, recheckPortableInstall, } from '../portable/commands.js';
 import { MANAGED_CODEX_PACKAGE_NAME, MANAGED_CODEX_VERSION, } from '../utils/codex-manager.js';
+import { projectPluginContentOverview, } from './plugin-content.js';
+import { executeCatalogStoreTask, inspectCatalogStoreTask, prepareCatalogStoreTask, } from './catalog-store-task.js';
 function reusableCandidateEvidenceIsComplete(candidate) {
     const evidence = candidate.probe.candidate;
     return [
@@ -151,6 +154,31 @@ function configIntentRequestsApply(intent) {
     return Object.keys(intent.updates ?? {}).length > 0
         || (intent.removeKeys?.length ?? 0) > 0;
 }
+function configSaveBatchGroupIntent(intent, group) {
+    return {
+        kind: 'configSave',
+        pluginId: intent.pluginId,
+        scope: group.scope,
+        apply: intent.apply,
+        ...(intent.scriptTimeoutMs === undefined ? {} : { scriptTimeoutMs: intent.scriptTimeoutMs }),
+        ...(group.updates ? { updates: group.updates } : {}),
+        ...(group.removeKeys ? { removeKeys: group.removeKeys } : {}),
+        ...(group.sensitiveKeys ? { sensitiveKeys: group.sensitiveKeys } : {}),
+        ...(group.privateKeys ? { privateKeys: group.privateKeys } : {}),
+        ...(group.changes ? { changes: group.changes } : {}),
+    };
+}
+function assertConfigSaveBatchIntent(intent) {
+    const order = { project: 0, user: 1 };
+    if (intent.groups.length === 0 || intent.groups.length > 2
+        || new Set(intent.groups.map((group) => group.scope)).size !== intent.groups.length
+        || intent.groups.some((group, index) => index > 0
+            && order[intent.groups[index - 1].scope] >= order[group.scope])
+        || intent.groups.some((group) => Object.keys(group.updates ?? {}).length === 0
+            && (group.removeKeys?.length ?? 0) === 0)) {
+        throw new TuiOperationBlockedError('configBatchInvalid', '设置批次必须包含按当前项目、个人默认排序的唯一非空目标。');
+    }
+}
 function operationReviewStale(message, diagnostics) {
     return new TuiOperationBlockedError('operationReviewStale', `operationReviewStale: ${message}`, diagnostics);
 }
@@ -170,6 +198,20 @@ function sourceEvidenceForPlugin(source, pluginName) {
         channel: source.manifest.channel,
     };
 }
+async function configLayerStoreDigest(options) {
+    const store = await readPluginConfigStore({
+        sourceId: options.source.sourceId,
+        sourceIdentity: options.source.sourceIdentity,
+        ...('logicalIdentity' in options.source
+            ? { logicalIdentity: options.source.logicalIdentity }
+            : {}),
+        pluginName: options.pluginName,
+        scope: options.scope,
+        cwd: options.cwd,
+        env: options.env,
+    });
+    return digest({ exists: store.exists, rawDigest: store.rawDigest });
+}
 async function inspectConfigShareability(options) {
     if (options.scope !== 'project')
         return undefined;
@@ -222,7 +264,7 @@ function reviewedScriptTimeoutMs(intent) {
             || intent.action === 'reinstall' || intent.action === 'sync')) {
         return parseScriptTimeoutMs(intent.scriptTimeoutMs ?? SCRIPT_TIMEOUT_DEFAULT_MS);
     }
-    if (intent.kind === 'configSave' && intent.apply) {
+    if ((intent.kind === 'configSave' || intent.kind === 'configSaveBatch') && intent.apply) {
         return parseScriptTimeoutMs(intent.scriptTimeoutMs ?? SCRIPT_TIMEOUT_DEFAULT_MS);
     }
     return undefined;
@@ -292,6 +334,25 @@ async function resolveBatchGroups(intent, env, cwd, frozenRequestedPluginIds) {
         throw new TuiOperationBlockedError('syncSelectionRequired', '当前项目全部操作只支持 project scope sync。');
     }
     const state = await readPluginIntentState({ scope: 'project', cwd, env });
+    const projectIntentDigest = calculatePluginIntentDigest(state);
+    if (intent.selection.kind === 'currentProjectIntentTargets') {
+        if (intent.selection.targets.length === 0
+            || intent.selection.targets.some((target) => target.scope !== 'project')) {
+            throw new TuiOperationBlockedError('batchTargetInvalid', '当前项目精确同步目标必须是非空 project targets。');
+        }
+        const exact = selectedBatchGroups({
+            ...intent,
+            selection: { kind: 'targets', targets: intent.selection.targets },
+        });
+        const declaredPlatforms = new Map(state.roots.map((root) => [
+            root.pluginId,
+            new Set(root.platforms),
+        ]));
+        if (intent.selection.targets.some((target) => !declaredPlatforms.get(target.pluginId)?.has(target.platform))) {
+            throw new TuiOperationBlockedError('batchTargetInvalid', '当前项目精确同步目标必须属于完整 project intent roots 声明。');
+        }
+        return { ...exact, projectIntentDigest };
+    }
     const selection = resolveSyncIntentSelection({
         roots: state.roots,
         selectors: frozenRequestedPluginIds ?? [],
@@ -303,6 +364,7 @@ async function resolveBatchGroups(intent, env, cwd, frozenRequestedPluginIds) {
     }
     return {
         requestedPluginIds: selection.requestedPluginIds,
+        projectIntentDigest,
         groups: selection.groups.map((group) => ({
             groupId: `${group.sourceId}\0${group.platform}\0${intent.scope}`,
             sourceId: group.sourceId,
@@ -757,8 +819,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             }))).flat();
             signal.throwIfAborted();
             const statusById = new Map(result.payload.catalog.sources.map((source) => [source.id, source]));
+            const [projectRoot, projectIntentState] = await Promise.all([
+                resolveCanonicalRepoProjectKey(context.cwd),
+                readPluginIntentState({ scope: 'project', cwd: context.cwd, env: context.env }),
+            ]);
+            signal.throwIfAborted();
             return {
                 cliChannel: packageInfo.version.includes('-') ? 'beta' : 'latest',
+                projectRoot,
+                projectIntentRoots: structuredClone(projectIntentState.roots),
                 configuredSources: structuredClone(configured.sources),
                 payload: result.payload,
                 pluginSummaries: result.pluginSummaries,
@@ -797,8 +866,98 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         throw new TuiOperationBlockedError('operationReviewStale', '状态读取期间来源配置持续变化。请重试。');
     };
+    const loadPluginContent = async (pluginId, signal) => {
+        signal.throwIfAborted();
+        try {
+            const packageInfo = await readCliPackageInfo();
+            const catalogOperation = sessionContextForPlugin(pluginId);
+            return await withResolvedCatalogPlugin({
+                selector: pluginId,
+                cliVersion: packageInfo.version,
+                env: context.env,
+                signal,
+                ...(catalogOperation ? { operationContext: catalogOperation } : {}),
+                consume: ({ plugin, source }) => projectPluginContentOverview({
+                    pluginId,
+                    catalogVersion: source.manifest.catalogVersion,
+                    plugin,
+                }),
+            });
+        }
+        catch {
+            signal.throwIfAborted();
+            const summary = sessionStatusResult?.pluginSummaries.find((entry) => entry.pluginId === pluginId);
+            let sourceId;
+            try {
+                sourceId = parsePluginId(pluginId).sourceId;
+            }
+            catch {
+                // The fixed unavailable result below does not repeat an unsafe selector.
+            }
+            const catalogVersion = sessionStatusResult?.payload.catalog.sources
+                .find((source) => source.id === sourceId)?.catalogVersion;
+            return {
+                pluginId,
+                pluginVersion: summary?.version ?? '待确认',
+                catalogVersion: catalogVersion ?? '待确认',
+                evidence: 'unavailable',
+                items: [],
+                notices: ['当前无法安全读取这个插件的目录内容。请检查来源状态后重试。'],
+            };
+        }
+    };
     const captureEvidence = async (intent, signal, preparation, operationInventory = createOperationInventoryReader(), freshCatalog = false, reusableCandidate, codexObservationSession, frozenBatchEvidence) => {
         reviewedScriptTimeoutMs(intent);
+        if (intent.kind === 'catalogStorePrune') {
+            signal?.throwIfAborted();
+            const config = await readCatalogSourcesConfigSnapshot(context.env);
+            const catalogStore = await prepareCatalogStoreTask({ env: context.env });
+            signal?.throwIfAborted();
+            return {
+                catalog: { configDigest: config.digest, compositeDigest: config.digest },
+                catalogStore,
+            };
+        }
+        if (intent.kind === 'configSaveBatch') {
+            assertConfigSaveBatchIntent(intent);
+            const groupEvidence = [];
+            let batchBase;
+            let batchCatalogOperation;
+            for (const group of intent.groups) {
+                const current = await captureEvidence(configSaveBatchGroupIntent(intent, group), signal, preparation, operationInventory, freshCatalog, reusableCandidate, codexObservationSession);
+                if (!current.config || !current.source || !current.targetFingerprint) {
+                    throw operationReviewStale('设置批次缺少单层证据。');
+                }
+                if (batchBase && (JSON.stringify(batchBase.catalog) !== JSON.stringify(current.catalog)
+                    || JSON.stringify(batchBase.source) !== JSON.stringify(current.source))) {
+                    throw operationReviewStale('准备设置批次期间 Catalog 或来源发生变化。');
+                }
+                batchBase ??= current;
+                batchCatalogOperation ??= catalogOperationByEvidence.get(current);
+                groupEvidence.push({
+                    scope: group.scope,
+                    config: {
+                        ...current.config,
+                        storeDigest: await configLayerStoreDigest({
+                            source: current.source,
+                            pluginName: parsePluginId(intent.pluginId).pluginName,
+                            scope: group.scope,
+                            cwd: context.cwd,
+                            env: context.env,
+                        }),
+                    },
+                    targetFingerprint: current.targetFingerprint,
+                });
+            }
+            const evidence = {
+                catalog: batchBase.catalog,
+                source: batchBase.source,
+                configBatch: { groups: groupEvidence },
+            };
+            if (batchCatalogOperation)
+                catalogOperationByEvidence.set(evidence, batchCatalogOperation);
+            return evidence;
+        }
         if ((intent.kind === 'pluginWrite'
             && (intent.platform === 'codex' || intent.platform === 'both')
             || intent.kind === 'pluginWriteTask'
@@ -1808,6 +1967,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         ?? digest(groups.map((group) => [group.groupId, group.preview.operationPlan?.planFingerprint])),
                 },
                 requestedPluginIds: selection.requestedPluginIds,
+                ...(selection.projectIntentDigest
+                    ? { projectIntentDigest: selection.projectIntentDigest }
+                    : {}),
                 groups,
                 targetVersions: [...new Map(targetVersions.map((target) => [[
                             target.pluginId, target.platform, target.scope,
@@ -1877,23 +2039,39 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         if (intent.kind === 'portableInstall') {
             await preparation?.reporter.emit('portable');
+            if (intent.retry
+                && (intent.retry.receipt.plugin.id !== intent.pluginId
+                    || intent.retry.receipt.scope !== intent.scope)) {
+                throw operationReviewStale('Portable 重试结果与当前插件或范围不匹配。');
+            }
             const portableSourceId = parsePluginId(intent.pluginId).sourceId;
             const portableCatalogOperation = sessionCatalogOperationContext
                 ? selectCatalogOperationContext(sessionCatalogOperationContext, [portableSourceId])
                 : undefined;
-            const portable = await preparePortableInstall({
-                selector: intent.pluginId,
-                scope: intent.scope,
-                ...(intent.selectedSkills.length > 0 ? { requestedSkills: intent.selectedSkills } : {}),
-                ...(intent.requestedAgents ? { requestedAgents: intent.requestedAgents } : {}),
-                cwd: context.cwd,
-                env: context.env,
-                cliVersion: packageInfo.version,
-                signal,
-                ...(portableCatalogOperation
-                    ? { catalogOperationContext: portableCatalogOperation }
-                    : {}),
-            });
+            const portable = intent.retry
+                ? await preparePortableRetry({
+                    receipt: intent.retry.receipt,
+                    cwd: context.cwd,
+                    env: context.env,
+                    cliVersion: packageInfo.version,
+                    signal,
+                    ...(portableCatalogOperation
+                        ? { catalogOperationContext: portableCatalogOperation }
+                        : {}),
+                })
+                : await preparePortableInstall({
+                    selector: intent.pluginId,
+                    scope: intent.scope,
+                    ...(intent.selectedSkills.length > 0 ? { requestedSkills: intent.selectedSkills } : {}),
+                    ...(intent.requestedAgents ? { requestedAgents: intent.requestedAgents } : {}),
+                    cwd: context.cwd,
+                    env: context.env,
+                    cliVersion: packageInfo.version,
+                    signal,
+                    ...(portableCatalogOperation
+                        ? { catalogOperationContext: portableCatalogOperation }
+                        : {}),
+                });
             signal?.throwIfAborted();
             await preparation?.reporter.emit('evidence');
             signal?.throwIfAborted();
@@ -2326,6 +2504,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             }
         },
         loadStatus,
+        loadPluginContent,
         async probeCatalogFreshness(sourceId, freshnessOptions, signal) {
             signal.throwIfAborted();
             const packageInfo = await readCliPackageInfo();
@@ -2439,6 +2618,13 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 }
                 return;
             }
+            if (intent.kind === 'configSaveBatch') {
+                assertConfigSaveBatchIntent(intent);
+                for (const group of intent.groups) {
+                    await dependencies.validateIntent(configSaveBatchGroupIntent(intent, group), signal);
+                }
+                return;
+            }
             if (intent.kind === 'configSave') {
                 const packageInfo = await readCliPackageInfo();
                 await withResolvedCatalogPlugin({
@@ -2476,6 +2662,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             }
         },
         captureEvidence,
+        inspectCatalogStore(signal) {
+            signal.throwIfAborted();
+            return inspectCatalogStoreTask({ env: context.env });
+        },
+        recheckPortableInstall(receipt, signal) {
+            return recheckPortableInstall({
+                receipt,
+                cwd: context.cwd,
+                env: context.env,
+                signal,
+            });
+        },
         logError(_error, code, logContext) {
             return context.debugLogger.log({
                 type: 'tui:controller-error',
@@ -2671,6 +2869,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             };
         },
         async executeIntent(intent, expectedEvidence, signal) {
+            if (intent.kind === 'catalogStorePrune') {
+                signal?.throwIfAborted();
+                if (!expectedEvidence.catalogStore) {
+                    throw new TuiOperationBlockedError('catalogStoreReviewStale', '确认信息缺少精确清理目标。');
+                }
+                return executeCatalogStoreTask({
+                    env: context.env,
+                    authorizedItems: expectedEvidence.catalogStore.authorizedItems,
+                });
+            }
             if (intent.kind === 'catalogSourcesRecovery') {
                 signal?.throwIfAborted();
                 return recoverInvalidCatalogSourcesConfig({ env: context.env });
@@ -2844,6 +3052,25 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 }
                 const packageInfo = await readCliPackageInfo();
                 try {
+                    if (intent.retry) {
+                        if (!('retryPairs' in expectedEvidence.portable)) {
+                            throw operationReviewStale('确认信息缺少 Portable 重试目标。');
+                        }
+                        return await executePortableRetry({
+                            receipt: intent.retry.receipt,
+                            review: expectedEvidence.portable,
+                            expectedEvidenceDigest: expectedEvidence.portable.evidenceDigest,
+                            cwd: context.cwd,
+                            env: context.env,
+                            cliVersion: packageInfo.version,
+                            signal,
+                            onProgress(stage) {
+                                const phase = stage === 'prepare' ? '重新检查失败目标'
+                                    : stage === 'add' ? '重试缺失的 Skills' : '验证重试结果';
+                                progressFeed?.setCurrent({ target: 'Skills CLI', phase }, `Portable Skills：${phase}`);
+                            },
+                        });
+                    }
                     return await installPortableSkills({
                         selector: intent.pluginId,
                         scope: intent.scope,
@@ -2951,6 +3178,12 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     }
                     catch (error) {
                         const code = error instanceof TuiOperationBlockedError ? error.code : undefined;
+                        if (intent.kind === 'pluginWriteBatch'
+                            && (intent.selection.kind === 'currentProjectIntentRoots'
+                                || intent.selection.kind === 'currentProjectIntentTargets')
+                            && error instanceof TuiOperationBlockedError) {
+                            throw operationReviewStale('确认后完整项目 Intent 声明发生变化。');
+                        }
                         if (intent.kind === 'pluginWriteTask'
                             && (code === 'taskHasBlockedTargets' || code === 'taskNoExecutableTargets')) {
                             throw operationReviewStale('确认后任务可执行目标发生变化。', error instanceof TuiOperationBlockedError ? error.diagnostics : undefined);
@@ -2960,6 +3193,12 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     if (intent.kind === 'pluginWriteBatch') {
                         const expectedBatch = expectedEvidence;
                         const currentBatch = currentEvidence;
+                        if ((intent.selection.kind === 'currentProjectIntentRoots'
+                            || intent.selection.kind === 'currentProjectIntentTargets')
+                            && (!expectedBatch.projectIntentDigest
+                                || expectedBatch.projectIntentDigest !== currentBatch.projectIntentDigest)) {
+                            throw operationReviewStale('确认后完整项目 Intent 声明发生变化。');
+                        }
                         const reviewedGroups = expectedBatch.groups.map((group) => ({
                             groupId: group.groupId,
                             sourceId: group.sourceId,
@@ -3330,6 +3569,147 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         throwIfWriteReviewStale(result);
                         return result;
                     }
+                    if (intent.kind === 'configSaveBatch') {
+                        assertConfigSaveBatchIntent(intent);
+                        const reviewedBatch = expectedEvidence.configBatch;
+                        if (!reviewedBatch || !currentEvidence.configBatch || !currentEvidence.source) {
+                            throw operationReviewStale('确认信息缺少设置批次证据。');
+                        }
+                        const approvedApplyTargets = new Set(reviewedBatch.groups.flatMap((group) => group.config.affectedTargets.map((target) => `${target.platform}\0${target.scope}`)));
+                        const approvedPreApplyTargets = reviewedBatch.groups.flatMap((group) => group.config.preApplyAuthorization ?? []);
+                        const results = [];
+                        const packageInfo = await readCliPackageInfo();
+                        for (const group of intent.groups) {
+                            const groupIntent = configSaveBatchGroupIntent(intent, group);
+                            const reviewedGroup = reviewedBatch.groups.find((item) => item.scope === group.scope);
+                            if (!reviewedGroup) {
+                                throw operationReviewStale('确认信息缺少设置层基线。');
+                            }
+                            let configSaved = false;
+                            const operationRebuildResults = [];
+                            try {
+                                const freshEvidence = await captureEvidence(groupIntent, undefined, undefined, operationInventory, true);
+                                const freshSource = freshEvidence.source;
+                                const freshConfig = freshEvidence.config;
+                                if (!freshSource || !freshConfig) {
+                                    throw operationReviewStale('设置目标缺少最新证据。');
+                                }
+                                assertSourceEvidenceMatches(currentEvidence.source, freshSource);
+                                const freshLayerStoreDigest = await configLayerStoreDigest({
+                                    source: freshSource,
+                                    pluginName: parsePluginId(intent.pluginId).pluginName,
+                                    scope: group.scope,
+                                    cwd: context.cwd,
+                                    env: context.env,
+                                });
+                                if (freshLayerStoreDigest !== reviewedGroup.config.storeDigest) {
+                                    throw operationReviewStale('保存设置期间此设置层的原始内容发生变化。');
+                                }
+                                if (freshConfig.affectedTargets.some((target) => !approvedApplyTargets.has(`${target.platform}\0${target.scope}`))) {
+                                    throw operationReviewStale('同批前一层变更扩大了未经确认的应用目标。');
+                                }
+                                const groupCatalogOperation = catalogOperationByEvidence.get(freshEvidence);
+                                if (expectedEvidence.catalog.generationSetDigest
+                                    && groupCatalogOperation?.generationSetDigest
+                                        !== expectedEvidence.catalog.generationSetDigest) {
+                                    throw operationReviewStale('保存设置期间 Active Catalog generation 发生变化。');
+                                }
+                                const result = await withResolvedCatalogPlugin({
+                                    selector: intent.pluginId,
+                                    cliVersion: packageInfo.version,
+                                    env: context.env,
+                                    ...(groupCatalogOperation ? { operationContext: groupCatalogOperation } : {}),
+                                    consume: async ({ plugin, source }) => {
+                                        assertSourceEvidenceMatches(freshSource, sourceEvidenceForPlugin(source, plugin.manifest.name));
+                                        const applyTargets = intent.apply
+                                            ? freshConfig.affectedTargets.map((target) => ({
+                                                pluginName: plugin.manifest.name,
+                                                platform: target.platform,
+                                                scope: target.scope,
+                                            }))
+                                            : [];
+                                        return applyPluginConfigWrite({
+                                            plugin,
+                                            pluginName: plugin.manifest.name,
+                                            scope: group.scope,
+                                            cwd: context.cwd,
+                                            env: context.env,
+                                            nativeCliRunner: context.nativeCliRunner,
+                                            rebuildRuntime: {
+                                                ...context,
+                                                awHomeMutationToken,
+                                                operationDiagnosticSink: (entries) => {
+                                                    operationRebuildResults.push(...structuredClone(entries));
+                                                },
+                                                ...(reviewedScriptTimeoutMs(intent) === undefined ? {} : {
+                                                    scriptTimeoutMs: reviewedScriptTimeoutMs(intent),
+                                                }),
+                                                ...(groupCatalogOperation ? {
+                                                    catalogOperationContext: groupCatalogOperation,
+                                                    expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
+                                                } : {}),
+                                            },
+                                            awHomeMutationToken,
+                                            applyTargets,
+                                            request: { updates: group.updates, removeKeys: group.removeKeys },
+                                            sharedNativeApplyConfirmed: true,
+                                            preApplyConfirmed: true,
+                                            preApplyAuthorizedTargets: approvedPreApplyTargets,
+                                        });
+                                    },
+                                });
+                                configSaved = result.configWrite === 'succeeded';
+                                const applyStatus = !intent.apply
+                                    ? 'notRequested'
+                                    : result.apply.state === 'succeeded'
+                                        ? 'succeeded'
+                                        : result.apply.state === 'skipped'
+                                            ? 'notNeeded'
+                                            : 'failed';
+                                results.push({
+                                    scope: group.scope,
+                                    status: applyStatus === 'failed' ? 'failed' : 'succeeded',
+                                    configSaved,
+                                    applyRequested: intent.apply,
+                                    applyStatus,
+                                    execution: { ...result, operationRebuildResults },
+                                    ...(applyStatus === 'failed' ? {
+                                        errorCode: result.apply.state === 'unavailable'
+                                            ? result.apply.error?.code ?? result.apply.reason
+                                            : result.apply.targetResults.find((target) => target.errorCode)?.errorCode
+                                                ?? 'runtimeApplyFailed',
+                                    } : {}),
+                                });
+                            }
+                            catch (error) {
+                                configSaved = error?.configWrite === 'succeeded';
+                                const errorCode = typeof error === 'object' && error !== null
+                                    && 'code' in error && typeof error.code === 'string'
+                                    ? error.code
+                                    : configSaved ? 'runtimeApplyFailed' : 'configWriteFailed';
+                                results.push({
+                                    scope: group.scope,
+                                    status: 'failed',
+                                    configSaved,
+                                    applyRequested: intent.apply,
+                                    applyStatus: intent.apply ? 'failed' : 'notRequested',
+                                    errorCode,
+                                    ...(operationRebuildResults.length > 0
+                                        ? { execution: { operationRebuildResults } }
+                                        : {}),
+                                });
+                            }
+                        }
+                        const succeeded = results.filter((result) => result.status === 'succeeded').length;
+                        return {
+                            status: succeeded === results.length
+                                ? 'succeeded'
+                                : succeeded > 0 || results.some((result) => result.configSaved)
+                                    ? 'partial'
+                                    : 'failed',
+                            groups: results,
+                        };
+                    }
                     if (intent.kind === 'configSave' || intent.kind === 'configReset') {
                         const operationRebuildResults = [];
                         const operationDiagnosticSink = (results) => {