@iseoane/agent-depot 0.4.1 → 0.5.1

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

@@ -2,6 +2,7 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createAppOperations } from "../app-flow.js";
+import { planAppRecipeRemoval, removeAppRecipe } from "../app-recipe-removal.js";
 import { BUILT_IN_SOURCE } from "../sources.js";
 import { handleCatalogActionKey } from "./catalog-flow.js";
 import { ActionPanel } from "./catalog-panel.js";
@@ -11,13 +12,11 @@ import { errorText } from "./batch.js";
 import { useMounted } from "./view-state.js";
 import { PreviewConfirm } from "./panel-parts.js";
 import { answerYesNo } from "./mode-keys.js";
-import { rowStyle, theme } from "./theme.js";
-import { computeWindow, pageStep } from "./window.js";
+import { theme } from "./theme.js";
 /**
- * Returns section focus, key dispatch (true when consumed), the recipe panel,
- * and the Git list's share of the common height budget. Sources owns key dispatch.
+ * Recipe loading and captured actions; Sources owns the single list and cursor.
  */
-export function useSourcesRecipes({ operations, environment, onCapturingChange, height, gitCount, }) {
+export function useSourcesRecipes({ operations, environment, onCapturingChange, highlightedFile, }) {
     const homeDirectory = environment?.homeDirectory;
     const appEnvironment = environment?.appEnvironment;
     const apps = useMemo(() => createAppOperations({
@@ -27,12 +26,8 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
     const mounted = useMounted();
     const [rows, setRows] = useState([]);
     const [error, setError] = useState();
+    const [notice, setNotice] = useState();
     const [loadError, setLoadError] = useState();
-    const [focused, setFocused] = useState(false);
-    // Ref mirrors keep Tab and subsequent keys in a single burst on the same section.
-    const focusRef = useRef(false);
-    const [index, setIndex] = useState(0);
-    const indexRef = useRef(0);
     const [mode, setModeState] = useState({ kind: "browse" });
     const modeRef = useRef(mode);
     const setMode = (next) => {
@@ -45,7 +40,7 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
         if (mounted.current)
             setMode({ kind: "browse" });
     };
-    const preview = async (entry, status) => {
+    const preview = async (entry, status, removeAfterApproval = false) => {
         setError(undefined);
         setMode({ kind: "busy" });
         try {
@@ -53,7 +48,7 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
             if (mounted.current) {
                 setMode({
                     kind: "approve",
-                    entry,
+                    entry, removeAfterApproval,
                     lines: [
                         `File: ${entry.file}`,
                         `Platform: ${entry.recipe?.platform ?? "all"}`,
@@ -117,66 +112,142 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
             }
         }
     };
-    /** Handles captured modes and browse keys only in the focused section. */
+    const startRemoval = async (entry) => {
+        setError(undefined);
+        setMode({ kind: "busy" });
+        try {
+            const approval = await apps.approvalStatus(entry);
+            if (approval.status === "needs approval") {
+                await preview(entry, approval.status, true);
+                return;
+            }
+            const removal = await planAppRecipeRemoval(apps, entry);
+            if (mounted.current)
+                setMode({ kind: removal.installed ? "uninstall-question" : "remove", removal });
+        }
+        catch (error) {
+            if (mounted.current) {
+                setError(errorText(error));
+                setMode({ kind: "browse" });
+            }
+        }
+    };
+    const uninstall = async (current) => {
+        setMode({ kind: "busy" });
+        try {
+            const result = current.kind === "uninstall-manual"
+                ? await apps.completeManual(current.plan, true)
+                : await apps.executeLifecycle(current.plan, true);
+            if (!mounted.current)
+                return;
+            if (result.status === "manual required")
+                setMode({ ...current, kind: "uninstall-manual" });
+            else if (result.status === "untracked")
+                setMode({ kind: "remove", removal: current.removal });
+            else {
+                setError(`Uninstall failed: ${result.reason ?? result.status}; recipe retained`);
+                setMode({ kind: "browse" });
+            }
+        }
+        catch (error) {
+            if (mounted.current) {
+                setError(`Uninstall failed: ${errorText(error)}; recipe retained`);
+                setMode({ kind: "browse" });
+            }
+        }
+    };
+    const startAdd = () => {
+        setError(undefined);
+        setMode({ kind: "guide" });
+    };
+    /** Captured actions take priority; browse actions use the unified cursor's recipe. */
     const handleKey = (input, key) => {
         const current = modeRef.current;
         if (current.kind === "busy")
             return true;
         if (current.kind === "install") {
-            // Host/scope/version are selection prompts; version chooses latest or fixed
-            // by number. Only the separate fixed mode accepts free-text version input.
-            // n declines these selections; fixed input and in-flight installs are untouched.
             const decline = input === "n" && ["host", "scope", "version"].includes(current.action.kind);
             handleCatalogActionKey(flow, current.action, input, decline ? { ...key, escape: true } : key);
             return true;
         }
         if (current.kind === "guide" || current.kind === "manual" || current.kind === "prompt") {
-            if (key.escape || input === "n")
+            if (key.escape || input === "n") {
                 setMode({ kind: "browse" });
+                void reload();
+            }
             else if (current.kind === "guide" && input === "1")
                 void startAI();
             else if (current.kind === "guide" && input === "2")
                 setMode({ kind: "manual" });
             return true;
         }
+        const cancel = () => setMode({ kind: "browse" });
         if (current.kind === "approve") {
             answerYesNo(input, key, () => {
                 setMode({ kind: "busy" });
-                void apps.approve(current.entry).then(finish, error => {
+                void apps.approve(current.entry).then(async () => {
+                    await reload();
+                    if (!mounted.current)
+                        return;
+                    if (current.removeAfterApproval)
+                        await startRemoval(current.entry);
+                    else
+                        setMode({ kind: "browse" });
+                }, error => {
                     if (mounted.current) {
                         setError(errorText(error));
-                        setMode({ kind: "browse" });
+                        cancel();
                     }
                 });
-            }, () => setMode({ kind: "browse" }));
+            }, cancel);
             return true;
         }
-        if (key.tab) {
-            setError(undefined);
-            focusRef.current = !focusRef.current;
-            setFocused(focusRef.current);
+        if (current.kind === "uninstall-question") {
+            answerYesNo(input, key, () => {
+                setMode({ kind: "busy" });
+                void apps.planLifecycle(current.removal.entry, "uninstall").then(plan => {
+                    if (mounted.current)
+                        setMode({ kind: !plan.argv && plan.manual ? "uninstall-manual" : "uninstall-confirm", removal: current.removal, plan });
+                }, error => { if (mounted.current) {
+                    setError(errorText(error));
+                    cancel();
+                } });
+            }, cancel);
             return true;
         }
-        if (!focusRef.current)
-            return false;
-        if (key.downArrow || input === "j" || key.upArrow || input === "k" || key.pageDown || key.pageUp) {
-            const step = key.pageDown || key.pageUp ? pageStep(recipeHeight) : 1;
-            const down = key.downArrow || input === "j" || key.pageDown;
-            indexRef.current = Math.min(Math.max(indexRef.current + (down ? step : -step), 0), Math.max(rows.length - 1, 0));
-            setIndex(indexRef.current);
+        if (current.kind === "uninstall-confirm" || current.kind === "uninstall-manual") {
+            answerYesNo(input, key, () => { void uninstall(current); }, cancel);
+            return true;
         }
-        else if (input === "n") {
-            setError(undefined);
-            setMode({ kind: "guide" });
+        if (current.kind === "remove") {
+            answerYesNo(input, key, () => {
+                setMode({ kind: "busy" });
+                void removeAppRecipe(apps, current.removal, true).then(async () => {
+                    if (mounted.current)
+                        setNotice(`Removed App recipe: ${current.removal.file}`);
+                    await finish();
+                }, error => {
+                    if (mounted.current) {
+                        setError(errorText(error));
+                        cancel();
+                    }
+                });
+            }, cancel);
+            return true;
         }
-        else if (input === "r") {
+        const row = rows.find(row => row.entry.file === highlightedFile());
+        if (!row)
+            return false;
+        if (input === "n")
+            startAdd();
+        else if (input === "r")
             void reload();
-        }
-        else if (key.return) {
-            const row = rows[Math.min(indexRef.current, rows.length - 1)];
-            if (row)
-                void preview(row.entry, row.status);
-        }
+        else if (key.return)
+            void preview(row.entry, row.status);
+        else if (input === "d")
+            void startRemoval(row.entry);
+        else
+            return false;
         return true;
     };
     /** Reloads parsing and approval receipts, never version/latest commands. */
@@ -201,16 +272,8 @@ export function useSourcesRecipes({ operations, environment, onCapturingChange,
         }
     }, [apps, mounted]);
     useEffect(() => { void reload(); }, [reload]);
-    // Give each nonempty section half the rows, then reclaim unused Git capacity.
-    const budget = Math.max(height, gitCount > 0 && rows.length > 0 ? 2 : 1);
-    const gitShare = Math.min(gitCount, Math.max(1, Math.floor(budget / 2)));
-    const recipeHeight = Math.min(rows.length, budget - gitShare);
-    const gitHeight = Math.max(1, budget - recipeHeight);
-    const at = Math.min(index, rows.length - 1);
-    const window = computeWindow(rows.length, at, recipeHeight);
-    const panel = (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { ...rowStyle(focused && rows.length === 0), children: ["App recipes \u00B7 ", apps.directory, " \u00B7 Tab switches section"] }), focused ? _jsx(Text, { color: theme.muted, children: "j/k move \u00B7 Enter preview \u00B7 n add recipe \u00B7 r reload" }) : null, loadError ? _jsxs(Text, { color: theme.error, children: ["Error loading App recipes: ", loadError] }) : null, error ? _jsx(Text, { color: theme.error, children: error }) : null, rows.slice(window.start, window.end).map(({ entry, status }, offset) => {
-                const selected = focused && window.start + offset === at;
-                return (_jsxs(Text, { ...rowStyle(selected), children: [selected ? "> " : "  ", entry.file.split(/[\\/]/u).pop(), " \u00B7 ", status] }, entry.file));
-            }), window.indicator ? _jsx(Text, { color: theme.muted, children: window.indicator }) : null, mode.kind === "guide" ? (_jsxs(Text, { children: ["1 With the AI skill · install if missing, then copy the prompt\n", "2 Manual · write a recipe using the schema\nn or Esc closes"] })) : null, mode.kind === "manual" ? (_jsxs(Text, { children: ["Write a JSON recipe in ", apps.directory, "\n", "Schema: agent-depot app schema \u00B7 n or Esc closes"] })) : null, mode.kind === "prompt" ? (_jsxs(Text, { children: ["Use the agent-depot-apprecipe skill to create the recipe for <app>", "\n", "Recipes: ", apps.directory, " \u00B7 n or Esc closes"] })) : null, mode.kind === "install" ? _jsx(ActionPanel, { mode: mode.action }) : null, mode.kind === "busy" ? _jsx(Text, { children: "Working..." }) : null, mode.kind === "approve" ? (_jsx(PreviewConfirm, { lines: mode.lines, question: `Approve ${appName(mode.entry)}? y/n` })) : null] }));
-    return { focused, handleKey, gitHeight, panel };
+    const panel = (_jsxs(Box, { flexDirection: "column", children: [loadError ? _jsxs(Text, { color: theme.error, children: ["Error loading App recipes: ", loadError] }) : null, error ? _jsx(Text, { color: theme.error, children: error }) : null, notice ? _jsx(Text, { color: theme.success, children: notice }) : null, mode.kind === "guide" ? (_jsxs(Text, { children: ["1 With the AI skill · install if missing, then copy the prompt\n", "2 Manual · write a recipe using the schema\nn or Esc closes"] })) : null, mode.kind === "manual" ? (_jsxs(Text, { children: ["Write a JSON recipe in ", apps.directory, "\n", "Schema: agent-depot app schema \u00B7 n or Esc closes"] })) : null, mode.kind === "prompt" ? (_jsxs(Text, { children: ["Use the agent-depot-apprecipe skill to create the recipe for <app>", "\n", "Recipes: ", apps.directory, " \u00B7 n or Esc closes"] })) : null, mode.kind === "install" ? _jsx(ActionPanel, { mode: mode.action }) : null, mode.kind === "busy" ? _jsx(Text, { children: "Working..." }) : null, mode.kind === "approve" ? (_jsx(PreviewConfirm, { lines: mode.lines, question: `Approve ${appName(mode.entry)}? y/n` })) : null, mode.kind === "uninstall-question" ? (_jsxs(Text, { children: ["App ", appName(mode.removal.entry), " is installed or tracked", mode.removal.installedVersion ? ` (${mode.removal.installedVersion})` : "", ". Uninstall it before removing the recipe? y/n (n cancels removal)"] })) : null, mode.kind === "uninstall-confirm" || mode.kind === "uninstall-manual" ? (_jsx(PreviewConfirm, { lines: appStepLines(mode.plan), question: mode.kind === "uninstall-manual"
+                    ? "Complete the manual uninstall, then check now? y/n"
+                    : `Uninstall ${appName(mode.removal.entry)}? y/n` })) : null, mode.kind === "remove" ? (_jsx(PreviewConfirm, { lines: [`Delete recipe: ${mode.removal.file}`, "Only this recipe file or symlink will be removed; App data and Host configuration are not deleted."], question: `Remove recipe for ${appName(mode.removal.entry)}? y/n` })) : null] }));
+    return { rows, handleKey, startAdd, reload, clearMessage: () => { setError(undefined); setNotice(undefined); }, panel, directory: apps.directory };
 }

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

@@ -6,6 +6,14 @@ import { rowStyle, theme } from "./theme.js";
 import { computeWindow, pageStep, useListHeight } from "./window.js";
 import { useKeys } from "./keys.js";
 import { useSourcesRecipes } from "./sources-recipes.js";
+/** Footer keys for the selected row; App seeds the footer before the view reports a selection. */
+export function sourceRowHints(row) {
+    if (row === undefined)
+        return "n add · q quit";
+    return row.kind === "app"
+        ? "j/k move · Enter preview/approve · n add · r refresh · d remove · q quit"
+        : "j/k move · space mark · a all · Enter catalog · n add · r refresh · d remove · q quit";
+}
 /** The highlighted index: by stable id while that source exists, otherwise the bounded fallback index. */
 function resolveIndex(sources, selection) {
     const found = sources.findIndex((source) => source.id === selection.id);
@@ -29,7 +37,7 @@ async function refreshEach(operations, targets) {
 function errorText(error) {
     return error instanceof Error ? error.message : String(error);
 }
-export function SourcesView({ operations, onCapturingChange, onOpenCatalog, listHeight, environment }) {
+export function SourcesView({ operations, onCapturingChange, onOpenCatalog, listHeight, environment, onHintsChange }) {
     const height = useListHeight(listHeight, 9);
     const [state, setState] = useState({ status: "loading" });
     // The highlight follows the source id; the index is only the fallback once that source is gone.
@@ -95,12 +103,28 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
     const sources = allSources.filter((source) => source.kind === "git");
     const sourcesRef = useRef(sources);
     sourcesRef.current = sources;
-    const selected = resolveIndex(sources, selection);
+    const rowsRef = useRef([]);
     const recipes = useSourcesRecipes({
-        operations, environment, onCapturingChange, height, gitCount: sources.length,
+        operations, environment, onCapturingChange,
+        highlightedFile: () => {
+            const rows = rowsRef.current;
+            const row = rows[resolveIndex(rows, selectionRef.current)];
+            return row?.kind === "app" ? row.recipe.entry.file : undefined;
+        },
     });
+    const rows = [
+        ...sources.map((source) => ({ id: source.id, kind: "skills", source })),
+        ...recipes.rows.map((recipe) => ({ id: `recipe:${recipe.entry.file}`, kind: "app", recipe })),
+    ];
+    rowsRef.current = rows;
+    const selected = resolveIndex(rows, selection);
+    const selectedRow = rows[selected];
+    const hints = sourceRowHints(selectedRow);
+    useEffect(() => { onHintsChange?.(hints); }, [hints, onHintsChange]);
     const select = (index) => {
-        const listed = sourcesRef.current;
+        setMessage(undefined);
+        recipes.clearMessage();
+        const listed = rowsRef.current;
         const bounded = Math.min(Math.max(index, 0), Math.max(listed.length - 1, 0));
         setSelection({ id: listed[bounded]?.id, index: bounded });
     };
@@ -164,6 +188,19 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
         const mode = modeRef.current;
         if (mode.kind === "busy")
             return;
+        if (mode.kind === "add-kind") {
+            if (key.escape || input === "n")
+                dispatch({ type: "done" });
+            else if (input === "1") {
+                typed.current = "";
+                dispatch({ type: "input" });
+            }
+            else if (input === "2") {
+                dispatch({ type: "done" });
+                recipes.startAdd();
+            }
+            return;
+        }
         if (mode.kind === "input") {
             if (key.escape)
                 dispatch({ type: "done" });
@@ -205,14 +242,13 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
                 dispatch({ type: "done" });
             return;
         }
-        if (recipes.handleKey(input, key)) {
-            if (key.tab)
-                setMessage(undefined);
+        if (recipes.handleKey(input, key))
             return;
-        }
+        const rows = rowsRef.current;
+        const at = resolveIndex(rows, selectionRef.current);
+        const row = rows[at];
         const listed = sourcesRef.current;
-        const at = resolveIndex(listed, selectionRef.current);
-        const highlighted = listed[at];
+        const highlighted = row?.kind === "skills" ? row.source : undefined;
         if (key.downArrow || input === "j") {
             select(at + 1);
         }
@@ -220,24 +256,23 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
             select(at - 1);
         }
         else if (key.pageDown) {
-            select(at + pageStep(recipes.gitHeight));
+            select(at + pageStep(height));
         }
         else if (key.pageUp) {
-            select(at - pageStep(recipes.gitHeight));
+            select(at - pageStep(height));
         }
         else if (key.return && highlighted) {
             onOpenCatalog?.(highlighted);
         }
         else if (input === "n") {
             setMessage(undefined);
-            typed.current = "";
-            dispatch({ type: "input" });
+            dispatch({ type: "add-kind" });
         }
         else if (input === " " && highlighted) {
             setMessage(undefined);
             toggle([highlighted.id]);
         }
-        else if (input === "a") {
+        else if (input === "a" && row?.kind !== "app") {
             if (listed.length === 0)
                 stop("There are no Git sources to select");
             else {
@@ -245,7 +280,7 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
                 toggle(listed.map((source) => source.id));
             }
         }
-        else if (input === "r") {
+        else if (input === "r" && row?.kind !== "app") {
             const targets = markedRef.current.size > 0
                 ? listed.filter((source) => markedRef.current.has(source.id))
                 : highlighted ? [highlighted] : [];
@@ -264,13 +299,16 @@ export function SourcesView({ operations, onCapturingChange, onOpenCatalog, list
         return _jsx(Text, { children: "Loading sources..." });
     if (state.status === "error")
         return _jsxs(Text, { color: theme.error, children: ["Error: ", state.message] });
-    const window = computeWindow(sources.length, selected, recipes.gitHeight);
-    return (_jsxs(Box, { flexDirection: "column", children: [builtin ? _jsxs(Text, { color: theme.muted, children: ["    ", builtin.id, " \u00B7 included"] }) : null, sources.length === 0 ? _jsx(Text, { children: "No Git sources \u00B7 n to add" }) : null, sources.length > 0 ? _jsxs(Text, { color: theme.muted, children: ["      ", "ID  KIND  URL"] }) : null, sources.slice(window.start, window.end).map((source, offset) => {
+    const window = computeWindow(rows.length, selected, height);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.muted, children: ["      ", "ID  KIND  LOCATION / STATUS"] }), builtin ? _jsxs(Text, { color: theme.muted, children: ["    ", builtin.id, "  skills  included"] }) : null, rows.length === 0 ? _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;
-                return (_jsxs(Text, { ...rowStyle(!recipes.focused && index === selected), children: [!recipes.focused && index === selected ? "> " : "  ", marked.has(source.id) ? "[x] " : "[ ] ", source.id, "  ", source.kind, "  ", source.url] }, source.id));
+                const id = row.kind === "skills" ? row.source.id : row.recipe.entry.recipe?.name ?? row.recipe.entry.file.split(/[\\/]/u).pop();
+                return (_jsxs(Text, { ...rowStyle(index === selected), children: [index === selected ? "> " : "  ", row.kind === "skills" ? (marked.has(row.id) ? "[x] " : "[ ] ") : "    ", id, "  ", row.kind, "  ", row.kind === "skills" ? row.source.url : `${row.recipe.entry.file} · ${row.recipe.status}`] }, row.id));
             }), window.indicator ? _jsx(Text, { color: theme.muted, children: window.indicator }) : null, selectedCount > 0 ? _jsxs(Text, { children: [selectedCount, " selected"] }) : null, recipes.panel, _jsx(Prompt, { mode: mode }), message ? _jsx(Text, { color: message.kind === "error" ? theme.error : theme.success, children: message.text }) : null] }));
 }
 function Prompt({ mode }) {
+    if (mode.kind === "add-kind")
+        return _jsx(Text, { children: "Add: 1 Git Source (skills + Packages) \u00B7 2 App recipe (Esc cancel)" });
     if (mode.kind === "input")
         return _jsxs(Text, { children: ["URL: ", mode.value] });
     if (mode.kind === "busy")

package/dist/src/tui/tree.js

@@ -1,7 +1,6 @@
-/** Initially only the first group with children is open; every other group starts collapsed. */
-export function defaultExpanded(roots) {
-    const first = roots.find((root) => (root.children?.length ?? 0) > 0);
-    return new Set(first ? [first.id] : []);
+/** Every group starts collapsed until the user expands it. */
+export function defaultExpanded() {
+    return new Set();
 }
 /** The visible nodes in display order: children appear only under expanded parents. */
 export function flattenVisible(roots, expanded) {

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

@@ -81,9 +81,12 @@ export function useUpdatesFlow(inputs) {
         }
         if (!mounted.current)
             return;
-        setMessage(result);
         // The sources were fetched for the check that was just applied; only the installations changed.
+        // The summary lands with the refreshed list, so no check is still writing when the view reports done.
         await load(false);
+        if (!mounted.current)
+            return;
+        setMessage(result);
     };
     return { state, load, startPreview, apply };
 }

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

@@ -7,7 +7,7 @@ import { PreviewLines } from "./panel-parts.js";
 /** What the last check found out: its age, how the sources were refreshed, and what failed. */
 export function CheckStatus({ data, now }) {
     const errors = data.results.filter((result) => result.error !== undefined);
-    return (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.muted, children: ["checked ", formatAgo(now - data.checkedAt), " \u00B7 ", describeRefresh(data)] }), data.refresh.failed.map((failure) => (_jsxs(Text, { color: theme.warning, children: ["refresh failed for ", failure.source, ": ", failure.reason] }, failure.source))), data.appError ? _jsxs(Text, { color: theme.error, children: ["Error (Apps): ", data.appError] }) : null, errors.map((result) => _jsxs(Text, { color: theme.error, children: ["Error (", result.scope, "): ", result.error] }, result.scope))] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.muted, children: ["checked ", formatAgo(now - data.checkedAt), " \u00B7 ", describeRefresh(data)] }), data.refresh.failed.map((failure) => (_jsxs(Text, { color: theme.warning, children: ["refresh failed for ", failure.source, ": ", failure.reason] }, failure.source))), data.appError ? _jsxs(Text, { color: theme.error, children: ["Error (Apps): ", data.appError] }) : null, data.packageError ? _jsxs(Text, { color: theme.error, children: ["Error (Packages): ", data.packageError] }) : null, errors.map((result) => _jsxs(Text, { color: theme.error, children: ["Error (", result.scope, "): ", result.error] }, result.scope))] }));
 }
 /** 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 }) {
@@ -35,7 +35,7 @@ export function ModePanel({ mode }) {
         case "busy":
             return mode.label === REFRESHING || mode.label === CHECKING ? null : _jsx(Text, { children: mode.label });
         case "preview":
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(PreviewLines, { lines: mode.prepared.lines }), _jsx(PreviewLines, { lines: mode.prepared.appFailures }), mode.prepared.failures.map(({ item, message }) => (_jsxs(Text, { color: theme.error, children: ["Preview failed for ", JSON.stringify(item.id), ": ", message] }, item.id))), mode.prepared.applicable.length === 0
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(PreviewLines, { lines: mode.prepared.lines }), _jsx(PreviewLines, { lines: mode.prepared.appFailures }), _jsx(PreviewLines, { lines: mode.prepared.packageFailures }), mode.prepared.failures.map(({ item, message }) => (_jsxs(Text, { color: theme.error, children: ["Preview failed for ", JSON.stringify(item.id), ": ", message] }, item.id))), mode.prepared.applicable.length === 0
                         ? _jsx(Text, { children: "Nothing can be applied. Enter/Esc to go back" })
                         : _jsxs(Text, { children: ["Apply ", mode.prepared.applicable.length, " ", mode.prepared.applicable.length === 1 ? "update" : "updates", "? y/n"] })] }));
         case "confirm-paths":

package/dist/src/tui/updates.js

@@ -1,7 +1,10 @@
 import { checkAppUpdates, createAppOperations } from "../app-flow.js";
+import { describeCoordinates, 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";
 import { formatVersionEvidence } from "./installations.js";
+import { installedEvidenceLabel, packagePlanLines, packageStatusLabel, packageVersionLabel, recordedVersionLabel } from "./package-rows.js";
 /** Every scope the view can assess, in display order. */
 export const UPDATE_SCOPES = ["project", "user-global"];
 const APP_STATUS_LABEL = {
@@ -68,6 +71,7 @@ async function refreshSources(operations, selections) {
  */
 export async function loadUpdateRows(operations, environment, options) {
     const apps = createAppOperations({ homeDirectory: environment.homeDirectory, ...environment.appEnvironment });
+    const packages = packageOperationsOf(environment);
     let refresh = { attempted: false, refreshed: [], failed: [], unreadable: [] };
     if (options.refresh) {
         options.onPhase?.("refreshing");
@@ -121,7 +125,29 @@ export async function loadUpdateRows(operations, environment, options) {
             reason: check.reason ?? check.inspection.reason ?? check.inspection.status,
         });
     }
-    return { results, rows, refresh, apps, appError, checkedAt: (options.now ?? Date.now)() };
+    let packageChecks = [];
+    let packageError;
+    try {
+        packageChecks = await packages.checkUpdates();
+    }
+    catch (error) {
+        packageError = errorText(error);
+    }
+    for (const check of packageChecks) {
+        rows.push({
+            kind: "package",
+            key: `package:${selectionKey(check.installed.selection)}`,
+            scope: "user-global",
+            check,
+            path: `Package: ${describeCoordinates(check.installed.selection)}`,
+            policy: formatVersionPolicy(check.installed.selection.version),
+            installed: recordedVersionLabel(check.installed),
+            available: check.available === undefined ? "?" : packageVersionLabel(check.available),
+            status: packageStatusLabel(check.status),
+            reason: check.reason ?? "the host reports no usable version evidence",
+        });
+    }
+    return { results, rows, refresh, apps, packages, appError, packageError, checkedAt: (options.now ?? Date.now)() };
 }
 /** `just now`, `42s ago`, `5 min ago`, `2 h ago`. */
 export function formatAgo(elapsedMs) {
@@ -140,10 +166,12 @@ export async function prepareUpdates(data, selected) {
     const groups = [];
     const appPlans = [];
     const appFailures = [];
+    const packagePlans = [];
+    const packageFailures = [];
     const lines = [];
     const failures = [];
     for (const { scope, loaded } of data.results) {
-        const items = selected.filter((row) => row.kind !== "app" && row.scope === scope).map((row) => row.item);
+        const items = selected.filter((row) => row.kind !== "app" && row.kind !== "package" && row.scope === scope).map((row) => row.item);
         if (!loaded || items.length === 0)
             continue;
         const { context } = loaded;
@@ -164,16 +192,32 @@ export async function prepareUpdates(data, selected) {
         try {
             const plan = await data.apps.planLifecycle(row.check.entry, "update", undefined, row.check);
             appPlans.push(plan);
-            lines.push(`Environment: ${plan.environment}`, row.path, `Version: ${plan.previousVersion} -> ${plan.latestVersion ?? "unknown"}`, ...(plan.argv ? [`argv: ${JSON.stringify(plan.argv)}`, `Executable: ${plan.executable ?? "unavailable"}`] : []), ...(plan.manual ? [`Manual: ${plan.manual}`] : []), `Working directory: ${plan.cwd}`, ...(plan.warning ? [plan.warning] : []));
+            lines.push(`Environment: ${plan.environment}`, row.path, `Version: ${plan.previousVersion} -> ${plan.latestVersion ?? "unknown"}`, ...(plan.argv ? [`argv: ${JSON.stringify(plan.argv)}`, `Executable: ${plan.executable ?? `${JSON.stringify(plan.argv[0])} not found in PATH`}`] : []), ...(plan.manual ? [`Manual: ${plan.manual}`] : []), `Working directory: ${plan.cwd}`, ...(plan.warning ? [plan.warning] : []));
         }
         catch (error) {
             appFailures.push(`Failed ${row.path}: preview failed: ${errorText(error)}`);
         }
     }
+    for (const row of selected) {
+        if (row.kind !== "package" || !data.packages)
+            continue;
+        try {
+            const plan = await data.packages.planLifecycle(row.check.installed.selection, "update");
+            const approval = await data.packages.approvalStatus(row.check.installed.selection, "update");
+            packagePlans.push({ plan, approval });
+            lines.push(...packagePlanLines(plan, approval));
+            if (approval === "needs approval")
+                lines.push("This apply approves the declaration above.");
+        }
+        catch (error) {
+            packageFailures.push(`Failed ${row.path}: preview failed: ${errorText(error)}`);
+        }
+    }
     return {
         groups, apps: data.apps, appPlans, appFailures,
+        packages: data.packages, packagePlans, packageFailures,
         lines,
-        applicable: [...groups.flatMap((group) => group.applicable), ...appPlans],
+        applicable: [...groups.flatMap((group) => group.applicable), ...appPlans, ...packagePlans.map(({ plan }) => plan)],
         failures,
         nonCanonicalPaths: groups.flatMap((group) => group.nonCanonicalPaths.map((location) => ({ scope: group.scope, path: location }))),
     };
@@ -220,7 +264,31 @@ export async function runUpdates(prepared, confirmedPaths, confirmManual) {
             failedLines.push(`Failed ${name}: ${errorText(error)}`);
         }
     }
+    for (const { plan, approval } of prepared.packagePlans ?? []) {
+        const name = `Package: ${plan.descriptor.name} (${plan.selection.host})`;
+        try {
+            const packages = prepared.packages;
+            if (!packages)
+                throw new Error("Package operations unavailable; check again");
+            if (approval === "needs approval")
+                await packages.approve(plan.selection, plan.action);
+            const result = await packages.executeLifecycle(plan, true);
+            if (result.status === "updated") {
+                updated.push(`Updated ${name}: ${installedEvidenceLabel(result.previous)} -> ${installedEvidenceLabel(result.verified)}`);
+            }
+            else if (result.status === "failed" || result.status === "stale plan" || result.status === "manual required") {
+                failedLines.push(`Failed ${name}: ${result.reason}`);
+            }
+            else {
+                failedLines.push(`Failed ${name}: unexpected result ${JSON.stringify(result.status)}`);
+            }
+        }
+        catch (error) {
+            failedLines.push(`Failed ${name}: ${errorText(error)}`);
+        }
+    }
     failedLines.push(...prepared.appFailures);
+    failedLines.push(...prepared.packageFailures);
     const previewFailed = prepared.failures.map(({ item, message }) => `Failed ${item.selection.path}: preview failed: ${message}`);
     const failed = failedLines.length + previewFailed.length;
     return {

package/dist/src/tui/window.js

@@ -1,4 +1,4 @@
-import { useStdout } from "ink";
+import { useWindowSize } from "ink";
 /** Rows assumed when the terminal size is unknown (for example under test renderers). */
 export const FALLBACK_TERMINAL_ROWS = 24;
 /** Lines the shell itself uses: title, tab bar, separator and footer hint. */
@@ -23,9 +23,8 @@ export function pageStep(height) {
  * view's own `reserved` lines. `override` fixes the height for tests.
  */
 export function useListHeight(override, reserved) {
-    const { stdout } = useStdout();
+    const { rows } = useWindowSize();
     if (override !== undefined)
         return Math.max(override, 1);
-    const rows = stdout.rows ?? FALLBACK_TERMINAL_ROWS;
-    return Math.max(rows - APP_CHROME_ROWS - reserved, MINIMUM_ROWS);
+    return Math.max((rows || FALLBACK_TERMINAL_ROWS) - APP_CHROME_ROWS - reserved, MINIMUM_ROWS);
 }