@iseoane/agent-depot 0.6.13 → 0.6.14

package/dist/src/tui/app.js

@@ -1,7 +1,9 @@
 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 { Box, useApp, useWindowSize } from "ink";
+import { Text } from "./safe-text.js";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { AGENT_DEPOT_PACKAGE_VERSION } from "../project-manifest.js";
+import { withRefreshSession } from "../source-refresh-session.js";
 import { CatalogView } from "./catalog-view.js";
 import { InstallationsView } from "./installations-view.js";
 import { headerTabRows, TABS } from "./header-layout.js";
@@ -28,7 +30,23 @@ 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 }) {
+export function App({ operations: plainOperations, environment: plainEnvironment, onExit, refreshSession, refreshOnStart }) {
+    // Memoized: views reload whenever the operations they receive change identity.
+    const operations = useMemo(() => refreshSession === undefined ? plainOperations : withRefreshSession(plainOperations, refreshSession), [plainOperations, refreshSession]);
+    // Package previews refresh through the same session, so they reuse and show the same refreshes.
+    const environment = useMemo(() => refreshSession === undefined ? plainEnvironment : {
+        ...plainEnvironment,
+        refreshSession,
+        ...(plainEnvironment?.packages !== undefined ? {} : {
+            packagesEnvironment: { ...plainEnvironment?.packagesEnvironment, sourceOperations: operations },
+        }),
+    }, [plainEnvironment, refreshSession, operations]);
+    useEffect(() => {
+        if (!refreshOnStart || refreshSession === undefined)
+            return;
+        // D3 (I0031): only registered Git Sources; the built-in Source is never refreshed.
+        plainOperations.listSources().then((sources) => refreshSession.refreshInBackground(sources.filter((source) => source.kind === "git")), () => undefined);
+    }, [plainOperations, refreshSession, refreshOnStart]);
     const { exit } = useApp();
     const { columns, rows } = useWindowSize();
     const [capturing, setCapturing] = useState(false);
@@ -79,7 +97,7 @@ export function App({ operations, environment, onExit }) {
         else if (input === "5")
             showView("profile");
     });
-    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) => {
+    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, refreshSession: refreshSession, onOpenCatalog: (source) => {
                         setCatalogSourceId(source.id);
                         showView("catalog");
                     } })) : view === "installations" ? (_jsx(InstallationsView, { operations: operations, environment: environment, onCapturingChange: onCapturingChange, retention: retention })) : 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, retention: retention })) }), _jsx(Text, { color: theme.muted, children: capturing

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

@@ -2,7 +2,9 @@ import { PROJECT_HOSTS } from "../project-manifest.js";
 import { assertManagedInstallationRecordsUnchanged } from "../skill-removal.js";
 import { errorText, runBatch } from "./batch.js";
 import { missingHosts, prepareHostAddition, prepareUninstall, runHostAddition, runUninstall, UNINSTALL_REFUSALS, } from "./catalog-installs.js";
-import { answerYesNo, applyChecklistOutcome, hostChecklistKey } from "./mode-keys.js";
+import { answerPaged, answerYesNo, applyChecklistOutcome, hostChecklistKey } from "./mode-keys.js";
+import { span } from "./preview-render.js";
+import { theme } from "./theme.js";
 import { skillOf, sourceIdOf } from "./installations.js";
 import { prepareUnmanagedRemoval, runUnmanagedRemoval } from "./unmanaged-actions.js";
 import { busy } from "./working-model.js";
@@ -193,7 +195,7 @@ async function preparePlan(context, label, prepare, confirmation) {
 }
 /** `u` with marks: prepares every marked leaf, then asks once. */
 export function startBulkUninstall(context, targets) {
-    return preparePlan(context, `Preparing uninstall of ${count(targets.length, "item")}…`, () => prepareBulkUninstall(context, targets), (plan) => ({ kind: "confirm-bulk-uninstall", plan }));
+    return preparePlan(context, `Preparing uninstall of ${count(targets.length, "item")}…`, () => prepareBulkUninstall(context, targets), (plan) => ({ kind: "confirm-bulk-uninstall", plan, cursor: 0 }));
 }
 /** `h` with marks: asks the hosts once, for the union of what the eligible items lack. */
 export function startBulkHostAddition(context, targets) {
@@ -207,7 +209,7 @@ export function startBulkHostAddition(context, targets) {
     context.setMode({ kind: "bulk-hosts", targets: ready, skipped, choices, cursor: 0, selected: [] });
 }
 function prepareHosts(context, mode) {
-    return preparePlan(context, `Preparing host change of ${count(mode.targets.length, "item")}…`, () => prepareBulkHostAddition(context, mode.targets, mode.skipped, mode.selected), (plan) => ({ kind: "confirm-bulk-hosts", plan }));
+    return preparePlan(context, `Preparing host change of ${count(mode.targets.length, "item")}…`, () => prepareBulkHostAddition(context, mode.targets, mode.skipped, mode.selected), (plan) => ({ kind: "confirm-bulk-hosts", plan, cursor: 0 }));
 }
 async function apply(context, label, action) {
     const started = busy(label);
@@ -226,6 +228,30 @@ async function apply(context, label, action) {
     context.unmark(result.applied);
     await context.finish(result.message);
 }
+function previewOf(item) {
+    if (!("kind" in item))
+        return item.prepared.preview;
+    return item.kind === "managed" ? item.prepared.plan.preview : item.prepared.preview;
+}
+/**
+ * One block per planned item (its label, then its preview), then the skipped ones, with the footer's action and question.
+ * Only the labels are styled; `styled` is sparse so the other lines keep the colours inferred from their text.
+ */
+export function bulkConfirmPreview(mode) {
+    const { plan } = mode;
+    const items = count(plan.items.length, "item");
+    const blocks = plan.items.flatMap((item) => [
+        { text: item.label, label: true },
+        ...previewOf(item).map((text) => ({ text, label: false })),
+    ]);
+    const skipped = plan.skipped.map(({ label, reason }) => ({ text: `Skipped ${label}: ${reason}`, label: false }));
+    const entries = [...blocks, ...skipped];
+    const lines = entries.map(({ text }) => text);
+    const styled = entries.map(({ text, label }) => label ? [span(text, theme.group)] : undefined);
+    return mode.kind === "confirm-bulk-uninstall"
+        ? { lines, styled, chrome: { title: "Uninstall", action: `Uninstall ${items}`, consequence: `Uninstall ${items}? y/n` } }
+        : { lines, styled, chrome: { title: "Add hosts", action: `Add hosts to ${items}`, consequence: `Add hosts to ${items}? y/n` } };
+}
 /** Handles a key in a bulk mode; returns false for any other mode. */
 export function handleBulkKey(context, mode, input, key) {
     const current = mode;
@@ -241,13 +267,20 @@ export function handleBulkKey(context, mode, input, key) {
             return true;
         }
         case "confirm-bulk-uninstall":
-            answerYesNo(input, key, () => {
-                void apply(context, `Removing ${count(current.plan.items.length, "item")}…`, (progress) => runBulkUninstall(current.plan, operations, env, progress));
-            }, () => cancel(context, "Uninstall cancelled"));
-            return true;
-        case "confirm-bulk-hosts":
-            answerYesNo(input, key, () => context.setMode({ kind: "confirm-bulk-exposure", plan: current.plan }), () => cancel(context, "Add hosts cancelled"));
+        case "confirm-bulk-hosts": {
+            const { lines, chrome } = bulkConfirmPreview(current);
+            answerPaged(context.previewGeometry(lines, current.cursor, chrome), current.cursor, input, key, {
+                moveTo: (cursor) => context.setMode({ ...current, cursor }),
+                yes: () => {
+                    if (current.kind === "confirm-bulk-hosts")
+                        context.setMode({ kind: "confirm-bulk-exposure", plan: current.plan });
+                    else
+                        void apply(context, `Removing ${count(current.plan.items.length, "item")}…`, (progress) => runBulkUninstall(current.plan, operations, env, progress));
+                },
+                no: () => cancel(context, current.kind === "confirm-bulk-hosts" ? "Add hosts cancelled" : "Uninstall cancelled"),
+            });
             return true;
+        }
         case "confirm-bulk-exposure":
             answerYesNo(input, key, () => {
                 void apply(context, `Changing hosts of ${count(current.plan.items.length, "item")}…`, (progress) => runBulkHostAddition(current.plan, operations, env, progress));

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

@@ -7,3 +7,15 @@ export function describeSkills(skills) {
     return skills.length === 1 ? skills[0].name : `${skills.length} skills`;
 }
 export const BROWSE = { kind: "browse" };
+/** What the install confirmation shows, so the key handler and the panel page the same rows. */
+export function installPreview(items) {
+    const ready = items.filter((item) => item.prepared !== undefined);
+    const single = items.length === 1;
+    const name = describeSkills(ready.map((item) => item.skill));
+    const lines = [
+        ...(ready[0]?.prepared?.projectTarget ?? []),
+        ...items.flatMap(({ skill, prepared, error }) => prepared === undefined ? [`Cannot install ${skill.name}: ${error}`] : [...(single ? [] : [skill.name]), ...prepared.preview]),
+        ...(ready.some((item) => item.prepared?.runsExternalCommand) ? ["This install runs an external command (see above)."] : []),
+    ];
+    return { lines, chrome: { title: `Skill install preview · ${ready.length} ready`, action: `Install ${name}`, consequence: `Install ${name}? y/n` } };
+}

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

@@ -1,8 +1,9 @@
-import { BROWSE, describeSkills, HOST_CHOICES, SCOPE_CHOICES } from "./catalog-actions.js";
+import { formatProgressLabel } from "../flow-progress.js";
+import { BROWSE, describeSkills, installPreview, HOST_CHOICES, SCOPE_CHOICES } from "./catalog-actions.js";
 import { prepareInstall, runInstall } from "./catalog-installs.js";
 import { skillKey } from "./catalog-tree.js";
 import { errorText, runBatch } from "./batch.js";
-import { answerYesNo, applyChecklistOutcome, hostChecklistKey, versionInputKey } from "./mode-keys.js";
+import { answerYesNo, applyChecklistOutcome, hostChecklistKey, movePreviewCursor, versionInputKey } from "./mode-keys.js";
 import { busy } from "./working-model.js";
 function cancel(context) {
     context.setMessage({ kind: "ok", text: "Install cancelled" });
@@ -27,22 +28,46 @@ async function startInstall(context, skills, choice) {
         context.setAction(BROWSE);
         return;
     }
-    context.setAction({ kind: "confirm-install", items });
+    context.setAction({ kind: "confirm-install", items, cursor: 0 });
 }
 /** Applies the prepared items one by one; a failure is reported for that item and the rest still run. */
 async function confirmInstall(context, items, exposure) {
-    context.setAction(busy(`Installing ${describeSkills(items.map((item) => item.skill))}…`));
+    const running = busy(`Installing ${describeSkills(items.map((item) => item.skill))}…`);
+    context.setAction(running);
     const outcomes = await runBatch(items, async ({ prepared, error }) => {
         if (prepared === undefined)
             throw new Error(error);
         return (await runInstall(prepared, context.operations, exposure && prepared.additionalHostExposure)).join(" ");
-    }, ({ skill }, caught) => `Failed ${skill.name}: ${errorText(caught)}`);
+    }, ({ skill }, caught) => `Failed ${skill.name}: ${errorText(caught)}`, ({ skill }, position, total, finished) => {
+        if (!context.isMounted())
+            return;
+        const label = formatProgressLabel({ kind: "skill", name: skill.name, position, total, verb: "Installing" });
+        context.setAction({ ...running, label, done: finished.map((outcome) => outcome.line) });
+    });
     const lines = outcomes.map((outcome) => outcome.line);
     const failed = new Set(outcomes.filter((outcome) => !outcome.ok).map((outcome) => skillKey(outcome.item.skill)));
     // Installed Skills leave the list; only the failed ones stay marked for another try.
     context.keepMarked(failed);
     await context.finish({ kind: failed.size > 0 ? "error" : "ok", text: lines.join("\n") });
 }
+/** Pages the preview like the other footer confirmations: `y` answers only once it has all been displayed. */
+function handleInstallKey(context, mode, input, key) {
+    const { lines, chrome } = installPreview(mode.items);
+    const viewport = context.previewGeometry(lines, mode.cursor, chrome);
+    const cursor = movePreviewCursor(mode.cursor, viewport.total, input, key, viewport.height);
+    if (cursor !== undefined) {
+        context.setAction({ ...mode, cursor });
+        return;
+    }
+    answerYesNo(input, key, () => {
+        if (!viewport.reachedEnd)
+            return;
+        if (mode.items.some((item) => item.prepared?.additionalHostExposure))
+            context.setAction({ kind: "confirm-exposure", items: mode.items });
+        else
+            void confirmInstall(context, mode.items, false);
+    }, () => cancel(context));
+}
 function handleHostKey(context, mode, input, key) {
     applyChecklistOutcome(hostChecklistKey(mode, HOST_CHOICES, input, key), {
         cancel: () => cancel(context),
@@ -92,12 +117,7 @@ export function handleCatalogActionKey(context, mode, input, key) {
             handleFixedKey(context, mode, input, key);
             return;
         case "confirm-install":
-            answerYesNo(input, key, () => {
-                if (mode.items.some((item) => item.prepared?.additionalHostExposure))
-                    context.setAction({ ...mode, kind: "confirm-exposure" });
-                else
-                    void confirmInstall(context, mode.items, false);
-            }, () => cancel(context));
+            handleInstallKey(context, mode, input, key);
             return;
         case "confirm-exposure":
             answerYesNo(input, key, () => void confirmInstall(context, mode.items, true), () => cancel(context));

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

@@ -1,12 +1,13 @@
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { Box, Text } from "ink";
-import { describeSkills, HOST_CHOICES, SCOPE_CHOICES } from "./catalog-actions.js";
+import { Box } from "ink";
+import { Text } from "./safe-text.js";
+import { describeSkills, HOST_CHOICES, installPreview, SCOPE_CHOICES } from "./catalog-actions.js";
 import { packageOwnedSkillNotice, packageOwnerBadge } from "./catalog-ownership.js";
-import { skillKey } from "./catalog-tree.js";
 import { hasUnmanagedCopy } from "./catalog-installs.js";
-import { describeRow, truncateDescription, UNMANAGED_MARKER } from "./catalog-tree.js";
+import { describeRow, singleLine, truncateDescription, UNMANAGED_MARKER } from "./catalog-tree.js";
 import { isPackageMode, PackagePanel } from "./package-actions.js";
-import { BorderPanel, DecisionPrompt, HostChecklist, PreviewLines, Working } from "./panel-parts.js";
+import { BorderPanel, DecisionPrompt, HostChecklist, PagedPreview, Working } from "./panel-parts.js";
+import { usePreviewGeometry } from "./preview-window.js";
 import { rowStyle } from "./theme.js";
 import { theme } from "./theme.js";
 /** Scope and counts, the filter line, and why the list may be empty. */
@@ -19,7 +20,7 @@ export function CatalogRowLine({ row, selected, marked, installed }) {
     const isGroup = data.kind === "source" || data.kind === "group";
     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), data.variant === true ? `  (${data.skill.path})` : ""] })
+                ? _jsxs(_Fragment, { children: [singleLine(data.skill.name), _jsxs(Text, { color: theme.marker, children: ["  ", "[", packageOwnerBadge(ownedBy), "]"] }), "  ", truncateDescription(data.skill.description), data.variant === true ? `  (${data.skill.path})` : ""] })
                 : 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] }));
@@ -29,6 +30,11 @@ export function CatalogSelectionHelp({ row, height }) {
     const owner = row?.node.data.kind === "skill" ? row.node.data.ownedBy : undefined;
     return (_jsx(Box, { flexDirection: "column", minHeight: height, children: owner === undefined ? null : _jsx(Text, { color: theme.marker, children: packageOwnedSkillNotice(owner) }) }));
 }
+/** The install confirmation with the shared footer; the view shows it alone so no tree rows count against its height. */
+export function InstallConfirmPanel({ mode }) {
+    const { lines, chrome } = installPreview(mode.items);
+    return _jsx(PagedPreview, { chrome: chrome, lines: lines, viewport: usePreviewGeometry()(lines, mode.cursor, chrome) });
+}
 /** The prompt of the install flow; browsing shows nothing. */
 export function ActionPanel({ mode }) {
     if (isPackageMode(mode))
@@ -44,17 +50,13 @@ export function ActionPanel({ mode }) {
             return _jsx(BorderPanel, { title: "Skill version policy", children: _jsx(Text, { children: "1 latest  2 fixed  (Esc cancel)" }) });
         case "fixed":
             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;
-            const projectTarget = ready[0]?.prepared?.projectTarget ?? [];
-            return (_jsxs(BorderPanel, { title: `Skill install preview · ${ready.length} ready`, children: [projectTarget.length === 0 ? null : _jsx(PreviewLines, { lines: projectTarget }), 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-install":
+            return _jsx(InstallConfirmPanel, { mode: mode });
         case "confirm-exposure": {
             const names = mode.items.filter((item) => item.prepared?.additionalHostExposure).map((item) => item.skill.name);
             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(BorderPanel, { title: "Skill install", children: _jsx(Working, { label: mode.label, since: mode.startedAt }) });
+            return (_jsxs(BorderPanel, { title: "Skill install", 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/catalog-tree.js

@@ -8,8 +8,13 @@ export const UNMANAGED_MARKER = "on disk, unmanaged · adopt it from Installatio
 export const skillKey = (skill) => `skill:${skill.sourceId}:${skill.path}`;
 /** 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)}`;
+/** A Skill's name or description on one row; a line break from a remote SKILL.md would add rows to the list window. */
+export function singleLine(text) {
+    return text.replace(/[\r\n]+/gu, " ");
+}
 export function truncateDescription(text) {
-    return text.length > DESCRIPTION_LIMIT ? `${text.slice(0, DESCRIPTION_LIMIT - 3)}...` : text;
+    const line = singleLine(text);
+    return line.length > DESCRIPTION_LIMIT ? `${line.slice(0, DESCRIPTION_LIMIT - 3)}...` : line;
 }
 /** A repository name, with directory and ref for scoped GitHub Sources. */
 export function sourceLabel(source) {
@@ -107,7 +112,7 @@ 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)}${data.variant === true ? `  (${data.skill.path})` : ""}`;
+    return `${singleLine(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) {

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text, useWindowSize } from "ink";
+import { Box, useWindowSize } from "ink";
+import { Text } from "./safe-text.js";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { createAppOperations } from "../app-flow.js";
 import { BROWSE } from "./catalog-actions.js";
@@ -8,7 +9,7 @@ import { filterSkills } from "./catalog-filter.js";
 import { handleCatalogActionKey } from "./catalog-flow.js";
 import { isInstalled } from "./catalog-installs.js";
 import { AppPanel, handleAppKey, startAppAction } from "./app-actions.js";
-import { ActionPanel, CatalogHeader, CatalogRowLine, CatalogSelectionHelp } from "./catalog-panel.js";
+import { ActionPanel, CatalogHeader, InstallConfirmPanel, CatalogRowLine, CatalogSelectionHelp } from "./catalog-panel.js";
 import { packageOwnedSkillNotice } from "./catalog-ownership.js";
 import { packageOperationsOf } from "./environment.js";
 import { handlePackageKey, isPackageMode, PackagePanel, startPackageAction } from "./package-actions.js";
@@ -21,6 +22,7 @@ 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";
+import { usePreviewGeometry } from "./preview-window.js";
 const NO_ENVIRONMENT = {};
 function wrappedLineCount(text, columns) {
     let lines = 1;
@@ -41,7 +43,8 @@ function wrappedLineCount(text, columns) {
     return lines;
 }
 export function CatalogView({ operations, sourceId, onCapturingChange, environment, listHeight, retention }) {
-    const { columns, rows: terminalRows } = useWindowSize();
+    const { columns } = useWindowSize();
+    const previewGeometry = usePreviewGeometry();
     const env = environment ?? NO_ENVIRONMENT;
     const [all, setAll] = useState(sourceId === undefined);
     const mounted = useMounted();
@@ -110,6 +113,7 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
     const flow = {
         operations,
         env,
+        previewGeometry,
         setAction,
         setMessage,
         isMounted: () => mounted.current,
@@ -158,7 +162,7 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
             setAction(BROWSE);
         },
     };
-    const packageContext = { packages, manage: packageHost, terminalRows: terminalRows || 24, terminalColumns: columns || 80 };
+    const packageContext = { packages, manage: packageHost, previewGeometry };
     const browse = {
         navigation,
         height,
@@ -168,14 +172,14 @@ export function CatalogView({ operations, sourceId, onCapturingChange, environme
         ready: state.status === "ready" && appCatalog.status === "ready",
         toggleAll: () => setAll((value) => !value),
         startPackage: (target) => void startPackageAction(packageContext, target, "i"),
-        startApp: (entry) => void startAppAction({ apps, manage: appManage, terminalRows: terminalRows || 24, terminalColumns: columns || 80 }, [entry], "i"),
+        startApp: (entry) => void startAppAction({ apps, manage: appManage, previewGeometry }, [entry], "i"),
         setMessage,
         setAction,
     };
     useKeys((input, key) => {
         const runningAppMode = appModeRef.current;
         if (runningAppMode !== undefined)
-            handleAppKey({ apps, manage: appManage, terminalRows: terminalRows || 24, terminalColumns: columns || 80 }, runningAppMode, input, key);
+            handleAppKey({ apps, manage: appManage, previewGeometry }, runningAppMode, input, key);
         else {
             const mode = actionRef.current;
             if (isPackageMode(mode))
@@ -200,5 +204,7 @@ 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 });
+    if (action.kind === "confirm-install")
+        return _jsx(InstallConfirmPanel, { 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/file-picker.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import path from "node:path";
-import { Text, useWindowSize } from "ink";
+import { useWindowSize } from "ink";
+import { Text } from "./safe-text.js";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { pickerEntries, readDirectoryListing, PROFILE_EXTENSION } from "./file-picker-model.js";
 import { useKeys } from "./keys.js";

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

@@ -1,9 +1,17 @@
-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 { Box } from "ink";
+import { Text } from "./safe-text.js";
+import { adoptionPreview } from "./adoption-actions.js";
 import { HOST_CHOICES } from "./catalog-actions.js";
 import { ManagePanel } from "./manage-panel.js";
-import { DecisionPrompt, HostChecklist, PreviewLines } from "./panel-parts.js";
+import { DecisionPrompt, HostChecklist, PagedPreview } from "./panel-parts.js";
+import { usePreviewGeometry } from "./preview-window.js";
 import { theme } from "./theme.js";
+/** An adoptable preview with the shared footer; the view shows it alone so no tree rows count against its height. */
+export function AdoptionConfirmPanel({ mode }) {
+    const { lines, chrome } = adoptionPreview(mode);
+    return _jsx(PagedPreview, { chrome: chrome, lines: lines, viewport: usePreviewGeometry()(lines, mode.cursor, chrome) });
+}
 /** The prompt of the adoption and manage modes; browsing shows nothing. */
 export function ModePanel({ mode }) {
     switch (mode.kind) {
@@ -18,7 +26,7 @@ export function ModePanel({ mode }) {
         case "fixed":
             return _jsxs(Text, { children: ["Fixed version: ", mode.value, "_  (Enter confirm, Esc cancel)"] });
         case "confirm":
-            return mode.adoption.verdict.adoptable ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(PreviewLines, { lines: mode.adoption.prepared.preview }), mode.adoption.prepared.runsExternalCommand ? _jsx(Text, { color: theme.warning, children: "This install runs an external command (see above)." }) : null, _jsxs(DecisionPrompt, { children: ["Adopt ", mode.entry.name, "?"] })] })) : (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.error, children: mode.adoption.verdict.reason }), _jsx(Text, { children: "Enter/Esc to go back" })] }));
+            return mode.adoption.verdict.adoptable ? (_jsx(AdoptionConfirmPanel, { mode: mode })) : (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.error, children: mode.adoption.verdict.reason }), _jsx(Text, { children: "Enter/Esc to go back" })] }));
         case "confirm-exposure":
             return (_jsxs(Text, { color: theme.warning, children: ["Adopting ", mode.entry.name, " adds the missing Host location and exposes it to more hosts; this needs separate confirmation (CLI: --confirm-additional-host). ", _jsx(DecisionPrompt, { children: "Confirm?" })] }));
         default:

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Text } from "ink";
+import { Text } from "./safe-text.js";
 import { describeLinks, describeNode, markersOf } from "./installations-tree.js";
 import { rowStyle, theme } from "./theme.js";
 function AppDetails({ row }) {

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text, useWindowSize } from "ink";
+import { Box } from "ink";
+import { Text } from "./safe-text.js";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createAppOperations } from "../app-flow.js";
 import { AppPanel, handleAppKey, isAppMode, startAppAction } from "./app-actions.js";
@@ -10,8 +11,9 @@ import { BROWSE } from "./installations-mode.js";
 import { errorText } from "./batch.js";
 import { handleAdoptionKey, startAdoption } from "./adoption-actions.js";
 import { handleBrowseKey } from "./installations-browse.js";
-import { handleManageKey } from "./manage-actions.js";
-import { ModePanel } from "./installations-panel.js";
+import { handleManageKey, isPagedConfirmMode } from "./manage-actions.js";
+import { PagedConfirmPanel } from "./manage-panel.js";
+import { AdoptionConfirmPanel, ModePanel } from "./installations-panel.js";
 import { TreeRowLine } from "./installations-rows.js";
 import { buildTree, leavesOf, markersOf } from "./installations-tree.js";
 import { ListFooter, Working } from "./panel-parts.js";
@@ -23,10 +25,11 @@ 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";
+import { usePreviewGeometry } from "./preview-window.js";
 const NO_ENVIRONMENT = {};
 const LEGEND = "adopted: tracked in place · modified: changed on disk";
 export function InstallationsView({ operations, environment, onCapturingChange, listHeight, retention }) {
-    const { rows: terminalRows, columns: terminalColumns } = useWindowSize();
+    const previewGeometry = usePreviewGeometry();
     const height = useListHeight(listHeight, 7);
     const env = environment ?? NO_ENVIRONMENT;
     const apps = useMemo(() => createAppOperations({ homeDirectory: env.homeDirectory, ...env.appEnvironment }), [env]);
@@ -148,6 +151,7 @@ export function InstallationsView({ operations, environment, onCapturingChange,
         operations,
         env,
         installed,
+        previewGeometry,
         setMode,
         browse: () => setMode(BROWSE),
         setMessage,
@@ -165,6 +169,7 @@ export function InstallationsView({ operations, environment, onCapturingChange,
     const adoption = {
         operations,
         env,
+        previewGeometry,
         setMode,
         browse: manage.browse,
         setMessage,
@@ -180,16 +185,16 @@ export function InstallationsView({ operations, environment, onCapturingChange,
         packages,
         startAdoption: (group) => void startAdoption(adoption, group),
         setMessage,
-        startApps: (entries, input) => void startAppAction({ apps, manage, terminalRows: terminalRows || 24, terminalColumns: terminalColumns || 80 }, entries, input),
+        startApps: (entries, input) => void startAppAction({ apps, manage, previewGeometry }, entries, input),
     };
     useKeys((input, key) => {
         const current = modeRef.current;
         if (current.kind === "browse")
             handleBrowseKey(browse, input, key);
         else if (isPackageMode(current))
-            handlePackageKey({ packages, manage, terminalRows: terminalRows || 24, terminalColumns: terminalColumns || 80 }, current, input, key);
+            handlePackageKey({ packages, manage, previewGeometry }, current, input, key);
         else if (isAppMode(current))
-            handleAppKey({ apps, manage, terminalRows: terminalRows || 24, terminalColumns: terminalColumns || 80 }, current, input, key);
+            handleAppKey({ apps, manage, previewGeometry }, current, input, key);
         else if (!handleManageKey(manage, current, input, key))
             handleAdoptionKey(adoption, current, input, key);
     });
@@ -202,6 +207,10 @@ export function InstallationsView({ operations, environment, onCapturingChange,
     // A paged declaration owns the view: rows of the tree above it would not be counted in its height.
     if (isPackageMode(mode))
         return _jsx(PackagePanel, { mode: mode });
+    if (isPagedConfirmMode(mode))
+        return _jsx(PagedConfirmPanel, { mode: mode });
+    if (mode.kind === "confirm" && mode.adoption.verdict.adoptable)
+        return _jsx(AdoptionConfirmPanel, { mode: mode });
     const ready = state.data;
     const window = computeWindow(rows.length, index, height);
     const listed = rows.slice(window.start, window.end);

package/dist/src/tui/keys.js

@@ -1,4 +1,5 @@
 import { useInput } from "ink";
+import { useRef } from "react";
 /** Plain printable characters only: control characters and escape sequences are never split. */
 const PRINTABLE = /^[^\p{Cc}]+$/u;
 /**
@@ -10,22 +11,44 @@ const PRINTABLE = /^[^\p{Cc}]+$/u;
  */
 const ESCAPE_REMNANT = /^(?:\[[\d;<:?]*[A-DFHIMOPQRSZm~]|O[A-DFHPQRS])$/;
 const PASTE_MARKERS = new Set(["[200~", "[201~"]);
+/** Keys that did not arrive alone: split off a multi-character block, or read after another key in the same turn. */
+const groupedKeys = new WeakSet();
+/**
+ * Whether this key press is a `y` that answers a confirmation. A `y` that arrived together with other
+ * keys never does: they may have opened the question or moved the cursor to its end before it was drawn.
+ * Text fields read `input` directly, so pasted text still reaches them.
+ */
+export function isYes(input, key) {
+    return input === "y" && !groupedKeys.has(key);
+}
+function grouped(key) {
+    const copy = { ...key };
+    groupedKeys.add(copy);
+    return copy;
+}
 /**
  * `useInput` that treats several plain characters delivered in one write (fast
- * typing, a paste) as the separate key presses they are, in order.
+ * typing, a paste) as the separate key presses they are, in order. Ink also hands
+ * the escape sequences of one read over as separate events within one turn; every key
+ * after the first of a turn counts as grouped, as do all characters of a split block.
  */
 export function useKeys(handler) {
+    const eventsThisTurn = useRef(0);
     useInput((input, key) => {
+        if (eventsThisTurn.current++ === 0)
+            queueMicrotask(() => { eventsThisTurn.current = 0; });
+        const later = eventsThisTurn.current > 1;
         if (ESCAPE_REMNANT.test(input)) {
             if (!PASTE_MARKERS.has(input))
-                handler(input, key);
+                handler(input, later ? grouped(key) : key);
             return;
         }
         if (input.length > 1 && !key.ctrl && !key.meta && !key.escape && PRINTABLE.test(input)) {
+            const blockKey = grouped(key);
             for (const character of input)
-                handler(character, key);
+                handler(character, blockKey);
             return;
         }
-        handler(input, key);
+        handler(input, later ? grouped(key) : key);
     });
 }