@iseoane/agent-depot 0.6.9 → 0.6.11

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

@@ -15,7 +15,7 @@ import { useKeys } from "./keys.js";
 import { previewViewport } from "./preview-window.js";
 import { answerYesNo, moveCursor, movePreviewCursor, toggleChoice } from "./mode-keys.js";
 import { BorderPanel, PreviewConfirm, PreviewLines, Working } from "./panel-parts.js";
-import { elideMiddle, fitLines, wrapText } from "./text-wrap.js";
+import { clipText, elideMiddle, fitLines, wrapText } from "./text-wrap.js";
 import { theme } from "./theme.js";
 import { useMirrored, useMounted } from "./view-state.js";
 import { computeWindow, useListHeight } from "./window.js";
@@ -53,14 +53,16 @@ function rowsFromExport(plan) {
         })),
     ];
 }
+/** A group header, followed by its children while the group is open; an empty group is not shown. */
+function section(expanded, id, label, depth, children) {
+    if (!children.length)
+        return [];
+    const header = { kind: "group", id, label, depth };
+    return expanded.has(id) ? [header, ...children] : [header];
+}
 function exportDisplayRows(rows, expanded) {
     const choices = (block) => rows.filter(row => row.block === block);
-    const group = (id, label, depth, children) => {
-        if (!children.length)
-            return [];
-        const header = { kind: "group", id, label, depth };
-        return expanded.has(id) ? [header, ...children] : [header];
-    };
+    const group = (id, label, depth, children) => section(expanded, id, label, depth, children);
     const sourceChildren = [
         ...group("group:sources", `Source choices (${choices("sources").length})`, 1, choices("sources")),
         ...group("group:skills", `Skills (${choices("skills").length})`, 1, choices("skills")),
@@ -73,6 +75,30 @@ function exportDisplayRows(rows, expanded) {
         ...group("group:excluded", `Export notes (${choices("excluded").length})`, 0, choices("excluded")),
     ];
 }
+const IMPORT_ADD = "import:add";
+const IMPORT_APPS = "import:apps";
+const importRepoId = (repo) => `import:add:${repo}`;
+/** Additions by Source and App recipes, then what is already there, then what conflicts. */
+function importDisplayRows(rows, expanded) {
+    const added = rows.filter(row => row.status === "add");
+    const recipes = added.filter(row => row.block === "apps");
+    const repos = [...new Set(added.filter(row => row.block !== "apps").map(row => row.source ?? ""))];
+    const sources = repos.flatMap(repo => {
+        const children = added.filter(row => row.block !== "apps" && (row.source ?? "") === repo);
+        return section(expanded, importRepoId(repo), `${repo} (${children.length})`, 1, children);
+    });
+    const unchanged = rows.filter(row => row.status === "same"), conflicts = rows.filter(row => row.status === "conflict");
+    return [
+        ...section(expanded, IMPORT_ADD, `To import (${added.length})`, 0, [...sources, ...section(expanded, IMPORT_APPS, `App recipes (${recipes.length})`, 1, recipes)]),
+        ...section(expanded, "import:same", `Unchanged (${unchanged.length})`, 0, unchanged),
+        ...section(expanded, "import:conflict", `Conflicts (${conflicts.length}) — not selectable`, 0, conflicts),
+    ];
+}
+/** Additions and conflicts are open to read; the unchanged items are what the person already has. */
+function importOpenGroups(rows) {
+    const repos = rows.filter(row => row.status === "add" && row.block !== "apps").map(row => importRepoId(row.source ?? ""));
+    return new Set([IMPORT_ADD, IMPORT_APPS, "import:conflict", ...repos]);
+}
 function physicalListWindow(rows, rowHeights, selected, height) {
     if (!rows.length)
         return { start: 0, end: 0, indicator: undefined, stickyGroup: false };
@@ -144,7 +170,7 @@ function planEntries(plan) {
 function rowsFromPlan(plan) {
     return planEntries(plan).map((item, index) => ({
         id: `${item.block}:${index}`, block: item.block, index, ordinal: index + 1,
-        label: `${item.status}: ${item.label}${item.difference ? `; ${item.difference}` : ""}`,
+        label: item.summary, status: item.status, ...(item.group === undefined ? {} : { source: item.group }),
         selectable: item.status === "add",
     }));
 }
@@ -173,6 +199,12 @@ function selectedImportProfile(profile, entries) {
     return parseProfile({ ...profile, format: replicas.length ? PROFILE_FORMAT_V2 : PROFILE_FORMAT,
         sources, skills, apps, packages, replicas });
 }
+/** The rows a list stage shows: the grouped export or import tree, otherwise the flat rows. */
+function listRows(mode, rows, expanded) {
+    if (mode === "export-list")
+        return exportDisplayRows(rows, expanded);
+    return mode === "import-list" ? importDisplayRows(rows, expanded) : rows;
+}
 /** Collect choices, display shared-core previews and confirm portable Profile transfers. */
 export function ProfileView({ operations, environment = {}, onCapturingChange, listHeight, existsCheck = pathExists }) {
     const apps = useMemo(() => createAppOperations({
@@ -208,14 +240,17 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
     const diagnostics = useRef([]);
     const { rows: terminalRows, columns: terminalColumns } = useWindowSize();
     const panelWidth = Math.max((terminalColumns || 80) - 4, 1);
-    const hintCursorRow = (mode === "export-list" ? exportDisplayRows(rows, expandedGroupsRef.current) : rows)[cursorRef.current];
+    const hintCursorRow = listRows(mode, rows, expandedGroupsRef.current)[cursorRef.current];
     const enterHint = hintCursorRow === undefined ? undefined
         : "kind" in hintCursorRow ? "Enter open"
             : hintCursorRow.block === "excluded" ? "Enter note" : undefined;
     const groupHint = hintCursorRow !== undefined && "kind" in hintCursorRow ? " · ←/→ group" : "";
+    // With nothing to choose, a header has no item row to move to, so Enter previews instead of opening it.
+    const nothingToImport = !rows.some(row => row.selectable);
+    const importEnter = hintCursorRow !== undefined && "kind" in hintCursorRow && !nothingToImport ? "Enter open" : "Enter preview";
     const listingHint = mode === "export-list"
         ? `j/k move${groupHint}${enterHint === undefined ? "" : ` · ${enterHint}`} · space toggle · a all · e export · Esc back to menu`
-        : "j/k move · space toggle · a all · Enter preview · Esc back to menu";
+        : `j/k move${groupHint} · space toggle · a all · ${importEnter} · Esc back to menu`;
     const hintText = `${selected.length} selected · ${listingHint}`;
     const titleRows = Math.max(Math.ceil(stringWidth("Export Profile") / panelWidth), 1);
     const hintRows = Math.max(Math.ceil(stringWidth(hintText) / panelWidth), 1);
@@ -250,11 +285,9 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
     const loadRows = (next, nextMode) => {
         setRows(next);
         select(next.filter(row => row.selectable));
-        const open = new Set();
+        const open = nextMode === "import-list" ? importOpenGroups(next) : new Set();
         setExpandedGroups(open);
-        const firstChoice = nextMode === "export-list"
-            ? exportDisplayRows(next, open).findIndex(row => !("kind" in row) && row.selectable)
-            : 0;
+        const firstChoice = listRows(nextMode, next, open).findIndex(row => !("kind" in row) && row.selectable);
         cursorTo(Math.max(firstChoice, 0));
         setMode(nextMode);
     };
@@ -483,9 +516,9 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
             return;
         }
         // export-list and import-list
-        const visibleRows = current === "export-list" ? exportDisplayRows(rows, expandedGroupsRef.current) : rows;
-        const currentRow = visibleRows[cursorRef.current];
-        const next = moveCursor(cursorRef.current, visibleRows.length, input, key);
+        const shownRows = listRows(current, rows, expandedGroupsRef.current);
+        const currentRow = shownRows[cursorRef.current];
+        const next = moveCursor(cursorRef.current, shownRows.length, input, key);
         if (next !== undefined) {
             cursorTo(Math.max(0, next));
             return;
@@ -503,6 +536,10 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
             beginExport();
             return;
         }
+        if (key.return && current === "import-list" && nothingToImport) {
+            previewImport();
+            return;
+        }
         if (currentRow && "kind" in currentRow && currentRow.kind === "group") {
             if (key.return || key.rightArrow || key.leftArrow) {
                 const open = new Set(expandedGroupsRef.current);
@@ -531,13 +568,13 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
         }
     });
     const listing = mode === "export-list" || mode === "import-list";
-    const displayRows = mode === "export-list" ? exportDisplayRows(rows, expandedGroups) : rows;
+    const displayRows = listRows(mode, rows, expandedGroups);
     const rowHeights = displayRows.map(row => {
-        const prefixWidth = "kind" in row ? stringWidth(`> ${" ".repeat(row.depth * 2)}▸ `) : row.block === "excluded" ? 2
-            : stringWidth(`> [ ] ${row.ordinal ?? row.index + 1} `);
-        const label = !("kind" in row) && row.block !== "excluded" && !row.selectable
-            ? `${row.label} (not selectable)` : row.label;
-        return wrapText(label, Math.max(panelWidth - prefixWidth, 1)).length;
+        // A group header is one row, so the sticky header the window repeats costs exactly the row it reserves.
+        if ("kind" in row)
+            return 1;
+        const prefixWidth = row.block === "excluded" ? 2 : stringWidth(`> [ ] ${row.ordinal ?? row.index + 1} `);
+        return wrapText(row.label, Math.max(panelWidth - prefixWidth, 1)).length;
     });
     const listWindow = physicalListWindow(displayRows, rowHeights, cursor, height);
     const window = listing ? listWindow : computeWindow(lines.length, cursor, height);
@@ -554,10 +591,8 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
             const open = expandedGroups.has(row.id);
             const prefix = `${marker}${" ".repeat(row.depth * 2)}${open ? "▾" : "▸"} `;
             const width = Math.max(panelWidth - stringWidth(prefix), 1);
-            const label = fitLines(wrapText(row.label, width), remainingRows, width)
-                .join(`\n${" ".repeat(stringWidth(prefix))}`);
-            remainingRows -= label.split("\n").length;
-            return _jsxs(Text, { color: theme.group, bold: true, children: [prefix, label] }, row.id);
+            remainingRows -= 1;
+            return _jsxs(Text, { color: theme.group, bold: true, children: [prefix, clipText(row.label, width)] }, row.id);
         }
         if (row.block === "excluded") {
             const width = Math.max(panelWidth - stringWidth(marker), 1);
@@ -566,13 +601,15 @@ export function ProfileView({ operations, environment = {}, onCapturingChange, l
             remainingRows -= label.split("\n").length;
             return _jsxs(Text, { color: theme.value, children: [marker, label] }, row.id);
         }
-        const prefix = `${marker}[${selected.some(choice => choice.id === row.id) ? "x" : " "}] ${row.ordinal ?? row.index + 1} `;
-        const value = `${row.label}${row.selectable ? "" : " (not selectable)"}`;
+        // A row the import never changes has no checkbox: unchanged items rest, conflicts warn.
+        const box = row.selectable ? `[${selected.some(choice => choice.id === row.id) ? "x" : " "}]` : "   ";
+        const prefix = `${marker}${box} ${row.ordinal ?? row.index + 1} `;
         const width = Math.max(panelWidth - stringWidth(prefix), 1);
-        const label = fitLines(wrapText(value, width), remainingRows, width)
+        const label = fitLines(wrapText(row.label, width), remainingRows, width)
             .join(`\n${" ".repeat(stringWidth(prefix))}`);
         remainingRows -= label.split("\n").length;
-        return _jsxs(Text, { children: [_jsx(Text, { color: theme.field, children: prefix }), _jsx(Text, { color: theme.value, children: label })] }, row.id);
+        const color = row.status === "conflict" ? theme.warning : row.status === "same" ? theme.muted : theme.value;
+        return _jsxs(Text, { children: [_jsx(Text, { color: theme.field, children: prefix }), _jsx(Text, { color: color, children: label })] }, row.id);
     });
     const nameOutcome = resolveExportFileName(text);
     const liveDestination = nameOutcome.kind === "ok"

package/dist/src/tui/sources-recipes.js

@@ -15,6 +15,25 @@ import { answerYesNo, movePreviewCursor } from "./mode-keys.js";
 import { previewViewport } from "./preview-window.js";
 import { theme } from "./theme.js";
 import { busy } from "./working-model.js";
+/**
+ * One group per App name. Invalid recipes, and recipes whose name clashes among those that apply here
+ * (they carry an error), stay single rows so nothing is guessed.
+ */
+export function groupRecipeRows(rows) {
+    const groups = new Map();
+    for (const row of rows) {
+        const key = row.entry.recipe !== undefined && row.entry.error === undefined ? `name:${row.entry.recipe.name}` : `file:${row.entry.file}`;
+        groups.set(key, [...(groups.get(key) ?? []), row]);
+    }
+    return [...groups.values()].map(found => {
+        const members = [...found.filter(row => row.entry.applicable), ...found.filter(row => !row.entry.applicable)];
+        return { primary: members[0], members };
+    });
+}
+/** `windows · approved · <file> (used here)`, one line per recipe of a grouped App. */
+function recipeMemberLine(row) {
+    return `${row.entry.recipe?.platform ?? "all platforms"} · ${row.status} · ${row.entry.file}${row.entry.applicable ? " (used here)" : ""}`;
+}
 function recipeApprovalChrome(entry) {
     return {
         title: "Recipe approval · does not install",
@@ -61,7 +80,7 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
         if (mounted.current)
             setMode({ kind: "browse" });
     };
-    const preview = async (entry, status, removeAfterApproval = false) => {
+    const preview = async (entry, status, removeAfterApproval = false, members = []) => {
         setError(undefined);
         setBusy("Preparing App recipe preview…");
         try {
@@ -70,7 +89,10 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
                 setMode({
                     kind: "approve",
                     entry, removeAfterApproval, cursor: 0,
-                    lines: appRecipePreviewLines(entry, status, steps),
+                    lines: [
+                        ...(members.length > 1 ? [`Recipes named ${appName(entry)}:`, ...members.map(row => `  ${recipeMemberLine(row)}`), ""] : []),
+                        ...appRecipePreviewLines(entry, status, steps),
+                    ],
                 });
             }
         }
@@ -198,6 +220,14 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
             return true;
         }
         const cancel = () => setMode({ kind: "browse" });
+        if (current.kind === "pick") {
+            const chosen = /^[1-9]$/u.test(input) ? current.members[Number(input) - 1] : undefined;
+            if (chosen)
+                void startRemoval(chosen.entry);
+            else if (input === "n" || key.escape)
+                cancel();
+            return true;
+        }
         if (current.kind === "approve") {
             const viewport = previewViewport(current.lines, current.cursor, terminalRows, terminalColumns, recipeApprovalChrome(current.entry));
             const cursor = movePreviewCursor(current.cursor, viewport.total, input, key, viewport.height);
@@ -265,17 +295,23 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
             }, cancel);
             return true;
         }
-        const row = rows.find(row => row.entry.file === highlightedFile());
-        if (!row)
+        const group = groupRecipeRows(rows).find(candidate => candidate.primary.entry.file === highlightedFile());
+        if (!group)
             return false;
+        const row = group.primary;
         if (input === "n")
             startAdd();
         else if (input === "r")
             void reload();
         else if (key.return)
-            void preview(row.entry, row.status);
-        else if (input === "d")
-            void startRemoval(row.entry);
+            void preview(row.entry, row.status, false, group.members);
+        // A grouped App names several files; the chosen one is the only file the removal flow may touch.
+        else if (input === "d") {
+            if (group.members.length > 1)
+                setMode({ kind: "pick", members: group.members });
+            else
+                void startRemoval(row.entry);
+        }
         else
             return false;
         return true;
@@ -312,7 +348,7 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
                 const chrome = recipeApprovalChrome(mode.entry);
                 const viewport = previewViewport(mode.lines, mode.cursor, terminalRows, terminalColumns, chrome);
                 return _jsx(PreviewConfirm, { title: chrome.title, lines: mode.lines, cursor: mode.cursor, question: viewport.reachedEnd ? chrome.questions[0] : chrome.questions[1], chrome: chrome });
-            })() : null, mode.kind === "uninstall-question" ? (_jsxs(BorderPanel, { title: "Uninstall before recipe removal", children: [_jsxs(Text, { children: ["App ", appName(mode.removal.entry), " is installed or tracked", mode.removal.installedVersion ? ` (${mode.removal.installedVersion})` : "", "."] }), _jsxs(Text, { children: [_jsx(DecisionPrompt, { children: "Uninstall it before removing the recipe?" }), _jsx(Text, { color: theme.legend, children: "(n cancels removal)" })] })] })) : null, mode.kind === "uninstall-confirm" || mode.kind === "uninstall-manual" ? (() => {
+            })() : null, mode.kind === "pick" ? (_jsxs(BorderPanel, { title: "Remove which recipe?", children: [mode.members.map((row, index) => _jsxs(Text, { children: [index + 1, " ", recipeMemberLine(row)] }, row.entry.file)), _jsx(Text, { color: theme.legend, children: "Press a number to review that one file for removal \u00B7 n or Esc cancels" })] })) : null, mode.kind === "uninstall-question" ? (_jsxs(BorderPanel, { title: "Uninstall before recipe removal", children: [_jsxs(Text, { children: ["App ", appName(mode.removal.entry), " is installed or tracked", mode.removal.installedVersion ? ` (${mode.removal.installedVersion})` : "", "."] }), _jsxs(Text, { children: [_jsx(DecisionPrompt, { children: "Uninstall it before removing the recipe?" }), _jsx(Text, { color: theme.legend, children: "(n cancels removal)" })] })] })) : null, mode.kind === "uninstall-confirm" || mode.kind === "uninstall-manual" ? (() => {
                 const chrome = uninstallChrome(mode);
                 const lines = appStepLines(mode.plan);
                 const viewport = previewViewport(lines, mode.cursor, terminalRows, terminalColumns, chrome);

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

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text, useWindowSize } from "ink";
+import path from "node:path";
 import { useCallback, useEffect, useReducer, useRef, useState } from "react";
 import { initialMode, modeReducer } from "./sources-mode.js";
 import { rowStyle, theme } from "./theme.js";
 import { computeWindow, pageStep, useListHeight } from "./window.js";
 import { useKeys } from "./keys.js";
-import { useSourcesRecipes } from "./sources-recipes.js";
+import { groupRecipeRows, useSourcesRecipes } from "./sources-recipes.js";
 import { BorderPanel, DecisionPrompt, FieldLine, PreviewLines, Working } from "./panel-parts.js";
 import { previewViewport } from "./preview-window.js";
 import { movePreviewCursor } from "./mode-keys.js";
@@ -123,14 +124,14 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
         highlightedFile: () => {
             const rows = rowsRef.current;
             const row = rows[resolveIndex(rows, selectionRef.current)];
-            return row?.kind === "app" ? row.recipe.entry.file : undefined;
+            return row?.kind === "app" ? row.group.primary.entry.file : undefined;
         },
         terminalRows: terminalRows || 24,
         terminalColumns: columns || 80,
     });
     const rows = [
         ...sources.map((source) => ({ id: source.id, kind: "skills", source })),
-        ...recipes.rows.map((recipe) => ({ id: `recipe:${recipe.entry.file}`, kind: "app", recipe })),
+        ...groupRecipeRows(recipes.rows).map((group) => ({ id: `recipe:${group.primary.entry.file}`, kind: "app", group })),
     ];
     rowsRef.current = rows;
     const selected = resolveIndex(rows, selection);
@@ -334,13 +335,19 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
         return _jsx(Box, { flexDirection: "column", children: recipes.panel });
     return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.muted, children: ["      ", "ID  KIND  LOCATION / STATUS"] }), builtin ? _jsxs(Text, { children: ["    ", _jsx(Text, { color: theme.value, children: builtin.id }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: "skills" }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.warning, children: "included" })] }) : null, rows.length === 0 && recipes.loadingSince === undefined ? _jsx(Text, { children: "No sources or App recipes \u00B7 n to add" }) : null, rows.slice(window.start, window.end).map((row, offset) => {
                 const index = window.start + offset;
-                const id = row.kind === "skills" ? row.source.id : row.recipe.entry.recipe?.name ?? row.recipe.entry.file.split(/[\\/]/u).pop();
+                const id = row.kind === "skills" ? row.source.id : row.group.primary.entry.recipe?.name ?? row.group.primary.entry.file.split(/[\\/]/u).pop();
                 return (_jsxs(Text, { ...rowStyle(index === selected), children: [index === selected ? "> " : "  ", row.kind === "skills" ? (marked.has(row.id) ? "[x] " : "[ ] ") : "    ", _jsx(Text, { color: theme.value, children: id }), _jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: theme.field, children: row.kind }), _jsx(Text, { color: theme.legend, children: "  " }), row.kind === "skills"
                             ? _jsx(Text, { color: theme.value, children: row.source.url })
-                            : _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.value, children: row.recipe.entry.file }), _jsx(Text, { color: theme.legend, children: " \u00B7 " }), _jsx(Text, { color: row.recipe.status === "approved" ? theme.success : theme.warning, children: row.recipe.status })] })] }, row.id));
+                            : _jsx(RecipeStatus, { group: row.group })] }, row.id));
             }), window.indicator ? _jsx(Text, { color: theme.muted, children: window.indicator }) : null, selectedCount > 0 ? _jsxs(Text, { children: [selectedCount, " selected"] }) : null, recipes.loadingSince !== undefined && mode.kind !== "busy" && !recipes.capturing
                 ? _jsx(Working, { label: "Loading App recipes\u2026", since: recipes.loadingSince }) : null, recipes.panel, _jsx(Prompt, { mode: mode }), message ? (_jsx(BorderPanel, { title: message.kind === "error" ? "Source action · failed" : "Source action · complete", children: _jsx(Text, { color: message.kind === "error" ? theme.error : theme.success, children: message.text }) })) : null] }));
 }
+/** Status of the recipe that applies here, led by its platform when it names one; other platforms follow, muted. */
+function RecipeStatus({ group }) {
+    const { primary, members } = group;
+    const platform = primary.entry.recipe?.platform;
+    return (_jsxs(_Fragment, { children: [platform === undefined ? null : _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.value, children: platform }), _jsx(Text, { color: theme.legend, children: " \u00B7 " })] }), primary.entry.error === undefined || primary.entry.recipe === undefined ? null : _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.value, children: path.basename(primary.entry.file) }), _jsx(Text, { color: theme.legend, children: " \u00B7 " })] }), _jsx(Text, { color: primary.status === "approved" ? theme.success : theme.warning, children: primary.status === "approved" ? "✓ approved" : primary.status }), members.slice(1).map(other => (_jsxs(Text, { color: theme.muted, children: ["    ", other.entry.recipe?.platform ?? "all platforms", " (other platform)"] }, other.entry.file)))] }));
+}
 function Prompt({ mode, terminalRows = 24, terminalColumns = 80 }) {
     if (mode.kind === "add-kind")
         return _jsx(Text, { children: "Add: 1 Git Source (skills + Packages) \u00B7 2 App recipe (Esc cancel)" });

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 })] }));
 }