@detergent-software/atk 9.2.0-dev.5 → 9.2.0-dev.6

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [9.2.0-dev.6](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.2.0-dev.5&targetVersion=GTv9.2.0-dev.6) (2026-10-23)
+
+### Features
+
+* **cli:** install bundles and [@org](https://emergentcode.visualstudio.com/org) among several names as one plan ([47425f3](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/47425f35d4986306dc024fca8ad6d767d064188f))
+* **cli:** uninstall a bundle among several names in one pass ([8c75075](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/8c75075465bd210989baba237955a68dcce2ad73))
+
+### Bug Fixes
+
+* **cli:** review fixes for bundles and [@org](https://emergentcode.visualstudio.com/org) among install names ([fc66d79](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/fc66d7994d704cf1ceebb6f2b551737e3233f671))
+
+### Documentation
+
+* **cli:** describe bundles and [@org](https://emergentcode.visualstudio.com/org) among several install names ([febfb7e](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/febfb7e6a81d6308c2df788fddfc2f1cb02e54f7))
+
 ## [9.2.0-dev.5](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.2.0-dev.4&targetVersion=GTv9.2.0-dev.5) (2026-10-23)
 
 ### Features

package/build/command-manifest.json

@@ -515,7 +515,7 @@
                 "name": "[target]"
             },
             {
-                "description": "More assets to install with the first, as one plan (name@version and @org/name)",
+                "description": "More assets, bundles or org scopes to install with the first, as one plan (name@version, @org/name, @org with --all)",
                 "name": "[targets...]"
             }
         ],
@@ -529,7 +529,7 @@
             },
             {
                 "flags": "-a, --all",
-                "description": "Install every asset from an org scope without prompting (for `atk install @org`; required with --json or no terminal)",
+                "description": "Install every asset from an org scope without prompting (for `atk install @org`; required with --json, no terminal, or other names)",
                 "defaultValue": false
             },
             {
@@ -1331,7 +1331,7 @@
                 "name": "<name>"
             },
             {
-                "description": "More assets to uninstall with the first",
+                "description": "More assets or bundles to uninstall with the first, in one pass",
                 "name": "[names...]"
             }
         ],

package/build/commands/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmExB,eAAO,MAAM,WAAW,6DAA6D,CAAC;AAEtF,eAAO,MAAM,OAAO;;;;;;;;;;;;;iBA8GlB,CAAC;AAEH,eAAO,MAAM,IAAI,uDAmBd,CAAC;AAmGJ,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAC9F,EAAE,KAAK,+BAuDP"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAqExB,eAAO,MAAM,WAAW,6DAA6D,CAAC;AAEtF,eAAO,MAAM,OAAO;;;;;;;;;;;;;iBA8GlB,CAAC;AAEH,eAAO,MAAM,IAAI,uDAoBd,CAAC;AAqIJ,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAQF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAC9F,EAAE,KAAK,+BAwDP"}

package/build/commands/install.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text, useApp } from 'ink';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 import { z } from 'zod';
 import { CrossScopeWarning, DryRunBanner, ErrorView, InstallSummary, MultiSelectList, Spinner, } from '../components/index.js';
 import { useCommand } from '../hooks/useCommand.js';
@@ -11,6 +11,7 @@ import { loadConfig } from '../lib/config.js';
 import { crossScopeNotice, findCrossScopeInstalls } from '../lib/cross-scope.js';
 import { errorGuidance, errorMessage } from '../lib/errors.js';
 import { isInstalledForTool } from '../lib/installed-for-tool.js';
+import { InstallerError } from '../lib/installer.js';
 import { addAssetToLockfile, findInstalledAsset, identityKey, readLockfile, upgradeToDirectInstall, withLockfileErrorHandling, writeLockfile, } from '../lib/lockfile.js';
 import { executeInstallPlanForTools, withoutKeptDependencies } from '../lib/multi-tool-install.js';
 import { addNotice } from '../lib/notices.js';
@@ -18,7 +19,7 @@ import { formatOrgName, isBareOrgScope, parseBundleSpec, resolveActiveOrg } from
 import { renderJson, useNonInteractive } from '../lib/output.js';
 import { argument, option } from '../lib/pastel/index.js';
 import { fetchRegistry, findAsset, findAssetsByName, findBundle, findBundleMember, getAssetsByOrg, isDeprecated, isLatestAlias, } from '../lib/registry.js';
-import { resolveBundleInstallPlan, resolveInstallPlan, resolveMultipleInstallPlans, ResolverError, } from '../lib/resolver.js';
+import { resolveBundleInstallPlan, resolveInstallPlan, resolveMultipleInstallPlans, ResolverError, resolveTargetsInstallPlan, } from '../lib/resolver.js';
 import { scopeLabel } from '../lib/scope.js';
 import { resolvePlacingTools } from '../lib/tool-resolver.js';
 import { parseNameVersion } from '../lib/version.js';
@@ -36,7 +37,7 @@ export const options = z.object({
         .default(false)
         .describe(option({
         alias: 'a',
-        description: 'Install every asset from an org scope without prompting (for `atk install @org`; required with --json or no terminal)',
+        description: 'Install every asset from an org scope without prompting (for `atk install @org`; required with --json, no terminal, or other names)',
     })),
     dryRun: z
         .boolean()
@@ -119,7 +120,7 @@ export const args = z
     })),
 ])
     .rest(z.string().describe(argument({
-    description: 'More assets to install with the first, as one plan (name@version and @org/name)',
+    description: 'More assets, bundles or org scopes to install with the first, as one plan (name@version, @org/name, @org with --all)',
     name: 'targets',
 })));
 export default function Install({ args: [rawName, ...more], options: { adopt, all, dryRun, force, json, org, pin, projectRoot, refresh, tool, user, yes }, }) {
@@ -128,7 +129,7 @@ export default function Install({ args: [rawName, ...more], options: { adopt, al
         return _jsx(Sync, { options: { dryRun, force, json, projectRoot, refresh, tool, user } });
     }
     if (more.length > 0) {
-        return (_jsx(InstallAssets, { adopt: adopt, dryRun: dryRun, force: force, json: json, org: org, pin: pin, projectRoot: projectRoot, specs: [rawName, ...more], tool: tool, user: user }));
+        return (_jsx(InstallAssets, { adopt: adopt, all: all || yes, dryRun: dryRun, force: force, json: json, org: org, pin: pin, projectRoot: projectRoot, specs: [rawName, ...more], tool: tool, user: user }));
     }
     if (isBareOrgScope(rawName)) {
         const orgName = rawName.slice(1);
@@ -273,16 +274,8 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
         // through to a misleading "asset not found".
         if (!indexBundle && (registry.bundles ?? []).some((b) => b.name === name)) {
             const assetExists = findAsset(registry, name, undefined, undefined, org);
-            if (!assetExists) {
-                if (inlineOrg) {
-                    throw new Error(`Bundle '${name}' not found in org '${inlineOrg}'.`);
-                }
-                const orgScopes = (registry.bundles ?? [])
-                    .filter((b) => b.name === name && b.org)
-                    .map((b) => `@${b.org}/${name}`);
-                throw new Error(`Bundle '${name}' not found in the registry.` +
-                    (orgScopes.length > 0 ? ` Did you mean ${orgScopes.join(' or ')}?` : ''));
-            }
+            if (!assetExists)
+                throw otherScopeBundleError(registry, name, inlineOrg);
         }
         // With no active org, `info` opens the only org asset of a bare name, but install doesn't
         // switch scopes on its own: it names the spec that installs that asset.
@@ -360,26 +353,7 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
                 };
                 // Bundle installation flow — check if already installed for ALL tools
                 if (!force) {
-                    const bundleAssets = bundle.assets ?? [];
-                    // When no configured tool takes any member, fall through so the installer says why.
-                    const allInstalledForAllTools = tools.every(({ adapter: toolAdapter }) => members.length > 0 &&
-                        bundleAssets.every((ref) => {
-                            const found = findBundleMember(registry, bundle, ref);
-                            if (!found)
-                                return false;
-                            // A tool that doesn't take this member (its type, or a hook for other tools) has
-                            // nothing to check.
-                            if (!placesAsset(toolAdapter, found.asset.type, found.versionData.tools))
-                                return true;
-                            const installed = findInstalledAsset(before, ref.name, ref.type, found.asset.org);
-                            if (!installed)
-                                return false;
-                            if (requiredBundleVersion && !isFromBundleVersion(installed, bundle, requiredBundleVersion)) {
-                                return false;
-                            }
-                            return isInstalledForTool(installed, toolAdapter, projectDir);
-                        }));
-                    if (allInstalledForAllTools) {
+                    if (isBundleInPlace(registry, bundle, before, { members, projectDir, requiredBundleVersion, tools })) {
                         // Adopting a bundle that is in place only records its origin on the members with none:
                         // their files, versions and pins stay as they are. Another bundle's member stays its.
                         const outside = membersOutsideBundle(before, members, bundle);
@@ -521,13 +495,15 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
     return (_jsxs(Box, { flexDirection: 'column', children: [data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
 }
 /**
- * `atk install a b@1.2.0 @org/c`: the named assets resolved together (shared dependencies once,
- * one version per asset) and installed as one plan, so a failure rolls the whole run back, as an
- * `@org` install does. Every name is checked before anything is written. A name already in place
- * for every tool is left out of the plan, and one installed only as a dependency becomes direct
- * once the install succeeds.
+ * `atk install a b@1.2.0 @org/c my-bundle @org --all`: the named assets, the bundles' members and
+ * the orgs' assets resolved together (shared dependencies once, one version per asset) and
+ * installed as one plan, so a failure rolls the whole run back, as an `@org` install does. Every
+ * name is checked before anything is written. An asset already in place for every tool is left out
+ * of the plan, and one installed only as a dependency becomes direct once the install succeeds. A
+ * bundle is left out when all of it is in place, as when it is installed alone; its members get
+ * its origin unless they are named themselves ({@link resolveTargetsInstallPlan}).
  */
-function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoot, specs, tool, user, }) {
+function InstallAssets({ adopt, all, dryRun, force, json, org: cliOrg, pin, projectRoot, specs, tool, user, }) {
     const { json: effectiveJson } = useNonInteractive(json);
     const { fields, resolve, resolved } = useResolvedScope({ projectRoot, user });
     const state = useCommand(async (progress) => {
@@ -535,11 +511,13 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
         if (adopt) {
             throw new Error('--adopt records a bundle as the owner of its members, so it works with one bundle only.');
         }
-        const orgScope = specs.find(isBareOrgScope);
-        if (orgScope) {
-            throw new ResolverError(`${orgScope} is an org scope, which installs on its own.`, {
-                command: installCommandFor(orgScope, flags),
-            });
+        // No picker opens halfway through a run, so an org among names takes all its assets, and
+        // only when asked to. A dry run shows them all, as `atk install @org --dry-run` does.
+        const orgScopes = [...new Set(specs.filter(isBareOrgScope))];
+        if (orgScopes.length > 0 && !all && !dryRun) {
+            throw new InstallerError(`${orgScopes.join(', ')} among other names installs every asset in ` +
+                `${orgScopes.length === 1 ? 'it' : 'them'}, so it needs --all (-a). ` +
+                `To choose ${orgScopes.length === 1 ? 'its' : 'their'} assets, install ${orgScopes.length === 1 ? 'it' : 'each'} alone.`, { code: 'selection_required', command: installCommandFor(`${specs.join(' ')} --all`, flags) });
         }
         const { root: projectDir, scope: installScope } = await resolve();
         progress('Loading configuration...');
@@ -549,33 +527,65 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
         progress('Fetching registry...');
         const registry = await fetchRegistry({ force: true });
         const currentLockfile = await readLockfile(projectDir);
-        // Every name is checked before anything is resolved or written.
-        // Each bundle as typed, and the spec that installs it (another scope's, when only that has it).
-        const bundles = [];
+        // Every name is checked before anything is resolved or written. The targets keep the order
+        // they were named in, which decides the origin of a member two bundles share.
         const deprecated = [];
-        const requests = [];
-        for (const spec of specs) {
+        const emptyOrgs = [];
+        const orgs = [];
+        const targets = [];
+        const deprecationOf = (name, deprecation) => {
+            if (deprecation.deprecated && !force) {
+                deprecated.push(`"${name}" (${deprecation.reason}${deprecation.replacement ? `; use ${deprecation.replacement}` : ''})`);
+            }
+        };
+        for (const spec of new Set(specs)) {
+            if (isBareOrgScope(spec)) {
+                const orgName = spec.slice(1);
+                const orgAssets = getAssetsByOrg(registry, orgName);
+                if (orgAssets.length === 0)
+                    emptyOrgs.push(spec);
+                orgs.push({ count: orgAssets.length, org: orgName });
+                for (const { name, type } of orgAssets) {
+                    targets.push({
+                        fromOrg: true,
+                        kind: 'asset',
+                        name,
+                        org: orgName,
+                        spec: formatOrgName(orgName, name),
+                        type,
+                    });
+                }
+                continue;
+            }
             const { name: parsedName, version } = parseNameVersion(spec);
             const { name: nameFromOrg, org: inlineOrg } = parseBundleSpec(parsedName);
             const name = inlineOrg ? nameFromOrg : parsedName;
             const org = resolveActiveOrg(inlineOrg ?? cliOrg, currentLockfile.org, config.org);
-            const asset = findAsset(registry, name, undefined, undefined, org)?.asset;
-            const bundle = findBundle(registry, name, inlineOrg) ??
-                (asset ? undefined : (registry.bundles ?? []).find((b) => b.name === name));
-            if (bundle) {
-                bundles.push({ install: formatOrgName(bundle.org, bundle.name) + (version ? `@${version}` : ''), spec });
+            const indexBundle = findBundle(registry, name, inlineOrg);
+            if (indexBundle) {
+                const bundle = await bundleAtRequestedVersion(indexBundle, version, progress);
+                const earlier = targets.find((t) => t.kind === 'bundle' && t.bundle.name === name && t.bundle.org === indexBundle.org);
+                if (earlier) {
+                    // A bundle installs at one version, as an asset does.
+                    if (earlier.bundle.version !== bundle.version) {
+                        throw new ResolverError(`Bundle "${formatOrgName(bundle.org, name)}" is named at two versions: ${earlier.bundle.version} ` +
+                            `(${earlier.spec}) and ${bundle.version} (${spec}). A bundle installs at one version.`);
+                    }
+                    continue;
+                }
+                deprecationOf(name, isDeprecated(registry, name, undefined, indexBundle.org));
+                targets.push({ bundle, kind: 'bundle', spec, ...(version ? { version } : {}) });
                 continue;
             }
-            const deprecation = isDeprecated(registry, name, asset?.type, asset ? asset.org : inlineOrg);
-            if (deprecation.deprecated && !force) {
-                deprecated.push(`"${name}" (${deprecation.reason}${deprecation.replacement ? `; use ${deprecation.replacement}` : ''})`);
+            const asset = findAsset(registry, name, undefined, undefined, org)?.asset;
+            if (!asset && (registry.bundles ?? []).some((b) => b.name === name)) {
+                throw otherScopeBundleError(registry, name, inlineOrg);
             }
-            requests.push({ name, ...(org ? { org } : {}), spec, ...(version ? { version } : {}) });
+            deprecationOf(name, isDeprecated(registry, name, asset?.type, asset ? asset.org : inlineOrg));
+            targets.push({ kind: 'asset', name, ...(org ? { org } : {}), spec, ...(version ? { version } : {}) });
         }
-        if (bundles.length > 0) {
-            throw new ResolverError(bundles.length === 1
-                ? `${bundles[0].spec} is a bundle, which installs on its own.`
-                : `${bundles.map((b) => b.spec).join(', ')} are bundles, which install on their own.`, { command: installCommandFor(bundles[0].install, flags) });
+        if (emptyOrgs.length > 0) {
+            throw new ResolverError(`No assets found for ${emptyOrgs.join(', ')}. Nothing was installed.`);
         }
         if (deprecated.length > 0) {
             throw new ResolverError(`Deprecated: ${deprecated.join(', ')}. Nothing was installed.`, {
@@ -584,10 +594,40 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
         }
         // A name every targeted tool already has in place is left out of the plan, as it is for one name.
         const assets = [];
+        const bundles = [];
         const upgrades = [];
         const toInstall = [];
-        for (const request of requests) {
-            const match = findAsset(registry, request.name, undefined, request.version, request.org);
+        const adoptCommandFor = ({ bundle, version }) => installCommandFor(formatOrgName(bundle.org, bundle.name) + (version ? `@${version}` : ''), {
+            adopt: true,
+            force: false,
+            pin: false,
+            projectRoot,
+            tool,
+            user,
+        });
+        for (const request of targets) {
+            if (request.kind === 'bundle') {
+                const { bundle, version } = request;
+                const members = bundleMembers(registry, bundle, tools);
+                const requiredBundleVersion = version && !isLatestAlias(version) ? bundle.version : undefined;
+                if (force ||
+                    !isBundleInPlace(registry, bundle, currentLockfile, { members, projectDir, requiredBundleVersion, tools })) {
+                    toInstall.push(request);
+                    continue;
+                }
+                bundles.push({
+                    name: bundle.name,
+                    ...(bundle.org ? { org: bundle.org } : {}),
+                    outcome: 'already-installed',
+                    version: bundle.version,
+                    ...bundleReport(membersOutsideBundle(currentLockfile, members, bundle), [], {
+                        adoptCommand: adoptCommandFor(request),
+                        bundle,
+                    }),
+                });
+                continue;
+            }
+            const match = findAsset(registry, request.name, request.type, request.version, request.org);
             const existing = match
                 ? findInstalledAsset(currentLockfile, request.name, match.asset.type, match.asset.org)
                 : undefined;
@@ -615,9 +655,25 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
             });
         }
         progress('Resolving dependencies...');
-        const plan = resolveMultipleInstallPlans(registry, toInstall.map(({ name, org, version }) => ({ name, ...(org ? { org } : {}), ...(version ? { version } : {}) })));
+        const plan = resolveTargetsInstallPlan(registry, toInstall.map((request) => request.kind === 'bundle'
+            ? { bundle: request.bundle, kind: 'bundle' }
+            : {
+                ...(request.fromOrg ? { fromOrg: true } : {}),
+                kind: 'asset',
+                name: request.name,
+                ...(request.org ? { org: request.org } : {}),
+                ...(request.type ? { type: request.type } : {}),
+                ...(request.version ? { version: request.version } : {}),
+            }));
+        // The named and the org's assets the plan installs, in plan order.
+        const requested = new Set(toInstall.flatMap((request) => {
+            if (request.kind === 'bundle')
+                return [];
+            const match = findAsset(registry, request.name, request.type, request.version, request.org);
+            return match ? [identityKey(match.asset)] : [];
+        }));
         const installed = plan.entries
-            .filter((entry) => entry.reason === 'direct')
+            .filter((entry) => entry.reason === 'direct' && requested.has(identityKey(entry.asset)))
             .map((entry) => ({
             name: entry.asset.name,
             ...(entry.asset.org ? { org: entry.asset.org } : {}),
@@ -627,10 +683,36 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
         }));
         const report = [...installed, ...assets];
         const crossScope = (resolvedPlan, installedAt) => crossScopeOf(resolvedPlan, { installedAt, json: effectiveJson, scope: installScope, tools: toolNames });
+        // Each bundle in the plan, in the order named, then the ones left out; and the orgs.
+        const targetsField = (lockfile, planned) => {
+            const installedBundles = toInstall.flatMap((request) => {
+                if (request.kind !== 'bundle')
+                    return [];
+                const { bundle } = request;
+                const members = bundleMembers(registry, bundle, tools);
+                // A dry run writes nothing, so the members it leaves outside the bundle are read from the plan.
+                const kept = [
+                    ...membersOutsideBundle(lockfile, members, bundle),
+                    ...(planned ? plannedOutsideBundle(plan, lockfile, members, bundle) : []),
+                ];
+                return [
+                    {
+                        name: bundle.name,
+                        ...(bundle.org ? { org: bundle.org } : {}),
+                        outcome: 'installed',
+                        version: bundle.version,
+                        ...bundleReport(kept, [], { adoptCommand: adoptCommandFor(request), bundle }),
+                    },
+                ];
+            });
+            const named = [...installedBundles, ...bundles];
+            return { ...(named.length > 0 ? { bundles: named } : {}), ...(orgs.length > 0 ? { orgs } : {}) };
+        };
         // A dry run says so even when every name is in place, and writes nothing (not even an upgrade).
         if (dryRun) {
             return {
                 assets: report,
+                ...targetsField(currentLockfile, true),
                 outcome: 'dry-run-install',
                 plan: withoutKeptDependencies(plan, currentLockfile, tools, {
                     onProgress: progress,
@@ -659,11 +741,18 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
                     lockfile = upgradeToDirectInstall(lockfile, name, type, org);
                 await writeLockfile(projectDir, lockfile);
             }
-            if (plan.entries.length === 0)
-                return { assets: report, outcome: 'already-installed' };
-            return { assets: report, outcome: 'installed', toolResults, ...(await crossScope(plan, projectDir)) };
+            if (plan.entries.length === 0) {
+                return { assets: report, ...targetsField(currentLockfile, false), outcome: 'already-installed' };
+            }
+            return {
+                assets: report,
+                ...targetsField(await readLockfile(projectDir), false),
+                outcome: 'installed',
+                toolResults,
+                ...(await crossScope(plan, projectDir)),
+            };
         });
-    }, [adopt, cliOrg, dryRun, force, pin, specs.join(' '), tool]);
+    }, [adopt, all, cliOrg, dryRun, force, pin, specs.join(' '), tool]);
     if (state.status === 'loading') {
         return _jsx(Spinner, { message: state.message });
     }
@@ -686,10 +775,10 @@ function InstallAssets({ adopt, dryRun, force, json, org: cliOrg, pin, projectRo
         return renderJson({ ...data, ...fields });
     }
     if (data.outcome === 'dry-run-install') {
-        return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(NamedAssetLines, { assets: data.assets, dryRun: true, where: label }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
+        return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(NamedAssetLines, { assets: data.assets, dryRun: true, where: label }), _jsx(TargetLines, { bundles: data.bundles, dryRun: true, orgs: data.orgs, where: label }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
     }
     return (_jsxs(Box, { flexDirection: 'column', children: [data.outcome === 'installed' &&
-                data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(NamedAssetLines, { assets: data.assets, where: label }), data.outcome === 'installed' && _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
+                data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(NamedAssetLines, { assets: data.assets, where: label }), _jsx(TargetLines, { bundles: data.bundles, orgs: data.orgs, where: label }), data.outcome === 'installed' && _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
 }
 /** `atk install <spec>` with the run's own flags, for a command an error suggests. */
 function installCommandFor(spec, { adopt, dryRun, force, pin, projectRoot, tool, user }) {
@@ -953,6 +1042,31 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
     }
     return null;
 }
+/**
+ * Whether every member of the bundle is in place for every tool that takes it (with
+ * `requiredBundleVersion`, recorded as this bundle at that version). False when no tool takes any
+ * member, so the installer says why.
+ */
+function isBundleInPlace(registry, bundle, lockfile, { members, projectDir, requiredBundleVersion, tools, }) {
+    const bundleAssets = bundle.assets ?? [];
+    return tools.every(({ adapter: toolAdapter }) => members.length > 0 &&
+        bundleAssets.every((ref) => {
+            const found = findBundleMember(registry, bundle, ref);
+            if (!found)
+                return false;
+            // A tool that doesn't take this member (its type, or a hook for other tools) has
+            // nothing to check.
+            if (!placesAsset(toolAdapter, found.asset.type, found.versionData.tools))
+                return true;
+            const installed = findInstalledAsset(lockfile, ref.name, ref.type, found.asset.org);
+            if (!installed)
+                return false;
+            if (requiredBundleVersion && !isFromBundleVersion(installed, bundle, requiredBundleVersion)) {
+                return false;
+            }
+            return isInstalledForTool(installed, toolAdapter, projectDir);
+        }));
+}
 /** Whether a lockfile asset was installed as part of this bundle (name, org) at this version. */
 function isFromBundleVersion(installed, bundle, version) {
     const origin = installed.bundleOrigin;
@@ -986,8 +1100,46 @@ function NamedAssetLines({ assets, dryRun = false, where, }) {
                     ? `${dryRun ? 'would become' : 'is now'} a direct install${inScope}.`
                     : `is already installed${inScope}.`] }, identityKey(a)))) }));
 }
+/**
+ * The error for a bundle name that only another scope has, when no asset can claim the name
+ * either, instead of a misleading "asset not found".
+ */
+function otherScopeBundleError(registry, name, inlineOrg) {
+    if (inlineOrg) {
+        return new Error(`Bundle '${name}' not found in org '${inlineOrg}'.`);
+    }
+    const orgScopes = (registry.bundles ?? []).filter((b) => b.name === name && b.org).map((b) => `@${b.org}/${name}`);
+    return new Error(`Bundle '${name}' not found in the registry.` +
+        (orgScopes.length > 0 ? ` Did you mean ${orgScopes.join(' or ')}?` : ''));
+}
 /** A plan's entries, each with its type and version, its dependencies marked. */
 function PlanEntryLines({ plan }) {
     return (_jsx(_Fragment, { children: plan.entries.map((entry) => (_jsxs(Text, { children: ['  ', entry.reason === 'dependency' ? (_jsxs(Text, { color: 'cyan', children: [formatOrgName(entry.asset.org, entry.asset.name), ' ', _jsxs(Text, { dimColor: true, children: ["(", entry.asset.type, ") v", entry.version, " \u2014 dependency"] })] })) : (_jsxs(Text, { children: [_jsx(Text, { bold: true, children: formatOrgName(entry.asset.org, entry.asset.name) }), _jsxs(Text, { dimColor: true, children: [' ', "(", entry.asset.type, ") v", entry.version] })] }))] }, identityKey(entry.asset)))) }));
 }
+/**
+ * The members not installed yet that the plan installs without the bundle's origin: named on their
+ * own, or with another bundle named before it. A dry run reports them as an install would.
+ */
+function plannedOutsideBundle(plan, lockfile, members, bundle) {
+    return members.flatMap((member) => {
+        if (findInstalledAsset(lockfile, member.name, member.type, member.org))
+            return [];
+        const entry = plan.entries.find((e) => identityKey(e.asset) === identityKey(member));
+        const origin = entry?.bundleOrigin;
+        if (!entry || (origin?.name === bundle.name && origin.org === bundle.org))
+            return [];
+        return [{ ...(origin ? { bundle: origin } : {}), ...member }];
+    });
+}
+/**
+ * The bundles and orgs a run of several names had among them: what it did with each bundle, the
+ * bundle's members outside it, and how many assets each org brought.
+ */
+function TargetLines({ bundles = [], dryRun = false, orgs = [], where, }) {
+    const inScope = where ? ` in ${where}` : '';
+    return (_jsxs(_Fragment, { children: [bundles.map((bundle) => {
+                const spec = formatOrgName(bundle.org, bundle.name);
+                return (_jsxs(Fragment, { children: [bundle.outcome === 'already-installed' ? (_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " Bundle ", _jsx(Text, { bold: true, children: spec }), " is already fully installed (v", bundle.version, ")", inScope, "."] })) : (_jsxs(Text, { children: [_jsx(Text, { color: 'green', children: "\u2713" }), " Bundle ", _jsx(Text, { bold: true, children: spec }), " v", bundle.version, ' ', dryRun ? 'would be installed' : 'installed', inScope, "."] })), _jsx(BundleReportLines, { bundleName: spec, dryRun: dryRun, report: bundle })] }, spec));
+            }), orgs.map(({ count, org }) => (_jsxs(Text, { children: [_jsxs(Text, { bold: true, color: 'magenta', children: ["Org: @", org] }), _jsxs(Text, { dimColor: true, children: [' ', "\u2014 all ", count, " asset", count !== 1 ? 's' : ''] })] }, org)))] }));
+}
 //# sourceMappingURL=install.js.map