@getorrery/cells 0.2.2 → 0.2.3

package/dist/el/chrome.d.ts

@@ -97,6 +97,8 @@ export interface DockView {
 }
 /** The dock: a rule with title and step, the question, its body. */
 export declare function dock(p: DockView, w: number, m: boolean): Item[];
+/** The most choices the dock shows at once; a longer list scrolls. */
+export declare const DOCK_ROWS = 10;
 /** A choice on the consent bar. */
 export interface ConsentChoice {
     key: string;

package/dist/el/extensions.d.ts

@@ -4,12 +4,16 @@
  * the processes behind `p`; one row's details behind Enter — port of
  * `el/extensions.rs`. The host formats every row (`orrery_registry::browse`);
  * this draws them. The marks are glyphs (● ○ ↑) and every state is also in
- * words, so mono reads the same. Read-only for now: no selection, no acts.
+ * words, so mono reads the same. Decision 0107: two-line rows, the search box
+ * on top, the focus (search, filters, list) and the marks are the client's,
+ * merged into the props before drawing; a batch in flight is drawn under the list.
  */
 import { type Item } from "../cells";
 /** One row of the list, as the host formats it (`orrery_registry::browse::Row`). The chat draws the same fields. */
 export interface ExtRowV {
     id: string;
+    /** Its name; the id when absent. */
+    name?: string;
     /** The installed version, else the listed one. */
     version?: string;
     /** What it is, kebab-case: `tools`, `session-store`. */
@@ -41,6 +45,21 @@ export interface ProcRowV {
     up: string;
     hosts: string;
 }
+/** One extension of a batch in flight (decision 0107 §4). */
+export interface BatchItemV {
+    id: string;
+    /** `download`, `verify`, `consent`, `install`. */
+    step?: string;
+    /** `running`, `done` or `failed`. */
+    state?: string;
+    /** What to do when it failed. */
+    fix?: string | null;
+}
+/** A batch in flight: a line per extension and a summary (empty while it runs). */
+export interface BatchV {
+    items?: BatchItemV[];
+    summary?: string;
+}
 /** One row's details. A third item is the value's style class (`d` is dim). */
 export interface DetailV {
     title: string;
@@ -85,6 +104,12 @@ export interface ExtensionsView {
     selected?: number | null;
     /** The screen rows the client has for the overlay: past it the rows are windowed around the cursor, the head, totals and keys always drawn. */
     height?: number | null;
+    /** Where the keys are (the client's): `search`, `filters` or `list` (the default). */
+    focus?: string | null;
+    /** The ids marked with Space (the client's). */
+    marked?: string[];
+    /** A batch in flight (the host's). */
+    batch?: BatchV | null;
 }
 /** Draw the overlay at `w` cells: the list, the processes, or one row's details. */
 export declare function extensions(p: ExtensionsView, w: number, m: boolean): Item[];

package/dist/el/mod.d.ts

@@ -23,6 +23,12 @@ export declare class BadProps extends Error {
     readonly reason: string;
     constructor(id: string, reason: string);
 }
+/**
+ * A `null` object member is the member absent, as the Rust crate reads it:
+ * every defaulted field takes its default rather than failing on `null`.
+ * Nulls in arrays stay. Returns a copy; the host's props are not changed.
+ */
+export declare function dropNulls(v: unknown): unknown;
 /**
  * Draw element `id` from its props at `w` columns, in mono when `m`.
  *

package/dist/from.d.ts

@@ -123,8 +123,8 @@ export declare function turn(tv: TurnView, o: TurnOpts, w: number, m: boolean):
 export declare function options(el: string, props: unknown): number | null;
 /** An element's props with this client's cursor put in them. */
 export declare function withCursor(el: string, props: unknown, cursor: string | null | undefined): unknown;
-/** An overlay's child as rows: as {@link node}, and an element that windows its rows (`/extensions`) is told the `rows` the overlay has. */
-export declare function overlayNode(doc: UiDoc, id: string, cursor: string | null | undefined, rows: number, w: number, m: boolean): Line[];
+/** An overlay's child as rows: as {@link node}, and an element that windows its rows (`/extensions`) is told the `rows` the overlay has and gets the client's own state merged in (`view`: its focus and marks). */
+export declare function overlayNode(doc: UiDoc, id: string, cursor: string | null | undefined, view: Record<string, unknown>, rows: number, w: number, m: boolean): Line[];
 /** A UI node (Tier 2, or an element) as rows. `cursor` is where this client moved a list's cursor. */
 export declare function node(doc: UiDoc, id: string, cursor: string | null | undefined, w: number, m: boolean): Line[];
 /** Whether a node's children are drawn by the node itself. */

package/dist/index.js

@@ -636,6 +636,7 @@ ${text2(got)}`;
 // src/el/chrome.ts
 var chrome_exports = {};
 __export(chrome_exports, {
+  DOCK_ROWS: () => DOCK_ROWS,
   INDICATOR_MARK: () => INDICATOR_MARK,
   SLASH_ROWS: () => SLASH_ROWS,
   SWITCHER_NARROW: () => SWITCHER_NARROW,
@@ -1619,18 +1620,33 @@ function dock(p, w, m) {
   } else {
     rows2 = [hd];
     if (prompt !== "" || (p.items ?? []).length > 0) rows2.push(q);
-    const lw = w < 60 ? 17 : 20;
+    const items2 = p.items ?? [];
+    const base = w < 60 ? 17 : 20;
+    const longest = Math.max(0, ...items2.map((it) => chars(it.label)));
+    const lw = Math.min(Math.max(longest + 1, base), Math.max(w - 4, base));
     const sl = p.selected ?? 0;
-    (p.items ?? []).forEach((it, i) => {
+    const n = items2.length;
+    let from = 0;
+    let to = n;
+    if (n > DOCK_ROWS) {
+      const cur = Math.min(sl, n - 1);
+      from = Math.min(Math.max(cur - Math.floor(DOCK_ROWS / 2), 0), n - DOCK_ROWS);
+      to = from + DOCK_ROWS;
+    }
+    if (from > 0) rows2.push([sp(4), t(`${from} more above`, "d")]);
+    items2.forEach((it, i) => {
+      if (i < from || i >= to) return;
       const on = i === sl;
       const d0 = it.detail ?? "";
       const detail2 = w < 60 ? d0.split(" \xB7 ")[1] ?? d0 : d0;
       const l = [sp(2), t(on ? "\u276F " : "  ", on ? "ac" : ""), t(ps(it.label, lw), on ? "b" : "i"), t(detail2, "d")];
       rows2.push(on ? sel(l) : l);
     });
+    if (to < n) rows2.push([sp(4), t(`${n - to} more below`, "d")]);
   }
   return out(rows2);
 }
+var DOCK_ROWS = 10;
 function consent(p, w, m) {
   const state = p.state ?? "asking";
   const selected = p.selected ?? 0;
@@ -1951,6 +1967,7 @@ __export(mod_exports, {
   chrome: () => chrome_exports,
   content: () => content_exports,
   context: () => context_exports,
+  dropNulls: () => dropNulls,
   errLines: () => errLines,
   extensions: () => extensions_exports,
   feedback: () => feedback_exports,
@@ -3078,19 +3095,19 @@ function options(el, props) {
 }
 function withCursor(el, props, cursor) {
   if (cursor == null || !/^\d+$/.test(cursor)) return props;
-  if (el === "tasks" && props !== null && typeof props === "object" && !Array.isArray(props)) {
+  if ((el === "tasks" || el === "extensions") && props !== null && typeof props === "object" && !Array.isArray(props)) {
     return { ...props, cursor: Number(cursor) };
   }
   if (options(el, props) == null) return props;
   if (props === null || typeof props !== "object" || Array.isArray(props)) return props;
   return { ...props, selected: Number(cursor) };
 }
-function overlayNode(doc, id, cursor, rows2, w, m) {
+function overlayNode(doc, id, cursor, view, rows2, w, m) {
   const n = doc.nodes[id];
   if (n?.type !== "element" || n.el !== "extensions") return node(doc, id, cursor, w, m);
   const p = withCursor(n.el, n.props ?? {}, cursor);
   try {
-    return linesOf(render2(n.el, p !== null && typeof p === "object" ? { ...p, height: rows2 } : p, w, m));
+    return linesOf(render2(n.el, p !== null && typeof p === "object" ? { ...p, ...view, height: rows2 } : p, w, m));
   } catch (e) {
     const msg = e instanceof BadProps ? e.message : e instanceof Error ? e.message : String(e);
     return para([g(m, "\u2717", "error", "er"), sp(1)], msg, w, "er", null);
@@ -3524,29 +3541,36 @@ function list2(p, w, m) {
   const noList = l.age == null;
   const loading = noList && l.refreshing === true;
   const lost = noList && l.refreshing !== true && (l.offline === true || l.failed != null);
-  const searching = p.query != null;
   const c = p.counts ?? {};
   const age = l.age ?? "";
   const fail = l.failed ?? "";
   const head = lost ? l.offline ? "offline" : "no list" : !noList && l.offline ? `offline \xB7 list from ${age} ago` : !noList && l.failed != null ? `list from ${age} ago` : "esc close";
   const lines = [panelHead(w, "Extensions", [], head, true, m)];
+  const on = p.filter ? p.filter : "all";
+  const query = p.query != null && p.query !== "" ? p.query : null;
+  const focus = p.focus ?? "list";
+  const lead = (at) => focus === at ? t("\u276F ", "ac") : sp(2);
   const unknown = (n2) => noList ? "\u2014" : String(n2 ?? 0);
   const tabs = [
     ["All", unknown(c.all), "all"],
     ["Installed", String(c.installed ?? 0), "installed"],
     ["Updates", unknown(c.updates), "updates"]
   ];
-  const on = p.filter ? p.filter : "all";
-  const f = [sp(2)];
+  const f = [lead("filters")];
   tabs.forEach(([name, n2, key], i) => {
     if (i > 0) f.push(sp(narrow ? 1 : 2));
     f.push(key === on ? m ? t(`[${name} ${n2}]`, "b") : t(` ${name} ${n2} `, "btn b") : t(` ${name} ${n2} `, "d"));
   });
-  lines.push(lr(f, narrow ? [] : [t("tab filter \xB7 / search", "dd")], w, true));
-  if (p.query != null) {
+  lines.push(lr(f, narrow ? [] : [t("\u2190\u2192 filter", "dd")], w, true));
+  const typing = focus === "search";
+  let sbox = query != null ? [t(query, "i")] : [];
+  if (typing) sbox.push(t(" ", "cur"));
+  if (query == null) sbox.push(t("Search extensions\u2026", "dd"));
+  if (query != null) {
     const total = on === "installed" ? c.installed ?? 0 : on === "updates" ? c.updates ?? 0 : c.all ?? 0;
-    lines.push(lr([sp(2), t("/ ", "ac"), t(p.query, "i"), t(" ", "cur")], [t(`${rows2.length} of ${total}`, "d")], w, true));
+    sbox = lr(sbox, [t(`${rows2.length} of ${total}`, "d")], Math.max(w - 4, 0), true);
   }
+  lines.push(...typing ? inputBox(sbox, w, m) : boxed([sbox], w));
   const missing = [];
   if (p.roles) {
     const r = p.roles;
@@ -3590,34 +3614,55 @@ function list2(p, w, m) {
   }
   for (const role of missing) {
     const [fix, why] = role === "provider" ? ["Orrery cannot answer", "Orrery cannot answer until one is"] : role === "client" ? ["nothing draws Orrery", "nothing draws Orrery until one is"] : ["sessions are not kept", "sessions are not kept until one is"];
-    const text2 = narrow ? `No ${role}: ${fix}.` : `No ${role} is installed: ${why}. / ${role} finds one; orrery install <id> adds it.`;
+    const text2 = narrow ? `No ${role}: ${fix}.` : `No ${role} is installed: ${why}. Search "${role}" to find one; orrery install <id> adds it.`;
     lines.push(...para([sp(2), g(m, "\u2717", "missing", "er"), sp(1)], text2, w, "er"));
     lines.push([]);
   }
   if (rows2.length === 0) {
-    let first;
-    let then;
-    if (p.query != null) {
-      first = `Nothing matches "${p.query}" in names, descriptions, authors, tags or kinds.`;
-      then = "Esc clears the search. Not in the list? orrery install takes a git URL, a folder or npm:<package>.";
+    let first2;
+    let then2;
+    if (query != null) {
+      first2 = `Nothing matches "${query}" in names, descriptions, authors, tags or kinds.`;
+      then2 = "Esc clears the search. Not in the list? orrery install takes a git URL, a folder or npm:<package>.";
     } else if (on === "updates") {
-      first = "No updates: every installed extension is on its listed version.";
-      then = "Built-ins update with Orrery (/update).";
+      first2 = "No updates: every installed extension is on its listed version.";
+      then2 = "Built-ins update with Orrery (/update).";
     } else {
       const platform = globalThis.process?.platform;
       const sep = platform === "win32" ? "\\" : "/";
-      first = `No extensions in ~${sep}.orrery${sep}extensions or .orrery${sep}extensions`;
-      then = "orrery install <source>";
+      first2 = `No extensions in ~${sep}.orrery${sep}extensions or .orrery${sep}extensions`;
+      then2 = "orrery install <source>";
     }
-    lines.push(...para([sp(2)], first, w, "i"));
-    lines.push(...para([sp(2)], then, w, "d"));
+    lines.push(...para([sp(2)], first2, w, "i"));
+    lines.push(...para([sp(2)], then2, w, "d"));
   }
   const tail = [[]];
+  if (p.batch) {
+    for (const it of p.batch.items ?? []) {
+      const mark2 = it.state === "done" ? g(m, "\u2713", "done", "ok") : it.state === "failed" ? g(m, "\u2717", "failed", "er") : m ? t("[running]", "i") : spin("lv");
+      tail.push(fit([sp(2), mark2, sp(1), t(it.id, "b"), t(` \xB7 ${it.step ?? ""}`, "d")], w));
+      if (it.state === "failed" && it.fix) tail.push(...para([sp(4)], it.fix, w, "er"));
+    }
+    if (p.batch.summary) tail.push(fit([sp(2), t(p.batch.summary, "d")], w));
+  }
   if (p.totals) tail.push([sp(2), t(fitTotals(p.totals, w - 2), "d")]);
   const retry2 = lost || l.failed != null && l.offline !== true;
-  const spec = searching ? narrow ? "enter details|esc clear" : "\u2191\u2193 move|enter details|tab filter|esc clear the search" : narrow ? `${retry2 ? "r retry|" : ""}enter details|esc close` : `${retry2 ? "r retry the list|" : ""}\u2191\u2193 move|tab filter|/ search|enter details|p processes|esc close`;
-  tail.push(keys(spec, w, 2));
-  if (narrow && !searching) tail.push(keys("tab filter|/ search|p processes", w, 2));
+  const esc = (p.marked ?? []).length === 0 ? "esc close" : "esc unselect";
+  let first;
+  let then = null;
+  if (focus === "search") {
+    first = narrow ? "enter the list|esc clear" : "type to search|\u2191 filters|\u2193 the list|enter the list|esc clear";
+  } else if (focus === "filters") {
+    first = narrow ? "\u2190\u2192 filter|enter the list" : "\u2190\u2192 filter|\u2193 search|enter the list|esc the list";
+  } else if (narrow) {
+    first = `${retry2 ? "r retry|" : ""}space select|enter details|${esc}`;
+    then = "i install|x remove|p processes";
+  } else {
+    first = `${retry2 ? "r retry the list|" : ""}\u2191\u2193 move|space select|enter details|\u2190\u2192 filter|${esc}`;
+    then = "i install|u update|x remove|l load or unload|p processes";
+  }
+  tail.push(keys(first, w, 2));
+  if (then) tail.push(keys(then, w, 2));
   const n = rows2.length;
   const room = p.height == null ? Infinity : Math.max(p.height - lines.length - tail.length, 0);
   let from = 0;
@@ -3629,21 +3674,40 @@ function list2(p, w, m) {
     to = from + k;
   }
   if (from > 0) lines.push([sp(4), t(`${from} more above`, "d")]);
-  for (let i = from; i < to; i++) lines.push(...row2(rows2[i], cursor === i, w));
+  for (let i = from; i < to; i++) {
+    const r = rows2[i];
+    lines.push(...row2(r, focus === "list" && cursor === i, (p.marked ?? []).includes(r.id), w));
+  }
   if (to < n) lines.push([sp(4), t(`${n - to} more below`, "d")]);
   lines.push(...tail);
   return lines;
 }
-function row2(r, cur, w) {
+function row2(r, cur, marked2, w) {
   const installed = r.installed === true;
   const dim2 = installed && r.loaded !== true;
   const mark2 = r.update != null ? t("\u2191", "ac") : !installed ? t("\u25CB", "d") : t("\u25CF", dim2 ? "dd" : "ok");
-  const left = [t(cur ? "\u276F " : "  ", cur ? "ac" : ""), sp(2), mark2, sp(1), t(r.id, dim2 ? "dd" : "b")];
+  const name = r.name ? r.name : r.id;
+  const left = [t(cur ? "\u276F " : "  ", cur ? "ac" : ""), marked2 ? t("\u2713 ", "ok") : sp(2), mark2, sp(1), t(name, dim2 ? "dd" : "b")];
+  if (r.version) left.push(t(dim2 ? ` (${r.version} \xB7 unloaded)` : ` (${r.version})`, dim2 ? "dd" : "d"));
   const right = r.update != null ? [t(`\u2191 ${r.update}`, "ac")] : [];
   let first = lr(left, right, w, true);
   if (cur) first = sel(first);
   const cls2 = r.failed === true ? "er" : dim2 ? "dd" : "d";
-  const second = fit([sp(6), t(tr(r.subtitle ?? "", Math.max(w - 6, 0)), cls2)], w);
+  const author = r.author ?? "";
+  const description = r.description ?? "";
+  const old = r.failed === true || author === "" && description === "";
+  let text2;
+  if (old && r.subtitle) {
+    text2 = r.subtitle;
+  } else {
+    const parts3 = [];
+    if ((r.kinds ?? []).length > 0) parts3.push(r.kinds.join(", "));
+    if (author) parts3.push(`by ${author}`);
+    else if (r.builtin === true) parts3.push("comes with Orrery");
+    if (w >= WIDE && description) parts3.push(description);
+    text2 = parts3.join(" \xB7 ");
+  }
+  const second = fit([sp(6), t(tr(text2, Math.max(w - 6, 0)), cls2)], w);
   return [first, second];
 }
 function grid(head, rows2, keep, cursor, w) {
@@ -4593,13 +4657,21 @@ var REGISTRY = {
   extensions,
   blocks: (p, w, m) => out(blocks(p.blocks, w, m))
 };
+function dropNulls(v) {
+  if (Array.isArray(v)) return v.map(dropNulls);
+  if (v === null || typeof v !== "object") return v;
+  const o = {};
+  for (const [k, x] of Object.entries(v)) if (x !== null) o[k] = dropNulls(x);
+  return o;
+}
 function render2(id, props, w, m) {
   const f = Object.prototype.hasOwnProperty.call(REGISTRY, id) ? REGISTRY[id] : void 0;
   if (f === void 0) throw new BadProps(id, "no such element");
   if (props === null || typeof props !== "object" || Array.isArray(props)) throw new BadProps(id, "expected an object");
   let items2;
   try {
-    items2 = soft(() => f(props, w, m));
+    const p = dropNulls(props);
+    items2 = soft(() => f(p, w, m));
   } catch (e) {
     if (e instanceof BadProps) throw e;
     throw new BadProps(id, e instanceof Error ? e.message : String(e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getorrery/cells",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "The terminal design as cells: every harness element drawn as rows of styled cells, checked against the design's own goldens. A port of the orrery-cells crate.",
   "type": "module",
   "main": "dist/index.js",
@@ -12,8 +12,8 @@
     "directory": "harness/clients/cells-ts"
   },
   "dependencies": {
-    "@getorrery/client": "0.2.2",
-    "@getorrery/protocol": "0.2.2"
+    "@getorrery/client": "0.2.3",
+    "@getorrery/protocol": "0.2.3"
   },
   "devDependencies": {
     "typescript": "^5.9.3",