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

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

@@ -1,10 +1,12 @@
 import crypto from 'node:crypto';
+import { captureNativeToolChanges } from '../utils/native-tool-review.js';
+import { forceOfflineCleanupEvidence } from './offline-cleanup-evidence.js';
 import path from 'node:path';
 import fs from 'fs-extra';
 import { catalogFileMode } from '@lesliechan721/aw-plugin-core';
 import { COMMAND_PRODUCER_RECORD_FILE, getManagedCommandArtifactTargets, getCommandPackageId } from '@lesliechan721/aw-plugin-core/manifest';
 import os from 'node:os';
-import { commandSetsForProducer, createManagedCommandReferenceResolver, discoverRetainedManagedCommandPackages, retainedManagedCommandPackageResult, managedCommandProducerIdentity, prepareManagedCommandPackage, resolveSkillManagedCommandReferences, } from '../utils/managed-command-materialization.js';
+import { injectNativeToolClosureFiles, nativeToolsForCommandSets, commandSetsForProducer, createManagedCommandReferenceResolver, discoverRetainedManagedCommandPackages, retainedManagedCommandPackageResult, managedCommandProducerIdentity, prepareManagedCommandPackage, resolveSkillManagedCommandReferences, } from '../utils/managed-command-materialization.js';
 import { assertManagedCommandBindingIdentities, normalizeInstalledCommandProducer, managedCommandDiagnostic, ManagedCommandError, publishManagedCommandBindings, revokeManagedCommandBindings, syncManagedCommandPackage, readInstalledCommandProducer, listManagedCommands } from '../utils/managed-command-store.js';
 import { injectInstalledRuntimeConfig, carryRuntimeConfigNativeReceipt } from '../utils/runtime-config.js';
 import { resolveCodexSkillsRelativeRoot } from '../utils/codex-skills-root.js';
@@ -142,7 +144,7 @@ async function commandPackageActions(options) {
                     }
                     await visit(prepared.resourceRoot, '');
                     files.sort((left, right) => left.relativePath.localeCompare(right.relativePath));
-                    return { action: { kind: 'syncManagedCommandPackage', pluginId: pluginActionId(options.plugin), scope: declaration.scope, producer: prepared.producer, sets: prepared.sets, files, contentDigest: `sha256:${crypto.createHash('sha256').update(JSON.stringify(files)).digest('hex')}` }, candidate: { producer: prepared.producer, sets: prepared.sets } };
+                    return { action: { kind: 'syncManagedCommandPackage', pluginId: pluginActionId(options.plugin), scope: declaration.scope, producer: prepared.producer, sets: prepared.sets, nativeTools: prepared.nativeTools, files, contentDigest: `sha256:${crypto.createHash('sha256').update(JSON.stringify(files)).digest('hex')}` }, candidate: { producer: prepared.producer, sets: prepared.sets, nativeTools: prepared.nativeTools } };
                 }
                 finally {
                     await prepared.cleanup();
@@ -172,8 +174,9 @@ async function prepareSkillCommandCandidate(options) {
             if (process.platform !== 'win32' && entry.runner === 'executable' && options.tree.fileModes?.[entry.entry] !== 0o755)
                 throw new Error(`commandRunnerUnsupported: command entry ${entry.entry} has no executable source file.`);
         }
-    options.tree.files[COMMAND_PRODUCER_RECORD_FILE] = Buffer.from(`${JSON.stringify({ schemaVersion: 1, producer, sets }, null, 2)}\n`);
-    return { producer, sets };
+    const nativeTools = injectNativeToolClosureFiles(options.tree.files, await nativeToolsForCommandSets(options.plugin, sets));
+    options.tree.files[COMMAND_PRODUCER_RECORD_FILE] = Buffer.from(`${JSON.stringify({ schemaVersion: 1, producer, sets, ...(nativeTools ? { nativeTools } : {}) }, null, 2)}\n`);
+    return { producer, sets, nativeTools };
 }
 async function prepareStaticNativeSkillActions(options) {
     if (!options.plugin.manifest.skills)
@@ -3542,7 +3545,7 @@ function createNativeDriver(options) {
         for (const target of targets)
             for (const action of target.operationActions ?? []) {
                 if (action.kind === 'syncManagedCommandPackage') {
-                    producers.push({ producer: action.producer, sets: action.sets });
+                    producers.push({ producer: action.producer, sets: action.sets, nativeTools: action.nativeTools });
                 }
                 else if (action.kind === 'materializeNativeSkill'
                     || (action.kind === 'writeOwnedArtifact' && action.artifactKind === 'skill-directory')) {
@@ -3597,7 +3600,7 @@ function createNativeDriver(options) {
                             await fs.outputFile(destination, content);
                             await fs.chmod(destination, file.mode);
                         }
-                        const result = await syncManagedCommandPackage({ producer: action.producer, sourceDirectory: resourceRoot, sets: action.sets, env: options.context.env });
+                        const result = await syncManagedCommandPackage({ producer: action.producer, sourceDirectory: resourceRoot, sets: action.sets, nativeTools: action.nativeTools, env: options.context.env });
                         await options.context.reporter.event({ type: 'managed-command:producer', source: { plugin: action.producer.pluginName, scope: action.producer.scope }, data: { packageKey: action.producer.key, phase: 'success' } });
                         return { producer: action.producer, state: 'completed', commandIds: result.commandIds, removedCommandIds: result.removedCommandIds, errors: [], recoveryActions: [] };
                     }
@@ -4975,6 +4978,30 @@ export function createRebuildIntegration(options) {
                 ...(write.additionalActions ?? []),
             ]));
             finalizeOwnedArtifactActions(operationActions);
+            const removed = input.command === 'cleanup' || input.command === 'uninstall';
+            if (input.readOnlyInspectionPlan !== true && (removed || operationActions.length > 0)) {
+                let skillComponents = allComponents.filter((component) => component.kind === 'skill-directory');
+                if (removed && skillComponents.length > 0) {
+                    const inspection = await inspectOwnedComponents({ components: skillComponents, executor: driver.ownership });
+                    skillComponents = inspection.components.flatMap((entry) => entry.state === 'present' && entry.component.kind === 'skill-directory' ? [entry.component] : []);
+                }
+                const nativeToolChanges = await captureNativeToolChanges({ actions: operationActions, sourceId: input.sourceId,
+                    pluginName: input.plugin.manifest.name, platform: input.platform, scope: input.scope, projectRoot: input.cwd,
+                    removed, env: options.context.env, resourceRoots: skillComponents.map((component) => component.path) });
+                if (nativeToolChanges.length > 0 && removed && operationActions.length === 0) {
+                    // Ordinary owned Skill removal can have no renderer action. Reuse the
+                    // existing owner/path evidence so its native impact enters Review.
+                    const evidence = await forceOfflineCleanupEvidence({ reason: 'bundleUnavailable',
+                        pluginId: input.pluginId ?? pluginActionId(input.plugin), pluginName: input.plugin.manifest.name,
+                        sourceId: input.sourceId, sourceIdentity: input.sourceIdentity, platform: input.platform, scope: input.scope,
+                        components: skillComponents });
+                    operationActions.push(...evidence.plan.actions.map((action) => ({ kind: 'removeOwnedArtifact',
+                        pluginId: evidence.pluginId, platform: input.platform, scope: input.scope,
+                        path: action.target, ownerFingerprint: evidence.targetFingerprint })));
+                }
+                if (nativeToolChanges.length > 0)
+                    operationActions[0].nativeToolChanges = nativeToolChanges;
+            }
             const target = {
                 plugin: input.plugin,
                 identity: {