@getorrery/cells 0.3.2 → 0.3.3

package/dist/cells.d.ts

@@ -43,7 +43,7 @@ export type Seg =
 export type Line = Seg[];
 /** What fills a {@link Blk}. */
 export type Fill = 
-/** The mark, large (15 × 8 cells): an animation and a state. */
+/** The mark, large (16 × 8 cells): an animation and a state. */
 {
     k: "pixel";
     anim: string;

package/dist/el/sessions.d.ts

@@ -45,11 +45,27 @@ export declare function sessionTree(p: SessionTreeView, w: number, m: boolean):
 export interface OAuthView {
     title: string;
     step?: string | null;
-    url: string;
-    code: string;
+    /** Unused with `command`. */
+    url?: string;
+    /** Unused with `command`. */
+    code?: string;
     /** `waiting`, `approved`, `error`, `expired`; `waiting` when absent. */
     state?: string;
     note?: string;
+    /** A command the person runs themselves, instead of a URL and a code. */
+    command?: string | null;
+    /** The title below 64 columns. */
+    short_title?: string | null;
+    /** The note below 64 columns. */
+    short_note?: string | null;
+    /** With `command`: what stands first, one paragraph each. */
+    lead?: string[];
+    /** With `command`: what the person must know before going on. */
+    warn?: string | null;
+    /** With `command`: the dim line above the keys. */
+    foot?: string | null;
+    /** With `command`: the key row, when a host binds other keys than the screen's own. */
+    keys?: string | null;
 }
 /** The URL, the code large in a heavy box, a spinner with the expiry. */
 export declare function oauth(p: OAuthView, w: number, m: boolean): Item[];
@@ -111,6 +127,8 @@ export interface WelcomeView {
     state?: string;
     selected?: number | null;
     warn?: string | null;
+    /** One static line under the warning, as runs of text and class. */
+    hint?: Runs;
 }
 /** Three suggestions, tips, and what is missing. */
 export declare function welcome(p: WelcomeView, w: number, m: boolean): Item[];

package/dist/index.js

@@ -1477,6 +1477,7 @@ function banner(p, w, m) {
   const state = p.state ?? "idle";
   const tl = flag(p.trusted) ? [g(m, "\u2713", "trusted", "ok"), t(" trusted workspace", "d")] : [g(m, "\u25B2", "untrusted", "at"), t(" untrusted \xB7 tools off \xB7 /trust", "at")];
   const ml = state === "loading" ? [spin("lv"), t(" resolving model\u2026", "d")] : p.model != null ? [t("model ", "d"), t(p.model, "i"), t(` \xB7 ${p.provider ?? ""}`, "d")] : [g(m, "\u25B2", "no model", "at"), t(" none \xB7 /model to pick one", "at")];
+  const mark2 = state === "idle" ? "static" : state;
   const br = p.branch ?? null;
   if (w >= 64 && !m) {
     const rw = w - 17;
@@ -1485,7 +1486,7 @@ function banner(p, w, m) {
     if (br != null) where.push(t(`  \u2387 ${br}`, "d"));
     const last = p.error != null ? [t(`\u2717 ${p.error}`, "er")] : [t("/help \xB7 /model \xB7 /providers \xB7 ? keys", "d")];
     const ls = [[], [t("orrery", "b"), t(`  ${p.harness}`, "i")], [t(`harness ${versionLabel(p)}`, "d")], [], where, tl, ml, last];
-    return [{ k: "blk", blk: { w: 17, h: 8, fill: { k: "pixel", anim: "orrery", state }, lines: ls.map((l) => fit(l, rw)) } }];
+    return [{ k: "blk", blk: { w: 17, h: 8, fill: { k: "pixel", anim: "orrery", state: mark2 }, lines: ls.map((l) => fit(l, rw)) } }];
   }
   const iw = w - 4;
   const body2 = [[t(p.harness, "i")], [t(trL(p.path, iw), "d2")]];
@@ -1493,7 +1494,7 @@ function banner(p, w, m) {
   body2.push(tl);
   body2.push(ml);
   if (p.error != null) for (const x of wrap(`\u2717 ${p.error}`, iw)) body2.push([t(x, "er")]);
-  const title = m ? [t("orrery", "b")] : [px(state), t(" orrery", "b")];
+  const title = m ? [t("orrery", "b")] : [px(mark2), t(" orrery", "b")];
   return out(boxed(body2, w, { t: title, r: [t(versionLabel(p), "d")], c: p.error != null ? "er" : "dd" }));
 }
 function newPill(n, w) {
@@ -4336,14 +4337,50 @@ function sessionTree(p, w, m) {
   else if (p.busy != null) o.push([spin("lv"), t(` ${p.busy}`, "d")]);
   return out(o);
 }
+function oauthCommand(p, command2, w, m) {
+  const wide = w >= 64;
+  const iw = w - 4;
+  const state = p.state ?? "waiting";
+  const title = !wide && p.short_title || p.title;
+  const note = !wide && p.short_note || (p.note ?? "");
+  const rows2 = [];
+  const lead = () => {
+    for (const l of p.lead ?? []) rows2.push(...para([], l, iw, "i", null));
+  };
+  if (state === "approved") {
+    rows2.push([g(m, "\u2713", "done", "ok"), t(` ${note}`, "i")], []);
+    lead();
+    if (p.warn != null) rows2.push([], ...warnLines(p.warn, iw, m, "warn"));
+    if (p.foot != null) rows2.push([], ...para([], p.foot, iw, "d", null));
+    rows2.push(keys(p.keys ?? "enter continue|esc cancel", iw, 0));
+  } else if (state === "error") {
+    rows2.push([g(m, "\u2715", "missing", "er"), t(` ${note}`, "i")], []);
+    lead();
+    rows2.push(keys(p.keys ?? "r check now|esc cancel", iw, 0));
+  } else {
+    lead();
+    rows2.push([]);
+    rows2.push(...para([], wide ? "Run this in any terminal, then come back:" : "Run in any terminal, then come back:", iw, "i", null));
+    if (wide) {
+      const c = m ? "i" : "ac";
+      const rule2 = "\u2501".repeat(chars(command2));
+      rows2.push([t(`\u250F\u2501 ${rule2} \u2501\u2513`, c)], [t("\u2503  ", c), t(command2, "b"), t("  \u2503", c)], [t(`\u2517\u2501 ${rule2} \u2501\u251B`, c)]);
+    } else rows2.push([t(command2, "b")]);
+    rows2.push([], [spin("lv"), t(` ${note}`, "d")]);
+    rows2.push(keys(p.keys ?? (wide ? "c copy command|r check now|esc cancel" : "c copy|r check|esc cancel"), iw, 0));
+  }
+  return out(ov(rows2, w, m, title, p.step ?? null));
+}
 function oauth(p, w, m) {
+  if (p.command != null) return oauthCommand(p, p.command, w, m);
   const state = p.state ?? "waiting";
   const note = p.note ?? "";
-  const code = w >= 64 ? Array.from(p.code).join(" ") : p.code;
+  const codeText = p.code ?? "";
+  const code = w >= 64 ? Array.from(codeText).join(" ") : codeText;
   const expired = state === "expired";
   const cw = chars(code) + 4;
   const cb = boxed([[t(code, "b")]], cw, { k: "heavy", c: expired ? "dd" : m ? "i" : "ac" });
-  const rows2 = [[t("Open this URL on any device:", "i")], [t(p.url, "u ac")], []];
+  const rows2 = [[t("Open this URL on any device:", "i")], [t(p.url ?? "", "u ac")], []];
   rows2.push(...cb.map((l) => center(l, w - 4)));
   rows2.push([]);
   if (state === "approved") rows2.push([g(m, "\u2713", "done", "ok"), t(` ${note}`, "i")]);
@@ -4457,6 +4494,20 @@ function trust(p, w, m) {
   o.push(keys(`1-${opts.length} pick|enter confirm|esc exit`, w, 4));
   return out(o);
 }
+function hintLines(hint, w) {
+  const rows2 = [];
+  let row3 = [sp(2)];
+  for (const [text2, cls2] of hint) {
+    if (row3.length > 1 && len(row3) + chars(text2) > w) {
+      rows2.push(row3);
+      row3 = [sp(2), t(text2.trimStart(), cls2)];
+    } else {
+      row3.push(t(text2, cls2));
+    }
+  }
+  rows2.push(row3);
+  return rows2;
+}
 function welcome(p, w, m) {
   const state = p.state ?? "ready";
   const o = [fit([t("Try", "b")], w)];
@@ -4478,6 +4529,7 @@ function welcome(p, w, m) {
     o.push([]);
     o.push(...warnLines(p.warn, w, m, "warn"));
   }
+  if ((p.hint ?? []).length > 0) o.push(...hintLines(p.hint ?? [], w));
   return out(o);
 }
 function themeSample(w, m) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getorrery/cells",
-  "version": "0.3.2",
+  "version": "0.3.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.3.2",
-    "@getorrery/protocol": "0.3.2"
+    "@getorrery/protocol": "0.3.3",
+    "@getorrery/client": "0.3.3"
   },
   "devDependencies": {
     "typescript": "^5.9.3",