@lesliechan721/aw 0.1.0-beta.31 → 0.1.0-beta.33

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

@@ -54,6 +54,7 @@ export interface PluginInstallBatchTarget extends PluginWriteBatchTarget {
 export declare function pluginWriteBatchTargets(action: Exclude<BatchPluginWriteAction, 'install'>, pluginIds: readonly string[], statusTargets: readonly StatusScopedTarget[]): PluginWriteBatchTarget[];
 export interface PluginWriteBatchIntent {
     kind: 'pluginWriteBatch';
+    dependencyScopeOverrides?: DependencyScopeOverride[];
     action: BatchPluginWriteAction;
     selection: PluginWriteBatchSelection;
     platform: PlatformName | 'both';
@@ -408,6 +409,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 {
@@ -749,6 +758,7 @@ export interface TuiControllerSnapshot {
     activeReview?: OperationReviewModel;
     reviewPreparation?: ReviewPreparationSnapshot;
     result?: OperationExecuteResult;
+    canResumeInstallDraft?: boolean;
     operationHistorySummaries: OperationHistorySummary[];
     portableResultSkills?: string[];
     loadError?: {
@@ -857,11 +867,12 @@ export declare class TuiController {
     beginInstallFlow(pluginId: string, rootScope: Scope): void;
     setInstallRootScope(rootScope: Scope): void;
     setInstallPlatforms(platforms: PlatformName[]): void;
+    setInstallRootTargets(targets: PluginWriteBatchTarget[]): void;
     prepareInstallDependencyPlacement(): Promise<boolean>;
     setDependencyScope(pluginId: string, platform: PlatformName, scope: Scope): Promise<void>;
     resetDependencyScopes(): Promise<void>;
     installPlacementIntent(): Extract<OperationIntent, {
-        kind: 'pluginWrite';
+        kind: 'pluginWrite' | 'pluginWriteBatch';
     }>;
     listPlugins(options: {
         mode: 'browse' | 'installed';

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,
         });
@@ -822,6 +825,7 @@ export class TuiController {
                 ? { reviewPreparation: this.#reviewPreparation.snapshot }
                 : {}),
             ...(this.#result ? { result: this.#result } : {}),
+            ...(this.#recoverableInstallPlacementDraft ? { canResumeInstallDraft: true } : {}),
             operationHistorySummaries: this.#operationHistory.list(),
             ...(this.#portableResultSkills ? { portableResultSkills: this.#portableResultSkills } : {}),
             ...(this.#loadError ? { loadError: this.#loadError } : {}),
@@ -830,6 +834,8 @@ export class TuiController {
                 ? { installPlacementDraft: {
                         pluginId: this.#installPlacementDraft.pluginId,
                         rootScope: this.#installPlacementDraft.rootScope,
+                        ...(this.#installPlacementDraft.exactRootTargets
+                            ? { exactRootTargets: this.#installPlacementDraft.exactRootTargets } : {}),
                         platforms: this.#installPlacementDraft.platforms,
                         dependencyScopeOverrides: this.#installPlacementDraft.dependencyScopeOverrides,
                         state: this.#installPlacementDraft.state,
@@ -1229,6 +1235,10 @@ export class TuiController {
         if (intent.kind === 'pluginWriteBatch') {
             if (active?.kind === 'batchWrite')
                 return;
+            if (active?.kind === 'pluginInstall' && intent.action === 'install'
+                && intent.selection.kind === 'targets' && this.#installPlacementDraft
+                && intent.selection.targets.every((target) => target.pluginId === this.#installPlacementDraft.pluginId))
+                return;
             this.#router.beginFlow('batchWrite', { name: 'pluginList', mode: 'installed' });
             return;
         }
@@ -1284,14 +1294,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 +1306,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 });
         }
@@ -1349,10 +1363,17 @@ export class TuiController {
         this.#cancelReviewPreparation();
         this.#progress = { messages: [] };
         this.#progressTargets = [];
+        const installDraft = this.#installPlacementDraft;
+        const ownsInstallDraft = installDraft && (intent.kind === 'pluginWrite'
+            && intent.action === 'install' && installDraft.pluginId === intent.pluginId
+            || intent.kind === 'pluginWriteBatch' && intent.action === 'install'
+                && this.#router.activeFlow()?.kind === 'pluginInstall'
+                && intent.selection.kind === 'targets' && installDraft.exactRootTargets
+                && JSON.stringify(canonicalBatchTargets(intent.selection.targets))
+                    === JSON.stringify(installDraft.exactRootTargets));
         this.#recoverableInstallPlacementDraft = result.state === 'blocked'
-            && intent.kind === 'pluginWrite' && intent.action === 'install'
-            && this.#installPlacementDraft?.pluginId === intent.pluginId
-            ? structuredClone(this.#installPlacementDraft)
+            && 'returnRoute' in result && result.returnRoute && ownsInstallDraft
+            ? structuredClone(installDraft)
             : undefined;
         this.#installPlacementDraft = undefined;
         this.#recoverablePortableDraft = result.state !== 'succeeded'
@@ -1556,13 +1577,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 +1600,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 +2021,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;
@@ -2074,21 +2111,31 @@ export class TuiController {
         if (this.#router.snapshot.current.route.name !== 'result' || !result
             || !('returnRoute' in result) || !result.returnRoute)
             return;
+        if (result.operationKind === 'pluginWriteBatch' && !this.#recoverableInstallPlacementDraft)
+            return;
         this.#invalidatePortableResultRecheck();
         const returnRoute = this.#normalizeRoute(result.returnRoute);
         this.#router.back();
-        const kind = result.operationKind === 'configSave' || result.operationKind === 'configSaveBatch'
-            || result.operationKind === 'configReset'
-            ? 'configEdit'
-            : result.operationKind === 'portableInstall'
-                ? 'portableInstall'
-                : result.operationKind === 'sourceMutation' || result.operationKind === 'catalogGeneration'
-                    || result.operationKind === 'catalogSourcesRecovery'
-                    ? 'sourceEdit'
-                    : 'pluginMaintenance';
+        const kind = this.#recoverableInstallPlacementDraft
+            ? 'pluginInstall'
+            : result.operationKind === 'configSave' || result.operationKind === 'configSaveBatch'
+                || result.operationKind === 'configReset'
+                ? 'configEdit'
+                : result.operationKind === 'portableInstall'
+                    ? 'portableInstall'
+                    : result.operationKind === 'sourceMutation' || result.operationKind === 'catalogGeneration'
+                        || result.operationKind === 'catalogSourcesRecovery'
+                        ? 'sourceEdit'
+                        : 'pluginMaintenance';
         this.#router.beginFlow(kind, this.#router.snapshot.current.route);
-        if (result.operationKind === 'pluginWrite') {
+        if (this.#recoverableInstallPlacementDraft) {
             this.#installPlacementDraft = this.#recoverableInstallPlacementDraft;
+            if (this.#installPlacementDraft.exactRootTargets) {
+                this.#installPlacementDraft.state = 'selecting';
+                this.#installPlacementDraft.targets = [];
+                this.#installPlacementDraft.canContinue = false;
+                this.#installPlacementDraft.error = undefined;
+            }
         }
         if (result.operationKind === 'portableInstall') {
             this.#portableDraft = this.#recoverablePortableDraft;
@@ -2107,8 +2154,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'
@@ -2209,8 +2256,9 @@ export class TuiController {
             return;
         this.#cancelInstallPlacementRequest();
         draft.rootScope = rootScope;
+        draft.exactRootTargets = undefined;
+        draft.dependencyScopeOverrides = draft.dependencyScopeOverrides.filter((override) => rootScope !== 'user' || override.scope === 'user');
         draft.platforms = [];
-        draft.plan = undefined;
         draft.targets = [];
         draft.state = 'selecting';
         draft.canContinue = false;
@@ -2224,21 +2272,41 @@ export class TuiController {
         this.#cancelInstallPlacementRequest();
         const selected = [...new Set(platforms)].sort();
         draft.platforms = selected;
+        draft.exactRootTargets = undefined;
         draft.dependencyScopeOverrides = draft.dependencyScopeOverrides.filter((override) => selected.includes(override.platform));
-        draft.plan = undefined;
         draft.targets = [];
         draft.state = 'selecting';
         draft.canContinue = selected.length > 0;
         draft.error = undefined;
         this.#publish();
     }
+    setInstallRootTargets(targets) {
+        const draft = this.#installPlacementDraft;
+        if (!draft)
+            return;
+        const selected = canonicalBatchTargets(structuredClone(targets));
+        if (selected.length === 0 || selected.some((target) => target.pluginId !== draft.pluginId)
+            || new Set(selected.map((target) => target.platform)).size !== selected.length) {
+            throw new TuiOperationBlockedError('installPlacementIncomplete', '请为每个所选平台确定一个根插件位置。');
+        }
+        this.#cancelInstallPlacementRequest();
+        draft.exactRootTargets = selected;
+        draft.rootScope = selected[0].scope;
+        draft.platforms = selected.map((target) => target.platform);
+        draft.dependencyScopeOverrides = draft.dependencyScopeOverrides.filter((override) => selected.some((target) => target.platform === override.platform
+            && (target.scope === 'project' || override.scope === 'user')));
+        draft.targets = [];
+        draft.state = 'selecting';
+        draft.canContinue = true;
+        draft.error = undefined;
+        this.#publish();
+    }
     #cancelInstallPlacementRequest() {
         const cancelled = this.#installPlacementRequestAbort !== undefined;
         this.#installPlacementRequestToken += 1;
         this.#installPlacementRequestAbort?.abort();
         this.#installPlacementRequestAbort = undefined;
         if (cancelled && this.#installPlacementDraft?.state === 'loading') {
-            this.#installPlacementDraft.plan = undefined;
             this.#installPlacementDraft.targets = [];
             this.#installPlacementDraft.state = 'selecting';
             this.#installPlacementDraft.canContinue = false;
@@ -2250,6 +2318,16 @@ export class TuiController {
         if (!draft || draft.platforms.length === 0) {
             throw new TuiOperationBlockedError('installPlacementIncomplete', '请先明确选择目标平台。');
         }
+        if (draft.exactRootTargets)
+            return {
+                kind: 'pluginWriteBatch',
+                action: 'install',
+                selection: { kind: 'targets', targets: structuredClone(draft.exactRootTargets) },
+                platform: draft.platforms.length === 2 ? 'both' : draft.platforms[0],
+                scope: draft.rootScope,
+                ...(draft.dependencyScopeOverrides.length > 0
+                    ? { dependencyScopeOverrides: structuredClone(draft.dependencyScopeOverrides) } : {}),
+            };
         return {
             kind: 'pluginWrite',
             action: 'install',
@@ -2284,19 +2362,22 @@ export class TuiController {
                     throw new DOMException('Dependency placement preview was cancelled.', 'AbortError');
                 }
             };
-            const plan = await this.#trackRead(preview(this.#installPlacementIntent()));
-            throwIfCancelled();
-            if (!plan) {
-                draft.state = 'ready';
-                draft.plan = undefined;
-                draft.targets = [];
-                draft.canContinue = true;
-                this.#publish();
-                return false;
+            const placementIntent = this.#installPlacementIntent();
+            const intents = placementIntent.kind === 'pluginWrite'
+                ? [placementIntent]
+                : (draft.exactRootTargets ?? []).map((target) => ({
+                    kind: 'pluginWrite', action: 'install', ...target,
+                    dependencyScopeOverrides: draft.dependencyScopeOverrides.filter((override) => override.platform === target.platform),
+                }));
+            const plans = [];
+            for (const intent of intents) {
+                const plan = await this.#trackRead(preview(intent));
+                throwIfCancelled();
+                if (plan)
+                    plans.push(plan);
             }
-            draft.plan = structuredClone(plan);
-            draft.targets = dependencyPlacementTargets(plan);
-            const blocker = plan.targets.find((target) => target.action === 'block');
+            draft.targets = plans.flatMap(dependencyPlacementTargets);
+            const blocker = plans.flatMap((plan) => plan.targets).find((target) => target.action === 'block');
             draft.state = blocker ? 'blocked' : 'ready';
             draft.canContinue = !blocker;
             draft.error = blocker
@@ -2306,7 +2387,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 +2700,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 +2720,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 +2739,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 +3304,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 +3374,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