atris 3.73.1 → 3.74.1

package/lib/gm-bet.js

@@ -152,6 +152,8 @@ function readScoreboard(file, workspaceRoot) {
     if (!row || row.workspace !== workspaceRoot) continue;
     if (row.kind === 'pick' && row.name) board = { name: row.name, up: row.up !== false, source: row.source === 'installs' ? 'installs' : 'reported', at: row.at, reports: [] };
     else if (row.kind === 'report' && board && Number.isFinite(row.value)) board.reports.push({ value: row.value, at: row.at });
+    // the owner stopped tracking it: no number until one is picked again
+    else if (row.kind === 'clear') board = null;
   }
   return board;
 }
@@ -348,6 +350,8 @@ function buildQuestionRewrite(previous, reasons) {
 
 const SAY_READ_MS = 15000;
 const SAY_KINDS = new Set(['question', 'answer', 'instruction', 'unclear']);
+// on the weekly number card, what an instruction wants done with the number
+const NUMBER_INTENTS = new Set(['stop', 'change', 'later', 'other']);
 const SAY_FALLBACK = 'say that another way, or tap a button.';
 // the last turns of a card's conversation the reader sees
 const THREAD_TURNS = 6;
@@ -380,6 +384,7 @@ async function readSaid({ text, card, thread = [], hint = null, workspaceRoot, b
     '- unclear: you cannot tell. reply: one short question back.',
     '- a message that ends with "?" or asks why, what, or how is a question back, never an answer.',
     '- you may add "suggestions": 0 to 3 short replies he could tap next, each under 40 characters.',
+    card.kind === 'number' ? '- on this number card an instruction also has "intent": "stop" when he wants to stop tracking this number, "change" when he wants a different number, "later" when he wants to be asked another time, else "other". for "other", reply says what this card can do.' : '',
     `- plain lowercase-friendly words, no em dashes, and never these words: ${OWNER_BANNED_WORDS.join(', ')}.`,
     '',
     `## the card on screen (${card.kind})`,
@@ -404,7 +409,8 @@ async function readSaid({ text, card, thread = [], hint = null, workspaceRoot, b
   const v = parsed.bet;
   if (!v || !SAY_KINDS.has(v.kind) || typeof v.reply !== 'string') return { ok: false, reason: 'the read was not the shape asked for' };
   const suggestions = Array.isArray(v.suggestions) ? v.suggestions.filter(x => typeof x === 'string' && x.trim()).map(x => x.trim()) : [];
-  return { ok: true, kind: v.kind, reply: clip(v.reply, 280), ...(suggestions.length ? { suggestions } : {}) };
+  const intent = card.kind === 'number' && NUMBER_INTENTS.has(v.intent) ? v.intent : null;
+  return { ok: true, kind: v.kind, reply: clip(v.reply, 280), ...(intent ? { intent } : {}), ...(suggestions.length ? { suggestions } : {}) };
 }
 
 // Two or three numbers that would tell the owner this project is going well,
@@ -1991,11 +1997,21 @@ const MISSION_STOP = 'every team step is done with proof, and every your-yes ste
 
 // The bet's own verify is the check; a bet made before verify existed keeps
 // the old formatting check.
-function missionStartArgs(bet, { owner, lane }, betId = null) {
+function missionStartArgs(bet, { owner, lane }, betId = null, workspaceRoot = process.cwd()) {
   // the owner steps are sealed into the mission record at start
   const seal = require('./yes-lock').sealFor(bet.steps);
   const time = jobTime(bet);
-  return ['mission', 'start', missionObjective(bet, { owner, betId }), '--owner', owner, '--runner', 'claude', '--lane', lane, '--verify', bet.verify || MISSION_VERIFY, '--stop', MISSION_STOP, '--max-wall', String(time.seconds), '--max-ticks', String(time.ticks), '--stop-when-done', ...(seal.length ? ['--yes-lock', JSON.stringify(seal)] : []), '--json'];
+  // --worktree: the job runs, and its check runs, in its own copy of the
+  // code. Mission #266 ran in the shared main folder, which sat on an old
+  // branch, so its check could not see the work it had merged. A folder with
+  // no git has no master to protect and no copy to make, so the job runs in
+  // place there, as it always did.
+  const worktree = inGitCheckout(workspaceRoot) ? ['--worktree'] : [];
+  return ['mission', 'start', missionObjective(bet, { owner, betId }), '--owner', owner, '--runner', 'claude', '--lane', lane, '--verify', bet.verify || MISSION_VERIFY, '--stop', MISSION_STOP, '--max-wall', String(time.seconds), '--max-ticks', String(time.ticks), '--stop-when-done', ...worktree, ...(seal.length ? ['--yes-lock', JSON.stringify(seal)] : []), '--json'];
+}
+
+function inGitCheckout(workspaceRoot) {
+  return String(gitOut(workspaceRoot, ['rev-parse', '--is-inside-work-tree']) || '').trim() === 'true';
 }
 
 // the run gets the same time as the start, so the detached driver never
@@ -2041,10 +2057,22 @@ const STALL_MS = 2 * 60 * 60 * 1000;
 
 // Every mission in this workspace, read-only, through the same reader the
 // mission command uses (it only reads .atris/state/missions.jsonl).
-function defaultReadMissions(workspaceRoot) {
-  return require(path.join(__dirname, '..', 'commands', 'mission.js')).loadMissionMap(workspaceRoot);
+// Every mission the desk follows: the main folder's, plus those in worktrees
+// ("do it" missions run in their own), newest record winning.
+function readDeskMissions(workspaceRoot) {
+  const missionCmd = require(path.join(__dirname, '..', 'commands', 'mission.js'));
+  const map = new Map(missionCmd.loadMissionMap(workspaceRoot));
+  const at = m => Date.parse((m && (m.updated_at || m.last_tick_at || m.created_at)) || '') || 0;
+  for (const rolled of missionCmd.listWorktreeRollupMissions(workspaceRoot)) {
+    if (!rolled || !rolled.id) continue;
+    const known = map.get(rolled.id);
+    if (!known || at(rolled) >= at(known)) map.set(rolled.id, rolled);
+  }
+  return map;
 }
 
+const defaultReadMissions = readDeskMissions;
+
 // A mission's last receipt, read-only. Null when there is none.
 function defaultReadReceipt(mission, workspaceRoot) {
   if (!mission || !mission.receipt_path) return null;
@@ -2223,9 +2251,23 @@ function defaultReadHandoffs(workspaceRoot) {
 }
 
 function currentMember(betId, owner, handoffs) {
+  const hit = latestHandoff(betId, handoffs);
+  return hit ? hit.to : owner;
+}
+
+function latestHandoff(betId, handoffs) {
   const tag = handoffTag(betId);
   const hits = handoffs.filter(h => h && typeof h.summary === 'string' && h.summary.includes(tag) && h.to);
-  return hits.length ? hits[hits.length - 1].to : owner;
+  return hits.length ? hits[hits.length - 1] : null;
+}
+
+// When the newest handoff for a job could not start its member (the team was
+// at its limit, no engine, asleep), say that instead of "<member> has it".
+function handoffWaiting(betId, handoffs) {
+  const hit = latestHandoff(betId, handoffs);
+  const wake = hit && hit.wake;
+  if (!wake || wake.status !== 'not_started') return null;
+  return clip(String(wake.text || `${hit.to} did not start`).split('. to start it:')[0], 160);
 }
 
 // a line that ends like a sentence
@@ -2286,8 +2328,8 @@ function queuedProblem(bet, team) {
 
 // ---- the desk: a queue of ready bets, one shown at a time --------------------------------
 
+// ideas kept ready ahead; one is written again the moment one is shown
 const QUEUE_TARGET = 3;
-const REFILL_BELOW = 2;
 // one generation at a time; the cap of 3 calls in flight per session is never reached
 const MAX_IN_FLIGHT = 1;
 const SESSION_IN_FLIGHT_CAP = 3;
@@ -2348,7 +2390,6 @@ function createBetDesk(deps) {
     gen: null,
     // a sharper idea asked for, made in the background like any other
     pendingSharper: null,
-    topping: false,
     failures: 0,
     backoffUntil: 0,
     retry: null,
@@ -2490,7 +2531,7 @@ function createBetDesk(deps) {
       // still because the guard holds a step for the owner's yes: that is a yes card, not a halt
       const held = job.stalled ? require('./yes-lock').askedYesLocks(lockDir, mission.id) : [];
       if (held.length) {
-        for (const lock of held) yes.push({ ...job, kind: 'yes', ask: lock.text, command: lock.held_command || null, lock_step: lock.step, ask_index: null, key: `${mission.id}:step-${lock.step}` });
+        for (const lock of held) yes.push({ ...job, kind: 'yes', ask: lock.text, command: lock.held_command || null, lock_step: lock.step, lock_hash: lock.hash || null, ask_index: null, key: `${mission.id}:step-${lock.step}:${lock.hash || ''}` });
         continue;
       }
       // finished with nothing failed: the roster's reviewer looks before it counts as done
@@ -2515,15 +2556,24 @@ function createBetDesk(deps) {
         });
         log({ card: 'bet', choice: 'job_finished', command: null, ran: 'in process', exit_code: job.failed ? 1 : 0, bet_id: row.id, mission_id: mission.id });
       } else if (job.kind === 'working') {
-        working.push({ ...job, owner: currentMember(row.id, job.owner, handoffs()) });
+        const waiting = handoffWaiting(row.id, handoffs());
+        working.push({ ...job, owner: currentMember(row.id, job.owner, handoffs()), ...(waiting ? { waiting } : {}) });
         // a step the job tried and the guard held is a yes card
         for (const lock of require('./yes-lock').askedYesLocks(lockDir, mission.id)) {
-          yes.push({ ...job, kind: 'yes', ask: lock.text, command: lock.held_command || null, lock_step: lock.step, ask_index: null, key: `${mission.id}:step-${lock.step}` });
+          yes.push({ ...job, kind: 'yes', ask: lock.text, command: lock.held_command || null, lock_step: lock.step, lock_hash: lock.hash || null, ask_index: null, key: `${mission.id}:step-${lock.step}:${lock.hash || ''}` });
         }
       } else if (job.kind === 'yes') {
         for (const ask of job.asks) yes.push({ ...job, ask_index: ask.index, ask: ask.text, key: `${job.mission_id}:${ask.index}` });
       }
     }
+    // a run woken by a handoff, held from a command: the card shows on the
+    // job it was handed off from when that job is on the desk, else on its
+    // own; the yes always goes to the run that was held
+    for (const card of require('./yes-lock').handoffYesCards(lockDir)) {
+      const parent = [...working, ...yes].find(j => j.mission_id && j.mission_id === card.parent_mission_id) || null;
+      const where = parent ? { bet_id: parent.bet_id, title: parent.title, owner: parent.owner } : { bet_id: null, title: 'a handed-off job', owner: 'the handed-off job' };
+      yes.push({ kind: 'yes', ...where, mission_id: card.mission_id, ask: card.ask, command: card.command, lock_step: card.step, lock_hash: card.hash || null, ask_index: null, key: `${card.mission_id}:step-${card.step}:${card.hash || ''}` });
+    }
     const expectOf = new Map(readLedger(deps.ledgerFile, deps.workspaceRoot).map(r => [r.id, r.bet && r.bet.expect]));
     state.jobs = { working, yes: yes.map(y => ({ ...y, expect: expectOf.get(y.bet_id) || null })), at: now() };
     retryFailed();
@@ -2665,10 +2715,11 @@ function createBetDesk(deps) {
         question: { key: 'scoreboard', ask: SCOREBOARD_ASK, line: null, choices: [...list.map((c, i) => ({ id: `s${i + 1}`, label: c.name })), { id: 'other', label: 'something else', other: true }], numbers: list },
       };
     }
-    if (board.source !== 'reported' || state.passedQuestions.has('report')) return null;
+    const today = dayKey(now());
+    // passed over today (not now, or a tap past it): asked again tomorrow
+    if (board.source !== 'reported' || state.passedQuestions.has(`report:${today}`)) return null;
     const last = board.reports[board.reports.length - 1] || null;
     const weekly = !last || now() - (Date.parse(last.at) || 0) >= WEEK_MS;
-    const today = dayKey(now());
     const waiting = readLedger(deps.ledgerFile, deps.workspaceRoot).some(r => r.status === 'doing' && r.bet && r.bet.target && r.bet.target.metric === 'scoreboard'
       && String(r.bet.check_date || '') < today && !board.reports.some(x => String(x.at).slice(0, 10) >= r.bet.check_date));
     if (!weekly && !waiting) return null;
@@ -2793,8 +2844,9 @@ function createBetDesk(deps) {
     return { ok: true, ...view() };
   }
 
-  // nothing ready and nothing left to ask: one plain card, shown at once
-  const WAIT_CARD = { what: 'the next idea is being written.', why: 'tap the orb again in a minute to see it.' };
+  // nothing ready and nothing left to ask: one calm line, shown at once; the
+  // page brings the idea in once it is written
+  const WAIT_CARD = { what: 'writing your next idea.' };
   function showWait() {
     state.current = { kind: 'wait', id: `wait:${now()}` };
     state.status = 'ready';
@@ -2815,7 +2867,7 @@ function createBetDesk(deps) {
   // a re-tap on a job card moves on: a yes waits for a later session, a done is seen
   function passJob(item) {
     if (item.kind === 'wait') return;
-    if (item.kind === 'report') { state.passedQuestions.add('report'); return; }
+    if (item.kind === 'report') { state.passedQuestions.add(item.id); return; }
     if (item.kind === 'choice') {
       for (const i of item.items) record(i.id, { status: 'passed', note: 'not picked' });
       log({ card: 'bet', choice: 'pass', command: null, ran: 'in process', exit_code: 0, kind: 'choice' });
@@ -2884,13 +2936,16 @@ function createBetDesk(deps) {
         // the sharper or reworked idea the owner asked for is the next shown
         if (sharperOf || ownerNote) state.queue.unshift(item);
         else state.queue.push(item);
+        // the calm line stays the card on screen; the page sees the idea in
+        // the queue and asks for it when the owner is not typing there
         return pump();
       });
     return gen;
   }
 
-  // Keeps the queue topped up: below 2 it refills to 3, one generation at a
-  // time. A sharper idea the owner asked for goes first.
+  // Keeps the queue full: below 3 the next one is written, so showing one
+  // starts the next at once, one generation at a time. A sharper idea the
+  // owner asked for goes first.
   function pump() {
     pumpQuestions();
     pumpSuggestions();
@@ -2902,9 +2957,7 @@ function createBetDesk(deps) {
       const gen = startGeneration(asked);
       return gen && gen.done;
     }
-    if (state.queue.length < REFILL_BELOW) state.topping = true;
-    if (state.queue.length >= QUEUE_TARGET) state.topping = false;
-    if (!state.topping) return null;
+    if (state.queue.length >= QUEUE_TARGET) return null;
     if (state.failures >= MAX_BACKGROUND_FAILURES) {
       if (now() < state.backoffUntil) return null;
       state.failures = 0;
@@ -2970,7 +3023,7 @@ function createBetDesk(deps) {
     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);
+    const startArgs = missionStartArgs(bet, pick, id, deps.workspaceRoot);
     state.status = 'starting';
     const display = args => require('./gm-phone').displayCommand(args);
     let res = await deps.runCli(startArgs);
@@ -3015,10 +3068,13 @@ function createBetDesk(deps) {
   }
 
   // an answer to the question on screen is saved to the focus file, where
-  // the writer reads it for every bet after this one
-  function answer({ choice, text } = {}) {
+  // the writer reads it for every bet after this one. card: the id of the
+  // card the page shows; a page that missed the next card names the old one,
+  // 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' };
     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' };
     const q = item.question;
@@ -3062,7 +3118,7 @@ function createBetDesk(deps) {
     const again = { ...row.bet, why_now: `the last run ${why}. try again. ${row.bet.why_now}` };
     const pick = pickOwner(again, deps.workspaceRoot);
     const display = args => require('./gm-phone').displayCommand(args);
-    const startArgs = missionStartArgs(again, pick, row.id);
+    const startArgs = missionStartArgs(again, pick, row.id, deps.workspaceRoot);
     let res = await deps.runCli(startArgs);
     log({ card: 'bet', choice: 'send_back', command: display(startArgs), exit_code: res.code, bet_id: row.id });
     const started = parseJsonOut(res.stdout);
@@ -3084,12 +3140,19 @@ function createBetDesk(deps) {
     if (!item) return { ok: false, reason: 'gone', message: 'there is no question on screen' };
     const { job } = item;
     if (job.lock_step) {
-      require('./yes-lock').approveYesLock(lockDir, job.mission_id, job.lock_step, null, iso());
+      // the yes releases only the command on this card (its hash), once
+      const approved = require('./yes-lock').approveYesLock(lockDir, job.mission_id, job.lock_step, null, iso(), { hash: job.lock_hash || null });
+      if (job.lock_hash && !approved) {
+        state.seenYes.add(job.key);
+        state.status = 'cleared';
+        pollJobs();
+        return { ok: true, ack: 'that request was already answered.' };
+      }
       const args = ['mission', 'ping', job.mission_id, `the owner said yes to step ${job.lock_step}: ${job.ask}. the guard lets it through now; run it again.`, '--from', 'gm-phone'];
       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, step: job.lock_step });
       state.seenYes.add(job.key);
-      record(job.bet_id, { yes_answered: { mission_id: job.mission_id, step: job.lock_step, at: iso() } });
+      if (job.bet_id) record(job.bet_id, { yes_answered: { mission_id: job.mission_id, step: job.lock_step, at: iso() } });
       state.status = 'cleared';
       pollJobs();
       return { ok: true, ack: `${job.owner}: got your yes` };
@@ -3180,7 +3243,7 @@ function createBetDesk(deps) {
       } : null,
       // each option: its title, and one plain line of why, the result it expects
       choice: kind === 'choice' ? { options: cur.items.map(i => ({ id: i.id, title: i.bet.title, why: choiceWhy(i.bet.expect) })) } : null,
-      working: state.jobs.working.map(j => ({ title: j.title, owner: j.owner, ...(j.left ? { left: j.left } : {}) })),
+      working: state.jobs.working.map(j => ({ title: j.title, owner: j.owner, ...(j.left ? { left: j.left } : {}), ...(j.waiting ? { waiting: j.waiting } : {}) })),
       // the conversation on this card so far
       thread: cur && state.thread.id === cur.id ? state.thread.turns.slice() : [],
       // the footer count: only members really working
@@ -3223,7 +3286,7 @@ function createBetDesk(deps) {
     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') 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 === '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: [] };
+    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: [] };
   }
 
@@ -3251,12 +3314,14 @@ function createBetDesk(deps) {
   // On a question it is the answer; on an idea, a note the writer reworks it
   // with (the rework is the next idea); on a choice or the plain card, the
   // next idea fits it; on a yes or a finished job, a word to that member.
-  async function say({ text, confirm = false, note = false } = {}) {
+  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` };
     const cur = state.status === 'ready' ? state.current : null;
     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' };
     const kind = cur.kind || 'bet';
     log({ card: 'bet', choice: 'say', command: null, ran: 'in process', exit_code: 0, kind, chars: said.length });
     const t = threadFor(cur.id);
@@ -3291,6 +3356,35 @@ function createBetDesk(deps) {
       pump();
       return { ok: true, ack: plainReply(read.reply) || 'got it. the next idea will fit that.' };
     }
+    // Words on the weekly number card are about that number, and the
+    // reader says what they want. A plain number is this week's value. Stop
+    // tracking this, or pick a different number, stops tracking it, and the
+    // next card asks which number, if any. Ask me tomorrow is not now. Any
+    // other answer or instruction gets a reply on the card and changes nothing.
+    if (kind === 'report') {
+      const stay = (reply) => {
+        addTurns(t, { who: 'owner', text: said }, { who: 'orb', text: reply });
+        return { ok: true, stay: true, kind: 'unclear', reply, thread: t.turns.slice() };
+      };
+      if (read.kind === 'answer') {
+        const saved = report({ value: said });
+        if (saved.ok) { endThread(); return saved; }
+        return stay('type this week\'s number in the box, or say stop tracking this.');
+      }
+      if (read.intent === 'later') {
+        passJob(cur);
+        state.status = 'cleared';
+        endThread();
+        return { ok: true, ack: 'got it. i will ask tomorrow.' };
+      }
+      if (read.intent !== 'stop' && read.intent !== 'change') return stay(plainReply(read.reply) || 'this card keeps one number a week. say stop tracking this, or ask me tomorrow.');
+      const name = cur.board.name;
+      appendLedger(scoreboardFile, { workspace: deps.workspaceRoot, kind: 'clear', name, at: iso() });
+      log({ card: 'bet', choice: 'scoreboard_clear', command: null, ran: 'in process', exit_code: 0 });
+      state.status = 'cleared';
+      endThread();
+      return { ok: true, ack: `got it. i stopped tracking ${name}.` };
+    }
     if (kind === 'yes' || kind === 'done') {
       const out = await steer({ member: cur.job.owner, text: said, confirm, note });
       if (out.ok) endThread();
@@ -3458,6 +3552,7 @@ module.exports = {
   scoreboardPath,
   choiceWhy,
   JOB_POLL_MS,
+  readDeskMissions,
   OWNER_BANNED,
   jobTime,
   generateQuestion,