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

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

@@ -1,10 +1,9 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import { statusCommandV5, } from '../commands/status-v5.js';
+import { statusCommandV6, } from '../commands/status-v6.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';
@@ -12,7 +11,7 @@ import { applyPluginConfigWrite, resetPluginConfigWithHelper, } from '../utils/p
 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 { buildConfigGroups, buildConfigPage, isPureNativeCodexTarget, projectPlatformPlacement, } from './model.js';
 import { projectCatalogSourceLocation } from '../utils/catalog-source-presentation.js';
 import { targetCanBeUninstalled, targetHasArtifactCollision, } from '../utils/target-eligibility.js';
 import { calculateCatalogSourceIdentity } from '../utils/catalog-source-identity.js';
@@ -20,20 +19,18 @@ import { checkAwCapabilitySupport, readPluginManifest } from '../utils/manifest.
 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';
+import { calculatePluginIntentDigest, canonicalizePluginIntentState, readPluginIntentState, writePluginIntentState, } from '../utils/plugin-intent-state.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
             ? item.resolution.manifest.entries.flatMap((entry) => {
                 const support = checkAwCapabilitySupport(entry.requires.aw.capabilities ?? [], IMPLEMENTED_AW_CAPABILITIES);
@@ -119,8 +116,6 @@ function throwIfWriteReviewStale(result) {
     }
 }
 const SOURCE_PROGRESS_PHASES = {
-    refreshingCatalog: '刷新 Catalog 缓存',
-    catalogReady: 'Catalog 已读取，索引已刷新',
     savingConfig: '保存来源配置',
 };
 function pluginIntent(intent) {
@@ -131,23 +126,48 @@ function assertIntentIsLegal(intent, targets, revisions = []) {
         ? ['codex', 'claude']
         : [intent.platform];
     for (const platform of platforms) {
-        const selected = targets.find((target) => target.pluginId === intent.pluginId
-            && target.platform === platform && target.scope === intent.scope);
+        const platformTargets = targets.filter((target) => target.pluginId === intent.pluginId
+            && target.platform === platform);
+        const selected = platformTargets.find((target) => target.scope === intent.scope)
+            ?? (platform === 'codex' ? platformTargets[0] : undefined);
         if (!selected || selected.errors.some((error) => error.code === 'unsupportedTarget')) {
             throw new TuiOperationBlockedError('unsupportedTarget', '所选插件不支持这个平台和使用位置。');
         }
-        const otherScopeInstalled = targets.some((target) => target.platform === platform
-            && target.scope !== intent.scope
-            && (target.state === 'present' || target.state === 'partial'));
-        if (intent.action === 'install' && otherScopeInstalled) {
+        if (intent.action === 'sync' && platform !== 'codex') {
+            throw new TuiOperationBlockedError('syncPlatformUnsupported', 'sync 只支持 Codex。');
+        }
+        if (intent.dependencyPlacementOnly === 'desired')
+            continue;
+        const otherScope = intent.scope === 'user' ? 'project' : 'user';
+        const otherScopeInstalled = platform === 'codex'
+            ? platformTargets.some((target) => target.desired.scopes.includes(otherScope)
+                || target.activation?.[otherScope] === true)
+            : targets.some((target) => target.platform === platform
+                && target.scope !== intent.scope
+                && (target.state === 'present' || target.state === 'partial'));
+        const pureNativeCodex = isPureNativeCodexTarget(selected);
+        if (intent.action === 'install' && otherScopeInstalled && !pureNativeCodex
+            && !intent.dependencyPlacementAdjustment) {
             throw new TuiOperationBlockedError('scopeConflict', '这个平台已安装在另一个使用位置。请先移除原位置。');
         }
-        if (intent.action === 'install' && targetHasArtifactCollision(selected)) {
+        if ((intent.action === 'install' || intent.action === 'upgrade' || intent.action === 'reinstall')
+            && targetHasArtifactCollision(selected)) {
             throw new TuiOperationBlockedError('artifactCollision', '所选位置存在输出冲突。请先移除或迁移冲突内容。');
         }
-        if (intent.action === 'install' && selected.state !== 'absent') {
+        const selectedScopeInstalled = platform === 'codex'
+            ? selected.desired.scopes.includes(intent.scope)
+                || selected.activation?.[intent.scope] === true
+            : selected.state !== 'absent';
+        if (intent.action === 'install' && selectedScopeInstalled
+            && !intent.dependencyPlacementAdjustment) {
             throw new TuiOperationBlockedError('targetAlreadyInstalled', '所选位置已经安装。');
         }
+        if (intent.action === 'sync'
+            && selected.actual.state !== 'needsSync'
+            && selected.actual.state !== 'drifted'
+            && selected.actual.state !== 'conflict') {
+            throw new TuiOperationBlockedError('targetStateChanged', '当前安装状态不需要同步。');
+        }
         const revision = revisions.find((entry) => entry.pluginId === intent.pluginId
             && entry.platform === platform && entry.scope === intent.scope)?.revision;
         if (intent.action === 'upgrade'
@@ -170,7 +190,9 @@ async function assertTypedIssueOrigin(intent, targets) {
     };
     const selected = targets.find((target) => target.pluginId === intent.pluginId
         && target.platform === intent.platform
-        && target.scope === intent.scope);
+        && target.scope === intent.scope)
+        ?? targets.find((target) => target.pluginId === intent.pluginId
+            && target.platform === 'codex');
     if (intent.originIssue.category === 'dependencyMissing') {
         if (intent.originIssue.actionId !== 'installDependency'
             || intent.action !== 'install' || !selected || selected.state !== 'absent') {
@@ -207,9 +229,17 @@ async function assertTypedIssueOrigin(intent, targets) {
         return;
     }
     else if (intent.originIssue.category === 'scopeConflict') {
-        const installedScopes = new Set(targets.filter((target) => target.pluginId === intent.pluginId
-            && target.platform === intent.platform
-            && (target.state === 'present' || target.state === 'partial')).map((target) => target.scope));
+        const installedScopes = new Set();
+        for (const target of targets.filter((candidate) => candidate.pluginId === intent.pluginId && candidate.platform === intent.platform)) {
+            if (target.state === 'present' || target.state === 'partial')
+                installedScopes.add(target.scope);
+            for (const scope of target.desired.scopes)
+                installedScopes.add(scope);
+            if (target.activation?.user === true)
+                installedScopes.add('user');
+            if (target.activation?.project === true)
+                installedScopes.add('project');
+        }
         const correctBranch = intent.action === 'uninstall'
             && ((intent.originIssue.actionId === 'keepUserScope' && intent.scope === 'project')
                 || (intent.originIssue.actionId === 'keepProjectScope' && intent.scope === 'user'));
@@ -239,13 +269,11 @@ async function assertTypedIssueOrigin(intent, targets) {
 async function loadDependencyOverviews(options) {
     const graph = await 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) => ({
             nodes: catalog.sources.flatMap((item) => item.resolution
                 ? item.resolution.manifest.entries.map((entry) => ({
@@ -332,7 +360,8 @@ async function loadDependencyOverviews(options) {
             return 'notInstalled';
         }
         return placements.some((placement) => placement.state === 'scopeConflict'
-            || (placement.state === 'installed' && placement.health !== 'ready'))
+            || (placement.state === 'installed'
+                && (placement.health !== 'ready' || placement.blockingReason !== undefined)))
             ? 'needsAttention'
             : 'ready';
     };
@@ -479,6 +508,30 @@ function createReviewStageReporter(options) {
 export function createTuiControllerDependencies(context, progressFeed, options = {}) {
     const readInventory = options.inventoryCatalogSourceReferences
         ?? inventoryCatalogSourceReferences;
+    const validatedStoreEntries = new Map();
+    const validatingStoreEntries = new Map();
+    const loadCatalogGenerations = async () => {
+        const generations = await loadCatalogGenerationViewModels({
+            env: context.env,
+            validatedStoreEntries,
+            validatingStoreEntries,
+            onStage: (event) => context.debugLogger.log({
+                type: 'performance:stage',
+                level: 'debug',
+                target: 'debugLog',
+                message: 'Catalog generation load stage completed.',
+                data: event,
+            }),
+        });
+        const retained = new Set(generations.flatMap((source) => [
+            source.active?.storeKey,
+        ].filter((value) => value !== undefined)));
+        for (const storeKey of validatedStoreEntries.keys()) {
+            if (!retained.has(storeKey))
+                validatedStoreEntries.delete(storeKey);
+        }
+        return generations;
+    };
     const createOperationInventoryReader = () => {
         let ordinaryInventory;
         return (inventoryOptions) => {
@@ -492,7 +545,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
     const catalogOperationByEvidence = new WeakMap();
     let sessionCatalogOperationContext;
     let sessionStatusResult;
-    let bootstrapNextCatalogSession = true;
     const sessionContextForPlugin = (pluginId) => {
         const sourceId = parsePluginId(pluginId).sourceId;
         if (!sourceId || !sessionCatalogOperationContext)
@@ -504,23 +556,20 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         const packageInfo = await readCliPackageInfo();
         const catalogOperationContext = sessionCatalogOperationContext
             ?? await resolvePartialCatalogOperationContext({
-                cliVersion: packageInfo.version,
                 env: context.env,
                 signal,
-                ...(bootstrapNextCatalogSession ? {} : { bootstrapMissingActive: false }),
-                ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+                validatedStoreEntries,
+                validatingStoreEntries,
             }).catch(() => undefined);
         if (catalogOperationContext)
             sessionCatalogOperationContext = catalogOperationContext;
         for (let attempt = 0; attempt < 3; attempt += 1) {
-            const result = await statusCommandV5({
+            const result = await statusCommandV6({
                 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();
@@ -535,17 +584,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 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 });
+            const catalogGenerations = await loadCatalogGenerations();
             signal.throwIfAborted();
             const statusById = new Map(result.payload.catalog.sources.map((source) => [source.id, source]));
             return {
@@ -556,6 +603,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 dependencyOverviews,
                 portablePluginIds,
                 catalogGenerations,
+                sessionGenerationKeys: Object.fromEntries((catalogOperationContext?.generationSet.sources ?? [])
+                    .map((source) => [source.sourceId, source.storeKey])),
                 sourceDetails: configured.sources.map((source) => {
                     const status = statusById.get(source.id);
                     return {
@@ -583,38 +632,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         throw new TuiOperationBlockedError('operationReviewStale', '状态读取期间来源配置持续变化。请重试。');
     };
-    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,
-                },
-            };
-        }
+    const captureEvidence = async (intent, signal, preparation, operationInventory = createOperationInventoryReader(), freshCatalog = false) => {
         if (intent.kind === 'sourceMutation') {
             signal?.throwIfAborted();
             if (intent.action === 'add' && !intent.source
@@ -636,10 +654,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             await preparation?.reporter.emit('evidence');
             signal?.throwIfAborted();
             const evidence = {
-                catalog: { configDigest: preview.configDigest, compositeDigest: preview.candidateDigest },
+                catalog: { configDigest: preview.configDigest, compositeDigest: preview.proposedConfigDigest },
                 sourceWrite: {
                     configDigest: preview.configDigest,
-                    candidateDigest: preview.candidateDigest,
+                    proposedConfigDigest: preview.proposedConfigDigest,
                     ...(preview.sourceIdentity ? { sourceIdentity: preview.sourceIdentity } : {}),
                     inventoryDigest: digest({ references: preview.references.references, errors: preview.references.errors }),
                     referenceCount: preview.references.references.length,
@@ -647,7 +665,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 },
             };
             if (preparation?.validateIntent
-                && evidence.sourceWrite?.configDigest === evidence.sourceWrite?.candidateDigest) {
+                && evidence.sourceWrite?.configDigest === evidence.sourceWrite?.proposedConfigDigest) {
                 throw new TuiOperationBlockedError('sourceNoChanges', '来源没有变化。');
             }
             return evidence;
@@ -666,19 +684,16 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             : undefined;
         let catalogOperation;
         let catalogOperationError;
-        if (!offlineCleanupReason && intent.kind !== 'portableInstall'
-            && sessionCatalogOperationContext) {
+        if (!offlineCleanupReason && intent.kind !== 'portableInstall') {
             try {
                 const sourceIds = [parsePluginId(intent.pluginId).sourceId];
-                catalogOperation = bootstrapMissingActive
+                catalogOperation = !freshCatalog && sessionCatalogOperationContext
                     ? selectCatalogOperationContext(sessionCatalogOperationContext, sourceIds)
                     : await resolveCatalogOperationContext({
-                        cliVersion: packageInfo.version,
                         sourceIds,
                         env: context.env,
-                        ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+                        ...(!freshCatalog ? { validatedStoreEntries, validatingStoreEntries } : {}),
                         ...(signal ? { signal } : {}),
-                        ...(!bootstrapMissingActive ? { bootstrapMissingActive: false } : {}),
                     });
             }
             catch (error) {
@@ -734,7 +749,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             const selected = await withResolvedCatalogPlugin({
                 selector: intent.pluginId,
                 cliVersion: packageInfo.version,
-                freshnessPolicy: 'cacheFirst',
                 configSnapshot,
                 env: context.env,
                 operationContext: catalogOperation,
@@ -798,8 +812,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         await preparation?.reporter.emit('status');
         const statusCatalogOperation = offlineCleanupReason
             ? undefined
-            : catalogOperation ?? (bootstrapMissingActive ? sessionCatalogOperationContext : undefined);
-        const status = await statusCommandV5({
+            : catalogOperation ?? (!freshCatalog ? sessionCatalogOperationContext : undefined);
+        const status = await statusCommandV6({
             plugins: [...new Set([intent.pluginId,
                     ...(intent.kind === 'pluginWrite' && intent.originIssue?.consumerPluginId
                         ? [intent.originIssue.consumerPluginId] : [])])],
@@ -811,10 +825,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             env: context.env,
             cliVersion: packageInfo.version,
             ...(statusCatalogOperation ? { catalogOperationContext: statusCatalogOperation } : {}),
-            ...(offlineCleanupReason || !bootstrapMissingActive
-                || (!statusCatalogOperation && sessionCatalogOperationContext)
-                ? { bootstrapMissingActive: false }
-                : {}),
             inventoryCatalogSourceReferences: operationInventory,
         });
         signal?.throwIfAborted();
@@ -833,16 +843,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         if (!offlineCleanupReason && !catalogOperation) {
             catalogOperation = await resolveCatalogOperationContext({
-                cliVersion: packageInfo.version,
                 sourceIds: [parsePluginId(intent.pluginId).sourceId],
                 configSnapshot,
                 env: context.env,
-                ...(options.catalogGenerationRuntime ? { runtime: options.catalogGenerationRuntime } : {}),
+                ...(!freshCatalog ? { validatedStoreEntries, validatingStoreEntries } : {}),
                 ...(signal ? { signal } : {}),
-                ...(!bootstrapMissingActive ? { bootstrapMissingActive: false } : {}),
             });
         }
         let dependencyPlan;
+        let codexReconcilePlans;
         await preparation?.reporter.emit('catalog');
         const offlineCleanupTarget = offlineCleanupReason && intent.kind === 'pluginWrite'
             ? status.payload.targets.find((target) => target.pluginId === intent.pluginId
@@ -888,7 +897,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             : await withResolvedCatalogPlugin({
                 selector: intent.pluginId,
                 cliVersion: packageInfo.version,
-                freshnessPolicy: 'cacheFirst',
                 configSnapshot,
                 env: context.env,
                 ...(catalogOperation ? { operationContext: catalogOperation } : {}),
@@ -925,11 +933,15 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 reinstall: reinstallWriteCommand,
                 uninstall: uninstallWriteCommand,
                 cleanup: cleanupWriteCommand,
+                sync: installWriteCommand,
             }[intent.action];
             const preview = await command([intent.pluginId], {
                 cwd: context.cwd,
                 platform: intent.platform,
                 scope: intent.scope,
+                ...(intent.action === 'install' && intent.dependencyScopeOverrides
+                    ? { dependencyScopeOverrides: intent.dependencyScopeOverrides }
+                    : {}),
                 ...(intent.action === 'cleanup' ? { force: intent.force === true } : {}),
             }, {
                 ...context,
@@ -940,15 +952,20 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     expectedGenerationSetDigest: catalogOperation.generationSetDigest,
                 } : {}),
                 previewDependencyPlanOnly: true,
+                ...(intent.action === 'sync' ? { reconcileIntentOnly: true } : {}),
                 ...(preparation ? {
                     onPreviewStage: (stage) => stage === 'catalog' ? undefined : preparation.reporter.emit(stage),
                 } : {}),
             });
             signal?.throwIfAborted();
+            codexReconcilePlans = intent.dependencyPlacementOnly === 'desired'
+                ? undefined
+                : preview?.codexReconcilePlans;
             if (hasDeclaredDependencies
                 && (intent.action === 'install'
                     || intent.action === 'upgrade'
-                    || intent.action === 'reinstall')) {
+                    || intent.action === 'reinstall'
+                    || intent.action === 'sync')) {
                 dependencyPlan = preview.dependencyPlan;
                 if (!dependencyPlan) {
                     throw new TuiOperationBlockedError('dependencyGraphInvalid', '无法建立可信的依赖安装计划。');
@@ -959,13 +976,14 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 }
             }
             const managerPreview = preview?.codexManagerPreview;
-            if (managerPreview?.state === 'blocked') {
+            if (managerPreview?.state === 'blocked' && intent.dependencyPlacementOnly !== 'desired') {
                 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) {
+            if (managerPreview && managerPreview.state !== 'blocked'
+                && intent.dependencyPlacementOnly !== 'desired') {
                 codexManager = {
                     state: managerPreview.state,
                     packageName: MANAGED_CODEX_PACKAGE_NAME,
@@ -977,6 +995,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         }
         await preparation?.reporter.emit('evidence');
         signal?.throwIfAborted();
+        let projectIntentDigest;
+        if (intent.kind === 'pluginWrite' && intent.dependencyPlacementOnly === 'desired') {
+            if (intent.scope !== 'project') {
+                throw new TuiOperationBlockedError('dependencyPlacementScopeInvalid', '缩小依赖位置只能更新当前项目 desired intent。');
+            }
+            projectIntentDigest = calculatePluginIntentDigest(await readPluginIntentState({
+                scope: 'project',
+                cwd: context.cwd,
+                env: context.env,
+            }));
+            signal?.throwIfAborted();
+        }
         const evidenceTargets = intent.kind === 'configSave' || intent.kind === 'configReset'
             ? configAffectedStatusTargets(status.payload.targets, intent.pluginId, intent.scope)
             : status.payload.targets;
@@ -996,6 +1026,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             source: selected.source,
             ...(offlineCleanup ? { offlineCleanup } : {}),
             ...(dependencyPlan ? { dependencyPlan } : {}),
+            ...(projectIntentDigest ? { projectIntentDigest } : {}),
+            ...(codexReconcilePlans ? { codexReconcilePlans } : {}),
             ...(codexManager ? { codexManager } : {}),
             targetFingerprint: statusTargetFingerprint(evidenceTargets, evidenceRevisions),
         };
@@ -1025,7 +1057,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
     const dependencies = {
         beginCatalogSession(sessionOptions) {
             sessionCatalogOperationContext = undefined;
-            bootstrapNextCatalogSession = sessionOptions?.bootstrapMissingActive !== false;
+            if (sessionOptions?.reuseValidatedGenerations !== true) {
+                validatedStoreEntries.clear();
+                validatingStoreEntries.clear();
+            }
         },
         loadStatus,
         async inspectSourceRemoval(_sourceId, signal) {
@@ -1056,14 +1091,14 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 await reporter.finish();
             }
         },
+        async previewDependencyPlacement(intent, signal) {
+            const evidence = await captureEvidence(intent, signal);
+            return evidence.dependencyPlan;
+        },
         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) {
+                if (evidence.sourceWrite?.configDigest === evidence.sourceWrite?.proposedConfigDigest) {
                     throw new TuiOperationBlockedError('sourceNoChanges', '来源没有变化。');
                 }
                 return;
@@ -1073,7 +1108,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 await withResolvedCatalogPlugin({
                     selector: intent.pluginId,
                     cliVersion: packageInfo.version,
-                    freshnessPolicy: 'cacheFirst',
                     env: context.env,
                     signal,
                     ...(sessionContextForPlugin(intent.pluginId)
@@ -1108,89 +1142,45 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 && (intent.originIssue.category === 'sourceMissing'
                     || intent.originIssue.category === 'sourceUnavailable');
             const sourceIds = pluginIds.map((pluginId) => parsePluginId(pluginId).sourceId);
-            const catalogOperation = offlineCleanup
+            let catalogOperation = offlineCleanup
                 ? undefined
                 : sessionCatalogOperationContext
                     ? selectCatalogOperationContext(sessionCatalogOperationContext, sourceIds)
                     : undefined;
-            const status = await statusCommandV5({
+            const statusOptions = {
                 plugins: pluginIds,
                 platform: intent.platform,
                 cwd: context.cwd,
                 env: context.env,
                 cliVersion: packageInfo.version,
-                ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
-                ...(offlineCleanup || sessionCatalogOperationContext
-                    ? { bootstrapMissingActive: false }
-                    : {}),
                 inventoryCatalogSourceReferences: readInventory,
+            };
+            let status = await statusCommandV6({
+                ...statusOptions,
+                ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
             });
-            signal.throwIfAborted();
-            await assertTypedIssueOrigin(intent, status.payload.targets);
-            assertIntentIsLegal(intent, status.payload.targets, status.targetRevisions);
-        },
-        async checkSource(sourceId, signal) {
-            const packageInfo = await readCliPackageInfo();
-            const configSnapshot = await readCatalogSourcesConfigSnapshot(context.env);
-            return withResolvedMultiSourceCatalog({
-                cliVersion: packageInfo.version,
-                freshnessPolicy: 'forceRemote',
-                sourceIds: [sourceId],
-                configSnapshot,
-                env: context.env,
-                signal,
-                consume: (catalog) => {
-                    const item = catalog.sources[0];
-                    if (item.error)
-                        throw item.error;
-                    return {
-                        sourceIdentity: item.resolution.sourceIdentity,
-                        requestedRef: item.resolution.requestedRef,
-                    };
-                },
-            });
-        },
-        async refreshCatalogSource(sourceId, signal, onState) {
-            let refreshError;
-            let refreshCompleted = false;
-            try {
-                await refreshCatalogSourceGeneration({
-                    sourceId,
-                    cliVersion: (await readCliPackageInfo()).version,
+            const platforms = intent.platform === 'both'
+                ? ['codex', 'claude']
+                : [intent.platform];
+            const missingSelectedTarget = platforms.some((platform) => !status.payload.targets.some((target) => target.pluginId === intent.pluginId
+                && target.platform === platform
+                && (platform === 'codex' || target.scope === intent.scope)));
+            if (!offlineCleanup && !catalogOperation && missingSelectedTarget) {
+                catalogOperation = await resolveCatalogOperationContext({
+                    sourceIds,
                     env: context.env,
+                    validatedStoreEntries,
+                    validatingStoreEntries,
                     signal,
-                    runtime: {
-                        ...options.catalogGenerationRuntime,
-                        onProgress: (event) => onState(event.state),
-                    },
                 });
-                refreshCompleted = true;
-            }
-            catch (error) {
-                refreshError = error;
+                status = await statusCommandV6({
+                    ...statusOptions,
+                    catalogOperationContext: catalogOperation,
+                });
             }
             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);
+            await assertTypedIssueOrigin(intent, status.payload.targets);
+            assertIntentIsLegal(intent, status.payload.targets, status.targetRevisions);
         },
         captureEvidence,
         logError(_error, code, logContext) {
@@ -1209,7 +1199,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             return withResolvedCatalogPlugin({
                 selector: pluginId,
                 cliVersion: packageInfo.version,
-                freshnessPolicy: 'cacheFirst',
                 env: context.env,
                 signal,
                 ...(sessionContextForPlugin(pluginId)
@@ -1244,7 +1233,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             return withResolvedCatalogPlugin({
                 selector: pluginId,
                 cliVersion: packageInfo.version,
-                freshnessPolicy: 'cacheFirst',
                 env: context.env,
                 signal,
                 ...(sessionContextForPlugin(pluginId)
@@ -1377,27 +1365,6 @@ 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)) {
@@ -1437,7 +1404,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 action: async (awHomeMutationToken) => {
                     await tuiControllerRuntimeTestHooks?.beforeMutationEvidenceCapture?.();
                     const operationInventory = createOperationInventoryReader();
-                    const currentEvidence = await captureEvidence(intent, undefined, undefined, false, operationInventory);
+                    const currentEvidence = await captureEvidence(intent, undefined, undefined, operationInventory, true);
                     if (operationEvidenceFingerprint(currentEvidence) !== operationEvidenceFingerprint(expectedEvidence)) {
                         throw new TuiOperationBlockedError('operationReviewStale', '确认后状态发生变化。');
                     }
@@ -1448,10 +1415,34 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     }
                     await tuiControllerRuntimeTestHooks?.afterMutationEvidenceCapture?.();
                     if (intent.kind === 'pluginWrite') {
+                        if (intent.dependencyPlacementOnly === 'desired') {
+                            const plan = currentEvidence.dependencyPlan;
+                            if (!plan || !expectedEvidence.projectIntentDigest) {
+                                throw operationReviewStale('确认信息缺少依赖位置或 project intent 证据。');
+                            }
+                            const location = { scope: 'project', cwd: context.cwd, env: context.env };
+                            const currentIntent = await readPluginIntentState(location);
+                            if (calculatePluginIntentDigest(currentIntent) !== expectedEvidence.projectIntentDigest) {
+                                throw operationReviewStale('确认后 project desired intent 发生变化。');
+                            }
+                            const plannedKeys = new Set(plan.targets.map((target) => `${target.pluginId}\0${target.platform}`));
+                            const nextIntent = canonicalizePluginIntentState({
+                                ...currentIntent,
+                                dependencyScopeOverrides: [
+                                    ...currentIntent.dependencyScopeOverrides.filter((override) => !plannedKeys.has(`${override.pluginId}\0${override.platform}`)),
+                                    ...plan.scopeOverrides,
+                                ],
+                            });
+                            await writePluginIntentState(location, nextIntent);
+                            return { dependencyPlan: plan, desiredPlacementUpdated: true };
+                        }
                         const options = {
                             cwd: context.cwd,
                             platform: intent.platform,
                             scope: intent.scope,
+                            ...(intent.action === 'install' && intent.dependencyScopeOverrides
+                                ? { dependencyScopeOverrides: intent.dependencyScopeOverrides }
+                                : {}),
                             ...(expectedEvidence.codexManager?.state === 'requires-install'
                                 ? { allowManagedCodexInstall: true }
                                 : {}),
@@ -1463,6 +1454,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             reinstall: reinstallWriteCommand,
                             uninstall: uninstallWriteCommand,
                             cleanup: cleanupWriteCommand,
+                            sync: installWriteCommand,
                         }[intent.action];
                         const currentSource = currentEvidence.source;
                         const offlineCleanup = currentEvidence.offlineCleanup;
@@ -1476,6 +1468,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(currentEvidence.dependencyPlan
                                 ? { expectedOperationDependencyPlan: currentEvidence.dependencyPlan }
                                 : {}),
+                            ...(currentEvidence.codexReconcilePlans
+                                ? { expectedCodexReconcilePlans: currentEvidence.codexReconcilePlans }
+                                : {}),
+                            ...(intent.action === 'sync' ? { reconcileIntentOnly: true } : {}),
                             expectedCatalogConfigDigest: expectedEvidence.catalog.configDigest,
                             ...(catalogOperation ? {
                                 catalogOperationContext: catalogOperation,
@@ -1500,7 +1496,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         return withResolvedCatalogPlugin({
                             selector: intent.pluginId,
                             cliVersion: packageInfo.version,
-                            freshnessPolicy: 'cacheFirst',
                             env: context.env,
                             ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                             consume: async ({ plugin, source }) => {