@lesliechan721/aw 0.1.0-beta.7 → 0.1.0-beta.8

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

@@ -1,34 +1,52 @@
 import crypto from 'node:crypto';
-import { statusCommandV4, } from '../commands/status-v4.js';
+import path from 'node:path';
+import { statusCommandV5, } from '../commands/status-v5.js';
 import { addCatalogSourceCommand, listCatalogSources, preflightCatalogSourceMutation, removeCatalogSourceCommand, setPrimaryCatalogSourceCommand, updateCatalogSourceCommand, } from '../commands/catalog-source.js';
 import { cleanupWriteCommand, installWriteCommand, reinstallWriteCommand, uninstallWriteCommand, upgradeWriteCommand, } from '../commands/write-commands.js';
 import { readCliPackageInfo } from '../utils/local-marketplace.js';
+import { CatalogGenerationError } from '../utils/catalog-generation-error.js';
 import { readCatalogSourcesConfigSnapshot, } from '../utils/catalog-sources.js';
 import { withResolvedCatalogPlugin, withResolvedMultiSourceCatalog, formatPluginId, parsePluginId, } from '../utils/multi-source-catalog.js';
 import { coercePluginConfigUpdates, readNamespacedPluginConfigStoreIdentity, readPluginConfigStore, resolveConfigRead, } from '../utils/plugin-config.js';
 import { applyPluginConfigWrite, resetPluginConfigWithHelper, } from '../utils/plugin-config-write.js';
+import { offlineCleanupEvidenceFromInventory, } from '../commands/offline-cleanup-evidence.js';
+import { inventoryCatalogSourceReferences } from '../utils/catalog-source-references.js';
 import { operationEvidenceFingerprint, TuiController, TuiOperationBlockedError, } from './controller.js';
 import { buildConfigGroups, buildConfigPage, projectPlatformPlacement, } from './model.js';
 import { projectCatalogSourceLocation } from '../utils/catalog-source-presentation.js';
-import { targetCanBeUninstalled } from '../utils/target-eligibility.js';
+import { targetCanBeUninstalled, targetHasArtifactCollision, } from '../utils/target-eligibility.js';
 import { calculateCatalogSourceIdentity } from '../utils/catalog-source-identity.js';
-import { resolvePluginsFromCatalog } from '../utils/manifest.js';
+import { checkAwCapabilitySupport, readPluginManifest } from '../utils/manifest.js';
 import { withAwHomeMutationLock } from '../utils/aw-home-mutation-lock.js';
+import { IMPLEMENTED_AW_CAPABILITIES } from '../commands/aw-capabilities.js';
+import { resolveCatalogOperationContext, resolvePartialCatalogOperationContext, selectCatalogOperationContext, } from '../utils/catalog-operation-context.js';
+import { activateCatalogSourceCandidate, refreshCatalogSourceGeneration, setCatalogSourceRefreshPolicy, } from '../utils/catalog-generation-service.js';
+import { loadCatalogGenerationViewModels } from './catalog-generation.js';
 import { installPortableSkills, preparePortableInstall, PortableCommandError, } from '../portable/commands.js';
+import { MANAGED_CODEX_PACKAGE_NAME, MANAGED_CODEX_VERSION, } from '../utils/codex-manager.js';
 async function loadPortablePluginIds(options) {
     return withResolvedMultiSourceCatalog({
         cliVersion: options.cliVersion,
         freshnessPolicy: 'cacheFirst',
         env: options.context.env,
         signal: options.signal,
+        ...(options.catalogOperationContext
+            ? { operationContext: options.catalogOperationContext }
+            : {}),
+        ...(options.bootstrapMissingActive === false ? { bootstrapMissingActive: false } : {}),
         consume: async (catalog) => (await Promise.all(catalog.sources.flatMap((item) => item.resolution
-            ? [resolvePluginsFromCatalog(item.resolution.rootDir, undefined).then((plugins) => plugins
-                    .filter((plugin) => plugin.manifest.distributions?.agentSkills)
-                    .map((plugin) => formatPluginId({
-                    sourceId: item.resolution.sourceId,
-                    pluginName: plugin.manifest.name,
-                })))]
-            : []))).flat(),
+            ? item.resolution.manifest.entries.flatMap((entry) => {
+                const support = checkAwCapabilitySupport(entry.requires.aw.capabilities ?? [], IMPLEMENTED_AW_CAPABILITIES);
+                return support.supported
+                    ? [readPluginManifest(path.join(item.resolution.rootDir, 'plugins', entry.name), { mode: 'bundle' }).then((plugin) => plugin.manifest.distributions?.agentSkills
+                            ? formatPluginId({
+                                sourceId: item.resolution.sourceId,
+                                pluginName: entry.name,
+                            })
+                            : null)]
+                    : [];
+            })
+            : []))).filter((pluginId) => pluginId !== null),
     });
 }
 let tuiControllerRuntimeTestHooks;
@@ -60,6 +78,13 @@ export function statusTargetFingerprint(targets, revisions = []) {
             .localeCompare([right.pluginId, right.platform, right.scope].join('\0'), 'en')),
     });
 }
+export function configAffectedStatusTargets(targets, pluginId, configScope) {
+    return targets.filter((target) => target.pluginId === pluginId
+        && (configScope === 'user' || target.scope === 'project')
+        && (target.state === 'present' || target.state === 'partial'))
+        .sort((left, right) => `${left.platform}\0${left.scope}`
+        .localeCompare(`${right.platform}\0${right.scope}`, 'en'));
+}
 function operationReviewStale(message) {
     return new TuiOperationBlockedError('operationReviewStale', `operationReviewStale: ${message}`);
 }
@@ -73,6 +98,8 @@ function sourceEvidenceForPlugin(source, pluginName) {
         manifestDigest: source.manifestDigest,
         snapshotDigest: source.snapshotDigest,
         contentDigest: entry.contentDigest,
+        catalogVersion: source.manifest.catalogVersion,
+        channel: source.manifest.channel,
     };
 }
 function assertSourceEvidenceMatches(expected, actual) {
@@ -115,6 +142,9 @@ function assertIntentIsLegal(intent, targets, revisions = []) {
         if (intent.action === 'install' && otherScopeInstalled) {
             throw new TuiOperationBlockedError('scopeConflict', '这个平台已安装在另一个使用位置。请先移除原位置。');
         }
+        if (intent.action === 'install' && targetHasArtifactCollision(selected)) {
+            throw new TuiOperationBlockedError('artifactCollision', '所选位置存在输出冲突。请先移除或迁移冲突内容。');
+        }
         if (intent.action === 'install' && selected.state !== 'absent') {
             throw new TuiOperationBlockedError('targetAlreadyInstalled', '所选位置已经安装。');
         }
@@ -169,6 +199,13 @@ async function assertTypedIssueOrigin(intent, targets) {
         }
         return;
     }
+    else if (intent.originIssue.category === 'sourceMissing') {
+        if (intent.originIssue.actionId !== 'cleanup' || intent.action !== 'cleanup'
+            || !selected || !selected.errors.some((error) => error.code === 'sourceMissing')) {
+            stale('原来源缺失问题已变化。');
+        }
+        return;
+    }
     else if (intent.originIssue.category === 'scopeConflict') {
         const installedScopes = new Set(targets.filter((target) => target.pluginId === intent.pluginId
             && target.platform === intent.platform
@@ -205,22 +242,28 @@ async function loadDependencyOverviews(options) {
         freshnessPolicy: 'cacheFirst',
         env: options.context.env,
         signal: options.signal,
+        ...(options.catalogOperationContext
+            ? { operationContext: options.catalogOperationContext }
+            : {}),
+        ...(options.bootstrapMissingActive === false ? { bootstrapMissingActive: false } : {}),
         consume: async (catalog) => ({
-            nodes: (await Promise.all(catalog.sources.flatMap((item) => item.resolution
-                ? [resolvePluginsFromCatalog(item.resolution.rootDir, undefined).then((plugins) => plugins.map((plugin) => ({
-                        pluginId: formatPluginId({
-                            sourceId: item.resolution.sourceId,
-                            pluginName: plugin.manifest.name,
-                        }),
-                        displayName: plugin.manifest.interface?.displayName ?? plugin.manifest.name,
-                        dependencies: (plugin.manifest.dependencies ?? []).map((pluginName) => formatPluginId({ sourceId: item.resolution.sourceId, pluginName })),
-                    })))] : []))).flat(),
+            nodes: catalog.sources.flatMap((item) => item.resolution
+                ? item.resolution.manifest.entries.map((entry) => ({
+                    pluginId: formatPluginId({
+                        sourceId: item.resolution.sourceId,
+                        pluginName: entry.name,
+                    }),
+                    displayName: entry.interface?.displayName ?? entry.name,
+                    dependencies: entry.dependencies.map((pluginName) => formatPluginId({ sourceId: item.resolution.sourceId, pluginName })),
+                }))
+                : []),
             sourceErrors: catalog.sources.flatMap((item) => item.error
                 ? [{ sourceId: item.sourceId, code: 'dependencyGraphInvalid' }]
                 : []),
         }),
     });
     const nodes = new Map(graph.nodes.map((node) => [node.pluginId, node]));
+    const summaryById = new Map(options.status.pluginSummaries.map((summary) => [summary.pluginId, summary]));
     const displayName = (pluginId) => nodes.get(pluginId)?.displayName
         ?? parsePluginId(pluginId).pluginName;
     const reverse = new Map();
@@ -233,6 +276,9 @@ async function loadDependencyOverviews(options) {
     for (const target of options.status.payload.targets) {
         targetsByPlugin.set(target.pluginId, [...(targetsByPlugin.get(target.pluginId) ?? []), target]);
     }
+    const unsupportedPluginIds = new Set(options.status.pluginSummaries
+        .filter((summary) => (summary.missingCapabilities?.length ?? 0) > 0)
+        .map((summary) => summary.pluginId));
     const placementReferences = new Map();
     for (const consumer of options.status.payload.targets.filter((target) => target.state !== 'absent')) {
         const consumerNode = nodes.get(consumer.pluginId);
@@ -279,7 +325,8 @@ async function loadDependencyOverviews(options) {
     };
     const aggregateFor = (pluginId, placements) => {
         const sourceId = parsePluginId(pluginId).sourceId;
-        if (graph.sourceErrors.some((error) => error.sourceId === sourceId))
+        if (graph.sourceErrors.some((error) => error.sourceId === sourceId)
+            || unsupportedPluginIds.has(pluginId))
             return 'unavailable';
         if (placements.length === 0 || placements.every((placement) => placement.state === 'notInstalled')) {
             return 'notInstalled';
@@ -359,6 +406,13 @@ async function loadDependencyOverviews(options) {
             title: '依赖关系需要处理',
             explanation: '当前目标的依赖证据不能安全通过检查。',
         })));
+        const consumerTargets = summaryById.get(pluginId)?.supportedTargets;
+        const unsupportedDependency = dependencyItems.find((dependency) => {
+            const dependencyTargets = summaryById.get(dependency.pluginId)?.supportedTargets;
+            if (!consumerTargets || !dependencyTargets)
+                return true;
+            return ['codex', 'claude'].some((platform) => consumerTargets[platform].length > 0 && dependencyTargets[platform].length === 0);
+        });
         const sourceId = parsePluginId(pluginId).sourceId;
         const blockers = [
             ...graph.sourceErrors.filter((error) => error.sourceId === sourceId).map((error) => ({
@@ -371,6 +425,11 @@ async function loadDependencyOverviews(options) {
                     title: '依赖关系无效',
                     explanation: '依赖关系形成环。',
                 }] : []),
+            ...(unsupportedDependency ? [{
+                    code: 'dependencyTargetUnsupported',
+                    title: '依赖目标不兼容',
+                    explanation: `${unsupportedDependency.displayName} 不支持根插件所需的平台。`,
+                }] : []),
             ...targetBlockers,
         ];
         const directCount = dependencyItems.filter((item) => item.relation === 'direct').length;
@@ -418,40 +477,85 @@ function createReviewStageReporter(options) {
     };
 }
 export function createTuiControllerDependencies(context, progressFeed, options = {}) {
+    const readInventory = options.inventoryCatalogSourceReferences
+        ?? inventoryCatalogSourceReferences;
+    const createOperationInventoryReader = () => {
+        let ordinaryInventory;
+        return (inventoryOptions) => {
+            if (inventoryOptions.includeHistoricalProjects === true) {
+                return readInventory(inventoryOptions);
+            }
+            ordinaryInventory ??= readInventory(inventoryOptions);
+            return ordinaryInventory;
+        };
+    };
+    const catalogOperationByEvidence = new WeakMap();
+    let sessionCatalogOperationContext;
+    let sessionStatusResult;
+    let bootstrapNextCatalogSession = true;
+    const sessionContextForPlugin = (pluginId) => {
+        const sourceId = parsePluginId(pluginId).sourceId;
+        if (!sourceId || !sessionCatalogOperationContext)
+            return undefined;
+        return selectCatalogOperationContext(sessionCatalogOperationContext, [sourceId]);
+    };
     const loadStatus = async (signal) => {
         signal.throwIfAborted();
         const packageInfo = await readCliPackageInfo();
+        const catalogOperationContext = sessionCatalogOperationContext
+            ?? await resolvePartialCatalogOperationContext({
+                cliVersion: packageInfo.version,
+                env: context.env,
+                signal,
+                ...(bootstrapNextCatalogSession ? {} : { bootstrapMissingActive: false }),
+                ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+            }).catch(() => undefined);
+        if (catalogOperationContext)
+            sessionCatalogOperationContext = catalogOperationContext;
         for (let attempt = 0; attempt < 3; attempt += 1) {
-            const result = await statusCommandV4({
+            const result = await statusCommandV5({
                 cwd: context.cwd,
                 env: context.env,
                 cliVersion: packageInfo.version,
                 verbose: context.diagnostics.verbose,
+                ...(catalogOperationContext ? { catalogOperationContext } : {}),
+                ...(!catalogOperationContext ? { bootstrapMissingActive: false } : {}),
+                ...(options.catalogGenerationRuntime ? { catalogGenerationRuntime: options.catalogGenerationRuntime } : {}),
+                inventoryCatalogSourceReferences: readInventory,
             });
             signal.throwIfAborted();
             const configured = await listCatalogSources({ env: context.env });
             signal.throwIfAborted();
             if (result.payload.catalog.configDigest !== configured.configDigest)
                 continue;
+            sessionStatusResult = result;
             const dependencyOverviews = await loadDependencyOverviews({
                 context,
                 cliVersion: packageInfo.version,
                 status: result,
                 signal,
+                ...(catalogOperationContext ? { catalogOperationContext } : {}),
+                ...(!catalogOperationContext ? { bootstrapMissingActive: false } : {}),
             });
             const portablePluginIds = await loadPortablePluginIds({
                 context,
                 cliVersion: packageInfo.version,
                 signal,
+                ...(catalogOperationContext ? { catalogOperationContext } : {}),
+                ...(!catalogOperationContext ? { bootstrapMissingActive: false } : {}),
             });
             signal.throwIfAborted();
+            const catalogGenerations = await loadCatalogGenerationViewModels({ env: context.env });
+            signal.throwIfAborted();
             const statusById = new Map(result.payload.catalog.sources.map((source) => [source.id, source]));
             return {
+                cliChannel: packageInfo.version.includes('-') ? 'beta' : 'latest',
                 payload: result.payload,
                 pluginSummaries: result.pluginSummaries,
                 targetRevisions: result.targetRevisions,
                 dependencyOverviews,
                 portablePluginIds,
+                catalogGenerations,
                 sourceDetails: configured.sources.map((source) => {
                     const status = statusById.get(source.id);
                     return {
@@ -479,7 +583,38 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         throw new TuiOperationBlockedError('operationReviewStale', '状态读取期间来源配置持续变化。请重试。');
     };
-    const captureEvidence = async (intent, signal, freshnessPolicy = 'cacheFirst', preparation) => {
+    const captureEvidence = async (intent, signal, preparation, bootstrapMissingActive = true, operationInventory = createOperationInventoryReader()) => {
+        if (intent.kind === 'catalogActivate') {
+            signal?.throwIfAborted();
+            const source = (await loadCatalogGenerationViewModels({ env: context.env }))
+                .find((entry) => entry.sourceId === intent.sourceId);
+            if (!source?.active || !source.candidate) {
+                throw operationReviewStale('Catalog Candidate 不再可用。');
+            }
+            if (source.candidate.generationKey !== intent.candidateGenerationKey) {
+                throw operationReviewStale('Catalog Candidate 已变化。');
+            }
+            const sessionCatalog = sessionCatalogOperationContext?.catalog;
+            return {
+                catalog: {
+                    configDigest: sessionCatalog?.configDigest ?? 'unavailable',
+                    compositeDigest: sessionCatalog?.compositeDigest ?? 'unavailable',
+                    ...(sessionCatalogOperationContext?.generationSetDigest
+                        ? { generationSetDigest: sessionCatalogOperationContext.generationSetDigest }
+                        : {}),
+                },
+                catalogCandidate: {
+                    sourceId: source.sourceId,
+                    activeVersion: source.active.catalogVersion,
+                    candidateVersion: source.candidate.catalogVersion,
+                    channel: source.candidate.channel,
+                    requestedRef: source.candidate.requestedRef,
+                    candidateGenerationKey: source.candidate.generationKey,
+                    digestShort: source.candidate.digestShort,
+                    pluginChanges: source.candidate.pluginChanges,
+                },
+            };
+        }
         if (intent.kind === 'sourceMutation') {
             signal?.throwIfAborted();
             if (intent.action === 'add' && !intent.source
@@ -522,8 +657,40 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         signal?.throwIfAborted();
         const packageInfo = await readCliPackageInfo();
+        const offlineCleanupReason = intent.kind === 'pluginWrite'
+            && intent.action === 'cleanup'
+            && intent.originIssue?.actionId === 'cleanup'
+            && (intent.originIssue?.category === 'sourceMissing'
+                || intent.originIssue?.category === 'sourceUnavailable')
+            ? intent.originIssue.category === 'sourceMissing' ? 'sourceMissing' : 'bundleUnavailable'
+            : undefined;
+        let catalogOperation;
+        let catalogOperationError;
+        if (!offlineCleanupReason && intent.kind !== 'portableInstall'
+            && sessionCatalogOperationContext) {
+            try {
+                const sourceIds = [parsePluginId(intent.pluginId).sourceId];
+                catalogOperation = bootstrapMissingActive
+                    ? selectCatalogOperationContext(sessionCatalogOperationContext, sourceIds)
+                    : await resolveCatalogOperationContext({
+                        cliVersion: packageInfo.version,
+                        sourceIds,
+                        env: context.env,
+                        ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+                        ...(signal ? { signal } : {}),
+                        ...(!bootstrapMissingActive ? { bootstrapMissingActive: false } : {}),
+                    });
+            }
+            catch (error) {
+                catalogOperationError = error;
+            }
+        }
         if (intent.kind === 'portableInstall') {
             await preparation?.reporter.emit('portable');
+            const portableSourceId = parsePluginId(intent.pluginId).sourceId;
+            const portableCatalogOperation = sessionCatalogOperationContext
+                ? selectCatalogOperationContext(sessionCatalogOperationContext, [portableSourceId])
+                : undefined;
             const portable = await preparePortableInstall({
                 selector: intent.pluginId,
                 scope: intent.scope,
@@ -533,20 +700,106 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 env: context.env,
                 cliVersion: packageInfo.version,
                 signal,
+                ...(portableCatalogOperation
+                    ? { catalogOperationContext: portableCatalogOperation }
+                    : {}),
             });
             signal?.throwIfAborted();
             await preparation?.reporter.emit('evidence');
             signal?.throwIfAborted();
-            return {
+            const evidence = {
                 catalog: {
                     configDigest: portable.configDigest,
                     compositeDigest: portable.evidenceDigest,
+                    ...(portable.generationSetDigest
+                        ? { generationSetDigest: portable.generationSetDigest }
+                        : {}),
                 },
                 portable,
             };
+            if (catalogOperation)
+                catalogOperationByEvidence.set(evidence, catalogOperation);
+            return evidence;
+        }
+        if (preparation && (intent.kind === 'configSave' || intent.kind === 'configReset')) {
+            if (!sessionStatusResult || !catalogOperation) {
+                throw operationReviewStale('当前 TUI session 没有可复用的设置证据。');
+            }
+            await preparation.reporter.emit('config');
+            const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
+            signal?.throwIfAborted();
+            if (configSnapshot.digest !== sessionStatusResult.payload.catalog.configDigest) {
+                throw operationReviewStale('准备设置确认期间来源配置发生变化。');
+            }
+            const selected = await withResolvedCatalogPlugin({
+                selector: intent.pluginId,
+                cliVersion: packageInfo.version,
+                freshnessPolicy: 'cacheFirst',
+                configSnapshot,
+                env: context.env,
+                operationContext: catalogOperation,
+                ...(signal ? { signal } : {}),
+                consume: async ({ plugin, source }) => {
+                    if (!plugin.manifest.config) {
+                        throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
+                    }
+                    if (intent.kind === 'configSave') {
+                        await coercePluginConfigUpdates({
+                            schema: plugin.manifest.config.schema,
+                            updates: intent.updates ?? {},
+                            cwd: context.cwd,
+                        });
+                        for (const key of intent.removeKeys ?? []) {
+                            if (!plugin.manifest.config.schema[key]) {
+                                throw new TuiOperationBlockedError('unknownConfigKey', '设置字段已变化，请重新检查。');
+                            }
+                        }
+                    }
+                    return {
+                        pluginName: plugin.manifest.name,
+                        source: sourceEvidenceForPlugin(source, plugin.manifest.name),
+                    };
+                },
+            });
+            const store = await readPluginConfigStore({
+                sourceId: selected.source.sourceId,
+                sourceIdentity: selected.source.sourceIdentity,
+                pluginName: selected.pluginName,
+                scope: intent.scope,
+                projectLayer: intent.projectLayer,
+                cwd: context.cwd,
+                env: context.env,
+            });
+            signal?.throwIfAborted();
+            const relevantTargets = configAffectedStatusTargets(sessionStatusResult.payload.targets, intent.pluginId, intent.scope);
+            const relevantRevisions = (sessionStatusResult.targetRevisions ?? []).filter((revision) => relevantTargets.some((target) => target.platform === revision.platform
+                && target.scope === revision.scope
+                && target.pluginId === revision.pluginId));
+            await preparation.reporter.emit('evidence');
+            const evidence = {
+                catalog: {
+                    configDigest: sessionStatusResult.payload.catalog.configDigest,
+                    compositeDigest: sessionStatusResult.payload.catalog.compositeDigest,
+                    generationSetDigest: catalogOperation.generationSetDigest,
+                },
+                source: selected.source,
+                targetFingerprint: statusTargetFingerprint(relevantTargets, relevantRevisions),
+                config: {
+                    scope: intent.scope,
+                    projectLayer: intent.projectLayer,
+                    schemaIdentity: selected.source.manifestDigest,
+                    storeDigest: digest({ exists: store.exists, values: store.values }),
+                    affectedTargets: relevantTargets.map(({ platform, scope }) => ({ platform, scope })),
+                },
+            };
+            catalogOperationByEvidence.set(evidence, catalogOperation);
+            return evidence;
         }
         await preparation?.reporter.emit('status');
-        const status = await statusCommandV4({
+        const statusCatalogOperation = offlineCleanupReason
+            ? undefined
+            : catalogOperation ?? (bootstrapMissingActive ? sessionCatalogOperationContext : undefined);
+        const status = await statusCommandV5({
             plugins: [...new Set([intent.pluginId,
                     ...(intent.kind === 'pluginWrite' && intent.originIssue?.consumerPluginId
                         ? [intent.originIssue.consumerPluginId] : [])])],
@@ -557,39 +810,77 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             cwd: context.cwd,
             env: context.env,
             cliVersion: packageInfo.version,
+            ...(statusCatalogOperation ? { catalogOperationContext: statusCatalogOperation } : {}),
+            ...(offlineCleanupReason || !bootstrapMissingActive
+                || (!statusCatalogOperation && sessionCatalogOperationContext)
+                ? { bootstrapMissingActive: false }
+                : {}),
+            inventoryCatalogSourceReferences: operationInventory,
         });
         signal?.throwIfAborted();
+        const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
+        signal?.throwIfAborted();
+        if (configSnapshot.digest !== status.payload.catalog.configDigest) {
+            throw operationReviewStale('准备确认信息期间来源配置发生变化。');
+        }
+        if (catalogOperationError)
+            throw catalogOperationError;
         if (intent.kind === 'pluginWrite') {
             await assertTypedIssueOrigin(intent, status.payload.targets);
             if (preparation?.validateIntent) {
                 assertIntentIsLegal(intent, status.payload.targets, status.targetRevisions);
             }
         }
-        const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
-        signal?.throwIfAborted();
-        if (configSnapshot.digest !== status.payload.catalog.configDigest) {
-            throw operationReviewStale('准备确认信息期间来源配置发生变化。');
+        if (!offlineCleanupReason && !catalogOperation) {
+            catalogOperation = await resolveCatalogOperationContext({
+                cliVersion: packageInfo.version,
+                sourceIds: [parsePluginId(intent.pluginId).sourceId],
+                configSnapshot,
+                env: context.env,
+                ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+                ...(signal ? { signal } : {}),
+                ...(!bootstrapMissingActive ? { bootstrapMissingActive: false } : {}),
+            });
         }
         let dependencyPlan;
         await preparation?.reporter.emit('catalog');
-        const bundleUnavailableCleanupTarget = intent.kind === 'pluginWrite'
-            && intent.action === 'cleanup'
-            && intent.originIssue?.category === 'sourceUnavailable'
-            && intent.originIssue.actionId === 'cleanup'
+        const offlineCleanupTarget = offlineCleanupReason && intent.kind === 'pluginWrite'
             ? status.payload.targets.find((target) => target.pluginId === intent.pluginId
                 && target.platform === intent.platform
                 && target.scope === intent.scope
-                && target.errors.some((error) => error.code === 'bundleUnavailable'))
+                && target.errors.some((error) => error.code === offlineCleanupReason))
             : undefined;
-        const catalogSource = bundleUnavailableCleanupTarget
-            ? status.payload.catalog.sources.find((source) => source.id === bundleUnavailableCleanupTarget.sourceId)
+        const catalogSource = offlineCleanupTarget
+            ? status.payload.catalog.sources.find((source) => source.id === offlineCleanupTarget.sourceId)
             : undefined;
-        const selected = bundleUnavailableCleanupTarget
+        let offlineCleanup;
+        if (offlineCleanupReason && offlineCleanupTarget) {
+            await preparation?.reporter.emit('inventory');
+            const inventory = await operationInventory({
+                cwd: context.cwd,
+                env: context.env,
+            });
+            signal?.throwIfAborted();
+            offlineCleanup = offlineCleanupEvidenceFromInventory({
+                reason: offlineCleanupReason,
+                pluginId: offlineCleanupTarget.pluginId,
+                pluginName: offlineCleanupTarget.pluginName,
+                sourceId: offlineCleanupTarget.sourceId,
+                sourceIdentity: offlineCleanupTarget.sourceIdentity,
+                platform: offlineCleanupTarget.platform,
+                scope: offlineCleanupTarget.scope,
+                inventory,
+            }) ?? undefined;
+            if (!offlineCleanup) {
+                throw operationReviewStale('离线清理现场证据已消失或无法验证。');
+            }
+        }
+        const selected = offlineCleanupTarget
             ? {
-                pluginName: bundleUnavailableCleanupTarget.pluginName,
+                pluginName: offlineCleanupTarget.pluginName,
                 source: {
-                    sourceId: bundleUnavailableCleanupTarget.sourceId,
-                    sourceIdentity: bundleUnavailableCleanupTarget.sourceIdentity,
+                    sourceId: offlineCleanupTarget.sourceId,
+                    sourceIdentity: offlineCleanupTarget.sourceIdentity,
                     ...(catalogSource?.requestedRef ? { requestedRef: catalogSource.requestedRef } : {}),
                     ...(catalogSource?.resolvedCommit ? { resolvedCommit: catalogSource.resolvedCommit } : {}),
                 },
@@ -597,9 +888,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             : await withResolvedCatalogPlugin({
                 selector: intent.pluginId,
                 cliVersion: packageInfo.version,
-                freshnessPolicy,
+                freshnessPolicy: 'cacheFirst',
                 configSnapshot,
                 env: context.env,
+                ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                 ...(signal ? { signal } : {}),
                 consume: async ({ plugin, source }) => {
                     if (preparation?.validateIntent && intent.kind === 'configSave') {
@@ -624,48 +916,88 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     };
                 },
             });
+        let codexManager;
         const hasDeclaredDependencies = (status.pluginSummaries.find((summary) => summary.pluginId === intent.pluginId)?.dependencyTotalCount ?? 0) > 0;
-        if (intent.kind === 'pluginWrite'
-            && hasDeclaredDependencies
-            && (intent.action === 'install' || intent.action === 'upgrade' || intent.action === 'reinstall')) {
+        if (intent.kind === 'pluginWrite') {
             const command = {
                 install: installWriteCommand,
                 upgrade: upgradeWriteCommand,
                 reinstall: reinstallWriteCommand,
+                uninstall: uninstallWriteCommand,
+                cleanup: cleanupWriteCommand,
             }[intent.action];
             const preview = await command([intent.pluginId], {
                 cwd: context.cwd,
                 platform: intent.platform,
                 scope: intent.scope,
+                ...(intent.action === 'cleanup' ? { force: intent.force === true } : {}),
             }, {
                 ...context,
+                inventoryCatalogSourceReferences: operationInventory,
                 expectedCatalogConfigDigest: status.payload.catalog.configDigest,
+                ...(catalogOperation ? {
+                    catalogOperationContext: catalogOperation,
+                    expectedGenerationSetDigest: catalogOperation.generationSetDigest,
+                } : {}),
                 previewDependencyPlanOnly: true,
                 ...(preparation ? {
-                    previewCatalogFreshnessPolicy: 'cacheFirst',
                     onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
                 } : {}),
             });
             signal?.throwIfAborted();
-            dependencyPlan = preview.dependencyPlan;
-            if (!dependencyPlan) {
-                throw new TuiOperationBlockedError('dependencyGraphInvalid', '无法建立可信的依赖安装计划。');
+            if (hasDeclaredDependencies
+                && (intent.action === 'install'
+                    || intent.action === 'upgrade'
+                    || intent.action === 'reinstall')) {
+                dependencyPlan = preview.dependencyPlan;
+                if (!dependencyPlan) {
+                    throw new TuiOperationBlockedError('dependencyGraphInvalid', '无法建立可信的依赖安装计划。');
+                }
+                const blocker = dependencyPlan.targets.find((target) => target.action === 'block');
+                if (blocker) {
+                    throw new TuiOperationBlockedError(blocker.errorCode ?? 'dependencyNotReady', `${blocker.errorCode ?? 'dependencyNotReady'}: 依赖安装计划被阻止。`);
+                }
             }
-            const blocker = dependencyPlan.targets.find((target) => target.action === 'block');
-            if (blocker) {
-                throw new TuiOperationBlockedError(blocker.errorCode ?? 'dependencyNotReady', `${blocker.errorCode ?? 'dependencyNotReady'}: 依赖安装计划被阻止。`);
+            const managerPreview = preview?.codexManagerPreview;
+            if (managerPreview?.state === 'blocked') {
+                const message = managerPreview.code === 'codexSystemCliUnsupported'
+                    ? '系统 Codex CLI 版本不受支持。请升级官方 Codex CLI 后重试。'
+                    : 'AW-managed Codex runtime 当前不可用。请重试、升级 AW，或安装官方 Codex CLI。';
+                throw new TuiOperationBlockedError(managerPreview.code, `${managerPreview.code}: ${message}`);
+            }
+            if (managerPreview) {
+                codexManager = {
+                    state: managerPreview.state,
+                    packageName: MANAGED_CODEX_PACKAGE_NAME,
+                    version: managerPreview.state === 'requires-install'
+                        ? MANAGED_CODEX_VERSION
+                        : managerPreview.manager.version,
+                };
             }
         }
         await preparation?.reporter.emit('evidence');
         signal?.throwIfAborted();
+        const evidenceTargets = intent.kind === 'configSave' || intent.kind === 'configReset'
+            ? configAffectedStatusTargets(status.payload.targets, intent.pluginId, intent.scope)
+            : status.payload.targets;
+        const evidenceRevisions = intent.kind === 'configSave' || intent.kind === 'configReset'
+            ? (status.targetRevisions ?? []).filter((revision) => evidenceTargets.some((target) => target.platform === revision.platform
+                && target.scope === revision.scope
+                && target.pluginId === revision.pluginId))
+            : (status.targetRevisions ?? []);
         const evidence = {
             catalog: {
                 configDigest: status.payload.catalog.configDigest,
                 compositeDigest: status.payload.catalog.compositeDigest,
+                ...(catalogOperation
+                    ? { generationSetDigest: catalogOperation.generationSetDigest }
+                    : {}),
             },
             source: selected.source,
+            ...(offlineCleanup ? { offlineCleanup } : {}),
             ...(dependencyPlan ? { dependencyPlan } : {}),
-            targetFingerprint: statusTargetFingerprint(status.payload.targets, status.targetRevisions ?? []),
+            ...(codexManager ? { codexManager } : {}),
+            targetFingerprint: statusTargetFingerprint(evidenceTargets, evidenceRevisions),
         };
         if (intent.kind === 'configSave' || intent.kind === 'configReset') {
             const store = await readPluginConfigStore({
@@ -683,11 +1015,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 projectLayer: intent.projectLayer,
                 schemaIdentity: selected.source.manifestDigest,
                 storeDigest: digest({ exists: store.exists, values: store.values }),
+                affectedTargets: evidenceTargets.map(({ platform, scope }) => ({ platform, scope })),
             };
         }
+        if (catalogOperation)
+            catalogOperationByEvidence.set(evidence, catalogOperation);
         return evidence;
     };
     const dependencies = {
+        beginCatalogSession(sessionOptions) {
+            sessionCatalogOperationContext = undefined;
+            bootstrapNextCatalogSession = sessionOptions?.bootstrapMissingActive !== false;
+        },
         loadStatus,
         async inspectSourceRemoval(_sourceId, signal) {
             signal.throwIfAborted();
@@ -708,7 +1047,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 now: options.now ?? Date.now,
             });
             try {
-                return await captureEvidence(intent, signal, 'cacheFirst', {
+                return await captureEvidence(intent, signal, {
                     reporter,
                     validateIntent: true,
                 });
@@ -718,6 +1057,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             }
         },
         async validateIntent(intent, signal) {
+            if (intent.kind === 'catalogActivate') {
+                await captureEvidence(intent, signal);
+                return;
+            }
             if (intent.kind === 'sourceMutation') {
                 const evidence = await captureEvidence(intent, signal);
                 if (evidence.sourceWrite?.configDigest === evidence.sourceWrite?.candidateDigest) {
@@ -733,6 +1076,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     freshnessPolicy: 'cacheFirst',
                     env: context.env,
                     signal,
+                    ...(sessionContextForPlugin(intent.pluginId)
+                        ? { operationContext: sessionContextForPlugin(intent.pluginId) }
+                        : {}),
                     consume: async ({ plugin }) => {
                         if (!plugin.manifest.config) {
                             throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
@@ -755,13 +1101,29 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 return;
             signal.throwIfAborted();
             const packageInfo = await readCliPackageInfo();
-            const status = await statusCommandV4({
-                plugins: [...new Set([intent.pluginId,
-                        ...(intent.originIssue?.consumerPluginId ? [intent.originIssue.consumerPluginId] : [])])],
+            const pluginIds = [...new Set([intent.pluginId,
+                    ...(intent.originIssue?.consumerPluginId ? [intent.originIssue.consumerPluginId] : [])])];
+            const offlineCleanup = intent.action === 'cleanup'
+                && intent.originIssue?.actionId === 'cleanup'
+                && (intent.originIssue.category === 'sourceMissing'
+                    || intent.originIssue.category === 'sourceUnavailable');
+            const sourceIds = pluginIds.map((pluginId) => parsePluginId(pluginId).sourceId);
+            const catalogOperation = offlineCleanup
+                ? undefined
+                : sessionCatalogOperationContext
+                    ? selectCatalogOperationContext(sessionCatalogOperationContext, sourceIds)
+                    : undefined;
+            const status = await statusCommandV5({
+                plugins: pluginIds,
                 platform: intent.platform,
                 cwd: context.cwd,
                 env: context.env,
                 cliVersion: packageInfo.version,
+                ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
+                ...(offlineCleanup || sessionCatalogOperationContext
+                    ? { bootstrapMissingActive: false }
+                    : {}),
+                inventoryCatalogSourceReferences: readInventory,
             });
             signal.throwIfAborted();
             await assertTypedIssueOrigin(intent, status.payload.targets);
@@ -788,6 +1150,48 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 },
             });
         },
+        async refreshCatalogSource(sourceId, signal, onState) {
+            let refreshError;
+            let refreshCompleted = false;
+            try {
+                await refreshCatalogSourceGeneration({
+                    sourceId,
+                    cliVersion: (await readCliPackageInfo()).version,
+                    env: context.env,
+                    signal,
+                    runtime: {
+                        ...options.catalogGenerationRuntime,
+                        onProgress: (event) => onState(event.state),
+                    },
+                });
+                refreshCompleted = true;
+            }
+            catch (error) {
+                refreshError = error;
+            }
+            signal.throwIfAborted();
+            const source = (await loadCatalogGenerationViewModels({ env: context.env }))
+                .find((entry) => entry.sourceId === sourceId);
+            if (!source)
+                throw refreshError ?? new TuiOperationBlockedError('catalogGenerationSourceMissing', 'Catalog 来源已不存在。');
+            if (refreshError && source.refreshState !== 'failed'
+                && source.refreshState !== 'immutableViolation')
+                throw refreshError;
+            return {
+                source: refreshCompleted && source.refreshState === 'idle'
+                    ? { ...source, refreshState: 'upToDate' }
+                    : source,
+            };
+        },
+        async setCatalogRefreshPolicy(sourceId, refreshPolicy) {
+            await setCatalogSourceRefreshPolicy({
+                sourceId,
+                refreshPolicy,
+                env: context.env,
+            });
+            return (await loadCatalogGenerationViewModels({ env: context.env }))
+                .find((source) => source.sourceId === sourceId);
+        },
         captureEvidence,
         logError(_error, code, logContext) {
             return context.debugLogger.log({
@@ -808,6 +1212,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 freshnessPolicy: 'cacheFirst',
                 env: context.env,
                 signal,
+                ...(sessionContextForPlugin(pluginId)
+                    ? { operationContext: sessionContextForPlugin(pluginId) }
+                    : {}),
                 consume: async ({ plugin }) => {
                     if (!plugin.manifest.config) {
                         throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
@@ -840,6 +1247,9 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 freshnessPolicy: 'cacheFirst',
                 env: context.env,
                 signal,
+                ...(sessionContextForPlugin(pluginId)
+                    ? { operationContext: sessionContextForPlugin(pluginId) }
+                    : {}),
                 consume: async ({ plugin }) => {
                     if (!plugin.manifest.config) {
                         throw new TuiOperationBlockedError('configSchemaUnavailable', '这个插件没有设置 schema。');
@@ -860,7 +1270,39 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         cwd: context.cwd,
                         env: context.env,
                     });
-                    return buildConfigPage({ pluginId, schema: plugin.manifest.config, read, effectiveRead });
+                    const layerReads = layer.scope === 'effective' ? undefined : {
+                        user: await resolveConfigRead({
+                            pluginName: plugin.manifest.name,
+                            plugin,
+                            scope: 'user',
+                            projectLayer: 'shared',
+                            cwd: context.cwd,
+                            env: context.env,
+                        }),
+                        project: await resolveConfigRead({
+                            pluginName: plugin.manifest.name,
+                            plugin,
+                            scope: 'project',
+                            projectLayer: 'shared',
+                            cwd: context.cwd,
+                            env: context.env,
+                        }),
+                        local: await resolveConfigRead({
+                            pluginName: plugin.manifest.name,
+                            plugin,
+                            scope: 'project',
+                            projectLayer: 'local',
+                            cwd: context.cwd,
+                            env: context.env,
+                        }),
+                    };
+                    return buildConfigPage({
+                        pluginId,
+                        schema: plugin.manifest.config,
+                        read,
+                        effectiveRead,
+                        ...(layerReads ? { layerReads } : {}),
+                    });
                 },
             });
         },
@@ -920,6 +1362,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         env: context.env,
                         cliVersion: packageInfo.version,
                         expectedEvidenceDigest: expectedEvidence.portable.evidenceDigest,
+                        expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
                         onProgress(stage) {
                             const phase = stage === 'prepare' ? '检查插件依赖并生成候选'
                                 : stage === 'add' ? '安装已选择的 Skills' : '验证安装结果';
@@ -934,49 +1377,84 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     throw error;
                 }
             }
+            if (intent.kind === 'catalogActivate') {
+                const currentEvidence = await captureEvidence(intent, undefined, undefined, false);
+                if (operationEvidenceFingerprint(currentEvidence) !== operationEvidenceFingerprint(expectedEvidence)) {
+                    throw operationReviewStale('确认后 Catalog Candidate 发生变化。');
+                }
+                try {
+                    return await activateCatalogSourceCandidate({
+                        sourceId: intent.sourceId,
+                        expectedCandidateGenerationKey: intent.candidateGenerationKey,
+                        env: context.env,
+                    });
+                }
+                catch (error) {
+                    if (error instanceof CatalogGenerationError
+                        && (error.code === 'catalogGenerationCandidateChanged'
+                            || error.code === 'catalogGenerationCandidateUnavailable')) {
+                        throw operationReviewStale('确认后 Catalog Candidate 发生变化。');
+                    }
+                    throw error;
+                }
+            }
+            if (intent.kind === 'sourceMutation') {
+                const currentEvidence = await captureEvidence(intent);
+                if (operationEvidenceFingerprint(currentEvidence) !== operationEvidenceFingerprint(expectedEvidence)) {
+                    throw new TuiOperationBlockedError('operationReviewStale', '确认后状态发生变化。');
+                }
+                await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
+                const packageInfo = await readCliPackageInfo();
+                const runtime = {
+                    onProgress: async (event) => {
+                        const phase = SOURCE_PROGRESS_PHASES[event.stage];
+                        progressFeed?.setCurrent({ target: 'Catalog 来源配置', phase }, `来源操作：${phase}`);
+                        await tuiControllerRuntimeTestHooks?.onCatalogSourceProgress?.(event);
+                    },
+                };
+                const common = {
+                    cwd: context.cwd,
+                    env: context.env,
+                    expectedConfigDigest: expectedEvidence.sourceWrite?.configDigest,
+                    runtime,
+                };
+                if (intent.action === 'add' && intent.source) {
+                    return addCatalogSourceCommand({ ...common, source: intent.source, cliVersion: packageInfo.version });
+                }
+                if (intent.action === 'update' && intent.update) {
+                    return updateCatalogSourceCommand({ ...common, sourceId: intent.sourceId, update: intent.update, cliVersion: packageInfo.version });
+                }
+                if (intent.action === 'setPrimary') {
+                    return setPrimaryCatalogSourceCommand({ ...common, sourceId: intent.sourceId });
+                }
+                if (intent.action === 'remove') {
+                    return removeCatalogSourceCommand({ ...common, sourceId: intent.sourceId });
+                }
+                throw new TuiOperationBlockedError('invalidSourceMutation', '来源操作缺少候选输入。');
+            }
             return withAwHomeMutationLock({
                 env: context.env,
                 action: async (awHomeMutationToken) => {
-                    const currentEvidence = await captureEvidence(intent, undefined, 'requireRemote');
+                    await tuiControllerRuntimeTestHooks?.beforeMutationEvidenceCapture?.();
+                    const operationInventory = createOperationInventoryReader();
+                    const currentEvidence = await captureEvidence(intent, undefined, undefined, false, operationInventory);
                     if (operationEvidenceFingerprint(currentEvidence) !== operationEvidenceFingerprint(expectedEvidence)) {
                         throw new TuiOperationBlockedError('operationReviewStale', '确认后状态发生变化。');
                     }
-                    await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
-                    if (intent.kind === 'sourceMutation') {
-                        const packageInfo = await readCliPackageInfo();
-                        const runtime = {
-                            awHomeMutationToken,
-                            onProgress: async (event) => {
-                                const phase = SOURCE_PROGRESS_PHASES[event.stage];
-                                progressFeed?.setCurrent({ target: 'Catalog 来源配置', phase }, `来源操作：${phase}`);
-                                await tuiControllerRuntimeTestHooks?.onCatalogSourceProgress?.(event);
-                            },
-                        };
-                        const common = {
-                            cwd: context.cwd,
-                            env: context.env,
-                            expectedConfigDigest: expectedEvidence.sourceWrite?.configDigest,
-                            runtime,
-                        };
-                        if (intent.action === 'add' && intent.source) {
-                            return addCatalogSourceCommand({ ...common, source: intent.source, cliVersion: packageInfo.version });
-                        }
-                        if (intent.action === 'update' && intent.update) {
-                            return updateCatalogSourceCommand({ ...common, sourceId: intent.sourceId, update: intent.update, cliVersion: packageInfo.version });
-                        }
-                        if (intent.action === 'setPrimary') {
-                            return setPrimaryCatalogSourceCommand({ ...common, sourceId: intent.sourceId });
-                        }
-                        if (intent.action === 'remove') {
-                            return removeCatalogSourceCommand({ ...common, sourceId: intent.sourceId });
-                        }
-                        throw new TuiOperationBlockedError('invalidSourceMutation', '来源操作缺少候选输入。');
+                    const catalogOperation = catalogOperationByEvidence.get(currentEvidence);
+                    if (expectedEvidence.catalog.generationSetDigest
+                        && catalogOperation?.generationSetDigest !== expectedEvidence.catalog.generationSetDigest) {
+                        throw operationReviewStale('确认后 Active Catalog generation 发生变化。');
                     }
+                    await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
                     if (intent.kind === 'pluginWrite') {
                         const options = {
                             cwd: context.cwd,
                             platform: intent.platform,
                             scope: intent.scope,
+                            ...(expectedEvidence.codexManager?.state === 'requires-install'
+                                ? { allowManagedCodexInstall: true }
+                                : {}),
                             ...(intent.action === 'cleanup' ? { force: intent.force === true } : {}),
                         };
                         const command = {
@@ -987,14 +1465,28 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             cleanup: cleanupWriteCommand,
                         }[intent.action];
                         const currentSource = currentEvidence.source;
-                        if (!expectedEvidence.source || !currentSource) {
+                        const offlineCleanup = currentEvidence.offlineCleanup;
+                        if (!offlineCleanup && (!expectedEvidence.source || !currentSource)) {
                             throw new TuiOperationBlockedError('operationReviewStale', '确认信息缺少来源身份。');
                         }
                         const result = await command([intent.pluginId], options, {
                             ...context,
                             awHomeMutationToken,
+                            inventoryCatalogSourceReferences: operationInventory,
+                            ...(currentEvidence.dependencyPlan
+                                ? { expectedOperationDependencyPlan: currentEvidence.dependencyPlan }
+                                : {}),
                             expectedCatalogConfigDigest: expectedEvidence.catalog.configDigest,
-                            reviewPreflight: (actual) => assertSourceEvidenceMatches(currentSource, actual),
+                            ...(catalogOperation ? {
+                                catalogOperationContext: catalogOperation,
+                                expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
+                            } : {}),
+                            ...(expectedEvidence.codexManager?.state === 'requires-install'
+                                ? { managedCodexAuthorizer: async () => true }
+                                : {}),
+                            ...(offlineCleanup
+                                ? { expectedOfflineCleanupEvidence: offlineCleanup }
+                                : { reviewPreflight: (actual) => assertSourceEvidenceMatches(currentSource, actual) }),
                         });
                         throwIfWriteReviewStale(result);
                         return result;
@@ -1008,10 +1500,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         return withResolvedCatalogPlugin({
                             selector: intent.pluginId,
                             cliVersion: packageInfo.version,
-                            freshnessPolicy: 'requireRemote',
+                            freshnessPolicy: 'cacheFirst',
                             env: context.env,
+                            ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                             consume: async ({ plugin, source }) => {
                                 assertSourceEvidenceMatches(currentSource, sourceEvidenceForPlugin(source, plugin.manifest.name));
+                                const applyTargets = currentEvidence.config?.affectedTargets.map((target) => ({
+                                    pluginName: plugin.manifest.name,
+                                    platform: target.platform,
+                                    scope: target.scope,
+                                })) ?? [];
                                 const result = intent.kind === 'configSave'
                                     ? await applyPluginConfigWrite({
                                         plugin,
@@ -1021,8 +1519,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         cwd: context.cwd,
                                         env: context.env,
                                         nativeCliRunner: context.nativeCliRunner,
-                                        rebuildRuntime: { ...context, awHomeMutationToken },
+                                        rebuildRuntime: {
+                                            ...context,
+                                            awHomeMutationToken,
+                                            ...(catalogOperation ? {
+                                                catalogOperationContext: catalogOperation,
+                                                expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
+                                            } : {}),
+                                        },
                                         awHomeMutationToken,
+                                        applyTargets,
                                         request: { updates: intent.updates, removeKeys: intent.removeKeys },
                                     })
                                     : await resetPluginConfigWithHelper({
@@ -1033,8 +1539,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         cwd: context.cwd,
                                         env: context.env,
                                         nativeCliRunner: context.nativeCliRunner,
-                                        rebuildRuntime: { ...context, awHomeMutationToken },
+                                        rebuildRuntime: {
+                                            ...context,
+                                            awHomeMutationToken,
+                                            ...(catalogOperation ? {
+                                                catalogOperationContext: catalogOperation,
+                                                expectedGenerationSetDigest: expectedEvidence.catalog.generationSetDigest,
+                                            } : {}),
+                                        },
                                         awHomeMutationToken,
+                                        applyTargets,
                                     });
                                 return result;
                             },