@lesliechan721/aw 0.1.0-beta.18 → 0.1.0-beta.20

package/dist/src/tui/controller.d.ts

@@ -3,7 +3,7 @@ import type { CatalogActivationMode, CatalogSource, CatalogGenerationActiveV1, C
 import type { PortableReview } from '../portable/commands.js';
 import type { CatalogSourceUpdate } from '../utils/catalog-sources.js';
 import type { CatalogGenerationFreshnessState, CatalogGenerationFreshnessResult } from '../utils/catalog-generation-service.js';
-import type { StatusV7Payload, StatusV7PluginSummary, StatusV7Target, StatusTargetRevision } from '../commands/status-v6.js';
+import type { StatusV8Payload, StatusV8PluginSummary, StatusScopedTarget, StatusTargetRevision } from '../commands/status-v6.js';
 import type { ReconcileOperationPlan } from '../commands/reconcile-operation-plan.js';
 import type { RebuildCommandResult } from '../commands/rebuild-command.js';
 import type { OfflineCleanupTargetEvidence } from '../commands/offline-cleanup-evidence.js';
@@ -11,7 +11,7 @@ import type { CodexReconcilePlan } from '../utils/codex-reconciler.js';
 import type { OperationPlan } from '../commands/operation-plan.js';
 import type { RebuildProgressFeed, RebuildProgressSnapshot } from '../output/rebuild-progress.js';
 import { type ConfigPageViewModel, type ConfigGroupViewModel, type InstallPlacementDraftViewModel, type PluginListItemViewModel, type PluginDependencyOverviewViewModel, type PortableSkillSelectionViewModel, type SourceHealthViewModel, type SourceDetailViewModel, type TuiViewModel, type UserIssueCategory, type UserIssueViewModel } from './model.js';
-import { OperationHistoryStore, type OperationDiagnosticDetail, type OperationEffectFacts, type OperationHistorySummary, type OperationReportPreview, type SaveOperationReportResult } from './operation-history.js';
+import { OperationHistoryStore, type OperationDiagnosticDetail, type OperationEffectFacts, type OperationHistorySummary, type OperationReportPreview, type SafeOperationDiagnostic, type SaveOperationReportResult } from './operation-history.js';
 import { type ConfigInvalidStoreEvidence, type PluginInstallFilter, type PortableBlockerCode, type TuiPageContext, type TuiRoute, type TuiRouterSnapshot } from './router.js';
 import { type CatalogSourceGenerationViewModel } from './catalog-generation.js';
 import type { CatalogSourceFreshnessViewModel } from './catalog-freshness.js';
@@ -42,7 +42,11 @@ export interface PluginWriteBatchTarget {
     platform: PlatformName;
     scope: Scope;
 }
-export declare function pluginWriteBatchTargets(action: Exclude<BatchPluginWriteAction, 'install'>, pluginIds: readonly string[], statusTargets: readonly StatusV7Target[]): PluginWriteBatchTarget[];
+export interface PluginInstallBatchTarget extends PluginWriteBatchTarget {
+    state: 'add' | 'existing' | 'blocked';
+    reason?: string;
+}
+export declare function pluginWriteBatchTargets(action: Exclude<BatchPluginWriteAction, 'install'>, pluginIds: readonly string[], statusTargets: readonly StatusScopedTarget[]): PluginWriteBatchTarget[];
 export interface PluginWriteBatchIntent {
     kind: 'pluginWriteBatch';
     action: BatchPluginWriteAction;
@@ -340,6 +344,7 @@ export interface OperationReviewModel {
         version?: string;
     };
     changes: OperationReviewChange[];
+    confirmationDetails?: string[];
     technicalDetails?: string[];
     equivalentCommand?: string;
     primaryLabel: string;
@@ -561,8 +566,8 @@ export interface PluginOperationProgressLine {
 }
 export interface TuiStatusLoadResult {
     cliChannel?: 'latest' | 'beta';
-    payload: StatusV7Payload;
-    pluginSummaries: StatusV7PluginSummary[];
+    payload: StatusV8Payload;
+    pluginSummaries: StatusV8PluginSummary[];
     targetRevisions?: StatusTargetRevision[];
     sourceDetails?: SourceDetailViewModel[];
     configuredSources?: CatalogSource[];
@@ -677,7 +682,8 @@ export interface TuiControllerSnapshot {
 }
 export declare class TuiOperationBlockedError extends Error {
     readonly code: string;
-    constructor(code: string, message: string);
+    readonly diagnostics?: SafeOperationDiagnostic[];
+    constructor(code: string, message: string, diagnostics?: readonly SafeOperationDiagnostic[]);
 }
 export declare class TuiConfigInvalidStoreError extends Error {
     readonly code = "invalidConfigStores";
@@ -764,14 +770,17 @@ export declare class TuiController {
         installFilter?: PluginInstallFilter;
     }): PluginListItemViewModel[];
     getPluginOverview(pluginId: string): PluginListItemViewModel | undefined;
+    getPluginSourceIdentity(pluginId: string): string | undefined;
     listCurrentProjectIntentRoots(): string[];
     listPluginWriteBatchTargets(action: Exclude<BatchPluginWriteAction, 'install'>, pluginIds: readonly string[]): PluginWriteBatchTarget[];
+    listPluginInstallBatchTargets(pluginIds: readonly string[], platform: PlatformName | 'both', scope: Scope): PluginInstallBatchTarget[];
+    pluginHasInstallableTarget(pluginId: string): boolean;
     getPluginDependencyOverview(pluginId: string): PluginDependencyOverviewViewModel | undefined;
     listPluginDependencyOverviews(): PluginDependencyOverviewViewModel[];
     getBlockingDependents(pluginId: string, platform: PlatformName, scope: Scope): PluginDependencyOverviewViewModel['dependents'];
     getPlatformPlacement(pluginId: string, platform: PlatformName): PluginListItemViewModel['installedPlacements'][number] | undefined;
     listInstallTargets(pluginId: string, scope: Scope): InstallTargetOption[];
-    getTargetState(pluginId: string, platform: PlatformName, scope: Scope): StatusV7Payload['targets'][number]['state'] | undefined;
+    getTargetState(pluginId: string, platform: PlatformName, scope: Scope): StatusV8Payload['targets'][number]['state'] | undefined;
     listSources(): TuiViewModel['sourceTabs'];
     getSourceOverview(sourceId: string): {
         source?: TuiViewModel['sourceTabs'][number];
@@ -794,6 +803,7 @@ export declare class TuiController {
     pluginWriteTaskReturnRoute(route: Extract<TuiRoute, {
         name: 'pluginWriteTask';
     }>): TuiRoute;
+    returnToPluginWriteTaskBatchSelection(flowId: string): boolean;
     retryFailedPluginWriteBatch(): ReviewPreparationSnapshot | undefined;
     retryFailedPluginWriteTask(): ReviewPreparationSnapshot | undefined;
     catalogActivationBlockReason(): CatalogActivationBlockReason | undefined;

package/dist/src/tui/controller.js

@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
 import { CatalogManagementError, } from './catalog-management.js';
 import { CatalogGenerationError } from '../utils/catalog-generation-error.js';
 import { readSafeOperationError } from '../utils/safe-operation-diagnostic.js';
-import { statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, } from '../commands/status-v6.js';
+import { flattenStatusTargets, statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, statusTargetSharedNative, } from '../commands/status-v6.js';
 import { buildRebuildReceiptJson, requestedIntentAction } from '../output/command-receipt.js';
 import { buildOperationResultModel } from '../commands/operation-planner.js';
 import { buildOperationReviewProjection } from './operation-review-planner.js';
@@ -89,10 +89,13 @@ function reviewPreparationStageLabel(stage) {
 }
 export class TuiOperationBlockedError extends Error {
     code;
-    constructor(code, message) {
+    diagnostics;
+    constructor(code, message, diagnostics) {
         super(message);
         this.name = 'TuiOperationBlockedError';
         this.code = code;
+        if (diagnostics?.length)
+            this.diagnostics = [...structuredClone(diagnostics)];
     }
 }
 export class TuiConfigInvalidStoreError extends Error {
@@ -545,6 +548,18 @@ export function userIssueKey(issue) {
         issue.sourceId ?? '', issue.sourceIdentity ?? '', issue.platform ?? '', issue.scope ?? '']
         .join('\0');
 }
+function originIssueRemains(issue, origin) {
+    if (!origin.consumerPluginId || !origin.consumerPlatform || !origin.consumerScope) {
+        return userIssueKey(issue) === origin.issueKey;
+    }
+    return issue.category === origin.category
+        && issue.dependencyPluginId === origin.dependencyPluginId
+        && issue.dependencyPlatform === origin.dependencyPlatform
+        && issue.dependencyScope === origin.dependencyScope
+        && issue.affectedTargets?.some((target) => target.pluginId === origin.consumerPluginId
+            && target.platform === origin.consumerPlatform
+            && target.scope === origin.consumerScope) === true;
+}
 function issueCode(error) {
     const safeOperationError = readSafeOperationError(error);
     if (safeOperationError)
@@ -923,8 +938,12 @@ export class TuiController {
     }
     #captureThrownProjection(operationId, error, code, stage, intent, effects) {
         const sensitiveValues = intent ? collectOperationSensitiveValues(intent) : [];
+        const carried = error instanceof TuiOperationBlockedError ? error.diagnostics : undefined;
         this.#operationDiagnostics.set(operationId, {
-            diagnostics: [projectThrownOperationDiagnostic({
+            diagnostics: carried?.length ? carried.map((diagnostic, index) => ({
+                ...structuredClone(diagnostic),
+                id: `${this.#sessionEpoch}:${operationId}:failure:${index}`,
+            })) : [projectThrownOperationDiagnostic({
                     error,
                     id: `${this.#sessionEpoch}:${operationId}:failure`,
                     stage,
@@ -941,6 +960,89 @@ export class TuiController {
             sensitiveValues,
         });
     }
+    #appendThrownProjection(operationId, error, code, stage, intent) {
+        const existing = this.#operationDiagnostics.get(operationId);
+        if (!existing) {
+            this.#captureThrownProjection(operationId, error, code, stage, intent);
+            return;
+        }
+        const carried = error instanceof TuiOperationBlockedError ? error.diagnostics : undefined;
+        const diagnostics = carried?.length ? carried : [projectThrownOperationDiagnostic({
+                error,
+                id: `${this.#sessionEpoch}:${operationId}:failure:${existing.diagnostics.length}`,
+                stage,
+                fallbackCode: code,
+                sensitiveValues: existing.sensitiveValues,
+            })];
+        const offset = existing.diagnostics.length;
+        const appended = diagnostics.map((diagnostic, index) => ({
+            ...structuredClone(diagnostic),
+            id: `${this.#sessionEpoch}:${operationId}:failure:${offset + index}`,
+        }));
+        existing.diagnostics.push(...appended);
+        const targetDiagnostics = appended.filter((diagnostic) => diagnostic.target !== undefined);
+        if (targetDiagnostics.length > 0) {
+            existing.targets = [...new Map([
+                    ...(existing.targets ?? []).map((target) => [[
+                            target.pluginId ?? '', target.platform, target.scope,
+                        ].join('\0'), target]),
+                    ...targetDiagnostics.map((diagnostic) => [[
+                            diagnostic.target.pluginId ?? '', diagnostic.target.platform, diagnostic.target.scope,
+                        ].join('\0'), {
+                            ...diagnostic.target,
+                            state: 'skipped',
+                            errorCode: diagnostic.code,
+                            diagnosticIds: targetDiagnostics.filter((candidate) => candidate.target
+                                && candidate.target.pluginId === diagnostic.target.pluginId
+                                && candidate.target.platform === diagnostic.target.platform
+                                && candidate.target.scope === diagnostic.target.scope).map((candidate) => candidate.id),
+                        }]),
+                ]).values()];
+        }
+    }
+    #recordStaleAttempt(operationId, intent) {
+        if (!this.#operationDiagnostics.has(operationId)) {
+            this.#captureThrownProjection(operationId, undefined, 'operationReviewStale', 'reviewValidation', intent);
+        }
+        const projected = this.#operationDiagnostics.get(operationId);
+        const recordId = `${this.#sessionEpoch}:${operationId}`;
+        const diagnosticsByTarget = new Map();
+        for (const diagnostic of projected.diagnostics) {
+            if (!diagnostic.target)
+                continue;
+            const key = [diagnostic.target.pluginId ?? '', diagnostic.target.platform, diagnostic.target.scope].join('\0');
+            diagnosticsByTarget.set(key, [...(diagnosticsByTarget.get(key) ?? []), diagnostic]);
+        }
+        const targets = projected.targets ?? [...diagnosticsByTarget.entries()].map(([key, diagnostics]) => {
+            const [pluginId, platform, scope] = key.split('\0');
+            return {
+                ...(pluginId ? { pluginId } : {}),
+                platform,
+                scope,
+                state: 'skipped',
+                errorCode: diagnostics[0].code,
+                diagnosticIds: diagnostics.map((diagnostic) => diagnostic.id),
+            };
+        });
+        this.#operationHistory.record({
+            summary: {
+                recordId,
+                epoch: this.#sessionEpoch,
+                operationId,
+                createdAtMs: this.dependencies.now?.() ?? Date.now(),
+                state: 'blocked',
+                code: projected.diagnostics[0]?.code ?? 'operationReviewStale',
+                message: '状态已变化，原确认没有执行。已准备新的确认信息。',
+                operationKind: intent.kind,
+                ...('pluginId' in intent ? { pluginId: intent.pluginId } : {}),
+                diagnosticCount: projected.diagnostics.length,
+                effects: projected.effects,
+            },
+            diagnostics: projected.diagnostics,
+            targets,
+        }, { sensitiveValues: projected.sensitiveValues });
+        this.#operationDiagnostics.delete(operationId);
+    }
     async #logErrorSafe(error, code, context) {
         try {
             await this.dependencies.logError?.(error, code, context);
@@ -1056,6 +1158,14 @@ export class TuiController {
     }
     #stableResultRoute(intent, result) {
         const active = this.#router.activeFlow();
+        if (intent.kind === 'pluginWriteTask'
+            && result.state === 'succeeded'
+            && 'returnRoute' in result
+            && result.returnRoute?.name === 'pluginWriteTask'
+            && result.returnRoute.goal === result.summary.task?.goal
+            && result.returnRoute.batchOrigin?.owner === 'batch-write') {
+            return { name: 'pluginList', mode: 'installed' };
+        }
         if (active?.parentFlowId)
             return this.#normalizeRoute(active.returnTarget);
         if (active && (intent.kind === 'portableInstall'
@@ -1145,7 +1255,18 @@ export class TuiController {
                 executionPolicy: 'all',
             }
             : undefined;
-        if (!this.#router.finishFlow(target, terminal))
+        const batchFlowId = result.state === 'succeeded'
+            && intent.kind === 'pluginWriteTask'
+            && 'returnRoute' in result
+            && result.returnRoute?.name === 'pluginWriteTask'
+            && result.returnRoute.goal === result.summary.task?.goal
+            && result.returnRoute.batchOrigin?.owner === 'batch-write'
+            ? result.returnRoute.batchOrigin.flowId
+            : undefined;
+        const finished = batchFlowId
+            ? this.#router.finishFlowById(batchFlowId, 'batchWrite', target, terminal)
+            : this.#router.finishFlow(target, terminal);
+        if (!finished)
             this.#router.replace(terminal);
     }
     #applyStatus(status) {
@@ -1900,15 +2021,93 @@ export class TuiController {
         const plugin = this.#viewModel?.plugins.find((entry) => entry.pluginId === pluginId);
         return plugin ? cloneFrozen(plugin) : undefined;
     }
+    getPluginSourceIdentity(pluginId) {
+        return flattenStatusTargets(this.#status?.payload.targets ?? []).find((target) => target.pluginId === pluginId)?.sourceIdentity;
+    }
     listCurrentProjectIntentRoots() {
-        return cloneFrozen([...new Set((this.#status?.payload.targets ?? []).flatMap((target) => {
+        return cloneFrozen([...new Set(flattenStatusTargets(this.#status?.payload.targets ?? []).flatMap((target) => {
                 const intent = statusTargetIntent(target);
                 return intent.relation === 'root' && intent.scopes.includes('project')
                     ? [target.pluginId] : [];
             }))].sort((left, right) => left.localeCompare(right, 'en')));
     }
     listPluginWriteBatchTargets(action, pluginIds) {
-        return cloneFrozen(pluginWriteBatchTargets(action, pluginIds, this.#status?.payload.targets ?? []));
+        return cloneFrozen(pluginWriteBatchTargets(action, pluginIds, flattenStatusTargets(this.#status?.payload.targets ?? [])));
+    }
+    listPluginInstallBatchTargets(pluginIds, platform, scope) {
+        const platforms = platform === 'both' ? ['codex', 'claude'] : [platform];
+        return cloneFrozen([...new Set(pluginIds)].flatMap((pluginId) => {
+            const plugin = this.#viewModel?.plugins.find((entry) => entry.pluginId === pluginId);
+            return platforms.map((targetPlatform) => {
+                const target = { pluginId, platform: targetPlatform, scope };
+                const statusTargets = flattenStatusTargets(this.#status?.payload.targets ?? []).filter((entry) => entry.pluginId === pluginId && entry.platform === targetPlatform);
+                const exactTarget = statusTargets.find((entry) => entry.scope === scope);
+                const alreadyConfigured = statusTargets.some((entry) => {
+                    const activation = statusTargetActivation(entry);
+                    return statusTargetIntent(entry).scopes.includes(scope)
+                        || (targetPlatform === 'codex'
+                            && activation?.evidence === 'observed'
+                            && activation[scope] === true);
+                });
+                const exactOwnership = exactTarget ? statusTargetOwnershipState(exactTarget) : 'absent';
+                if (alreadyConfigured || exactOwnership === 'present' || exactOwnership === 'partial') {
+                    return { ...target, state: 'existing' };
+                }
+                if (!plugin)
+                    return { ...target, state: 'blocked', reason: '插件已不在当前状态中' };
+                if (plugin.configOnly) {
+                    return { ...target, state: 'blocked', reason: '来源中没有可信插件定义' };
+                }
+                if (plugin.sourceUnavailable) {
+                    return { ...target, state: 'blocked', reason: '插件来源不可用' };
+                }
+                if (plugin.capabilityUnsupported) {
+                    return { ...target, state: 'blocked', reason: '当前 AW CLI 不支持插件所需功能' };
+                }
+                const option = this.listInstallTargets(pluginId, scope)
+                    .find((entry) => entry.platform === targetPlatform);
+                if (!option?.compatible) {
+                    return { ...target, state: 'blocked', reason: option?.disabled ?? '插件不支持所选工具或位置' };
+                }
+                const representativeTarget = exactTarget
+                    ?? (targetPlatform === 'codex' ? statusTargets[0] : undefined);
+                const uncertainObservation = (representativeTarget
+                    && statusTargetActivation(representativeTarget)?.evidence === 'unobserved')
+                    || statusTargets.some((entry) => statusTargetSharedNative(entry)?.state === 'unobserved');
+                if (uncertainObservation) {
+                    return { ...target, state: 'blocked', reason: '无法确认所选位置是否缺失' };
+                }
+                if (!representativeTarget || representativeTarget.state === 'blocked') {
+                    return {
+                        ...target,
+                        state: 'blocked',
+                        reason: representativeTarget?.reasons.find((reason) => reason.severity === 'blocking')?.message
+                            ?? '无法确认所选位置是否缺失',
+                    };
+                }
+                if (targetPlatform === 'codex') {
+                    const intent = statusTargetIntent(representativeTarget);
+                    const activation = statusTargetActivation(representativeTarget);
+                    const confirmedMissing = activation?.evidence === 'observed' && activation[scope] === false
+                        || intent.enabled && !intent.scopes.includes(scope)
+                        || representativeTarget.state === 'absent'
+                            && statusTargetOwnershipState(representativeTarget) === 'absent'
+                            && !intent.enabled;
+                    if (!confirmedMissing) {
+                        return { ...target, state: 'blocked', reason: '无法确认所选位置是否缺失' };
+                    }
+                }
+                else if (representativeTarget.state !== 'absent') {
+                    return { ...target, state: 'blocked', reason: '无法确认所选位置是否缺失' };
+                }
+                return { ...target, state: 'add' };
+            });
+        }).sort((left, right) => [left.pluginId, left.platform, left.scope].join('\0')
+            .localeCompare([right.pluginId, right.platform, right.scope].join('\0'), 'en')));
+    }
+    pluginHasInstallableTarget(pluginId) {
+        return ['project', 'user'].some((scope) => this.listPluginInstallBatchTargets([pluginId], 'both', scope)
+            .some((target) => target.state === 'add'));
     }
     getPluginDependencyOverview(pluginId) {
         const overview = this.#viewModel?.dependencyOverviews.find((entry) => entry.pluginId === pluginId);
@@ -1918,6 +2117,7 @@ export class TuiController {
         return cloneFrozen(this.#viewModel?.dependencyOverviews ?? []);
     }
     getBlockingDependents(pluginId, platform, scope) {
+        const statusTargets = flattenStatusTargets(this.#status?.payload.targets ?? []);
         const dependents = this.#viewModel?.dependencyOverviews.find((entry) => entry.pluginId === pluginId)?.dependents ?? [];
         return cloneFrozen(dependents.flatMap((dependent) => {
             const references = (dependent.placementReferences ?? []).filter((reference) => reference.dependency.pluginId === pluginId
@@ -1925,7 +2125,7 @@ export class TuiController {
                 && reference.dependency.scope === scope
                 && (scope === 'user' || reference.dependency.project === 'current')
                 && (reference.consumer.project === 'other'
-                    || this.#status?.payload.targets.find((target) => target.pluginId === reference.consumer.pluginId
+                    || statusTargets.find((target) => target.pluginId === reference.consumer.pluginId
                         && target.platform === reference.consumer.platform
                         && target.scope === reference.consumer.scope)?.state !== 'absent'));
             return references.length > 0 ? [{ ...dependent, placementReferences: references }] : [];
@@ -1946,7 +2146,8 @@ export class TuiController {
             }));
         }
         return plugin.supportedPlatforms.map((platform) => {
-            const platformTargets = this.#status?.payload.targets.filter((target) => target.pluginId === pluginId && target.platform === platform) ?? [];
+            const allStatusTargets = flattenStatusTargets(this.#status?.payload.targets ?? []);
+            const platformTargets = allStatusTargets.filter((target) => target.pluginId === pluginId && target.platform === platform) ?? [];
             const rootSummary = this.#status?.pluginSummaries.find((summary) => summary.pluginId === pluginId);
             const rootSupportedScopes = rootSummary?.supportedTargets?.[platform]
                 ?? platformTargets.filter((target) => !target.reasons.some((error) => error.code === 'unsupportedTarget')).map((target) => target.scope);
@@ -1962,7 +2163,7 @@ export class TuiController {
             for (const dependency of overview?.dependencies ?? []) {
                 const dependencySummary = this.#status?.pluginSummaries.find((summary) => summary.pluginId === dependency.pluginId);
                 const allowedScopes = dependencySummary?.supportedTargets?.[platform]
-                    ?? (this.#status?.payload.targets.filter((target) => target.pluginId === dependency.pluginId
+                    ?? (allStatusTargets.filter((target) => target.pluginId === dependency.pluginId
                         && target.platform === platform
                         && !target.reasons.some((error) => error.code === 'unsupportedTarget'))
                         .map((target) => target.scope) ?? []);
@@ -1975,7 +2176,7 @@ export class TuiController {
                     };
                 }
                 const collisionAtEveryViableScope = viableScopes.every((candidateScope) => {
-                    const target = this.#status?.payload.targets.find((entry) => entry.pluginId === dependency.pluginId
+                    const target = allStatusTargets.find((entry) => entry.pluginId === dependency.pluginId
                         && entry.platform === platform
                         && entry.scope === candidateScope);
                     return Boolean(target && targetHasArtifactCollision(target));
@@ -1992,7 +2193,7 @@ export class TuiController {
         });
     }
     getTargetState(pluginId, platform, scope) {
-        return this.#status?.payload.targets.find((target) => target.pluginId === pluginId
+        return flattenStatusTargets(this.#status?.payload.targets ?? []).find((target) => target.pluginId === pluginId
             && target.platform === platform
             && target.scope === scope)?.state;
     }
@@ -2075,6 +2276,23 @@ export class TuiController {
             ? active.returnTarget
             : route);
     }
+    returnToPluginWriteTaskBatchSelection(flowId) {
+        this.#assertAcceptingActions();
+        const route = this.#router.snapshot.current.route;
+        if (route.name !== 'review'
+            || this.#activeReview?.operationId !== route.operationId
+            || this.#activeReview.operationKind !== 'pluginWriteTask')
+            return false;
+        const reviewToken = this.#activeReview.reviewToken;
+        const returned = this.#router.returnToBatchSelection(flowId);
+        if (!returned)
+            return false;
+        this.#cancelReviewPreparation();
+        this.#tickets.delete(reviewToken);
+        this.#activeReview = undefined;
+        this.#publish();
+        return true;
+    }
     retryFailedPluginWriteBatch() {
         if (!this.#batchRetryIntent)
             return undefined;
@@ -2496,13 +2714,24 @@ export class TuiController {
                                     ? '本次加载时 Catalog 来源不可用。请刷新来源并重新加载后重试。'
                                     : '无法准备确认信息。请返回检查选择，或重试。';
             const preparationRecordId = `${this.#sessionEpoch}:${active.snapshot.id}`;
-            const preparationDiagnostic = projectThrownOperationDiagnostic({
-                error,
-                id: `${preparationRecordId}:failure`,
-                stage: active.snapshot.currentStage ?? 'reviewPreparation',
-                fallbackCode: code,
-                sensitiveValues: collectOperationSensitiveValues(intent),
-            });
+            const carriedDiagnostics = error instanceof TuiOperationBlockedError
+                ? error.diagnostics : undefined;
+            if (carriedDiagnostics?.length) {
+                active.snapshot.message = `无法准备确认信息：${carriedDiagnostics.slice(0, 3)
+                    .map((diagnostic) => sanitizeDiagnosticText(`${diagnostic.target?.pluginId ? `${diagnostic.target.pluginId}：` : ''}${diagnostic.safeMessage}（${safeDiagnosticCode(diagnostic.code, 'operationBlocked')}）`, [], collectOperationSensitiveValues(intent))).join('；')}`;
+            }
+            const preparationDiagnostics = carriedDiagnostics?.length
+                ? carriedDiagnostics.map((diagnostic, index) => ({
+                    ...structuredClone(diagnostic),
+                    id: `${preparationRecordId}:failure:${index}`,
+                }))
+                : [projectThrownOperationDiagnostic({
+                        error,
+                        id: `${preparationRecordId}:failure`,
+                        stage: active.snapshot.currentStage ?? 'reviewPreparation',
+                        fallbackCode: code,
+                        sensitiveValues: collectOperationSensitiveValues(intent),
+                    })];
             this.#operationHistory.record({
                 summary: {
                     recordId: preparationRecordId,
@@ -2510,18 +2739,29 @@ export class TuiController {
                     operationId: active.snapshot.id,
                     createdAtMs: this.dependencies.now?.() ?? Date.now(),
                     state: 'blocked',
-                    code: preparationDiagnostic.code,
+                    code: preparationDiagnostics[0].code,
                     message: active.snapshot.message,
                     operationKind: intent.kind,
                     ...('pluginId' in intent ? { pluginId: intent.pluginId } : {}),
-                    diagnosticCount: 1,
+                    diagnosticCount: preparationDiagnostics.length,
                     effects: {
                         configCommit: 'notApplicable', awWrite: 'notStarted',
                         preApplyExternalEffect: 'notApplicable', finalVerification: 'notStarted',
                     },
                 },
-                diagnostics: [preparationDiagnostic],
-                targets: [],
+                diagnostics: preparationDiagnostics,
+                targets: [...new Map(preparationDiagnostics.flatMap((diagnostic) => diagnostic.target ? [[
+                            [diagnostic.target.pluginId ?? '', diagnostic.target.platform, diagnostic.target.scope].join('\0'),
+                            {
+                                ...diagnostic.target,
+                                state: 'skipped',
+                                errorCode: diagnostic.code,
+                                diagnosticIds: preparationDiagnostics.filter((candidate) => candidate.target
+                                    && candidate.target.pluginId === diagnostic.target.pluginId
+                                    && candidate.target.platform === diagnostic.target.platform
+                                    && candidate.target.scope === diagnostic.target.scope).map((candidate) => candidate.id),
+                            },
+                        ]] : [])).values()],
             }, { sensitiveValues: collectOperationSensitiveValues(intent) });
             this.#publish();
             await this.#logOperationError(error, code, intent);
@@ -3025,7 +3265,7 @@ export class TuiController {
             }
             const originIssue = ticket.intent.kind === 'pluginWrite' ? ticket.intent.originIssue : undefined;
             if (originIssue && !dependencyPartial
-                && this.#viewModel?.issues.some((issue) => userIssueKey(issue) === originIssue.issueKey)) {
+                && this.#viewModel?.issues.some((issue) => originIssueRemains(issue, originIssue))) {
                 return this.#setBlocked(operationId, 'issueStillPresent', {
                     intent: ticket.intent,
                     navigation: 'result',
@@ -3133,7 +3373,6 @@ export class TuiController {
             if (!this.#operationIsCurrent(generation))
                 return this.#detachedBlocked(operationId, ticket.intent);
             if (code === 'operationReviewStale' || code === 'catalogGenerationReviewStale') {
-                this.#operationDiagnostics.delete(operationId);
                 return this.#rebuildStaleReview(ticket, operationId, undefined, generation);
             }
             if (ticket.intent.kind === 'catalogManagement') {
@@ -3254,6 +3493,7 @@ export class TuiController {
             }
             catch (error) {
                 const code = issueCode(error);
+                this.#appendThrownProjection(operationId, error, code, 'reviewPreparation', ticket.intent);
                 await this.#logOperationError(error, code, ticket.intent);
                 return this.#setBlocked(operationId, code, {
                     intent: ticket.intent,
@@ -3267,6 +3507,7 @@ export class TuiController {
                 review,
                 ...this.#operationIdentity(ticket.intent),
             };
+            this.#recordStaleAttempt(operationId, ticket.intent);
             this.#result = result;
             this.#publish();
             return cloneFrozen(result);
@@ -3282,6 +3523,7 @@ export class TuiController {
         catch (error) {
             if (!this.#operationIsCurrent(generation))
                 return this.#detachedBlocked(operationId, ticket.intent);
+            this.#appendThrownProjection(operationId, error, 'tuiStateReloadFailed', 'statusReload', ticket.intent);
             await this.#logErrorSafe(error, 'tuiStateReloadFailed', { privateConfigOperation: true });
             return this.#setBlocked(operationId, 'tuiStateReloadFailed', {
                 intent: ticket.intent,
@@ -3297,6 +3539,7 @@ export class TuiController {
             if (!this.#operationIsCurrent(generation))
                 return this.#detachedBlocked(operationId, ticket.intent);
             const code = issueCode(error);
+            this.#appendThrownProjection(operationId, error, code, 'validate', intent);
             await this.#logOperationError(error, code, intent);
             if (!this.#operationIsCurrent(generation))
                 return this.#detachedBlocked(operationId, ticket.intent);
@@ -3325,6 +3568,7 @@ export class TuiController {
                 if (!this.#operationIsCurrent(generation))
                     return this.#detachedBlocked(operationId, ticket.intent);
                 const code = issueCode(error);
+                this.#appendThrownProjection(operationId, error, code, 'reviewPreparation', intent);
                 await this.#logOperationError(error, code, intent);
                 if (!this.#operationIsCurrent(generation))
                     return this.#detachedBlocked(operationId, ticket.intent);
@@ -3349,6 +3593,7 @@ export class TuiController {
             return this.#detachedBlocked(operationId, ticket.intent);
         const review = this.#storeOperationReview(intent, evidence, 'replace', ticket.returnRoute);
         const result = { state: 'stale', operationId, review, ...this.#operationIdentity(intent) };
+        this.#recordStaleAttempt(operationId, intent);
         this.#result = result;
         this.#publish();
         return cloneFrozen(result);