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

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

@@ -1,4 +1,3 @@
-import { type CatalogDevManagementViewModel, type CatalogManagementIntent, type CatalogManagementReviewEvidence, type CatalogManagementService, type CatalogPublicationManagementViewModel, type CatalogStoreManagementViewModel, type CatalogValidationViewModel, type CatalogWorkspaceManagementViewModel } from './catalog-management.js';
 import type { CatalogActivationMode, CatalogSource, CatalogGenerationActiveV1, CatalogGenerationCandidateEvidence, CatalogGenerationSyncResult, CatalogSourceImpact, DependencyScopeOverride, PlatformName, Scope } from '../types.js';
 import type { PortableReview } from '../portable/commands.js';
 import type { CatalogSourceUpdate } from '../utils/catalog-sources.js';
@@ -18,9 +17,9 @@ import type { CatalogSourceFreshnessViewModel } from './catalog-freshness.js';
 import type { CatalogSessionReusableCandidate } from './catalog-sources/types.js';
 import { type PluginWriteTaskBlockedTarget, type PluginWriteTaskCandidate, type PluginWriteTaskCause, type PluginWriteTaskGoal, type PluginWriteTaskIntent, type PluginWriteTaskTarget } from './plugin-write-task.js';
 export type { PluginWriteTaskBlockReason, PluginWriteTaskCandidate, PluginWriteTaskExpectedUpdate, PluginWriteTaskGoal, PluginWriteTaskIntent, PluginWriteTaskMethod, PluginWriteTaskTarget, } from './plugin-write-task.js';
-type CatalogActivationBlockReason = 'configDraft' | 'sourceDraft' | 'batchDraft' | 'catalogDraft' | 'portableDraft' | 'activeReview' | 'reviewPreparation' | 'writeProgress';
+type CatalogActivationBlockReason = 'configDraft' | 'sourceDraft' | 'batchDraft' | 'portableDraft' | 'activeReview' | 'reviewPreparation' | 'writeProgress';
 export interface ExternalDraftState {
-    kind: 'configDraft' | 'sourceDraft' | 'batchDraft' | 'catalogDraft';
+    kind: 'configDraft' | 'sourceDraft' | 'batchDraft';
     owner: string;
     flowId?: string;
     revision: number;
@@ -219,7 +218,7 @@ export type OperationIntent = {
     setPrimaryAfterActivation?: boolean;
 } | {
     kind: 'catalogSourcesRecovery';
-} | CatalogManagementIntent;
+};
 export interface OperationEvidence {
     catalog: {
         configDigest: string;
@@ -311,7 +310,6 @@ export interface OperationEvidence {
         }>['sourceMutation'];
         setPrimaryAfterActivation?: boolean;
     };
-    catalogManagement?: CatalogManagementReviewEvidence;
     portable?: PortableReview;
 }
 export interface OperationReviewChange {
@@ -387,6 +385,7 @@ export interface ReviewPreparationSnapshot {
     currentStage?: ReviewPreparationStageId;
     code?: 'reviewPreparationFailed';
     message?: string;
+    operationRecordId?: string;
 }
 export type OperationExecuteResult = {
     state: 'succeeded';
@@ -455,24 +454,6 @@ export interface OperationResultSummary {
     catalogAction?: Extract<OperationIntent, {
         kind: 'catalogGeneration';
     }>['action'];
-    catalogManagement?: {
-        action: CatalogManagementIntent['action'];
-        state: 'succeeded' | 'partial';
-        catalogVersion?: string;
-        planDigest?: string;
-        store?: {
-            deletedEntries: number;
-            deletedBytes: number;
-            retainedEntries: number;
-        };
-        publication?: {
-            catalogVersion: string;
-            planDigest: string;
-            state: 'prepared' | 'uncertain' | 'published';
-            remote: string;
-            branch: string;
-        };
-    };
     catalogGeneration?: Pick<CatalogGenerationSyncResult, 'activeChanged' | 'outcome'> & {
         catalogVersion: string;
     };
@@ -603,7 +584,6 @@ export interface SourceReferenceSummaryViewModel {
     }>;
 }
 export interface TuiControllerDependencies {
-    catalogManagement?: CatalogManagementService;
     beginCatalogSession?: (options?: {
         reuseValidatedGenerations?: boolean;
     }) => void;
@@ -821,12 +801,6 @@ export declare class TuiController {
     getConfigPage(pluginId: string, layer: {
         scope: Scope | 'effective';
     }, signal?: AbortSignal): Promise<ConfigPageViewModel>;
-    selectCatalogWorkspace(workspaceRoot?: string): Promise<CatalogWorkspaceManagementViewModel>;
-    getCatalogWorkspaceManagement(): Promise<CatalogWorkspaceManagementViewModel>;
-    validateCatalogWorkspace(): Promise<CatalogValidationViewModel>;
-    getCatalogDevManagement(): Promise<CatalogDevManagementViewModel>;
-    getCatalogStoreManagement(): Promise<CatalogStoreManagementViewModel>;
-    getCatalogPublicationManagement(): Promise<CatalogPublicationManagementViewModel>;
     previewConfigSaveImpact(intent: Extract<OperationIntent, {
         kind: 'configSave';
     }>, signal?: AbortSignal): Promise<NonNullable<OperationEvidence['config']>>;

package/dist/src/tui/controller.js

@@ -1,5 +1,4 @@
 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 { flattenStatusTargets, statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, statusTargetSharedNative, } from '../commands/status-v6.js';
@@ -139,13 +138,6 @@ function normalizeOperationIntent(intent) {
     if (intent.kind === 'pluginWriteTask') {
         return { ...intent, targets: canonicalPluginWriteTaskTargets(intent.targets) };
     }
-    if (intent.kind === 'catalogManagement' && intent.action === 'storePrune') {
-        const items = [...new Map(intent.items.map((item) => [
-                `${item.category}\0${item.storeKey}`,
-                item,
-            ])).values()].sort((left, right) => `${left.category}\0${left.storeKey}`.localeCompare(`${right.category}\0${right.storeKey}`, 'en'));
-        return { ...intent, items };
-    }
     if (intent.kind !== 'pluginWriteBatch')
         return intent;
     if (intent.selection.kind === 'targets') {
@@ -360,12 +352,6 @@ export function pluginWriteTaskFailedRequestedTargets(execution) {
     }));
 }
 function collectOperationSensitiveValues(intent) {
-    if (intent.kind === 'catalogManagement') {
-        return [
-            ...('ownerUrl' in intent && intent.ownerUrl ? [intent.ownerUrl] : []),
-            ...('remoteUrl' in intent && intent.remoteUrl ? [intent.remoteUrl] : []),
-        ];
-    }
     if (intent.kind !== 'configSave')
         return [];
     const sensitiveKeys = new Set([...(intent.sensitiveKeys ?? []), ...(intent.privateKeys ?? [])]);
@@ -413,22 +399,6 @@ function cloneFrozen(value) {
     return deepFreeze(structuredClone(value));
 }
 export function operationEvidenceFingerprint(evidence) {
-    if (evidence.catalogManagement) {
-        const management = evidence.catalogManagement;
-        return crypto.createHash('sha256')
-            .update(JSON.stringify(stableValue(management.action === 'storePrune'
-            ? {
-                action: management.action,
-                workspaceBinding: management.workspaceBinding,
-                authorizedStoreItems: management.authorizedStoreItems,
-            }
-            : {
-                action: management.action,
-                workspaceBinding: management.workspaceBinding,
-                evidenceDigest: management.evidenceDigest,
-            })))
-            .digest('hex');
-    }
     if ('taskPlan' in evidence) {
         const task = evidence.taskPlan;
         return crypto.createHash('sha256')
@@ -566,8 +536,6 @@ function issueCode(error) {
         return safeDiagnosticCode(safeOperationError.code, 'operationBlocked');
     if (error instanceof TuiOperationBlockedError)
         return error.code;
-    if (error instanceof CatalogManagementError)
-        return error.code;
     if (error instanceof CatalogGenerationError)
         return error.code;
     if (error instanceof Error && error.name === 'CatalogSourcesConfigConflictError') {
@@ -1095,12 +1063,6 @@ export class TuiController {
     }
     #ensureOperationFlow(intent) {
         const active = this.#router.activeFlow();
-        if (intent.kind === 'catalogManagement') {
-            if (active?.kind === 'catalogManagement')
-                return;
-            this.#router.beginFlow('catalogManagement', this.#router.snapshot.current.route);
-            return;
-        }
         if (intent.kind === 'pluginWriteTask') {
             if (active?.kind === 'pluginWriteTask')
                 return;
@@ -1193,17 +1155,6 @@ export class TuiController {
             }
             return this.#normalizeRoute({ name: 'sourceDetail', sourceId: intent.sourceId });
         }
-        if (intent.kind === 'catalogManagement') {
-            if (intent.action === 'devActivate' || intent.action === 'devDeactivate') {
-                return { name: 'catalogDev', step: 'overview' };
-            }
-            if (intent.action === 'storePrune')
-                return { name: 'catalogStore' };
-            if (intent.action === 'publishPlan' || intent.action === 'publishApply') {
-                return { name: 'catalogPublish', step: 'overview' };
-            }
-            return { name: 'catalogWorkspace', view: 'overview' };
-        }
         return { name: 'sourceList' };
     }
     #showResult(result, intent) {
@@ -2011,8 +1962,10 @@ export class TuiController {
     }
     listPlugins(options) {
         const query = options.query?.trim().toLocaleLowerCase('en');
+        const catalogPluginIds = new Set(this.#status?.pluginSummaries.map((plugin) => plugin.pluginId));
         return cloneFrozen((this.#viewModel?.plugins ?? []).filter((plugin) => (!options.sourceId || plugin.sourceId === options.sourceId)
-            && (options.mode === 'browse' || hasInstalledPlacement(plugin) || plugin.savedConfigScopes.length > 0)
+            && (options.mode === 'browse' ? catalogPluginIds.has(plugin.pluginId)
+                : hasInstalledPlacement(plugin) || plugin.savedConfigScopes.length > 0)
             && (options.installFilter !== 'uninstalled' || !hasInstalledPlacement(plugin))
             && (options.installFilter !== 'updateAvailable' || plugin.update?.state === 'available')
             && (!query || `${plugin.displayName}\n${plugin.description}\n${plugin.sourceId}`.toLocaleLowerCase('en').includes(query))));
@@ -2243,7 +2196,7 @@ export class TuiController {
         return this.#catalogSourcesSession.fullValidate(sourceId);
     }
     setExternalDraftState(states = []) {
-        const priority = { sourceDraft: 0, batchDraft: 1, catalogDraft: 2, configDraft: 3 };
+        const priority = { sourceDraft: 0, batchDraft: 1, configDraft: 2 };
         this.#externalDrafts = structuredClone(states).sort((left, right) => priority[left.kind] - priority[right.kind] || left.owner.localeCompare(right.owner, 'en'));
         this.#publish();
     }
@@ -2411,48 +2364,6 @@ export class TuiController {
             : this.#abort.signal;
         return cloneFrozen(await this.#trackRead(this.dependencies.getConfigPage(pluginId, structuredClone(layer), combined)));
     }
-    async selectCatalogWorkspace(workspaceRoot) {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.selectWorkspace(workspaceRoot)));
-    }
-    async getCatalogWorkspaceManagement() {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.getWorkspace()));
-    }
-    async validateCatalogWorkspace() {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.validateWorkspace()));
-    }
-    async getCatalogDevManagement() {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.getDev()));
-    }
-    async getCatalogStoreManagement() {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.getStore()));
-    }
-    async getCatalogPublicationManagement() {
-        this.#assertAcceptingActions();
-        if (!this.dependencies.catalogManagement) {
-            throw new TuiOperationBlockedError('catalogManagementUnavailable', 'Catalog management is unavailable.');
-        }
-        return cloneFrozen(await this.#trackRead(this.dependencies.catalogManagement.getPublication()));
-    }
     async previewConfigSaveImpact(intent, signal) {
         this.#assertAcceptingActions();
         const normalized = normalizeOperationIntent(intent);
@@ -2492,6 +2403,8 @@ export class TuiController {
         catch (error) {
             const code = issueCode(error);
             await this.#logOperationError(error, code, intent);
+            if (error instanceof TuiOperationBlockedError && error.diagnostics?.length)
+                throw error;
             throw new TuiOperationBlockedError(code, code === 'catalogGenerationUnavailable'
                 ? '本次加载时 Catalog 来源不可用。请刷新来源并重新加载后重试。'
                 : '操作未建立。请检查当前设置后重试。');
@@ -2564,23 +2477,6 @@ export class TuiController {
         return this.startReviewPreparation(structuredClone(intent), preparation.returnRoute);
     }
     #validateReviewIntent(intent) {
-        if (intent.kind === 'catalogManagement') {
-            if (intent.action === 'storePrune' && intent.items.length === 0) {
-                throw new TuiOperationBlockedError('catalogStoreSelectionInvalid', 'Select at least one reclaimable Catalog store item.');
-            }
-            if (intent.action === 'workspaceVersion'
-                && (intent.version === undefined) === (intent.bump === undefined)) {
-                throw new TuiOperationBlockedError('catalogVersionSelectionInvalid', 'Select exactly one Catalog version or bump level.');
-            }
-            if ((intent.action === 'publishPlan' || intent.action === 'publishApply')
-                && intent.remote !== undefined && intent.remoteUrl !== undefined) {
-                throw new TuiOperationBlockedError('catalogPublicationTargetInvalid', 'Select a Git remote name or one direct remote URL.');
-            }
-            if (intent.action === 'publishApply'
-                && !/^sha256:[0-9a-f]{64}$/u.test(intent.expectedPlanDigest)) {
-                throw new TuiOperationBlockedError('catalogPublicationPlanInvalid', 'Select an exact prepared Catalog publication plan.');
-            }
-        }
         if (intent.kind === 'pluginWriteTask') {
             if (intent.targets.length === 0
                 || JSON.stringify(intent.targets) !== JSON.stringify(canonicalPluginWriteTaskTargets(intent.targets))) {
@@ -2615,8 +2511,6 @@ export class TuiController {
         }
     }
     #reviewPreparationLabel(intent) {
-        if (intent.kind === 'catalogManagement')
-            return 'Catalog 管理';
         if (intent.kind === 'catalogSourcesRecovery')
             return 'Catalog 来源配置';
         if (intent.kind === 'pluginWriteTask')
@@ -2714,6 +2608,7 @@ export class TuiController {
                                     ? '本次加载时 Catalog 来源不可用。请刷新来源并重新加载后重试。'
                                     : '无法准备确认信息。请返回检查选择，或重试。';
             const preparationRecordId = `${this.#sessionEpoch}:${active.snapshot.id}`;
+            active.snapshot.operationRecordId = preparationRecordId;
             const carriedDiagnostics = error instanceof TuiOperationBlockedError
                 ? error.diagnostics : undefined;
             if (carriedDiagnostics?.length) {
@@ -3042,63 +2937,6 @@ export class TuiController {
                 ...executionProjection,
                 sensitiveValues: collectOperationSensitiveValues(ticket.intent),
             });
-            if (ticket.intent.kind === 'catalogManagement') {
-                if (ticket.intent.action === 'devActivate' || ticket.intent.action === 'devDeactivate') {
-                    this.dependencies.beginCatalogSession?.();
-                    generation = ++this.#generation;
-                    try {
-                        const refreshed = await this.dependencies.loadStatus(this.#abort.signal);
-                        if (!this.#operationIsCurrent(generation)) {
-                            return this.#detachedBlocked(operationId, ticket.intent);
-                        }
-                        this.#applyStatus(refreshed);
-                    }
-                    catch (reloadError) {
-                        if (!this.#operationIsCurrent(generation)) {
-                            return this.#detachedBlocked(operationId, ticket.intent);
-                        }
-                        await this.#logErrorSafe(reloadError, 'tuiStateReloadFailed', {
-                            privateConfigOperation: true,
-                        });
-                        this.#status = undefined;
-                        this.#viewModel = undefined;
-                        this.#phase = 'error';
-                        this.#loadError = {
-                            code: 'tuiStateReloadFailed',
-                            message: 'Catalog 来源已变更，但插件状态刷新失败。请重新加载后再继续操作。',
-                        };
-                        return this.#setBlocked(operationId, 'tuiStateReloadFailed', {
-                            intent: ticket.intent,
-                            navigation: 'result',
-                            returnRoute: ticket.returnRoute,
-                            writeMayHaveCompleted: true,
-                        });
-                    }
-                }
-                const baseSummary = operationResultSummary(ticket.intent, execution);
-                const summary = {
-                    ...baseSummary,
-                    elapsedMs: Math.max(0, (this.dependencies.now?.() ?? Date.now()) - startedAtMs),
-                    messages: [...this.#progress.messages, ...(baseSummary.messages ?? [])].slice(-8)
-                        .map((message) => sanitizeDiagnosticText(message, [], collectOperationSensitiveValues(ticket.intent))),
-                };
-                const projection = this.#operationDiagnostics.get(operationId);
-                if (projection)
-                    projection.effects.finalVerification = 'completed';
-                this.#progress = { ...this.#progress, elapsedMs: summary.elapsedMs };
-                const result = {
-                    state: summary.code === 'operationPartial' ? 'partial' : 'succeeded',
-                    operationId,
-                    summary,
-                    operationKind: ticket.intent.kind,
-                    returnRoute: structuredClone(this.#normalizeRoute(ticket.returnRoute)),
-                };
-                this.#result = result;
-                this.#activeReview = undefined;
-                this.#showResult(result, ticket.intent);
-                this.#publish();
-                return cloneFrozen(result);
-            }
             if (ticket.intent.kind === 'sourceMutation' && ticket.intent.action === 'update') {
                 const confirmedAutoCheck = catalogSourceAutoCheckOnlyValue(ticket.intent.update);
                 if (confirmedAutoCheck !== undefined) {
@@ -3375,14 +3213,6 @@ export class TuiController {
             if (code === 'operationReviewStale' || code === 'catalogGenerationReviewStale') {
                 return this.#rebuildStaleReview(ticket, operationId, undefined, generation);
             }
-            if (ticket.intent.kind === 'catalogManagement') {
-                return this.#setBlocked(operationId, code, {
-                    intent: ticket.intent,
-                    navigation: 'result',
-                    returnRoute: ticket.returnRoute,
-                    writeMayHaveCompleted: true,
-                });
-            }
             generation = ++this.#generation;
             let finalVerification = 'completed';
             try {
@@ -3486,32 +3316,6 @@ export class TuiController {
         });
     }
     async #rebuildStaleReview(ticket, operationId, currentEvidence, generation = this.#generation) {
-        if (ticket.intent.kind === 'catalogManagement') {
-            let evidence = currentEvidence;
-            try {
-                evidence ??= await this.dependencies.captureEvidence(structuredClone(ticket.intent), this.#abort.signal);
-            }
-            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,
-                    returnRoute: ticket.returnRoute,
-                });
-            }
-            const review = this.#storeOperationReview(ticket.intent, evidence, 'replace', ticket.returnRoute);
-            const result = {
-                state: 'stale',
-                operationId,
-                review,
-                ...this.#operationIdentity(ticket.intent),
-            };
-            this.#recordStaleAttempt(operationId, ticket.intent);
-            this.#result = result;
-            this.#publish();
-            return cloneFrozen(result);
-        }
         this.dependencies.beginCatalogSession?.();
         generation = ++this.#generation;
         try {
@@ -3667,22 +3471,6 @@ export class TuiController {
     }
 }
 function operationResultSummaryUnsafe(intent, execution) {
-    if (intent.kind === 'catalogManagement') {
-        const result = execution;
-        return {
-            code: result.state === 'partial' ? 'operationPartial' : 'operationSucceeded',
-            message: result.message,
-            messages: result.messages,
-            catalogManagement: {
-                action: result.action,
-                state: result.state,
-                ...(result.catalogVersion ? { catalogVersion: result.catalogVersion } : {}),
-                ...(result.planDigest ? { planDigest: result.planDigest } : {}),
-                ...(result.store ? { store: structuredClone(result.store) } : {}),
-                ...(result.publication ? { publication: structuredClone(result.publication) } : {}),
-            },
-        };
-    }
     if (intent.kind === 'catalogSourcesRecovery') {
         const result = execution;
         return {