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

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

@@ -2,13 +2,19 @@ import crypto from 'node:crypto';
 import path from 'node:path';
 import { statusCommandV7, statusTargetIntent, } from '../commands/status-v6.js';
 import { addCatalogSourceCommand, listCatalogSources, preflightCatalogSourceMutation, removeCatalogSourceCommand, setPrimaryCatalogSourceCommand, updateCatalogSourceCommand, } from '../commands/catalog-source.js';
-import { cleanupWriteCommand, installWriteCommand, reinstallWriteCommand, syncWriteCommand, uninstallWriteCommand, } from '../commands/write-commands.js';
+import { cleanupWriteCommand, failedWriteCommandResult, installWriteCommand, mergeWriteCommandResults, reinstallWriteCommand, syncWriteCommand, uninstallWriteCommand, } from '../commands/write-commands.js';
+import { resolveSyncIntentSelection } from '../commands/sync-command.js';
+import { parseScriptTimeoutMs, SCRIPT_TIMEOUT_DEFAULT_MS, } from '../commands/options.js';
 import { readCliPackageInfo } from '../utils/local-marketplace.js';
+import { createCodexNativeObservationSession, } from '../utils/codex-native-observation.js';
 import { readCatalogSourcesConfigSnapshot, recoverInvalidCatalogSourcesConfig, } from '../utils/catalog-sources.js';
 import { withResolvedCatalogPlugin, withResolvedMultiSourceCatalog, formatPluginId, parsePluginId, } from '../utils/multi-source-catalog.js';
-import { coercePluginConfigUpdates, inspectPluginConfigResetTarget, readPluginConfigStore, resolveConfigRead, resolveEffectivePluginConfig, } from '../utils/plugin-config.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 { applyPluginConfigWrite, replayConfigRuntimeWrites, resetPluginConfigWithHelper, } from '../utils/plugin-config-write.js';
-import { offlineCleanupEvidenceFromInventory, } from '../commands/offline-cleanup-evidence.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, projectPlatformPlacement, } from './model.js';
@@ -113,12 +119,14 @@ export function configAffectedStatusTargets(targets, pluginId, configScope) {
         .localeCompare(`${right.platform}\0${right.scope}`, 'en'));
 }
 function configSharedNativeRenderTargets(plugin, changedKeys) {
-    const changed = new Set(changedKeys);
+    const changed = changedKeys ? new Set(changedKeys) : undefined;
     return (plugin.manifest.artifacts?.targets ?? []).flatMap((target) => target.platform === 'codex'
         && target.target === 'codex.skill'
         && target.delivery.mode === 'codex-native'
         && target.skillKey
-        && target.refreshKeys.some((key) => changed.has(key))
+        && (changed
+            ? target.refreshKeys.some((key) => changed.has(key))
+            : target.refreshKeys.length > 0)
         ? [{ id: target.id, skillKey: target.skillKey, refreshKeys: [...target.refreshKeys] }]
         : []);
 }
@@ -130,6 +138,7 @@ function sourceEvidenceForPlugin(source, pluginName) {
     return {
         sourceId: source.sourceId,
         sourceIdentity: source.sourceIdentity,
+        logicalIdentity: source.logicalIdentity,
         requestedRef: source.requestedRef,
         resolvedCommit: source.resolvedCommit,
         manifestDigest: source.manifestDigest,
@@ -140,9 +149,27 @@ function sourceEvidenceForPlugin(source, pluginName) {
         channel: source.manifest.channel,
     };
 }
+async function inspectConfigShareability(options) {
+    if (options.scope !== 'project')
+        return undefined;
+    const targetPath = resolvePluginConfigStorePath({
+        sourceId: options.sourceId,
+        pluginName: options.pluginName,
+        scope: 'project',
+        cwd: options.cwd,
+        env: options.env,
+    });
+    const visibility = await assertProjectSharedConfigPathVisible({
+        cwd: options.cwd,
+        targetPath,
+        env: options.env,
+    });
+    return visibility.state === 'unverified' ? 'unverified' : 'verified';
+}
 function assertSourceEvidenceMatches(expected, actual) {
     if (actual.sourceId !== expected.sourceId
         || actual.sourceIdentity !== expected.sourceIdentity
+        || actual.logicalIdentity !== expected.logicalIdentity
         || actual.resolvedCommit !== expected.resolvedCommit
         || actual.manifestDigest !== expected.manifestDigest
         || actual.snapshotDigest !== expected.snapshotDigest
@@ -150,10 +177,12 @@ function assertSourceEvidenceMatches(expected, actual) {
         throw operationReviewStale('确认后来源内容发生变化。');
     }
 }
-function throwIfWriteReviewStale(result) {
-    const stale = result.targetResults.find((target) => target.errorCode === 'operationReviewStale'
+function writeReviewIsStale(result) {
+    return result.targetResults.some((target) => target.errorCode === 'operationReviewStale'
         || target.errorCode === 'operationPlanStale');
-    if (stale) {
+}
+function throwIfWriteReviewStale(result) {
+    if (writeReviewIsStale(result)) {
         throw operationReviewStale('确认后实际写入计划发生变化。');
     }
 }
@@ -163,6 +192,122 @@ const SOURCE_PROGRESS_PHASES = {
 function pluginIntent(intent) {
     return 'pluginId' in intent;
 }
+function reviewedScriptTimeoutMs(intent) {
+    if ((intent.kind === 'pluginWrite' || intent.kind === 'pluginWriteBatch')
+        && (intent.action === 'install' || intent.action === 'refreshAndSync'
+            || intent.action === 'reinstall' || intent.action === 'sync')) {
+        return parseScriptTimeoutMs(intent.scriptTimeoutMs ?? SCRIPT_TIMEOUT_DEFAULT_MS);
+    }
+    if (intent.kind === 'configSave' && intent.apply) {
+        return parseScriptTimeoutMs(intent.scriptTimeoutMs ?? SCRIPT_TIMEOUT_DEFAULT_MS);
+    }
+    return undefined;
+}
+function selectedBatchGroups(intent) {
+    if (intent.selection.kind !== 'selected' && intent.selection.kind !== 'targets') {
+        throw new TuiOperationBlockedError('syncSelectionRequired', '当前项目全部同步必须从项目 intent roots 解析。');
+    }
+    const rawTargets = intent.selection.kind === 'targets'
+        ? intent.selection.targets
+        : intent.selection.pluginIds.map((pluginId) => ({
+            pluginId, platform: intent.platform, scope: intent.scope,
+        }));
+    const normalizedTargets = rawTargets.map((target) => {
+        if ((target.platform !== 'codex' && target.platform !== 'claude' && target.platform !== 'both')
+            || target.scope !== intent.scope
+            || (intent.selection.kind === 'targets' && target.platform === 'both')) {
+            throw new TuiOperationBlockedError('batchTargetInvalid', '批量精确目标必须使用共同 scope 和单个平台。');
+        }
+        const pluginId = target.pluginId;
+        const parsed = parsePluginId(pluginId);
+        if (!parsed.sourceId) {
+            throw new TuiOperationBlockedError('invalidPluginId', '批量操作必须使用 canonical pluginId。');
+        }
+        const canonicalPluginId = formatPluginId({ sourceId: parsed.sourceId, pluginName: parsed.pluginName });
+        if (intent.selection.kind === 'targets' && canonicalPluginId !== pluginId) {
+            throw new TuiOperationBlockedError('invalidPluginId', '批量精确目标必须使用 canonical pluginId。');
+        }
+        return {
+            pluginId: canonicalPluginId,
+            platform: target.platform,
+            scope: target.scope,
+        };
+    }).sort((left, right) => [left.pluginId, left.platform, left.scope].join('\0')
+        .localeCompare([right.pluginId, right.platform, right.scope].join('\0'), 'en'));
+    const uniqueTargets = [...new Map(normalizedTargets.map((target) => [
+            [target.pluginId, target.platform, target.scope].join('\0'), target,
+        ])).values()];
+    const requestedPluginIds = [...new Set(uniqueTargets.map((target) => target.pluginId))];
+    if (requestedPluginIds.length === 0) {
+        throw new TuiOperationBlockedError('syncSelectionRequired', '批量操作至少需要一个插件。');
+    }
+    const groups = new Map();
+    for (const target of uniqueTargets) {
+        const pluginId = target.pluginId;
+        const sourceId = parsePluginId(pluginId).sourceId;
+        const groupKey = [sourceId, target.platform, target.scope].join('\0');
+        const group = groups.get(groupKey) ?? {
+            groupId: groupKey,
+            sourceId,
+            platform: target.platform,
+            scope: target.scope,
+            requestedPluginIds: [],
+        };
+        group.requestedPluginIds.push(pluginId);
+        groups.set(groupKey, group);
+    }
+    return { requestedPluginIds, groups: [...groups.values()] };
+}
+async function resolveBatchGroups(intent, env, cwd, frozenRequestedPluginIds) {
+    if (intent.selection.kind === 'selected' || intent.selection.kind === 'targets') {
+        return selectedBatchGroups(intent);
+    }
+    if (intent.action !== 'sync' || intent.scope !== 'project') {
+        throw new TuiOperationBlockedError('syncSelectionRequired', '当前项目全部操作只支持 project scope sync。');
+    }
+    const state = await readPluginIntentState({ scope: 'project', cwd, env });
+    const selection = resolveSyncIntentSelection({
+        roots: state.roots,
+        selectors: frozenRequestedPluginIds ?? [],
+        all: frozenRequestedPluginIds === undefined,
+        platform: intent.platform,
+    });
+    if (selection.requestedPluginIds.length === 0) {
+        throw new TuiOperationBlockedError('syncSelectionRequired', '当前项目没有可同步的 intent roots。');
+    }
+    return {
+        requestedPluginIds: selection.requestedPluginIds,
+        groups: selection.groups.map((group) => ({
+            groupId: `${group.sourceId}\0${group.platform}\0${intent.scope}`,
+            sourceId: group.sourceId,
+            platform: group.platform,
+            scope: intent.scope,
+            requestedPluginIds: group.pluginIds,
+        })),
+    };
+}
+async function runBatchWriteGroup(options) {
+    const commandOptions = {
+        cwd: options.cwd,
+        platform: options.group.platform,
+        scope: options.group.scope,
+        ...(reviewedScriptTimeoutMs(options.intent) === undefined
+            ? {}
+            : { scriptTimeoutMs: reviewedScriptTimeoutMs(options.intent) }),
+    };
+    switch (options.intent.action) {
+        case 'install':
+            return installWriteCommand(options.group.requestedPluginIds, commandOptions, options.runtime);
+        case 'sync':
+            return syncWriteCommand(options.group.requestedPluginIds, commandOptions, options.runtime);
+        case 'reinstall':
+            return reinstallWriteCommand(options.group.requestedPluginIds, commandOptions, options.runtime);
+        case 'uninstall':
+            return uninstallWriteCommand(options.group.requestedPluginIds, commandOptions, options.runtime);
+        case 'cleanup':
+            return cleanupWriteCommand(options.group.requestedPluginIds, commandOptions, options.runtime);
+    }
+}
 async function loadDependencyOverviews(options) {
     const graph = await withResolvedMultiSourceCatalog({
         cliVersion: options.cliVersion,
@@ -437,6 +582,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         };
     };
     const catalogOperationByEvidence = new WeakMap();
+    const codexManagerByEvidence = new WeakMap();
     let sessionCatalogOperationContext;
     let sessionStatusResult;
     const sessionContextForPlugin = (pluginId) => {
@@ -450,6 +596,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         const stores = await Promise.all(scopes.map((scope) => readPluginConfigStore({
             sourceId: config.sourceId,
             sourceIdentity: config.sourceIdentity,
+            logicalIdentity: config.logicalIdentity,
             pluginName: config.pluginName,
             scope,
             cwd: context.cwd,
@@ -541,14 +688,38 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             signal.throwIfAborted();
             const catalogGenerations = await loadCatalogGenerations();
             signal.throwIfAborted();
+            const configStoreInventory = (await Promise.all(['user', 'project'].map(async (scope) => {
+                try {
+                    return (await listNamespacedPluginConfigStoreIdentities({
+                        cwd: context.cwd,
+                        env: context.env,
+                        scope,
+                    })).map(({ pluginId, sourceId, pluginName }) => ({
+                        pluginId, sourceId, pluginName, scope,
+                    }));
+                }
+                catch {
+                    await context.debugLogger.log({
+                        type: 'tui:config-inventory-error',
+                        level: 'debug',
+                        target: 'debugLog',
+                        message: 'TUI saved config inventory could not be read.',
+                        data: { scope },
+                    });
+                    return [];
+                }
+            }))).flat();
+            signal.throwIfAborted();
             const statusById = new Map(result.payload.catalog.sources.map((source) => [source.id, source]));
             return {
                 cliChannel: packageInfo.version.includes('-') ? 'beta' : 'latest',
+                configuredSources: structuredClone(configured.sources),
                 payload: result.payload,
                 pluginSummaries: result.pluginSummaries,
                 targetRevisions: result.targetRevisions,
                 dependencyOverviews,
                 portablePluginIds,
+                configStoreInventory,
                 catalogGenerations,
                 sessionGenerationKeys: Object.fromEntries((catalogOperationContext?.generationSet.sources ?? [])
                     .map((source) => [source.sourceId, source.storeKey])),
@@ -580,7 +751,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         throw new TuiOperationBlockedError('operationReviewStale', '状态读取期间来源配置持续变化。请重试。');
     };
-    const captureEvidence = async (intent, signal, preparation, operationInventory = createOperationInventoryReader(), freshCatalog = false, reusableCandidate) => {
+    const captureEvidence = async (intent, signal, preparation, operationInventory = createOperationInventoryReader(), freshCatalog = false, reusableCandidate, codexObservationSession, frozenBatchEvidence) => {
+        reviewedScriptTimeoutMs(intent);
         if (intent.kind === 'configReset') {
             const parsed = parsePluginId(intent.pluginId);
             if (!parsed.sourceId || !parsed.pluginName) {
@@ -684,12 +856,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     && (preview.identityChanged || sourceFingerprintChanged);
                 if (preview.identityChanged)
                     sourceIdentityChangeImpact = {
-                        impactSchemaVersion: 1,
+                        impactSchemaVersion: 3,
                         sourceId: preview.sourceId,
+                        primaryChange: preview.references.primaryChange,
                         inventoryComplete: preview.references.inventoryComplete,
                         references: preview.references.references,
                         affectedReferences: preview.references.references,
-                        changes: { added: [], removed: [], changed: [], newlyIncompatible: [], dependencyChanged: [] },
+                        changes: {
+                            added: [], removed: [], changed: [], newlyIncompatible: [],
+                            dependencyChanged: [], platformSupportChanged: [],
+                        },
                         errors: preview.references.errors,
                     };
                 if (!explicitSourceChange) {
@@ -828,7 +1004,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             if (intent.action !== 'replaceDamaged' && !explicitSourceChange && candidateRelation === 'rollbackDetected') {
                 throw new TuiOperationBlockedError('catalogRollbackDetected', '候选 Catalog 版本低于当前 Active。普通更新已阻止。');
             }
-            const impact = intent.action === 'repair' ? undefined
+            const impact = exactRepair ? undefined
                 : sourceIdentityChangeImpact ?? await inspectCatalogSourceImpact({
                     sourceId: intent.sourceId,
                     cwd: context.cwd,
@@ -837,6 +1013,29 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     mode: 'generation',
                     candidateManifest: probe.manifest,
                 });
+            const primaryPreview = intent.setPrimaryAfterActivation
+                ? await preflightCatalogSourceMutation({
+                    request: { action: 'setPrimary', sourceId: intent.sourceId },
+                    cwd: context.cwd,
+                    env: context.env,
+                })
+                : undefined;
+            if (primaryPreview && primaryPreview.configDigest !== config.digest) {
+                throw operationReviewStale('准备主来源切换期间来源配置发生变化。');
+            }
+            const primaryImpact = primaryPreview ? {
+                impactSchemaVersion: 3,
+                sourceId: primaryPreview.sourceId,
+                primaryChange: primaryPreview.references.primaryChange,
+                inventoryComplete: primaryPreview.references.inventoryComplete,
+                references: primaryPreview.references.references,
+                affectedReferences: primaryPreview.references.references,
+                changes: {
+                    added: [], removed: [], changed: [], newlyIncompatible: [],
+                    dependencyChanged: [], platformSupportChanged: [],
+                },
+                errors: primaryPreview.references.errors,
+            } : undefined;
             return {
                 catalog: {
                     configDigest: config.digest,
@@ -857,6 +1056,11 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         impactDigest: calculateCatalogSourceImpactDigest(impact),
                         impactMode: sourceIdentityChangeImpact ? 'identityChange' : 'generation',
                     } : {}),
+                    ...(primaryPreview && primaryImpact ? {
+                        primaryImpact,
+                        primaryImpactDigest: primaryPreview.impactDigest,
+                        primaryConfigDigest: primaryPreview.configDigest,
+                    } : {}),
                     configDigest: config.digest,
                     ...(proposedConfigDigest ? { proposedConfigDigest } : {}),
                     ...(proposedSource ? { proposedSource } : {}),
@@ -896,12 +1100,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     referenceCount: preview.references.references.length,
                     inventoryComplete: preview.references.inventoryComplete,
                     impact: {
-                        impactSchemaVersion: 1,
+                        impactSchemaVersion: 3,
                         sourceId: preview.sourceId,
+                        primaryChange: preview.references.primaryChange,
                         inventoryComplete: preview.references.inventoryComplete,
                         references: preview.references.references,
                         affectedReferences: preview.references.references,
-                        changes: { added: [], removed: [], changed: [], newlyIncompatible: [], dependencyChanged: [] },
+                        changes: {
+                            added: [], removed: [], changed: [], newlyIncompatible: [],
+                            dependencyChanged: [], platformSupportChanged: [],
+                        },
                         errors: preview.references.errors,
                     },
                 },
@@ -912,10 +1120,95 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             }
             return evidence;
         }
-        if (!pluginIntent(intent)) {
+        if (!pluginIntent(intent) && intent.kind !== 'pluginWriteBatch') {
             throw new TuiOperationBlockedError('operationNotImplemented', '这个写操作尚未接入新 Controller。');
         }
         signal?.throwIfAborted();
+        if (intent.kind === 'pluginWriteBatch') {
+            await preparation?.reporter.emit('status');
+            const selection = await resolveBatchGroups(intent, context.env, context.cwd, frozenBatchEvidence?.requestedPluginIds);
+            signal?.throwIfAborted();
+            const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
+            const groups = [];
+            const ownsObservationSession = !codexObservationSession
+                && selection.groups.some((group) => {
+                    const reviewed = frozenBatchEvidence?.groups.find((candidate) => candidate.groupId === group.groupId);
+                    return reviewed?.executable !== false
+                        && (group.platform === 'codex' || group.platform === 'both');
+                });
+            const observationSession = codexObservationSession ?? (ownsObservationSession
+                ? await createCodexNativeObservationSession({
+                    exactCwd: context.cwd,
+                    env: context.env,
+                    runner: context.nativeCliRunner,
+                })
+                : undefined);
+            try {
+                await preparation?.reporter.emit('catalog');
+                for (const group of selection.groups) {
+                    signal?.throwIfAborted();
+                    const reviewed = frozenBatchEvidence?.groups.find((candidate) => candidate.groupId === group.groupId);
+                    if (reviewed?.executable === false) {
+                        groups.push({ ...group, preview: reviewed.preview, executable: false });
+                        continue;
+                    }
+                    let catalogOperation;
+                    try {
+                        catalogOperation = !freshCatalog && sessionCatalogOperationContext
+                            ? selectCatalogOperationContext(sessionCatalogOperationContext, [group.sourceId])
+                            : await resolveCatalogOperationContext({
+                                sourceIds: [group.sourceId],
+                                env: context.env,
+                                ...(!freshCatalog ? { validatedStoreEntries, validatingStoreEntries } : {}),
+                                ...(signal ? { signal } : {}),
+                            });
+                    }
+                    catch {
+                        catalogOperation = undefined;
+                    }
+                    const preview = await runBatchWriteGroup({
+                        intent,
+                        group,
+                        cwd: context.cwd,
+                        runtime: {
+                            ...context,
+                            inventoryCatalogSourceReferences: operationInventory,
+                            expectedCatalogConfigDigest: configSnapshot.digest,
+                            ...(catalogOperation ? {
+                                catalogOperationContext: catalogOperation,
+                                expectedGenerationSetDigest: catalogOperation.generationSetDigest,
+                            } : {}),
+                            previewOperationPlan: true,
+                            ...(observationSession ? { codexObservationSession: observationSession } : {}),
+                            ...(preparation ? {
+                                onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
+                            } : {}),
+                        },
+                    });
+                    groups.push({ ...group, preview, executable: preview.operationPlan !== undefined });
+                }
+            }
+            finally {
+                if (ownsObservationSession)
+                    await observationSession?.dispose();
+            }
+            await preparation?.reporter.emit('evidence');
+            signal?.throwIfAborted();
+            const merged = mergeWriteCommandResults(groups.map((group) => group.preview));
+            const evidence = {
+                catalog: {
+                    configDigest: configSnapshot.digest,
+                    compositeDigest: sessionStatusResult?.payload.catalog.compositeDigest
+                        ?? digest(groups.map((group) => [group.groupId, group.preview.operationPlan?.planFingerprint])),
+                },
+                requestedPluginIds: selection.requestedPluginIds,
+                groups,
+                ...(merged.dependencyPlan ? { dependencyPlan: merged.dependencyPlan } : {}),
+                ...(merged.codexReconcilePlans ? { codexReconcilePlans: merged.codexReconcilePlans } : {}),
+                ...(merged.operationPlan ? { operationPlan: merged.operationPlan } : {}),
+            };
+            return evidence;
+        }
         const packageInfo = await readCliPackageInfo();
         const offlineCleanupReason = intent.kind === 'pluginWrite'
             && intent.action === 'cleanup'
@@ -1015,10 +1308,12 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         pluginName: plugin.manifest.name,
                         source: sourceEvidenceForPlugin(source, plugin.manifest.name),
                         sharedNativeRenderTargets: intent.kind === 'configSave'
-                            ? configSharedNativeRenderTargets(plugin, [
-                                ...Object.keys(intent.updates ?? {}),
-                                ...(intent.removeKeys ?? []),
-                            ])
+                            ? configSharedNativeRenderTargets(plugin, intent.retryApply
+                                ? undefined
+                                : [
+                                    ...Object.keys(intent.updates ?? {}),
+                                    ...(intent.removeKeys ?? []),
+                                ])
                             : [],
                     };
                 },
@@ -1028,6 +1323,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 ...(selected.source?.sourceIdentity
                     ? { sourceIdentity: selected.source.sourceIdentity }
                     : {}),
+                ...(selected.source?.logicalIdentity
+                    ? { logicalIdentity: selected.source.logicalIdentity }
+                    : {}),
                 pluginName: selected.pluginName,
                 scope: intent.scope,
                 cwd: context.cwd,
@@ -1099,6 +1397,7 @@ 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
@@ -1169,15 +1468,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         pluginName: plugin.manifest.name,
                         source: sourceEvidenceForPlugin(source, plugin.manifest.name),
                         sharedNativeRenderTargets: intent.kind === 'configSave'
-                            ? configSharedNativeRenderTargets(plugin, [
-                                ...Object.keys(intent.updates ?? {}),
-                                ...(intent.removeKeys ?? []),
-                            ])
+                            ? configSharedNativeRenderTargets(plugin, intent.retryApply
+                                ? undefined
+                                : [
+                                    ...Object.keys(intent.updates ?? {}),
+                                    ...(intent.removeKeys ?? []),
+                                ])
                             : [],
                     };
                 },
             });
         let codexManager;
+        let resolvedCodexManager;
         const hasDeclaredDependencies = (status.pluginSummaries.find((summary) => summary.pluginId === intent.pluginId)?.dependencyTotalCount ?? 0) > 0;
         if (intent.kind === 'pluginWrite') {
             const command = {
@@ -1192,6 +1494,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 cwd: context.cwd,
                 platform: intent.platform,
                 scope: intent.scope,
+                ...(reviewedScriptTimeoutMs(intent) === undefined
+                    ? {}
+                    : { scriptTimeoutMs: reviewedScriptTimeoutMs(intent) }),
                 ...(intent.action === 'install' && intent.dependencyScopeOverrides
                     ? { dependencyScopeOverrides: intent.dependencyScopeOverrides }
                     : {}),
@@ -1205,6 +1510,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     expectedGenerationSetDigest: catalogOperation.generationSetDigest,
                 } : {}),
                 previewOperationPlan: true,
+                ...(codexObservationSession ? { codexObservationSession } : {}),
                 ...(preparation ? {
                     onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
                 } : {}),
@@ -1212,6 +1518,17 @@ 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'
@@ -1234,6 +1551,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 throw new TuiOperationBlockedError(managerPreview.code, `${managerPreview.code}: ${message}`);
             }
             if (managerPreview) {
+                if (managerPreview.state === 'system' || managerPreview.state === 'cached') {
+                    resolvedCodexManager = managerPreview.manager;
+                }
                 codexManager = {
                     state: managerPreview.state,
                     packageName: MANAGED_CODEX_PACKAGE_NAME,
@@ -1263,6 +1583,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             },
             source: selected.source,
             ...(offlineCleanup ? { offlineCleanup } : {}),
+            ...(forceCleanupEvidence ? { offlineCleanup: forceCleanupEvidence } : {}),
             ...(dependencyPlan ? { dependencyPlan } : {}),
             ...(codexReconcilePlans ? { codexReconcilePlans } : {}),
             ...(operationPlan ? { operationPlan } : {}),
@@ -1273,6 +1594,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             const store = await readPluginConfigStore({
                 sourceId: selected.source.sourceId,
                 sourceIdentity: selected.source.sourceIdentity,
+                ...('logicalIdentity' in selected.source
+                    ? { logicalIdentity: selected.source.logicalIdentity }
+                    : {}),
                 pluginName: selected.pluginName,
                 scope: intent.scope,
                 cwd: context.cwd,
@@ -1286,6 +1610,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     : {}),
                 storeDigest: digest({ exists: store.exists, rawDigest: store.rawDigest }),
                 affectedTargets: evidenceTargets.map(({ platform, scope }) => ({ platform, scope })),
+                ...(intent.scope === 'project' ? {
+                    shareability: await inspectConfigShareability({
+                        sourceId: selected.source.sourceId,
+                        pluginName: selected.pluginName,
+                        scope: intent.scope,
+                        cwd: context.cwd,
+                        env: context.env,
+                    }),
+                } : {}),
                 ...('sharedNativeRenderTargets' in selected
                     && selected.sharedNativeRenderTargets.length > 0
                     ? { sharedNativeRenderTargets: selected.sharedNativeRenderTargets }
@@ -1294,6 +1627,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         if (catalogOperation)
             catalogOperationByEvidence.set(evidence, catalogOperation);
+        if (resolvedCodexManager)
+            codexManagerByEvidence.set(evidence, resolvedCodexManager);
         return evidence;
     };
     const dependencies = {
@@ -1501,6 +1836,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     const stores = await readConfigStoresForTui({
                         sourceId: plugin.sourceId,
                         sourceIdentity: plugin.sourceIdentity,
+                        logicalIdentity: plugin.catalogLogicalIdentity,
                         pluginName: plugin.manifest.name,
                         schema: plugin.manifest.config.fields,
                         scope: layer.scope,
@@ -1535,6 +1871,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     const effectiveRaw = await resolveEffectivePluginConfig({
                         sourceId: plugin.sourceId,
                         sourceIdentity: plugin.sourceIdentity,
+                        logicalIdentity: plugin.catalogLogicalIdentity,
                         pluginName: plugin.manifest.name,
                         manifest: plugin.manifest,
                         targetScope: layer.scope === 'user' ? 'user' : 'project',
@@ -1569,9 +1906,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 throw new TuiOperationBlockedError('invalidPluginId', '设置目标必须使用 canonical pluginId。');
             }
             let sourceIdentity;
+            let logicalIdentity;
             try {
                 const packageInfo = await readCliPackageInfo();
-                sourceIdentity = await withResolvedCatalogPlugin({
+                const source = await withResolvedCatalogPlugin({
                     selector: pluginId,
                     cliVersion: packageInfo.version,
                     env: context.env,
@@ -1579,11 +1917,17 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     ...(sessionContextForPlugin(pluginId)
                         ? { operationContext: sessionContextForPlugin(pluginId) }
                         : {}),
-                    consume: async ({ source }) => source.sourceIdentity,
+                    consume: async ({ source }) => ({
+                        sourceIdentity: source.sourceIdentity,
+                        logicalIdentity: source.logicalIdentity,
+                    }),
                 });
+                sourceIdentity = source.sourceIdentity;
+                logicalIdentity = source.logicalIdentity;
             }
             catch {
                 sourceIdentity = undefined;
+                logicalIdentity = undefined;
             }
             signal.throwIfAborted();
             const target = await inspectPluginConfigResetTarget({
@@ -1598,6 +1942,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 const store = await readPluginConfigStore({
                     sourceId: parsed.sourceId,
                     ...(sourceIdentity ? { sourceIdentity } : {}),
+                    ...(logicalIdentity ? { logicalIdentity } : {}),
                     pluginName: parsed.pluginName,
                     scope: layer.scope,
                     cwd: context.cwd,
@@ -1645,13 +1990,21 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         expectedConfigDigest: expected.configDigest,
                     };
                     if (intent.sourceMutation.action === 'add') {
-                        await addCatalogSourceCommand({ ...common, source: intent.sourceMutation.source });
+                        await addCatalogSourceCommand({
+                            ...common,
+                            source: intent.sourceMutation.source,
+                            expectedProposedConfigDigest: expected.proposedConfigDigest,
+                            expectedImpactDigest: expected.impactDigest,
+                            requireImpactConfirmation: true,
+                            confirmImpact: true,
+                        });
                     }
                     else {
                         await updateCatalogSourceCommand({
                             ...common,
                             sourceId: intent.sourceId,
                             update: intent.sourceMutation.update,
+                            expectedProposedConfigDigest: expected.proposedConfigDigest,
                             expectedImpactDigest: expected.impactDigest,
                             requireIdentityChangeConfirmation: true,
                             confirmIdentityChange: true,
@@ -1751,6 +2104,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 sourceId: intent.sourceId,
                                 cwd: context.cwd,
                                 env: context.env,
+                                expectedConfigDigest: expected.primaryConfigDigest,
+                                expectedImpactDigest: expected.primaryImpactDigest,
+                                requireImpactConfirmation: true,
+                                confirmImpact: true,
                             });
                             primaryChanged = true;
                         }
@@ -1761,7 +2118,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 configSaved,
                                 generation,
                                 activeAvailable: true,
-                                errorCode: error instanceof Error ? error.name : 'catalogSourcePrimaryFailed',
+                                errorCode: typeof error === 'object' && error !== null
+                                    && 'code' in error && typeof error.code === 'string'
+                                    ? error.code
+                                    : error instanceof Error ? error.name : 'catalogSourcePrimaryFailed',
                             };
                         }
                     }
@@ -1827,11 +2187,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     cwd: context.cwd,
                     env: context.env,
                     expectedConfigDigest: expectedEvidence.sourceWrite?.configDigest,
+                    expectedProposedConfigDigest: expectedEvidence.sourceWrite?.proposedConfigDigest,
                     expectedImpactDigest: expectedEvidence.sourceWrite?.impactDigest,
                     runtime,
                 };
                 if (intent.action === 'add' && intent.source) {
-                    return addCatalogSourceCommand({ ...common, source: intent.source, cliVersion: packageInfo.version });
+                    return addCatalogSourceCommand({
+                        ...common,
+                        source: intent.source,
+                        cliVersion: packageInfo.version,
+                        requireImpactConfirmation: true,
+                        confirmImpact: true,
+                    });
                 }
                 if (intent.action === 'update' && intent.update) {
                     return updateCatalogSourceCommand({
@@ -1844,7 +2211,12 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     });
                 }
                 if (intent.action === 'setPrimary') {
-                    return setPrimaryCatalogSourceCommand({ ...common, sourceId: intent.sourceId });
+                    return setPrimaryCatalogSourceCommand({
+                        ...common,
+                        sourceId: intent.sourceId,
+                        requireImpactConfirmation: true,
+                        confirmImpact: true,
+                    });
                 }
                 if (intent.action === 'remove') {
                     return removeCatalogSourceCommand({
@@ -1856,12 +2228,164 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 }
                 throw new TuiOperationBlockedError('invalidSourceMutation', '来源操作缺少候选输入。');
             }
+            const codexObservationSession = intent.kind === 'pluginWrite'
+                || intent.kind === 'pluginWriteBatch'
+                ? await createCodexNativeObservationSession({
+                    exactCwd: context.cwd,
+                    env: context.env,
+                    runner: context.nativeCliRunner,
+                    manager: codexManagerByEvidence.get(expectedEvidence),
+                })
+                : undefined;
             return withAwHomeMutationLock({
                 env: context.env,
                 action: async (awHomeMutationToken) => {
                     await tuiControllerRuntimeTestHooks?.beforeMutationEvidenceCapture?.();
                     const operationInventory = createOperationInventoryReader();
-                    const currentEvidence = await captureEvidence(intent, undefined, undefined, operationInventory, true);
+                    const currentEvidence = await captureEvidence(intent, undefined, undefined, operationInventory, true, undefined, codexObservationSession, intent.kind === 'pluginWriteBatch'
+                        ? expectedEvidence
+                        : undefined);
+                    if (intent.kind === 'pluginWriteBatch') {
+                        const expectedBatch = expectedEvidence;
+                        const currentBatch = currentEvidence;
+                        const reviewedGroups = expectedBatch.groups.map((group) => ({
+                            groupId: group.groupId,
+                            sourceId: group.sourceId,
+                            platform: group.platform,
+                            scope: group.scope,
+                            requestedPluginIds: group.requestedPluginIds,
+                            executable: group.executable,
+                            planFingerprint: group.preview.operationPlan
+                                ? createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
+                                : undefined,
+                        }));
+                        const currentGroups = currentBatch.groups.map((group) => ({
+                            groupId: group.groupId,
+                            sourceId: group.sourceId,
+                            platform: group.platform,
+                            scope: group.scope,
+                            requestedPluginIds: group.requestedPluginIds,
+                            executable: expectedBatch.groups.find((reviewed) => reviewed.groupId === group.groupId)
+                                ?.executable === false ? false : group.executable,
+                            planFingerprint: expectedBatch.groups.find((reviewed) => reviewed.groupId === group.groupId)
+                                ?.executable === false
+                                ? undefined
+                                : group.preview.operationPlan
+                                    ? createBatchIntentCompatiblePlanFingerprint(group.preview.operationPlan)
+                                    : undefined,
+                        }));
+                        if (expectedBatch.catalog.configDigest !== currentBatch.catalog.configDigest
+                            || JSON.stringify(expectedBatch.requestedPluginIds)
+                                !== JSON.stringify(currentBatch.requestedPluginIds)
+                            || JSON.stringify(reviewedGroups) !== JSON.stringify(currentGroups)) {
+                            throw operationReviewStale('确认后批量目标或写入计划发生变化。');
+                        }
+                        await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
+                        const groupResults = [];
+                        const completedTargetKeys = new Set();
+                        let executedGroupCount = 0;
+                        const appendStoppedGroups = (startIndex, staleMessage) => {
+                            for (const [offset, stopped] of expectedBatch.groups.slice(startIndex).entries()) {
+                                groupResults.push({
+                                    groupId: stopped.groupId,
+                                    sourceId: stopped.sourceId,
+                                    platform: stopped.platform,
+                                    scope: stopped.scope,
+                                    requestedPluginIds: stopped.requestedPluginIds,
+                                    result: !stopped.executable ? stopped.preview : failedWriteCommandResult(intent.action, stopped.requestedPluginIds, { cwd: context.cwd, platform: stopped.platform, scope: stopped.scope }, offset === 0
+                                        ? new TuiOperationBlockedError('operationReviewStale', staleMessage)
+                                        : new TuiOperationBlockedError('batchNotStarted', '前一个批量组的写入计划已变化，因此这个组没有开始。')),
+                                });
+                            }
+                        };
+                        for (const [groupIndex, reviewed] of expectedBatch.groups.entries()) {
+                            const current = currentBatch.groups.find((group) => group.groupId === reviewed.groupId);
+                            if (!reviewed.executable) {
+                                groupResults.push({
+                                    groupId: reviewed.groupId,
+                                    sourceId: reviewed.sourceId,
+                                    platform: reviewed.platform,
+                                    scope: reviewed.scope,
+                                    requestedPluginIds: reviewed.requestedPluginIds,
+                                    result: reviewed.preview,
+                                });
+                                continue;
+                            }
+                            const groupInventory = groupResults.length === 0
+                                ? operationInventory
+                                : createOperationInventoryReader();
+                            let executionPreview = current.preview;
+                            if (completedTargetKeys.size > 0) {
+                                executionPreview = await runBatchWriteGroup({
+                                    intent,
+                                    group: current,
+                                    cwd: context.cwd,
+                                    runtime: {
+                                        ...context,
+                                        awHomeMutationToken,
+                                        inventoryCatalogSourceReferences: groupInventory,
+                                        expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                        previewOperationPlan: true,
+                                        ...(codexObservationSession ? { codexObservationSession } : {}),
+                                    },
+                                });
+                                if (!reviewed.preview.operationPlan || !executionPreview.operationPlan
+                                    || createBatchIntentCompatiblePlanFingerprint(reviewed.preview.operationPlan, completedTargetKeys) !== createBatchIntentCompatiblePlanFingerprint(executionPreview.operationPlan, completedTargetKeys)) {
+                                    appendStoppedGroups(groupIndex, '前序批量结果改变了这个组的实际写入计划。');
+                                    break;
+                                }
+                            }
+                            const requiresManagedCodex = reviewed.preview.codexManagerPreview?.state === 'requires-install';
+                            const result = await runBatchWriteGroup({
+                                intent,
+                                group: current,
+                                cwd: context.cwd,
+                                runtime: {
+                                    ...context,
+                                    awHomeMutationToken,
+                                    inventoryCatalogSourceReferences: groupInventory,
+                                    expectedCatalogConfigDigest: expectedBatch.catalog.configDigest,
+                                    ...(executionPreview.operationPlan ? {
+                                        expectedPlanFingerprint: executionPreview.operationPlan.planFingerprint,
+                                    } : {}),
+                                    ...(requiresManagedCodex ? {
+                                        managedCodexAuthorizer: async () => true,
+                                    } : {}),
+                                    ...(codexObservationSession ? { codexObservationSession } : {}),
+                                },
+                            });
+                            if (writeReviewIsStale(result)) {
+                                if (executedGroupCount === 0)
+                                    throwIfWriteReviewStale(result);
+                                appendStoppedGroups(groupIndex, '这个组的实际写入计划发生变化。');
+                                break;
+                            }
+                            executedGroupCount += 1;
+                            for (const target of result.targetResults) {
+                                if (target.state === 'completed') {
+                                    completedTargetKeys.add([
+                                        target.target.pluginId,
+                                        target.target.platform,
+                                        target.target.scope,
+                                    ].join('\0'));
+                                }
+                            }
+                            groupResults.push({
+                                groupId: reviewed.groupId,
+                                sourceId: reviewed.sourceId,
+                                platform: reviewed.platform,
+                                scope: reviewed.scope,
+                                requestedPluginIds: reviewed.requestedPluginIds,
+                                result,
+                            });
+                        }
+                        const merged = mergeWriteCommandResults(groupResults.map((group) => group.result));
+                        return {
+                            ...merged,
+                            requestedPluginIds: expectedBatch.requestedPluginIds,
+                            groupResults,
+                        };
+                    }
                     if (intent.kind !== 'pluginWrite'
                         && !operationEvidenceMatches(expectedEvidence, currentEvidence)) {
                         throw new TuiOperationBlockedError('operationReviewStale', '确认后状态发生变化。');
@@ -1877,6 +2401,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             cwd: context.cwd,
                             platform: intent.platform,
                             scope: intent.scope,
+                            ...(reviewedScriptTimeoutMs(intent) === undefined
+                                ? {}
+                                : { scriptTimeoutMs: reviewedScriptTimeoutMs(intent) }),
                             ...(intent.action === 'install' && intent.dependencyScopeOverrides
                                 ? { dependencyScopeOverrides: intent.dependencyScopeOverrides }
                                 : {}),
@@ -1895,11 +2422,19 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         }[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 (!offlineCleanup && (!expectedEvidence.source || !currentSource)) {
                             throw new TuiOperationBlockedError('operationReviewStale', '确认信息缺少来源身份。');
                         }
                         const result = await command([intent.pluginId], options, {
                             ...context,
+                            ...(codexObservationSession ? { codexObservationSession } : {}),
                             awHomeMutationToken,
                             inventoryCatalogSourceReferences: operationInventory,
                             ...(expectedEvidence.operationPlan
@@ -1913,14 +2448,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(expectedEvidence.codexManager?.state === 'requires-install'
                                 ? { managedCodexAuthorizer: async () => true }
                                 : {}),
-                            ...(offlineCleanup
-                                ? { expectedOfflineCleanupEvidence: offlineCleanup }
+                            ...(reviewedOfflineCleanup
+                                ? { expectedOfflineCleanupEvidence: reviewedOfflineCleanup }
                                 : { reviewPreflight: (actual) => assertSourceEvidenceMatches(currentSource, actual) }),
                         });
                         throwIfWriteReviewStale(result);
                         return result;
                     }
                     if (intent.kind === 'configSave' || intent.kind === 'configReset') {
+                        const operationRebuildResults = [];
+                        const operationDiagnosticSink = (results) => {
+                            operationRebuildResults.push(...structuredClone(results));
+                        };
                         const currentSource = currentEvidence.source;
                         if (intent.kind === 'configReset') {
                             const parsed = parsePluginId(intent.pluginId);
@@ -1937,6 +2476,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                 rebuildRuntime: { ...context, awHomeMutationToken },
                                 awHomeMutationToken,
                                 apply: false,
+                                sharedNativeApplyConfirmed: false,
                             });
                         }
                         if (!currentSource) {
@@ -1967,6 +2507,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         rebuildRuntime: {
                                             ...context,
                                             awHomeMutationToken,
+                                            operationDiagnosticSink,
+                                            ...(reviewedScriptTimeoutMs(intent) === undefined
+                                                ? {}
+                                                : { scriptTimeoutMs: reviewedScriptTimeoutMs(intent) }),
                                             ...(catalogOperation ? {
                                                 catalogOperationContext: catalogOperation,
                                                 expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
@@ -1974,6 +2518,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         },
                                         awHomeMutationToken,
                                         applyTargets,
+                                        sharedNativeApplyConfirmed: true,
                                     })
                                     : await applyPluginConfigWrite({
                                         plugin,
@@ -1985,6 +2530,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         rebuildRuntime: {
                                             ...context,
                                             awHomeMutationToken,
+                                            operationDiagnosticSink,
+                                            ...(reviewedScriptTimeoutMs(intent) === undefined
+                                                ? {}
+                                                : { scriptTimeoutMs: reviewedScriptTimeoutMs(intent) }),
                                             ...(catalogOperation ? {
                                                 catalogOperationContext: catalogOperation,
                                                 expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
@@ -1993,13 +2542,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         awHomeMutationToken,
                                         applyTargets,
                                         request: { updates: intent.updates, removeKeys: intent.removeKeys },
+                                        sharedNativeApplyConfirmed: true,
                                     });
-                                return result;
+                                return { ...result, operationRebuildResults };
                             },
                         });
                     }
                     throw new TuiOperationBlockedError('operationNotImplemented', '这个写操作尚未接入新 Controller。');
                 },
+            }).finally(async () => {
+                await codexObservationSession?.dispose();
             });
         },
     };