@iseoane/agent-depot 0.5.1 → 0.6.0

package/dist/src/self-update.js

@@ -0,0 +1,141 @@
+import { lstat, realpath } from "node:fs/promises";
+import path from "node:path";
+import { compareAppVersions } from "./app-version.js";
+import { createPortableExecutableResolver } from "./executable-resolution.js";
+import { runProcess } from "./process-runner.js";
+const REGISTRY_URL = "https://registry.npmjs.org";
+const MAX_REGISTRY_RESPONSE_BYTES = 8 * 1024;
+const MAX_NPM_STDERR_BYTES = 16 * 1024;
+const COMMAND_TIMEOUT_MS = 30_000;
+function compareVersions(left, right) {
+    const comparison = compareAppVersions(left, right);
+    if (comparison === undefined)
+        throw new Error(`Invalid semantic version comparison ${JSON.stringify(left)} and ${JSON.stringify(right)}`);
+    return comparison;
+}
+async function latestVersion(fetcher, packageName) {
+    const encodedName = encodeURIComponent(packageName).replace(/^%40/u, "@");
+    const response = await fetcher(`${REGISTRY_URL}/${encodedName}/latest`, {
+        signal: AbortSignal.timeout(10_000),
+        credentials: "omit",
+        redirect: "error",
+    });
+    if (!response.ok)
+        throw new Error(`npm registry returned HTTP ${response.status}`);
+    const contentLength = Number(response.headers.get("content-length"));
+    if (Number.isFinite(contentLength) && contentLength > MAX_REGISTRY_RESPONSE_BYTES) {
+        throw new Error("npm registry response exceeded the size limit");
+    }
+    if (!response.body)
+        throw new Error("npm registry response did not include a body");
+    const reader = response.body.getReader();
+    const chunks = [];
+    let responseBytes = 0;
+    try {
+        for (;;) {
+            const chunk = await reader.read();
+            if (chunk.done)
+                break;
+            responseBytes += chunk.value.byteLength;
+            if (responseBytes > MAX_REGISTRY_RESPONSE_BYTES) {
+                await reader.cancel();
+                throw new Error("npm registry response exceeded the size limit");
+            }
+            chunks.push(chunk.value);
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+    const body = Buffer.concat(chunks).toString("utf8");
+    let payload;
+    try {
+        payload = JSON.parse(body);
+    }
+    catch {
+        throw new Error("npm registry returned invalid JSON");
+    }
+    if (typeof payload !== "object" || payload === null || !("version" in payload) || typeof payload.version !== "string") {
+        throw new Error("npm registry response did not contain a version");
+    }
+    compareVersions(payload.version, payload.version);
+    return payload.version;
+}
+function successfulStdout(result) {
+    if (result.code !== 0 || result.signal !== null || result.timedOut || result.outputTooLarge)
+        return undefined;
+    return result.stdout.toString("utf8").trim();
+}
+export function createSelfUpdateOperations(options) {
+    const resolveExecutable = options.resolveExecutable ?? createPortableExecutableResolver();
+    const run = options.run ?? runProcess;
+    const fetcher = options.fetch ?? globalThis.fetch;
+    async function npmGlobalExecutable() {
+        const npm = await resolveExecutable("npm");
+        if (npm.blocked || npm.executable === undefined)
+            return undefined;
+        const target = await realpath(npm.executable).catch(() => undefined);
+        if (target === undefined || path.basename(target) !== "npm-cli.js" || path.basename(path.dirname(target)) !== "bin" || path.basename(path.dirname(path.dirname(target))) !== "npm")
+            return undefined;
+        let rootResult;
+        try {
+            rootResult = await run(npm.executable, ["root", "--global", "--silent", "--logs-max=0", "--no-update-notifier"], {
+                captureStdout: true,
+                maxOutputBytes: 4096,
+                maxStderrBytes: MAX_NPM_STDERR_BYTES,
+                timeoutMs: COMMAND_TIMEOUT_MS,
+            });
+        }
+        catch {
+            return undefined;
+        }
+        const globalRoot = successfulStdout(rootResult);
+        if (globalRoot === undefined || !path.isAbsolute(globalRoot))
+            return undefined;
+        const installedPackagePath = path.join(globalRoot, ...options.packageName.split("/"));
+        const installedPackage = await lstat(installedPackagePath).catch(() => undefined);
+        if (installedPackage === undefined || !installedPackage.isDirectory())
+            return undefined;
+        const actualRoot = await realpath(options.packageRoot).catch(() => undefined);
+        const reportedRoot = await realpath(installedPackagePath).catch(() => undefined);
+        return actualRoot !== undefined && actualRoot === reportedRoot ? npm.executable : undefined;
+    }
+    return {
+        async check() {
+            compareVersions(options.packageVersion, options.packageVersion);
+            const npm = await npmGlobalExecutable();
+            if (npm === undefined) {
+                return { kind: "unsupported", reason: "this CLI is not verified in npm's global package directory" };
+            }
+            const latest = await latestVersion(fetcher, options.packageName);
+            const comparison = compareVersions(latest, options.packageVersion);
+            if (comparison === 0)
+                return { kind: "current", current: options.packageVersion, latest };
+            if (comparison < 0)
+                return { kind: "ahead", current: options.packageVersion, latest };
+            return { kind: "available", current: options.packageVersion, latest };
+        },
+        async apply(version) {
+            let comparison;
+            try {
+                comparison = compareVersions(version, options.packageVersion);
+            }
+            catch {
+                throw new Error(`Refusing invalid Agent Depot version ${JSON.stringify(version)}`);
+            }
+            if (comparison <= 0)
+                throw new Error(`Refusing to downgrade Agent Depot from ${options.packageVersion} to ${version}`);
+            const npm = await npmGlobalExecutable();
+            if (npm === undefined)
+                throw new Error("this CLI is not verified in npm's global package directory");
+            const result = await run(npm, [
+                "install", "--global", "--no-audit", "--no-fund", "--no-update-notifier", "--logs-max=0", "--ignore-scripts",
+                "--registry=https://registry.npmjs.org/", `${options.packageName}@${version}`,
+            ], { maxStderrBytes: MAX_NPM_STDERR_BYTES, timeoutMs: COMMAND_TIMEOUT_MS });
+            if (result.code !== 0 || result.signal !== null || result.timedOut || result.outputTooLarge) {
+                const detail = result.timedOut ? "timed out" : result.outputTooLarge ? "produced too much output" : result.signal ? `stopped by ${result.signal}` : `exited with code ${result.code ?? "unknown"}`;
+                throw new Error(`npm global update ${detail}${result.stderr ? `: ${result.stderr.trim()}` : ""}`);
+            }
+        },
+    };
+}

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

@@ -1,27 +1,67 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { Box, Text } from "ink";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Text, useWindowSize } from "ink";
 import { PROJECT_HOSTS } from "../project-manifest.js";
 import { errorText, runBatch } from "./batch.js";
-import { answerYesNo, hostChecklistKey } from "./mode-keys.js";
-import { HostChecklist, PreviewConfirm } from "./panel-parts.js";
-export const APP_KINDS = ["app-approve", "app-hosts", "app-confirm", "app-manual"];
+import { hostChecklistKey, movePreviewCursor } from "./mode-keys.js";
+import { BorderPanel, HostChecklist, PreviewConfirm } from "./panel-parts.js";
+import { previewViewport } from "./preview-window.js";
+export const APP_KINDS = ["app-busy", "app-approve", "app-hosts", "app-confirm", "app-manual"];
 /** Narrows the view's mode without asserting a partial mode is an App mode. */
 export function isAppMode(mode) {
     return APP_KINDS.some(kind => kind === mode.kind);
 }
 /** Recipe name, falling back to the file identity for invalid recipes. */
 export const appName = (entry) => entry.recipe?.name ?? entry.file;
+function appPreviewChrome(mode) {
+    const title = mode.kind === "app-approve" ? "Recipe approval · does not install"
+        : mode.kind === "app-manual" ? "App manual step" : `App ${mode.plan.action} confirmation`;
+    const question = mode.kind === "app-approve" ? `Approve ${appName(mode.entry)}? y/n · recipe approval does not install the App.`
+        : mode.kind === "app-manual" ? "Manual step done, check now? y/n"
+            : `${mode.plan.action} ${appName(mode.plan.entry)}? y/n`;
+    return { title, questions: [question, "Scroll to end before y; n cancels."], footerRows: 2 };
+}
 export function appStepLines(step) {
+    const argv = step.argv;
     return [
-        ...(step.argv ? [`argv: ${JSON.stringify(step.argv)}`, `Executable: ${step.executable ?? `${JSON.stringify(step.argv[0])} not found in PATH`}`] : []),
+        ...(argv ? [
+            "argv: [",
+            ...argv.map((argument, index) => `  ${JSON.stringify(argument)}${index < argv.length - 1 ? "," : ""}`),
+            "]",
+            `Executable: ${step.executable ?? `${JSON.stringify(argv[0])} not found in PATH`}`,
+        ] : []),
         ...(step.manual ? [`Manual: ${step.manual}`] : []),
+        ...(step.declaration ? [step.declaration] : []),
+        ...(step.pattern ? [`Version pattern: ${step.pattern}`] : []),
+        ...(step.environment ? [`Environment: ${step.environment}`] : []),
         `Working directory: ${step.cwd}`,
         ...(step.warning ? [step.warning] : []),
     ];
 }
+export function appRecipePreviewLines(entry, status, steps) {
+    const recipe = entry.recipe;
+    return [
+        `File: ${entry.file}`,
+        `Name: ${recipe?.name ?? entry.file}`,
+        `Platform: ${recipe?.platform ?? "all"}`,
+        `Status: ${status}`,
+        ...(recipe?.homepage ? [`Homepage: ${recipe.homepage}`] : []),
+        ...(recipe?.skills ? [`Owned Skills: ${JSON.stringify(recipe.skills)}`] : []),
+        ...steps.flatMap(step => [step.step, ...appStepLines(step)]),
+    ];
+}
+function appPreviewLines(mode) {
+    if (mode.kind === "app-approve")
+        return mode.lines;
+    return [
+        `App: ${appName(mode.plan.entry)} ${mode.plan.action}${mode.plan.host ? ` (${mode.plan.host})` : ""}`,
+        ...(mode.plan.previousVersion ? [`Previous version: ${mode.plan.previousVersion}`] : []),
+        ...(mode.plan.latestVersion ? [`Latest version: ${mode.plan.latestVersion}`] : []),
+        ...appStepLines(mode.plan),
+    ];
+}
 async function prepareNext(context, requests, results = [], failures = 0) {
     const { manage, apps } = context;
-    manage.setMode({ kind: "busy", label: "Preparing App step..." });
+    manage.setMode({ kind: "app-busy", label: "Preparing App step..." });
     // Independent planning failures never stop the remaining marked Apps.
     const [request, ...remaining] = requests;
     if (!request) {
@@ -33,7 +73,7 @@ async function prepareNext(context, requests, results = [], failures = 0) {
         if (manage.isMounted()) {
             manage.setMode({
                 kind: !plan.argv && plan.manual ? "app-manual" : "app-confirm",
-                plan, remaining, results, failures,
+                plan, remaining, results, failures, cursor: 0,
             });
         }
     }
@@ -52,10 +92,10 @@ export async function startAppAction(context, entries, input) {
             const entry = entries[0];
             if (!entry)
                 throw new Error("No App selected");
-            manage.setMode({ kind: "busy", label: "Preparing recipe approval..." });
-            const steps = await apps.preview(entry);
+            manage.setMode({ kind: "app-busy", label: "Preparing recipe approval..." });
+            const [steps, approval] = await Promise.all([apps.preview(entry), apps.approvalStatus(entry)]);
             if (manage.isMounted()) {
-                manage.setMode({ kind: "app-approve", entry, lines: steps.flatMap(step => [step.step, ...appStepLines(step)]) });
+                manage.setMode({ kind: "app-approve", entry, lines: appRecipePreviewLines(entry, approval.status, steps), cursor: 0 });
             }
         }
         else if (input === "h") {
@@ -78,7 +118,7 @@ export async function startAppAction(context, entries, input) {
 }
 async function execute(context, mode) {
     const { manage, apps } = context;
-    manage.setMode({ kind: "busy", label: "Running App step..." });
+    manage.setMode({ kind: "app-busy", label: "Running App step..." });
     let manualRequired = false;
     const [outcome] = await runBatch([mode.plan], async (plan) => {
         const result = mode.kind === "app-manual"
@@ -102,6 +142,8 @@ async function execute(context, mode) {
 /** Applies checklist and y/n keys, continuing independent batch steps after cancellation or failure. */
 export function handleAppKey(context, mode, input, key) {
     const { manage, apps } = context;
+    if (mode.kind === "app-busy")
+        return;
     const cancel = () => {
         manage.browse();
         manage.setMessage({ kind: "ok", text: "App action cancelled" });
@@ -123,35 +165,42 @@ export function handleAppKey(context, mode, input, key) {
                 void prepareNext(context, requests);
         }
     }
-    else
-        answerYesNo(input, key, () => {
-            if (mode.kind !== "app-approve") {
-                void execute(context, mode);
-                return;
-            }
-            manage.setMode({ kind: "busy", label: "Approving recipe..." });
-            void apps.approve(mode.entry).then(() => manage.finish({ kind: "ok", text: `Approved ${appName(mode.entry)}` }), error => manage.finish({ kind: "error", text: errorText(error) }));
-        }, () => {
+    else {
+        const lines = appPreviewLines(mode);
+        const viewport = previewViewport(lines, mode.cursor, context.terminalRows, context.terminalColumns, appPreviewChrome(mode));
+        const cursor = movePreviewCursor(mode.cursor, viewport.total, input, key, viewport.height);
+        if (cursor !== undefined) {
+            manage.setMode({ ...mode, cursor });
+            return;
+        }
+        if (input === "n" || key.escape) {
             if (mode.kind === "app-confirm" || mode.kind === "app-manual") {
                 void prepareNext(context, mode.remaining, [...mode.results, `${appName(mode.plan.entry)}: cancelled`], mode.failures);
             }
             else
                 cancel();
-        });
+            return;
+        }
+        if (input !== "y" || !viewport.reachedEnd)
+            return;
+        if (mode.kind !== "app-approve") {
+            void execute(context, mode);
+            return;
+        }
+        manage.setMode({ kind: "app-busy", label: "Approving recipe..." });
+        void apps.approve(mode.entry).then(() => manage.finish({ kind: "ok", text: `Approved ${appName(mode.entry)}` }), error => manage.finish({ kind: "error", text: errorText(error) }));
+    }
 }
 /** Renders App prompts using the existing checklist and preview-confirm panels. */
 export function AppPanel({ mode }) {
+    const { rows, columns } = useWindowSize();
+    if (mode.kind === "app-busy")
+        return _jsx(BorderPanel, { title: "App lifecycle", children: _jsx(Text, { children: mode.label }) });
     if (mode.kind === "app-hosts") {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["App Host steps: checked = setup, unchecked = teardown. Wiring is not tracked. Space/1-", mode.choices.length, " toggle, j/k move, Enter continue, Esc cancel."] }), _jsx(HostChecklist, { choices: mode.choices, cursor: mode.cursor, selected: mode.selected })] }));
-    }
-    if (mode.kind === "app-approve") {
-        return _jsx(PreviewConfirm, { lines: mode.lines, question: `Approve ${appName(mode.entry)}? y/n` });
+        return (_jsxs(BorderPanel, { title: "App Host steps", children: [_jsx(Text, { children: "Checked = setup. Unchecked = teardown. Wiring is not tracked." }), _jsxs(Text, { children: ["Space/1-", mode.choices.length, " toggle \u00B7 j/k move \u00B7 Enter continue \u00B7 Esc cancel"] }), _jsx(HostChecklist, { choices: mode.choices, cursor: mode.cursor, selected: mode.selected })] }));
     }
-    return (_jsx(PreviewConfirm, { lines: [
-            `Environment: ${mode.plan.environment}`,
-            `App: ${appName(mode.plan.entry)} ${mode.plan.action}${mode.plan.host ? ` (${mode.plan.host})` : ""}`,
-            ...appStepLines(mode.plan),
-        ], question: mode.kind === "app-manual"
-            ? "Manual step done, check now? y/n"
-            : `${mode.plan.action} ${appName(mode.plan.entry)}? y/n` }));
+    const lines = appPreviewLines(mode);
+    const chrome = appPreviewChrome(mode);
+    const viewport = previewViewport(lines, mode.cursor, rows || 24, columns || 80, chrome);
+    return (_jsx(PreviewConfirm, { title: chrome.title, lines: lines, cursor: mode.cursor, question: viewport.reachedEnd ? chrome.questions[0] : chrome.questions[1], chrome: chrome }));
 }

package/dist/src/tui/app.js

@@ -1,21 +1,15 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useApp, useWindowSize } from "ink";
 import { useCallback, useRef, useState } from "react";
 import { AGENT_DEPOT_PACKAGE_VERSION } from "../project-manifest.js";
 import { CatalogView } from "./catalog-view.js";
 import { InstallationsView } from "./installations-view.js";
+import { headerTabRows, TABS } from "./header-layout.js";
 import { useKeys } from "./keys.js";
 import { ProfileView } from "./profile-view.js";
 import { SourcesView, sourceRowHints } from "./sources-view.js";
-import { separatorLine, theme } from "./theme.js";
+import { theme } from "./theme.js";
 import { UpdatesView } from "./updates-view.js";
-const TABS = [
-    ["sources", "1 Sources"],
-    ["catalog", "2 Catalog"],
-    ["installations", "3 Installations"],
-    ["updates", "4 Updates"],
-    ["profile", "5 Import/Export"],
-];
 /** Sources derives its own hints from the selected row, so it is excluded here. */
 function hintsOf(view, catalogFocusedOnSource) {
     switch (view) {
@@ -26,9 +20,13 @@ function hintsOf(view, catalogFocusedOnSource) {
         case "profile":
             return "e export · i import · q quit";
         case "updates":
-            return "j/k move · space mark · a all · Enter preview · r check again · q quit";
+            return "j/k move · space mark · a all · Enter preview · u update · r check again · q quit";
     }
 }
+export function Header({ view, columns }) {
+    const innerWidth = Math.max(columns - 4, 1);
+    return (_jsxs(Box, { borderStyle: "round", borderColor: theme.accent, paddingX: 1, flexDirection: "column", width: columns, children: [_jsxs(Box, { width: innerWidth, justifyContent: "space-between", children: [_jsx(Text, { color: theme.accent, bold: true, children: "AGENT DEPOT" }), AGENT_DEPOT_PACKAGE_VERSION === undefined ? null : _jsxs(Text, { color: theme.value, children: ["v", AGENT_DEPOT_PACKAGE_VERSION] })] }), _jsx(Box, { flexDirection: "column", children: headerTabRows(innerWidth).map((row, rowIndex) => (_jsx(Text, { wrap: "truncate-end", children: row.map(([name, label], tabIndex) => (_jsxs(Text, { color: view === name ? theme.accent : theme.inactive, children: [tabIndex === 0 ? "" : "  ", view === name ? "▶ " : "", label] }, name))) }, rowIndex))) })] }));
+}
 export function App({ operations, environment, onExit }) {
     const { exit } = useApp();
     const { columns, rows } = useWindowSize();
@@ -43,10 +41,15 @@ export function App({ operations, environment, onExit }) {
     const [catalogSourceId, setCatalogSourceId] = useState();
     const [sourcesHints, setSourcesHints] = useState(sourceRowHints(undefined));
     const showView = (next) => setView(next);
-    useKeys((input) => {
+    useKeys((input, key) => {
         if (capturingRef.current)
             return;
-        if (input === "q") {
+        if (key.tab) {
+            const current = TABS.findIndex(([name]) => name === view);
+            const direction = key.shift ? -1 : 1;
+            showView(TABS[(current + direction + TABS.length) % TABS.length][0]);
+        }
+        else if (input === "q") {
             onExit?.();
             exit();
         }
@@ -61,8 +64,10 @@ export function App({ operations, environment, onExit }) {
         else if (input === "5")
             showView("profile");
     });
-    return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsxs(Text, { bold: true, color: theme.accent, children: ["Agent Depot", AGENT_DEPOT_PACKAGE_VERSION === undefined ? "" : ` v${AGENT_DEPOT_PACKAGE_VERSION}`] }), _jsx(Text, { children: TABS.map(([name, label], position) => (_jsxs(Text, { color: view === name ? theme.accent : theme.inactive, bold: view === name, children: [position > 0 ? " " : "", view === name ? `[${label}]` : ` ${label} `] }, name))) }), _jsx(Text, { color: theme.muted, children: separatorLine(columns) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: view === "sources" ? (_jsx(SourcesView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange, onHintsChange: setSourcesHints, onOpenCatalog: (source) => {
+    return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Header, { view: view, columns: columns }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: view === "sources" ? (_jsx(SourcesView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange, onHintsChange: setSourcesHints, onOpenCatalog: (source) => {
                         setCatalogSourceId(source.id);
                         setView("catalog");
-                    } })) : view === "installations" ? (_jsx(InstallationsView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : view === "profile" ? (_jsx(ProfileView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : view === "updates" ? (_jsx(UpdatesView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : (_jsx(CatalogView, { operations: operations, sourceId: catalogSourceId, environment: environment, onCapturingChange: onCapturingChange })) }), _jsx(Text, { color: theme.muted, children: capturing ? "Enter submit · Esc cancel · y/n confirm · space toggle" : view === "sources" ? sourcesHints : hintsOf(view, catalogSourceId !== undefined) })] }));
+                    } })) : view === "installations" ? (_jsx(InstallationsView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : view === "profile" ? (_jsx(ProfileView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : view === "updates" ? (_jsx(UpdatesView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange })) : (_jsx(CatalogView, { operations: operations, sourceId: catalogSourceId, environment: environment, onCapturingChange: onCapturingChange })) }), _jsx(Text, { color: theme.muted, children: capturing
+                    ? columns < 64 ? "Enter submit · Esc cancel" : "Enter submit · Esc cancel · y/n confirm · space toggle"
+                    : view === "sources" ? sourcesHints : hintsOf(view, catalogSourceId !== undefined) })] }));
 }

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

@@ -47,6 +47,11 @@ function markRepository(context, row, visible) {
 /** `i`: installs the highlighted bundle, or the marked Skills that are listed, or the highlighted one. */
 function chooseHosts(context, row) {
     const data = row.node.data;
+    if (data.kind === "app") {
+        context.setMessage(undefined);
+        context.startApp(data.row.entry);
+        return;
+    }
     // A bundle row is not markable, so it acts on itself and never picks up a Skill mark.
     if (data.kind === "bundle") {
         context.setMessage(undefined);
@@ -87,6 +92,6 @@ export function handleCatalogBrowseKey(context, input, key) {
         markRow(context, row);
     else if (input === "a")
         markRepository(context, row, snapshot.visible);
-    else if (input === "i" && context.ready && row)
+    else if (input === "i" && row && (context.ready || row.node.data.kind === "app"))
         chooseHosts(context, row);
 }

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

@@ -6,12 +6,12 @@ import { skillKey } from "./catalog-tree.js";
 import { hasUnmanagedCopy } from "./catalog-installs.js";
 import { describeRow, truncateDescription, UNMANAGED_MARKER } from "./catalog-tree.js";
 import { isPackageMode, PackagePanel } from "./package-actions.js";
-import { HostChecklist, PreviewLines } from "./panel-parts.js";
+import { BorderPanel, DecisionPrompt, HostChecklist, PreviewLines } from "./panel-parts.js";
 import { rowStyle } from "./theme.js";
 import { theme } from "./theme.js";
 /** Scope and counts, the filter line, and why the list may be empty. */
-export function CatalogHeader({ scope, listed, installable, total, filter }) {
-    return (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.muted, children: ["Scope: ", scope, "  ", listed, " of ", installable] }), filter.editing || filter.query !== "" ? (_jsxs(Text, { children: ["Filter: ", filter.query, filter.editing ? "_" : ""] })) : null, total === 0 ? _jsx(Text, { children: "No skills" }) : null, total > 0 && installable === 0 ? _jsx(Text, { children: "All skills are installed" }) : null, installable > 0 && listed === 0 ? _jsx(Text, { children: "No matching skills" }) : null] }));
+export function CatalogHeader({ scope, listed, installable, total, appCount, filter }) {
+    return (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.muted, children: ["Scope: ", scope, "  ", listed, " of ", installable, " Skills  \u00B7  ", appCount, " Apps"] }), filter.editing || filter.query !== "" ? (_jsxs(Text, { children: ["Filter: ", filter.query, filter.editing ? "_" : ""] })) : null, total === 0 ? _jsx(Text, { children: "No skills" }) : null, total > 0 && installable === 0 ? _jsx(Text, { children: "All skills are installed" }) : null, installable > 0 && listed === 0 ? _jsx(Text, { children: "No matching skills" }) : null] }));
 }
 /** One line of the Catalog tree: cursor, indent, mark box, label and the ownership markers. */
 export function CatalogRowLine({ row, selected, marked, installed }) {
@@ -20,7 +20,7 @@ export function CatalogRowLine({ row, selected, marked, installed }) {
     const ownedBy = data.kind === "skill" ? data.ownedBy : undefined;
     return (_jsxs(Text, { ...rowStyle(selected), color: isGroup ? theme.group : undefined, wrap: "truncate-end", children: [selected ? "> " : "  ", "  ".repeat(row.depth), data.kind === "skill" ? marked ? "[x] " : "[ ] " : "", data.kind === "skill" && ownedBy !== undefined
                 ? _jsxs(_Fragment, { children: [data.skill.name, _jsxs(Text, { color: theme.marker, children: ["  ", "[", packageOwnerBadge(ownedBy), "]"] }), "  ", truncateDescription(data.skill.description)] })
-                : describeRow(row), data.kind === "skill" && hasUnmanagedCopy(data.skill, installed)
+                : data.kind === "app" ? `App ${data.row.entry.recipe?.name ?? data.row.entry.file}` : describeRow(row), data.kind === "app" ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.legend, children: "  " }), _jsx(Text, { color: data.row.inspection.status === "not installed" ? theme.warning : theme.value, children: data.row.inspection.status })] })) : null, data.kind === "skill" && hasUnmanagedCopy(data.skill, installed)
                 ? _jsxs(Text, { color: theme.marker, children: ["  ", UNMANAGED_MARKER] })
                 : null] }));
 }
@@ -37,23 +37,23 @@ export function ActionPanel({ mode }) {
         case "browse":
             return null;
         case "host":
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Install ", describeSkills(mode.skills), ". Host (space/1-4 toggle, j/k move, Enter continue, Esc cancel):"] }), _jsx(HostChecklist, { choices: HOST_CHOICES, cursor: mode.cursor, selected: mode.selected })] }));
+            return (_jsxs(BorderPanel, { title: `Skill selection · ${mode.skills.length} selected`, children: [_jsxs(Text, { children: ["Install ", describeSkills(mode.skills), ". Host (space/1-4 toggle \u00B7 j/k move \u00B7 Enter continue \u00B7 Esc cancel)"] }), _jsx(HostChecklist, { choices: HOST_CHOICES, cursor: mode.cursor, selected: mode.selected })] }));
         case "scope":
-            return _jsxs(Text, { children: ["Scope: ", SCOPE_CHOICES.map((scope, i) => `${i + 1} ${scope}`).join("  "), "  (Esc cancel)"] });
+            return _jsx(BorderPanel, { title: "Skill installation scope", children: _jsxs(Text, { children: [SCOPE_CHOICES.map((scope, i) => `${i + 1} ${scope}`).join("  "), "  (Esc cancel)"] }) });
         case "version":
-            return _jsx(Text, { children: "Version: 1 latest  2 fixed  (Esc cancel)" });
+            return _jsx(BorderPanel, { title: "Skill version policy", children: _jsx(Text, { children: "1 latest  2 fixed  (Esc cancel)" }) });
         case "fixed":
-            return _jsxs(Text, { children: ["Fixed version: ", mode.value, "_  (Enter confirm, Esc cancel)"] });
+            return _jsx(BorderPanel, { title: "Fixed Skill version", children: _jsxs(Text, { children: [mode.value, "_  (Enter confirm, Esc cancel)"] }) });
         case "confirm-install": {
             const ready = mode.items.filter((item) => item.prepared !== undefined);
             const single = mode.items.length === 1;
-            return (_jsxs(Box, { flexDirection: "column", children: [mode.items.map(({ skill, prepared, error }) => prepared === undefined ? (_jsxs(Text, { color: theme.error, children: ["Cannot install ", skill.name, ": ", error] }, skillKey(skill))) : (_jsxs(Box, { flexDirection: "column", children: [single ? null : _jsx(Text, { color: theme.group, children: skill.name }), _jsx(PreviewLines, { lines: prepared.preview })] }, skillKey(skill)))), ready.some((item) => item.prepared?.runsExternalCommand) ? _jsx(Text, { color: theme.warning, children: "This install runs an external command (see above)." }) : null, _jsxs(Text, { children: ["Install ", describeSkills(ready.map((item) => item.skill)), "? y/n"] })] }));
+            return (_jsxs(BorderPanel, { title: `Skill install preview · ${ready.length} ready`, children: [mode.items.map(({ skill, prepared, error }) => prepared === undefined ? (_jsxs(Text, { color: theme.error, children: ["Cannot install ", skill.name, ": ", error] }, skillKey(skill))) : (_jsxs(Box, { flexDirection: "column", children: [single ? null : _jsx(Text, { color: theme.group, children: skill.name }), _jsx(PreviewLines, { lines: prepared.preview })] }, skillKey(skill)))), ready.some((item) => item.prepared?.runsExternalCommand) ? _jsx(Text, { color: theme.warning, children: "This install runs an external command (see above)." }) : null, _jsxs(DecisionPrompt, { children: ["Install ", describeSkills(ready.map((item) => item.skill)), "?"] })] }));
         }
         case "confirm-exposure": {
             const names = mode.items.filter((item) => item.prepared?.additionalHostExposure).map((item) => item.skill.name);
-            return (_jsxs(Text, { color: theme.warning, children: [names.length === 1 ? `An identical ${names[0]} already exists` : `Identical copies of ${names.join(", ")} already exist`, "; adding the missing Host location needs separate confirmation (CLI: --confirm-additional-host). Confirm? y/n"] }));
+            return (_jsx(BorderPanel, { title: `Skill Host exposure · ${names.length} confirmation`, children: _jsxs(Text, { color: theme.warning, children: [names.length === 1 ? `An identical ${names[0]} already exists` : `Identical copies of ${names.join(", ")} already exist`, "; adding the missing Host location needs separate confirmation. ", _jsx(DecisionPrompt, { children: "Confirm?" })] }) }));
         }
         case "busy":
-            return _jsx(Text, { children: mode.label });
+            return _jsx(BorderPanel, { title: "Skill install", children: _jsx(Text, { children: mode.label }) });
     }
 }

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

@@ -87,6 +87,34 @@ export function useCatalogSkills(operations, sourceId, all, env, reloadKey = 0)
     }, [operations, sourceId, all, env, reloadKey]);
     return state;
 }
+export function useCatalogApps(apps) {
+    const [state, setState] = useState({ status: "loading" });
+    const generation = useRef(0);
+    const reload = useCallback(async () => {
+        const current = ++generation.current;
+        setState({ status: "loading" });
+        try {
+            const rows = await Promise.all((await apps.load()).filter(entry => entry.applicable).map(async (entry) => ({
+                entry,
+                inspection: await apps.inspect(entry),
+            })));
+            if (generation.current === current)
+                setState({
+                    status: "ready",
+                    rows: rows.filter(row => row.inspection.status === "not installed"),
+                });
+        }
+        catch (error) {
+            if (generation.current === current)
+                setState({ status: "ready", rows: [], error: error instanceof Error ? error.message : String(error) });
+        }
+    }, [apps]);
+    useEffect(() => {
+        void reload();
+        return () => { generation.current += 1; };
+    }, [reload]);
+    return { state, reload };
+}
 /** The Skills already installed, loaded on mount and on demand. */
 export function useInstalledSkills(operations, env, mounted) {
     const [installed, setInstalled] = useState(NO_INSTALLED);

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

@@ -23,7 +23,7 @@ export function sourceLabel(source) {
     return url.hostname === "github.com" ? repository : `${url.host}/${repository}`;
 }
 /** Skills and their Source's Packages, in first-seen order; a Source with neither never appears. */
-export function buildTree(skills, sources = [], bundles = [], activeDescriptors = []) {
+export function buildTree(skills, sources = [], bundles = [], activeDescriptors = [], apps = []) {
     const labels = new Map(sources.map((source) => [source.id, sourceLabel(source)]));
     const active = new Set(activeDescriptors);
     const bySource = new Map();
@@ -32,7 +32,7 @@ export function buildTree(skills, sources = [], bundles = [], activeDescriptors
     const bundlesBySource = new Map();
     for (const bundle of bundles)
         bundlesBySource.set(bundle.sourceId, [...(bundlesBySource.get(bundle.sourceId) ?? []), bundle]);
-    return [...new Set([...bySource.keys(), ...bundlesBySource.keys()])].map((sourceId) => {
+    const sourcesTree = [...new Set([...bySource.keys(), ...bundlesBySource.keys()])].map((sourceId) => {
         const members = bySource.get(sourceId) ?? [];
         const sourceBundles = bundlesBySource.get(sourceId) ?? [];
         const owned = packageOwnedSkillMatcher(sourceBundles.map((entry) => entry.descriptor).filter((descriptor) => active.has(descriptor)));
@@ -52,13 +52,28 @@ export function buildTree(skills, sources = [], bundles = [], activeDescriptors
             ],
         };
     });
+    return apps.length === 0 ? sourcesTree : [...sourcesTree, {
+            id: "apps:user-global",
+            data: { kind: "group", label: `Apps (user-global) (${apps.length})` },
+            children: apps.map((row) => ({ id: `app:${row.entry.file}`, data: { kind: "app", row } })),
+        }];
 }
-function allSourceIds(roots) {
-    return new Set(roots.filter((root) => (root.children?.length ?? 0) > 0).map((root) => root.id));
+function allExpandableIds(roots) {
+    const ids = new Set();
+    const visit = (nodes) => {
+        for (const node of nodes) {
+            if ((node.children?.length ?? 0) === 0)
+                continue;
+            ids.add(node.id);
+            visit(node.children);
+        }
+    };
+    visit(roots);
+    return ids;
 }
 /** Filtering opens matching Sources; otherwise all groups start collapsed. */
 export function openByDefault(nodes, query) {
-    return query === "" ? defaultExpanded() : allSourceIds(nodes);
+    return query === "" ? defaultExpanded() : allExpandableIds(nodes);
 }
 export function describeRow(row) {
     const { data } = row.node;
@@ -69,6 +84,8 @@ export function describeRow(row) {
     if (data.kind === "bundle") {
         return `Package ${data.entry.descriptor.name} (${data.entry.descriptor.host})  ${packageVersionLabel(data.entry.descriptor.version)}`;
     }
+    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)}`;
 }
 /** The Skills under the tree's Sources, in display order. */