@lesliechan721/aw 0.1.0-beta.4 → 0.1.0-beta.6

package/dist/src/tui/controller.js

@@ -1,6 +1,19 @@
 import crypto from 'node:crypto';
 import { buildTuiViewModel, hasInstalledPlacement, } from './model.js';
+import { safeDiagnosticCode } from './diagnostics.js';
 import { TuiRouter, } from './router.js';
+function reviewPreparationStageLabel(stage) {
+    return {
+        validate: '验证当前状态',
+        status: '读取安装状态',
+        catalog: '解析 Catalog',
+        inventory: '检查本地现场',
+        dependencyPlan: '准备依赖计划',
+        config: '验证设置',
+        portable: '准备 Portable Skills',
+        evidence: '准备确认信息',
+    }[stage];
+}
 export class TuiOperationBlockedError extends Error {
     code;
     constructor(code, message) {
@@ -58,6 +71,14 @@ function operationLabels(intent) {
     }
     if (intent.kind === 'pluginWrite') {
         if (intent.originIssue) {
+            if (intent.action === 'cleanup') {
+                return {
+                    title: '清理已安装内容',
+                    description: '只清理可证明属于 AW 的现场内容；保留插件设置；不运行 uninstall lifecycle。',
+                    primaryLabel: '开始清理',
+                    destructive: true,
+                };
+            }
             return {
                 title: '处理问题',
                 description: '只执行所选问题处理动作；插件设置保持不变。',
@@ -310,7 +331,7 @@ export function extractPortableError(error) {
         : undefined;
     const message = error instanceof Error ? error.message : String(error);
     const fallback = message.match(/^([A-Za-z][A-Za-z0-9]*):/u)?.[1];
-    const diagnosticCode = typedCode ?? fallback ?? 'portableValidationFailed';
+    const diagnosticCode = safeDiagnosticCode(typedCode ?? fallback, 'portableValidationFailed');
     if (diagnosticCode === 'requiredConfigMissing')
         return { code: 'requiredConfigMissing', diagnosticCode };
     if (diagnosticCode === 'portableSkillsCliMissing')
@@ -340,6 +361,8 @@ export class TuiController {
     #progress = { messages: [] };
     #progressTargets = [];
     #activeReview;
+    #reviewPreparation;
+    #reviewPreparationToken = 0;
     #result;
     #loadError;
     #portableDraft;
@@ -390,6 +413,7 @@ export class TuiController {
             progress: this.#progress,
             progressTargets: this.#progressTargets,
             ...(this.#activeReview ? { activeReview: this.#activeReview } : {}),
+            ...(this.#reviewPreparation ? { reviewPreparation: this.#reviewPreparation.snapshot } : {}),
             ...(this.#result ? { result: this.#result } : {}),
             ...(this.#loadError ? { loadError: this.#loadError } : {}),
             ...(this.#portableDraft ? { portableDraft: this.#portableDraft } : {}),
@@ -421,6 +445,7 @@ export class TuiController {
         this.#viewModel = buildTuiViewModel({
             status: this.#status.payload,
             pluginSummaries: this.#status.pluginSummaries,
+            targetRevisions: this.#status.targetRevisions,
             sourceHealth: this.#health,
             sourceDetails: this.#status.sourceDetails,
             dependencyOverviews: this.#status.dependencyOverviews,
@@ -441,7 +466,7 @@ export class TuiController {
             || route.name === 'portableBlocker'
             || route.name === 'pluginDependencies'
             || route.name === 'installPlacement'
-            || route.name === 'installTools'
+            || route.name === 'installTargets'
             || route.name === 'pluginDetail'
             || route.name === 'platform'
             || route.name === 'pluginAbout'
@@ -449,13 +474,12 @@ export class TuiController {
             || route.name === 'configLayer'
             || route.name === 'configFields'
             || route.name === 'configFieldEditor'
-            || route.name === 'configPresets'
             || route.name === 'configUnavailable';
         if (pluginRoute && !this.#viewModel?.plugins.some((plugin) => plugin.pluginId === route.pluginId)) {
             return {
                 name: 'pluginList',
                 mode: route.name === 'pluginPreview' || route.name === 'pluginDependencies'
-                    || route.name === 'installPlacement' || route.name === 'installTools'
+                    || route.name === 'installPlacement' || route.name === 'installTargets'
                     ? 'browse'
                     : 'installed',
             };
@@ -685,6 +709,7 @@ export class TuiController {
         this.#publish();
     }
     push(route, context) {
+        this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#discardPortableDraftForRoute(route);
         this.#router.push(route, context);
@@ -818,6 +843,16 @@ export class TuiController {
         this.#publish();
     }
     async buildPortableInstallReview() {
+        const intent = this.#portableInstallIntent();
+        const draft = this.#portableDraft;
+        const expectedRoute = this.#router.snapshot.current.route;
+        return this.#runPortableRequest(`review:${JSON.stringify(intent)}`, async (signal, token) => {
+            const evidence = await this.dependencies.captureEvidence(structuredClone(intent), signal);
+            this.#assertPortableRequestCurrent(token, expectedRoute);
+            return this.#storeOperationReview(intent, evidence, 'push', this.#router.portableOrigin(draft.pluginId));
+        });
+    }
+    #portableInstallIntent() {
         const draft = this.#portableDraft;
         if (!draft?.canContinue) {
             throw new TuiOperationBlockedError('portableNoSkillsSelected', '至少选择一个 Skill。');
@@ -826,19 +861,17 @@ export class TuiController {
         if (unavailable.length > 0) {
             throw new TuiOperationBlockedError('portableScopeUnavailable', `所选范围不提供这些 Skill：${unavailable.map((candidate) => candidate.name).join(', ')}。请返回 Skill 选择或更改范围。`);
         }
-        const intent = {
+        return {
             kind: 'portableInstall',
             pluginId: draft.pluginId,
             scope: draft.scope,
             selectedSkills: draft.candidates.filter((candidate) => candidate.selected).map((candidate) => candidate.name),
             ...(draft.agentMode === 'explicit' ? { requestedAgents: draft.requestedAgents } : {}),
         };
-        const expectedRoute = this.#router.snapshot.current.route;
-        return this.#runPortableRequest(`review:${JSON.stringify(intent)}`, async (signal, token) => {
-            const evidence = await this.dependencies.captureEvidence(structuredClone(intent), signal);
-            this.#assertPortableRequestCurrent(token, expectedRoute);
-            return this.#storeOperationReview(intent, evidence, 'push', this.#router.portableOrigin(draft.pluginId));
-        });
+    }
+    startPortableInstallReviewPreparation() {
+        const intent = this.#portableInstallIntent();
+        return this.startReviewPreparation(intent, this.#router.portableOrigin(intent.pluginId));
     }
     discardPortableDraft() {
         this.#cancelPortableRequest();
@@ -846,6 +879,7 @@ export class TuiController {
         this.#publish();
     }
     replace(route, context) {
+        this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         const current = this.#router.snapshot.current.route;
         if (current.name === 'portableBlocker' && current.code === 'requiredConfigMissing'
@@ -856,11 +890,24 @@ export class TuiController {
         this.#router.replace(route, context);
         this.#publish();
     }
+    beginConfigFlow(pluginId) {
+        this.#router.beginConfigFlow(pluginId);
+        this.#router.push({
+            name: 'configFields',
+            pluginId,
+            layer: { scope: 'effective', projectLayer: 'shared' },
+        });
+        this.#publish();
+    }
+    configOrigin(pluginId) {
+        return this.#router.configOrigin(pluginId);
+    }
     updatePageContext(context) {
         this.#router.updateContext(context);
         this.#publish();
     }
     back() {
+        this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         const route = this.#router.snapshot.current.route;
         if (route.name === 'review' && this.#activeReview?.operationId === route.operationId) {
@@ -892,6 +939,14 @@ export class TuiController {
             this.resetPortableFlowToPreview(this.#result.pluginId, target, preserveDraft);
             return;
         }
+        if (this.#result?.state === 'succeeded'
+            && (this.#result.operationKind === 'configSave' || this.#result.operationKind === 'configReset')
+            && this.#result.pluginId
+            && this.#router.resetConfigFlow(this.#result.pluginId, target)) {
+            this.#result = undefined;
+            this.#publish();
+            return;
+        }
         const route = target ?? (this.#result && 'returnRoute' in this.#result
             ? this.#result.returnRoute
             : undefined);
@@ -911,8 +966,10 @@ export class TuiController {
             || route.name === 'portableAgentInput'
             || route.name === 'portableScope'
             || route.name === 'portableBlocker';
-        const portableOperationRoute = (route.name === 'review' || route.name === 'progress' || route.name === 'result')
-            && (this.#activeReview?.operationKind === 'portableInstall'
+        const portableOperationRoute = (route.name === 'reviewPreparing' || route.name === 'review'
+            || route.name === 'progress' || route.name === 'result')
+            && (this.#reviewPreparation?.snapshot.intent.kind === 'portableInstall'
+                || this.#activeReview?.operationKind === 'portableInstall'
                 || this.#result?.operationKind === 'portableInstall');
         if (!portableRoute && !portableOperationRoute) {
             this.#cancelPortableRequest();
@@ -970,6 +1027,7 @@ export class TuiController {
         const query = options.query?.trim().toLocaleLowerCase('en');
         return cloneFrozen((this.#viewModel?.plugins ?? []).filter((plugin) => (!options.sourceId || plugin.sourceId === options.sourceId)
             && (options.mode === 'browse' || hasInstalledPlacement(plugin))
+            && (options.installFilter !== 'uninstalled' || !hasInstalledPlacement(plugin))
             && (!query || `${plugin.displayName}\n${plugin.description}\n${plugin.sourceId}`.toLocaleLowerCase('en').includes(query))));
     }
     getPluginOverview(pluginId) {
@@ -997,6 +1055,64 @@ export class TuiController {
     getPlatformPlacement(pluginId, platform) {
         return this.getPluginOverview(pluginId)?.installedPlacements.find((placement) => placement.platform === platform);
     }
+    listInstallTargets(pluginId, scope) {
+        const plugin = this.#viewModel?.plugins.find((entry) => entry.pluginId === pluginId);
+        if (!plugin)
+            return [];
+        if (plugin.aggregateStatus === 'unavailable') {
+            return plugin.supportedPlatforms.map((platform) => ({
+                platform,
+                compatible: false,
+                disabled: '插件来源不可用',
+            }));
+        }
+        return plugin.supportedPlatforms.map((platform) => {
+            const placement = plugin.installedPlacements.find((entry) => entry.platform === platform);
+            if (!placement)
+                return { platform, compatible: false, disabled: '当前没有可信的平台能力信息' };
+            if (placement.state === 'scopeConflict') {
+                return { platform, compatible: false, disabled: '安装位置冲突；请先处理问题' };
+            }
+            if (placement.state === 'installed') {
+                return {
+                    platform,
+                    compatible: false,
+                    disabled: `已安装到${placement.scope === 'user' ? '所有项目' : '当前项目'}；请先移除现有安装`,
+                };
+            }
+            if (!placement.supportedScopes.includes(scope)) {
+                return { platform, compatible: false, disabled: '不支持所选位置' };
+            }
+            const overview = this.#viewModel?.dependencyOverviews.find((entry) => entry.pluginId === pluginId);
+            for (const dependency of overview?.dependencies ?? []) {
+                const dependentPlugin = this.#viewModel?.plugins.find((entry) => entry.pluginId === dependency.pluginId);
+                if (!dependentPlugin || !dependentPlugin.supportedPlatforms.includes(platform)) {
+                    return {
+                        platform,
+                        compatible: false,
+                        disabled: `${dependency.displayName} 不支持${platform === 'codex' ? 'Codex' : 'Claude Code'}`,
+                    };
+                }
+                const dependencyPlacement = dependentPlugin.installedPlacements.find((entry) => entry.platform === platform);
+                if (dependencyPlacement?.state === 'scopeConflict') {
+                    return { platform, compatible: false, disabled: `${dependency.displayName} 的安装位置冲突` };
+                }
+                if (dependencyPlacement?.state === 'installed') {
+                    if (dependencyPlacement.health !== 'ready') {
+                        return { platform, compatible: false, disabled: `${dependency.displayName} 需要先处理` };
+                    }
+                    if (scope === 'user' && dependencyPlacement.scope === 'project') {
+                        return { platform, compatible: false, disabled: `${dependency.displayName} 只在当前项目可用` };
+                    }
+                }
+                if (dependencyPlacement?.state === 'notInstalled'
+                    && !dependencyPlacement.supportedScopes.includes(scope)) {
+                    return { platform, compatible: false, disabled: `${dependency.displayName} 不支持所选位置` };
+                }
+            }
+            return { platform, compatible: true };
+        });
+    }
     getTargetState(pluginId, platform, scope) {
         return this.#status?.payload.targets.find((target) => target.pluginId === pluginId
             && target.platform === platform
@@ -1044,16 +1160,8 @@ export class TuiController {
     }
     async buildOperationReview(intent, returnRoute) {
         try {
-            this.#assertIssueOrigin(intent);
-            if (intent.kind === 'pluginWrite'
-                && (intent.action === 'uninstall' || intent.action === 'cleanup')
-                && intent.force !== true
-                && (intent.platform === 'both' ? ['codex', 'claude'] : [intent.platform])
-                    .some((platform) => this.getBlockingDependents(intent.pluginId, platform, intent.scope).length > 0)) {
-                throw new TuiOperationBlockedError('dependencyStillRequired', '仍有已安装插件依赖这个插件。请先查看完整依赖关系。');
-            }
-            await this.dependencies.validateIntent?.(structuredClone(intent), this.#abort.signal);
-            const evidence = await this.dependencies.captureEvidence(structuredClone(intent), this.#abort.signal);
+            this.#validateReviewIntent(intent);
+            const evidence = await this.#prepareReviewEvidence(intent, this.#abort.signal);
             return this.#storeOperationReview(intent, evidence, 'push', returnRoute);
         }
         catch (error) {
@@ -1062,6 +1170,142 @@ export class TuiController {
             throw new TuiOperationBlockedError(code, '操作未建立。请检查当前设置后重试。');
         }
     }
+    startReviewPreparation(intent, returnRoute) {
+        const inheritedReturnRoute = this.#reviewPreparation?.returnRoute;
+        const current = this.#router.snapshot.current.route;
+        const navigation = current.name === 'result' || current.name === 'reviewPreparing'
+            ? 'replace' : 'push';
+        const resolvedReturnRoute = returnRoute
+            ?? (current.name === 'reviewPreparing' ? inheritedReturnRoute : undefined)
+            ?? (current.name === 'result' && this.#result
+                && 'returnRoute' in this.#result && this.#result.returnRoute
+                ? this.#result.returnRoute
+                : current);
+        const normalizedReturnRoute = this.#normalizeRoute(resolvedReturnRoute);
+        const key = JSON.stringify(stableValue({ intent, returnRoute: normalizedReturnRoute }));
+        if (this.#reviewPreparation?.snapshot.state === 'running'
+            && this.#reviewPreparation.key === key) {
+            return cloneFrozen(this.#reviewPreparation.snapshot);
+        }
+        this.#cancelReviewPreparation();
+        const id = crypto.randomUUID();
+        const abort = new AbortController();
+        const token = ++this.#reviewPreparationToken;
+        const snapshot = {
+            id,
+            intent: structuredClone(intent),
+            state: 'running',
+            stages: this.dependencies.prepareReviewEvidence ? [] : [
+                { id: 'validate', label: '验证当前状态', state: 'running' },
+                { id: 'evidence', label: '准备确认信息', state: 'pending' },
+            ],
+            currentLabel: this.#reviewPreparationLabel(intent),
+        };
+        this.#reviewPreparation = {
+            snapshot,
+            key,
+            returnRoute: structuredClone(normalizedReturnRoute),
+            abort,
+            token,
+        };
+        this.#result = undefined;
+        this.#router[navigation]({ name: 'reviewPreparing', preparationId: id });
+        this.#publish();
+        queueMicrotask(() => void this.#runReviewPreparation(token));
+        return cloneFrozen(snapshot);
+    }
+    retryReviewPreparation() {
+        const preparation = this.#reviewPreparation;
+        if (!preparation || preparation.snapshot.state !== 'failed')
+            return undefined;
+        return this.startReviewPreparation(preparation.snapshot.intent, preparation.returnRoute);
+    }
+    #validateReviewIntent(intent) {
+        this.#assertIssueOrigin(intent);
+        if (intent.kind === 'pluginWrite'
+            && (intent.action === 'uninstall' || intent.action === 'cleanup')
+            && intent.force !== true
+            && (intent.platform === 'both' ? ['codex', 'claude'] : [intent.platform])
+                .some((platform) => this.getBlockingDependents(intent.pluginId, platform, intent.scope).length > 0)) {
+            throw new TuiOperationBlockedError('dependencyStillRequired', '仍有已安装插件依赖这个插件。请先查看完整依赖关系。');
+        }
+    }
+    #reviewPreparationLabel(intent) {
+        if ('pluginId' in intent) {
+            return this.#viewModel?.plugins.find((plugin) => plugin.pluginId === intent.pluginId)?.displayName
+                ?? pluginNameFromId(intent.pluginId);
+        }
+        return intent.sourceId;
+    }
+    #reviewPreparationIsCurrent(token) {
+        const preparation = this.#reviewPreparation;
+        return Boolean(preparation && preparation.token === token
+            && !preparation.abort.signal.aborted
+            && !this.#disposed
+            && this.#router.snapshot.current.route.name === 'reviewPreparing'
+            && this.#router.snapshot.current.route.preparationId === preparation.snapshot.id);
+    }
+    async #runReviewPreparation(token) {
+        const preparation = this.#reviewPreparation;
+        if (!preparation || preparation.token !== token)
+            return;
+        const intent = structuredClone(preparation.snapshot.intent);
+        const signal = AbortSignal.any([this.#abort.signal, preparation.abort.signal]);
+        try {
+            this.#validateReviewIntent(intent);
+            const evidence = await this.#prepareReviewEvidence(intent, signal, (stage) => {
+                if (!this.#reviewPreparationIsCurrent(token))
+                    return;
+                const existing = preparation.snapshot.stages.find((entry) => entry.id === stage);
+                preparation.snapshot.stages = preparation.snapshot.stages.map((entry) => entry.state === 'running' ? { ...entry, state: 'completed' } : entry);
+                if (existing) {
+                    preparation.snapshot.stages = preparation.snapshot.stages.map((entry) => entry.id === stage ? { ...entry, state: 'running' } : entry);
+                }
+                else {
+                    preparation.snapshot.stages.push({
+                        id: stage,
+                        label: reviewPreparationStageLabel(stage),
+                        state: 'running',
+                    });
+                }
+                this.#publish();
+            });
+            if (!this.#reviewPreparationIsCurrent(token))
+                return;
+            preparation.snapshot.stages = preparation.snapshot.stages.map((stage) => stage.state === 'running' ? { ...stage, state: 'completed' } : stage);
+            this.#publish();
+            const returnRoute = structuredClone(preparation.returnRoute);
+            this.#reviewPreparation = undefined;
+            this.#storeOperationReview(intent, evidence, 'replace', returnRoute);
+        }
+        catch (error) {
+            if (!this.#reviewPreparationIsCurrent(token))
+                return;
+            const active = this.#reviewPreparation;
+            active.snapshot.state = 'failed';
+            active.snapshot.stages = active.snapshot.stages.map((stage) => stage.state === 'running' ? { ...stage, state: 'failed' } : stage);
+            active.snapshot.code = 'reviewPreparationFailed';
+            active.snapshot.message = '无法准备确认信息。请返回检查选择，或重试。';
+            this.#publish();
+            await this.#logOperationError(error, issueCode(error), intent);
+        }
+    }
+    async #prepareReviewEvidence(intent, signal, onStage = () => undefined) {
+        if (this.dependencies.prepareReviewEvidence) {
+            return this.dependencies.prepareReviewEvidence(structuredClone(intent), signal, onStage);
+        }
+        await onStage('validate');
+        await this.dependencies.validateIntent?.(structuredClone(intent), signal);
+        await onStage('evidence');
+        return this.dependencies.captureEvidence(structuredClone(intent), signal);
+    }
+    #cancelReviewPreparation() {
+        if (!this.#reviewPreparation)
+            return;
+        this.#reviewPreparationToken += 1;
+        this.#reviewPreparation.abort.abort();
+        this.#reviewPreparation = undefined;
+    }
     async #logOperationError(error, code, intent) {
         await this.#logErrorSafe(error, code, {
             privateConfigOperation: intent.kind === 'configSave' || intent.kind === 'configReset'
@@ -1119,8 +1363,8 @@ export class TuiController {
             },
             changes: reviewChanges(intent, evidence, 'pluginId' in intent ? this.getPluginDependencyOverview(intent.pluginId) : undefined),
             technicalDetails: technicalDetails(evidence),
-            ...(intent.kind === 'pluginWrite' && intent.action === 'cleanup' && intent.force === true
-                ? { equivalentCommand: `aw cleanup ${intent.pluginId} --platform ${intent.platform} --scope ${intent.scope} --force` }
+            ...(intent.kind === 'pluginWrite' && intent.action === 'cleanup'
+                ? { equivalentCommand: `aw cleanup ${intent.pluginId} --platform ${intent.platform} --scope ${intent.scope}${intent.force === true ? ' --force' : ''}` }
                 : {}),
             primaryLabel: intent.kind === 'pluginWrite' && evidence.dependencyPlan
                 ? `${labels.primaryLabel} ${evidence.dependencyPlan.resolvedPluginIds.length} 个插件`
@@ -1293,19 +1537,26 @@ export class TuiController {
             const pluginSummary = ticket.intent.kind === 'pluginWrite'
                 ? operationResultSummary(ticket.intent, execution)
                 : undefined;
+            const hasFailedDependencyTarget = pluginSummary?.targets?.some((target) => target.relation !== undefined && (target.state === 'failed' || target.state === 'skipped'));
+            const hasPreservedTarget = pluginSummary?.targets?.some((target) => target.state === 'completed' || target.state === 'kept');
+            const dependencyPartial = pluginSummary?.code === 'operationPartial'
+                && Boolean(hasFailedDependencyTarget && hasPreservedTarget);
             const dependencyFailure = pluginSummary?.code === 'operationFailed'
-                && pluginSummary.targets?.some((target) => target.relation !== undefined
-                    && (target.state === 'failed' || target.state === 'skipped'));
-            if (pluginSummary?.code === 'operationFailed' && !dependencyFailure) {
-                return this.#setBlocked(operationId, 'operationFailed', {
+                && Boolean(hasFailedDependencyTarget);
+            if (pluginSummary?.code === 'operationFailed') {
+                const unsuccessfulTargets = pluginSummary.targets?.filter((target) => target.state === 'failed' || target.state === 'skipped') ?? [];
+                const dependencyStillRequired = unsuccessfulTargets.length > 0
+                    && unsuccessfulTargets.every((target) => target.errorCode === 'dependencyStillRequired');
+                return this.#setBlocked(operationId, dependencyStillRequired ? 'dependencyStillRequired' : 'operationFailed', {
                     intent: ticket.intent,
                     navigation: 'result',
                     returnRoute: ticket.returnRoute,
-                    writeMayHaveCompleted: true,
+                    ...(dependencyFailure || dependencyStillRequired ? { summary: pluginSummary } : {}),
+                    ...(!dependencyFailure && !dependencyStillRequired ? { writeMayHaveCompleted: true } : {}),
                 });
             }
             const originIssue = ticket.intent.kind === 'pluginWrite' ? ticket.intent.originIssue : undefined;
-            if (originIssue && !dependencyFailure
+            if (originIssue && !dependencyPartial
                 && this.#viewModel?.issues.some((issue) => userIssueKey(issue) === originIssue.issueKey)) {
                 return this.#setBlocked(operationId, 'issueStillPresent', {
                     intent: ticket.intent,
@@ -1326,7 +1577,7 @@ export class TuiController {
                     });
                 }
             }
-            const baseSummary = dependencyFailure && pluginSummary
+            const baseSummary = dependencyPartial && pluginSummary
                 ? { ...pluginSummary, code: 'operationPartial', message: '依赖安装没有全部完成。' }
                 : pluginSummary ?? operationResultSummary(ticket.intent, execution);
             const summary = {
@@ -1538,6 +1789,7 @@ export class TuiController {
             ...(options?.returnRoute ? { returnRoute: structuredClone(this.#normalizeRoute(options.returnRoute)) } : {}),
             ...(options?.writeMayHaveCompleted ? { writeMayHaveCompleted: true } : {}),
             ...(options?.verification ? { verification: options.verification } : {}),
+            ...(options?.summary ? { summary: structuredClone(options.summary) } : {}),
         };
         this.#result = structuredClone(result);
         this.#activeReview = undefined;
@@ -1587,13 +1839,17 @@ export class TuiController {
                         : origin.actionId === 'remove'
                             ? { action: 'uninstall', scope: issue.scope }
                             : undefined
-                    : issue.category === 'scopeConflict'
-                        ? origin.actionId === 'keepUserScope'
-                            ? { action: 'uninstall', scope: 'project' }
-                            : origin.actionId === 'keepProjectScope'
-                                ? { action: 'uninstall', scope: 'user' }
-                                : undefined
-                        : undefined;
+                    : issue.category === 'sourceUnavailable'
+                        ? origin.actionId === 'cleanup' && action.writeAction === 'cleanup'
+                            ? { action: 'cleanup', scope: issue.scope }
+                            : undefined
+                        : issue.category === 'scopeConflict'
+                            ? origin.actionId === 'keepUserScope'
+                                ? { action: 'uninstall', scope: 'project' }
+                                : origin.actionId === 'keepProjectScope'
+                                    ? { action: 'uninstall', scope: 'user' }
+                                    : undefined
+                            : undefined;
         const dependencyOriginValid = issue.category !== 'dependencyMissing' && issue.category !== 'dependencyNotReady'
             || (origin.consumerPluginId === issue.pluginId
                 && origin.consumerSourceIdentity === issue.sourceIdentity
@@ -1612,6 +1868,7 @@ export class TuiController {
         if (this.#disposed)
             return;
         this.#disposed = true;
+        this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#abort.abort();
         this.#cancelSourceRefreshes();
@@ -1644,6 +1901,7 @@ function operationResultSummary(intent, execution) {
                 requestedAgents: receipt.requestedAgents,
                 scope: receipt.scope,
                 materializationDigest: receipt.materializationDigest,
+                skillsCliVersion: receipt.skillsCliVersion,
                 missing: receipt.verification.missing,
                 verificationUnknown,
                 ...(receipt.failures[0]?.recovery ? { recovery: receipt.failures[0].recovery } : {}),
@@ -1691,6 +1949,9 @@ function operationResultSummary(intent, execution) {
                     relation: dependencyRelation(executionPlan, planned.pluginId),
                     requiredBy: planned.requiredBy,
                 } : {}),
+                ...(entry.errorCode === 'dependencyStillRequired'
+                    ? { errorCode: 'dependencyStillRequired' }
+                    : {}),
             }];
     });
     const inferredTargets = intent.kind === 'pluginWrite' && targets.length === 0