@open-agent-toolkit/cli 0.2.52 → 0.2.54

package/dist/commands/tools/shared/pack-lifecycle.js

@@ -2,9 +2,18 @@ import { mkdir, writeFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 import { readOatConfig, writeOatConfig } from '../../../config/oat-config.js';
 import { applyPackReconcilePlan, preflightPackReconcilePlans, } from './apply-pack-reconcile.js';
+import { dependencyRetainedAssetIds, expandPackLifecycleRequests, } from './pack-dependencies.js';
 import { inventoryScopedPack, } from './pack-inventory.js';
-import { planPackReconcile, } from './pack-reconcile.js';
-import { writeScopedPackIntent } from './scoped-pack-intent.js';
+import { planPackReconcile, resolveSharedOwnerRetentions, } from './pack-reconcile.js';
+import { hasScopedPackOwnershipEvidence, writeScopedPackIntent, writeScopedPackLease, } from './scoped-pack-intent.js';
+function lifecycleInventoryKey(request) {
+    return JSON.stringify({
+        pack: request.pack,
+        scope: request.scope,
+        scopeRoot: request.scopeRoot,
+        assetsRoot: request.assetsRoot,
+    });
+}
 async function writeGenerated(scopeRoot, operation) {
     await mkdir(dirname(operation.destination), { recursive: true });
     switch (operation.generation) {
@@ -27,17 +36,83 @@ async function writeGenerated(scopeRoot, operation) {
 }
 export async function reconcilePackLifecycles(requests, options = {}) {
     const dependencies = options.dependencies ?? {};
+    const getDefinition = dependencies.getDefinition;
     const inventory = dependencies.inventory ?? inventoryScopedPack;
     const plan = dependencies.plan ?? planPackReconcile;
-    const planned = await Promise.all(requests.map(async (request) => {
-        const before = await inventory(request);
-        return {
+    const expanded = expandPackLifecycleRequests(requests, getDefinition);
+    const initialInventories = new Map();
+    const finalLeaseConsumers = new Map();
+    for (const request of expanded) {
+        if (!request.dependency)
+            continue;
+        const key = lifecycleInventoryKey(request);
+        let consumers = finalLeaseConsumers.get(key);
+        if (!consumers) {
+            const inventoried = await inventory(request);
+            initialInventories.set(key, inventoried);
+            consumers = [...inventoried.intent.requiredBy];
+        }
+        const nextConsumers = new Set(consumers);
+        if (request.dependency.lease === 'acquire') {
+            nextConsumers.add(request.dependency.requiredBy);
+        }
+        else {
+            nextConsumers.delete(request.dependency.requiredBy);
+        }
+        finalLeaseConsumers.set(key, [...nextConsumers].sort());
+    }
+    const projectedLeaseConsumers = new Map();
+    const planned = [];
+    for (const request of expanded) {
+        const key = lifecycleInventoryKey(request);
+        const inventoried = initialInventories.get(key) ?? (await inventory(request));
+        const projectedConsumers = projectedLeaseConsumers.get(key);
+        const before = projectedConsumers
+            ? {
+                ...inventoried,
+                intent: {
+                    ...inventoried.intent,
+                    requiredBy: projectedConsumers,
+                },
+            }
+            : inventoried;
+        const retainedAssets = request.action === 'remove'
+            ? await resolveSharedOwnerRetentions({
+                packs: [request.pack],
+                scope: request.scope,
+                scopeRoot: request.scopeRoot,
+                hasOwnershipEvidence: async (pack, scope, scopeRoot) => (dependencies.hasOwnershipEvidence ??
+                    hasScopedPackOwnershipEvidence)({
+                    pack,
+                    scope,
+                    scopeRoot,
+                }),
+            })
+            : [];
+        const retainedConsumers = finalLeaseConsumers.get(key) ?? before.intent.requiredBy;
+        const reconcilePlan = plan({
+            ...request,
+            inventory: before,
+            retainedAssets,
+            retainedDependencyAssetIds: dependencyRetainedAssetIds(request.pack, retainedConsumers, getDefinition),
+        });
+        planned.push({
             request,
             before,
-            plan: plan({ ...request, inventory: before }),
+            plan: reconcilePlan,
             apply: null,
-        };
-    }));
+        });
+        if (request.dependency) {
+            const nextConsumers = new Set(before.intent.requiredBy);
+            if (request.dependency.lease === 'acquire') {
+                nextConsumers.add(request.dependency.requiredBy);
+            }
+            else {
+                nextConsumers.delete(request.dependency.requiredBy);
+            }
+            projectedLeaseConsumers.set(key, [...nextConsumers].sort());
+        }
+    }
     if (options.dryRun)
         return planned;
     await (dependencies.preflight ?? preflightPackReconcilePlans)(planned.map(({ request, plan: value }) => ({
@@ -56,6 +131,13 @@ export async function reconcilePackLifecycles(requests, options = {}) {
                 scopeRoot: request.scopeRoot,
                 enabled: operation.enabled,
             }),
+            writeLease: async (operation) => writeScopedPackLease({
+                pack: operation.pack,
+                scope: operation.scope,
+                scopeRoot: request.scopeRoot,
+                requiredBy: operation.requiredBy,
+                enabled: operation.enabled,
+            }),
             inventory: async () => inventory(request),
         });
         results.push({ ...entry, apply: applied });
@@ -63,5 +145,16 @@ export async function reconcilePackLifecycles(requests, options = {}) {
     return results;
 }
 export async function reconcilePackLifecycle(request, options = {}) {
-    return (await reconcilePackLifecycles([request], options))[0];
+    const results = await reconcilePackLifecycles([request], options);
+    return (results.find(({ request: candidate }) => candidate.pack === request.pack &&
+        candidate.scope === request.scope &&
+        candidate.scopeRoot === request.scopeRoot &&
+        candidate.action === request.action &&
+        !candidate.dependency) ?? results[0]);
+}
+export async function reconcilePackDependencyLifecycles(request, options = {}) {
+    const dependencyRequests = expandPackLifecycleRequests([request], options.dependencies?.getDefinition).filter(({ dependency }) => dependency !== undefined);
+    if (dependencyRequests.length === 0)
+        return [];
+    return reconcilePackLifecycles(dependencyRequests, options);
 }

package/dist/commands/tools/shared/pack-manifest.d.ts

@@ -1,5 +1,5 @@
-import type { PackAssetDefinition, PackAssetGeneration, PackAssetKind, PackAssetOwnership, PackDefinition, PackName } from './types.js';
-export type { PackAssetDefinition, PackAssetGeneration, PackAssetKind, PackAssetOwnership, PackDefinition, };
+import type { PackAssetDefinition, PackAssetGeneration, PackAssetKind, PackAssetOwnership, PackDependencyDefinition, PackDefinition, PackName } from './types.js';
+export type { PackAssetDefinition, PackAssetGeneration, PackAssetKind, PackAssetOwnership, PackDependencyDefinition, PackDefinition, };
 export declare const PACK_NAMES: readonly ["core", "ideas", "docs", "workflows", "utility", "project-management", "research", "brainstorm"];
 export declare function isPackName(value: string): value is PackName;
 export declare const PACK_MANIFEST: readonly PackDefinition[];

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

@@ -1 +1 @@
-{"version":3,"file":"pack-manifest.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-manifest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,cAAc,GACf,CAAC;AAEF,eAAO,MAAM,UAAU,4GASiB,CAAC;AAEzC,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,QAAQ,CAE3D;AA8HD,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EAwKlD,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAMhE;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,IAAI,CAAC,EAAE,aAAa,GACnB,SAAS,mBAAmB,EAAE,CAGhC;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,GAC9C,MAAM,EAAE,CAQV;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAIlE;AA0DD,wBAAgB,oBAAoB,CAClC,QAAQ,GAAE,SAAS,cAAc,EAAkB,GAClD,IAAI,CA6DN"}
+{"version":3,"file":"pack-manifest.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-manifest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,cAAc,EACd,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,cAAc,GACf,CAAC;AAEF,eAAO,MAAM,UAAU,4GASiB,CAAC;AAEzC,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,QAAQ,CAE3D;AAkID,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EAwLlD,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAMhE;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,IAAI,CAAC,EAAE,aAAa,GACnB,SAAS,mBAAmB,EAAE,CAGhC;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,GAC9C,MAAM,EAAE,CAQV;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAIlE;AAoJD,wBAAgB,oBAAoB,CAClC,QAAQ,GAAE,SAAS,cAAc,EAAkB,GAClD,IAAI,CAiEN"}

package/dist/commands/tools/shared/pack-manifest.js

@@ -28,7 +28,7 @@ function skill(name, scopes = BOTH_SCOPES) {
         ownership: scopes.length === 1 ? { user: 'managed' } : BOTH_MANAGED,
     };
 }
-function agent(name) {
+function agent(name, options = {}) {
     return {
         id: `agent:${name}`,
         kind: 'agent',
@@ -36,6 +36,7 @@ function agent(name) {
         destination: `.agents/agents/${name}`,
         scopes: BOTH_SCOPES,
         ownership: BOTH_MANAGED,
+        ...options,
     };
 }
 function template(name, kind = 'template') {
@@ -264,8 +265,26 @@ export const PACK_MANIFEST = [
         allowedScopes: BOTH_SCOPES,
         defaultScope: 'user',
         assets: [
-            ...['analyze', 'compare', 'deep-research', 'skeptic', 'synthesize'].map((name) => skill(name)),
+            ...[
+                'analyze',
+                'compare',
+                'deep-research',
+                'recon',
+                'skeptic',
+                'synthesize',
+            ].map((name) => skill(name)),
             agent('skeptical-evaluator.md'),
+            agent('recon-worker.md', { userMaterializable: true }),
+        ],
+        dependencies: [
+            {
+                pack: 'utility',
+                scope: 'same',
+                assets: [
+                    'skill:oat-dispatch-subagents',
+                    'skill:subagent-orchestration',
+                ],
+            },
         ],
     },
     {
@@ -335,15 +354,84 @@ function validateAsset(pack, asset) {
             throw new Error(`Pack ${pack.name} asset ${asset.id} declares ownership outside scope ${scope}`);
         }
     }
+    if (asset.userMaterializable) {
+        if (asset.kind !== 'agent') {
+            throw new Error(`Pack ${pack.name} user materializable asset ${asset.id} must be an agent`);
+        }
+        if (!asset.scopes.includes('user') || asset.ownership.user !== 'managed') {
+            throw new Error(`Pack ${pack.name} user materializable agent ${asset.id} must support user scope with managed ownership`);
+        }
+    }
+}
+function validateDependencies(manifest, packs) {
+    const graph = new Map();
+    for (const pack of manifest) {
+        const edges = new Set();
+        for (const dependency of pack.dependencies ?? []) {
+            if (dependency.scope !== 'same') {
+                throw new Error(`Pack ${pack.name} dependency on ${dependency.pack} must use same scope`);
+            }
+            const owner = packs.get(dependency.pack);
+            if (!owner) {
+                throw new Error(`Pack ${pack.name} declares unknown dependency pack ${dependency.pack}`);
+            }
+            if (dependency.assets.length === 0) {
+                throw new Error(`Pack ${pack.name} dependency on ${dependency.pack} selects no assets`);
+            }
+            for (const scope of pack.allowedScopes) {
+                if (!owner.allowedScopes.includes(scope)) {
+                    throw new Error(`Pack ${pack.name} dependency on ${dependency.pack} cannot resolve at same scope ${scope}`);
+                }
+            }
+            for (const assetId of dependency.assets) {
+                const edge = `${dependency.pack}:${assetId}`;
+                if (edges.has(edge)) {
+                    throw new Error(`Pack ${pack.name} has duplicate dependency edge ${edge}`);
+                }
+                edges.add(edge);
+                const asset = owner.assets.find(({ id }) => id === assetId);
+                if (!asset) {
+                    throw new Error(`Pack ${pack.name} declares unknown dependency asset ${dependency.pack}/${assetId}`);
+                }
+                for (const scope of pack.allowedScopes) {
+                    if (!asset.scopes.includes(scope)) {
+                        throw new Error(`Pack ${pack.name} dependency asset ${dependency.pack}/${assetId} does not support same scope ${scope}`);
+                    }
+                }
+            }
+            const targets = graph.get(pack.name) ?? new Set();
+            targets.add(dependency.pack);
+            graph.set(pack.name, targets);
+        }
+    }
+    const visiting = new Set();
+    const visited = new Set();
+    const visit = (pack, path) => {
+        if (visiting.has(pack)) {
+            throw new Error(`Pack dependency cycle: ${[...path, pack].join(' -> ')}`);
+        }
+        if (visited.has(pack))
+            return;
+        visiting.add(pack);
+        for (const dependency of graph.get(pack) ?? []) {
+            visit(dependency, [...path, pack]);
+        }
+        visiting.delete(pack);
+        visited.add(pack);
+    };
+    for (const pack of packs.keys())
+        visit(pack, []);
 }
 export function validatePackManifest(manifest = PACK_MANIFEST) {
     const packNames = new Set();
+    const packs = new Map();
     const destinations = new Map();
     for (const pack of manifest) {
         if (packNames.has(pack.name)) {
             throw new Error(`Duplicate pack name: ${pack.name}`);
         }
         packNames.add(pack.name);
+        packs.set(pack.name, pack);
         if (!pack.allowedScopes.includes(pack.defaultScope)) {
             throw new Error(`Pack ${pack.name} default scope ${pack.defaultScope} is not allowed`);
         }
@@ -362,6 +450,7 @@ export function validatePackManifest(manifest = PACK_MANIFEST) {
             }
         }
     }
+    validateDependencies(manifest, packs);
     for (const [destination, entries] of destinations) {
         if (entries.length < 2)
             continue;

package/dist/commands/tools/shared/pack-reconcile.d.ts

@@ -1,4 +1,5 @@
 import type { ConcreteScope } from '../../../shared/types.js';
+import type { PackDependencyLease } from './pack-dependencies.js';
 import type { ScopedPackInventory } from './pack-inventory.js';
 import type { PackAssetGeneration, PackCompleteness, PackName } from './types.js';
 export type PackReconcileAction = 'install' | 'update' | 'remove' | 'migrate-destination';
@@ -27,15 +28,25 @@ export type PackReconcileOperation = {
     pack: PackName;
     scope: ConcreteScope;
     enabled: boolean;
+} | {
+    kind: 'write-lease';
+    pack: PackName;
+    scope: ConcreteScope;
+    requiredBy: PackName;
+    enabled: boolean;
 };
 export interface PackReconcilePlan {
     pack: PackName;
     scope: ConcreteScope;
     action: PackReconcileAction;
     operations: readonly PackReconcileOperation[];
-    expectedCompleteness: PackCompleteness;
+    expectedCompleteness: PackCompleteness | null;
+    selectedAssetIds: readonly string[];
+    expectedAssetStatus: 'current' | 'missing' | null;
+    expectedAssetStatuses?: Readonly<Record<string, 'current' | 'missing'>>;
     changedCanonicalPaths: readonly string[];
     retainedAssets: readonly PackSharedOwnerRetention[];
+    retainedDependencyAssetIds: readonly string[];
 }
 export interface PackSharedOwnerRetention {
     assetId: string;
@@ -51,6 +62,9 @@ export interface PlanPackReconcileInput {
     action: PackReconcileAction;
     inventory: ScopedPackInventory;
     retainedAssets?: readonly PackSharedOwnerRetention[];
+    retainedDependencyAssetIds?: readonly string[];
+    assetIds?: readonly string[];
+    dependency?: PackDependencyLease;
 }
 export interface ResolveSharedOwnerRetentionsInput {
     packs: readonly PackName[];

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

@@ -1 +1 @@
-{"version":3,"file":"pack-reconcile.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAEV,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,qBAAqB,CAAC;AAE1B,MAAM,MAAM,sBAAsB,GAC9B;IACE,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,mBAAmB,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrE;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC9C,oBAAoB,EAAE,gBAAgB,CAAC;IACvC,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,cAAc,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACrD;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,cAAc,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,iCAAiC;IAChD,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,CACpB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,iCAAiC,GACvC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAmDrC;AAqFD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,iBAAiB,CA4EnB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAE1E"}
+{"version":3,"file":"pack-reconcile.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/pack-reconcile.ts"],"names":[],"mappings":"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"}

package/dist/commands/tools/shared/pack-reconcile.js

@@ -95,6 +95,8 @@ function removalOperation(asset, input) {
     if (input.retainedAssets?.some(({ assetId }) => assetId === asset.id)) {
         return null;
     }
+    if (input.retainedDependencyAssetIds?.includes(asset.id))
+        return null;
     const observed = input.inventory.assets.find(({ definition }) => definition.id === asset.id);
     if (!observed || observed.status === 'missing')
         return null;
@@ -113,13 +115,27 @@ export function planPackReconcile(input) {
     if (!packDefinition.allowedScopes.includes(input.scope)) {
         throw new Error(`Pack ${input.pack} does not allow ${input.scope} scope`);
     }
-    const applicableAssets = packDefinition.assets.filter(({ scopes }) => scopes.includes(input.scope));
+    const allApplicableAssets = packDefinition.assets.filter(({ scopes }) => scopes.includes(input.scope));
+    const requestedAssetIds = new Set(input.assetIds ?? []);
+    if (requestedAssetIds.size > 0) {
+        for (const assetId of requestedAssetIds) {
+            if (!allApplicableAssets.some(({ id }) => id === assetId)) {
+                throw new Error(`Pack ${input.pack} dependency selected unknown or out-of-scope asset ${assetId}`);
+            }
+        }
+    }
+    const applicableAssets = requestedAssetIds.size > 0
+        ? allApplicableAssets.filter(({ id }) => requestedAssetIds.has(id))
+        : allApplicableAssets;
     const changedCanonicalPaths = [];
     const operations = [];
     const retainedAssets = input.retainedAssets ?? [];
+    const directDependencyRetention = input.dependency?.lease === 'release' && input.inventory.intent.direct;
     for (const asset of applicableAssets) {
         const assetOperations = input.action === 'remove'
-            ? [removalOperation(asset, input)].filter((operation) => operation !== null)
+            ? [
+                directDependencyRetention ? null : removalOperation(asset, input),
+            ].filter((operation) => operation !== null)
             : materializationOperations(asset, input);
         operations.push(...assetOperations);
         if (assetOperations.length > 0) {
@@ -128,32 +144,78 @@ export function planPackReconcile(input) {
                 changedCanonicalPaths.push(path);
         }
     }
-    const desiredIntent = input.action !== 'remove';
-    if (input.inventory.intent.enabled !== desiredIntent ||
-        (desiredIntent && input.inventory.intent.source !== 'declared')) {
-        operations.push({
-            kind: 'write-intent',
-            pack: input.pack,
-            scope: input.scope,
-            enabled: desiredIntent,
-        });
+    if (input.dependency) {
+        const desiredLease = input.dependency.lease === 'acquire';
+        const hasLease = input.inventory.intent.requiredBy.includes(input.dependency.requiredBy);
+        if (hasLease !== desiredLease) {
+            operations.push({
+                kind: 'write-lease',
+                pack: input.pack,
+                scope: input.scope,
+                requiredBy: input.dependency.requiredBy,
+                enabled: desiredLease,
+            });
+        }
+    }
+    else {
+        const desiredIntent = input.action !== 'remove';
+        if (input.inventory.intent.direct !== desiredIntent ||
+            (desiredIntent && input.inventory.intent.source !== 'declared')) {
+            operations.push({
+                kind: 'write-intent',
+                pack: input.pack,
+                scope: input.scope,
+                enabled: desiredIntent,
+            });
+        }
     }
     const managedAssets = applicableAssets.filter((asset) => asset.ownership[input.scope] === 'managed');
-    const retainedPresent = managedAssets.filter((asset) => retainedAssets.some(({ assetId }) => assetId === asset.id) &&
+    const retainedPresent = managedAssets.filter((asset) => (retainedAssets.some(({ assetId }) => assetId === asset.id) ||
+        input.retainedDependencyAssetIds?.includes(asset.id)) &&
         input.inventory.assets.some(({ definition, status }) => definition.id === asset.id && status !== 'missing')).length;
     const expectedRemovalCompleteness = retainedPresent === 0
         ? 'absent'
         : retainedPresent === managedAssets.length
             ? 'complete'
             : 'partial';
+    const retainedSelectedAssets = applicableAssets.filter((asset) => retainedAssets.some(({ assetId }) => assetId === asset.id) ||
+        input.retainedDependencyAssetIds?.includes(asset.id)).length;
+    const expectedSelectedRemovalStatus = retainedSelectedAssets === 0
+        ? 'missing'
+        : retainedSelectedAssets === applicableAssets.length
+            ? 'current'
+            : null;
+    const expectedAssetStatuses = requestedAssetIds.size === 0
+        ? undefined
+        : Object.fromEntries(applicableAssets.map((asset) => [
+            asset.id,
+            input.action !== 'remove' ||
+                directDependencyRetention ||
+                retainedAssets.some(({ assetId }) => assetId === asset.id) ||
+                input.retainedDependencyAssetIds?.includes(asset.id)
+                ? 'current'
+                : 'missing',
+        ]));
     return {
         pack: input.pack,
         scope: input.scope,
         action: input.action,
         operations,
-        expectedCompleteness: input.action === 'remove' ? expectedRemovalCompleteness : 'complete',
+        expectedCompleteness: requestedAssetIds.size > 0
+            ? null
+            : input.action === 'remove'
+                ? expectedRemovalCompleteness
+                : 'complete',
+        selectedAssetIds: applicableAssets.map(({ id }) => id),
+        expectedAssetStatus: requestedAssetIds.size === 0
+            ? null
+            : input.action !== 'remove' || directDependencyRetention
+                ? 'current'
+                : expectedSelectedRemovalStatus,
+        expectedAssetStatuses,
         changedCanonicalPaths: [...new Set(changedCanonicalPaths)],
         retainedAssets,
+        retainedDependencyAssetIds: input.retainedDependencyAssetIds ?? [],
     };
 }
 export function serializePackReconcilePlan(plan) {

package/dist/commands/tools/shared/scoped-pack-intent.d.ts

@@ -1,10 +1,14 @@
 import type { ConcreteScope } from '../../../shared/types.js';
 import type { PackName } from './types.js';
 export type PackIntentSource = 'declared' | 'inferred-legacy' | 'none';
+export type PackIntentState = 'direct' | 'transitive' | 'legacy-inferred' | 'absent';
 export interface ScopedPackIntent {
     pack: PackName;
     scope: ConcreteScope;
     enabled: boolean;
+    direct: boolean;
+    requiredBy: PackName[];
+    state: PackIntentState;
     source: PackIntentSource;
     configPath: string;
     diagnostics: PackIntentDiagnostic[];
@@ -22,6 +26,9 @@ export interface IntentReadInput {
 export interface IntentWriteInput extends IntentReadInput {
     enabled: boolean;
 }
+export interface LeaseWriteInput extends IntentWriteInput {
+    requiredBy: PackName;
+}
 /**
  * Returns ownership evidence that is safe to use when deciding whether a
  * shared managed asset must be retained. A shared asset cannot prove that any
@@ -31,4 +38,5 @@ export interface IntentWriteInput extends IntentReadInput {
 export declare function hasScopedPackOwnershipEvidence(input: IntentReadInput): Promise<boolean>;
 export declare function readScopedPackIntent(input: IntentReadInput): Promise<ScopedPackIntent>;
 export declare function writeScopedPackIntent(input: IntentWriteInput): Promise<void>;
+export declare function writeScopedPackLease(input: LeaseWriteInput): Promise<void>;
 //# sourceMappingURL=scoped-pack-intent.d.ts.map

package/dist/commands/tools/shared/scoped-pack-intent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scoped-pack-intent.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/scoped-pack-intent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,OAAO,EAAE,OAAO,CAAC;CAClB;AAoDD;;;;;GAKG;AACH,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,CAsB3B;AAgBD,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,IAAI,CAAC,CAwBf"}
+{"version":3,"file":"scoped-pack-intent.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/shared/scoped-pack-intent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,MAAM,CAAC;AACvE,MAAM,MAAM,eAAe,GACvB,QAAQ,GACR,YAAY,GACZ,iBAAiB,GACjB,QAAQ,CAAC;AAEb,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,UAAU,EAAE,QAAQ,CAAC;CACtB;AAoDD;;;;;GAKG;AACH,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,CAwC3B;AAmED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,IAAI,CAAC,CAOf"}

package/dist/commands/tools/shared/scoped-pack-intent.js

@@ -45,7 +45,8 @@ async function findPhysicalManagedAssets(input) {
  */
 export async function hasScopedPackOwnershipEvidence(input) {
     const config = await readConcreteConfig(input);
-    if (config.tools?.[input.pack] === true) {
+    if (config.tools?.[input.pack] === true ||
+        (config.tools?.requiredBy?.[input.pack]?.length ?? 0) > 0) {
         return true;
     }
     const paths = getPackDefinition(input.pack)
@@ -58,8 +59,11 @@ export async function hasScopedPackOwnershipEvidence(input) {
 export async function readScopedPackIntent(input) {
     const config = await readConcreteConfig(input);
     const declared = config.tools?.[input.pack] === true;
+    const requiredBy = [...(config.tools?.requiredBy?.[input.pack] ?? [])].sort();
     const legacyFalse = config.tools?.[input.pack] === false;
-    const physicalAssets = declared ? [] : await findPhysicalManagedAssets(input);
+    const physicalAssets = declared || requiredBy.length > 0
+        ? []
+        : await findPhysicalManagedAssets(input);
     const inferred = physicalAssets.length > 0;
     const diagnostics = [];
     if (legacyFalse && inferred) {
@@ -72,8 +76,21 @@ export async function readScopedPackIntent(input) {
     return {
         pack: input.pack,
         scope: input.scope,
-        enabled: declared || inferred,
-        source: declared ? 'declared' : inferred ? 'inferred-legacy' : 'none',
+        enabled: declared || requiredBy.length > 0 || inferred,
+        direct: declared,
+        requiredBy,
+        state: declared
+            ? 'direct'
+            : requiredBy.length > 0
+                ? 'transitive'
+                : inferred
+                    ? 'legacy-inferred'
+                    : 'absent',
+        source: declared || requiredBy.length > 0
+            ? 'declared'
+            : inferred
+                ? 'inferred-legacy'
+                : 'none',
         configPath: configPathForScope(input.scopeRoot),
         diagnostics,
     };
@@ -88,29 +105,58 @@ function updateTools(tools, pack, enabled) {
     }
     return Object.keys(next).length > 0 ? next : undefined;
 }
-export async function writeScopedPackIntent(input) {
+function updateRequiredBy(tools, pack, requiredBy, enabled) {
+    const next = { ...tools };
+    const leases = new Set(next.requiredBy?.[pack] ?? []);
+    if (enabled) {
+        leases.add(requiredBy);
+    }
+    else {
+        leases.delete(requiredBy);
+    }
+    const requiredByConfig = { ...next.requiredBy };
+    if (leases.size > 0) {
+        requiredByConfig[pack] = [...leases].sort();
+    }
+    else {
+        delete requiredByConfig[pack];
+    }
+    if (Object.keys(requiredByConfig).length > 0) {
+        next.requiredBy = requiredByConfig;
+    }
+    else {
+        delete next.requiredBy;
+    }
+    return Object.keys(next).length > 0 ? next : undefined;
+}
+async function writeToolsConfig(input, update) {
     if (input.scope === 'project') {
         const config = await readOatConfig(input.scopeRoot);
-        const tools = updateTools(config.tools, input.pack, input.enabled);
+        const tools = update(config.tools);
         const next = { ...config };
-        if (tools) {
+        if (tools)
             next.tools = tools;
-        }
-        else {
+        else
             delete next.tools;
-        }
         await writeOatConfig(input.scopeRoot, next);
         return;
     }
     const configDir = userConfigDir(input.scopeRoot);
     const config = await readUserConfig(configDir);
-    const tools = updateTools(config.tools, input.pack, input.enabled);
+    const tools = update(config.tools);
     const next = { ...config };
-    if (tools) {
+    if (tools)
         next.tools = tools;
-    }
-    else {
+    else
         delete next.tools;
-    }
     await writeUserConfig(configDir, next);
 }
+export async function writeScopedPackIntent(input) {
+    await writeToolsConfig(input, (tools) => updateTools(tools, input.pack, input.enabled));
+}
+export async function writeScopedPackLease(input) {
+    if (input.pack === input.requiredBy) {
+        throw new Error(`Pack ${input.pack} cannot require itself`);
+    }
+    await writeToolsConfig(input, (tools) => updateRequiredBy(tools, input.pack, input.requiredBy, input.enabled));
+}

package/dist/commands/tools/shared/types.d.ts

@@ -13,12 +13,19 @@ export interface PackAssetDefinition {
     ownership: Partial<Record<ConcreteScope, PackAssetOwnership>>;
     executable?: boolean;
     sharedOwner?: string;
+    userMaterializable?: boolean;
+}
+export interface PackDependencyDefinition {
+    pack: PackName;
+    scope: 'same';
+    assets: readonly string[];
 }
 export interface PackDefinition {
     name: PackName;
     allowedScopes: readonly ConcreteScope[];
     defaultScope: ConcreteScope;
     assets: readonly PackAssetDefinition[];
+    dependencies?: readonly PackDependencyDefinition[];
 }
 export type PackAssetStatus = 'missing' | 'current' | 'outdated' | 'newer' | 'present';
 export type PackCompleteness = 'complete' | 'partial' | 'absent';