atris 3.74.9 → 3.74.10

package/lib/gm-bet.js

@@ -2108,7 +2108,7 @@ const WRITER_ANGLES = [
 const SWARM_SAY = {
   drafting: n => (n === 1 ? 'drafting an idea' : `drafting ${COUNT_WORDS[n] || n} ideas at once`),
   checking: k => `the ${ORDINALS[k - 1] || 'next'} draft is in. checking it`,
-  redraft: 'one draft missed a rule. redrafting it',
+  redraft: 'one draft did not fit. redrafting it',
   shorten: 'one draft ran long. shortening it',
   heldUp: 'found one that holds up',
   notHeld: 'that one did not hold up. still working',
@@ -3289,10 +3289,10 @@ function createBetDesk(deps) {
   // the number for the card on screen, saved beside the ledger
   function report({ value } = {}) {
     const item = onJob('report');
-    if (!item) return { ok: false, reason: 'gone', message: 'there is no number asked for on screen' };
+    if (!item) return { ok: false, reason: 'gone', message: 'there is no number asked for on screen.' };
     const raw = String(value == null ? '' : value).replace(/,/g, '').trim();
     const v = Number(raw);
-    if (!raw || !Number.isFinite(v)) return { ok: false, reason: 'bad_number', message: 'that is not a number' };
+    if (!raw || !Number.isFinite(v)) return { ok: false, reason: 'bad_number', message: 'that is not a number.' };
     appendLedger(scoreboardFile, { workspace: deps.workspaceRoot, kind: 'report', value: v, at: iso() });
     log({ card: 'bet', choice: 'report', command: null, ran: 'in process', exit_code: 0 });
     state.status = 'cleared';
@@ -3387,7 +3387,7 @@ function createBetDesk(deps) {
   function pick({ id } = {}) {
     const cur = onJob('choice');
     const item = cur && cur.items.find(i => i.id === id);
-    if (!item) return { ok: false, reason: 'gone', message: 'there is nothing to pick on screen' };
+    if (!item) return { ok: false, reason: 'gone', message: 'there is nothing to pick on screen.' };
     for (const other of cur.items) if (other !== item) record(other.id, { status: 'passed', note: 'not picked' });
     log({ card: 'bet', choice: 'pick', command: null, ran: 'in process', exit_code: 0, bet_id: item.id });
     state.current = item;
@@ -3732,15 +3732,16 @@ function createBetDesk(deps) {
   const isBet = () => state.status === 'ready' && state.current && (!state.current.kind || state.current.kind === 'bet');
 
   function skip() {
-    if (!isBet()) return { ok: false, reason: 'gone', message: 'there is no idea on screen to skip' };
+    if (!isBet()) return { ok: false, reason: 'gone', message: 'there is no idea on screen to skip.' };
     record(state.current.id, { status: 'skipped' });
     log({ card: 'bet', choice: 'skip', command: null, ran: 'in process', exit_code: 0, bet_id: state.current.id });
     state.status = 'skipped';
-    return { ok: true, ack: 'not now. all clear.' };
+    // the page says what to do next under the orb, so this only says what happened
+    return { ok: true, ack: 'set aside.' };
   }
 
   async function doIt() {
-    if (!isBet()) return { ok: false, reason: 'gone', message: 'there is no idea on screen to start' };
+    if (!isBet()) return { ok: false, reason: 'gone', message: 'there is no idea on screen to start.' };
     const { id, bet } = state.current;
     const pick = pickOwner(bet, deps.workspaceRoot);
     const startArgs = missionStartArgs(bet, pick, id, deps.workspaceRoot);
@@ -3766,7 +3767,7 @@ function createBetDesk(deps) {
     let line;
     // what the owner reads; the command and exit code stay in the log
     if (res.code === 0 && ran.action === 'mission_run_detached') line = `${owner} has it and is starting now.`;
-    else if (ran.reason === 'human_asks_open') line = `${owner} has it, and is waiting on your yes before starting.`;
+    else if (ran.reason === 'human_asks_open') line = `${owner} has it, and is waiting for your yes before starting.`;
     else line = `${owner} has it, but has not started yet. it can be started from the mac.`;
     state.status = 'started';
     state.mission = { id: missionId, owner, line, commands: [display(startArgs), display(runArgs)] };
@@ -3780,7 +3781,7 @@ function createBetDesk(deps) {
   // nice: a finished job was seen; nothing else happens
   function nice() {
     const item = onJob('done');
-    if (!item) return { ok: false, reason: 'gone', message: 'there is no finished job on screen' };
+    if (!item) return { ok: false, reason: 'gone', message: 'there is no finished job on screen.' };
     record(item.job.bet_id, { done_seen_at: iso() });
     log({ card: 'bet', choice: 'nice', command: null, ran: 'in process', exit_code: 0, bet_id: item.job.bet_id });
     state.status = 'cleared';
@@ -3793,18 +3794,18 @@ function createBetDesk(deps) {
   // and its answer is saved against nothing (answer ids repeat across questions)
   function answer({ choice, text, card } = {}) {
     const item = onJob('question');
-    if (!item) return { ok: false, reason: 'gone', message: 'there is no question on screen' };
-    if (card !== undefined && card !== item.id) return { ok: false, reason: 'gone', message: 'that card changed, so nothing was saved. tap the orb for the new one' };
+    if (!item) return { ok: false, reason: 'gone', message: 'there is no question on screen.' };
+    if (card !== undefined && card !== item.id) return { ok: false, reason: 'gone', message: 'that card changed, so nothing was saved. here is the one on screen now.' };
     const picked = item.question.choices.find(c => c.id === choice);
-    if (!picked) return { ok: false, reason: 'bad_choice', message: 'that is not one of the answers' };
+    if (!picked) return { ok: false, reason: 'bad_choice', message: 'that is not one of the answers.' };
     const q = item.question;
     if (q.key === 'scoreboard') {
       let name;
       let up;
       if (picked.other) {
         name = String(text || '').trim();
-        if (!name) return { ok: false, reason: 'empty', message: 'say the number in a few words' };
-        if (name.length > 60) return { ok: false, reason: 'too_long', message: 'keep it under 60 characters' };
+        if (!name) return { ok: false, reason: 'empty', message: 'name the number in a few words.' };
+        if (name.length > 60) return { ok: false, reason: 'too_long', message: 'keep it under 60 characters.' };
         up = !LOWER_IS_BETTER.test(name);
       } else {
         const pick = q.numbers[Number(picked.id.slice(1)) - 1];
@@ -3899,7 +3900,7 @@ function createBetDesk(deps) {
       if (job.bet_id) record(job.bet_id, { yes_answered: { mission_id: job.mission_id, step: job.lock_step, at: iso() } });
       clear();
       pollJobs();
-      return { ok: true, ack: `${job.owner}: got your yes` };
+      return { ok: true, ack: `told ${job.owner} yes.` };
     }
     const listed = await deps.runCli(['decide', '--json']);
     const open = (parseJsonOut(listed.stdout) || {}).decisions || [];
@@ -3913,13 +3914,13 @@ function createBetDesk(deps) {
     const args = ['decide', String(match.number), 'yes', '--json'];
     const res = await deps.runCli(args);
     log({ card: 'bet', choice: 'yes', command: require('./gm-phone').displayCommand(args), exit_code: res.code, bet_id: job.bet_id, mission_id: job.mission_id });
-    if (res.code !== 0) return { ok: false, reason: 'answer_failed', message: 'your yes did not go through; try again' };
+    if (res.code !== 0) return { ok: false, reason: 'answer_failed', message: 'your yes did not go through. try again.' };
     state.seenYes.add(job.key);
       state.answeredYes.add(job.key);
     if (job.bet_id) record(job.bet_id, { yes_answered: { mission_id: job.mission_id, ask_index: job.ask_index, at: iso() } });
     clear();
     pollJobs();
-    return { ok: true, ack: `${job.owner}: got your yes` };
+    return { ok: true, ack: `told ${job.owner} yes.` };
   }
 
   // no: the one request on the card is told no, and the job goes on without
@@ -3955,7 +3956,7 @@ function createBetDesk(deps) {
     const args = ['decide', String(match.number), 'no', '--json'];
     const res = await deps.runCli(args);
     log({ card: 'bet', choice: 'no', command: display(args), exit_code: res.code, bet_id: job.bet_id, mission_id: job.mission_id });
-    if (res.code !== 0) return { ok: false, reason: 'answer_failed', message: 'your no did not go through; try again' };
+    if (res.code !== 0) return { ok: false, reason: 'answer_failed', message: 'your no did not go through. try again.' };
     if (job.bet_id) record(job.bet_id, { no_answered: { mission_id: job.mission_id, ask_index: job.ask_index, at: iso() } });
     return done(told);
   }
@@ -3966,7 +3967,7 @@ function createBetDesk(deps) {
     const j = item.job;
     const expect = item.kind === 'yes' ? j.expect : j.bet && j.bet.expect;
     const why = expect ? ` ${sentence(expect)}` : '';
-    if (item.kind === 'yes') return { what: plainAsk(j.ask), why: `${j.owner} is waiting on your yes for this.${why}` };
+    if (item.kind === 'yes') return { what: plainAsk(j.ask), why: `${j.owner} is waiting for your yes.${why}` };
     return { what: j.title, why: `this is done.${why}` };
   }
 
@@ -4074,7 +4075,7 @@ function createBetDesk(deps) {
   function cardForReader(v) {
     if (v.kind === 'question') return { kind: 'question', title: v.question.ask, detail: v.question.line, buttons: v.question.choices.map(c => c.label) };
     if (v.kind === 'bet' && v.bet.concern) return { kind: 'idea', title: v.bet.title, detail: [v.bet.why_now, v.bet.expect, v.bet.concern].join(' '), buttons: ['go with it', 'sharpen it', 'something else'] };
-    if (v.kind === 'bet') return { kind: 'idea', title: v.bet.title, detail: [v.bet.why_now, v.bet.expect].join(' '), buttons: ['do it', 'sharper idea', 'not now'] };
+    if (v.kind === 'bet') return { kind: 'idea', title: v.bet.title, detail: [v.bet.why_now, v.bet.expect].join(' '), buttons: ['do it', 'sharpen it', 'not now'] };
     if (v.kind === 'choice') return { kind: 'choice', title: 'which one next?', detail: v.choice.options.map(o => o.title).join(' / '), buttons: [] };
     if (v.kind === 'report') return { kind: 'number', title: v.report.what, detail: v.report.why, buttons: ['save', 'not now'] };
     return { kind: v.kind, title: v.job ? v.job.what : '', detail: v.job ? v.job.why : '', buttons: [] };
@@ -4108,12 +4109,12 @@ function createBetDesk(deps) {
   // next idea fits it; on a yes or a finished job, a word to that member.
   async function say({ text, confirm = false, note = false, card } = {}) {
     const said = String(text || '').trim();
-    if (!said) return { ok: false, reason: 'empty', message: 'say something first' };
-    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters` };
+    if (!said) return { ok: false, reason: 'empty', message: 'say something first.' };
+    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters.` };
     let cur = state.status === 'ready' ? state.current : null;
-    if (!cur) return { ok: false, reason: 'gone', message: 'there is no card on screen' };
+    if (!cur) return { ok: false, reason: 'gone', message: 'there is no card on screen.' };
     // words said on a card the page no longer shows act on nothing
-    if (card !== undefined && card !== cur.id) return { ok: false, reason: 'gone', message: 'that card changed, so nothing was done. tap the orb for the new one' };
+    if (card !== undefined && card !== cur.id) return { ok: false, reason: 'gone', message: 'that card changed, so nothing was done. here is the one on screen now.' };
     // on the calm line there is nothing to answer: the words are a note for the idea being written, read by no model
     if (cur.kind === 'wait') return noteOnWait(cur, said);
     let kind = cur.kind || 'bet';
@@ -4128,7 +4129,7 @@ function createBetDesk(deps) {
       // said on the try-again card that took its place, never dropped
       const replaced = kind === 'wait' && state.status === 'ready' && state.current && state.current.kind === 'missed' && state.current.after === cur.id;
       if (replaced) { cur = state.current; kind = 'missed'; }
-      if (state.current !== cur || state.status !== 'ready') return { ok: false, reason: 'gone', message: 'that card changed, so nothing was done' };
+      if (state.current !== cur || state.status !== 'ready') return { ok: false, reason: 'gone', message: 'that card changed, so nothing was done. here is the one on screen now.' };
       if (turn.stay) return turn.stay;
       read = turn.act;
     }
@@ -4208,10 +4209,10 @@ function createBetDesk(deps) {
   // answered from what the table knows; an instruction steers them.
   async function talk({ member, text, confirm = false, note = false } = {}) {
     const name = String(member || '');
-    if (!(team || []).some(m => m.name === name)) return { ok: false, reason: 'gone', message: 'there is no such member on the team' };
+    if (!(team || []).some(m => m.name === name)) return { ok: false, reason: 'gone', message: 'there is no such member on the team.' };
     const said = String(text || '').trim();
-    if (!said) return { ok: false, reason: 'empty', message: 'say something first' };
-    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters` };
+    if (!said) return { ok: false, reason: 'empty', message: 'say something first.' };
+    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters.` };
     const t = threadFor(`member:${name}`);
     if (!confirm && !note) {
       const row = statusTable().rows.find(r => r.member === name);
@@ -4247,13 +4248,13 @@ function createBetDesk(deps) {
     if (!OPEN_MISSION.has(status)) return null;
     const asks = (Array.isArray(m.human_asks) ? m.human_asks : []).some(a => a && !(typeof a === 'object' && a.answered_at))
       || require('./yes-lock').askedYesLocks(lockDir, m.id).length > 0;
-    if (asks) return { moved, row: { on, status: 'waiting for your yes', time: `waiting ${spanWords(age)}` } };
+    if (asks) return { moved, row: { on, status: 'waiting for your yes', time: `asked ${spanWords(age)} ago` } };
     if (driverAlive(m) || age <= MOVING_MS) {
       const wall = Number(m.max_wall_seconds) || Number(m.budget_contract && m.budget_contract.requested_seconds) || 0;
       const left = wall ? created + wall * 1000 - now() : 0;
       return { moved, row: { on, status: 'working', time: left > 0 ? leftWords(left) : `at it for ${spanWords(now() - created)}` } };
     }
-    if (!m.last_tick_at) return { moved, row: { on, status: 'waiting to start', time: `waiting ${spanWords(now() - created)}` } };
+    if (!m.last_tick_at) return { moved, row: { on, status: 'waiting to start', time: `added ${spanWords(now() - created)} ago` } };
     return { moved, row: { on, status: 'stopped', time: `stopped ${spanWords(age)} ago` } };
   }
 
@@ -4281,7 +4282,7 @@ function createBetDesk(deps) {
       const at = Date.parse((hnd && (hnd.closed_at || hnd.created_at)) || '') || 0;
       if (!hnd || !hnd.to || !at || now() - at > RECENT_MS) continue;
       const on = clip(String(hnd.summary || '').replace(/^\[[^\]]*\]\s*/, ''), 100);
-      if (hnd.status === 'open') put(hnd.to, { on, status: 'waiting to start', time: `waiting ${spanWords(now() - at)}` }, at);
+      if (hnd.status === 'open') put(hnd.to, { on, status: 'waiting to start', time: `added ${spanWords(now() - at)} ago` }, at);
       else put(hnd.to, { on, status: 'idle', time: `free for ${spanWords(now() - at)}` }, at);
     }
     const rows = [...best.values()]
@@ -4336,7 +4337,7 @@ function createBetDesk(deps) {
   // the owner's tap is the approval, so there is no yes card. scope member
   // gives only this member the model, scope job swaps the lead of its job.
   function onTeam(name) { return (team || []).some(m => m.name === name); }
-  const NOT_ON_TEAM = { ok: false, reason: 'gone', message: 'there is no such member on the team' };
+  const NOT_ON_TEAM = { ok: false, reason: 'gone', message: 'there is no such member on the team.' };
   function engineCard({ member } = {}) {
     const name = String(member || '');
     if (!onTeam(name)) return NOT_ON_TEAM;
@@ -4414,7 +4415,7 @@ function createBetDesk(deps) {
       const at = Date.parse((hnd && hnd.created_at) || '') || 0;
       if (!hnd || hnd.status !== 'open' || !names.has(hnd.to) || !at || now() - at > RECENT_MS) continue;
       const on = clip(String(hnd.summary || '').replace(/^\[[^\]]*\]\s*/, ''), 100);
-      jobs.push({ id: `handoff:${hnd.id || at}`, mission: null, member: hnd.to, row: { on, status: 'waiting to start', time: `waiting ${spanWords(now() - at)}` }, moved: at });
+      jobs.push({ id: `handoff:${hnd.id || at}`, mission: null, member: hnd.to, row: { on, status: 'waiting to start', time: `added ${spanWords(now() - at)} ago` }, moved: at });
     }
     jobs.sort((x, y) => STATUS_ORDER.indexOf(x.row.status) - STATUS_ORDER.indexOf(y.row.status) || y.moved - x.moved || x.member.localeCompare(y.member));
     // a yes skipped with not now waits at the back of the ones that need the owner
@@ -4459,10 +4460,10 @@ function createBetDesk(deps) {
 
   async function steer({ member, text, confirm = false, note = false } = {}) {
     const name = String(member || '');
-    if (!(team || []).some(m => m.name === name)) return { ok: false, reason: 'gone', message: 'there is no such member on the team' };
+    if (!(team || []).some(m => m.name === name)) return { ok: false, reason: 'gone', message: 'there is no such member on the team.' };
     const said = String(text || '').trim();
-    if (!said) return { ok: false, reason: 'empty', message: 'say something first' };
-    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters` };
+    if (!said) return { ok: false, reason: 'empty', message: 'say something first.' };
+    if (said.length > SAY_MAX) return { ok: false, reason: 'too_long', message: `keep it under ${SAY_MAX} characters.` };
     if (note) {
       steeringNote(name, said);
       log({ card: 'bet', choice: 'steer_note', command: null, ran: 'in process', exit_code: 0, member: name, chars: said.length });
@@ -4481,7 +4482,7 @@ function createBetDesk(deps) {
       if (out.action === 'member_run_not_started' && out.reason) return { ok: false, reason: 'not_started', message: `${name} did not start: ${String(out.reason).replace(/[.\s]+$/, '')}.` };
       return { ok: false, reason: 'not_started', message: `${name} did not start. try again in a minute.` };
     }
-    if (out.action === 'member_not_running' || res.code === 3) return { ok: false, reason: 'needs_confirm', message: `tap again to start ${name} on this` };
+    if (out.action === 'member_not_running' || res.code === 3) return { ok: false, reason: 'needs_confirm', message: `tap again to start ${name} on this.` };
     return { ok: false, reason: 'steer_failed', message: 'it did not reach them. try again in a minute.' };
   }
 
@@ -4566,8 +4567,9 @@ function createBetDesk(deps) {
       const at = Math.min(l.at || 0, cards.length - 1);
       const c = { ...cards[at], said: (l.said && l.said[cards[at].job_id]) || null };
       const r = c.rows[0];
-      // the deck card is about the job: its row without the rating and the model, which live on the team table
-      const columns = DECK_COLUMNS.filter(k => k !== 'ovr' && k !== 'engine');
+      // the deck card is about the job: its row without the rating and the model, which live on the team table,
+      // and without done, which says "not yet" on every card because the deck holds only open jobs
+      const columns = DECK_COLUMNS.filter(k => k !== 'ovr' && k !== 'engine' && k !== 'done');
       return gmCard.deck({ id: l.id, at, total: cards.length, card: c, columns, job: { member: c.member, role: r.role, ovr: r.ovr, engine: r.engine } });
     }
     if (l.kind === 'swap') {
@@ -4655,7 +4657,7 @@ function createBetDesk(deps) {
     const base = stays && under && under.kind === 'wait' && state.current && state.current.kind === 'missed' ? (underCard() || under) : under;
     const back = replied(out, base.id, text);
     if (back) return back;
-    if (!out.ok) return refuse(out.reason || 'gone', out.message || 'that did not send. try again');
+    if (!out.ok) return refuse(out.reason || 'gone', out.message || 'that did not send. try again.');
     state.reply = null;
     next();
     return done200({ ack: out.ack });
@@ -4669,7 +4671,7 @@ function createBetDesk(deps) {
     const out = await talk({ member: name, text, ...more });
     const back = replied(out, under.id, text);
     if (back) return back;
-    if (!out.ok) return refuse(out.reason || 'gone', out.message || 'that did not send. try again');
+    if (!out.ok) return refuse(out.reason || 'gone', out.message || 'that did not send. try again.');
     state.reply = null;
     if (l.kind === 'deck') { l.said = { ...(l.said || {}), [under.deck_job]: out.ack }; l.id = freshId('deck'); } else { l.line = out.ack; l.id = freshId('member'); }
     return done200();
@@ -4711,18 +4713,18 @@ function createBetDesk(deps) {
       return done200(out.busy ? { busy: true } : {});
     }
     if (body.open === 'team' || body.open === 'deck') {
-      if (stale) return refuse('gone', 'that card changed. here is the one on screen now');
+      if (stale) return refuse('gone', 'that card changed. here is the one on screen now.');
       open(body.open);
       return done200();
     }
     // an option or words always name the card they were for
-    if (!shown || !cardId || stale) return refuse('gone', 'that card changed, so nothing was done. here is the one on screen now');
+    if (!shown || !cardId || stale) return refuse('gone', 'that card changed, so nothing was done. here is the one on screen now.');
     const optionId = body.option_id == null ? null : String(body.option_id);
     const opt = optionId ? shown.options.find(o => o.id === optionId) : null;
-    if (optionId && !opt) return refuse('bad_option', 'that is not on this card');
-    if (!opt && !shown.input) return refuse('bad_option', 'this card has no box to type in');
+    if (optionId && !opt) return refuse('bad_option', 'that is not on this card.');
+    if (!opt && !shown.input) return refuse('bad_option', 'this card has no box to type in.');
     const typed = String(body.text == null ? '' : body.text).trim();
-    if ((!opt || opt.type) && !typed) return refuse('empty', 'say something first');
+    if ((!opt || opt.type) && !typed) return refuse('empty', 'say something first.');
     if (opt && opt.confirm && body.confirm !== true) return { status: 409, body: { ...envelope(), ok: false, reason: 'needs_confirm', message: opt.confirm } };
     const action = opt ? opt.action : shown.input.action;
     const b = (opt && opt.binds) || {};
@@ -4827,10 +4829,11 @@ function createBetDesk(deps) {
       case 'swap_to': {
         const out = swapEngine({ member: state.layer.name, engine: b.engine, model: b.model, scope: b.scope });
         if (!out.ok) return refuse(out.reason, out.message);
+        // the team comes back with the line on it, so nothing says it twice
         open('team', { line: out.ack });
-        return done200({ ack: out.ack });
+        return done200();
       }
-      default: return refuse('bad_option', 'that does nothing here');
+      default: return refuse('bad_option', 'that does nothing here.');
     }
   }
 

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 };