@open-agent-toolkit/cli 0.2.51 → 0.2.52

package/dist/commands/tools/install/index.js

@@ -1,6 +1,7 @@
 import { execFile } from 'node:child_process';
 import { buildCommandContext } from '../../../app/command-context.js';
-import { consumeInitToolsRunMetadata, createInitToolsCommand, } from '../../init/tools/index.js';
+import { consumeInitToolsRunMetadata, createInitToolsCommand, wasInstallSyncHandled, } from '../../init/tools/index.js';
+import { withProjectGuidanceOptions } from '../../init/tools/project-guidance.js';
 import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { autoSync, } from '../../tools/shared/auto-sync.js';
@@ -28,22 +29,37 @@ const defaultSyncDependencies = {
     },
 };
 export function createToolsInstallCommand(syncDependencies = defaultSyncDependencies, initOverrides = {}, createBaseCommand) {
+    let syncEnabled = true;
+    const buildContext = initOverrides.buildCommandContext ?? buildCommandContext;
+    const effectiveOverrides = {
+        ...initOverrides,
+        syncAfterInstall: async (scopes, context, installedCanonicalPaths) => syncEnabled
+            ? autoSync(scopes, context.cwd, context.home, context.logger, syncDependencies, { installedCanonicalPaths })
+            : { synced: false, scopes: [], error: null },
+    };
     const cmd = createBaseCommand === undefined
-        ? createInitToolsCommand(initOverrides)
+        ? createInitToolsCommand(effectiveOverrides)
         : createBaseCommand();
     cmd.name('install');
     withScopeOption(cmd);
+    withProjectGuidanceOptions(cmd);
     cmd.option('--no-sync', 'Skip auto-sync after install');
+    cmd.hook('preAction', (thisCommand) => {
+        syncEnabled = thisCommand.opts().sync !== false;
+    });
     cmd.hook('postAction', async (thisCommand, actionCommand) => {
         if (process.exitCode !== 0 && process.exitCode !== undefined)
             return;
+        if (wasInstallSyncHandled(actionCommand))
+            return;
         const opts = thisCommand.opts();
         if (opts.sync === false)
             return;
         const globalOptions = readGlobalOptions(actionCommand);
-        const buildContext = initOverrides.buildCommandContext ?? buildCommandContext;
         const context = buildContext(globalOptions);
         const metadata = consumeInitToolsRunMetadata();
+        if (metadata?.syncHandled)
+            return;
         const scopes = metadata === null
             ? resolveConcreteScopes(context.scope)
             : metadata.affectedScopes;

package/dist/commands/tools/list/list-tools.d.ts

@@ -1,4 +1,5 @@
 import type { CommandContext } from '../../../app/command-context.js';
+import { type PackEvidenceBlockV1 } from '../../tools/shared/format-pack-inventory.js';
 import { type InventoryPackInput, type PackInventory } from '../../tools/shared/pack-inventory.js';
 import type { ScanToolsOptions } from '../../tools/shared/scan-tools.js';
 import type { ToolInfo } from '../../tools/shared/types.js';
@@ -11,6 +12,7 @@ export interface ListToolsDependencies {
 export interface ListToolsResult {
     tools: ToolInfo[];
     packs: PackInventory[];
+    packEvidence: PackEvidenceBlockV1;
 }
 export declare function runListTools(context: CommandContext, dependencies: ListToolsDependencies): Promise<ListToolsResult>;
 //# sourceMappingURL=list-tools.d.ts.map

package/dist/commands/tools/list/list-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-tools.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/list/list-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,gBAAgB,EAAE,CAChB,KAAK,EAAE,SAAS,GAAG,MAAM,EACzB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,EAAE,aAAa,EAAE,CAAC;CACxB;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,qBAAqB,GAClC,OAAO,CAAC,eAAe,CAAC,CAiG1B"}
+{"version":3,"file":"list-tools.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/list/list-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAML,KAAK,mBAAmB,EACzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,gBAAgB,EAAE,CAChB,KAAK,EAAE,SAAS,GAAG,MAAM,EACzB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,YAAY,EAAE,mBAAmB,CAAC;CACnC;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,qBAAqB,GAClC,OAAO,CAAC,eAAe,CAAC,CAkI1B"}

package/dist/commands/tools/list/list-tools.js

@@ -1,5 +1,5 @@
 import { resolveConcreteScopes } from '../../shared/shared.utils.js';
-import { formatPackInventoryDetails } from '../../tools/shared/format-pack-inventory.js';
+import { formatPackEvidenceDetails, formatPackInventoryDetails, packEvidenceBlock, projectRenderablePackEvidence, unavailablePackEvidence, } from '../../tools/shared/format-pack-inventory.js';
 import { inventoryPack, } from '../../tools/shared/pack-inventory.js';
 import { PACK_MANIFEST } from '../../tools/shared/pack-manifest.js';
 export async function runListTools(context, dependencies) {
@@ -18,16 +18,35 @@ export async function runListTools(context, dependencies) {
         allTools.push(...tools);
         roots[scope] = scopeRoot;
     }
+    const packRoots = {
+        projectRoot: roots.project,
+        userRoot: roots.user,
+    };
     const inspectPack = dependencies.inventoryPack ?? inventoryPack;
-    const packs = await Promise.all(PACK_MANIFEST.map(({ name }) => inspectPack({
+    const inspected = await Promise.all(PACK_MANIFEST.map(({ name }) => inspectPack({
         pack: name,
         assetsRoot,
         projectRoot: roots.project,
         userRoot: roots.user,
-    })));
+    }).then((canonical) => ({
+        canonical,
+        evidence: projectRenderablePackEvidence(canonical, packRoots),
+    }), (error) => ({
+        canonical: null,
+        evidence: unavailablePackEvidence({
+            pack: name,
+            scopes,
+            reason: error instanceof Error ? error.message : String(error),
+            roots: packRoots,
+        }),
+    }))));
+    const packs = inspected
+        .map(({ canonical }) => canonical)
+        .filter((pack) => pack !== null);
+    const packEvidence = packEvidenceBlock(inspected.map(({ evidence }) => evidence));
     if (context.json) {
-        logger.json({ tools: allTools, packs });
-        return { tools: allTools, packs };
+        logger.json({ tools: allTools, packs, packEvidence });
+        return { tools: allTools, packs, packEvidence };
     }
     if (allTools.length === 0) {
         logger.info('No tools installed.');
@@ -37,7 +56,11 @@ export async function runListTools(context, dependencies) {
             for (const line of formatPackInventoryDetails(pack))
                 logger.info(line);
         }
-        return { tools: allTools, packs };
+        for (const evidence of packEvidence.items) {
+            for (const line of formatPackEvidenceDetails(evidence))
+                logger.info(line);
+        }
+        return { tools: allTools, packs, packEvidence };
     }
     logger.info('Installed tools:\n');
     const header = formatRow('NAME', 'TYPE', 'VERSION', 'PACK', 'SCOPE', 'STATUS');
@@ -56,7 +79,13 @@ export async function runListTools(context, dependencies) {
         for (const line of formatPackInventoryDetails(pack))
             logger.info(line);
     }
-    return { tools: allTools, packs };
+    logger.info('\nNormalized pack evidence:');
+    for (const evidence of packEvidence.items) {
+        logger.info(`${evidence.pack}: ${evidence.realizedPlacement}`);
+        for (const line of formatPackEvidenceDetails(evidence))
+            logger.info(line);
+    }
+    return { tools: allTools, packs, packEvidence };
 }
 function formatRow(name, type, version, pack, scope, status) {
     return [

package/dist/commands/tools/remove/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/index.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAS1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AAmExB,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CAiHT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAW1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAM7B,MAAM,gBAAgB,CAAC;AAqExB,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CAkOT"}

package/dist/commands/tools/remove/index.js

@@ -5,12 +5,13 @@ import { buildCommandContext } from '../../../app/command-context.js';
 import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { autoSync, } from '../../tools/shared/auto-sync.js';
+import { inventoryScopedPack } from '../../tools/shared/pack-inventory.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
 import { hasScopedPackOwnershipEvidence, writeScopedPackIntent, } from '../../tools/shared/scoped-pack-intent.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../../fs/paths.js';
 import { Command } from 'commander';
-import { removeTools, } from './remove-tools.js';
+import { failedPostRemovalLifecycleOutcomes, failedRemovalLifecycleOutcomes, removalLifecycleOutcomes, removeTools, selectedPacks, } from './remove-tools.js';
 const defaultDependencies = {
     scanTools,
     resolveScopeRoot: async (scope, cwd, home) => {
@@ -41,6 +42,8 @@ const defaultDependencies = {
         }
     },
     hasPackOwnershipEvidence: async (pack, scope, scopeRoot) => hasScopedPackOwnershipEvidence({ pack, scope, scopeRoot }),
+    inventoryScopedPack,
+    writeScopedPackIntent,
 };
 const defaultSyncDependencies = {
     runSync: async ({ scope, cwd, removedCanonicalPaths }) => {
@@ -94,28 +97,98 @@ export function createToolsRemoveCommand(dependencies = defaultDependencies, syn
         }
         const scopes = resolveConcreteScopes(context.scope);
         const dryRun = opts.dryRun ?? false;
-        const result = await removeTools(target, scopes, context.cwd, context.home, dryRun, dependencies);
+        let result;
+        try {
+            result = await removeTools(target, scopes, context.cwd, context.home, dryRun, dependencies);
+        }
+        catch (error) {
+            if (target.kind === 'name' || !context.json)
+                throw error;
+            const lifecycle = failedRemovalLifecycleOutcomes(target, scopes, error);
+            logger.json({
+                target: describeTarget(target),
+                dryRun,
+                result: {
+                    removed: [],
+                    removedAssets: [],
+                    retainedOwnerData: [],
+                    packOutcomes: [],
+                    notInstalled: [],
+                },
+                lifecycle,
+            });
+            process.exitCode = 1;
+            return;
+        }
         if (!dryRun && target.kind !== 'name') {
             const packs = target.kind === 'pack' ? [target.pack] : [...VALID_PACKS];
-            for (const scope of scopes) {
-                const scopeRoot = await dependencies.resolveScopeRoot(scope, context.cwd, context.home);
-                for (const pack of packs) {
-                    // Durable scoped intent is what lets `oat tools update` restore a
-                    // pack whose files are all missing, so it may only be cleared for a
-                    // pack this run actually removed something for. A removal that
-                    // removed nothing reports nothing and must leave intent alone.
-                    const removedForPack = result.packOutcomes.some((outcome) => outcome.pack === pack &&
-                        outcome.scope === scope &&
-                        outcome.removed);
-                    if (!removedForPack)
-                        continue;
-                    await writeScopedPackIntent({
-                        pack,
-                        scope,
-                        scopeRoot,
-                        enabled: false,
+            let stage = 'intent-write';
+            let currentPack = packs[0];
+            let currentScope = scopes[0];
+            try {
+                for (const scope of scopes) {
+                    currentScope = scope;
+                    const scopeRoot = await dependencies.resolveScopeRoot(scope, context.cwd, context.home);
+                    for (const pack of packs) {
+                        currentPack = pack;
+                        // Durable scoped intent is what lets `oat tools update` restore a
+                        // pack whose files are all missing, so it may only be cleared for a
+                        // pack this run actually removed something for.
+                        const removedForPack = result.packOutcomes.some((outcome) => outcome.pack === pack &&
+                            outcome.scope === scope &&
+                            outcome.removed);
+                        if (!removedForPack)
+                            continue;
+                        await (dependencies.writeScopedPackIntent ?? writeScopedPackIntent)({
+                            pack,
+                            scope,
+                            scopeRoot,
+                            enabled: false,
+                        });
+                    }
+                }
+                if (dependencies.inventoryScopedPack) {
+                    stage = 'final-inventory';
+                    const assetsRoot = await dependencies.resolveAssetsRoot();
+                    const finalInventories = [];
+                    for (const scope of scopes) {
+                        currentScope = scope;
+                        const scopeRoot = await dependencies.resolveScopeRoot(scope, context.cwd, context.home);
+                        for (const pack of selectedPacks(target)) {
+                            currentPack = pack;
+                            finalInventories.push(await dependencies.inventoryScopedPack({
+                                pack,
+                                scope,
+                                scopeRoot,
+                                assetsRoot,
+                            }));
+                        }
+                    }
+                    result.lifecycle = removalLifecycleOutcomes(selectedPacks(target), scopes, result.packOutcomes, false, finalInventories);
+                }
+            }
+            catch (error) {
+                const lifecycle = failedPostRemovalLifecycleOutcomes(target, scopes, result.packOutcomes, stage, currentPack, currentScope, error);
+                const legacyResult = { ...result };
+                delete legacyResult.lifecycle;
+                if (context.json) {
+                    logger.json({
+                        target: describeTarget(target),
+                        dryRun,
+                        result: legacyResult,
+                        lifecycle,
                     });
                 }
+                else {
+                    for (const tool of result.removed) {
+                        logger.success(`Removed: ${tool.name} (${tool.scope})`);
+                    }
+                    for (const outcome of lifecycle) {
+                        logger.warn(outcome.recovery.map(({ message }) => message).join('; '));
+                    }
+                }
+                process.exitCode = 1;
+                return;
             }
         }
         if (result.notInstalled.length > 0) {
@@ -129,17 +202,29 @@ export function createToolsRemoveCommand(dependencies = defaultDependencies, syn
             return;
         }
         // Auto-sync after mutations (before output so sync errors are captured)
+        const syncResults = [];
         if (!dryRun && opts.sync !== false) {
             for (const scope of scopes) {
                 const scopeRoot = await dependencies.resolveScopeRoot(scope, context.cwd, context.home);
                 const removedCanonicalPaths = canonicalRemovalPaths(result, scope, scopeRoot);
                 if (removedCanonicalPaths.length === 0)
                     continue;
-                await autoSync([scope], context.cwd, context.home, logger, syncDependencies, { removedCanonicalPaths });
+                syncResults.push(await autoSync([scope], context.cwd, context.home, logger, syncDependencies, { removedCanonicalPaths }));
             }
         }
+        const lifecycle = finalizeRemovalLifecycle(result.lifecycle, syncResults);
+        const legacyResult = { ...result };
+        delete legacyResult.lifecycle;
         if (context.json) {
-            logger.json({ target: describeTarget(target), dryRun, result });
+            logger.json({
+                target: describeTarget(target),
+                dryRun,
+                result: legacyResult,
+                ...(lifecycle ? { lifecycle } : {}),
+            });
+            if (lifecycle?.some(({ status }) => status !== 'complete')) {
+                process.exitCode = 1;
+            }
             return;
         }
         if (result.removed.length > 0) {
@@ -151,6 +236,50 @@ export function createToolsRemoveCommand(dependencies = defaultDependencies, syn
         else {
             logger.info('No tools to remove.');
         }
+        for (const outcome of lifecycle ?? []) {
+            if (outcome.status === 'complete')
+                continue;
+            logger.warn(`Pack ${outcome.selection.pack} removal ${outcome.status}: ${outcome.recovery.map(({ message }) => message).join('; ')}`);
+            process.exitCode = 1;
+        }
+    });
+}
+function finalizeRemovalLifecycle(lifecycle, syncResults) {
+    if (!lifecycle || syncResults.length === 0)
+        return lifecycle;
+    return lifecycle.map((outcome) => {
+        const relevant = syncResults.filter(({ scopes }) => scopes.some((scope) => outcome.selection.targetScopes.includes(scope)));
+        if (relevant.length === 0 || relevant.every(({ synced }) => synced)) {
+            return relevant.length === 0
+                ? outcome
+                : {
+                    ...outcome,
+                    sync: {
+                        scopes: [...new Set(relevant.flatMap(({ scopes }) => scopes))],
+                        status: 'complete',
+                        providers: [],
+                    },
+                };
+        }
+        const error = relevant.find((result) => result.error)?.error;
+        return {
+            ...outcome,
+            sync: {
+                scopes: [...new Set(relevant.flatMap(({ scopes }) => scopes))],
+                status: 'failed',
+                providers: [],
+                ...(error ? { error } : {}),
+            },
+            status: 'partial',
+            recovery: [
+                ...outcome.recovery,
+                {
+                    code: 'provider-sync-incomplete',
+                    message: error ??
+                        `Run oat sync for ${outcome.selection.targetScopes.join(', ')} scope`,
+                },
+            ],
+        };
     });
 }
 function canonicalRemovalPaths(result, scope, scopeRoot) {

package/dist/commands/tools/remove/remove-tools.d.ts

@@ -1,3 +1,5 @@
+import type { InventoryScopedPackInput, ScopedPackInventory } from '../../tools/shared/pack-inventory.js';
+import type { PackLifecycleOutcome } from '../../tools/shared/pack-lifecycle-outcome.js';
 import type { ScanToolsOptions } from '../../tools/shared/scan-tools.js';
 import type { PackName, ToolInfo } from '../../tools/shared/types.js';
 import type { ConcreteScope } from '../../../shared/types.js';
@@ -18,6 +20,13 @@ export interface RemoveToolsDependencies {
     removeFile: (path: string) => Promise<void>;
     pathExists: (path: string) => Promise<boolean>;
     hasPackOwnershipEvidence: (pack: PackName, scope: ConcreteScope, scopeRoot: string) => Promise<boolean>;
+    inventoryScopedPack?: (input: InventoryScopedPackInput) => Promise<ScopedPackInventory>;
+    writeScopedPackIntent?: (input: {
+        pack: PackName;
+        scope: ConcreteScope;
+        scopeRoot: string;
+        enabled: boolean;
+    }) => Promise<unknown>;
 }
 interface RemovedTool {
     name: string;
@@ -53,7 +62,18 @@ export interface RemoveResult {
     }>;
     packOutcomes: PackRemovalOutcome[];
     notInstalled: string[];
+    lifecycle?: PackLifecycleOutcome[];
 }
+export declare function selectedPacks(target: Exclude<RemoveTarget, {
+    kind: 'name';
+}>): PackName[];
 export declare function removeTools(target: RemoveTarget, scopes: ConcreteScope[], cwd: string, home: string, dryRun: boolean, deps: RemoveToolsDependencies): Promise<RemoveResult>;
+export declare function removalLifecycleOutcomes(packs: readonly PackName[], scopes: readonly ConcreteScope[], outcomes: readonly PackRemovalOutcome[], dryRun: boolean, finalInventories: readonly ScopedPackInventory[]): PackLifecycleOutcome[];
+export declare function failedRemovalLifecycleOutcomes(target: Exclude<RemoveTarget, {
+    kind: 'name';
+}>, scopes: readonly ConcreteScope[], error: unknown): PackLifecycleOutcome[];
+export declare function failedPostRemovalLifecycleOutcomes(target: Exclude<RemoveTarget, {
+    kind: 'name';
+}>, scopes: readonly ConcreteScope[], outcomes: readonly PackRemovalOutcome[], stage: 'intent-write' | 'final-inventory', failedPack: PackName, failedScope: ConcreteScope, error: unknown): PackLifecycleOutcome[];
 export {};
 //# sourceMappingURL=remove-tools.d.ts.map

package/dist/commands/tools/remove/remove-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-tools.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/remove-tools.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAEV,QAAQ,EACR,QAAQ,EACT,MAAM,8BAA8B,CAAC;AAMtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC;AAEpB,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,wBAAwB,EAAE,CACxB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACxB,KAAK,EAAE,aAAa,CAAC;CACtB;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAC7D,iBAAiB,EAAE,KAAK,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IACH,YAAY,EAAE,kBAAkB,EAAE,CAAC;IACnC,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AA8MD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,aAAa,EAAE,EACvB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAsGvB"}
+{"version":3,"file":"remove-tools.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/remove-tools.ts"],"names":[],"mappings":"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"}

package/dist/commands/tools/remove/remove-tools.js

@@ -1,4 +1,5 @@
 import { join } from 'node:path';
+import { packScopeFactsFromInventory, projectPackEvidence, } from '../../tools/shared/pack-evidence.js';
 import { PACK_MANIFEST } from '../../tools/shared/pack-manifest.js';
 import { resolveSharedOwnerRetentions } from '../../tools/shared/pack-reconcile.js';
 import { resolveManagedScopeRoots, validateManagedPath, } from '../../../fs/paths.js';
@@ -27,7 +28,7 @@ async function removeTool(tool, scopeRoot, dryRun, deps) {
 function isDirectoryAsset(asset) {
     return asset.kind === 'skill' || asset.kind === 'directory';
 }
-function selectedPacks(target) {
+export function selectedPacks(target) {
     return target.kind === 'pack'
         ? [target.pack]
         : PACK_MANIFEST.map(({ name }) => name);
@@ -146,6 +147,14 @@ export async function removeTools(target, scopes, cwd, home, dryRun, deps) {
         const tools = await deps.scanTools({ scope, scopeRoot, assetsRoot });
         const matched = tools.filter((tool) => matchesTarget(tool, target));
         const managedPlan = await planManagedPackRemoval(selectedPacks(target), scope, scopeRoot, dryRun, deps);
+        const beforeInventories = deps.inventoryScopedPack
+            ? await Promise.all(selectedPacks(target).map((pack) => deps.inventoryScopedPack({
+                pack,
+                scope,
+                scopeRoot,
+                assetsRoot,
+            })))
+            : [];
         const seedData = PACK_MANIFEST.filter(({ name }) => selectedPacks(target).includes(name)).flatMap(({ assets }) => assets
             .filter((asset) => asset.scopes.includes(scope) &&
             asset.ownership[scope] === 'seed-if-missing')
@@ -160,6 +169,7 @@ export async function removeTools(target, scopes, cwd, home, dryRun, deps) {
             managedTargets: managedPlan.targets,
             retainedOwnerData: [...managedPlan.retained, ...seedData],
             presentPacks: managedPlan.presentPacks,
+            beforeInventories,
         });
     }
     for (const plan of plans) {
@@ -184,11 +194,122 @@ export async function removeTools(target, scopes, cwd, home, dryRun, deps) {
                 plan.presentPacks.includes(pack),
         })));
     }
+    const finalInventories = dryRun
+        ? plans.flatMap(({ beforeInventories }) => beforeInventories)
+        : [];
     return {
         removed,
         removedAssets,
         retainedOwnerData,
         packOutcomes,
         notInstalled: [],
+        lifecycle: removalLifecycleOutcomes(selectedPacks(target), scopes, packOutcomes, dryRun, finalInventories),
     };
 }
+export function removalLifecycleOutcomes(packs, scopes, outcomes, dryRun, finalInventories) {
+    if (finalInventories.length === 0)
+        return [];
+    return packs.map((pack) => {
+        const packInventories = finalInventories.filter((inventory) => inventory.pack === pack);
+        const finalEvidence = packInventories.length === 0
+            ? null
+            : projectPackEvidence({
+                canonical: null,
+                scopes: packInventories.map(packScopeFactsFromInventory),
+            });
+        const removed = outcomes.some((outcome) => outcome.pack === pack && outcome.removed);
+        const inventoriedScopes = new Set(packInventories.map(({ scope }) => scope));
+        const inventoryVerified = finalEvidence !== null &&
+            finalEvidence.unknownScopes.length === 0 &&
+            scopes.every((scope) => inventoriedScopes.has(scope));
+        const remainingScopes = finalEvidence
+            ? scopes.filter((scope) => finalEvidence.knownRealizedScopes.includes(scope))
+            : [...scopes];
+        const verified = inventoryVerified && (dryRun || remainingScopes.length === 0);
+        const recovery = !inventoryVerified
+            ? [
+                {
+                    code: 'final-inventory-unverified',
+                    message: `Re-run status for ${pack}; final removal state could not be verified`,
+                },
+            ]
+            : !dryRun && remainingScopes.length > 0
+                ? remainingScopes.map((scope) => ({
+                    code: 'canonical-verification-failed',
+                    message: `Removal remains incomplete for ${pack} at ${scope} scope; rerun oat tools remove --pack ${pack} --scope ${scope}`,
+                }))
+                : [];
+        return {
+            schemaVersion: 1,
+            selection: {
+                pack,
+                requested: scopes.includes('project') && scopes.includes('user')
+                    ? 'both'
+                    : scopes[0],
+                retainedRealizedScopes: finalEvidence?.knownRealizedScopes ?? [],
+                targetScopes: scopes,
+            },
+            canonical: {
+                status: removed && !dryRun ? 'applied' : 'unchanged',
+                results: [],
+            },
+            sync: { scopes: [], status: 'not-run', providers: [] },
+            finalEvidence,
+            status: verified ? 'complete' : inventoryVerified ? 'partial' : 'failed',
+            recovery,
+        };
+    });
+}
+export function failedRemovalLifecycleOutcomes(target, scopes, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return selectedPacks(target).map((pack) => ({
+        schemaVersion: 1,
+        selection: {
+            pack,
+            requested: scopes.includes('project') && scopes.includes('user')
+                ? 'both'
+                : scopes[0],
+            retainedRealizedScopes: [],
+            targetScopes: scopes,
+        },
+        canonical: { status: 'failed', results: [] },
+        sync: { scopes: [], status: 'not-run', providers: [] },
+        finalEvidence: null,
+        status: 'failed',
+        recovery: [{ code: 'canonical-apply-failed', message }],
+    }));
+}
+export function failedPostRemovalLifecycleOutcomes(target, scopes, outcomes, stage, failedPack, failedScope, error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    return selectedPacks(target).map((pack) => {
+        const canonicalApplied = outcomes.some((outcome) => outcome.pack === pack && outcome.removed);
+        const stageLabel = stage === 'intent-write'
+            ? 'durable intent update failed'
+            : 'final inventory failed';
+        const canonicalSummary = canonicalApplied
+            ? `Canonical removal was applied for ${pack}, but final state is unverified`
+            : `No canonical removal was observed for ${pack}; final state remains unverified`;
+        return {
+            schemaVersion: 1,
+            selection: {
+                pack,
+                requested: scopes.includes('project') && scopes.includes('user')
+                    ? 'both'
+                    : scopes[0],
+                retainedRealizedScopes: [],
+                targetScopes: scopes,
+            },
+            canonical: {
+                status: canonicalApplied ? 'applied' : 'unchanged',
+                results: [],
+            },
+            sync: { scopes: [], status: 'not-run', providers: [] },
+            finalEvidence: null,
+            status: 'failed',
+            recovery: scopes.map((scope) => ({
+                code: 'final-inventory-unverified',
+                message: `${canonicalSummary} because ${stageLabel} for ${failedPack} at ${failedScope} scope: ${detail}. Rerun oat tools remove --pack ${pack} --scope ${scope}`,
+            })),
+        };
+    });
+}

package/dist/commands/tools/shared/format-pack-inventory.d.ts

@@ -1,3 +1,22 @@
+import type { ConcreteScope } from '../../../shared/types.js';
+import { type PackEvidenceDiagnostic, type ToolPackEvidence } from './pack-evidence.js';
 import type { PackInventory } from './pack-inventory.js';
+import { type PackPathRoots } from './pack-paths.js';
+import type { PackName } from './types.js';
+export interface PackEvidenceBlockV1 {
+    schemaVersion: 1;
+    status: 'ok' | 'partial' | 'error';
+    items: readonly ToolPackEvidence[];
+    diagnostics: readonly PackEvidenceDiagnostic[];
+}
+export declare function unavailablePackEvidence(input: {
+    pack: PackName;
+    scopes: readonly ConcreteScope[];
+    reason: string;
+    roots?: PackPathRoots;
+}): ToolPackEvidence;
+export declare function projectRenderablePackEvidence(canonical: PackInventory, roots: PackPathRoots): ToolPackEvidence;
+export declare function packEvidenceBlock(items: readonly ToolPackEvidence[]): PackEvidenceBlockV1;
+export declare function formatPackEvidenceDetails(evidence: ToolPackEvidence, indent?: string): string[];
 export declare function formatPackInventoryDetails(inventory: PackInventory, indent?: string): string[];
 //# sourceMappingURL=format-pack-inventory.d.ts.map

package/dist/commands/tools/shared/format-pack-inventory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-pack-inventory.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/format-pack-inventory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUtD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,aAAa,EACxB,MAAM,SAAO,GACZ,MAAM,EAAE,CAuBV"}
+{"version":3,"file":"format-pack-inventory.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/format-pack-inventory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAIL,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,CAAC,CAAC;IACjB,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,KAAK,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACnC,WAAW,EAAE,SAAS,sBAAsB,EAAE,CAAC;CAChD;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,GAAG,gBAAgB,CAiBnB;AA4CD,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,aAAa,GACnB,gBAAgB,CAiClB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,gBAAgB,EAAE,GACjC,mBAAmB,CAQrB;AAUD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,SAAO,GACZ,MAAM,EAAE,CAuBV;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,aAAa,EACxB,MAAM,SAAO,GACZ,MAAM,EAAE,CAuBV"}