@iseoane/agent-depot 0.6.9 → 0.6.10

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

@@ -1,12 +1,13 @@
 import { githubTreeLocation } from "../git-source.js";
-import { bundleRoot } from "../package-model.js";
+import { selectionKey } from "../package-model.js";
 import { packageOwnedSkillMatcher } from "../package-owned-skills.js";
 import { packageVersionLabel } from "./package-rows.js";
 import { defaultExpanded } from "./tree.js";
 const DESCRIPTION_LIMIT = 60;
 export const UNMANAGED_MARKER = "on disk, unmanaged · adopt it from Installations";
 export const skillKey = (skill) => `skill:${skill.sourceId}:${skill.path}`;
-export const bundleKey = (entry) => `bundle:${entry.sourceId}:${entry.descriptor.host}:${bundleRoot(entry.descriptor.coordinates)}`;
+/** Keyed on the full selection, so two plugins of one marketplace root stay distinct nodes. */
+export const bundleKey = (entry) => `bundle:${entry.sourceId}:${selectionKey(entry.selection)}`;
 export function truncateDescription(text) {
     return text.length > DESCRIPTION_LIMIT ? `${text.slice(0, DESCRIPTION_LIMIT - 3)}...` : text;
 }
@@ -30,11 +31,20 @@ export function buildTree(skills, sources = [], bundles = [], activeDescriptors
     for (const skill of skills)
         bySource.set(skill.sourceId, [...(bySource.get(skill.sourceId) ?? []), skill]);
     const bundlesBySource = new Map();
-    for (const bundle of bundles)
+    const seenBundles = new Set();
+    for (const bundle of bundles) {
+        // Descriptors with identical coordinates are one Package; a duplicate node id would corrupt the rows.
+        if (seenBundles.has(bundleKey(bundle)))
+            continue;
+        seenBundles.add(bundleKey(bundle));
         bundlesBySource.set(bundle.sourceId, [...(bundlesBySource.get(bundle.sourceId) ?? []), bundle]);
+    }
     const sourcesTree = [...new Set([...bySource.keys(), ...bundlesBySource.keys()])].map((sourceId) => {
         const members = bySource.get(sourceId) ?? [];
         const sourceBundles = bundlesBySource.get(sourceId) ?? [];
+        const variants = new Map();
+        for (const skill of members)
+            variants.set(skill.name, [...(variants.get(skill.name) ?? []), skill]);
         const owned = packageOwnedSkillMatcher(sourceBundles.map((entry) => entry.descriptor).filter((descriptor) => active.has(descriptor)));
         return {
             id: `source:${sourceId}`,
@@ -45,10 +55,21 @@ export function buildTree(skills, sources = [], bundles = [], activeDescriptors
                         data: { kind: "group", label: `Packages (${sourceBundles.length})` },
                         children: sourceBundles.map((entry) => ({ id: bundleKey(entry), data: { kind: "bundle", entry } })),
                     }]),
-                ...members.map((skill) => {
-                    const ownedBy = owned(skill.path);
-                    return { id: skillKey(skill), data: { kind: "skill", skill, ...(ownedBy === undefined ? {} : { ownedBy }) } };
-                }),
+                ...(members.length === 0 ? [] : [{
+                        id: `skills:${sourceId}`,
+                        data: { kind: "group", label: `Skills (${members.length})` },
+                        children: [...variants.values()].map((group) => {
+                            const variant = group.length > 1;
+                            const nodes = group.map((skill) => {
+                                const ownedBy = owned(skill.path);
+                                return { id: skillKey(skill), data: { kind: "skill", skill, ...(ownedBy === undefined ? {} : { ownedBy }), ...(variant ? { variant } : {}) } };
+                            });
+                            // Same-named Skills of one Source differ in content, so each stays its own installable row under one group.
+                            return variant
+                                ? { id: `variants:${sourceId}:${group[0].name}`, data: { kind: "group", label: `${group[0].name} (${group.length} variants)` }, children: nodes }
+                                : nodes[0];
+                        }),
+                    }]),
             ],
         };
     });
@@ -86,13 +107,29 @@ export function describeRow(row) {
     }
     if (data.kind === "app")
         return `App ${data.row.entry.recipe?.name ?? data.row.entry.file}  ${data.row.inspection.status}`;
-    return `${data.skill.name}  ${truncateDescription(data.skill.description)}`;
+    return `${data.skill.name}  ${truncateDescription(data.skill.description)}${data.variant === true ? `  (${data.skill.path})` : ""}`;
+}
+/** Skill nodes inside a Source's Skills group, directly or within one of its variant groups. */
+function skillNodesOf(roots) {
+    const found = [];
+    const visit = (node) => {
+        if (node.data.kind === "skill")
+            found.push(node);
+        else if (node.id.startsWith("variants:"))
+            node.children?.forEach(visit);
+    };
+    for (const root of roots) {
+        for (const group of root.children ?? [])
+            if (group.id.startsWith("skills:"))
+                group.children?.forEach(visit);
+    }
+    return found;
 }
 /** The Skills under the tree's Sources, in display order. */
 export function leavesOf(roots) {
-    return roots.flatMap((root) => (root.children ?? []).flatMap((child) => child.data.kind === "skill" ? [child.data.skill] : []));
+    return skillNodesOf(roots).map((node) => node.data.skill);
 }
 /** Skills that can still be installed as loose Skills, excluding active Package-owned rows. */
 export function looseLeavesOf(roots) {
-    return roots.flatMap((root) => (root.children ?? []).flatMap((child) => child.data.kind === "skill" && child.data.ownedBy === undefined ? [child.data.skill] : []));
+    return skillNodesOf(roots).filter((node) => node.data.ownedBy === undefined).map((node) => node.data.skill);
 }

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

@@ -17,6 +17,7 @@ import { useCatalogApps, useCatalogFilter, useCatalogSkills, useInstalledSkills
 import { buildTree, leavesOf, openByDefault, skillKey } from "./catalog-tree.js";
 import { theme } from "./theme.js";
 import { useTreeNavigation } from "./tree-navigation.js";
+import { invalidateRetention } from "./view-retention.js";
 import { useLoadingSince, useMarks, useMounted } from "./view-state.js";
 import { computeWindow, useListHeight } from "./window.js";
 import { useKeys } from "./keys.js";
@@ -39,7 +40,7 @@ function wrappedLineCount(text, columns) {
     }
     return lines;
 }
-export function CatalogView({ operations, sourceId, onCapturingChange, environment, listHeight }) {
+export function CatalogView({ operations, sourceId, onCapturingChange, environment, listHeight, retention }) {
     const { columns, rows: terminalRows } = useWindowSize();
     const env = environment ?? NO_ENVIRONMENT;
     const [all, setAll] = useState(sourceId === undefined);
@@ -52,12 +53,12 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
     // Mirrors the action mode synchronously, like the filter, so later keystrokes and the shell never see stale state.
     const actionRef = useRef(BROWSE);
     const filter = useCatalogFilter(actionRef, onCapturingChange);
-    const state = useCatalogSkills(operations, sourceId, all, env, reloadKey);
+    const state = useCatalogSkills(operations, sourceId, all, env, reloadKey, retention);
     const packages = useMemo(() => packageOperationsOf(env), [env]);
     const apps = useMemo(() => createAppOperations({ homeDirectory: env.homeDirectory, ...env.appEnvironment }), [env]);
-    const appCatalogState = useCatalogApps(apps);
+    const appCatalogState = useCatalogApps(apps, retention);
     const appCatalog = appCatalogState.state;
-    const { installed, installedReady, reloadInstalled } = useInstalledSkills(operations, env, mounted);
+    const { installed, installedReady, installedStale, reloadInstalled } = useInstalledSkills(operations, env, mounted, retention);
     const [appMode, setAppMode] = useState();
     const appModeRef = useRef(undefined);
     const setAppAction = (mode) => {
@@ -104,6 +105,8 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
         }
     }, [loading]);
     const loadingSince = useLoadingSince(loading, runningSince ?? resumedSince);
+    const refreshing = !loading && ((state.status === "ready" && state.stale === true) || (appCatalog.status === "ready" && appCatalog.stale === true) || installedStale);
+    const refreshingSince = useLoadingSince(refreshing);
     const flow = {
         operations,
         env,
@@ -112,6 +115,7 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
         isMounted: () => mounted.current,
         keepMarked: marks.setMarked,
         finish: async (result) => {
+            invalidateRetention(retention);
             await reloadInstalled();
             if (!mounted.current)
                 return;
@@ -126,6 +130,7 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
         isMounted: () => mounted.current,
         unmark: ids => marks.setMarked(new Set([...marks.markedRef.current].filter(id => !ids.includes(id)))),
         finish: async (result) => {
+            invalidateRetention(retention);
             await reloadInstalled();
             if (!mounted.current)
                 return;
@@ -142,6 +147,7 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
         setMessage,
         isMounted: () => mounted.current,
         finish: async (result) => {
+            invalidateRetention(retention);
             await reloadInstalled();
             if (!mounted.current)
                 return;
@@ -194,5 +200,5 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
     // A paged declaration owns the view: rows of the tree above it would not be counted in its height.
     if (isPackageMode(action))
         return _jsx(PackagePanel, { mode: action });
-    return (_jsxs(Box, { flexDirection: "column", children: [state.warnings.map((warning) => _jsx(Text, { color: theme.warning, children: warning }, warning)), appCatalog.status === "ready" && appCatalog.error ? _jsxs(Text, { color: theme.error, children: ["Apps unavailable: ", appCatalog.error] }) : null, _jsx(CatalogHeader, { scope: scope, listed: visible.length, installable: installable.length, total: skills.length, appCount: visibleApps.length, filter: filter.filter }), rows.slice(window.start, window.end).map((row, offset) => (_jsx(CatalogRowLine, { row: row, selected: window.start + offset === index, marked: marks.marked.has(row.node.id), installed: installed }, row.node.id))), _jsx(CatalogSelectionHelp, { row: rows[index], height: helpLines }), _jsx(ListFooter, { indicator: window.indicator, selectedCount: selectedCount, message: message }), appMode ? _jsx(AppPanel, { mode: appMode }) : _jsx(ActionPanel, { mode: action })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [refreshing ? _jsx(Working, { label: "Refreshing catalog (last data shown)\u2026", since: refreshingSince }) : null, state.warnings.map((warning) => _jsx(Text, { color: theme.warning, children: warning }, warning)), appCatalog.status === "ready" && appCatalog.error ? _jsxs(Text, { color: theme.error, children: ["Apps unavailable: ", appCatalog.error] }) : null, _jsx(CatalogHeader, { scope: scope, listed: visible.length, installable: installable.length, total: skills.length, appCount: visibleApps.length, filter: filter.filter }), rows.slice(window.start, window.end).map((row, offset) => (_jsx(CatalogRowLine, { row: row, selected: window.start + offset === index, marked: marks.marked.has(row.node.id), installed: installed }, row.node.id))), _jsx(CatalogSelectionHelp, { row: rows[index], height: helpLines }), _jsx(ListFooter, { indicator: window.indicator, selectedCount: selectedCount, message: message }), appMode ? _jsx(AppPanel, { mode: appMode }) : _jsx(ActionPanel, { mode: action })] }));
 }

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

@@ -22,15 +22,18 @@ import { busy } from "./working-model.js";
 import { useLoadingSince, useMarks, useMounted } from "./view-state.js";
 import { computeWindow, useListHeight } from "./window.js";
 import { useKeys } from "./keys.js";
+import { invalidateRetention } from "./view-retention.js";
 const NO_ENVIRONMENT = {};
 const LEGEND = "adopted: tracked in place · modified: changed on disk";
-export function InstallationsView({ operations, environment, onCapturingChange, listHeight }) {
+export function InstallationsView({ operations, environment, onCapturingChange, listHeight, retention }) {
     const { rows: terminalRows, columns: terminalColumns } = useWindowSize();
     const height = useListHeight(listHeight, 7);
     const env = environment ?? NO_ENVIRONMENT;
     const apps = useMemo(() => createAppOperations({ homeDirectory: env.homeDirectory, ...env.appEnvironment }), [env]);
     const packages = useMemo(() => packageOperationsOf(env), [env]);
-    const [state, setState] = useState({ status: "loading" });
+    const [state, setState] = useState(() => retention?.installations ? { status: "ready", data: retention.installations } : { status: "loading" });
+    // The data shown comes from an earlier visit until the first reload of this one ends.
+    const [stale, setStale] = useState(retention?.installations !== undefined);
     const [mode, setModeState] = useState(BROWSE);
     // Mirrors the mode synchronously so later keystrokes and the shell never see stale state.
     const modeRef = useRef(BROWSE);
@@ -50,22 +53,30 @@ export function InstallationsView({ operations, environment, onCapturingChange,
     const loadGeneration = useRef(0);
     const reload = useCallback(async () => {
         const generation = ++loadGeneration.current;
+        const retained = retention?.generation;
         if (reloads.current++ === 0 && mounted.current)
             setRefreshingSince(Date.now());
         try {
             const data = await loadInstallations(operations, env, apps, packages);
-            if (mounted.current && generation === loadGeneration.current)
+            // A result that began before an invalidation may predate the change, so it is not kept.
+            if (retention && retention.generation === retained)
+                retention.installations = data;
+            if (mounted.current && generation === loadGeneration.current) {
                 setState({ status: "ready", data });
+                setStale(false);
+            }
         }
         catch (error) {
-            if (mounted.current && generation === loadGeneration.current)
+            if (mounted.current && generation === loadGeneration.current) {
                 setState({ status: "error", message: errorText(error) });
+                setStale(false);
+            }
         }
         finally {
             if (--reloads.current === 0 && mounted.current)
                 setRefreshingSince(undefined);
         }
-    }, [operations, env, apps, packages, mounted]);
+    }, [operations, env, apps, packages, mounted, retention]);
     useEffect(() => {
         void reload();
     }, [reload]);
@@ -129,6 +140,8 @@ export function InstallationsView({ operations, environment, onCapturingChange,
         const current = modeRef.current;
         if ("startedAt" in current && mounted.current)
             setMode(busy("Refreshing installations…", current));
+        // The action changed what is installed, so what was kept no longer describes it.
+        invalidateRetention(retention);
         await reload();
     };
     const manage = {
@@ -197,6 +210,6 @@ export function InstallationsView({ operations, environment, onCapturingChange,
     const markedApps = markedLeaves.filter(node => node.data.kind === "app").length;
     // The legend explains the markers, so it shows only while a rendered row carries one.
     const legendNeeded = listed.some((row) => row.node.data.kind === "installation" && markersOf(row.node.data.row) !== "");
-    return (_jsxs(Box, { flexDirection: "column", children: [refreshingSince !== undefined && mode.kind === "browse" ? _jsx(Working, { label: "Refreshing installations\u2026", since: refreshingSince }) : null, ready.global === undefined ? _jsx(Text, { children: "User-global installations are not supported by the configured operations" }) : null, ready.projectError === undefined ? null : _jsxs(Text, { color: theme.error, children: ["Error: ", ready.projectError] }), listed.map((row, offset) => (_jsx(TreeRowLine, { row: row, selected: window.start + offset === index, marked: marks.marked.has(row.node.id) }, row.node.id))), _jsx(ListFooter, { indicator: window.indicator, selectedCount: selectedCount, message: message }), markedApps > 0 ? _jsxs(Text, { color: theme.muted, children: [markedApps, " Apps marked"] }) : null, legendNeeded ? _jsx(Text, { color: theme.muted, children: LEGEND }) : null, checkingSince !== undefined && refreshingSince === undefined && mode.kind === "browse"
+    return (_jsxs(Box, { flexDirection: "column", children: [refreshingSince !== undefined && mode.kind === "browse" ? _jsx(Working, { label: stale ? "Refreshing installations (last data shown)…" : "Refreshing installations…", since: refreshingSince }) : null, ready.global === undefined ? _jsx(Text, { children: "User-global installations are not supported by the configured operations" }) : null, ready.projectError === undefined ? null : _jsxs(Text, { color: theme.error, children: ["Error: ", ready.projectError] }), listed.map((row, offset) => (_jsx(TreeRowLine, { row: row, selected: window.start + offset === index, marked: marks.marked.has(row.node.id) }, row.node.id))), _jsx(ListFooter, { indicator: window.indicator, selectedCount: selectedCount, message: message }), markedApps > 0 ? _jsxs(Text, { color: theme.muted, children: [markedApps, " Apps marked"] }) : null, legendNeeded ? _jsx(Text, { color: theme.muted, children: LEGEND }) : null, checkingSince !== undefined && refreshingSince === undefined && mode.kind === "browse"
                 ? _jsx(Working, { label: "Checking App status\u2026", since: checkingSince }) : null, _jsx(ModePanel, { mode: mode })] }));
 }

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

@@ -66,6 +66,6 @@ export function ManagePanel({ mode }) {
         case "confirm-bulk-exposure":
             return (_jsxs(Text, { color: theme.warning, children: ["Adding hosts exposes the installed ", mode.plan.items.map((item) => item.label).join(", "), " to more hosts and needs separate confirmation (CLI: --confirm-additional-host). ", _jsx(DecisionPrompt, { children: "Confirm?" })] }));
         case "busy":
-            return _jsx(Working, { label: mode.label, since: mode.startedAt });
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Working, { label: mode.label, since: mode.startedAt }), (mode.done ?? []).length > 0 ? _jsxs(Text, { color: theme.muted, children: [mode.done.length, " finished"] }) : null] }));
     }
 }

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.js

@@ -184,6 +184,7 @@ export async function prepareUpdates(data, selected) {
             continue;
         const { context } = loaded;
         const outcome = await previewUpdateCandidates(items, context);
+        lines.push(...loaded.projectTarget.map(previewText));
         lines.push(...outcome.plans.flatMap((plan) => describeUpdatePreview(plan, scope, context.projectRoot, "prompt").map(previewText)));
         failures.push(...outcome.failures);
         groups.push({