@lesliechan721/aw 0.1.0-beta.14 → 0.1.0-beta.16

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

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import { statusCommandV7, statusTargetIntent, } from '../commands/status-v6.js';
+import { statusCommandV7, 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';
@@ -369,40 +369,6 @@ async function loadDependencyOverviews(options) {
     const unsupportedPluginIds = new Set(options.status.pluginSummaries
         .filter((summary) => (summary.missingCapabilities?.length ?? 0) > 0)
         .map((summary) => summary.pluginId));
-    const placementReferences = new Map();
-    for (const consumer of options.status.payload.targets.filter((target) => target.state !== 'absent')) {
-        const consumerNode = nodes.get(consumer.pluginId);
-        if (!consumerNode)
-            continue;
-        for (const dependencyPluginId of consumerNode.dependencies) {
-            const dependencyTargets = (targetsByPlugin.get(dependencyPluginId) ?? [])
-                .filter((target) => target.platform === consumer.platform);
-            const projectTarget = dependencyTargets.find((target) => target.scope === 'project');
-            const userTarget = dependencyTargets.find((target) => target.scope === 'user');
-            const dependencyScope = consumer.scope === 'user'
-                ? 'user'
-                : userTarget && (!projectTarget
-                    || (userTarget.state !== 'absent' && projectTarget.state === 'absent'))
-                    ? 'user'
-                    : 'project';
-            const reference = {
-                consumer: {
-                    pluginId: consumer.pluginId,
-                    platform: consumer.platform,
-                    scope: consumer.scope,
-                    project: consumer.scope === 'project' ? 'current' : null,
-                },
-                dependency: {
-                    pluginId: dependencyPluginId,
-                    platform: consumer.platform,
-                    scope: dependencyScope,
-                    project: dependencyScope === 'project' ? 'current' : null,
-                },
-            };
-            const key = `${consumer.pluginId}\0${dependencyPluginId}`;
-            placementReferences.set(key, [...(placementReferences.get(key) ?? []), reference]);
-        }
-    }
     const placementsFor = (pluginId) => {
         const targets = targetsByPlugin.get(pluginId) ?? [];
         if (targets.length > 0) {
@@ -474,7 +440,7 @@ async function loadDependencyOverviews(options) {
                 })),
                 placements,
                 aggregateStatus: aggregateFor(dependency.pluginId, placements),
-                placementReferences: placementReferences.get(`${pluginId}\0${dependency.pluginId}`) ?? [],
+                placementReferences: [],
             };
         });
         const dependentIds = [...new Set(reverse.get(pluginId) ?? [])].sort();
@@ -488,7 +454,7 @@ async function loadDependencyOverviews(options) {
                 requiredBy: [],
                 placements,
                 aggregateStatus: aggregateFor(dependentId, placements),
-                placementReferences: placementReferences.get(`${dependentId}\0${pluginId}`) ?? [],
+                placementReferences: [],
             };
         });
         const targetBlockers = (targetsByPlugin.get(pluginId) ?? []).flatMap((target) => target.reasons.filter((error) => error.code.startsWith('dependency') || error.code === 'sourceChanged')
@@ -683,6 +649,7 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             const result = await statusCommandV7({
                 cwd: context.cwd,
                 env: context.env,
+                nativeCliRunner: context.nativeCliRunner,
                 cliVersion: packageInfo.version,
                 verbose: context.diagnostics.verbose,
                 ...(catalogOperationContext ? { catalogOperationContext } : {}),
@@ -775,6 +742,23 @@ export function createTuiControllerDependencies(context, progressFeed, options =
     };
     const captureEvidence = async (intent, signal, preparation, operationInventory = createOperationInventoryReader(), freshCatalog = false, reusableCandidate, codexObservationSession, frozenBatchEvidence) => {
         reviewedScriptTimeoutMs(intent);
+        if ((intent.kind === 'pluginWrite'
+            && (intent.platform === 'codex' || intent.platform === 'both')
+            || intent.kind === 'pluginWriteTask'
+                && intent.targets.some((target) => target.platform === 'codex'))
+            && !codexObservationSession) {
+            const observationSession = await createCodexNativeObservationSession({
+                exactCwd: context.cwd,
+                env: context.env,
+                runner: context.nativeCliRunner,
+            });
+            try {
+                return await captureEvidence(intent, signal, preparation, operationInventory, freshCatalog, reusableCandidate, observationSession, frozenBatchEvidence);
+            }
+            finally {
+                await observationSession.dispose();
+            }
+        }
         if (intent.kind === 'catalogManagement') {
             signal?.throwIfAborted();
             await preparation?.reporter.emit('validate');
@@ -1236,6 +1220,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                     plugins: [...new Set(requestedTargets.map((target) => target.pluginId))],
                     cwd: context.cwd,
                     env: context.env,
+                    nativeCliRunner: context.nativeCliRunner,
+                    ...(codexObservationSession ? { codexObservationSession } : {}),
                     cliVersion: packageInfo.version,
                     catalogOperationContext: catalogOperation,
                     inventoryCatalogSourceReferences: operationInventory,
@@ -1635,6 +1621,33 @@ export function createTuiControllerDependencies(context, progressFeed, options =
             await preparation?.reporter.emit('evidence');
             signal?.throwIfAborted();
             const merged = mergeWriteCommandResults(groups.map((group) => group.preview));
+            const targetVersions = groups.flatMap((group) => {
+                if (group.platform === 'both')
+                    return [];
+                const platform = group.platform;
+                return group.requestedPluginIds.map((pluginId) => {
+                    const live = 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
+                        && target.scope === group.scope)?.revision;
+                    const activation = live ? statusTargetActivation(live) : undefined;
+                    const ownership = live && live.scope === group.scope
+                        ? statusTargetOwnershipState(live) : 'absent';
+                    const present = ownership === 'present' || ownership === 'partial'
+                        || platform === 'codex' && activation?.[group.scope] === true;
+                    const planned = live ? statusTargetIntent(live).scopes.includes(group.scope) : false;
+                    return {
+                        pluginId,
+                        platform,
+                        scope: group.scope,
+                        presence: present ? 'installed'
+                            : ownership === 'absent' && planned ? 'new' : 'unknown',
+                        ...(revision?.installedVersion ? { installedVersion: revision.installedVersion } : {}),
+                        ...(revision?.availableVersion ? { availableVersion: revision.availableVersion } : {}),
+                    };
+                });
+            });
             const evidence = {
                 catalog: {
                     configDigest: configSnapshot.digest,
@@ -1643,6 +1656,13 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 },
                 requestedPluginIds: selection.requestedPluginIds,
                 groups,
+                targetVersions: [...new Map(targetVersions.map((target) => [[
+                            target.pluginId, target.platform, target.scope,
+                        ].join('\0'), target])).values()].sort((left, right) => [
+                    left.pluginId, left.platform, left.scope,
+                ].join('\0').localeCompare([
+                    right.pluginId, right.platform, right.scope,
+                ].join('\0'), 'en')),
                 ...(merged.dependencyPlan ? { dependencyPlan: merged.dependencyPlan } : {}),
                 ...(merged.codexReconcilePlans ? { codexReconcilePlans: merged.codexReconcilePlans } : {}),
                 ...(merged.operationPlan ? { operationPlan: merged.operationPlan } : {}),
@@ -1843,6 +1863,8 @@ export function createTuiControllerDependencies(context, progressFeed, options =
                 : {}),
             cwd: context.cwd,
             env: context.env,
+            nativeCliRunner: context.nativeCliRunner,
+            ...(codexObservationSession ? { codexObservationSession } : {}),
             cliVersion: packageInfo.version,
             ...(statusCatalogOperation ? { catalogOperationContext: statusCatalogOperation } : {}),
             inventoryCatalogSourceReferences: operationInventory,