@iseoane/agent-depot 0.6.10 → 0.6.12

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.12] - 2026-11-09
+
+### Changed
+
+- Development only; the published CLI is unchanged. `pnpm test:single` maps test
+  paths on every shell, including Git Bash on Windows (#91); TUI tests no longer time
+  out on Windows (#90); local `pnpm test:e2e` on Windows skips its PTY journeys with
+  an explicit reason, as local end-to-end tests are Linux-only (#92).
+
+## [0.6.11] - 2026-11-08
+
+### Changed
+
+- The TUI Updates view is grouped by Source, with Packages and Skills below each
+  Source and Apps last. Groups start collapsed; `Enter` or `→`/`←` expand and
+  collapse them, and `space` on a group marks or clears all its rows (`[x]`, `[-]`,
+  `[ ]`). `u`, or `Enter` on a row, previews exactly the marked rows. `Enter` also
+  folds the "cannot be checked" line.
+- TUI Package labels always name their Source and never show a Source-root Package
+  as `.` or `name@.` (for example `…demo.git::claude#demo`); update results name the
+  Package's Source. CLI selection tokens are unchanged.
+- Profile export and import previews name a Source-root Package as `Package pi from …`
+  instead of `Package pi . from …`, and Package flow failure and approval reasons say
+  `pi from <source>` instead of `pi .`. Profile `--package` filters still accept the
+  previous spelling.
+
 ## [0.6.10] - 2026-11-06
 
 ### Changed

package/README.md

@@ -520,7 +520,7 @@ Keys per view (prompts also accept `Esc` to cancel and `y`/`n` to confirm):
 | Sources | `j`/`k` move through Git Sources and App recipes. `Enter` opens the Catalog for a Git Source or previews/approves an App recipe. Approval does not install the App. `n` adds a Git Source or guides recipe authoring; `r` refreshes Sources or reloads recipe status; `d` removes. `space`/`a` mark Git Sources only. Refresh previews show every selected Source; review every physical row before `y`. `n` cancels. |
 | Catalog | `Enter`/arrows expand and collapse, `space` marks the highlighted loose Skill, `a` marks or clears the visible loose Skills in its Source, and `i` starts installation for marked Skills or the highlighted Skill, Package, or verified-absent approved App. A Package opens the same paged panel as in Installations; confirm an App install separately with `y`. `/` filters and `s` widens a Source view to all Sources. Marks in other Sources remain unchanged; Skills hidden by the filter are not installed. |
 | Installations | `Enter`/arrows expand and collapse. On user-global rows, `u` starts an App or managed Skill uninstall, or removes an unmanaged Skill; project Skills cannot be removed. `h` or `i` adds Hosts to a user-global Skill installation, and `A` or `Enter` adopts an unmanaged Skill. `space` marks a leaf and `a` marks all visible leaves; bulk actions skip project installations with a reason. On an App row, `u` previews uninstall and `h` selects setup/teardown; changed recipes must be approved again before commands run. On a Package row, `i` previews the frozen install plan and runs it, approving the receipt first when it is missing; `Enter` approves the install declaration only, `U` updates, `u` uninstalls, and `f` forgets the selection record. Each of these opens its own panel, which pages when it is taller than the terminal: arrows or PageUp/PageDown move by a visible page, `j`/`k` by one row, and `Review N of M` with the row window shows where you are. `y` and `n` answer from any page. Package rows are not markable for bulk actions. |
-| Updates | `space` marks an update, `a` marks all available updates, and `t`/`p`/`g` selects all, project, or user-global scope. `Enter` previews the marked rows; `u` previews the selected batch; neither applies updates. `r` checks again, and left/right arrows fold or unfold the "cannot be checked" group. In a preview, arrows or PageUp/PageDown move by a visible page and `j`/`k` move one row. Review every row before `y`; `n` cancels. Unknown rows are informational. Packages and Apps are user-global only; Packages need action approval before update execution. |
+| Updates | Updates are grouped by Source, with Packages and Skills below each Source and Apps last; every group starts collapsed. `→`/`←` and `Enter` expand and collapse a group, and `←` on a row selects its group. `space` marks an update, or every available update in the highlighted group, even when it is collapsed. `a` marks all available updates, and `t`/`p`/`g` selects all, project, or user-global scope. `u` previews the marked rows from anywhere, and `Enter` on an update row does too; neither applies updates. `r` checks again, and `Enter` or `→`/`←` on the "cannot be checked" line fold or unfold it. In a preview, arrows or PageUp/PageDown move by a visible page and `j`/`k` move one row. Review every row before `y`; `n` cancels. Unknown rows are informational. Packages and Apps are user-global only; Packages need action approval before update execution. |
 | Profile | Press `e` to export or `i` to import. See [Profile workflow](#profile-workflow) for navigation, selection, previews, and cancellation. |
 
 ### Profile workflow

package/dist/src/cli.js

@@ -6,8 +6,8 @@ import path from "node:path";
 import { checkAppUpdates, createAppOperations } from "./app-flow.js";
 import { describeAppResult, describeManualCompletion, runAppCommand } from "./app-cli.js";
 import { createPackageOperations } from "./package-flow.js";
-import { describeLifecyclePlan, describePackageResult, describePackageUpdateCheck, formatPackageSelection, packageSelectionMatches, planWithRefresh, runPackageCommand } from "./package-cli.js";
-import { selectionKey } from "./package-model.js";
+import { describeLifecyclePlan, describePackageResult, describePackageUpdateCheck, packageSelectionMatches, planWithRefresh, runPackageCommand } from "./package-cli.js";
+import { formatPackageSelection, selectionKey } from "./package-model.js";
 import { EXPORT_USAGE, IMPORT_USAGE, runProfileExport, runProfileImport } from "./profile-cli.js";
 import { pathsOverlap } from "./path-safety.js";
 import { withChildOutput } from "./process-runner.js";

package/dist/src/package-cli.js

@@ -1,5 +1,5 @@
 import { sourceIdForUrl } from "./git-source.js";
-import { PACKAGE_HOSTS, bundleRoot, describeCoordinates, selectionKey } from "./package-model.js";
+import { PACKAGE_HOSTS, bundleRoot, describeCoordinates, describeSelectionCoordinate, displayRoot, formatPackageSelection, selectionKey, sourceToken } from "./package-model.js";
 import { NO_PROGRESS } from "./progress.js";
 import { projectSourceOf } from "./sources.js";
 import { CliUsageError } from "./usage-error.js";
@@ -76,9 +76,6 @@ export async function runPackageCommand(values, packages, sources, output, progr
 export function planWithRefresh(packages, selection, action, progress) {
     return progress.run(`Refreshing Source for Package ${formatPackageSelection(selection)}`, () => packages.planLifecycle(selection, action), { mayPrompt: true });
 }
-export function formatPackageSelection(selection) {
-    return `${sourceToken(selection.source)}::${describeSelectionCoordinate(selection)}`;
-}
 /**
  * The two spellings the CLI prints name the same selection: `discover` prints
  * the registered Source id, and `list` prints the Source's own token. Both are
@@ -295,12 +292,6 @@ function sourceMatchesToken(source, token) {
     }
     return source.kind === "git" && (source.url === token || sourceToken(projectSourceOf(source)) === token);
 }
-function sourceToken(source) {
-    if (source.kind === "builtin") {
-        return source.id;
-    }
-    return "url" in source ? source.url : source.path;
-}
 /** The registered Source id: derived for a Git Source, and its own token otherwise. */
 function sourceIdToken(source) {
     return "url" in source ? sourceIdForUrl(source.url) : sourceToken(source);
@@ -308,11 +299,6 @@ function sourceIdToken(source) {
 function formatDescriptorSelection(sourceId, descriptor) {
     return `${sourceId}::${describeSelectionCoordinate(descriptor.coordinates)}`;
 }
-function describeSelectionCoordinate(coordinates) {
-    return coordinates.host === "pi"
-        ? `pi:${displayRoot(coordinates.root)}`
-        : `claude:${displayRoot(coordinates.marketplaceRoot)}#${coordinates.pluginName}`;
-}
 function formatPackageRecord(record) {
     const verified = record.verified === undefined ? "unknown" : describeVersion(record.verified);
     return `Package ${formatPackageSelection(record.selection)}\tinstallId=${record.installId}\tverified=${verified}\tverifiedAt=${record.verifiedAt}`;
@@ -410,9 +396,6 @@ function packageResultSucceeded(result) {
     return result.status === "installed" || result.status === "updated" || result.status === "removed" ||
         result.status === "selected" || result.status === "forgotten";
 }
-function displayRoot(root) {
-    return root === "" ? "." : root;
-}
 function requireOptionValue(args, index, option) {
     const value = args[index];
     if (!value || value.startsWith("--")) {

package/dist/src/package-flow.js

@@ -7,7 +7,7 @@ import { sourceBundleScope } from "./package-content.js";
 import { affectedBy, classifyUpdate, claudeVersionUpdateNotice, hostInstallId, packageApprovalDigest, planHostSteps, PackagePlanError, } from "./package-host-plans.js";
 import { findInstalledBundle, readHostInstallView } from "./package-host-state.js";
 import { activeBundles as classifyActiveBundles, portableSkillConflicts, } from "./package-owned-skills.js";
-import { bundleRoot, describeCoordinates, selectionKey, } from "./package-model.js";
+import { bundleRoot, describePackageInSource, selectionKey, } from "./package-model.js";
 import { defaultPackageStateDirectory, PackageStateStore, } from "./package-state.js";
 import { runProcess } from "./process-runner.js";
 import { SourceStateStore } from "./source-state.js";
@@ -52,7 +52,7 @@ export function createPackageOperations(environment = {}) {
             return source;
         }
         if (sourceOperations.refreshProjectSource === undefined) {
-            throw new PackagePlanError(`Planning a Package lifecycle for ${describeCoordinates(selection)} requires a Source refresh, but this environment cannot refresh project Sources`);
+            throw new PackagePlanError(`Planning a Package lifecycle for ${describePackageInSource(selection)} requires a Source refresh, but this environment cannot refresh project Sources`);
         }
         return await sourceOperations.refreshProjectSource(selection.source);
     }
@@ -69,7 +69,7 @@ export function createPackageOperations(environment = {}) {
         const descriptor = discoverBundlesInSnapshot(files, sourceBundleScope(source))
             .find((candidate) => sameCoordinates(candidate.coordinates, coordinates));
         if (descriptor === undefined) {
-            throw new PackagePlanError(`Source ${JSON.stringify(source.id)} no longer provides a ${selection.host} Package at ${JSON.stringify(bundleRoot(coordinates))}`);
+            throw new PackagePlanError(`Source ${JSON.stringify(source.id)} no longer provides a ${selection.host} Package ${bundleRoot(coordinates) === "" ? "at its root" : `at ${JSON.stringify(bundleRoot(coordinates))}`}`);
         }
         const resolvedCommit = await readResolvedCommit(source);
         const available = availableEvidence(descriptor, resolvedCommit);
@@ -222,7 +222,7 @@ export function createPackageOperations(environment = {}) {
         switch (context.action) {
             case "install": {
                 if (observed.kind !== "installed") {
-                    return { status: "failed", reason: `The host does not report ${describeCoordinates(context.selection)} installed (${describeEvidence(observed)})` };
+                    return { status: "failed", reason: `The host does not report ${describePackageInSource(context.selection)} installed (${describeEvidence(observed)})` };
                 }
                 const contradiction = pinContradiction(context.selection, observed);
                 if (contradiction !== undefined) {
@@ -233,7 +233,7 @@ export function createPackageOperations(environment = {}) {
             }
             case "update": {
                 if (observed.kind !== "installed") {
-                    return { status: "failed", reason: `The update left no installed ${describeCoordinates(context.selection)} (${describeEvidence(observed)})` };
+                    return { status: "failed", reason: `The update left no installed ${describePackageInSource(context.selection)} (${describeEvidence(observed)})` };
                 }
                 const contradiction = pinContradiction(context.selection, observed);
                 if (contradiction !== undefined) {
@@ -262,7 +262,7 @@ export function createPackageOperations(environment = {}) {
             }
             case "uninstall": {
                 if (observed.kind !== "absent") {
-                    return { status: "failed", reason: `The host still reports ${describeCoordinates(context.selection)} (${describeEvidence(observed)})` };
+                    return { status: "failed", reason: `The host still reports ${describePackageInSource(context.selection)} (${describeEvidence(observed)})` };
                 }
                 await state.drop(context.selection);
                 return Object.freeze({ status: "removed" });
@@ -343,7 +343,7 @@ export function createPackageOperations(environment = {}) {
                 return Object.freeze({ status: "stale plan", reason: difference });
             }
             if (await state.approvalStatus(fresh.digest) !== "approved") {
-                throw new PackagePlanError(`The ${plan.action} plan for ${describeCoordinates(plan.selection)} is not approved; review it and approve the current declaration first`);
+                throw new PackagePlanError(`The ${plan.action} plan for ${describePackageInSource(plan.selection)} is not approved; review it and approve the current declaration first`);
             }
             const previous = findInstalledBundle(await readHostView(), fresh.plan.descriptor, plan.selection);
             const context = contextFromDerived(fresh, plan.action, previous);
@@ -586,7 +586,7 @@ function pinContradiction(selection, observed) {
     if (verdict.kind !== "contradicted") {
         return undefined;
     }
-    return `The host reports ${describeCoordinates(selection)} ${describeEvidence(observed)}, which contradicts the fixed pin ${JSON.stringify(verdict.pin)}`;
+    return `The host reports ${describePackageInSource(selection)} ${describeEvidence(observed)}, which contradicts the fixed pin ${JSON.stringify(verdict.pin)}`;
 }
 /**
  * The record's `verified` field is a claim about the host, so it derives from the

package/dist/src/package-model.js

@@ -20,6 +20,57 @@ export function describeCoordinates(coordinates) {
         ? `pi ${at(coordinates.root)}`
         : `claude ${coordinates.pluginName}@${at(coordinates.marketplaceRoot)}`;
 }
+/**
+ * Like `describeCoordinates` for text that already names the Source: a bundle at the Source root
+ * omits its root instead of showing `.`. Display only; `--package` filters keep `describeCoordinates`.
+ */
+export function describeBundleInSource(coordinates) {
+    return coordinates.host === "pi"
+        ? `pi${coordinates.root === "" ? "" : ` ${coordinates.root}`}`
+        : `claude ${coordinates.pluginName}${coordinates.marketplaceRoot === "" ? "" : `@${coordinates.marketplaceRoot}`}`;
+}
+/** Host, root and Source in prose. Unlike `formatPackageSelection` it cannot be mistaken for a CLI token. */
+export function describePackageInSource(selection) {
+    return `${describeBundleInSource(selection)} from ${sourceToken(selection.source)}`;
+}
+/** The token the CLI prints for a Source: the built-in id, the URL or the local path. */
+export function sourceToken(source) {
+    if (source.kind === "builtin") {
+        return source.id;
+    }
+    return "url" in source ? source.url : source.path;
+}
+/** A root-level bundle shows its root as `.`. */
+export function displayRoot(root) {
+    return root === "" ? "." : root;
+}
+/** `pi:<root>` or `claude:<root>#<plugin>`. */
+export function describeSelectionCoordinate(coordinates) {
+    return coordinates.host === "pi"
+        ? `pi:${displayRoot(coordinates.root)}`
+        : `claude:${displayRoot(coordinates.marketplaceRoot)}#${coordinates.pluginName}`;
+}
+/** Coordinates qualified by the Source they live in, so equal roots of different Sources stay apart. */
+export function formatPackageCoordinates(source, coordinates) {
+    return `${sourceToken(source)}::${describeSelectionCoordinate(coordinates)}`;
+}
+/**
+ * The TUI spelling of coordinates: like the CLI's, but a bundle at the Source root omits its root
+ * segment instead of showing `.`. Display only; the CLI keeps `formatPackageCoordinates`.
+ */
+export function displayPackageCoordinates(source, coordinates) {
+    const root = bundleRoot(coordinates);
+    const at = root === "" ? "" : `:${root}`;
+    return `${sourceToken(source)}::${coordinates.host === "pi" ? `pi${at}` : `claude${at}#${coordinates.pluginName}`}`;
+}
+/** The TUI spelling of a selection. */
+export function displayPackageSelection(selection) {
+    return displayPackageCoordinates(selection.source, selection);
+}
+/** The CLI spelling of a selection. */
+export function formatPackageSelection(selection) {
+    return formatPackageCoordinates(selection.source, selection);
+}
 /**
  * The stable selection identity. Derived from the Source and the coordinates
  * only, so a bundle rename (its manifest name or version) does not move the

package/dist/src/profile-export.js

@@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises";
 import path from "node:path";
 import { loadAppOwnedSkillFilter } from "./app-owned-skills.js";
 import { sourceIdForUrl } from "./git-source.js";
-import { bundleRoot, describeCoordinates } from "./package-model.js";
+import { bundleRoot, describeBundleInSource, describeCoordinates } from "./package-model.js";
 import { AGENT_DEPOT_PACKAGE_VERSION } from "./project-manifest.js";
 import { parseProfile, PROFILE_FORMAT, PROFILE_FORMAT_V2, serializeProfile } from "./profile.js";
 import { formatVersionPolicy } from "./skill-install.js";
@@ -33,7 +33,7 @@ export function packageFilterNames(selection) {
 }
 /** One Package line, shared by the export preview and the import plan label. */
 export function describeProfilePackage(selection) {
-    return `Package ${describeCoordinates(selection)} from ${profileSourceIdentity(selection.source)} (${formatVersionPolicy(selection.version)}; saved selection)`;
+    return `Package ${describeBundleInSource(selection)} from ${profileSourceIdentity(selection.source)} (${formatVersionPolicy(selection.version)}; saved selection)`;
 }
 export function describeProfileSkill(skill) {
     return `Skill ${skill.path} from ${profileSourceIdentity(skill.source)} (${skill.version.policy})`;
@@ -42,7 +42,7 @@ export function describeProfileReplica(replica) {
     switch (replica.kind) {
         case "skill": return `Installed Skill ${replica.path} from ${profileSourceIdentity(replica.source)}`;
         case "app": return `Installed App ${replica.name} (${replica.platform ?? "all platforms"})`;
-        case "package": return `Installed Package ${describeCoordinates(replica.selection)} from ${profileSourceIdentity(replica.selection.source)}`;
+        case "package": return `Installed Package ${describeBundleInSource(replica.selection)} from ${profileSourceIdentity(replica.selection.source)}`;
     }
 }
 export function profileSourceIdentity(source) {

package/dist/src/profile-import.js

@@ -4,7 +4,7 @@ import { homedir } from "node:os";
 import path from "node:path";
 import { compareAppVersions } from "./app-version.js";
 import { canonicalizeGitSourceUrl, sourceIdForUrl } from "./git-source.js";
-import { describeCoordinates, selectionKey } from "./package-model.js";
+import { describeBundleInSource, selectionKey } from "./package-model.js";
 import { describeProfilePackage, describeProfileReplica, packageFilterNames, profileSourceIdentity, selectProfileItems } from "./profile-export.js";
 import { parseProfile, PROFILE_FORMAT } from "./profile.js";
 import { AGENT_DEPOT_PACKAGE_VERSION } from "./project-manifest.js";
@@ -128,7 +128,7 @@ function classifySkill(value, skills, { showPath = false, showSource = false } =
 function classifyPackage(value, recorded) {
     const existing = recorded.find(record => selectionKey(record.selection) === selectionKey(value));
     const result = comparison(existing === undefined ? undefined : { version: existing.selection.version }, { version: value.version });
-    const thing = `Package ${describeCoordinates(value)} from ${profileSourceIdentity(value.source)} (${formatVersionPolicy(value.version)})`;
+    const thing = `Package ${describeBundleInSource(value)} from ${profileSourceIdentity(value.source)} (${formatVersionPolicy(value.version)})`;
     return { block: "packages", value, label: describeProfilePackage(value), group: groupOf(value.source), ...result,
         summary: summarize(result.status, thing, `Select ${thing}`, "reason" in result ? result.reason : undefined) };
 }

package/dist/src/tui/app.js

@@ -21,7 +21,7 @@ function hintsOf(view, catalogFocusedOnSource) {
         case "profile":
             return "e export · i import · q quit";
         case "updates":
-            return "j/k move · space mark · a all · Enter preview · u update · r check again · q quit";
+            return "j/k move · space mark · a all · Enter expand · u update · r check again · q quit";
     }
 }
 export function Header({ view, columns }) {

package/dist/src/tui/installations.js

@@ -46,7 +46,7 @@ export function homeOf(environment) {
 function projectRootOf(environment) {
     return path.resolve(environment.projectRoot ?? process.cwd());
 }
-function sourceLabel(source) {
+export function sourceLabel(source) {
     if (source.kind === "builtin")
         return source.id;
     return "url" in source ? `${source.url}${source.ref === undefined ? "" : `@${source.ref}`}` : source.path;

package/dist/src/tui/package-actions.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { describeCoordinates } from "../package-model.js";
+import { displayPackageSelection } from "../package-model.js";
 import { errorText } from "./batch.js";
 import { movePreviewCursor } from "./mode-keys.js";
 import { installedEvidenceLabel, packagePlanLines } from "./package-rows.js";
@@ -41,7 +41,7 @@ export async function startPackageAction(context, target, input) {
                     target,
                     lines: [
                         `Package: ${target.name} (${target.selection.host})`,
-                        `Coordinates: ${describeCoordinates(target.selection)}`,
+                        `Coordinates: ${displayPackageSelection(target.selection)}`,
                         `Installed: ${installedEvidenceLabel(inspection.installed)}`,
                         "Forgetting drops the Agent Depot selection record only; the host install is left as it is and no host command runs.",
                     ],

package/dist/src/tui/package-rows.js

@@ -1,5 +1,5 @@
 import { classifyUpdate } from "../package-host-plans.js";
-import { describeCoordinates, } from "../package-model.js";
+import { displayPackageCoordinates, displayPackageSelection, } from "../package-model.js";
 /** Version evidence as a short label; `unknown` when the host or the bundle states none. */
 export function packageVersionLabel(evidence, commit) {
     if (evidence === undefined)
@@ -52,7 +52,7 @@ export function recordedVersionLabel(record) {
 export function packageRow(record, inspection) {
     return {
         selection: record.selection,
-        name: inspection.descriptor?.name ?? describeCoordinates(record.selection),
+        name: inspection.descriptor?.name ?? displayPackageSelection(record.selection),
         installed: installedEvidenceLabel(inspection.installed),
         ...(inspection.installed.kind === "installed" && inspection.installed.version !== undefined
             ? { installedVersion: versionWithCommit(inspection.installed.version, inspection.installed.commit) }
@@ -90,7 +90,7 @@ export function packagePlanLines(plan, approval) {
     return [
         `Environment: ${plan.environment}`,
         `Package: ${descriptor.name} (${selection.host}) ${plan.action}`,
-        `Coordinates: ${describeCoordinates(selection)}`,
+        `Coordinates: ${displayPackageSelection(selection)}`,
         `Origin: manifest ${plan.origin.manifestDigest.slice(0, 12)}${plan.origin.resolvedCommit === undefined ? "" : `  commit ${plan.origin.resolvedCommit.slice(0, 7)}`}`,
         `Available: ${packageVersionLabel(descriptor.version)}`,
         `Components (${descriptor.components.length}):`,
@@ -101,7 +101,7 @@ export function packagePlanLines(plan, approval) {
                 `Step ${position + 1} (${command.purpose}): ${JSON.stringify([command.executable, ...command.args])}`,
                 `Executable: ${command.resolvedPath ?? command.executable}`,
             ])),
-        `Blast radius: ${plan.affects.map(describeCoordinates).join(", ")}`,
+        `Blast radius: ${plan.affects.map((coordinates) => displayPackageCoordinates(selection.source, coordinates)).join(", ")}`,
         `Working directory: ${plan.cwd}`,
         `Approval: ${approval === "approved" ? "approved" : "needs approval"}`,
         ...plan.warnings.map((warning) => `Warning: ${warning}`),

package/dist/src/tui/updates-keys.js

@@ -1,3 +1,5 @@
+import { collapseOrParent, expandNode, toggleNode } from "./tree.js";
+import { toggleGroup } from "./updates-tree.js";
 import { answerYesNo, movePreviewCursor } from "./mode-keys.js";
 import { busy } from "./working-model.js";
 import { pageStep } from "./window.js";
@@ -18,14 +20,14 @@ function moveCursorKey(context, snapshot, input, key) {
         return false;
     return true;
 }
-/** Space toggles the highlighted update, `a` selects them all. */
+/** Space toggles the highlighted update or every update of the highlighted group, `a` selects them all. */
 function selectKey(context, snapshot, input) {
     if (input === " ") {
         const entry = snapshot.entries[snapshot.at];
-        if (entry?.kind !== "update")
-            return true;
-        const checked = context.checked();
-        context.setChecked(checked.includes(entry.row.key) ? checked.filter((id) => id !== entry.row.key) : [...checked, entry.row.key]);
+        if (entry?.kind === "group")
+            context.setChecked(toggleGroup(context.checked(), entry.leafKeys));
+        else if (entry?.kind === "update")
+            context.setChecked(toggleGroup(context.checked(), [entry.row.key]));
     }
     else if (input === "a")
         context.setChecked(snapshot.updatable.map((row) => row.key));
@@ -33,21 +35,38 @@ function selectKey(context, snapshot, input) {
         return false;
     return true;
 }
-/** Right/left unfold and fold the "cannot be checked" rows; Enter toggles the fold or previews the selection. */
+/** Moves to the group above the highlighted line, or stays when there is none. */
+function selectParent(context, snapshot, parentId) {
+    const parent = snapshot.entries.findIndex((entry) => entry.kind !== "summary" && entry.kind !== "unknown" && entry.line.node.id === parentId);
+    if (parent >= 0)
+        context.setCursor(parent);
+}
+/** Right/left expand and collapse groups and the "cannot be checked" rows; Enter does the same on a line that is not an update. */
 function foldKey(context, snapshot, key) {
     const entry = snapshot.entries[snapshot.at];
     if (key.rightArrow) {
-        if (entry?.kind === "summary")
+        if (entry?.kind === "group")
+            context.setExpanded(expandNode(context.expanded(), entry.line));
+        else if (entry?.kind === "summary")
             context.setShowUnknown(true);
     }
     else if (key.leftArrow) {
-        if (entry?.kind === "unknown")
-            context.setCursor(snapshot.updatable.length);
-        if (entry?.kind === "summary" || entry?.kind === "unknown")
+        if (entry?.kind === "group" || entry?.kind === "update") {
+            const next = collapseOrParent(context.expanded(), [entry.line], 0);
+            context.setExpanded(next.expanded);
+            if (next.selectedId !== entry.line.node.id)
+                selectParent(context, snapshot, entry.line.parentId);
+        }
+        else if (entry?.kind === "summary" || entry?.kind === "unknown") {
+            if (entry.kind === "unknown")
+                context.setCursor(snapshot.entries.findIndex((candidate) => candidate.kind === "summary"));
             context.setShowUnknown(false);
+        }
     }
     else if (key.return) {
-        if (entry?.kind === "summary")
+        if (entry?.kind === "group")
+            context.setExpanded(toggleNode(context.expanded(), entry.line));
+        else if (entry?.kind === "summary")
             context.setShowUnknown(!context.unknownShown());
         else if (entry?.kind !== "unknown" && snapshot.data)
             context.startPreview();

package/dist/src/tui/updates-model.js

@@ -1,6 +1,16 @@
+import { buildUpdateTree } from "./updates-tree.js";
+import { flattenVisible } from "./tree.js";
 export const REFRESHING = "Refreshing sources…";
 export const CHECKING = "Checking for updates…";
 export const PHASE_LABEL = { refreshing: REFRESHING, checking: CHECKING };
+/** A stable React key: tree lines use their node id, the others their own identity. */
+export function entryId(entry) {
+    switch (entry.kind) {
+        case "summary": return "summary";
+        case "unknown": return `unknown:${entry.row.key}`;
+        default: return entry.line.node.id;
+    }
+}
 /** Names the reasons worth knowing before expanding the collapsed "cannot be checked" row. */
 export function describeUnknownReasons(rows) {
     const newer = rows.filter((row) => /^installed by a newer agent depot/i.test(row.reason)).length;
@@ -14,14 +24,16 @@ export function describeUnknownReasons(rows) {
     return parts.length === 0 ? "" : ` (${parts.join(", ")})`;
 }
 const matchesScope = (row, filter) => filter === "all" || row.scope === filter;
-/** The rows the list shows for a scope filter and fold state, and the cursor positions they make up. */
-export function viewOf(data, scope, showUnknown) {
+/** The rows the list shows for a scope filter and fold states, and the cursor positions they make up. */
+export function viewOf(data, scope, showUnknown, expanded) {
     const shown = (data?.rows ?? []).filter((row) => matchesScope(row, scope));
     const updatable = shown.filter((row) => row.status === "update available");
     const unknown = shown.filter((row) => row.status === "cannot assess");
     const upToDate = shown.filter((row) => row.status === "up to date").length;
     const entries = [
-        ...updatable.map((row) => ({ kind: "update", row })),
+        ...flattenVisible(buildUpdateTree(updatable), expanded).map((line) => line.node.data.kind === "group"
+            ? { kind: "group", line, label: line.node.data.label, leafKeys: line.node.data.leafKeys }
+            : { kind: "update", line, row: line.node.data.row }),
         ...(unknown.length > 0 ? [{ kind: "summary" }] : []),
         ...(unknown.length > 0 && showUnknown ? unknown.map((row) => ({ kind: "unknown", row })) : []),
     ];

package/dist/src/tui/updates-panel.js

@@ -5,6 +5,7 @@ import { BorderPanel, FieldLine, PreviewConfirm } from "./panel-parts.js";
 import { previewViewport } from "./preview-window.js";
 import { describeRefresh, describeUnknownReasons } from "./updates-model.js";
 import { formatAgo, previewLineText } from "./updates.js";
+import { groupCheckState, packageLeafLabel } from "./updates-tree.js";
 import { updateModePreviewChrome, updateModePreviewLines, updateModeQuestion } from "./updates-preview.js";
 function updateResultField(line, defaultOk) {
     if (line.startsWith("Update summary: ")) {
@@ -26,19 +27,24 @@ export function CheckStatus({ data, now }) {
     const errors = data.results.filter((result) => result.error !== undefined);
     return (_jsxs(BorderPanel, { title: "Update check", children: [_jsxs(Text, { color: theme.field, children: ["checked ", _jsx(Text, { color: theme.value, children: formatAgo(now - data.checkedAt) }), _jsx(Text, { color: theme.legend, children: " \u00B7 " }), _jsx(Text, { color: theme.value, children: describeRefresh(data) })] }), data.refresh.failed.map((failure) => (_jsxs(Text, { children: [_jsx(Text, { color: theme.warning, children: "[WARN] " }), _jsx(FieldLine, { label: "Refresh failed for", value: `${failure.source}: ${failure.reason}` })] }, failure.source))), data.appError ? _jsxs(Text, { children: [_jsx(Text, { color: theme.error, children: "[FAIL] " }), _jsx(FieldLine, { label: "Error (Apps):", value: data.appError })] }) : null, data.rows.filter(row => row.kind === "package" && row.check.status === "current" && row.check.reason !== undefined).map(row => (_jsxs(Text, { color: theme.warning, children: [row.path, ": ", row.reason] }, row.key))), data.packageError ? _jsxs(Text, { children: [_jsx(Text, { color: theme.error, children: "[FAIL] " }), _jsx(FieldLine, { label: "Error (Packages):", value: data.packageError })] }) : null, errors.map((result) => _jsxs(Text, { children: [_jsx(Text, { color: theme.error, children: "[FAIL] " }), _jsx(FieldLine, { label: `Error (${result.scope}):`, value: result.error ?? "" })] }, result.scope))] }));
 }
+const BOX = { all: "[x]", some: "[-]", none: "[ ]" };
 /** One line of the list: an update, the fold of unassessable items, or one of those when unfolded. */
 export function EntryLine({ entry, selected, checked, view, showUnknown }) {
     const cursor = selected ? "> " : "  ";
     if (entry.kind === "summary") {
         return (_jsxs(Text, { ...rowStyle(selected), color: theme.inactive, children: [cursor, view.unknown.length, " cannot be checked ", showUnknown ? "▾" : "▸", describeUnknownReasons(view.unknown)] }));
     }
+    if (entry.kind === "group") {
+        const state = groupCheckState(entry.leafKeys, checked);
+        return (_jsxs(Text, { ...rowStyle(selected), children: [cursor, "  ".repeat(entry.line.depth), BOX[state], " ", _jsxs(Text, { color: theme.field, children: [entry.line.expanded ? "▾" : "▸", " ", entry.label] })] }));
+    }
     const { row } = entry;
     if (entry.kind === "unknown") {
         return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { ...rowStyle(selected), children: [cursor, "    ", _jsx(Text, { color: theme.field, children: row.path }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.scope })] }), _jsxs(Text, { color: theme.muted, children: ["        ", row.kind === "package" && /local modifications|local changes/i.test(row.reason)
                             ? `Update comparison unavailable: ${row.reason}`
                             : row.reason] })] }));
     }
-    return (_jsxs(Text, { ...rowStyle(selected), children: [cursor, checked ? "[x]" : "[ ]", " ", _jsx(Text, { color: theme.field, children: row.path }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.scope }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.policy }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.value, children: row.installed }), _jsx(Text, { color: theme.legend, children: " -> " }), _jsx(Text, { color: theme.value, children: row.available })] }));
+    return (_jsxs(Text, { ...rowStyle(selected), children: [cursor, "  ".repeat(entry.line.depth), BOX[checked.includes(row.key) ? "all" : "none"], " ", _jsx(Text, { color: theme.field, children: packageLeafLabel(row) }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.scope }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.policy }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.value, children: row.installed }), _jsx(Text, { color: theme.legend, children: " -> " }), _jsx(Text, { color: theme.value, children: row.available })] }));
 }
 /** Under the list: the window indicator, what is up to date or selected, and the last result. */
 export function UpdatesFooter({ indicator, upToDate, updatableCount, checkedCount, message }) {

package/dist/src/tui/updates-tree.js

@@ -0,0 +1,51 @@
+import { bundleRoot } from "../package-model.js";
+import { groupUpdates } from "../update-groups.js";
+import { sourceLabel } from "./installations.js";
+function grouped(row) {
+    if (row.kind === "app")
+        return { kind: "app", row };
+    const source = row.kind === "skill" ? row.item.selection.source : row.check.installed.selection.source;
+    const label = sourceLabel(source);
+    return { kind: row.kind, source: { id: label, label }, row };
+}
+// Node ids stay stable across reloads, and keys and Source labels hold paths and URLs, so they are encoded.
+const leaf = (row) => ({ id: `update:${encodeURIComponent(row.key)}`, data: { kind: "update", row } });
+function group(id, name, leaves, children = leaves) {
+    const leafKeys = leaves.flatMap((node) => (node.data.kind === "update" ? [node.data.row.key] : node.data.leafKeys));
+    return { id, data: { kind: "group", label: `${name} (${leafKeys.length})`, leafKeys }, children };
+}
+/** Source groups with Packages and Skills below them, then Apps; built from the updatable rows only. */
+export function buildUpdateTree(rows) {
+    const { sources, apps } = groupUpdates(rows.map(grouped));
+    const nodes = sources.map(({ source, subgroups }) => {
+        const id = `source:${encodeURIComponent(source.id)}`;
+        const children = subgroups.map(({ kind, items }) => group(`${id}:${kind}`, kind === "packages" ? "Packages" : "Skills", items.map((item) => leaf(item.row))));
+        return group(id, source.label, children);
+    });
+    if (apps.length > 0)
+        nodes.push(group("apps", "Apps", apps.map((item) => leaf(item.row))));
+    return nodes;
+}
+/** Whether all, some or none of a group's rows are selected. */
+export function groupCheckState(leafKeys, checked) {
+    const count = leafKeys.filter((key) => checked.includes(key)).length;
+    if (count === 0)
+        return "none";
+    return count === leafKeys.length ? "all" : "some";
+}
+/** Space on a group: selects all its rows unless they all are, then unselects them; other rows are untouched. */
+export function toggleGroup(checked, leafKeys) {
+    if (groupCheckState(leafKeys, checked) === "all")
+        return checked.filter((key) => !leafKeys.includes(key));
+    return [...checked, ...leafKeys.filter((key) => !checked.includes(key))];
+}
+/** A Package row inside its Source group: the bundle name, plus its path only when it is not the Source root. */
+export function packageLeafLabel(row) {
+    if (row.kind !== "package")
+        return row.path;
+    const selection = row.check.installed.selection;
+    const root = bundleRoot(selection);
+    // A Pi bundle has no plugin name, so its directory names it; at the Source root only the host is left.
+    const name = selection.host === "claude" ? selection.pluginName : root.split("/").pop() || "pi package";
+    return `Package: ${name}${root === "" ? "" : `  ${root}`}`;
+}

package/dist/src/tui/updates-view.js

@@ -5,10 +5,11 @@ import { theme } from "./theme.js";
 import { previewViewport } from "./preview-window.js";
 import { computeWindow, useListHeight } from "./window.js";
 import { BROWSE } from "./updates-mode.js";
+import { defaultExpanded } from "./tree.js";
 import { useMirrored } from "./view-state.js";
 import { useUpdatesFlow } from "./updates-flow.js";
 import { handleUpdatesKey } from "./updates-keys.js";
-import { viewOf } from "./updates-model.js";
+import { entryId, viewOf } from "./updates-model.js";
 import { CheckStatus, EntryLine, ModePanel, UpdatesFooter } from "./updates-panel.js";
 import { previewLineText } from "./updates.js";
 import { updateModePreviewChrome, updateModePreviewLines } from "./updates-preview.js";
@@ -26,6 +27,7 @@ export function UpdatesView({ operations, environment, onCapturingChange, listHe
     const [scope, scopeRef, setScope] = useMirrored("all");
     const [cursor, cursorRef, setCursor] = useMirrored(0);
     const [showUnknown, showUnknownRef, setShowUnknown] = useMirrored(false);
+    const [expanded, expandedRef, setExpanded] = useMirrored(defaultExpanded());
     const [checked, checkedRef, setChecked] = useMirrored([]);
     const [mode, setModeState] = useState(BROWSE);
     // Mirrors the mode synchronously so later keystrokes and the shell never see stale state.
@@ -52,7 +54,7 @@ export function UpdatesView({ operations, environment, onCapturingChange, listHe
     const dataRef = useRef(undefined);
     /** The list, the cursor and the fold as of the latest keystroke. */
     const latest = () => {
-        const view = viewOf(dataRef.current, scopeRef.current, showUnknownRef.current);
+        const view = viewOf(dataRef.current, scopeRef.current, showUnknownRef.current, expandedRef.current);
         return { ...view, data: dataRef.current, at: Math.min(cursorRef.current, Math.max(view.entries.length - 1, 0)) };
     };
     const changeScope = (next) => {
@@ -77,7 +79,7 @@ export function UpdatesView({ operations, environment, onCapturingChange, listHe
     }, [load]);
     const data = state.status === "ready" ? state.data : undefined;
     dataRef.current = data;
-    const { shown, updatable, unknown, upToDate, entries } = viewOf(data, scope, showUnknown);
+    const { shown, updatable, unknown, upToDate, entries } = viewOf(data, scope, showUnknown, expanded);
     const index = Math.min(cursor, Math.max(entries.length - 1, 0));
     const previewGeometry = (current) => {
         const cursor = "cursor" in current ? current.cursor : 0;
@@ -95,6 +97,8 @@ export function UpdatesView({ operations, environment, onCapturingChange, listHe
         checked: () => checkedRef.current,
         setChecked,
         setCursor,
+        expanded: () => expandedRef.current,
+        setExpanded,
         unknownShown: () => showUnknownRef.current,
         setShowUnknown,
         changeScope,
@@ -115,5 +119,5 @@ export function UpdatesView({ operations, environment, onCapturingChange, listHe
     const showingBrowse = mode.kind === "browse";
     // One indicator for the whole operation: a check's own phase label, else the busy mode's.
     const working = state.status === "loading" ? state : mode.kind === "busy" ? mode : undefined;
-    return (_jsxs(Box, { flexDirection: "column", children: [showingBrowse ? _jsxs(Text, { color: theme.title, bold: true, children: ["Updates (scope: ", scope, ")  t all \u00B7 p project \u00B7 g user-global \u00B7 u update"] }) : null, working ? _jsx(BorderPanel, { title: state.status === "loading" ? "Update check" : "Updates", children: _jsx(Working, { label: working.label, since: working.startedAt, now: clock }) }) : null, showingBrowse && data ? _jsx(CheckStatus, { data: data, now: clock() }) : null, showingBrowse && data && !hasErrors && shown.length === 0 ? _jsx(Text, { children: "No installations" }) : null, showingBrowse ? entries.slice(window.start, window.end).map((entry, offset) => (_jsx(EntryLine, { entry: entry, selected: window.start + offset === index, checked: entry.kind === "update" && checked.includes(entry.row.key), view: view, showUnknown: showUnknown }, entry.kind === "summary" ? "summary" : entry.row.key))) : null, showingBrowse ? _jsx(UpdatesFooter, { indicator: window.indicator, upToDate: upToDate, updatableCount: updatable.length, checkedCount: checked.length, message: message }) : null, _jsx(ModePanel, { mode: mode })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [showingBrowse ? _jsxs(Text, { color: theme.title, bold: true, children: ["Updates (scope: ", scope, ")  t all \u00B7 p project \u00B7 g user-global \u00B7 u update"] }) : null, working ? _jsx(BorderPanel, { title: state.status === "loading" ? "Update check" : "Updates", children: _jsx(Working, { label: working.label, since: working.startedAt, now: clock }) }) : null, showingBrowse && data ? _jsx(CheckStatus, { data: data, now: clock() }) : null, showingBrowse && data && !hasErrors && shown.length === 0 ? _jsx(Text, { children: "No installations" }) : null, showingBrowse ? entries.slice(window.start, window.end).map((entry, offset) => (_jsx(EntryLine, { entry: entry, selected: window.start + offset === index, checked: checked, view: view, showUnknown: showUnknown }, entryId(entry)))) : null, showingBrowse ? _jsx(UpdatesFooter, { indicator: window.indicator, upToDate: upToDate, updatableCount: updatable.length, checkedCount: checked.length, message: message }) : null, _jsx(ModePanel, { mode: mode })] }));
 }

package/dist/src/tui/updates.js

@@ -1,5 +1,5 @@
 import { checkAppUpdates, createAppOperations } from "../app-flow.js";
-import { describeCoordinates, selectionKey } from "../package-model.js";
+import { displayPackageSelection, selectionKey } from "../package-model.js";
 import { formatVersionPolicy } from "../skill-install.js";
 import { applyConfirmedUpdates, describeUpdatePreview, loadUpdates, previewUpdateCandidates, readScopeInstallations, } from "../update-flow.js";
 import { packageOperationsOf } from "./environment.js";
@@ -139,7 +139,7 @@ export async function loadUpdateRows(operations, environment, options) {
             key: `package:${selectionKey(check.installed.selection)}`,
             scope: "user-global",
             check,
-            path: `Package: ${describeCoordinates(check.installed.selection)}`,
+            path: `Package: ${displayPackageSelection(check.installed.selection)}`,
             policy: formatVersionPolicy(check.installed.selection.version),
             installed: check.observed === undefined
                 ? `${recordedVersionLabel(check.installed)} (recorded)`
@@ -277,7 +277,7 @@ export async function runUpdates(prepared, confirmedPaths, confirmManual) {
         }
     }
     for (const { plan, approval } of prepared.packagePlans ?? []) {
-        const name = `Package: ${plan.descriptor.name} (${plan.selection.host})`;
+        const name = `Package: ${plan.descriptor.name} (${plan.selection.host}) from ${displayPackageSelection(plan.selection)}`;
         try {
             const packages = prepared.packages;
             if (!packages)

package/dist/src/update-groups.js

@@ -0,0 +1,29 @@
+// Code-unit order, so Linux and Windows agree whatever the locale.
+const compare = (left, right) => (left < right ? -1 : left > right ? 1 : 0);
+/** Groups updates by Source, then by Packages and Skills, with Apps apart. */
+export function groupUpdates(items) {
+    const bySource = new Map();
+    const apps = [];
+    for (const item of items) {
+        if (item.kind === "app") {
+            apps.push(item);
+            continue;
+        }
+        let group = bySource.get(item.source.id);
+        if (group === undefined) {
+            group = { source: item.source, packages: [], skills: [] };
+            bySource.set(item.source.id, group);
+        }
+        (item.kind === "package" ? group.packages : group.skills).push(item);
+    }
+    const sources = [...bySource.values()]
+        .sort((left, right) => compare(left.source.label, right.source.label) || compare(left.source.id, right.source.id))
+        .map(({ source, packages, skills }) => ({
+        source,
+        subgroups: [
+            ...(packages.length > 0 ? [{ kind: "packages", items: packages }] : []),
+            ...(skills.length > 0 ? [{ kind: "skills", items: skills }] : []),
+        ],
+    }));
+    return { sources, apps };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iseoane/agent-depot",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "A cross-platform catalog for reusable coding-agent skills.",
   "license": "MIT",
   "author": "iseoane",
@@ -74,7 +74,7 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint \"src/**/*.{ts,tsx}\" \"resources/pi/**/*.{ts,tsx}\" \"tests/**/*.{ts,tsx}\"",
     "test": "pnpm build && node --test --import ./dist/tests/isolated-env.js \"dist/tests/*.test.js\"",
-    "test:single": "pnpm build && node -e \"const { spawnSync } = require('node:child_process'); const input = process.argv[1] || 'tests/version.test.ts'; const file = input.replace(/^tests[\\\\/]/, 'dist/tests/').replace(/\\\\.tsx?$/i, '.js'); process.exit(spawnSync(process.execPath, ['--import', './dist/tests/isolated-env.js', '--test', file], { stdio: 'inherit' }).status ?? 1);\"",
+    "test:single": "pnpm build && node scripts/test-single.mjs",
     "test:coverage": "node -e \"require('node:fs').rmSync('coverage',{recursive:true,force:true})\" && tsc -p tsconfig.coverage.json && node -e \"const { spawnSync } = require('node:child_process'); process.exit(spawnSync(process.execPath, ['--enable-source-maps','--import','./dist/tests/isolated-env.js','--test','--test-reporter=dot','dist/tests/*.test.js'], { stdio: 'inherit', env: { ...process.env, NODE_V8_COVERAGE: 'coverage/v8' } }).status ?? 1);\"",
     "audit:dead-code": "npx --yes fallow@3.30.0 dead-code --fail-on-issues",
     "audit:dupes": "npx --yes fallow@3.30.0 dupes",