@iseoane/agent-depot 0.6.12 → 0.6.14

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

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

@@ -2,9 +2,9 @@ import { APP_KINDS } from "./app-actions.js";
 import { PACKAGE_KINDS } from "./package-actions.js";
 import { globalRecord, missingHosts, prepareHostAddition, prepareHostRemoval, prepareUninstall, runHostAddition, runHostRemoval, runUninstall, UNINSTALL_REFUSALS, } from "./catalog-installs.js";
 import { errorText } from "./batch.js";
-import { BULK_KINDS, handleBulkKey } from "./bulk-actions.js";
-import { answerYesNo, applyChecklistOutcome, hostChecklistKey } from "./mode-keys.js";
-import { handleUnmanagedKey, UNMANAGED_KINDS } from "./unmanaged-actions.js";
+import { BULK_KINDS, bulkConfirmPreview, handleBulkKey } from "./bulk-actions.js";
+import { answerYesNo, applyChecklistOutcome, hostChecklistKey, movePreviewCursor } from "./mode-keys.js";
+import { handleUnmanagedKey, UNMANAGED_KINDS, unmanagedConfirmPreview } from "./unmanaged-actions.js";
 import { busy } from "./working-model.js";
 const MANAGE_KINDS = new Set([
     "remove-scope",
@@ -43,7 +43,7 @@ async function startFullUninstall(context, skill) {
         if (!context.isMounted())
             return;
         if (prepared.kind === "ready") {
-            context.setMode({ kind: "confirm-uninstall", skill, prepared });
+            context.setMode({ kind: "confirm-uninstall", skill, prepared, cursor: 0 });
             return;
         }
         context.setMessage({ kind: "error", text: UNINSTALL_REFUSALS[prepared.kind] });
@@ -73,13 +73,13 @@ async function startHostChange(context, mode) {
             const prepared = await prepareHostAddition(operations, env, mode.skill, installed, mode.selected);
             if (!context.isMounted())
                 return;
-            context.setMode({ kind: "confirm-host-add", skill: mode.skill, prepared });
+            context.setMode({ kind: "confirm-host-add", skill: mode.skill, prepared, cursor: 0 });
         }
         else {
             const prepared = await prepareHostRemoval(operations, env, mode.skill, installed, mode.selected);
             if (!context.isMounted())
                 return;
-            context.setMode({ kind: "confirm-host-remove", skill: mode.skill, prepared });
+            context.setMode({ kind: "confirm-host-remove", skill: mode.skill, prepared, cursor: 0 });
         }
     }
     catch (error) {
@@ -117,35 +117,61 @@ function handleRemoveScopeKey(context, mode, input, key) {
     else if (input === "2")
         context.setMode({ kind: "hosts-remove", skill: mode.skill, choices: mode.hosts, cursor: 0, selected: [] });
 }
-/** Keys of the confirmation modes: `y` runs the step (or asks for exposure consent first), `n`/Esc cancels. */
-function handleConfirmKey(context, mode, input, key) {
-    const { operations, env } = context;
-    const cancelWith = (text) => () => cancel(context, text);
+/** What a paged confirmation shows, so the key handler and the panel page the same rows. */
+export function pagedConfirmPreview(mode) {
+    if (mode.kind === "confirm-unmanaged")
+        return unmanagedConfirmPreview(mode);
+    if (mode.kind === "confirm-bulk-uninstall" || mode.kind === "confirm-bulk-hosts")
+        return bulkConfirmPreview(mode);
+    const name = mode.skill.name;
     switch (mode.kind) {
         case "confirm-host-add":
-            answerYesNo(input, key, () => context.setMode({ ...mode, kind: "confirm-host-exposure" }), cancelWith("Install cancelled"));
-            return;
-        case "confirm-host-exposure":
-            answerYesNo(input, key, () => {
-                void execute(context, `Changing hosts of ${mode.skill.name}…`, () => runHostAddition(mode.prepared, operations, env));
-            }, cancelWith("Install cancelled"));
-            return;
+            return { lines: mode.prepared.preview, chrome: { title: "Add hosts", action: `Add hosts to ${name}`, consequence: `Add hosts to ${name}? y/n` } };
         case "confirm-host-remove":
-            answerYesNo(input, key, () => {
-                void execute(context, `Changing hosts of ${mode.skill.name}…`, () => runHostRemoval(mode.prepared, operations, env, mode.skill));
-            }, cancelWith("Uninstall cancelled"));
-            return;
+            return { lines: mode.prepared.preview, chrome: { title: "Remove hosts", action: `Remove hosts from ${name}`, consequence: `Remove hosts from ${name}? y/n` } };
         case "confirm-uninstall":
-            answerYesNo(input, key, () => {
+            return { lines: mode.prepared.plan.preview, chrome: { title: "Uninstall", action: `Uninstall ${name}`, consequence: `Uninstall ${name}? y/n` } };
+    }
+}
+export function isPagedConfirmMode(mode) {
+    return ["confirm-host-add", "confirm-host-remove", "confirm-uninstall", "confirm-unmanaged", "confirm-bulk-uninstall", "confirm-bulk-hosts"].includes(mode.kind);
+}
+/** Pages the preview like the other footer confirmations: `y` answers only once it has all been displayed. */
+function handlePagedConfirmKey(context, mode, input, key) {
+    const { operations, env } = context;
+    const { lines, chrome } = pagedConfirmPreview(mode);
+    const viewport = context.previewGeometry(lines, mode.cursor, chrome);
+    const cursor = movePreviewCursor(mode.cursor, viewport.total, input, key, viewport.height);
+    if (cursor !== undefined) {
+        context.setMode({ ...mode, cursor });
+        return;
+    }
+    answerYesNo(input, key, () => {
+        if (!viewport.reachedEnd)
+            return;
+        switch (mode.kind) {
+            case "confirm-host-add":
+                context.setMode({ kind: "confirm-host-exposure", skill: mode.skill, prepared: mode.prepared });
+                return;
+            case "confirm-host-remove":
+                void execute(context, `Changing hosts of ${mode.skill.name}…`, () => runHostRemoval(mode.prepared, operations, env, mode.skill));
+                return;
+            case "confirm-uninstall":
                 void execute(context, `Removing ${mode.skill.name}…`, async () => {
                     await runUninstall(mode.prepared, operations, env);
                     return mode.prepared.plan.inspections.every((inspection) => inspection.recordOnly)
                         ? `Forgot missing installation record for ${mode.skill.path}; no files were removed`
                         : `Removed ${mode.skill.name} (${mode.skill.path})`;
                 });
-            }, cancelWith("Uninstall cancelled"));
-            return;
-    }
+                return;
+        }
+    }, () => cancel(context, mode.kind === "confirm-host-add" ? "Install cancelled" : "Uninstall cancelled"));
+}
+/** The exposure question has no preview: `y` adds the hosts, `n`/Esc cancels. */
+function handleExposureKey(context, mode, input, key) {
+    answerYesNo(input, key, () => {
+        void execute(context, `Changing hosts of ${mode.skill.name}…`, () => runHostAddition(mode.prepared, context.operations, context.env));
+    }, () => cancel(context, "Install cancelled"));
 }
 /**
  * Handles a key in one of the manage modes. Returns false when the mode is not
@@ -167,10 +193,12 @@ export function handleManageKey(context, mode, input, key) {
             handleHostChecklistKey(context, mode, input, key);
             break;
         case "confirm-host-add":
-        case "confirm-host-exposure":
         case "confirm-host-remove":
         case "confirm-uninstall":
-            handleConfirmKey(context, mode, input, key);
+            handlePagedConfirmKey(context, mode, input, key);
+            break;
+        case "confirm-host-exposure":
+            handleExposureKey(context, mode, input, key);
             break;
         default:
             break;

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

@@ -1,29 +1,20 @@
 import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { Box, Text } from "ink";
+import { Box } from "ink";
+import { Text } from "./safe-text.js";
 import { AppPanel } from "./app-actions.js";
 import { PackagePanel } from "./package-actions.js";
-import { ChecklistLines, DecisionPrompt, HostChecklist, PreviewConfirm, PreviewLines, Working } from "./panel-parts.js";
+import { pagedConfirmPreview } from "./manage-actions.js";
+import { ChecklistLines, DecisionPrompt, HostChecklist, PagedPreview, Working } from "./panel-parts.js";
+import { usePreviewGeometry } from "./preview-window.js";
 import { theme } from "./theme.js";
 const plural = (n) => `${n} ${n === 1 ? "item" : "items"}`;
 function SkippedLines({ skipped }) {
     return (_jsx(_Fragment, { children: skipped.map(({ id, label, reason }) => _jsxs(Text, { color: theme.warning, children: ["Skipped ", label, ": ", reason] }, id)) }));
 }
-/** One block per planned item, the skipped ones, then the y/n question. */
-function PlanPreview({ entries, skipped, question }) {
-    return (_jsxs(Box, { flexDirection: "column", children: [entries.map((entry) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.group, children: entry.label }), _jsx(PreviewLines, { lines: entry.lines, warnFirst: entry.warnFirst })] }, entry.id))), _jsx(SkippedLines, { skipped: skipped }), _jsx(DecisionPrompt, { children: question })] }));
-}
-function UninstallPreview({ plan }) {
-    const entries = plan.items.map((item) => ({
-        id: item.id,
-        label: item.label,
-        lines: item.kind === "managed" ? item.prepared.plan.preview : item.prepared.preview,
-        warnFirst: item.kind === "unmanaged",
-    }));
-    return _jsx(PlanPreview, { entries: entries, skipped: plan.skipped, question: `Uninstall ${plural(plan.items.length)}?` });
-}
-function HostsPreview({ plan }) {
-    const entries = plan.items.map((item) => ({ id: item.id, label: item.label, lines: item.prepared.preview, warnFirst: false }));
-    return _jsx(PlanPreview, { entries: entries, skipped: plan.skipped, question: `Add hosts to ${plural(plan.items.length)}?` });
+/** A Skill confirmation with the shared footer; the view shows it alone so no tree rows count against its height. */
+export function PagedConfirmPanel({ mode }) {
+    const { lines, styled, chrome } = pagedConfirmPreview(mode);
+    return _jsx(PagedPreview, { chrome: chrome, lines: lines, styled: styled, viewport: usePreviewGeometry()(lines, mode.cursor, chrome) });
 }
 /** Renders the prompt of a manage mode: host lists, previews and confirmations. */
 export function ManagePanel({ mode }) {
@@ -44,25 +35,20 @@ export function ManagePanel({ mode }) {
         case "hosts-remove":
             return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [mode.kind === "hosts-add" ? "Add hosts to" : "Remove hosts from", " ", mode.skill.name, ". Host (space/1-", mode.choices.length, " toggle, j/k move, Enter continue, Esc cancel):"] }), _jsx(HostChecklist, { choices: mode.choices, cursor: mode.cursor, selected: mode.selected })] }));
         case "confirm-host-add":
-            return _jsx(PreviewConfirm, { lines: mode.prepared.preview, question: `Add hosts to ${mode.skill.name}? y/n` });
-        case "confirm-host-exposure":
-            return (_jsxs(Text, { color: theme.warning, children: ["Adding hosts exposes the installed ", mode.skill.name, " to more hosts and needs separate confirmation (CLI: --confirm-additional-host). ", _jsx(DecisionPrompt, { children: "Confirm?" })] }));
         case "confirm-host-remove":
-            return _jsx(PreviewConfirm, { lines: mode.prepared.preview, question: `Remove hosts from ${mode.skill.name}? y/n` });
         case "confirm-uninstall":
-            return _jsx(PreviewConfirm, { lines: mode.prepared.plan.preview, question: `Uninstall ${mode.skill.name}? y/n` });
+        case "confirm-unmanaged":
+        case "confirm-bulk-uninstall":
+        case "confirm-bulk-hosts":
+            return _jsx(PagedConfirmPanel, { mode: mode });
+        case "confirm-host-exposure":
+            return (_jsxs(Text, { color: theme.warning, children: ["Adding hosts exposes the installed ", mode.skill.name, " to more hosts and needs separate confirmation (CLI: --confirm-additional-host). ", _jsx(DecisionPrompt, { children: "Confirm?" })] }));
         case "unmanaged-scope":
             return _jsxs(Text, { children: ["Remove ", mode.group.name, " (", mode.group.locations.length, " locations): 1 all locations  2 choose locations  (Esc cancel)"] });
         case "unmanaged-pick":
             return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Remove locations of ", mode.group.name, ". Location (space/1-", mode.group.locations.length, " toggle, j/k move, Enter continue, Esc cancel):"] }), _jsx(ChecklistLines, { choices: mode.group.locations, cursor: mode.cursor, isSelected: (location) => mode.selected.includes(location.path), keyOf: (location) => location.path, label: (location) => `${location.path}${location.linkTarget === undefined ? "" : `  symlink → ${location.linkTarget}`}` })] }));
-        case "confirm-unmanaged":
-            return _jsx(PreviewConfirm, { lines: mode.prepared.preview, question: `Remove ${mode.group.name}? y/n`, warnFirst: true });
         case "bulk-hosts":
             return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Add hosts to ", plural(mode.targets.length), ". Host (space/1-", mode.choices.length, " toggle, j/k move, Enter continue, Esc cancel):"] }), _jsx(HostChecklist, { choices: mode.choices, cursor: mode.cursor, selected: mode.selected }), _jsx(SkippedLines, { skipped: mode.skipped })] }));
-        case "confirm-bulk-uninstall":
-            return _jsx(UninstallPreview, { plan: mode.plan });
-        case "confirm-bulk-hosts":
-            return _jsx(HostsPreview, { plan: mode.plan });
         case "confirm-bulk-exposure":
             return (_jsxs(Text, { color: theme.warning, children: ["Adding hosts exposes the installed ", mode.plan.items.map((item) => item.label).join(", "), " to more hosts and needs separate confirmation (CLI: --confirm-additional-host). ", _jsx(DecisionPrompt, { children: "Confirm?" })] }));
         case "busy":

package/dist/src/tui/mode-keys.js

@@ -1,4 +1,5 @@
 import { isValidFixedVersion } from "../skill-install.js";
+import { isYes } from "./keys.js";
 /** The cursor after a down/up key (arrows or j/k), or undefined when the key does not move it. */
 export function moveCursor(cursor, length, input, key) {
     if (key.downArrow || input === "j")
@@ -51,11 +52,20 @@ export function applyChecklistOutcome(outcome, handlers) {
 }
 /** The y/n confirmation keys: `y` confirms, `n` or Esc declines, anything else is ignored. */
 export function answerYesNo(input, key, onYes, onNo) {
-    if (input === "y")
+    if (isYes(input, key))
         onYes();
     else if (input === "n" || key.escape)
         onNo();
 }
+/** A paged preview answers `y` only once `viewport` has been read to the end; paging keys move the cursor. */
+export function answerPaged(viewport, cursor, input, key, outcome) {
+    const moved = movePreviewCursor(cursor, viewport.total, input, key, viewport.height);
+    if (moved !== undefined)
+        outcome.moveTo(moved);
+    else
+        answerYesNo(input, key, () => { if (viewport.reachedEnd)
+            outcome.yes(); }, outcome.no);
+}
 /** Esc cancels, Enter submits a valid version, backspace deletes, any other plain key is typed. */
 export function versionInputKey(value, input, key) {
     if (key.escape)

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

@@ -1,10 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { quoteText } from "../preview-model.js";
 import { displayPackageSelection } from "../package-model.js";
 import { errorText } from "./batch.js";
+import { isYes } from "./keys.js";
 import { movePreviewCursor } from "./mode-keys.js";
 import { installedEvidenceLabel, packagePlanLines } from "./package-rows.js";
-import { PreviewConfirm } from "./panel-parts.js";
-import { previewViewport } from "./preview-window.js";
+import { PagedPreview } from "./panel-parts.js";
+import { usePreviewGeometry } from "./preview-window.js";
 import { busy } from "./working-model.js";
 /** The per-row keys of a Package; Enter is approval, handled beside these. */
 export const PACKAGE_ACTION_KEYS = new Map([
@@ -58,7 +60,7 @@ export async function startPackageAction(context, target, input) {
                 manage.setMode({ kind: "package-confirm", plan, approval, cursor: 0 });
             return;
         }
-        await manage.finish({ kind: "error", text: `The action ${JSON.stringify(input)} is not available for Packages` });
+        await manage.finish({ kind: "error", text: `The action ${quoteText(input)} is not available for Packages` });
     }
     catch (error) {
         await manage.finish({ kind: "error", text: errorText(error) });
@@ -132,28 +134,32 @@ function packagePreview(mode) {
         case "package-approve":
             return {
                 lines: mode.lines,
-                chrome: reviewChrome("Package approval", `Approve this install declaration for ${mode.target.name}? y/n`),
+                chrome: { title: "Package approval", action: "Approve the install declaration",
+                    consequence: `Approve this install declaration for ${mode.target.name}? y/n` },
             };
         case "package-forget":
             return {
                 lines: mode.lines,
-                chrome: reviewChrome("Forget Package selection", `Forget the selection record of ${mode.target.name}? y/n`),
+                chrome: { title: "Forget Package selection", action: "Forget the selection record",
+                    consequence: `Forget the selection record of ${mode.target.name}? y/n` },
             };
-        case "package-confirm":
+        case "package-confirm": {
+            const { action, descriptor } = mode.plan;
+            const needsApproval = mode.approval === "needs approval";
             return {
                 lines: packagePlanLines(mode.plan, mode.approval),
-                chrome: reviewChrome(`Package ${mode.plan.action} confirmation`, mode.approval === "needs approval"
-                    ? "Approve this declaration and continue? y/n"
-                    : `${mode.plan.action} ${mode.plan.descriptor.name}? y/n`),
+                chrome: {
+                    title: `Package ${action} confirmation`,
+                    action: needsApproval ? `Approve and ${action} ${descriptor.name}` : `${action[0].toUpperCase()}${action.slice(1)} ${descriptor.name}`,
+                    consequence: needsApproval ? "Approve this declaration and continue? y/n" : `${action} ${descriptor.name}? y/n`,
+                },
             };
+        }
     }
 }
-function reviewChrome(title, question) {
-    return { title, questions: [question], footerRows: 2 };
-}
 /**
- * Pages the declaration with the arrows, PgUp/PgDn and j/k. `y` answers from any page: the panel shows
- * the `Review N of M` position and the row window while more remains. `n` and Esc run nothing.
+ * Pages the declaration with the arrows, PgUp/PgDn and j/k. `y` answers only once the whole declaration
+ * has been displayed. `n` and Esc run nothing.
  */
 export function handlePackageKey(context, mode, input, key) {
     const { manage, packages } = context;
@@ -162,7 +168,7 @@ export function handlePackageKey(context, mode, input, key) {
         manage.browse();
     };
     const { lines, chrome } = packagePreview(mode);
-    const viewport = previewViewport(lines, mode.cursor, context.terminalRows, context.terminalColumns, chrome);
+    const viewport = context.previewGeometry(lines, mode.cursor, chrome);
     const cursor = movePreviewCursor(mode.cursor, viewport.total, input, key, viewport.height);
     if (cursor !== undefined) {
         manage.setMode({ ...mode, cursor });
@@ -172,7 +178,7 @@ export function handlePackageKey(context, mode, input, key) {
         cancel("Package action cancelled");
         return;
     }
-    if (input !== "y")
+    if (!isYes(input, key) || !viewport.reachedEnd)
         return;
     switch (mode.kind) {
         case "package-approve":
@@ -190,8 +196,9 @@ export function handlePackageKey(context, mode, input, key) {
             return;
     }
 }
-/** Renders a Package prompt with the existing preview panel and y/n confirmation. */
+/** Renders a Package prompt with the shared paged preview. */
 export function PackagePanel({ mode }) {
     const { lines, chrome } = packagePreview(mode);
-    return _jsx(PreviewConfirm, { title: chrome.title, lines: lines, cursor: mode.cursor, question: chrome.questions[0], chrome: chrome });
+    const viewport = usePreviewGeometry()(lines, mode.cursor, chrome);
+    return _jsx(PagedPreview, { chrome: chrome, lines: lines, viewport: viewport });
 }

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

@@ -1,4 +1,5 @@
 import { classifyUpdate } from "../package-host-plans.js";
+import { quoteText } from "../preview-model.js";
 import { displayPackageCoordinates, displayPackageSelection, } from "../package-model.js";
 /** Version evidence as a short label; `unknown` when the host or the bundle states none. */
 export function packageVersionLabel(evidence, commit) {
@@ -98,7 +99,7 @@ export function packagePlanLines(plan, approval) {
         ...(plan.commands.length === 0
             ? ["This action runs no host command."]
             : plan.commands.flatMap((command, position) => [
-                `Step ${position + 1} (${command.purpose}): ${JSON.stringify([command.executable, ...command.args])}`,
+                `Step ${position + 1} (${command.purpose}): [${[command.executable, ...command.args].map(quoteText).join(",")}]`,
                 `Executable: ${command.resolvedPath ?? command.executable}`,
             ])),
         `Blast radius: ${plan.affects.map((coordinates) => displayPackageCoordinates(selection.source, coordinates)).join(", ")}`,

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

@@ -1,8 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Box, Text, useWindowSize } from "ink";
+import { Box } from "ink";
+import { PreEscapedText, Text } from "./safe-text.js";
 import { useEffect, useState } from "react";
 import { theme } from "./theme.js";
-import { previewViewport } from "./preview-window.js";
+import { escapeControlText, sliceSpans } from "./preview-window.js";
 import { animationEnabled, formatElapsed, SPINNER_FRAMES, SPINNER_TICK_MS, STATIC_GLYPH } from "./working-model.js";
 /** A titled, color-independent boundary for a focused interaction or result. */
 export function BorderPanel({ title, children }) {
@@ -40,7 +41,6 @@ export function ChecklistLines({ choices, cursor, isSelected, keyOf, label }) {
 export function HostChecklist({ choices, cursor, selected }) {
     return _jsx(ChecklistLines, { choices: choices, cursor: cursor, isSelected: (host) => selected.includes(host), keyOf: (host) => host, label: (host) => host });
 }
-/** Preview lines; `warnFirst` colors the first one as a warning. */
 const PREVIEW_FIELD_LABELS = [
     "File:", "Name:", "Platform:", "Status:", "Homepage:", "Owned Skills:",
     "App:", "Environment:", "Version:", "argv:", "Executable:", "Manual:",
@@ -106,51 +106,60 @@ function profilePreviewSpans(line) {
             previewSpan(` ${hosts[2]}`, theme.version)];
     return undefined;
 }
-function visiblePreviewSpans(spans, offset, length) {
-    const end = offset + length;
-    let spanStart = 0;
-    const visible = [];
-    for (const span of spans) {
-        const spanEnd = spanStart + span.text.length;
-        const start = Math.max(offset, spanStart);
-        const stop = Math.min(end, spanEnd);
-        if (start < stop)
-            visible.push({ ...span, text: span.text.slice(start - spanStart, stop - spanStart) });
-        spanStart = spanEnd;
-    }
-    return visible;
+/** The colour of a warning, host exposure notice or refusal, which the flows indent to different depths. */
+function noticeColor(line) {
+    const text = line.trimStart();
+    if (text.startsWith("WARNING:") || text.startsWith("ADDITIONAL HOST EXPOSURE:") || text.startsWith("Skipped "))
+        return theme.warning;
+    return text.startsWith("Cannot install ") ? theme.error : undefined;
 }
-function PreviewLine({ line, position, warnFirst, logicalLine, offset = 0 }) {
+function PreviewLine({ line, position, logicalLine, offset = 0 }) {
     const profileSpans = logicalLine === undefined ? profilePreviewSpans(line) : profilePreviewSpans(logicalLine);
     if (profileSpans) {
-        const spans = logicalLine === undefined ? profileSpans : visiblePreviewSpans(profileSpans, offset, line.length);
-        return _jsx(Text, { children: spans.map((span, index) => _jsx(Text, { color: span.color, bold: span.bold, children: span.text }, index)) }, position);
+        const spans = logicalLine === undefined ? profileSpans : sliceSpans(profileSpans, offset, line.length);
+        return _jsx(PreEscapedText, { children: spans.map((span, index) => _jsx(PreEscapedText, { color: span.color, bold: span.bold, children: span.text }, index)) }, position);
     }
     const field = previewField(logicalLine ?? line);
     if (field) {
         const fieldSpans = [previewSpan(field.label, theme.field), previewSpan(field.value, theme.value)];
-        const spans = logicalLine === undefined ? fieldSpans : visiblePreviewSpans(fieldSpans, offset, line.length);
-        return _jsx(Text, { children: spans.map((span, index) => _jsx(Text, { color: span.color, children: span.text }, index)) }, position);
+        const spans = logicalLine === undefined ? fieldSpans : sliceSpans(fieldSpans, offset, line.length);
+        return _jsx(PreEscapedText, { children: spans.map((span, index) => _jsx(PreEscapedText, { color: span.color, children: span.text }, index)) }, position);
     }
-    return _jsx(Text, { color: warnFirst && position === 0 ? theme.warning : theme.value, children: line }, position);
+    return _jsx(PreEscapedText, { color: noticeColor(logicalLine ?? line) ?? theme.value, children: line }, position);
 }
-export function PreviewLines({ lines, warnFirst = false }) {
-    return _jsx(_Fragment, { children: lines.map((line, position) => _jsx(PreviewLine, { line: line, position: position, warnFirst: warnFirst }, position)) });
+export function PreviewLines({ lines }) {
+    return _jsx(_Fragment, { children: lines.map((line, position) => _jsx(PreviewLine, { line: escapeControlText(line), position: position }, position)) });
 }
 /** Under a list: the window indicator, how many items are marked, and the last result. */
 export function ListFooter({ indicator, selectedCount, message }) {
     return (_jsxs(_Fragment, { children: [indicator ? _jsx(Text, { color: theme.muted, children: indicator }) : null, selectedCount > 0 ? _jsxs(Text, { color: theme.muted, children: [selectedCount, " selected"] }) : null, message ? (_jsx(BorderPanel, { title: message.kind === "error" ? "Result · failed" : "Result · complete", children: _jsx(Text, { color: message.kind === "error" ? theme.error : theme.success, children: message.text }) })) : null] }));
 }
-/** A preview followed by a y/n question. */
-export function PreviewConfirm({ title = "Confirmation", lines, question, warnFirst, cursor, chrome }) {
-    const { rows, columns } = useWindowSize();
-    const viewport = cursor === undefined ? undefined : previewViewport(lines, cursor, rows || 24, columns || 80, chrome ?? { title, questions: [question], footerRows: 2 });
-    const shown = viewport?.rows ?? lines;
-    return (_jsxs(BorderPanel, { title: title, children: [viewport ? shown.map((line, position) => {
-                const sourceLine = viewport.sourceLines[position];
-                return _jsx(PreviewLine, { line: line, position: position, warnFirst: Boolean(warnFirst && viewport.start === 0), logicalLine: lines[sourceLine], offset: viewport.sourceOffsets[position] }, position);
-            }) : _jsx(PreviewLines, { lines: shown, warnFirst: warnFirst }), viewport && viewport.total > viewport.height ? _jsxs(Text, { color: theme.muted, children: [viewport.start + 1, "\u2013", viewport.end, " of ", viewport.total] }) : null, viewport ? _jsxs(Text, { color: theme.legend, children: ["Review ", viewport.cursor + 1, " of ", viewport.total, " \u00B7 arrows/Pg page"] }) : null, question.includes("y/n") ? (() => {
-                const marker = question.indexOf("y/n");
-                return _jsxs(Text, { children: [_jsx(Text, { color: theme.warning, children: question.slice(0, marker) }), _jsx(Text, { color: theme.success, bold: true, children: "y" }), _jsx(Text, { color: theme.legend, children: "/" }), _jsx(Text, { color: theme.error, children: "n" }), _jsx(Text, { color: theme.legend, children: question.slice(marker + 3) })] });
-            })() : _jsx(Text, { color: theme.legend, children: question })] }));
+function footerColor(role, reachedEnd) {
+    switch (role) {
+        case "read": return { color: theme.success };
+        case "reading": return { color: theme.warning };
+        case "consequence": return { color: theme.warning };
+        case "yes": return { color: theme.success, bold: true };
+        case "no": return { color: theme.error };
+        case "action": return reachedEnd ? { color: theme.success, bold: true } : { color: theme.muted };
+        case "position":
+        case "cancel": return { color: theme.legend };
+    }
+}
+/**
+ * A paged preview with the shared two-row footer: reading progress, then what `y` does. `[y]` stays
+ * dimmed until `viewport` reaches the end; callers ignore `y` until then using the same viewport.
+ */
+export function PagedPreview({ chrome, lines: rawLines, styled: rawStyled, viewport }) {
+    // The same escape `previewViewport` applied, so rows, offsets and spans describe the same text. The rows themselves are already
+    // escaped, hence `PreEscapedText`; only the title goes through `BorderPanel`.
+    const lines = rawLines.map(escapeControlText);
+    const styled = rawStyled?.map((line) => line?.map((span) => ({ ...span, text: escapeControlText(span.text) })));
+    return (_jsxs(BorderPanel, { title: chrome.title, children: [viewport.rows.map((line, position) => {
+                const logical = viewport.sourceLines[position];
+                const custom = styled?.[logical];
+                return custom === undefined
+                    ? _jsx(PreviewLine, { line: line, position: position, logicalLine: lines[logical], offset: viewport.sourceOffsets[position] }, position)
+                    : _jsx(PreEscapedText, { children: sliceSpans(custom, viewport.sourceOffsets[position], line.length).map((span, index) => _jsx(PreEscapedText, { color: span.color, bold: span.bold, children: span.text }, index)) }, position);
+            }), viewport.footer.map((spans, row) => _jsx(PreEscapedText, { children: spans.map((span, index) => _jsx(PreEscapedText, { ...footerColor(span.role, viewport.reachedEnd), children: span.text }, index)) }, `footer-${row}`))] }));
 }