@lesliechan721/aw 0.1.0-beta.54 → 0.1.0-beta.56

package/dist/src/utils/plugin-config-write.js

@@ -1,9 +1,11 @@
+import { getCommandPackageId } from '@lesliechan721/aw-plugin-core/manifest';
 import { flattenStatusTargets, statusCommandV8, statusTargetIntent, } from '../commands/status-v6.js';
 import { syncWriteCommand } from '../commands/write-commands.js';
 import { CONFIG_MUTATION_RECEIPT_SCHEMA_VERSION, } from '../types.js';
 import { getDefaultNativeCliRunner } from './native-cli.js';
 import { assertReadyPluginConfigStore, assertPluginConfigMutationCandidate, assertSafePluginConfigSegment, codexNativeRefreshKeys, coercePluginConfigUpdates, patchPluginConfigStore, readPluginConfigStore, readNamespacedPluginConfigStoreIdentity, resetPluginConfigStore, resolveConfigRead, resolveEffectivePluginConfig, resolvePluginConfigStorePath, resolvePluginConfigSchemaAccess, summarizeEffectivePluginConfig, } from './plugin-config.js';
-import { analyzePluginConfigMutationImpact } from './plugin-config-impact.js';
+import { analyzePluginConfigMutationImpact, pluginSharedNativeConfigTargets } from './plugin-config-impact.js';
+import { discoverInstalledPluginManagedCommandPackages, syncPluginManagedCommandPackage, } from './managed-command-materialization.js';
 import { collectSensitivePluginConfigValues, redactPluginScriptOutput, } from './plugin-scripts.js';
 import { resolveClaudeProjectKey, resolveCodexProjectKey } from './paths.js';
 import { withAwHomeMutationLock, } from './aw-home-mutation-lock.js';
@@ -51,7 +53,7 @@ function markConfigWriteFailed(error) {
 function skippedApply(reason) {
     return { state: 'skipped', reason, targetResults: [] };
 }
-function unavailableApply(reason, stage, targetResults = []) {
+function unavailableApply(reason, stage, targetResults = [], commandPackages = []) {
     const messages = {
         invalidConfig: 'The effective config is invalid for every visible target.',
         schemaUnavailable: 'The config schema is unavailable after the config commit.',
@@ -63,6 +65,12 @@ function unavailableApply(reason, stage, targetResults = []) {
         state: 'unavailable',
         reason,
         targetResults,
+        ...(commandPackages.length > 0 ? { commandResults: commandPackages.map((target) => ({
+                producer: target.producer, state: 'failed', commandIds: [], removedCommandIds: [],
+                errors: [{ code: reason, message: messages[reason] }],
+                recoveryActions: [`aw command package sync ${target.producer.sourceId}/${target.producer.pluginName} ${target.packageKey} --scope ${target.producer.scope} --yes`,
+                    `aw command package remove ${target.packageId} --yes`],
+            })) } : {}),
         error: { stage, code: reason, message: messages[reason] },
     };
 }
@@ -133,22 +141,21 @@ async function discoverVisibleTargets(options) {
 }
 async function reinstallVisibleTargets(options) {
     const nativeCliRunner = options.nativeCliRunner ?? getDefaultNativeCliRunner();
-    const discovered = options.discovered ?? (options.applyTargets === undefined
-        ? await discoverVisibleTargets({
-            pluginName: options.plugin.manifest.name,
-            plugin: options.plugin,
-            scope: options.scope,
-            cwd: options.cwd,
-            env: options.env,
-            nativeCliRunner,
-            rebuildRuntime: options.rebuildRuntime,
-        })
-        : { targets: dedupeTargets(options.applyTargets), failures: [] });
+    const discovered = options.discovered ?? await resolveConfigApplyTargets(options);
     const targetResults = [...discovered.failures];
-    let runtimeFailed = discovered.failures.length > 0;
+    const commandResults = new Map();
+    const managedCommandProducerCache = options.rebuildRuntime?.managedCommandProducerCache
+        ?? new Map();
+    let runtimeFailed = discovered.failures.length > 0
+        || (discovered.commandDiscoveryErrors?.length ?? 0) > 0;
     let invalidTargets = 0;
     let unavailableTargets = 0;
     const errors = [];
+    if ((discovered.commandDiscoveryErrors?.length ?? 0) > 0) {
+        errors.push(...discovered.commandDiscoveryErrors.map((error) => ({
+            stage: 'targetDiscovery', code: error.code, message: error.message,
+        })));
+    }
     const reinstall = options.reinstallCommandImpl ?? syncWriteCommand;
     if (options.plugin.sourceId && !options.plugin.pluginId) {
         throw new Error(`Plugin "${options.plugin.manifest.name}" is missing its namespaced plugin ID.`);
@@ -273,6 +280,7 @@ async function reinstallVisibleTargets(options) {
                 nativeCliRunner,
                 preApplyConfirmed: options.preApplyConfirmed === true,
                 preApplyExecutionCache,
+                managedCommandProducerCache,
                 ...(debugLogger ? {
                     debugLogger: {
                         ...debugLogger,
@@ -287,6 +295,11 @@ async function reinstallVisibleTargets(options) {
                 } : {}),
             });
             options.rebuildRuntime?.operationDiagnosticSink?.(result.rebuildResults);
+            for (const producer of result.commandResults ?? []) {
+                commandResults.set(getCommandPackageId(producer.producer), producer);
+                if (producer.state !== 'completed')
+                    runtimeFailed = true;
+            }
             if (result.overallState !== 'succeeded')
                 runtimeFailed = true;
             targetResults.push(...await Promise.all(result.targetResults.map(async (entry) => ({
@@ -311,14 +324,63 @@ async function reinstallVisibleTargets(options) {
             });
         }
     }
-    if (discovered.targets.length === 0 && discovered.failures.length === 0) {
+    for (const target of discovered.commandPackages ?? []) {
+        await options.rebuildRuntime?.reporter?.event({
+            type: 'managed-command:producer',
+            source: { plugin: options.plugin.manifest.name, scope: target.producer.scope },
+            data: { packageKey: target.packageKey, phase: 'start' },
+        });
+        let result;
+        if (!target.declared) {
+            result = {
+                producer: target.producer, state: 'failed', commandIds: [], removedCommandIds: [],
+                errors: [{ code: 'commandPackageDeclarationMissing',
+                        message: 'The installed command package is no longer declared by this plugin.' }],
+                recoveryActions: [`aw command package remove ${target.packageId} --yes`],
+            };
+        }
+        else {
+            try {
+                result = await syncPluginManagedCommandPackage({
+                    plugin: options.plugin, packageKey: target.packageKey, scope: target.producer.scope,
+                    cwd: options.cwd, env: options.env, managedCommandProducerCache,
+                    event: options.changedConfigKeys?.length ? 'refresh' : 'install',
+                    changedConfigKeys: options.changedConfigKeys ?? [],
+                });
+            }
+            catch {
+                result = {
+                    producer: target.producer, state: 'failed', commandIds: [], removedCommandIds: [],
+                    errors: [{ code: 'commandPackageApplyFailed', message: 'The managed command package could not be refreshed.' }],
+                    recoveryActions: [`aw command package sync ${selector} ${target.packageKey} --scope ${target.producer.scope} --yes`,
+                        `aw command package remove ${target.packageId} --yes`],
+                };
+            }
+        }
+        result = { ...result, errors: await Promise.all(result.errors.map(async (error) => ({
+                ...error, message: await sanitizeFailure(error.message, { scope: target.producer.scope,
+                    ...(target.producer.projectRoot ? { projectKey: target.producer.projectRoot } : {}) }),
+            }))) };
+        commandResults.set(getCommandPackageId(result.producer), result);
+        await options.rebuildRuntime?.reporter?.event({
+            type: 'managed-command:producer',
+            source: { plugin: options.plugin.manifest.name, scope: target.producer.scope },
+            data: { packageKey: target.packageKey, phase: result.state === 'completed' ? 'success' : 'failure' },
+        });
+        if (result.state !== 'completed')
+            runtimeFailed = true;
+    }
+    const commands = commandResults.size > 0 ? { commandResults: [...commandResults.values()] } : {};
+    const commandTargetCount = (discovered.commandPackages?.length ?? 0);
+    if (discovered.targets.length === 0 && discovered.failures.length === 0
+        && commandTargetCount === 0 && !runtimeFailed) {
         return skippedApply('noVisibleTarget');
     }
-    if (discovered.targets.length > 0 && invalidTargets === discovered.targets.length) {
-        return unavailableApply('invalidConfig', 'targetValidation', targetResults);
+    if (discovered.targets.length > 0 && invalidTargets === discovered.targets.length && commandTargetCount === 0) {
+        return { ...unavailableApply('invalidConfig', 'targetValidation', targetResults), ...commands };
     }
-    if (discovered.targets.length > 0 && unavailableTargets === discovered.targets.length) {
-        return unavailableApply('effectiveConfigUnavailable', 'targetValidation', targetResults);
+    if (discovered.targets.length > 0 && unavailableTargets === discovered.targets.length && commandTargetCount === 0) {
+        return { ...unavailableApply('effectiveConfigUnavailable', 'targetValidation', targetResults), ...commands };
     }
     if (runtimeFailed
         || invalidTargets > 0
@@ -327,30 +389,33 @@ async function reinstallVisibleTargets(options) {
         return {
             state: 'partial',
             targetResults,
+            ...commands,
             ...(errors.length > 0 ? { errors } : {}),
         };
     }
-    return { state: 'succeeded', targetResults };
+    return { state: 'succeeded', targetResults, ...commands };
 }
 async function resolveConfigApplyTargets(options) {
-    if (options.applyTargets !== undefined) {
-        return { targets: dedupeTargets(options.applyTargets), failures: [] };
-    }
-    return discoverVisibleTargets({
-        pluginName: options.plugin.manifest.name,
-        plugin: options.plugin,
-        scope: options.scope,
-        cwd: options.cwd,
-        env: options.env,
-        nativeCliRunner: options.nativeCliRunner ?? getDefaultNativeCliRunner(),
-        rebuildRuntime: options.rebuildRuntime,
+    const platformTargets = options.applyTargets !== undefined
+        ? { targets: dedupeTargets(options.applyTargets), failures: [] }
+        : await discoverVisibleTargets({
+            pluginName: options.plugin.manifest.name,
+            plugin: options.plugin,
+            scope: options.scope,
+            cwd: options.cwd,
+            env: options.env,
+            nativeCliRunner: options.nativeCliRunner ?? getDefaultNativeCliRunner(),
+            rebuildRuntime: options.rebuildRuntime,
+        });
+    const commands = await discoverInstalledPluginManagedCommandPackages({
+        plugin: options.plugin, scope: options.scope, cwd: options.cwd, env: options.env,
+        platformTargets: platformTargets.targets,
     });
+    return { ...platformTargets, commandPackages: commands.packages, commandDiscoveryErrors: commands.errors };
 }
-async function configApplyHasValidCodexTarget(options) {
-    const codexScopes = new Set(options.targets
-        .filter((target) => target.platform === 'codex')
-        .map((target) => target.scope));
-    for (const scope of codexScopes) {
+async function configApplyHasValidSharedNativeTarget(options) {
+    const sharedTargets = pluginSharedNativeConfigTargets(options.plugin);
+    if (options.targets.some((target) => sharedTargets.some((shared) => (shared.platform ?? 'codex') === target.platform))) {
         const effective = await resolveEffectivePluginConfig({
             ...(options.plugin.sourceId ? {
                 sourceId: options.plugin.sourceId,
@@ -359,7 +424,7 @@ async function configApplyHasValidCodexTarget(options) {
             } : {}),
             pluginName: options.plugin.manifest.name,
             manifest: options.plugin.manifest,
-            targetScope: scope,
+            targetScope: 'user',
             cwd: options.cwd,
             env: options.env,
         });
@@ -383,6 +448,7 @@ async function applyConfigToVisibleTargets(options) {
     }
     if (discovered.targets.length === 0
         && discovered.failures.length === 0
+        && (discovered.commandPackages?.length ?? 0) === 0
         && options.noVisibleTargetHasInvalidConfig) {
         return unavailableApply('invalidConfig', 'targetValidation');
     }
@@ -577,11 +643,13 @@ export async function replayConfigRuntimeWrites(options) {
                 };
             }
             discovered = {
+                ...discovered,
                 targets: preApplyAuthorization.availableApplyTargets,
                 failures: [...discovered.failures, ...preApplyAuthorization.unavailableTargetResults],
             };
             if (discovered.targets.length === 0
-                && preApplyAuthorization.unavailableTargetResults.length > 0) {
+                && preApplyAuthorization.unavailableTargetResults.length > 0
+                && (discovered.commandPackages?.length ?? 0) === 0) {
                 const apply = unavailableApply('sourceUnavailable', 'source', preApplyAuthorization.unavailableTargetResults);
                 return {
                     configWrite: 'succeeded',
@@ -593,7 +661,7 @@ export async function replayConfigRuntimeWrites(options) {
             if (options.scope === 'user'
                 && options.sharedNativeApplyConfirmed !== true
                 && pluginHasSharedNativeRefreshKeys(options.plugin)
-                && await configApplyHasValidCodexTarget({
+                && await configApplyHasValidSharedNativeTarget({
                     plugin: options.plugin,
                     targets: discovered.targets,
                     cwd: options.cwd,
@@ -623,13 +691,10 @@ export async function replayConfigRuntimeWrites(options) {
     });
 }
 function pluginHasSharedNativeRefreshKeys(plugin) {
-    return (plugin.manifest.artifacts?.targets ?? []).some((target) => target.platform === 'codex'
-        && target.target === 'codex.skill'
-        && target.delivery?.mode === 'codex-native'
-        && target.refreshKeys.length > 0);
+    return pluginSharedNativeConfigTargets(plugin).length > 0;
 }
 function throwSharedNativeApplyConfirmationRequired() {
-    const error = new Error('sharedNativeConfigApplyConfirmationRequired: Applying this user config changes a shared Codex native artifact. Re-run with --yes.');
+    const error = new Error('sharedNativeConfigApplyConfirmationRequired: Applying this user config changes a shared native artifact. Re-run with --yes.');
     error.code = 'sharedNativeConfigApplyConfirmationRequired';
     throw error;
 }
@@ -713,6 +778,9 @@ async function applyPluginConfigWriteUnlocked(options) {
         cwd: options.cwd,
         env: options.env,
         visibleTargets: discovered?.targets ?? [],
+        ...(discovered ? { commandDiscovery: {
+                packages: discovered.commandPackages ?? [], errors: discovered.commandDiscoveryErrors ?? [],
+            } } : {}),
         mutation: {
             kind: 'patch',
             updates: requestedUpdates,
@@ -735,7 +803,8 @@ async function applyPluginConfigWriteUnlocked(options) {
     let preApplyUnavailableReason;
     let preApplyUnavailableTargetResults = [];
     let applyDiscovery = discovered
-        ? { targets: impact.affectedTargets, failures: discovered.failures }
+        ? { ...discovered, targets: impact.affectedTargets, failures: discovered.failures,
+            commandPackages: impact.affectedCommandPackages }
         : undefined;
     const shouldApply = options.apply !== false && impact.storeChanged && !impact.noEffectiveChange;
     if (shouldApply && pluginMayRunPreApply(schemaPlugin)) {
@@ -759,10 +828,12 @@ async function applyPluginConfigWriteUnlocked(options) {
             }
             preApplyUnavailableTargetResults = preApplyAuthorization.unavailableTargetResults;
             applyDiscovery = {
+                ...applyDiscovery,
                 targets: preApplyAuthorization.availableApplyTargets,
                 failures: [...applyDiscovery.failures, ...preApplyUnavailableTargetResults],
             };
-            if (applyDiscovery.targets.length === 0 && preApplyUnavailableTargetResults.length > 0) {
+            if (applyDiscovery.targets.length === 0 && preApplyUnavailableTargetResults.length > 0
+                && (applyDiscovery.commandPackages?.length ?? 0) === 0) {
                 preApplyUnavailableReason = 'sourceUnavailable';
             }
         }
@@ -770,8 +841,8 @@ async function applyPluginConfigWriteUnlocked(options) {
     if (options.apply !== false
         && options.scope === 'user'
         && options.sharedNativeApplyConfirmed !== true
-        && impact.sharedNativeRenderTargets.length > 0
-        && impact.affectedTargets.some((target) => target.platform === 'codex')) {
+        && impact.sharedNativeRenderTargets.some((shared) => impact.affectedTargets
+            .some((target) => target.platform === (shared.platform ?? 'codex')))) {
         throwSharedNativeApplyConfirmationRequired();
     }
     if (impact.storeChanged) {
@@ -804,7 +875,7 @@ async function applyPluginConfigWriteUnlocked(options) {
         }));
     }
     catch {
-        const apply = unavailableApply('effectiveConfigUnavailable', 'effectiveConfig');
+        const apply = unavailableApply('effectiveConfigUnavailable', 'effectiveConfig', [], impact.affectedCommandPackages);
         const otherProjectsMayRequireSync = options.scope === 'user' && impact.storeChanged;
         if (otherProjectsMayRequireSync)
             warnings.push(...otherProjectsWarning(options.scope));
@@ -831,7 +902,7 @@ async function applyPluginConfigWriteUnlocked(options) {
                 : targetDiscoveryFailed
                     ? unavailableApply('targetDiscoveryFailed', 'targetDiscovery')
                     : impact.noEffectiveChange
-                        && ((discovered?.targets.length ?? 0) > 0
+                        && ((discovered?.targets.length ?? 0) + impact.commandPackages.length > 0
                             || staleRemovedKeys.length === impact.changedKeys.length)
                         ? skippedApply('noEffectiveConfigChange')
                         : preApplyUnavailableReason
@@ -849,6 +920,7 @@ async function applyPluginConfigWriteUnlocked(options) {
                                     && effective.issues.length > 0,
                                 preApplyConfirmed: options.preApplyConfirmed,
                                 discovered: applyDiscovery,
+                                changedConfigKeys: impact.changedKeys,
                             });
     }
     catch (error) {
@@ -1017,10 +1089,11 @@ async function resetPluginConfigWithHelperUnlocked(options) {
     let impact;
     let targetDiscoveryFailed = false;
     let visibleTargets = [];
+    let discovered;
     if (options.plugin) {
         if (options.apply !== false) {
             try {
-                visibleTargets = (await resolveConfigApplyTargets({
+                discovered = await resolveConfigApplyTargets({
                     plugin: options.plugin,
                     scope: options.scope,
                     cwd: options.cwd,
@@ -1028,7 +1101,8 @@ async function resetPluginConfigWithHelperUnlocked(options) {
                     applyTargets: options.applyTargets,
                     nativeCliRunner: options.nativeCliRunner,
                     rebuildRuntime: options.rebuildRuntime,
-                })).targets;
+                });
+                visibleTargets = discovered.targets;
             }
             catch {
                 targetDiscoveryFailed = true;
@@ -1041,6 +1115,9 @@ async function resetPluginConfigWithHelperUnlocked(options) {
                 cwd: options.cwd,
                 env: options.env,
                 visibleTargets,
+                ...(discovered ? { commandDiscovery: {
+                        packages: discovered.commandPackages ?? [], errors: discovered.commandDiscoveryErrors ?? [],
+                    } } : {}),
                 mutation: { kind: 'reset' },
             });
             removedKeys = impact.removedKeys;
@@ -1052,7 +1129,9 @@ async function resetPluginConfigWithHelperUnlocked(options) {
     let preApplyUnavailableReason;
     let preApplyUnavailableTargetResults = [];
     let applyDiscovery = options.plugin && !targetDiscoveryFailed
-        ? { targets: impact?.affectedTargets ?? visibleTargets, failures: [] }
+        ? { targets: impact?.affectedTargets ?? visibleTargets, failures: [],
+            commandPackages: impact?.affectedCommandPackages ?? discovered?.commandPackages,
+            commandDiscoveryErrors: impact?.commandDiscoveryErrors ?? discovered?.commandDiscoveryErrors }
         : undefined;
     if (options.plugin
         && options.apply !== false
@@ -1079,10 +1158,12 @@ async function resetPluginConfigWithHelperUnlocked(options) {
         }
         preApplyUnavailableTargetResults = preApplyAuthorization.unavailableTargetResults;
         applyDiscovery = {
+            ...applyDiscovery,
             targets: preApplyAuthorization.availableApplyTargets,
             failures: preApplyUnavailableTargetResults,
         };
-        if (applyDiscovery.targets.length === 0 && preApplyUnavailableTargetResults.length > 0) {
+        if (applyDiscovery.targets.length === 0 && preApplyUnavailableTargetResults.length > 0
+            && (applyDiscovery.commandPackages?.length ?? 0) === 0) {
             preApplyUnavailableReason = 'sourceUnavailable';
         }
     }
@@ -1091,10 +1172,10 @@ async function resetPluginConfigWithHelperUnlocked(options) {
         && options.scope === 'user'
         && options.sharedNativeApplyConfirmed !== true
         && (impact
-            ? impact.sharedNativeRenderTargets.length > 0
-                && impact.affectedTargets.some((target) => target.platform === 'codex')
-            : pluginHasSharedNativeRefreshKeys(options.plugin))
-        && visibleTargets.some((target) => target.platform === 'codex')) {
+            ? impact.sharedNativeRenderTargets.some((shared) => impact.affectedTargets
+                .some((target) => target.platform === (shared.platform ?? 'codex')))
+            : pluginSharedNativeConfigTargets(options.plugin).some((shared) => visibleTargets
+                .some((target) => target.platform === (shared.platform ?? 'codex'))))) {
         throwSharedNativeApplyConfirmationRequired();
     }
     let reset;
@@ -1142,14 +1223,14 @@ async function resetPluginConfigWithHelperUnlocked(options) {
             }
             catch {
                 if (reset.deleted && options.apply !== false) {
-                    apply = unavailableApply('effectiveConfigUnavailable', 'effectiveConfig');
+                    apply = unavailableApply('effectiveConfigUnavailable', 'effectiveConfig', [], impact?.affectedCommandPackages);
                 }
             }
             if (reset.deleted
                 && options.apply !== false
                 && apply.state === 'skipped'
                 && impact?.noEffectiveChange
-                && visibleTargets.length > 0) {
+                && visibleTargets.length + (impact?.commandPackages.length ?? 0) > 0) {
                 apply = skippedApply('noEffectiveConfigChange');
             }
             else if (reset.deleted
@@ -1173,6 +1254,7 @@ async function resetPluginConfigWithHelperUnlocked(options) {
                         noVisibleTargetHasInvalidConfig: (effective?.issues.length ?? 0) > 0,
                         preApplyConfirmed: options.preApplyConfirmed,
                         discovered: applyDiscovery,
+                        changedConfigKeys: impact?.changedKeys ?? removedKeys,
                     });
             }
         }