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

package/dist/src/commands/rebuild-integration.d.ts

@@ -52,6 +52,7 @@ export declare class CodexActivationPostcheckError extends Error {
     constructor(codexPluginIds: string | readonly string[], detail: string);
 }
 export interface RebuildExecutionContext {
+    referencePlugins?: readonly PluginMeta[];
     env: NodeJS.ProcessEnv;
     nativeCliRunner: NativeCliRunner;
     codexManager?: CodexManager;
@@ -169,6 +170,7 @@ export interface MaterializedReviewNativeSkills {
  * The caller owns outputRoot and is responsible for its cleanup.
  */
 export declare function materializeReviewNativeSkills(options: {
+    plugins?: readonly PluginMeta[];
     plugin: PluginMeta;
     platform: 'codex' | 'claude';
     scope: Scope;

package/dist/src/commands/rebuild-integration.js

@@ -73,11 +73,12 @@ function withoutVerifiedRequirementsReceipt(plugin, files) {
 }
 const commandPackagePreparationCaches = new WeakMap();
 const staticCommandPreparationCaches = new WeakMap();
+const dynamicArtifactPreparationCaches = new WeakMap();
 async function prepareStaticCommandArtifacts(options) {
     const targets = getManagedCommandArtifactTargets(options.plugin.manifest).filter((target) => target.producer.kind === 'static-skill' && target.platform === options.platform);
     if (!targets.length)
         return [];
-    const config = await resolveArtifactRenderConfig({ sourceId: options.plugin.sourceId, sourceIdentity: options.plugin.sourceIdentity, logicalIdentity: options.plugin.catalogLogicalIdentity, pluginName: options.plugin.manifest.name, manifest: options.plugin.manifest, scope: 'user', cwd: options.cwd, env: options.env });
+    const config = await resolveArtifactRenderConfig({ sourceId: options.plugin.sourceId, sourceIdentity: options.plugin.sourceIdentity, logicalIdentity: options.plugin.catalogLogicalIdentity, pluginName: options.plugin.manifest.name, manifest: options.plugin.manifest, scope: 'user', cwd: options.cwd, env: options.env, referencePlugins: options.context.referencePlugins });
     const key = JSON.stringify([options.plugin.rootDir, options.platform, config]);
     let cache = staticCommandPreparationCaches.get(options.context);
     if (!cache) {
@@ -87,7 +88,7 @@ async function prepareStaticCommandArtifacts(options) {
     let prepared = cache.get(key);
     if (!prepared) {
         prepared = (async () => {
-            const rendered = await runArtifactRenderer({ plugin: options.plugin, event: 'install', platform: options.platform, scope: 'user', configScope: 'user', cwd: options.cwd, commandEnv: options.env, requestedArtifactIds: targets.map((target) => target.id) });
+            const rendered = await runArtifactRenderer({ plugin: options.plugin, referencePlugins: options.context.referencePlugins, event: 'install', platform: options.platform, scope: 'user', configScope: 'user', cwd: options.cwd, commandEnv: options.env, requestedArtifactIds: targets.map((target) => target.id) });
             return validateArtifactPlan({ manifest: options.plugin.manifest, plan: rendered.plan, platform: options.platform, scope: 'user', requestedArtifactIds: rendered.context.requestedArtifactIds, renderConfig: rendered.context.config, rendererDigest: rendered.target.rendererDigest, manifestDigest: rendered.target.manifestDigest }).artifacts;
         })();
         cache.set(key, prepared);
@@ -127,7 +128,7 @@ async function commandPackageActions(options) {
         let preparation = cache.get(getCommandPackageId(producer));
         if (!preparation) {
             preparation = (async () => {
-                const prepared = await prepareManagedCommandPackage({ ...options, packageKey: declaration.key, scope: declaration.scope });
+                const prepared = await prepareManagedCommandPackage({ ...options, referencePlugins: options.context.referencePlugins, packageKey: declaration.key, scope: declaration.scope });
                 try {
                     const files = [];
                     async function visit(directory, prefix) {
@@ -1140,11 +1141,17 @@ async function resolveDynamicArtifacts(options) {
         return { artifacts: [], sourceDirs: () => [], sensitiveValues: [] };
     }
     const previousArtifacts = [...options.previousArtifacts];
+    let preparedResults = options.context && dynamicArtifactPreparationCaches.get(options.context);
+    if (options.context && !preparedResults) {
+        preparedResults = new Map();
+        dynamicArtifactPreparationCaches.set(options.context, preparedResults);
+    }
     const renders = [];
     for (const requestedArtifactIds of requestBatches) {
         renders.push(await runArtifactRenderer({
             event: options.event,
             plugin: options.plugin,
+            referencePlugins: options.referencePlugins ?? options.context?.referencePlugins,
             platform: options.platform,
             scope: options.scope,
             cwd: options.cwd,
@@ -1152,6 +1159,7 @@ async function resolveDynamicArtifacts(options) {
             previousArtifacts,
             requestedArtifactIds,
             scriptTimeoutMs: options.scriptTimeoutMs,
+            preparedResults,
         }));
     }
     const config = await resolveArtifactRenderConfig({
@@ -1160,6 +1168,7 @@ async function resolveDynamicArtifacts(options) {
         logicalIdentity: options.plugin.catalogLogicalIdentity,
         pluginName: options.plugin.manifest.name,
         manifest: options.plugin.manifest,
+        referencePlugins: options.referencePlugins ?? options.context?.referencePlugins,
         scope: options.scope,
         cwd: options.cwd,
         env: options.env,
@@ -2806,7 +2815,7 @@ function pluginHasCodexNativeSkillSurface(plugin) {
     return plugin.manifest.skills !== undefined
         || codexNativeRenderTargets(plugin).length > 0;
 }
-async function resolveSensitiveUserConfigValues(plugin, env) {
+async function resolveSensitiveUserConfigValues(plugin, env, referencePlugins) {
     const hasSensitiveFields = Object.values(plugin.manifest.config?.fields ?? {}).some((field) => field.sensitive === true);
     if (!hasSensitiveFields)
         return [];
@@ -2815,6 +2824,7 @@ async function resolveSensitiveUserConfigValues(plugin, env) {
         sourceIdentity: plugin.sourceIdentity,
         pluginName: plugin.manifest.name,
         manifest: plugin.manifest,
+        referencePlugins,
         scope: 'user',
         cwd: plugin.rootDir,
         env,
@@ -2930,6 +2940,7 @@ async function prepareCodexNativeRender(options) {
         if (!group || group.length === 0)
             continue;
         const rendered = await runArtifactRenderer({
+            referencePlugins: options.referencePlugins,
             event: 'install',
             plugin: options.plugin,
             platform: 'codex',
@@ -3035,6 +3046,7 @@ function prepareCodexNativeRenderCached(options) {
     let preparation = cache.get(options.plugin);
     if (!preparation) {
         preparation = prepareCodexNativeRender({
+            referencePlugins: options.context.referencePlugins,
             plugin: options.plugin,
             env: options.context.env,
             scriptTimeoutMs: options.scriptTimeoutMs,
@@ -3138,6 +3150,7 @@ export async function materializeReviewNativeSkills(options) {
         .map((target) => target.id);
     if (directTargetIds.length > 0) {
         const dynamic = await resolveDynamicArtifacts({
+            referencePlugins: options.plugins,
             plugin: options.plugin,
             platform: options.platform,
             scope: options.scope,
@@ -3218,6 +3231,7 @@ export async function materializeReviewNativeSkills(options) {
             dereference: false,
         });
         const prepared = await prepareCodexNativeRender({
+            referencePlugins: options.plugins,
             plugin: options.plugin,
             env: options.env,
             requestedArtifactIds: nativeTargetIds,
@@ -3239,7 +3253,7 @@ export async function materializeReviewNativeSkills(options) {
             plugin: options.plugin,
             payloadRoot,
             allowedRoot: marketplaceRoot,
-            sensitiveValues: await resolveSensitiveUserConfigValues(options.plugin, options.env),
+            sensitiveValues: await resolveSensitiveUserConfigValues(options.plugin, options.env, options.plugins),
             verifiedRenderReceipt: staged.receipt,
         });
         const presentSkillKeys = new Set(staged.presentSkillKeys);
@@ -3767,7 +3781,7 @@ function createNativeDriver(options) {
                                 plugin: candidate.plugin,
                                 payloadRoot: path.join(stagingRoot, 'plugins', candidate.identity.pluginName),
                                 allowedRoot: stagingRoot,
-                                sensitiveValues: await resolveSensitiveUserConfigValues(candidate.plugin, options.context.env),
+                                sensitiveValues: await resolveSensitiveUserConfigValues(candidate.plugin, options.context.env, options.context.referencePlugins),
                                 ...(nativeRender ? { verifiedRenderReceipt: nativeRender.receipt } : {}),
                             });
                         }
@@ -4169,7 +4183,7 @@ function createNativeDriver(options) {
                 && !target.codexNativeSensitivePreflightRequired)
                 return;
             const sensitiveValues = pluginHasCodexNativeSkillSurface(target.plugin)
-                ? await resolveSensitiveUserConfigValues(target.plugin, options.context.env)
+                ? await resolveSensitiveUserConfigValues(target.plugin, options.context.env, options.context.referencePlugins)
                 : [];
             if (sensitiveValues.length > 0) {
                 await assertNoSensitiveValuesInCanonicalCodexNativePayload({
@@ -4561,6 +4575,7 @@ function createNativeDriver(options) {
                 scope: invocation.target.identity.scope,
                 cwd: invocation.target.identity.cwd,
                 context: options.context,
+                referencePlugins: options.context.referencePlugins,
                 scriptTimeoutMs: options.scriptTimeoutMs,
             });
             const cache = options.context.preApplyExecutionCache;
@@ -4692,6 +4707,7 @@ export function createRebuildIntegration(options) {
                         scriptTimeoutMs: options.scriptTimeoutMs,
                         commandCandidates: commands.candidates,
                         nativeSkillActions,
+                        context: options.context,
                     });
                 }
             }