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

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [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
+
+* **cli:** install several assets at once as one plan ([9f45771](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/9f45771cd13f2e9f62352c6ee7050afa3f3c2bb2))
+* **cli:** uninstall several assets at once ([eeaf8e2](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/eeaf8e26db6619593264ae33183086aec94a9d3e))
+* **cli:** update several assets at once and pick them with atk update -i ([ad76872](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/ad768721353fe5f6a466aa33807dcbdedd488f29))
+
+### Bug Fixes
+
+* **cli:** agree the verb in the bundle refusal of several names ([7bb43aa](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/7bb43aaf6c0f6295e5b8253106ea76a68d0d45c0))
+* **cli:** give atk update --interactive the short flag -I ([7ab8d77](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/7ab8d777eabd3a5e90e4dc5d13fd7c2054c64457))
+* **cli:** review fixes for install, uninstall and update with several names ([4bdfa9c](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/4bdfa9c3560460af7b91e480f24a6ee9c28d57dc))
+
+## [9.2.0-dev.4](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.2.0-dev.3&targetVersion=GTv9.2.0-dev.4) (2026-10-23)
+
+### Features
+
+* **cli:** compare atk diff with a chosen version or the locked one ([ef0e182](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/ef0e182764ae57223037c695dfeda286f66d95e7))
+
+### Bug Fixes
+
+* **cli:** keep atk diff's latest wording and outdated colour ([95894f7](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/95894f7cddd0f1dbfab06fea1494055147609035))
+* **cli:** say when atk diff --installed finds its version unpublished ([7aed9ae](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/7aed9ae6d42afc32dedc12bddcf55952c1801a1c))
+
 ## [9.2.0-dev.3](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.2.0-dev.2&targetVersion=GTv9.2.0-dev.3) (2026-10-23)
 
 ### Features

package/README.md

@@ -77,7 +77,7 @@ atk update
 | `atk checkout <name>`    | Fetch a writable working copy of a registry asset for updating    |
 | `atk config`             | Manage user configuration (`~/.atkrc.json`)                       |
 | `atk deprecate <name>`   | Deprecate an asset or bundle (or `--undo`) via PR, no new version |
-| `atk diff <asset>`       | Show changes between installed and latest versions                |
+| `atk diff <asset>`       | Show changes against the latest, `@<version>` or `--installed`    |
 | `atk doctor`             | Run environment diagnostics                                       |
 | `atk info <asset>`       | Show asset details, what depends on it and the bundles with it    |
 | `atk init`               | Scaffold a new asset or bundle                                    |
@@ -109,20 +109,20 @@ A short flag means the same long flag on every command that takes it, and a long
 
 | Short | Long                                 | Short | Long                                                  |
 | ----- | ------------------------------------ | ----- | ----------------------------------------------------- |
-| `-a`  | `--all`                              | `-O`  | `--offline` (`init`)                                  |
-| `-b`  | `--bundle`                           | `-o`  | `--org`                                               |
-| `-C`  | `--context`                          | `-P`  | `--project-root`                                      |
-| `-d`  | `--description` (`init`, `register`) | `-p`  | `--pin`                                               |
-| `-e`  | `--entrypoint`                       | `-R`  | `--reset`                                             |
-| `-F`  | `--from`                             | `-r`  | `--refresh`                                           |
-| `-f`  | `--force`                            | `-s`  | `--sort`                                              |
-| `-g`  | `--tag`                              | `-T`  | `--tool`                                              |
-| `-h`  | `--help`                             | `-t`  | `--type`                                              |
+| `-a`  | `--all`                              | `-n`  | `--dry-run`                                           |
+| `-b`  | `--bundle`                           | `-O`  | `--offline` (`init`)                                  |
+| `-C`  | `--context`                          | `-o`  | `--org`                                               |
+| `-d`  | `--description` (`init`, `register`) | `-P`  | `--project-root`                                      |
+| `-e`  | `--entrypoint`                       | `-p`  | `--pin`                                               |
+| `-F`  | `--from`                             | `-R`  | `--reset`                                             |
+| `-f`  | `--force`                            | `-r`  | `--refresh`                                           |
+| `-g`  | `--tag`                              | `-s`  | `--sort`                                              |
+| `-h`  | `--help`                             | `-T`  | `--tool`                                              |
+| `-I`  | `--interactive` (`update`)           | `-t`  | `--type`                                              |
 | `-i`  | `--from-installed`                   | `-u`  | `--update`                                            |
 | `-j`  | `--json`                             | `-V`  | `--version`, an asset's (`checkout`, `drift`, `info`) |
 | `-l`  | `--limit`                            | `-v`  | `--version`, the CLI's                                |
 | `-m`  | `--message`                          | `-y`  | `--yes`                                               |
-| `-n`  | `--dry-run`                          |       |                                                       |
 
 CLI 9.0.0 changed the letters that meant two things. `-n` became `--dry-run` on `publish`, `unpublish`, `promote` and `deprecate`. Their old `-d` is now an unknown option on all four, so an old dry run fails rather than running for real. `--name` (`init`, `register`, `drift`), `--author` (`init`, `register`), `deprecate --reason`, `info --full`, `info --verbose` and `release-notes --prerelease` lost their short flags. `move` gained `-n` and `setup` gained `-j`.
 
@@ -138,7 +138,7 @@ These fail a build when they find something (CLI 9.2.0+):
 
 - `atk sync --check` exits 1 when the installed files don't match the lockfile: a file or config entry missing or changed, a local edit (which `atk sync` keeps but the check doesn't), a hook copy sync would remove because its locked version doesn't declare the tool, or an asset sync would refuse. Frozen assets and assets uninstalled for a tool pass, except such a hook copy left on disk. It changes nothing. Add `--user` to check the user scope. It can't be combined with `--force`.
 - `atk outdated --exit-code` exits 1 when an installed asset has an update. A pin that doesn't match the installed version doesn't count.
-- `atk diff <asset> --exit-code` exits 1 when the installed files differ from the latest version's. A newer version with the same files exits 0.
+- `atk diff <asset> --exit-code` exits 1 when the installed files differ from the latest version's. A newer version with the same files exits 0. `atk diff <asset>@<version>` compares with that version instead, and `--installed` with the version the lockfile records, so `atk diff <asset> --installed --exit-code` fails only on local edits.
 - `atk drift [path] --exit-code` exits 1 when a local asset folder differs from its published version.
 
 `atk audit` exits 1 on a checksum failure, as before. Without these flags, the commands exit 0 when they find something. An error is still exit 1 (with `--json`, `"outcome": "error"`), and a usage error is exit 2. All four call the ATK API, so give them a token. A CI checkout has no `.atkrc.json` (it is gitignored), so name the tool with `--tool`:

package/build/command-manifest.json

@@ -224,11 +224,11 @@
         "name": "diff",
         "args": [
             {
-                "description": "Asset name (supports @org/name syntax)",
+                "description": "Asset name (supports name@version and @org/name syntax)",
                 "name": "<name>"
             }
         ],
-        "description": "Show changes between installed and latest version",
+        "description": "Show changes between installed files and the latest or a chosen version",
         "file": "diff.js",
         "options": [
             {
@@ -239,7 +239,12 @@
             },
             {
                 "flags": "--exit-code",
-                "description": "Exit 1 when the installed files differ from the latest version's (for CI)",
+                "description": "Exit 1 when the installed files differ from the compared version's (for CI)",
+                "defaultValue": false
+            },
+            {
+                "flags": "--installed",
+                "description": "Compare with the version the lockfile records, which shows only local edits",
                 "defaultValue": false
             },
             {
@@ -508,6 +513,10 @@
             {
                 "description": "Asset, bundle, or org scope to install (supports name@version and @org)",
                 "name": "[target]"
+            },
+            {
+                "description": "More assets to install with the first, as one plan (name@version and @org/name)",
+                "name": "[targets...]"
             }
         ],
         "description": "Install an asset or bundle (no args syncs from lockfile)",
@@ -1320,6 +1329,10 @@
             {
                 "description": "Asset or bundle name to uninstall",
                 "name": "<name>"
+            },
+            {
+                "description": "More assets to uninstall with the first",
+                "name": "[names...]"
             }
         ],
         "description": "Uninstall an asset or bundle",
@@ -1479,6 +1492,10 @@
             {
                 "description": "Asset name (updates all if omitted, supports name@version syntax)",
                 "name": "[name]"
+            },
+            {
+                "description": "More assets to update to their latest versions",
+                "name": "[names...]"
             }
         ],
         "description": "Update installed assets",
@@ -1494,6 +1511,11 @@
                 "description": "Override version pins on targeted assets, and overwrite local edits",
                 "defaultValue": false
             },
+            {
+                "flags": "-I, --interactive",
+                "description": "Pick the outdated assets to update from a list (needs an interactive terminal)",
+                "defaultValue": false
+            },
             {
                 "flags": "-j, --json",
                 "description": "Output raw JSON (for scripting and CI)",

package/build/commands/diff.d.ts

@@ -1,8 +1,9 @@
 import { z } from 'zod';
-export declare const description = "Show changes between installed and latest version";
+export declare const description = "Show changes between installed files and the latest or a chosen version";
 export declare const options: z.ZodObject<{
     context: z.ZodDefault<z.ZodNumber>;
     exitCode: z.ZodOptional<z.ZodBoolean>;
+    installed: z.ZodOptional<z.ZodBoolean>;
     json: z.ZodDefault<z.ZodBoolean>;
     org: z.ZodOptional<z.ZodString>;
     projectRoot: z.ZodOptional<z.ZodString>;
@@ -15,6 +16,6 @@ type Props = {
     args: z.infer<typeof args>;
     options: z.infer<typeof options>;
 };
-export default function Diff({ args: [rawName], options: { context, exitCode, json, org: cliOrg, projectRoot, refresh, tool, user }, }: Props): import("react").JSX.Element;
+export default function Diff({ args: [rawName], options: { context, exitCode, installed, json, org: cliOrg, projectRoot, refresh, tool, user }, }: Props): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=diff.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/commands/diff.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,WAAW,sDAAsD,CAAC;AAE/E,eAAO,MAAM,OAAO;;;;;;;;;iBAuElB,CAAC;AAEH,eAAO,MAAM,IAAI,iCAEf,CAAC;AAEH,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,IAAI,CAAC,EAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,EACf,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GACpF,EAAE,KAAK,+BAkEP"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/commands/diff.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,eAAO,MAAM,WAAW,4EAA4E,CAAC;AAErG,eAAO,MAAM,OAAO;;;;;;;;;;iBA+ElB,CAAC;AAEH,eAAO,MAAM,IAAI,iCAIf,CAAC;AAEH,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,IAAI,CAAC,EAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,EACf,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAC/F,EAAE,KAAK,+BAwHP"}

package/build/commands/diff.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Text } from 'ink';
+import { Box, Text } from 'ink';
 import { z } from 'zod';
 import { DiffView, ErrorView, Spinner } from '../components/index.js';
 import { useCommand } from '../hooks/useCommand.js';
@@ -7,7 +7,10 @@ import { computeDiffOutcome } from '../lib/diff-command.js';
 import { parseOrgFromName } from '../lib/org.js';
 import { renderJson, useNonInteractive } from '../lib/output.js';
 import { argument, option } from '../lib/pastel/index.js';
-export const description = 'Show changes between installed and latest version';
+import { scopedCommand } from '../lib/scope.js';
+import { reportUsageError } from '../lib/usage-error.js';
+import { parseNameVersion } from '../lib/version.js';
+export const description = 'Show changes between installed files and the latest or a chosen version';
 export const options = z.object({
     context: z
         .number()
@@ -20,7 +23,13 @@ export const options = z.object({
         .boolean()
         .optional()
         .describe(option({
-        description: "Exit 1 when the installed files differ from the latest version's (for CI)",
+        description: "Exit 1 when the installed files differ from the compared version's (for CI)",
+    })),
+    installed: z
+        .boolean()
+        .optional()
+        .describe(option({
+        description: 'Compare with the version the lockfile records, which shows only local edits',
     })),
     json: z
         .boolean()
@@ -65,13 +74,27 @@ export const options = z.object({
     })),
 });
 export const args = z.tuple([
-    z.string().describe(argument({ description: 'Asset name (supports @org/name syntax)', name: 'name' })),
+    z
+        .string()
+        .describe(argument({ description: 'Asset name (supports name@version and @org/name syntax)', name: 'name' })),
 ]);
-export default function Diff({ args: [rawName], options: { context, exitCode, json, org: cliOrg, projectRoot, refresh, tool, user }, }) {
-    const { name: nameFromOrg, org: inlineOrg } = parseOrgFromName(rawName);
-    const name = inlineOrg ? nameFromOrg : rawName;
+export default function Diff({ args: [rawName], options: { context, exitCode, installed, json, org: cliOrg, projectRoot, refresh, tool, user }, }) {
+    // The version first, so `@org/name@1.2.0` parses as info and install parse it.
+    const { name: parsedName, version } = parseNameVersion(rawName);
+    const { name: nameFromOrg, org: inlineOrg } = parseOrgFromName(parsedName);
+    const name = inlineOrg ? nameFromOrg : parsedName;
     const { json: effectiveJson } = useNonInteractive(json);
-    const state = useCommand(async (progress) => computeDiffOutcome(name, undefined, tool, context, refresh, projectRoot, user, cliOrg, inlineOrg, progress), [cliOrg, context, inlineOrg, name, projectRoot, refresh, tool, user]);
+    const state = useCommand(async (progress) => {
+        if (version && installed) {
+            reportUsageError(`error: ${name}@${version} and --installed contradict each other: --installed compares with the locked version`, effectiveJson);
+        }
+        const target = installed
+            ? { kind: 'installed' }
+            : version
+                ? { kind: 'version', version }
+                : { kind: 'latest' };
+        return computeDiffOutcome(name, target, undefined, tool, context, refresh, projectRoot, user, cliOrg, inlineOrg, progress);
+    }, [cliOrg, context, effectiveJson, inlineOrg, installed, name, projectRoot, refresh, tool, user, version]);
     if (state.status === 'loading') {
         return _jsx(Spinner, { message: state.message });
     }
@@ -88,9 +111,9 @@ export default function Diff({ args: [rawName], options: { context, exitCode, js
         return _jsx(ErrorView, { command: state.command, hint: state.hint, message: state.message });
     }
     const { data } = state;
-    // Nothing to compare: the asset isn't installed, or the registry doesn't have it. With
-    // --exit-code, files that differ fail too; a new version with the same files doesn't.
-    if (data.outcome === 'not-installed' || data.outcome === 'not-in-registry' || (exitCode && hasChanges(data))) {
+    // Nothing to compare: the asset isn't installed, or the registry doesn't have it or the version.
+    // With --exit-code, files that differ fail too; a new version with the same files doesn't.
+    if (data.outcome !== 'results' || (exitCode && hasChanges(data))) {
         process.exitCode = 1;
     }
     if (effectiveJson) {
@@ -102,12 +125,23 @@ export default function Diff({ args: [rawName], options: { context, exitCode, js
     if (data.outcome === 'not-in-registry') {
         return (_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " ", _jsx(Text, { bold: true, children: data.name }), " was not found in the registry."] }));
     }
-    return (_jsx(DiffView, { diffs: data.diffs, installedVersion: data.installed.version, latestVersion: data.latestVersion, name: data.name, sameVersion: data.sameVersion, scope: data.scope }));
+    if (data.outcome === 'version-not-found') {
+        return (_jsxs(Box, { flexDirection: 'column', children: [data.target === 'installed' ? (_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " The installed version ", _jsxs(Text, { bold: true, children: ["\"", data.version, "\""] }), " of", ' ', _jsxs(Text, { bold: true, children: ["\"", data.name, "\""] }), " is no longer in the registry, so there is nothing to compare with."] })) : (_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " Version ", _jsxs(Text, { bold: true, children: ["\"", data.version, "\""] }), " of ", _jsxs(Text, { bold: true, children: ["\"", data.name, "\""] }), ' ', "not found."] })), data.availableVersions.length > 0 && (_jsxs(Text, { dimColor: true, children: ["Available versions: ", data.availableVersions.join(', ')] })), data.target === 'installed' && (_jsxs(Text, { dimColor: true, children: ["Run ", _jsx(Text, { bold: true, children: scopedCommand(`atk update ${data.name}`, data.scope) }), " to move to the latest version."] }))] }));
+    }
+    return (_jsx(DiffView, { comparedVersion: data.comparedVersion, diffs: data.diffs, installedVersion: data.installed.version, latestVersion: data.latestVersion, name: data.name, sameVersion: data.sameVersion, scope: data.scope, target: data.target }));
 }
 function buildJsonOutput(data) {
     if (data.outcome === 'not-installed' || data.outcome === 'not-in-registry') {
         return { name: data.name, outcome: data.outcome };
     }
+    if (data.outcome === 'version-not-found') {
+        return {
+            availableVersions: data.availableVersions,
+            name: data.name,
+            outcome: data.outcome,
+            version: data.version,
+        };
+    }
     const diffs = data.diffs.map((d) => ({
         fileName: d.fileName,
         ...(d.localLines !== undefined ? { localLines: d.localLines } : {}),
@@ -115,6 +149,7 @@ function buildJsonOutput(data) {
         status: d.status,
     }));
     return {
+        comparedVersion: data.comparedVersion,
         diffs,
         hasChanges: hasChanges(data),
         installedVersion: data.installed.version,
@@ -124,7 +159,7 @@ function buildJsonOutput(data) {
         sameVersion: data.sameVersion,
     };
 }
-/** Whether any installed file differs from the latest version's. */
+/** Whether any installed file differs from the compared version's. */
 function hasChanges(data) {
     return data.outcome === 'results' && data.diffs.some((d) => d.status !== 'unchanged');
 }

package/build/commands/diff.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/commands/diff.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/commands/diff.tsx"],"names":[],"mappings":"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"}

package/build/commands/install.d.ts

@@ -14,11 +14,11 @@ export declare const options: z.ZodObject<{
     user: z.ZodOptional<z.ZodBoolean>;
     yes: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>;
-export declare const args: z.ZodTuple<[z.ZodOptional<z.ZodString>], null>;
+export declare const args: z.ZodTuple<[z.ZodOptional<z.ZodString>], z.ZodString>;
 type Props = {
     args: z.infer<typeof args>;
     options: z.infer<typeof options>;
 };
-export default function Install({ args: [rawName], options: { adopt, all, dryRun, force, json, org, pin, projectRoot, refresh, tool, user, yes }, }: Props): import("react").JSX.Element;
+export default function Install({ args: [rawName, ...more], options: { adopt, all, dryRun, force, json, org, pin, projectRoot, refresh, tool, user, yes }, }: Props): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=install.d.ts.map

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,gDAUf,CAAC;AAqFH,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,CAAC,EACf,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,+BAsCP"}
+{"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"}

package/build/commands/install.js

@@ -108,7 +108,8 @@ export const options = z.object({
         description: 'Alias for --all: install every asset from an org scope without prompting',
     })),
 });
-export const args = z.tuple([
+export const args = z
+    .tuple([
     z
         .string()
         .optional()
@@ -116,12 +117,19 @@ export const args = z.tuple([
         description: 'Asset, bundle, or org scope to install (supports name@version and @org)',
         name: 'target',
     })),
-]);
-export default function Install({ args: [rawName], options: { adopt, all, dryRun, force, json, org, pin, projectRoot, refresh, tool, user, yes }, }) {
+])
+    .rest(z.string().describe(argument({
+    description: 'More assets to install with the first, as one plan (name@version and @org/name)',
+    name: 'targets',
+})));
+export default function Install({ args: [rawName, ...more], options: { adopt, all, dryRun, force, json, org, pin, projectRoot, refresh, tool, user, yes }, }) {
     // No argument provided — delegate to sync behavior
     if (!rawName) {
         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 }));
+    }
     if (isBareOrgScope(rawName)) {
         const orgName = rawName.slice(1);
         return (_jsx(InstallOrg, { cliOrg: org, dryRun: dryRun, force: force, json: json, orgName: orgName, pin: pin, projectRoot: projectRoot, skipPicker: all || yes, tool: tool, user: user }));
@@ -502,16 +510,187 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
         return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 ", _jsx(Text, { bold: true, children: data.name }), " (v", data.version, ") is now a direct install", where, "."] }), _jsx(Text, { dimColor: true, children: "It will no longer be auto-removed when its parent is uninstalled." })] }));
     }
     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: " " }), data.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)))), _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(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
     }
     if (data.outcome === 'dry-run-bundle') {
-        return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsxs(Text, { bold: true, color: 'magenta', children: ["Bundle: ", data.bundleName] }), _jsxs(Text, { dimColor: true, children: [" v", data.version] })] }), _jsx(Text, { children: " " }), data.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)))), _jsx(BundleReportLines, { bundleName: data.bundleName, dryRun: true, report: data }), _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: " " }), _jsxs(Text, { children: [_jsxs(Text, { bold: true, color: 'magenta', children: ["Bundle: ", data.bundleName] }), _jsxs(Text, { dimColor: true, children: [" v", data.version] })] }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(BundleReportLines, { bundleName: data.bundleName, dryRun: true, report: data }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
     }
     if (data.outcome === 'deprecated') {
         return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'yellow', children: ["Warning: \"", data.name, "\" is deprecated \u2014 ", data.reason] }), data.replacement && (_jsxs(Text, { children: ["Consider using", ' ', _jsx(Text, { bold: true, color: 'cyan', children: data.replacement }), ' ', "instead."] })), _jsx(Text, { dimColor: true, children: "Use --force to install anyway." })] }));
     }
     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.
+ */
+function InstallAssets({ adopt, 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) => {
+        const flags = { dryRun, force, pin, projectRoot, tool, user };
+        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),
+            });
+        }
+        const { root: projectDir, scope: installScope } = await resolve();
+        progress('Loading configuration...');
+        const config = await loadConfig();
+        const tools = await resolvePlacingTools(tool, projectDir);
+        const toolNames = tools.map((t) => t.tool);
+        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 = [];
+        const deprecated = [];
+        const requests = [];
+        for (const spec of specs) {
+            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 });
+                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}` : ''})`);
+            }
+            requests.push({ 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 (deprecated.length > 0) {
+            throw new ResolverError(`Deprecated: ${deprecated.join(', ')}. Nothing was installed.`, {
+                hint: 'Use --force to install them anyway.',
+            });
+        }
+        // A name every targeted tool already has in place is left out of the plan, as it is for one name.
+        const assets = [];
+        const upgrades = [];
+        const toInstall = [];
+        for (const request of requests) {
+            const match = findAsset(registry, request.name, undefined, request.version, request.org);
+            const existing = match
+                ? findInstalledAsset(currentLockfile, request.name, match.asset.type, match.asset.org)
+                : undefined;
+            const supportingTools = existing && match ? tools.filter((t) => placesAsset(t.adapter, existing.type, match.versionData.tools)) : [];
+            const inPlace = !force &&
+                existing !== undefined &&
+                supportingTools.length > 0 &&
+                supportingTools.every((t) => isInstalledForTool(existing, t.adapter, projectDir)) &&
+                (!request.version || request.version === existing.version);
+            if (!inPlace) {
+                toInstall.push(request);
+                continue;
+            }
+            if (assets.some((a) => identityKey(a) === identityKey(existing)))
+                continue;
+            const dependency = (existing.installReason ?? 'direct') === 'dependency';
+            if (dependency)
+                upgrades.push(existing);
+            assets.push({
+                name: existing.name,
+                ...(existing.org ? { org: existing.org } : {}),
+                outcome: dependency ? 'upgraded-to-direct' : 'already-installed',
+                type: existing.type,
+                version: existing.version,
+            });
+        }
+        progress('Resolving dependencies...');
+        const plan = resolveMultipleInstallPlans(registry, toInstall.map(({ name, org, version }) => ({ name, ...(org ? { org } : {}), ...(version ? { version } : {}) })));
+        const installed = plan.entries
+            .filter((entry) => entry.reason === 'direct')
+            .map((entry) => ({
+            name: entry.asset.name,
+            ...(entry.asset.org ? { org: entry.asset.org } : {}),
+            outcome: 'installed',
+            type: entry.asset.type,
+            version: entry.version,
+        }));
+        const report = [...installed, ...assets];
+        const crossScope = (resolvedPlan, installedAt) => crossScopeOf(resolvedPlan, { installedAt, json: effectiveJson, scope: installScope, tools: toolNames });
+        // A dry run says so even when every name is in place, and writes nothing (not even an upgrade).
+        if (dryRun) {
+            return {
+                assets: report,
+                outcome: 'dry-run-install',
+                plan: withoutKeptDependencies(plan, currentLockfile, tools, {
+                    onProgress: progress,
+                    projectDir,
+                    scope: installScope,
+                }),
+                tools: toolNames,
+                ...(await crossScope(plan)),
+            };
+        }
+        return await withLockfileErrorHandling(projectDir, async () => {
+            const toolResults = plan.entries.length > 0
+                ? await executeInstallPlanForTools(plan, tools, {
+                    force,
+                    onProgress: progress,
+                    onTool: (toolName) => progress(`Installing for ${toolName}...`),
+                    pin,
+                    projectDir,
+                    scope: installScope,
+                })
+                : [];
+            // After the install, so a failed one leaves even the install reasons as they were.
+            if (upgrades.length > 0) {
+                let lockfile = await readLockfile(projectDir);
+                for (const { name, org, type } of upgrades)
+                    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)) };
+        });
+    }, [adopt, cliOrg, dryRun, force, pin, specs.join(' '), tool]);
+    if (state.status === 'loading') {
+        return _jsx(Spinner, { message: state.message });
+    }
+    if (state.status === 'error') {
+        if (effectiveJson) {
+            return renderJson({
+                ...(state.code ? { code: state.code } : {}),
+                ...(state.command ? { command: state.command } : {}),
+                ...(state.hint ? { hint: state.hint } : {}),
+                message: state.message,
+                outcome: 'error',
+                ...fields,
+            });
+        }
+        return _jsx(ErrorView, { command: state.command, hint: state.hint, message: state.message });
+    }
+    const { data } = state;
+    const label = resolved && scopeLabel(resolved);
+    if (effectiveJson) {
+        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: [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 ?? [] })] }));
+}
 /** `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 }) {
     return [
@@ -758,7 +937,7 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
                 ...fields,
             });
         }
-        return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: state.plan.totalCount, tools: state.tools, where: label }), _jsx(Text, { children: " " }), _jsx(Text, { children: _jsxs(Text, { bold: true, color: 'magenta', children: ["Org: @", orgName] }) }), _jsx(Text, { children: " " }), state.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)))), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] })] }));
+        return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: state.plan.totalCount, tools: state.tools, where: label }), _jsx(Text, { children: " " }), _jsx(Text, { children: _jsxs(Text, { bold: true, color: 'magenta', children: ["Org: @", orgName] }) }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: state.plan }), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] })] }));
     }
     if (state.phase === 'done') {
         if (effectiveJson) {
@@ -798,4 +977,17 @@ function membersOutsideBundle(lockfile, members, bundle) {
         return [{ ...(origin ? { bundle: origin } : {}), ...member }];
     });
 }
+/** The names a run of several left out of its plan: already installed, or made a direct install. */
+function NamedAssetLines({ assets, dryRun = false, where, }) {
+    const inScope = where ? ` in ${where}` : '';
+    return (_jsx(_Fragment, { children: assets
+            .filter((a) => a.outcome !== 'installed')
+            .map((a) => (_jsxs(Text, { children: [a.outcome === 'upgraded-to-direct' ? _jsx(Text, { color: 'green', children: "\u2713" }) : _jsx(Text, { color: 'yellow', children: "!" }), ' ', _jsx(Text, { bold: true, children: formatOrgName(a.org, a.name) }), " (v", a.version, ")", ' ', a.outcome === 'upgraded-to-direct'
+                    ? `${dryRun ? 'would become' : 'is now'} a direct install${inScope}.`
+                    : `is already installed${inScope}.`] }, identityKey(a)))) }));
+}
+/** 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)))) }));
+}
 //# sourceMappingURL=install.js.map