@lesliechan721/aw 0.1.0-beta.62 → 0.1.0-beta.64

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

@@ -17,7 +17,7 @@ import { assertProjectSharedConfigPathVisible } from '../utils/project-boundary.
 import { calculatePluginIntentDigest, readPluginIntentState, } from '../utils/plugin-intent-state.js';
 import { applyPluginConfigWrite, replayConfigRuntimeWrites, resolveConfigPreApplyAuthorization, resetPluginConfigWithHelper, } from '../utils/plugin-config-write.js';
 import { analyzePluginConfigMutationImpact, discoverPluginConfigManagedCommandPackages, pluginConfigTargetRenderScopes, pluginSharedNativeConfigTargets } from '../utils/plugin-config-impact.js';
-import { collectPluginConfigReferenceEvidence, resolvePluginConfigReferenceConsumers, resolvePluginConfigReferencePlugins } from '../utils/plugin-config-references.js';
+import { collectPluginConfigReferenceEvidence, pluginConfigHasExternalReferences, resolvePluginConfigReferenceConsumers, resolvePluginConfigReferencePlugins } from '../utils/plugin-config-references.js';
 import { createBatchIntentCompatiblePlanFingerprint } from '../commands/operation-plan.js';
 import { inventoryCatalogSourceReferences } from '../utils/catalog-source-references.js';
 import { operationEvidenceMatches, operationEvidenceFingerprint, TuiConfigInvalidStoreError, TuiController, TuiOperationBlockedError, } from './controller.js';
@@ -132,14 +132,20 @@ export function configAffectedStatusTargets(targets, pluginId, configScope, cons
         .sort((left, right) => `${left.pluginId}\0${left.platform}\0${left.scope}`
         .localeCompare(`${right.pluginId}\0${right.platform}\0${right.scope}`, 'en'));
 }
-async function configRetrySharedNativeRenderTargets(plugin, targets, env) {
-    const plugins = await resolvePluginConfigReferenceConsumers({ plugin, env });
+function configNeedsReferencePlugins(plugin) {
+    return pluginConfigHasExternalReferences(plugin.manifest)
+        || Object.values(plugin.manifest.config?.fields ?? {})
+            .some((field) => field.type === 'array' && field.items.type === 'object');
+}
+async function configRetrySharedNativeRenderTargets(plugin, targets, env, referencePlugins) {
+    const plugins = await resolvePluginConfigReferenceConsumers({ plugin, env, plugins: referencePlugins });
     return plugins.flatMap((consumer) => pluginSharedNativeConfigTargets(consumer).filter((shared) => targets.some((target) => (target.pluginName ?? plugin.manifest.name) === consumer.manifest.name
         && target.platform === (shared.platform ?? 'codex'))));
 }
 async function configRetryStoreDigest(options) {
     const plugins = await resolvePluginConfigReferencePlugins({ sourceId: options.plugin.sourceId,
-        sourceIdentity: options.plugin.sourceIdentity, logicalIdentity: options.plugin.catalogLogicalIdentity, env: options.env });
+        sourceIdentity: options.plugin.sourceIdentity, logicalIdentity: options.plugin.catalogLogicalIdentity,
+        env: options.env, plugins: options.plugins });
     const byName = new Map([...plugins, options.plugin].map((plugin) => [plugin.manifest.name, plugin]));
     const profiles = [{ pluginName: options.plugin.manifest.name, scope: options.scope },
         ...options.targets.flatMap((target) => {
@@ -2153,13 +2159,28 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 catalogOperationByEvidence.set(evidence, catalogOperation);
             return evidence;
         }
-        const configReferencePluginIds = intent.kind === 'configSave'
+        const needsReferencePlugins = intent.kind === 'configSave'
+            && await withResolvedCatalogPlugin({
+                selector: intent.pluginId, cliVersion: packageInfo.version, env: context.env,
+                ...(catalogOperation ? { operationContext: catalogOperation } : {}),
+                ...(signal ? { signal } : {}),
+                consume: ({ plugin }) => configNeedsReferencePlugins(plugin),
+            });
+        const referencePlugins = needsReferencePlugins
+            ? await resolvePluginConfigReferencePlugins({
+                sourceId: parsePluginId(intent.pluginId).sourceId,
+                env: context.env,
+                operationContext: catalogOperation,
+            })
+            : undefined;
+        const configReferencePluginIds = intent.kind === 'configSave' && needsReferencePlugins
             ? await withResolvedCatalogPlugin({
                 selector: intent.pluginId, cliVersion: packageInfo.version, env: context.env,
                 ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                 ...(signal ? { signal } : {}),
-                consume: async ({ plugin }) => (await resolvePluginConfigReferenceConsumers({ plugin, env: context.env }))
-                    .map((entry) => entry.pluginId ?? `${entry.sourceId}/${entry.manifest.name}`),
+                consume: async ({ plugin }) => (await resolvePluginConfigReferenceConsumers({
+                    plugin, env: context.env, plugins: referencePlugins,
+                })).map((entry) => entry.pluginId ?? `${entry.sourceId}/${entry.manifest.name}`),
             })
             : [];
         if (preparation && intent.kind === 'configSave') {
@@ -2199,6 +2220,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     }
                     const impact = intent.retryApply ? undefined : await analyzePluginConfigMutationImpact({
                         plugin,
+                        referencePlugins,
                         scope: intent.scope,
                         cwd: context.cwd,
                         env: context.env,
@@ -2214,7 +2236,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         : impact.affectedTargets;
                     const commandPackages = impact?.affectedCommandPackages
                         ?? (await discoverPluginConfigManagedCommandPackages({ plugin, scope: intent.scope,
-                            cwd: context.cwd, env: context.env ?? process.env, platformTargets: affectedTargets })).packages;
+                            cwd: context.cwd, env: context.env ?? process.env, platformTargets: affectedTargets, referencePlugins })).packages;
                     const preApplyAuthorization = configIntentRequestsApply(intent)
                         ? (await resolveConfigPreApplyAuthorization({
                             plugin,
@@ -2224,6 +2246,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             applyTargets: affectedTargets,
                             nativeCliRunner: context.nativeCliRunner,
                             rebuildRuntime: {
+                                referencePlugins,
                                 catalogOperationContext: preparedCatalogOperation,
                                 expectedGenerationSetDigest: preparedCatalogOperation.generationSetDigest,
                                 inventoryCatalogSourceReferences: operationInventory,
@@ -2237,9 +2260,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                         commandPackages,
                         preApplyAuthorization,
                         retryStoreDigest: intent.retryApply ? await configRetryStoreDigest({ plugin, scope: intent.scope,
-                            targets: affectedTargets, commandPackages, preApplyAuthorization, cwd: context.cwd, env: context.env }) : undefined,
+                            targets: affectedTargets, commandPackages, preApplyAuthorization, cwd: context.cwd, env: context.env,
+                            plugins: referencePlugins }) : undefined,
                         sharedNativeRenderTargets: intent.retryApply
-                            ? await configRetrySharedNativeRenderTargets(plugin, affectedTargets, context.env)
+                            ? await configRetrySharedNativeRenderTargets(plugin, affectedTargets, context.env, referencePlugins)
                             : impact.sharedNativeRenderTargets,
                     };
                 },
@@ -2349,6 +2373,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 const impact = intent.kind === 'configSave' && !intent.retryApply
                     ? await analyzePluginConfigMutationImpact({
                         plugin,
+                        referencePlugins,
                         scope: intent.scope,
                         cwd: context.cwd,
                         env: context.env,
@@ -2367,6 +2392,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     ?? (intent.kind === 'configSave' ? (await discoverPluginConfigManagedCommandPackages({
                         plugin, scope: intent.scope, cwd: context.cwd, env: context.env ?? process.env,
                         platformTargets: configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets),
+                        referencePlugins,
                     })).packages : []);
                 const preApplyAuthorization = intent.kind === 'configSave'
                     && configIntentRequestsApply(intent)
@@ -2380,6 +2406,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             : impact.affectedTargets,
                         nativeCliRunner: context.nativeCliRunner,
                         rebuildRuntime: {
+                            referencePlugins,
                             ...(catalogOperation ? { catalogOperationContext: catalogOperation } : {}),
                             ...(catalogOperation?.generationSetDigest
                                 ? { expectedGenerationSetDigest: catalogOperation.generationSetDigest }
@@ -2396,10 +2423,10 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     preApplyAuthorization,
                     retryStoreDigest: intent.kind === 'configSave' && intent.retryApply
                         ? await configRetryStoreDigest({ plugin, scope: intent.scope, targets: affectedTargets,
-                            commandPackages, preApplyAuthorization, cwd: context.cwd, env: context.env }) : undefined,
+                            commandPackages, preApplyAuthorization, cwd: context.cwd, env: context.env, plugins: referencePlugins }) : undefined,
                     sharedNativeRenderTargets: intent.kind === 'configSave'
                         ? intent.retryApply
-                            ? await configRetrySharedNativeRenderTargets(plugin, configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets), context.env)
+                            ? await configRetrySharedNativeRenderTargets(plugin, configImpactVisibleTargets(plugin.manifest.name, configVisibleTargets), context.env, referencePlugins)
                             : impact.sharedNativeRenderTargets
                         : [],
                 };
@@ -3781,6 +3808,13 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                     ...(groupCatalogOperation ? { operationContext: groupCatalogOperation } : {}),
                                     consume: async ({ plugin, source }) => {
                                         assertSourceEvidenceMatches(freshSource, sourceEvidenceForPlugin(source, plugin.manifest.name));
+                                        const referencePlugins = configNeedsReferencePlugins(plugin) ? await resolvePluginConfigReferencePlugins({
+                                            sourceId: plugin.sourceId,
+                                            sourceIdentity: plugin.sourceIdentity,
+                                            logicalIdentity: plugin.catalogLogicalIdentity,
+                                            env: context.env,
+                                            operationContext: groupCatalogOperation,
+                                        }) : undefined;
                                         const applyTargets = intent.apply
                                             ? freshConfig.affectedTargets.map((target) => ({
                                                 pluginName: target.pluginName ?? plugin.manifest.name,
@@ -3797,6 +3831,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                             nativeCliRunner: context.nativeCliRunner,
                                             rebuildRuntime: {
                                                 ...context,
+                                                referencePlugins,
                                                 awHomeMutationToken,
                                                 operationDiagnosticSink: (entries) => {
                                                     operationRebuildResults.push(...structuredClone(entries));
@@ -3905,6 +3940,13 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                             ...(catalogOperation ? { operationContext: catalogOperation } : {}),
                             consume: async ({ plugin, source }) => {
                                 assertSourceEvidenceMatches(currentSource, sourceEvidenceForPlugin(source, plugin.manifest.name));
+                                const referencePlugins = configNeedsReferencePlugins(plugin) ? await resolvePluginConfigReferencePlugins({
+                                    sourceId: plugin.sourceId,
+                                    sourceIdentity: plugin.sourceIdentity,
+                                    logicalIdentity: plugin.catalogLogicalIdentity,
+                                    env: context.env,
+                                    operationContext: catalogOperation,
+                                }) : undefined;
                                 const applyTargets = intent.retryApply || intent.apply
                                     ? currentEvidence.config?.affectedTargets.map((target) => ({
                                         pluginName: target.pluginName ?? plugin.manifest.name,
@@ -3921,6 +3963,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         nativeCliRunner: context.nativeCliRunner,
                                         rebuildRuntime: {
                                             ...context,
+                                            referencePlugins,
                                             awHomeMutationToken,
                                             operationDiagnosticSink,
                                             ...(reviewedScriptTimeoutMs(intent) === undefined
@@ -3946,6 +3989,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                                         nativeCliRunner: context.nativeCliRunner,
                                         rebuildRuntime: {
                                             ...context,
+                                            referencePlugins,
                                             awHomeMutationToken,
                                             operationDiagnosticSink,
                                             ...(reviewedScriptTimeoutMs(intent) === undefined