@lesliechan721/aw 0.1.0-beta.30 → 0.1.0-beta.32

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

@@ -408,6 +408,14 @@ export interface OperationReviewModel {
         blockedTargetCount: number;
         causeCount: number;
     };
+    rootSummary?: Array<{
+        pluginId: string;
+        version?: string;
+        targets: Array<{
+            platform: PlatformName | 'both';
+            scope: Scope;
+        }>;
+    }>;
 }
 export type ReviewPreparationStageId = 'refresh' | 'validate' | 'status' | 'catalog' | 'inventory' | 'dependencyPlan' | 'config' | 'portable' | 'evidence';
 export interface ReviewPreparationStage {

package/dist/src/tui/controller.js

@@ -768,8 +768,11 @@ export class TuiController {
                 this.#project();
                 this.#publish();
             },
-            onError: (error, code) => {
+            onError: (error, code, context) => {
                 void this.#logErrorSafe(error, code);
+                return this.#recordStandaloneFailure(code, context.fullValidation
+                    ? 'validate-catalog-source'
+                    : context.automatic ? 'auto-check-catalog-source' : 'check-catalog-source', error);
             },
             now: this.dependencies.now,
         });
@@ -1284,14 +1287,10 @@ export class TuiController {
     #stableResultRoute(intent, result) {
         const active = this.#router.activeFlow();
         if (intent.kind === 'pluginWriteTask' && active?.kind === 'pluginWriteTask'
-            && (active.parentFlowId || active.returnTarget.name === 'pluginWriteTask'
-                && active.returnTarget.goal !== intent.goal)) {
+            && active.returnTarget.name === 'pluginWriteTask'
+            && active.returnTarget.goal !== intent.goal) {
             return this.#normalizeRoute(active.returnTarget);
         }
-        const completedPluginId = completedSinglePluginId(intent, result);
-        if (completedPluginId) {
-            return this.#normalizeRoute({ name: 'pluginDetail', pluginId: completedPluginId });
-        }
         if (intent.kind === 'pluginWriteTask'
             && result.state === 'succeeded'
             && 'returnRoute' in result
@@ -1300,6 +1299,14 @@ export class TuiController {
             && result.returnRoute.batchOrigin?.owner === 'batch-write') {
             return { name: 'pluginList', mode: 'installed' };
         }
+        const completedPluginId = completedSinglePluginId(intent, result);
+        if (completedPluginId) {
+            return this.#normalizeRoute({ name: 'pluginDetail', pluginId: completedPluginId });
+        }
+        if (intent.kind === 'pluginWriteTask' && active?.kind === 'pluginWriteTask'
+            && active.parentFlowId) {
+            return this.#normalizeRoute(active.returnTarget);
+        }
         if (intent.kind === 'portableInstall' && result.state === 'succeeded') {
             return this.#normalizeRoute({ name: 'pluginDetail', pluginId: intent.pluginId });
         }
@@ -1556,13 +1563,19 @@ export class TuiController {
         if (!this.hasPortableSkills(pluginId)) {
             throw new TuiOperationBlockedError('portableUnsupported', '插件不提供通用 Skills。');
         }
+        const requestKey = `prepare:${pluginId}`;
+        if (this.#portablePending?.key === requestKey) {
+            return this.#portablePending.promise;
+        }
         this.#router.beginPortableFlow(pluginId);
+        this.#router[navigation]({ name: 'portablePreparing', pluginId });
+        this.#publish();
         const expectedRoute = this.#router.snapshot.current.route;
-        return this.#runPortableRequest(`prepare:${pluginId}`, async (signal, token) => {
+        return this.#runPortableRequest(requestKey, async (signal, token) => {
             const draft = await this.#buildPortableDraft(pluginId, false, signal);
             this.#assertPortableRequestCurrent(token, expectedRoute);
             this.#portableDraft = draft;
-            this.#router[navigation]({ name: 'portableSkillSelect', pluginId });
+            this.#router.replace({ name: 'portableSkillSelect', pluginId });
             this.#publish();
             return cloneFrozen(draft);
         });
@@ -1573,6 +1586,10 @@ export class TuiController {
         return this.#runPortableRequest(`refresh:${pluginId}`, async (signal, token) => {
             const draft = await this.#buildPortableDraft(pluginId, true, signal);
             this.#assertPortableRequestCurrent(token, expectedRoute);
+            if (this.#activeReview?.operationKind === 'portableInstall') {
+                this.#tickets.delete(this.#activeReview.reviewToken);
+                this.#activeReview = undefined;
+            }
             this.#portableDraft = draft;
             this.#publish();
             return cloneFrozen(draft);
@@ -1990,9 +2007,15 @@ export class TuiController {
             this.#tickets.delete(this.#activeReview.reviewToken);
             this.#activeReview = undefined;
         }
-        this.#router.back();
-        if (activeFlow
+        if (route.name === 'batchSelection' && activeFlow?.kind === 'batchWrite'
             && this.#router.snapshot.currentFrameId === activeFlow.originFrameId) {
+            this.#router.finishFlow();
+        }
+        else
+            this.#router.back();
+        if (activeFlow
+            && this.#router.snapshot.currentFrameId === activeFlow.originFrameId
+            && this.#router.snapshot.currentFlowId !== activeFlow.id) {
             this.#router.abandonFlow(activeFlow.id);
             if (activeFlow.kind === 'pluginInstall')
                 this.#installPlacementDraft = undefined;
@@ -2107,8 +2130,8 @@ export class TuiController {
             || route.name === 'operationReportPreview';
         if (readOnlyHistoryRoute && this.#router.activeFlow()?.kind === 'portableInstall')
             return;
-        const portableRoute = route.name === 'portableSkillSelect'
-            || route.name === 'portableSkillSummary'
+        const portableRoute = route.name === 'portablePreparing'
+            || route.name === 'portableSkillSelect'
             || route.name === 'portableDependencies'
             || route.name === 'portableAgentMode'
             || route.name === 'portableAgentInput'
@@ -2306,7 +2329,10 @@ export class TuiController {
                 }
                 : undefined;
             this.#publish();
-            return draft.targets.some((target) => !target.locked);
+            const editableDependencies = draft.targets.filter((target) => !target.locked);
+            return editableDependencies.some((target) => draft.targets.some((candidate) => candidate.pluginId === target.pluginId
+                && candidate.platform !== target.platform
+                && candidate.scope !== target.scope));
         }
         catch (error) {
             if (error instanceof Error && error.name === 'AbortError')
@@ -2616,7 +2642,16 @@ export class TuiController {
     }
     recheckCatalogSource(sourceId) {
         this.#assertAcceptingActions();
-        return this.#catalogSourcesSession.recheck(sourceId);
+        return this.#catalogSourcesSession.refresh(sourceId, this.#sourceCheckNeedsFullValidation(sourceId));
+    }
+    #sourceCheckNeedsFullValidation(sourceId) {
+        const generation = this.#catalogGenerations.get(sourceId);
+        const freshness = this.#catalogFreshness.get(sourceId);
+        const activeReady = generation?.state === 'ready';
+        return !activeReady
+            || freshness?.state === 'incompatible'
+            || freshness?.state === 'versionConflict'
+            || freshness?.state === 'rollbackDetected';
     }
     async recheckAllCatalogSources() {
         this.#assertAcceptingActions();
@@ -2627,8 +2662,9 @@ export class TuiController {
         const worker = async () => {
             while (next < sourceIds.length) {
                 const sourceId = sourceIds[next++];
-                if (sourceId)
-                    await this.#catalogSourcesSession.recheck(sourceId);
+                if (sourceId) {
+                    await this.#catalogSourcesSession.refresh(sourceId, this.#sourceCheckNeedsFullValidation(sourceId));
+                }
             }
         };
         await Promise.all(Array.from({ length: Math.min(2, sourceIds.length) }, () => worker()));
@@ -2645,7 +2681,7 @@ export class TuiController {
     beginPluginWriteBatch() {
         this.#assertAcceptingActions();
         this.#router.beginBatchFlow();
-        this.#router.push({ name: 'batchSelection' });
+        this.#router.replace({ name: 'batchSelection' }, this.#router.snapshot.current.context);
         this.#publish();
     }
     startPluginWriteBatchReview(intent) {
@@ -3210,6 +3246,36 @@ export class TuiController {
             ? evidence.source?.pluginVersion
                 ?? this.#viewModel?.plugins.find((plugin) => plugin.pluginId === intent.pluginId)?.version
             : undefined;
+        const rootSummary = intent.kind === 'pluginWriteTask'
+            ? [...new Set(evidence.taskPlan.requestedTargets
+                    .map((target) => target.pluginId))].map((rootPluginId) => {
+                const targets = evidence.taskPlan.requestedTargets
+                    .filter((target) => target.pluginId === rootPluginId);
+                const versions = [...new Set(targets.flatMap((target) => target.expectedUpdate?.activeVersion ? [target.expectedUpdate.activeVersion] : []))];
+                return {
+                    pluginId: rootPluginId,
+                    ...(versions.length === 1 ? { version: versions[0] } : {}),
+                    targets: targets.map(({ platform, scope }) => ({ platform, scope })),
+                };
+            })
+            : intent.kind === 'pluginWriteBatch'
+                ? evidence.requestedPluginIds.map((rootPluginId) => {
+                    const batchEvidence = evidence;
+                    const targetVersions = batchEvidence.targetVersions?.filter((target) => target.pluginId === rootPluginId) ?? [];
+                    const versions = [...new Set(targetVersions.flatMap((target) => {
+                            const version = intent.action === 'uninstall'
+                                ? target.installedVersion
+                                : target.availableVersion ?? target.installedVersion;
+                            return version ? [version] : [];
+                        }))];
+                    return {
+                        pluginId: rootPluginId,
+                        ...(versions.length === 1 ? { version: versions[0] } : {}),
+                        targets: batchEvidence.groups.filter((group) => group.requestedPluginIds.includes(rootPluginId))
+                            .map(({ platform, scope }) => ({ platform, scope })),
+                    };
+                })
+                : undefined;
         const review = {
             operationId,
             reviewToken,
@@ -3250,6 +3316,7 @@ export class TuiController {
                     causeCount: evidence.taskPlan.causes.length,
                 },
             } : {}),
+            ...(rootSummary && rootSummary.length > 0 ? { rootSummary } : {}),
             ...(evidence.source && 'catalogVersion' in evidence.source
                 && typeof evidence.source.catalogVersion === 'string'
                 && evidence.source.snapshotDigest