@impeccable/reviews 0.1.23 → 0.1.25

package/dist/ui/bridge.js

@@ -31,6 +31,10 @@ export async function askPerson(q) {
 export function reportStatus(line) {
     mounted?.status(plainText(line));
 }
+/** What a tool just confirmed it did, a line under the tasks: "Netlify password set on acme" (#416). */
+export function reportDone(line) {
+    mounted?.done?.(plainText(line));
+}
 /** Replaces the task list. */
 export function reportTasks(tasks) {
     mounted?.tasks(tasks.map((t) => ({ ...t, title: plainText(t.title) })));

package/dist/ui/look.js

@@ -9,7 +9,6 @@ import { fitsTask, taskInProgress, workStarted } from '../stages.js';
  * the box on the right. Only the middle changes from screen to screen.
  */
 export const PRODUCT = 'Impeccable for PRs';
-export const FEEDBACK = 'support@renaissance-geek.ai';
 /** How long the outro waits for a key before it closes itself (screens.ts), which its fine print says. */
 export const CLOSES_AFTER_MINUTES = 20;
 /** The box fills the terminal up to this size, then sits in the middle of it. */
@@ -22,6 +21,8 @@ const FIELD_WIDTH = 48;
 /** The running task's spinner: one glyph every third frame. */
 const SPINNER = ['◐', '◓', '◑', '◒'];
 const START = { heading: "Let's set up your app", text: 'This wizard detects your framework and wires up all the essentials.' };
+/** The start's heading on a checkout of several apps (#418). */
+const START_APPS = "Let's set up your apps";
 /** The sign-in over a run, by why it signs in again. */
 const AGAIN = {
     'ran-out': 'Your sign-in ran out. Approve again in your browser to carry on.',
@@ -195,7 +196,7 @@ function questionPage(qv, inner, st) {
             ways: [[q.confirmLabel ?? 'Continue', 'Enter'], [q.skipLabel ?? 'Skip', 'Esc']],
         };
     }
-    // One test account: both fields under the divider, each in a box with its label in the top edge, the password as dots.
+    // One account: its prompt under the title, then the hint and both fields under the divider, each field in a box with its label in the top edge, the second as dots. A test account of the app's sign-in (no fields of its own) leaves its prompt to the web page and its prompt's row blank, so its title stands alone where a one-line prompt would put the divider (#409).
     if (q.kind === 'account') {
         const width = Math.min(FIELD_WIDTH, inner);
         const label = (text) => `  ${st.soft(text)}`;
@@ -204,7 +205,7 @@ function questionPage(qv, inner, st) {
         const fields = [...fieldBox(first, qv.field(width - 2), width, qv.focus !== 1, st), ...fieldBox(second, qv.password?.() ?? '', width, qv.focus === 1, st)];
         return {
             heading: q.title ?? 'A test account',
-            text: said(q.prompt, inner, st),
+            text: q.fields ? said(q.prompt, inner, st) : [''],
             rule: divider(inner, st),
             action: [...block([...hint, ...fields], inner, width), ...note],
             at: hint.length + (qv.focus === 1 ? 4 : 1),
@@ -215,7 +216,7 @@ function questionPage(qv, inner, st) {
     const choices = q.kind !== 'text' && q.options?.length ? q.options : null;
     const hint = q.hint && choices ? said(q.hint, inner, st) : [];
     const after = [
-        ...(choices ? [center(st.faint(q.kind === 'multi' ? 'Move [↑↓]   Pick [Space]' : 'Choose [↑↓]'), inner)] : []),
+        ...(choices ? ['', center(st.faint(q.kind === 'multi' ? 'Move [↑↓]   Pick [Space]' : 'Choose [↑↓]'), inner)] : []),
         ...note,
     ];
     // A field's hint is its label, in the box's top edge when it fits there, else over the box on the same left edge.
@@ -255,8 +256,9 @@ function runPage(scene, f, inner, st) {
         current ? center(`${f.motion?.at === 'status' ? `${st.full(glyph)} ` : ''}${st.soft(current)}`, inner) : '',
     ];
     const around = { ways: f.stopping ? [['Stop the setup', 'Esc']] : undefined };
+    const done = scene.done ? ['', center(st.soft(`✓ ${scene.done}`), inner)] : [];
     if (!workStarted(scene.tasks))
-        return { heading: 'Understanding your app', rule: loader(inner, f.motion?.frame ?? 0, st), action: status, ...around };
+        return { heading: 'Understanding your app', rule: loader(inner, f.motion?.frame ?? 0, st), action: [...status, ...done], ...around };
     const running = scene.tasks.findIndex((t) => t.status === 'in_progress');
     const rows = scene.tasks.map((t, i) => {
         // A task back to pending after it started (Preview method while Test drive runs) keeps a started mark, never ○ (#390).
@@ -277,9 +279,11 @@ function runPage(scene, f, inner, st) {
         if (i !== running || !scene.wait)
             return ink(line);
         // The task in progress says what the run waits for and the time so far, never how long it may wait, so a screen
-        // waiting on a host's build is never still; the time alone where the words would push it off the row.
-        const waiting = row(`waiting for ${scene.wait.host ? `${scene.wait.host}'s preview` : 'the preview'} · ${scene.wait.timer}`);
-        if (visibleWidth(waiting) <= room)
+        // waiting on a host's build is never still; the host alone where the words would push it off the row (80 columns),
+        // and the time alone where even that would.
+        const { host, timer } = scene.wait;
+        const waiting = (host ? [`${host}'s preview`, host] : ['the preview']).map((what) => row(`waiting for ${what} · ${timer}`)).find((words) => visibleWidth(words) <= room);
+        if (waiting)
             return ink(waiting);
         // Where even the time alone would pass the box from that edge, the title gives way, never the time.
         const tail = ` · ${scene.wait.timer}`;
@@ -289,7 +293,7 @@ function runPage(scene, f, inner, st) {
     return {
         heading: 'Setting up',
         rule: divider(inner, st),
-        action: block(lines, inner, widest),
+        action: [...block(lines, inner, widest), ...done],
         at: running >= 0 ? running : Math.max(0, scene.tasks.findIndex((t) => t.status === 'pending')),
         ...around,
     };
@@ -300,7 +304,7 @@ function outroPage(scene, inner, st) {
         return {
             heading: outro.title,
             // A warning is read whole: wrapped, where centered on one line it would be cut.
-            text: [...said(outro.result, inner, st), ...usedLines(outro, inner, st), ...leftLines(outro.todo, inner, st), ...outro.warnings.flatMap((line) => said(`! ${line}`, inner, st))],
+            text: [...said(outro.result, inner, st), ...usedLines(outro, inner, st), ...paragraph([...leftLines(outro.todo, inner, st), ...outro.warnings.flatMap((line) => said(`! ${line}`, inner, st))])],
             rule: divider(inner, st),
             action: pullAction(outro.link, scene.copied, inner, st),
             ways: scene.leaving ? undefined : [['Close', 'Enter']],
@@ -310,28 +314,35 @@ function outroPage(scene, inner, st) {
     const width = Math.min(TEXT_WIDTH, inner);
     const notes = [...outro.todo.flatMap((line) => hang(line, width, '→ ').map(st.full)), ...outro.warnings.flatMap((line) => hang(line, width, '! ').map(st.soft))];
     const links = outro.links.flatMap((l) => linkLines(l.label, l.url, inner, st));
+    const action = [...block(notes, inner), ...(notes.length && links.length ? [''] : []), ...links, ...(outro.links.length === 1 ? [scene.copied ? center(st.soft('Copied to clipboard!'), inner) : copyWay(inner, st)] : [])];
     return {
         heading: outro.title,
         text: [...said(outro.result, inner, st), ...usedLines(outro, inner, st)],
         rule: divider(inner, st),
-        action: [...block(notes, inner), ...(notes.length && links.length ? [''] : []), ...links, ...(outro.links.length === 1 ? [scene.copied ? center(st.soft('Copied to clipboard!'), inner) : copyWay(inner, st)] : [])],
+        action,
+        // Where the notes leave no room, the window opens on the links, the notes above it a scroll away (#419).
+        at: Math.max(0, action.length - 1),
         ways: scene.leaving ? undefined : [['Close', 'Enter']],
-        foot: outro.outcome === 'stopped' ? [center(st.faint(`Questions? Write to ${FEEDBACK}`), inner)] : closesItself(scene, inner, st),
+        // A stopped run's foot is empty: no line to write to us in the closed beta (#413).
+        foot: outro.outcome === 'stopped' ? [] : closesItself(scene, inner, st),
     };
 }
-/** The outro's fine print that it closes on its own, until it is closing; a stopped run's foot keeps the way to write to us instead, one line either way. */
+/** Lines under the text above them, a blank row between (#416); none when there are none. */
+const paragraph = (lines) => (lines.length ? ['', ...lines] : []);
+/** The outro's fine print that it closes on its own, until it is closing; a stopped run's has none. */
 const closesItself = (scene, inner, st) => (scene.leaving ? [] : [center(st.faint(`Closes on its own after ${CLOSES_AFTER_MINUTES} minutes.`), inner)]);
 function pageOf(f, inner) {
     const st = f.style;
+    const start = f.apps ? START_APPS : START.heading;
     if (f.question)
         return questionPage(f.question, inner, st);
     const { scene } = f;
     switch (scene.kind) {
         case 'wait':
-            return { heading: START.heading, text: said(START.text, inner, st), rule: divider(inner, st), action: [center(st.faint('One moment…'), inner)] };
+            return { heading: start, text: said(START.text, inner, st), rule: divider(inner, st), action: [center(st.faint('One moment…'), inner)] };
         case 'intro': {
             const note = scene.note ? ['', ...block(hang(scene.note, Math.min(TEXT_WIDTH, inner), '! ').map(st.soft), inner)] : [];
-            return { heading: START.heading, text: said(START.text, inner, st), rule: divider(inner, st), action: [center(st.full("Let's start with login"), inner), ...note], ways: [['Continue', 'Enter']] };
+            return { heading: start, text: said(START.text, inner, st), rule: divider(inner, st), action: [center(st.full("Let's start with login"), inner), ...note], ways: [['Continue', 'Enter']] };
         }
         case 'signin': {
             // P still takes a pasted code on a remote shell; --help says so, the screen does not.
@@ -340,7 +351,7 @@ function pageOf(f, inner) {
             // In the action, which scrolls and keeps every line, so a short terminal still shows which checkout this approves.
             const checkout = scene.checkout && !scene.again ? [...balanced(scene.checkout.repository, Math.min(TEXT_WIDTH, inner)).map((line) => center(st.full(line), inner)), ...slashRows(`in ${scene.checkout.folder}`, Math.min(TEXT_WIDTH, inner)).map((line) => center(st.soft(line), inner)), ''] : [];
             return {
-                heading: scene.again ? 'Sign in again' : START.heading,
+                heading: scene.again ? 'Sign in again' : start,
                 text: said(scene.again ? AGAIN[scene.again] : 'Sign in with GitHub in your browser, then approve this repository.', inner, st),
                 rule: divider(inner, st),
                 action: [...checkout, ...link, ...(under ? ['', center(st.full(under), inner)] : []), ...(scene.copied ? [] : ['', copyWay(inner, st)])],
@@ -382,7 +393,10 @@ function stack(page, inner, rows, st, scroll) {
     if (over() > 0)
         foot = [];
     if (over() > 0 && over() < text.length && !page.asks) {
-        const keep = text.length - over();
+        let keep = text.length - over();
+        // The ellipsis goes on the last line of words, never on a blank row between paragraphs.
+        while (keep > 1 && !text[keep - 1])
+            keep--;
         text = [...text.slice(0, keep - 1), `${text[keep - 1]}${st.soft('…')}`];
     }
     if (over() > 0 && !page.asks)
@@ -391,9 +405,9 @@ function stack(page, inner, rows, st, scroll) {
         mark = [];
     if (over() > 0)
         rule = [];
-    // Past this point a question's prompt scrolls with its field or choices, a blank row under it.
-    const lead = over() > 0 && page.asks ? [...text, ''] : [];
-    if (lead.length)
+    // Past this point a question's prompt scrolls with its field or choices, a blank row under it; an account's blank prompt row goes.
+    const lead = over() > 0 && page.asks && text.some(Boolean) ? [...text, ''] : [];
+    if (over() > 0)
         text = [];
     const action = windowed([...lead, ...page.action], page.action.length - over(), lead.length + (page.at ?? 0), scroll, inner, st);
     const parts = [mark, heading, text, rule, action, ways, foot].filter((part) => part.length);

package/dist/ui/run-state.js

@@ -24,10 +24,14 @@ export class RunState {
     tasks = [];
     previous;
     current;
+    /** The last thing a tool confirmed it did, which stays under the tasks until the next. */
+    done;
     /** A bounded wait under way: the current line carries its timer, counting up. */
     waiting;
     /** The tasks that have been in progress, done or failed in this run. */
     started = new Set();
+    /** The tasks that have left pending in this run (skipped too), in the order they first did: the list shows them in that order. */
+    moved = new Set();
     /** When something last changed on screen: a status, the task list, an answered question. */
     changedAt;
     constructor(now = Date.now, first) {
@@ -64,8 +68,15 @@ export class RunState {
         for (const t of tasks)
             if (t.status === 'in_progress' || t.status === 'completed' || t.status === 'failed')
                 this.started.add(t.id);
+        for (const t of tasks)
+            if (t.status !== 'pending')
+                this.moved.add(t.id);
         // A task that has started never reads as not started again (#390).
-        this.tasks = tasks.map((t) => ({ ...t, ...(t.status === 'pending' && this.started.has(t.id) ? { started: true } : {}) }));
+        const shown = tasks.map((t) => ({ ...t, ...(t.status === 'pending' && this.started.has(t.id) ? { started: true } : {}) }));
+        // The tasks that moved on, in the order they did, then those still waiting: one that waits under the task in progress never shows above it unticked (#419).
+        const order = [...this.moved];
+        const rank = (t) => (this.moved.has(t.id) ? order.indexOf(t.id) : order.length);
+        this.tasks = shown.map((t, i) => ({ t, i })).sort((a, b) => rank(a.t) - rank(b.t) || a.i - b.i).map(({ t }) => t);
         this.touch();
     }
     /** Something happened that the person saw, so the silence starts again. */

package/dist/ui/screens.js

@@ -30,6 +30,8 @@ let frames;
 class Wizard {
     state = new RunState();
     views = [];
+    /** The checkout holds several apps, so the start says "apps" (#418). */
+    apps = false;
     questions = [];
     /** Output from anywhere else while the screen is up, printed once it has gone. */
     held = [];
@@ -78,6 +80,7 @@ class Wizard {
             status: (line) => (this.state.status(line), this.redraw()),
             tasks: (tasks) => (this.state.setTasks(tasks), this.redraw()),
             wait: (wait) => (this.state.wait(wait), this.redraw()),
+            done: (line) => ((this.state.done = line), this.state.touch(), this.redraw()),
         });
     }
     push(view) {
@@ -345,7 +348,7 @@ class Wizard {
             return { kind: 'pull', url: view.url, ...(view.app ? { app: view.app } : {}), copied: view.copied };
         if (view.kind === 'outro')
             return { kind: 'outro', outro: view.outro, leaving: view.leaving, copied: view.copied };
-        return { kind: 'run', tasks: this.state.tasks, band: this.state.band(!this.questions.length, live), wait: this.state.timer(live) };
+        return { kind: 'run', tasks: this.state.tasks, band: this.state.band(!this.questions.length, live), wait: this.state.timer(live), ...(this.state.done ? { done: this.state.done } : {}) };
     }
     render(width) {
         const question = this.questions[0];
@@ -374,6 +377,7 @@ class Wizard {
             scroll: this.scroll,
             version: VERSION,
             style: this.style,
+            apps: this.apps,
         };
         const lines = drawFrame(frame);
         if (frames) {
@@ -413,9 +417,11 @@ function host() {
 export function recordFrames(dir) {
     frames = createFrameWriter(dir);
 }
-/** The first screen: what the command does, a warning to read before anything runs (`note`), and the way on; without a terminal, a line naming `repository`, the owner/name being set up. Resolves true to go on, false to cancel. */
-export function showIntro(repository, note) {
+/** The first screen: what the command does, a warning to read before anything runs (`note`), and the way on, saying "apps" where the checkout holds several (`apps`, which the screens after it keep); without a terminal, a line naming `repository`, the owner/name being set up. Resolves true to go on, false to cancel. */
+export function showIntro(repository, note, apps = false) {
     const screen = host();
+    if (screen)
+        screen.apps = apps;
     if (!screen) {
         console.log(`${PRODUCT}: setting up ${repository}.`);
         if (note)
@@ -486,12 +492,12 @@ async function handOver(url, hand) {
     const copied = hand.copy(url).catch(() => false);
     return (await Promise.race([copied, new Promise((r) => setTimeout(() => r(false), 1000).unref())])) === true;
 }
-/** The test drive on a screen of its own once the run has ended, before the last screen shows the setup pull request, handed over as it appears, until a key other than ↑↓ PgUp PgDn is pressed, or for 20 minutes; on a repository with several apps, each app's in turn, named (impeccable-reviews#397). Without a terminal there is no such screen: the summary has it. */
-export async function showPullRequest(url, hand, app) {
+/** The test drive on a screen of its own once the run has ended, before the last screen shows the setup pull request, handed over as it appears (put on the clipboard only when `copy`: a later screen's link would take its place, #418), until a key other than ↑↓ PgUp PgDn is pressed, or for 20 minutes; on a repository with several apps, each app's in turn, named (impeccable-reviews#397). Without a terminal there is no such screen: the summary has it. */
+export async function showPullRequest(url, hand, app, copy = true) {
     const screen = host();
     if (!screen)
         return;
-    const copied = await handOver(url, hand);
+    const copied = copy ? await handOver(url, hand) : (hand.open(url), false);
     await new Promise((resolve) => {
         // The screen stays until the end screen takes its place, so no empty screen shows between the two.
         const done = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impeccable/reviews",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Set up a repository for Impeccable for PRs from your terminal.",
   "license": "SEE LICENSE IN LICENSE",
   "private": false,