atris 3.74.9 → 3.74.11

package/lib/gm-card.js

@@ -97,7 +97,7 @@ function idea({ id, title, body, line = null, unstarted = null, concern = null }
     line: line || unstarted || null,
     options: [
       answer(id, { id: 'do', label: 'do it', action: 'do', style: 'primary', confirm: 'tap again to start' }),
-      answer(id, { id: 'sharper', label: 'sharper idea', action: 'sharper' }),
+      answer(id, { id: 'sharper', label: 'sharpen it', action: 'sharper' }),
       answer(id, { id: 'skip', label: 'not now', action: 'skip' }),
     ],
     input: sayInput(),
@@ -175,6 +175,11 @@ function missed({ id }) {
   };
 }
 
+// the way back from a reply that asks its own question names the card it returns to
+const IDEA_KINDS = new Set(['idea', 'started']);
+const ASK_KINDS = new Set(['question', 'yes', 'report', 'choice']);
+const backToBase = base => (IDEA_KINDS.has(base.kind) ? 'back to the idea' : ASK_KINDS.has(base.kind) ? 'back to the question' : 'back');
+
 // A reply to words said on a card. When it asks its own question (it ends
 // in a question mark) only its answers show, with the box and a quiet way
 // back to the first question. When it only explains, the first card's own
@@ -200,7 +205,7 @@ function reply({ id, base, text, thread = [], suggestions = [], confirm = null }
       ...card, asks: id,
       options: [
         ...suggestions.map((s, i) => answer(id, { id: `r${i + 1}`, label: s, action: 'say', style: 'choice', binds: { text: s } })),
-        nav({ id: 'back', label: base.kind === 'deck' ? 'back to the job' : base.kind === 'member' ? `back to ${base.title}` : 'back to the first question', action: 'back' }),
+        nav({ id: 'back', label: base.kind === 'deck' ? 'back to the job' : base.kind === 'member' ? `back to ${base.title}` : backToBase(base), action: 'back' }),
       ],
       input: base.input || sayInput(),
     };
@@ -235,10 +240,10 @@ function team({ id, rows, line = null, deck = false }) {
     options.push(nav({ id: `talk:${r.member}`, label: r.member, action: 'member', binds: { member: r.member }, cell: { row: i, column: 'member' } }));
     if (r.engine !== 'person') options.push(nav({ id: `swap:${r.member}`, label: r.engine, action: 'swap', binds: { member: r.member }, cell: { row: i, column: 'engine' } }));
   });
-  if (deck) options.push(nav({ id: 'deck', label: 'the jobs, one at a time', action: 'deck' }));
+  if (deck) options.push(nav({ id: 'deck', label: 'go through the jobs', action: 'deck' }));
   options.push(nav({ id: 'back', label: 'close', action: 'back' }));
   return {
-    id, kind: 'team', asks: id, title: 'the team', body: rows.length ? 'tap a name to talk to them, or what they run on to change it.' : 'nobody is on the team yet.', line,
+    id, kind: 'team', asks: id, title: 'the team', body: rows.length ? 'tap a name to talk to them, or their engine to change it.' : 'nobody is on the team yet.', line,
     table: rows.length ? { columns: TEAM_COLUMNS, rows: rows.map(r => [r.member, r.role, r.ovr, r.engine, r.sentence]), status: rows.map(r => r.status) } : null,
     options, input: null,
   };
@@ -253,37 +258,39 @@ function member({ id, name, sentence: said, job = null, line = null }) {
   };
 }
 
-// what a job in the deck is doing, when there is no yes on it to answer
+// what a job in the deck is doing, when there is no yes on it to answer;
+// how long it has been is the card's own time line, so it is said once
 function deckLine(card) {
-  const when = card.time ? `, ${card.time}` : '';
-  if (card.label === 'working') return `${card.member} is working on it${when}. nothing needs you here.`;
+  if (card.label === 'working') return `${card.member} is working on it. nothing needs you here.`;
   if (card.label === 'you answered') return `you answered this, so it is back with ${card.member}.`;
-  return `${card.member} has not started it yet${when}.`;
+  return `${card.member} has not started it yet.`;
 }
 
 // one running job: its place in the deck, the yes it waits on, its table
 // row, and a box to talk to its member
 function deck({ id, at, total, card, columns, job = null }) {
   const options = [];
+  // previous and next first: the page draws them at the top, beside the card's place in the deck
+  if (total > 1) options.push(nav({ id: 'prev', label: 'previous', action: 'flip', binds: { step: -1 } }), nav({ id: 'next', label: 'next', action: 'flip', binds: { step: 1 } }));
   if (card.yes) {
     const binds = { job: card.mission_id, key: card.yes.key, hash: card.yes.hash || null };
     options.push(answer(id, { id: 'yes', label: 'yes', action: 'yes', style: 'primary', confirm: 'tap again to say yes', binds }));
     options.push(answer(id, { id: 'no', label: 'no', action: 'no', binds }));
     options.push(answer(id, { id: 'later', label: 'not now', action: 'later', binds }));
   }
-  if (total > 1) options.push(nav({ id: 'prev', label: 'previous', action: 'flip', binds: { step: -1 } }));
-  options.push(nav({ id: 'back', label: 'the whole team', action: 'back' }));
-  if (total > 1) options.push(nav({ id: 'next', label: 'next', action: 'flip', binds: { step: 1 } }));
+  options.push(nav({ id: 'back', label: 'back to the team', action: 'back' }));
   return {
     id, kind: 'deck', asks: id,
     title: card.yes ? card.yes.what : card.rows[0].work,
     body: card.yes ? card.yes.why : deckLine(card),
     line: card.said || null,
-    count: `${at + 1} of ${total}`,
+    // a place with its unit, so it never reads as "1 of 4 needs you"
+    count: `job ${at + 1} of ${total}`,
     label: card.label,
     time: card.time || null,
     job,
-    table: { columns, rows: card.rows.map(r => columns.map(k => r[k] || '')) },
+    // each row's status too, so its cell reads in the same color as on the team page
+    table: { columns, rows: card.rows.map(r => columns.map(k => r[k] || '')), status: card.rows.map(r => r.status || '') },
     options,
     input: { ...SAY, label: `talk to ${card.member}`, placeholder: `talk to ${card.member}`, action: 'talk' },
     member: card.member,
@@ -294,7 +301,7 @@ function deck({ id, at, total, card, columns, job = null }) {
 
 // The swap card renders the swap list as it comes: Atris models, then the
 // owner's picks, then "more models", which turns this card's options into
-// the full list. A list with no picks opens short too: the model in use and
+// the full list, with the models already shown first, where they were. A list with no picks opens short too: the model in use and
 // the next two, then more models, when that hides at least two. Without the
 // list, every model by tool.
 const SHORT_LIST = 3;
@@ -308,7 +315,13 @@ function swapChoices(choices, all = false) {
     more = { more: true, label: 'more models', options: list };
     list = [...list.filter(o => o.current), ...list.filter(o => !o.current)].slice(0, SHORT_LIST);
   }
-  if (all && more) return { list: more.options || [], more: null };
+  if (all && more) {
+    // the models already on the card keep their places, and the rest come in under them
+    const same = (a, b) => a.engine === b.engine && a.model === b.model;
+    const full = more.options || [];
+    const kept = list.map(o => full.find(f => same(f, o))).filter(Boolean);
+    return { list: [...kept, ...full.filter(f => !kept.includes(f))], more: null };
+  }
   return { list, more };
 }
 
@@ -317,7 +330,9 @@ function swapChoices(choices, all = false) {
 function swap({ id, name, choices, scope = 'member', all = false, line = null }) {
   const { list, more } = swapChoices(choices, all);
   const options = list.map((m) => {
-    const detail = m.current ? 'now' : [m.tool, m.record].filter(Boolean).join(', ') || null;
+    // the tool under the model, unless it is the same word (codex on codex)
+    const tool = m.tool && String(m.tool).trim().toLowerCase() !== String(m.label || '').trim().toLowerCase() ? m.tool : null;
+    const detail = m.current ? 'now' : [tool, m.record].filter(Boolean).join(', ') || null;
     return answer(id, { id: `m-${hash8([m.engine, m.model, m.label])}`, label: m.label, detail, action: m.current ? 'none' : 'swap_to', style: 'choice', chosen: Boolean(m.current), binds: { engine: m.engine, model: m.model, scope } });
   });
   if (more) options.push(nav({ id: 'more', label: more.label || 'more models', action: 'more' }));
@@ -381,10 +396,22 @@ function sequenceProblems(cards) {
 // Words the owner reads say what a thing is, not where a number comes from:
 // "300 more npm installs" reads "300 more installs".
 const ownerText = t => (typeof t === 'string' ? t.replace(/\bnpm (installs?|downloads?)\b/gi, '$1') : t);
+// Every card speaks lowercase, so an idea or a job written "Write the page"
+// reads "write the page" like the cards around it. Only a plain capitalized
+// first word moves: a capital, then lowercase letters, and no other capital
+// before the next space. OpenAI, GitHub, YouTube, McKinsey, API, and CRM stay
+// as written, and iPhone starts lowercase already.
+const lowerFirst = t => (typeof t === 'string' && /^[A-Z][a-z]+[^A-Z\s]*(?=\s|$)/.test(t) ? t[0].toLowerCase() + t.slice(1) : t);
+// Only the words that are an idea or a job move. A talk card, a swap card,
+// and the team page are titled with a name, and member and model names in
+// cells and buttons are never changed: only the deck's work cell and the
+// ideas on a choice card are sentences of that kind.
+const NAMED = new Set(['member', 'swap', 'team']);
 function ownerWords(card) {
-  const out = { ...card, title: ownerText(card.title), body: ownerText(card.body), line: ownerText(card.line) };
-  out.options = (card.options || []).map(o => ({ ...o, label: ownerText(o.label), ...(o.detail ? { detail: ownerText(o.detail) } : {}) }));
-  if (card.table) out.table = { ...card.table, rows: card.table.rows.map(row => row.map(ownerText)) };
+  const title = ownerText(card.title);
+  const out = { ...card, title: NAMED.has(card.kind) ? title : lowerFirst(title), body: ownerText(card.body), line: ownerText(card.line) };
+  out.options = (card.options || []).map(o => ({ ...o, label: card.kind === 'choice' && o.style === 'option' ? lowerFirst(ownerText(o.label)) : ownerText(o.label), ...(o.detail ? { detail: ownerText(o.detail) } : {}) }));
+  if (card.table) out.table = { ...card.table, rows: card.table.rows.map(row => row.map((cell, j) => (card.table.columns[j] === 'work' ? lowerFirst(ownerText(cell)) : ownerText(cell)))) };
   return out;
 }
 

package/lib/gm-phone-icon.js

@@ -0,0 +1,80 @@
+'use strict';
+
+// The phone page's icon: the lava orb's amber on the page's dark, small. An
+// svg for the browser tab, and a 180px png for the home screen (iPhones take
+// only a png there), drawn here with node's own zlib, no packages. Both go
+// into the page inline as data, so no request for them ever needs the link's key.
+
+const zlib = require('node:zlib');
+
+const BG = [0x14, 0x11, 0x10];
+// the lava's colors, lit from the upper left: cream where lit, amber, then deep
+const LIT = [255, 232, 170];
+const AMBER = [251, 150, 44];
+const DEEP = [150, 52, 14];
+
+const SVG = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">'
+  + '<defs><radialGradient id="o" cx="40%" cy="38%" r="66%">'
+  + '<stop offset="0" stop-color="#ffe8aa"/><stop offset=".38" stop-color="#fb962c"/><stop offset="1" stop-color="#96340e"/>'
+  + '</radialGradient></defs>'
+  + '<rect width="64" height="64" rx="14" fill="#141110"/><circle cx="32" cy="32" r="20" fill="url(#o)"/></svg>';
+
+const iconSvg = () => `data:image/svg+xml,${encodeURIComponent(SVG)}`;
+
+const mix = (a, b, t) => a.map((v, i) => v + (b[i] - v) * t);
+const clamp01 = v => Math.max(0, Math.min(1, v));
+
+// one pixel of the orb at (x, y) on a size-wide square, as [r, g, b]
+function orbPixel(x, y, size) {
+  const c = size / 2, r = size * 0.33;
+  const d = Math.hypot(x - c, y - c);
+  // the lit point sits up and to the left; the color runs from it outward
+  const lit = Math.hypot(x - size * 0.43, y - size * 0.41) / (r * 1.32);
+  const face = lit < 0.38 ? mix(LIT, AMBER, lit / 0.38) : mix(AMBER, DEEP, clamp01((lit - 0.38) / 0.62));
+  // a soft glow just past the edge, then the page
+  const glow = mix(BG, AMBER, 0.16 * Math.pow(clamp01(1 - (d - r) / (r * 0.5)), 2));
+  const edge = clamp01(r + 0.5 - d);
+  return mix(glow, face, edge).map(Math.round);
+}
+
+function chunk(type, data) {
+  const len = Buffer.alloc(4);
+  len.writeUInt32BE(data.length);
+  const body = Buffer.concat([Buffer.from(type, 'ascii'), data]);
+  const crc = Buffer.alloc(4);
+  crc.writeUInt32BE(zlib.crc32(body));
+  return Buffer.concat([len, body, crc]);
+}
+
+// a size-wide square png of the orb, rgb with no alpha (the home screen fills
+// see-through corners with black), each row filtered by its left neighbour so
+// the smooth color compresses small
+function orbPng(size = 180) {
+  const raw = Buffer.alloc(size * (1 + size * 3));
+  for (let y = 0; y < size; y++) {
+    const row = y * (1 + size * 3);
+    raw[row] = 1;
+    let prev = [0, 0, 0];
+    for (let x = 0; x < size; x++) {
+      const px = orbPixel(x + 0.5, y + 0.5, size);
+      for (let k = 0; k < 3; k++) raw[row + 1 + x * 3 + k] = (px[k] - prev[k]) & 0xff;
+      prev = px;
+    }
+  }
+  const head = Buffer.alloc(13);
+  head.writeUInt32BE(size, 0);
+  head.writeUInt32BE(size, 4);
+  head[8] = 8;
+  head[9] = 2;
+  return Buffer.concat([
+    Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
+    chunk('IHDR', head),
+    chunk('IDAT', zlib.deflateSync(raw, { level: 9 })),
+    chunk('IEND', Buffer.alloc(0)),
+  ]);
+}
+
+let touch = null;
+const touchIconPng = () => (touch || (touch = `data:image/png;base64,${orbPng(180).toString('base64')}`));
+
+module.exports = { iconSvg, touchIconPng };