herdrchat 1.1.0 → 1.1.1

package/lib/core/engine.mjs

@@ -44,7 +44,8 @@ const KEY_SETTLE_MS = 700; // a dialog redraws this soon after a key
 const CLICK_BUDGET_MS = 2000; // a click must be answered within 3 s
 const OVERVIEW_WAIT_MS = 2000;
 const UPLOAD_TRIES = 3;
-const DRAW_TRIES = 3;
+const DRAW_TRIES = 5;
+const BOX_GAP_MS = 120; // between two boxes pressed for one Next
 const DRAW_WAIT_MS = 400;
 const TITLE_MAX = 40;
 const DIALOG_LINES = 15;
@@ -580,14 +581,18 @@ export function createEngine({ cfg, chat, hc, readers, store, log, logWarn, logE
   // `screen`: the screen read when the event came (a promise), so a dialog answered in
   // the terminal while earlier work was still being posted still gets its card. `again`:
   // post it even if it was posted (you typed in the room while it waits). A screen read
-  // the moment `blocked` arrives may come before the dialog is drawn: with no menu on it,
-  // the screen is read again a few times.
+  // the moment `blocked` arrives may come before the dialog is drawn, and then a numbered
+  // list the agent wrote looks like a menu: a dialog is believed once it has its top
+  // border and two reads DRAW_WAIT_MS apart show the same one, or after DRAW_TRIES reads.
   async function postBlocked(session, address, record, { screen: first = null, again = false } = {}) {
     const firstScreen = await first;
     let dialog = firstScreen ? dialogOf(record.status, firstScreen) : null;
-    for (let i = 0; i < DRAW_TRIES && !dialog?.menu; i += 1) {
-      if (i) await sleep(DRAW_WAIT_MS);
-      dialog = dialogOf(record.status, await hc.screenTail(session, address, SCREEN_LINES));
+    for (let i = 0; i < DRAW_TRIES; i += 1) {
+      if (dialog || i) await sleep(DRAW_WAIT_MS);
+      const next = dialogOf(record.status, await hc.screenTail(session, address, SCREEN_LINES));
+      const steady = dialog?.menu?.framed && next.menu?.key === dialog.menu.key;
+      dialog = next;
+      if (steady) break;
     }
     const k = key(session, address);
     if (!claimDialog(k, dialog, record.status) && !again) return;
@@ -630,23 +635,48 @@ export function createEngine({ cfg, chat, hc, readers, store, log, logWarn, logE
   async function onAction({ value: v = {}, message, answer = '' }) {
     const started = Date.now();
     const shown = dialogCards.get(message) || { title: NEEDS_TITLE, markdown: '', doneTitle: DONE_TITLE };
+    // A box in a multi-select is ticked on the card only, at once; Next sends them all.
+    const box = shown.menu?.multi && typeof v.pick === 'number' ? shown.menu.options.find((o) => o.n === v.pick && o !== shown.menu.free && o.checked !== null) : null;
+    if (box) {
+      const menu = { ...shown.menu, options: shown.menu.options.map((o) => (o === box ? { ...o, checked: !o.checked } : o)) };
+      const toggled = { ...shown, menu };
+      remember(message, toggled);
+      return { ...toast('info', `${box.checked ? '☐' : '☑'} ${box.label}`), card: { kind: 'dialog', dialog: toggled, value: v } };
+    }
     const record = views.get(v.s)?.terminals.get(v.a);
-    if (!record || record.state !== 'live') return answered(shown, 'The terminal has ended.');
+    if (!record || record.state !== 'live') {
+      log(`-> ${v.s}/${v.a}: click on ${message} not pressed: the terminal has ended`);
+      return answered(shown, 'The terminal has ended.');
+    }
     const status = (await hc.getTerminal(v.s, v.a)).status;
     const menu = status?.state === 'blocked' ? menuOf(await hc.screenTail(v.s, v.a, SCREEN_LINES)) : null;
     if (!menu || menu.key !== v.k) {
+      log(`-> ${v.s}/${v.a}: click on ${message} not pressed: ${menu ? `the dialog changed (card ${v.k}, screen ${menu.key})` : `nothing waits (status ${status?.state || 'none'})`}`);
       if (menu) later(v.s, v.a, 'dialog', () => postBlocked(v.s, v.a, { ...record, status }));
       return answered(shown, menu ? 'It now asks something else; see the new card.' : 'It no longer waits on this.');
     }
     const k = key(v.s, v.a);
     if (openCard.get(k)?.message === message) openCard.delete(k);
     let picked;
-    if (v.pick === 'esc' || v.pick === 'tab') {
+    if (v.pick === 'tab' && shown.menu?.multi) {
+      // the boxes the card shows, made so on the screen: each one that differs is pressed
+      const changed = shown.menu.options.filter((o) => o.checked !== null && o.checked !== menu.options.find((m) => m.n === o.n)?.checked);
+      for (const o of changed) {
+        await hc.keys(v.s, v.a, [String(o.n)]);
+        await sleep(BOX_GAP_MS);
+      }
+      await hc.keys(v.s, v.a, ['tab']);
+      const ticked = shown.menu.options.filter((o) => o.checked).map((o) => o.label);
+      picked = ticked.length ? ticked.join(', ') : 'nothing ticked';
+    } else if (v.pick === 'esc' || v.pick === 'tab') {
       await hc.keys(v.s, v.a, [v.pick]);
       picked = v.pick === 'esc' ? 'Esc pressed' : 'Next';
     } else {
       const option = menu.options.find((o) => o.n === v.pick);
-      if (!option || option.label !== v.label) return answered(shown, 'The options changed; nothing was pressed.');
+      if (!option || option.label !== v.label) {
+        log(`-> ${v.s}/${v.a}: click on ${message} not pressed: option ${v.pick} is now ${option ? `"${option.label}"` : 'gone'}, not "${v.label}"`);
+        return answered(shown, 'The options changed; nothing was pressed.');
+      }
       if (option === menu.free) {
         const text = answer.trim();
         if (!text) return toast('warning', 'Type your answer first.');

package/lib/core/menu.mjs

@@ -9,7 +9,8 @@
 // `text` is what the dialog says above its options: from its top border (a line of ─),
 // without rules and blank lines; what was on the screen above the dialog is left out.
 // `key` names the dialog: a hash of it from its top border to its last option, without
-// the cursor and the check marks. A card click is pressed only when the
+// the cursor and any check mark (an option's [✔], and the ☐/☒/✔ of the question tabs
+// above a multi-question dialog, which change as you answer: the same dialog keeps its key). A card click is pressed only when the
 // screen still shows the dialog with that key, so an old card can never answer a newer
 // dialog that looks alike (two permission prompts both offer "1. Yes").
 import crypto from 'node:crypto';
@@ -27,8 +28,10 @@ function topOf(lines, first) {
   return BORDER.test(lines[top]) ? top : Math.max(0, first - TEXT_LINES);
 }
 
+const MARKS = /[☐☑☒✔✓✗✘■□●○◉◯]/gu;
+
 function keyOf(lines, top, last) {
-  const body = lines.slice(top, last + 1).map((l) => l.replace(/❯/g, '').replace(/^(\s*\d{1,2}\.\s+)\[.\]/, '$1').trim()).join('\n');
+  const body = lines.slice(top, last + 1).map((l) => l.replace(/❯/g, '').replace(/^(\s*\d{1,2}\.\s+)\[.\]/, '$1').replace(MARKS, '').replace(/\s+/g, ' ').trim()).join('\n');
   return crypto.createHash('sha1').update(body).digest('hex').slice(0, 12);
 }
 
@@ -53,6 +56,7 @@ export function menuOf(screen) {
   const top = topOf(lines, menu.first);
   return {
     key: keyOf(lines, top, menu.last),
+    framed: BORDER.test(lines[top]), // a dialog's top border; a numbered list in text has none
     text: lines.slice(top, menu.first).filter((l) => !RULE.test(l)).map((l) => l.trim()).join('\n'),
     options: menu.options,
     multi: menu.options.some((o) => o.checked !== null),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdrchat",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Chat front-ends for hc: every terminal hc runs, in the chat app you use",
   "repository": {
     "type": "git",