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

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

@@ -17,10 +17,9 @@ import { analyzePluginConfigMutationImpact } from '../utils/plugin-config-impact
 import { createBatchIntentCompatiblePlanFingerprint } from '../commands/operation-plan.js';
 import { inventoryCatalogSourceReferences } from '../utils/catalog-source-references.js';
 import { operationEvidenceMatches, operationEvidenceFingerprint, TuiConfigInvalidStoreError, TuiController, TuiOperationBlockedError, } from './controller.js';
-import { buildConfigGroups, buildConfigPage, buildTuiViewModel, projectPlatformPlacement, } from './model.js';
+import { buildConfigGroups, buildConfigPage, buildTuiViewModel, hasActualScopeEvidence, 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';
 import { checkAwCapabilitySupport, readPluginManifest } from '../utils/manifest.js';
@@ -350,6 +349,7 @@ async function loadDependencyOverviews(options) {
                         sourceId: item.resolution.sourceId,
                         pluginName: entry.name,
                     }),
+                    sourceIdentity: item.resolution.sourceIdentity,
                     displayName: entry.interface?.displayName ?? entry.name,
                     dependencies: entry.dependencies.map((pluginName) => formatPluginId({ sourceId: item.resolution.sourceId, pluginName })),
                 }))
@@ -376,6 +376,55 @@ async function loadDependencyOverviews(options) {
     const unsupportedPluginIds = new Set(options.status.pluginSummaries
         .filter((summary) => (summary.missingCapabilities?.length ?? 0) > 0)
         .map((summary) => summary.pluginId));
+    const availableReferencesFor = (consumerPluginId, dependencyPluginId) => {
+        const consumerSourceId = parsePluginId(consumerPluginId).sourceId;
+        const dependencySourceId = parsePluginId(dependencyPluginId).sourceId;
+        const consumerNode = nodes.get(consumerPluginId);
+        const dependencyNode = nodes.get(dependencyPluginId);
+        if (consumerSourceId !== dependencySourceId
+            || !nodes.get(consumerPluginId)?.dependencies.includes(dependencyPluginId))
+            return [];
+        return (targetsByPlugin.get(consumerPluginId) ?? []).flatMap((consumer) => {
+            if (!hasActualScopeEvidence(consumer)
+                || consumer.sourceId !== consumerSourceId
+                || consumer.sourceIdentity !== consumerNode?.sourceIdentity)
+                return [];
+            return [...consumer.components, ...(consumer.sharedComponents ?? [])].flatMap((component) => {
+                if (component.kind !== 'dependency'
+                    || component.key !== dependencyPluginId
+                    || component.state !== 'ready')
+                    return [];
+                const platform = component.metadata?.platform;
+                const scope = component.metadata?.scope;
+                const project = component.metadata?.project;
+                if ((platform !== 'codex' && platform !== 'claude')
+                    || (scope !== 'user' && scope !== 'project')
+                    || project !== (scope === 'project' ? 'current' : 'none'))
+                    return [];
+                const dependency = (targetsByPlugin.get(dependencyPluginId) ?? []).find((target) => target.platform === platform
+                    && target.scope === scope
+                    && target.sourceId === dependencySourceId
+                    && target.sourceIdentity === dependencyNode?.sourceIdentity
+                    && target.sourceIdentity === consumer.sourceIdentity);
+                if (!dependency)
+                    return [];
+                return [{
+                        consumer: {
+                            pluginId: consumerPluginId,
+                            platform: consumer.platform,
+                            scope: consumer.scope,
+                            project: consumer.scope === 'project' ? 'current' : null,
+                        },
+                        dependency: {
+                            pluginId: dependencyPluginId,
+                            platform,
+                            scope,
+                            project: scope === 'project' ? 'current' : null,
+                        },
+                    }];
+            });
+        });
+    };
     const placementsFor = (pluginId) => {
         const targets = targetsByPlugin.get(pluginId) ?? [];
         if (targets.length > 0) {
@@ -448,6 +497,7 @@ async function loadDependencyOverviews(options) {
                 placements,
                 aggregateStatus: aggregateFor(dependency.pluginId, placements),
                 placementReferences: [],
+                availablePlacementReferences: availableReferencesFor(pluginId, dependency.pluginId),
             };
         });
         const dependentIds = [...new Set(reverse.get(pluginId) ?? [])].sort();
@@ -462,6 +512,7 @@ async function loadDependencyOverviews(options) {
                 placements,
                 aggregateStatus: aggregateFor(dependentId, placements),
                 placementReferences: [],
+                availablePlacementReferences: availableReferencesFor(dependentId, pluginId),
             };
         });
         const targetBlockers = (targetsByPlugin.get(pluginId) ?? []).flatMap((target) => target.reasons.filter((error) => error.code.startsWith('dependency') || error.code === 'sourceChanged')
@@ -541,7 +592,6 @@ function createReviewStageReporter(options) {
     };
 }
 export function createTuiControllerDependencies(context, progressFeed, options = {}) {
-    const catalogManagement = createCatalogManagementService(context);
     const readInventory = options.inventoryCatalogSourceReferences
         ?? inventoryCatalogSourceReferences;
     const validatedStoreEntries = new Map();
@@ -766,20 +816,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 await observationSession.dispose();
             }
         }
-        if (intent.kind === 'catalogManagement') {
-            signal?.throwIfAborted();
-            await preparation?.reporter.emit('validate');
-            const managementEvidence = await catalogManagement.captureEvidence(intent);
-            signal?.throwIfAborted();
-            await preparation?.reporter.emit('evidence');
-            return {
-                catalog: {
-                    configDigest: managementEvidence.workspaceBinding ?? 'catalog-store',
-                    compositeDigest: managementEvidence.evidenceDigest,
-                },
-                catalogManagement: managementEvidence,
-            };
-        }
         if (intent.kind === 'configReset') {
             const parsed = parsePluginId(intent.pluginId);
             if (!parsed.sourceId || !parsed.pluginName) {
@@ -1489,7 +1525,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     if (blockedPlanTargets.length === 0)
                         break;
                     const requestedKeys = new Set(draft.executableTargets.map(pluginWriteTaskTargetKey));
-                    const errorCodesByRoot = new Map();
+                    const blockedPlansByRoot = new Map();
                     for (const blockedPlanTarget of blockedPlanTargets) {
                         const pending = [blockedPlanTarget];
                         const visited = new Set();
@@ -1533,25 +1569,45 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             throw new TuiOperationBlockedError('taskPlanConsumerMissing', '任务计划中的阻止项无法映射到请求目标。');
                         }
                         for (const key of mappedRoots) {
-                            const codes = errorCodesByRoot.get(key) ?? new Set();
-                            codes.add(blockedPlanTarget.errorCode ?? 'writePlanBlocked');
-                            errorCodesByRoot.set(key, codes);
+                            const plans = blockedPlansByRoot.get(key) ?? [];
+                            plans.push(blockedPlanTarget);
+                            blockedPlansByRoot.set(key, plans);
                         }
                     }
                     blockedTargets.push(...draft.executableTargets.flatMap((target) => {
-                        const codes = errorCodesByRoot.get(pluginWriteTaskTargetKey(target));
-                        return codes ? [{
+                        const plans = blockedPlansByRoot.get(pluginWriteTaskTargetKey(target));
+                        return plans ? [{
                                 target,
                                 reason: 'targetUnavailable',
                                 issueIds: draft.causes.filter((cause) => cause.consumers.some((consumer) => pluginWriteTaskTargetKey(consumer) === pluginWriteTaskTargetKey(target)))
                                     .map((cause) => cause.issueId),
-                                errorCodes: [...codes].sort((left, right) => left.localeCompare(right, 'en')),
+                                errorCodes: [...new Set(plans.map((plan) => plan.errorCode ?? 'writePlanBlocked'))]
+                                    .sort((left, right) => left.localeCompare(right, 'en')),
+                                diagnostics: plans.map((plan, index) => ({
+                                    id: `task-plan:${sourceId}:${target.pluginId}:${target.platform}:${target.scope}:${index}`,
+                                    code: plan.errorCode ?? 'writePlanBlocked',
+                                    stage: 'dependencyPlan',
+                                    sourceId,
+                                    target: {
+                                        pluginId: plan.pluginId, platform: plan.platform,
+                                        scope: plan.requestedScope ?? plan.resolvedScope,
+                                    },
+                                    causes: [],
+                                    detailLines: [],
+                                    safeMessage: plan.errorCode === 'artifactCollision'
+                                        ? '输出位置存在外来内容，无法覆盖。'
+                                        : plan.errorCode === 'exclusiveOwnerEvidenceInvalid'
+                                            ? '独立扩展的归属标记缺失或损坏。'
+                                            : plan.errorCode === 'dependencyNotReady'
+                                                ? '依赖安装状态无法读取。'
+                                                : '依赖计划阻止了此目标。',
+                                })),
                             }] : [];
                     }));
-                    draft.executableTargets = draft.executableTargets.filter((target) => !errorCodesByRoot.has(pluginWriteTaskTargetKey(target)));
+                    draft.executableTargets = draft.executableTargets.filter((target) => !blockedPlansByRoot.has(pluginWriteTaskTargetKey(target)));
                     draft.causes = draft.causes.map((cause) => ({
                         ...cause,
-                        consumers: cause.consumers.filter((consumer) => !errorCodesByRoot.has(pluginWriteTaskTargetKey(consumer))),
+                        consumers: cause.consumers.filter((consumer) => !blockedPlansByRoot.has(pluginWriteTaskTargetKey(consumer))),
                     })).filter((cause) => cause.consumers.length > 0);
                 }
                 if (!preview?.operationPlan || draft.executableTargets.length === 0)
@@ -2149,7 +2205,18 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 }
                 const blocker = dependencyPlan.targets.find((target) => target.action === 'block');
                 if (blocker) {
-                    throw new TuiOperationBlockedError(blocker.errorCode ?? 'dependencyNotReady', `${blocker.errorCode ?? 'dependencyNotReady'}: 依赖安装计划被阻止。`);
+                    const code = blocker.errorCode ?? 'dependencyNotReady';
+                    const reason = code === 'dependencyScopeConflict' || code === 'codexExtensionScopeConflict'
+                        ? '这个依赖的安装位置存在冲突，需要先选择保留的位置。'
+                        : code === 'artifactCollision' || code === 'exclusiveOwnerEvidenceInvalid'
+                            ? '这个依赖的安装位置被其他内容占用，需要先检查并处理冲突。'
+                            : '这个依赖尚不可用，需要先检查并恢复后再安装。';
+                    throw new TuiOperationBlockedError(code, `${blocker.pluginId}：${reason}`, [{
+                            id: `dependency:${blocker.pluginId}:${blocker.platform}:${blocker.resolvedScope}`,
+                            code, stage: 'dependencyPlan', safeMessage: reason,
+                            target: { pluginId: blocker.pluginId, platform: blocker.platform, scope: blocker.resolvedScope },
+                            causes: [], detailLines: [],
+                        }]);
                 }
             }
             const managerPreview = preview?.codexManagerPreview;
@@ -2248,7 +2315,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
         return evidence;
     };
     const dependencies = {
-        catalogManagement,
         beginCatalogSession(sessionOptions) {
             sessionCatalogOperationContext = undefined;
             if (sessionOptions?.reuseValidatedGenerations !== true) {
@@ -2355,10 +2421,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             return evidence.dependencyPlan;
         },
         async validateIntent(intent, signal) {
-            if (intent.kind === 'catalogManagement') {
-                signal.throwIfAborted();
-                return;
-            }
             if (intent.kind === 'catalogSourcesRecovery') {
                 signal.throwIfAborted();
                 return;
@@ -2606,25 +2668,6 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             };
         },
         async executeIntent(intent, expectedEvidence, signal) {
-            if (intent.kind === 'catalogManagement') {
-                signal?.throwIfAborted();
-                if (!expectedEvidence.catalogManagement) {
-                    throw new TuiOperationBlockedError('operationReviewStale', 'Catalog management Review evidence is missing.');
-                }
-                const progressLabels = {
-                    validate: '验证 Catalog 状态',
-                    build: '构建 Catalog snapshot',
-                    source: '更新开发来源',
-                    sync: '同步开发来源',
-                    prune: '清理 Catalog store',
-                    prepare: '准备发布计划',
-                    remote: '写入 Catalog 远端',
-                    verify: '验证操作结果',
-                };
-                return catalogManagement.execute(intent, expectedEvidence.catalogManagement, (stage) => {
-                    progressFeed?.setCurrent({ target: 'Catalog 管理', phase: progressLabels[stage] }, `Catalog 管理：${progressLabels[stage]}`);
-                });
-            }
             if (intent.kind === 'catalogSourcesRecovery') {
                 signal?.throwIfAborted();
                 return recoverInvalidCatalogSourcesConfig({ env: context.env });