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

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

@@ -1,5 +1,5 @@
 import type { CliExecutionContext } from '../commands/runtime.js';
-import { type StatusTargetRevision, type StatusV7Target } from '../commands/status-v6.js';
+import { type StatusTargetRevision, type StatusScopedTarget, type StatusV8Target } from '../commands/status-v6.js';
 import { type CatalogSourceMutationProgress } from '../commands/catalog-source.js';
 import type { RebuildProgressFeed } from '../output/rebuild-progress.js';
 import { inventoryCatalogSourceReferences } from '../utils/catalog-source-references.js';
@@ -13,8 +13,8 @@ export interface TuiControllerRuntimeTestHooks {
     afterCatalogGenerationCandidateResolved?: () => Promise<void>;
 }
 export declare function setTuiControllerRuntimeTestHooksForTests(hooks: TuiControllerRuntimeTestHooks | undefined): void;
-export declare function statusTargetFingerprint(targets: StatusV7Target[], revisions?: StatusTargetRevision[]): string;
-export declare function configAffectedStatusTargets(targets: StatusV7Target[], pluginId: string, configScope: 'user' | 'project'): StatusV7Target[];
+export declare function statusTargetFingerprint(targets: StatusScopedTarget[], revisions?: StatusTargetRevision[]): string;
+export declare function configAffectedStatusTargets(targets: StatusV8Target[], pluginId: string, configScope: 'user' | 'project'): StatusScopedTarget[];
 export declare function createTuiControllerDependencies(context: CliExecutionContext, progressFeed?: RebuildProgressFeed, options?: {
     now?: () => number;
     inventoryCatalogSourceReferences?: typeof inventoryCatalogSourceReferences;

package/dist/src/tui/controller-runtime.js

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import { statusCommandV7, statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, } from '../commands/status-v6.js';
+import { flattenStatusTargets, statusCommandV8, statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, } from '../commands/status-v6.js';
 import { addCatalogSourceCommand, listCatalogSources, preflightCatalogSourceMutation, removeCatalogSourceCommand, setPrimaryCatalogSourceCommand, updateCatalogSourceCommand, } from '../commands/catalog-source.js';
 import { cleanupWriteCommand, failedWriteCommandResult, installWriteCommand, mergeWriteCommandResults, reinstallWriteCommand, syncWriteCommand, taskWriteCommand, uninstallWriteCommand, } from '../commands/write-commands.js';
 import { resolveSyncIntentSelection } from '../commands/sync-command.js';
@@ -19,6 +19,7 @@ import { inventoryCatalogSourceReferences } from '../utils/catalog-source-refere
 import { operationEvidenceMatches, operationEvidenceFingerprint, TuiConfigInvalidStoreError, TuiController, TuiOperationBlockedError, } from './controller.js';
 import { buildConfigGroups, buildConfigPage, buildTuiViewModel, projectPlatformPlacement, } from './model.js';
 import { buildPluginWriteTaskCandidates, buildPluginWriteTaskDraft, evaluatePluginWriteTaskRestoreVersion, pluginWriteTaskTargetKey, } from './plugin-write-task.js';
+import { projectExecutionDiagnostics, projectThrownOperationDiagnostic } from './diagnostic-projection.js';
 import { createCatalogManagementService, } from './catalog-management.js';
 import { projectCatalogSourceLocation } from '../utils/catalog-source-presentation.js';
 import { calculateCatalogSourceConfigFingerprint, calculateCatalogSourceIdentity, } from '../utils/catalog-source-identity.js';
@@ -91,8 +92,13 @@ export function statusTargetFingerprint(targets, revisions = []) {
             scope: target.scope,
             state: target.state,
             errors: target.reasons.map((error) => error.code).sort(),
+            sharedReasons: [...(target.sharedReasons ?? [])]
+                .sort((left, right) => `${left.code}\0${left.message}`.localeCompare(`${right.code}\0${right.message}`, 'en')),
             components: target.components.map((component) => [component.key, component.state])
                 .sort(([left], [right]) => left.localeCompare(right, 'en')),
+            sharedComponents: (target.sharedComponents ?? [])
+                .map((component) => [component.key, component.state, component.metadata])
+                .sort(([left], [right]) => left.localeCompare(right, 'en')),
         })).sort((left, right) => [left.pluginId, left.platform, left.scope].join('\0')
             .localeCompare([right.pluginId, right.platform, right.scope].join('\0'), 'en')),
         revisions: revisions.map((entry) => ({
@@ -106,7 +112,7 @@ export function statusTargetFingerprint(targets, revisions = []) {
 }
 export function configAffectedStatusTargets(targets, pluginId, configScope) {
     const affected = new Map();
-    for (const target of targets) {
+    for (const target of flattenStatusTargets(targets)) {
         const intent = statusTargetIntent(target);
         if (target.pluginId !== pluginId || !intent.enabled)
             continue;
@@ -146,8 +152,8 @@ function configIntentRequestsApply(intent) {
     return Object.keys(intent.updates ?? {}).length > 0
         || (intent.removeKeys?.length ?? 0) > 0;
 }
-function operationReviewStale(message) {
-    return new TuiOperationBlockedError('operationReviewStale', `operationReviewStale: ${message}`);
+function operationReviewStale(message, diagnostics) {
+    return new TuiOperationBlockedError('operationReviewStale', `operationReviewStale: ${message}`, diagnostics);
 }
 function sourceEvidenceForPlugin(source, pluginName) {
     const entry = source.manifest.entries.find((candidate) => candidate.name === pluginName);
@@ -364,7 +370,7 @@ async function loadDependencyOverviews(options) {
         }
     }
     const targetsByPlugin = new Map();
-    for (const target of options.status.payload.targets) {
+    for (const target of flattenStatusTargets(options.status.payload.targets)) {
         targetsByPlugin.set(target.pluginId, [...(targetsByPlugin.get(target.pluginId) ?? []), target]);
     }
     const unsupportedPluginIds = new Set(options.status.pluginSummaries
@@ -647,7 +653,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         if (catalogOperationContext)
             sessionCatalogOperationContext = catalogOperationContext;
         for (let attempt = 0; attempt < 3; attempt += 1) {
-            const result = await statusCommandV7({
+            const result = await statusCommandV8({
                 cwd: context.cwd,
                 env: context.env,
                 nativeCliRunner: context.nativeCliRunner,
@@ -1208,16 +1214,39 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(signal ? { signal } : {}),
                         });
                 }
-                catch {
-                    blockedTargets.push(...requestedTargets.map((target) => ({
-                        target,
-                        reason: 'targetUnavailable',
-                        issueIds: [],
-                    })));
+                catch (error) {
+                    if (error instanceof Error && error.name === 'AbortError')
+                        throw error;
+                    blockedTargets.push(...requestedTargets.map((target, index) => {
+                        const diagnostic = error instanceof CatalogGenerationError ? {
+                            id: `task-source:${sourceId}:${index}`,
+                            code: error.code,
+                            stage: 'source',
+                            sourceId,
+                            safeMessage: 'The Catalog source could not be prepared safely.',
+                            target: { pluginId: target.pluginId, platform: target.platform, scope: target.scope },
+                            causes: [],
+                            detailLines: [],
+                        } : projectThrownOperationDiagnostic({
+                            error,
+                            id: `task-source:${sourceId}:${index}`,
+                            stage: 'source',
+                            fallbackCode: 'catalogSourceResolutionFailed',
+                            sourceId,
+                            target,
+                        });
+                        return {
+                            target,
+                            reason: 'targetUnavailable',
+                            issueIds: [],
+                            errorCodes: [diagnostic.code],
+                            diagnostics: [diagnostic],
+                        };
+                    }));
                     continue;
                 }
                 operationContexts.set(sourceId, catalogOperation);
-                const status = await statusCommandV7({
+                const status = await statusCommandV8({
                     plugins: [...new Set(requestedTargets.map((target) => target.pluginId))],
                     cwd: context.cwd,
                     env: context.env,
@@ -1227,7 +1256,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     catalogOperationContext: catalogOperation,
                     inventoryCatalogSourceReferences: operationInventory,
                 });
-                observedTargets.push(...status.payload.targets);
+                observedTargets.push(...flattenStatusTargets(status.payload.targets));
                 observedRevisions.push(...status.targetRevisions);
                 const model = buildTuiViewModel({
                     status: status.payload,
@@ -1240,7 +1269,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         const expected = target.expectedUpdate;
                         const revision = status.targetRevisions.find((entry) => entry.pluginId === target.pluginId && entry.platform === target.platform
                             && entry.scope === target.scope);
-                        const live = status.payload.targets.find((entry) => {
+                        const live = flattenStatusTargets(status.payload.targets).find((entry) => {
                             if (entry.pluginId !== target.pluginId || entry.platform !== target.platform)
                                 return false;
                             const desired = statusTargetIntent(entry);
@@ -1325,12 +1354,41 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         } : {}),
                     });
                     if (!preview.operationPlan) {
-                        blockedTargets.push(...draft.executableTargets.map((target) => ({
-                            target,
-                            reason: 'targetUnavailable',
-                            issueIds: draft.causes.filter((cause) => cause.consumers.some((consumer) => pluginWriteTaskTargetKey(consumer) === pluginWriteTaskTargetKey(target)))
-                                .map((cause) => cause.issueId),
-                        })));
+                        const projected = projectExecutionDiagnostics(preview, `task-preview:${sourceId}`, [], 'pluginWrite');
+                        const sourceDiagnostics = projected.diagnostics.filter((diagnostic) => !diagnostic.target)
+                            .map((diagnostic) => ({ ...diagnostic, sourceId, target: undefined }));
+                        blockedTargets.push(...draft.executableTargets.map((target, targetIndex) => {
+                            const matchingDiagnostics = projected.diagnostics.filter((diagnostic) => diagnostic.target?.pluginId === target.pluginId
+                                && diagnostic.target.platform === target.platform
+                                && diagnostic.target.scope === target.scope);
+                            const preparedDiagnostics = [
+                                ...matchingDiagnostics,
+                                ...(targetIndex === 0 ? sourceDiagnostics : []),
+                            ];
+                            const targetDiagnostics = preparedDiagnostics.length > 0
+                                ? preparedDiagnostics
+                                : [projectThrownOperationDiagnostic({
+                                        error: undefined,
+                                        id: `task-preview:${sourceId}:${targetIndex}`,
+                                        stage: 'dependencyPlan',
+                                        fallbackCode: 'taskOperationPlanMissing',
+                                        sourceId,
+                                        target,
+                                    })];
+                            const diagnostics = targetDiagnostics.map((diagnostic, diagnosticIndex) => ({
+                                ...structuredClone(diagnostic),
+                                id: `task-preview:${sourceId}:${targetIndex}:${diagnosticIndex}`,
+                                sourceId,
+                            }));
+                            return {
+                                target,
+                                reason: 'targetUnavailable',
+                                issueIds: draft.causes.filter((cause) => cause.consumers.some((consumer) => pluginWriteTaskTargetKey(consumer) === pluginWriteTaskTargetKey(target)))
+                                    .map((cause) => cause.issueId),
+                                errorCodes: [...new Set(diagnostics.map((diagnostic) => diagnostic.code))],
+                                diagnostics,
+                            };
+                        }));
                         draft.executableTargets = [];
                         draft.causes = [];
                         break;
@@ -1520,10 +1578,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 ])).values()].sort((left, right) => pluginWriteTaskTargetKey(left.target)
                 .localeCompare(pluginWriteTaskTargetKey(right.target), 'en'));
             if (executableTargets.length === 0) {
-                throw new TuiOperationBlockedError('taskNoExecutableTargets', '任务没有可安全执行的目标。');
+                throw new TuiOperationBlockedError('taskNoExecutableTargets', '任务没有可安全执行的目标。', canonicalBlocked.flatMap((target) => target.diagnostics ?? []));
             }
             if (intent.executionPolicy === 'all' && canonicalBlocked.length > 0) {
-                throw new TuiOperationBlockedError('taskHasBlockedTargets', '部分目标需要先处理。请调整选择。');
+                throw new TuiOperationBlockedError('taskHasBlockedTargets', '部分目标需要先处理。请调整选择。', canonicalBlocked.flatMap((target) => target.diagnostics ?? []));
             }
             await preparation?.reporter.emit('evidence');
             const evidence = {
@@ -1662,7 +1720,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     return [];
                 const platform = group.platform;
                 return group.requestedPluginIds.map((pluginId) => {
-                    const live = sessionStatusResult?.payload.targets.find((target) => target.pluginId === pluginId && target.platform === platform
+                    const live = flattenStatusTargets(sessionStatusResult?.payload.targets ?? []).find((target) => target.pluginId === pluginId && target.platform === platform
                         && (target.scope === group.scope || statusTargetIntent(target).scopes.includes(group.scope)
                             || platform === 'codex' && statusTargetActivation(target)?.[group.scope] === true));
                     const revision = sessionStatusResult?.targetRevisions?.find((target) => target.pluginId === pluginId && target.platform === platform
@@ -1915,7 +1973,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         await preparation?.reporter.emit('status');
         const statusCatalogOperation = catalogOperation
             ?? (!freshCatalog ? sessionCatalogOperationContext : undefined);
-        const status = await statusCommandV7({
+        const status = await statusCommandV8({
             plugins: [...new Set([intent.pluginId,
                     ...(intent.kind === 'pluginWrite' && intent.originIssue?.consumerPluginId
                         ? [intent.originIssue.consumerPluginId] : [])])],
@@ -2118,7 +2176,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         signal?.throwIfAborted();
         const evidenceTargets = intent.kind === 'configSave'
             ? configVisibleTargets
-            : status.payload.targets;
+            : flattenStatusTargets(status.payload.targets);
         const evidenceRevisions = intent.kind === 'configSave'
             ? (status.targetRevisions ?? []).filter((revision) => evidenceTargets.some((target) => target.platform === revision.platform
                 && target.scope === revision.scope
@@ -2849,7 +2907,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         const code = error instanceof TuiOperationBlockedError ? error.code : undefined;
                         if (intent.kind === 'pluginWriteTask'
                             && (code === 'taskHasBlockedTargets' || code === 'taskNoExecutableTargets')) {
-                            throw operationReviewStale('确认后任务可执行目标发生变化。');
+                            throw operationReviewStale('确认后任务可执行目标发生变化。', error instanceof TuiOperationBlockedError ? error.diagnostics : undefined);
                         }
                         throw error;
                     }