wisp-agents 0.18.0 → 0.20.0

package/web/js/features/auto.js

@@ -1,15 +1,17 @@
-// Auto: what the router (server/router.js) learned about which harness and model work for you.
+// Auto: what the router (server/router.js) learned about which harness, model and thinking level work for you.
 
 import { esc } from '../md.js';
 import { api } from '../core/api.js';
 import * as bus from '../core/bus.js';
-import { $, el, icon } from '../core/dom.js';
+import { $, $$, el, icon } from '../core/dom.js';
 import { S } from '../core/state.js';
 import { present } from '../ui/overlay.js';
-import { toastError } from '../ui/toast.js';
+import { toast, toastError } from '../ui/toast.js';
 import { AUTO_GOALS, harnessLogo } from './runners.js';
 
-const ARM_STATE = { ready: ['Ready', 'ok'], new: ['Trying out', 'warn'], untried: ['No data yet', ''], gone: ['Not installed', 'bad'] };
+const ARM_STATE = { ready: ['Ready', 'ok'], new: ['Trying out', 'warn'], untried: ['No data yet', ''], cooling: ['At its limit', 'warn'], gone: ['Not installed', 'bad'] };
+const TIER = { 1: 'small', 2: 'everyday', 3: 'frontier' };
+const untilLabel = (t) => new Date(t).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
 export async function openRouter({ host } = {}) {
   const node = el(`<div class="modal router-modal">
       <header><h2>Auto</h2><button class="icon-btn close">${icon('x')}</button></header>
@@ -23,15 +25,22 @@ export async function openRouter({ host } = {}) {
     if (!r || !node.isConnected) return;
     const arms = r.arms.filter((a) => a.state !== 'gone' || a.n);
     $('.ro-body', node).innerHTML = `
-      <p class="hint">For each task Auto estimates every harness · model’s chance of doing it well, from wisp-bench (${esc(r.priors.version)}) and then more and more from your own tasks: merged PRs, 👍 / 👎, rollbacks, follow-ups and how the run ended. It picks the best value for your goal (<b>${esc(AUTO_GOALS.find((g) => g.id === r.goal)?.label || '')}</b>), now and then trying an alternative so the estimates stay honest.</p>
-      <h4>Harness · model</h4>
+      <p class="hint">For each task Auto estimates every harness · model · thinking level’s chance of doing it well, from wisp-bench (${esc(r.priors.version)}) and then more and more from your own tasks: merged PRs, 👍 / 👎, rollbacks, follow-ups and how the run ended. It picks the best value for your goal (<b>${esc(AUTO_GOALS.find((g) => g.id === r.goal)?.label || '')}</b>), which also sets how hard it thinks: Cheap low, Balanced default or medium, Best high. Best runs frontier models only (Opus, not Sonnet or Haiku). Now and then it tries an alternative so the estimates stay honest.${r.coldStart && r.coldStart.have < r.coldStart.needed ? ` Until it has ${r.coldStart.needed} of your own outcomes (${r.coldStart.have} so far), Balanced uses everyday and frontier models only.` : ''}</p>
+      <h4>Harness · model · thinking</h4>
       <table class="us-table ro-table"><thead><tr><th></th><th>Works</th><th>Your tasks</th><th>~Cost</th><th>~Time</th><th></th></tr></thead><tbody>${arms
         .map((a) => {
           const [state, tone] = ARM_STATE[a.state] || ARM_STATE.ready;
           const types = Object.entries(a.byType).map(([t, x]) => `${t} ${pctOf(x.chance)} (${x.n})`).join(' · ');
-          return `<tr><td><span class="us-runner"><span class="model-logo">${harnessLogo(a.agent)}</span>${esc(a.label)}</span>${types ? `<small class="ro-types">${esc(types)}</small>` : ''}</td>${a.state === 'untried' ? '<td>—</td><td>—</td><td>—</td><td>—</td>' : `<td><b>${pctOf(a.chance)}</b></td><td>${a.n || '—'}</td><td>${a.usd ? `$${a.usd.toFixed(2)}` : '$0'}</td><td>${a.minutes}m</td>`}<td><span class="sx-state ${tone}"><i class="dot ${tone}"></i>${state}</span></td></tr>`;
+          return `<tr><td><span class="us-runner"><span class="model-logo">${harnessLogo(a.agent)}</span>${esc(a.label)}<i class="ro-tier t${a.tier}" title="${TIER[a.tier]} tier">${TIER[a.tier]}</i></span>${types ? `<small class="ro-types">${esc(types)}</small>` : ''}</td>${a.state === 'untried' ? '<td>—</td><td>—</td><td>—</td><td>—</td>' : `<td><b>${pctOf(a.chance)}</b></td><td>${a.n || '—'}</td><td>${a.usd ? `$${a.usd.toFixed(2)}` : '$0'}</td><td>${a.minutes}m</td>`}<td><span class="sx-state ${tone}" ${a.coolingUntil ? `title="${esc(`${a.coolingWhy || 'At its limit'} · back around ${untilLabel(a.coolingUntil)}`)}"` : ''}><i class="dot ${tone}"></i>${state}${a.coolingUntil ? ` until ${untilLabel(a.coolingUntil)}` : ''}</span></td></tr>`;
         })
         .join('')}</tbody></table>
+      <h4>Tests per project</h4>
+      <p class="hint">What wisp runs to check an Auto task. Leave it empty to use what wisp found, or type <code>off</code> to skip the check in that project.</p>
+      ${r.projects?.length
+        ? `<div class="ro-tests">${r.projects
+            .map((p) => `<label class="ro-test"><span class="us-proj c-${esc(p.color || 'slate')}"><i class="p-dot"></i>${esc(p.name)}</span><input class="input mono" data-id="${esc(p.id)}" value="${esc(p.testCommand)}" placeholder="${esc(p.detected?.command || (p.detected?.skip ? `none: ${p.detected.skip}` : 'none found'))}" spellcheck="false"></label>`)
+            .join('')}</div>`
+        : '<p class="mem-empty">Add a project to set its test command.</p>'}
       <h4>Recent picks</h4>
       ${r.recent.length
         ? `<ul class="ro-recent">${r.recent
@@ -42,6 +51,28 @@ export async function openRouter({ host } = {}) {
             .join('')}</ul>`
         : '<p class="mem-empty">Nothing yet. Launch with Auto and its picks show up here.</p>'}
       <div class="ro-foot"><button class="ghost sm danger" id="roReset">Forget what Auto learned</button><span class="hint">The wisp-bench starting point stays.</span></div>`;
+    for (const input of $$('.ro-test input', node)) {
+      let saved = input.value;
+      const save = async () => {
+        const v = input.value.trim();
+        if (v === saved) return;
+        const prev = saved;
+        saved = v;
+        try {
+          await api(`/projects/${input.dataset.id}`, { method: 'PATCH', body: { testCommand: v } });
+          toast(v ? `Auto will check with <code>${esc(v)}</code>` : 'Back to the test command wisp finds');
+        } catch (err) {
+          saved = input.value = prev;
+          toastError(err);
+        }
+      };
+      input.onblur = () => {
+        save();
+      };
+      input.onkeydown = (e) => {
+        if (e.key === 'Enter') input.blur();
+      };
+    }
     $('#roReset', node).onclick = async () => {
       if (!confirm('Forget what Auto learned from your tasks?')) return;
       await api('/router/reset', { method: 'POST', body: {} }).catch(toastError);

package/web/js/features/composer.js

@@ -5,7 +5,7 @@ import { mentionHtml } from '../mention-text.js';
 import { api } from '../core/api.js';
 import { $, el, icon } from '../core/dom.js';
 import { S } from '../core/state.js';
-import { popover } from '../ui/popover.js';
+import { clampToViewport, popover } from '../ui/popover.js';
 import { toast, toastError } from '../ui/toast.js';
 import { toggleDone } from './actions.js';
 import { acceptFiles, attachTray, autosize } from './attachments.js';
@@ -226,9 +226,7 @@ function queuedMenu(e, cancel) {
     if (a === 'cancel') cancel();
   };
   const close = popover(menu);
-  const r = menu.getBoundingClientRect();
-  if (r.right > innerWidth - 8) menu.style.left = `${innerWidth - r.width - 8}px`;
-  if (r.bottom > innerHeight - 8) menu.style.top = `${innerHeight - r.height - 8}px`;
+  clampToViewport(menu, e.clientX, e.clientY);
 }
 
 // Follow-ups sent while an agent works interrupt it, unless the user flipped this on.

package/web/js/features/feed.js

@@ -208,6 +208,7 @@ function renderHead(n, s) {
     <span class="it-side">
       ${pill}
       ${s.queued ? `<span class="q-queued" title="Follow-ups queued">+${s.queued}</span>` : ''}
+      ${autoPill(s)}
       ${s.shipping ? shipPill(s) : s.pr ? prPill(s.pr, s.conflictFix) : ''}
       ${s.team?.length ? teamStack(s.agent, s.team) : modelBadge(s.agent, s.model, s.effort, s.route?.switched ? null : s.route)}
       ${s.machine ? machinePill(s.machine) : ''}
@@ -218,6 +219,28 @@ function renderHead(n, s) {
     </span>`;
 }
 
+// What Auto found after the run: its own test check, the best-of-2 pick, a hand-over.
+function autoPill(s) {
+  const a = s.auto;
+  if (!a || s.pending) return '';
+  const out = [];
+  if (a.pick?.winner) out.push(`<span class="pill auto-pick" title="${esc(`wisp's pick of the two runs: ${a.pick.why}`)}">${icon('spark')}Pick</span>`);
+  if (a.escalatedTo) {
+    const to = S.sessions.get(a.escalatedTo);
+    const toName = to ? `${agentName(to.agent)}${to.model ? ` · ${to.model}` : ''}` : 'another pick';
+    const why = a.reason === 'limit' ? `${agentName(s.agent)} was at its usage limit, so wisp moved the task to ${toName}` : a.reason === 'error' ? `The run failed, so wisp handed the task to ${toName}` : `Tests still failed, so wisp handed the task to ${toName}`;
+    out.push(`<span class="pill auto-handed" title="${esc(why)}">${a.reason === 'limit' ? 'Moved on' : 'Handed on'}</span>`);
+  }
+  const c = a.check;
+  if (c && !a.busy && c.verdict !== 'skip') {
+    const n = c.newFailures || c.failed;
+    const tip = c.verdict === 'pass' ? `wisp ran ${c.command}: no new failures${c.note ? ` (${c.note})` : ''}` : c.verdict === 'fail' ? `wisp ran ${c.command}: ${n} test${n === 1 ? '' : 's'} that passed before now fail${a.repairs ? `, after ${a.repairs} repair round${a.repairs > 1 ? 's' : ''}` : ''}` : `wisp ran ${c.command}: ${c.note || "couldn't tell"}`;
+    const label = c.verdict === 'pass' ? 'Tests' : c.verdict === 'fail' ? `${n} failing` : 'Tests ?';
+    out.push(`<span class="pill auto-ck ck-${c.verdict}" title="${esc(tip)}">${icon(c.verdict === 'pass' ? 'check' : c.verdict === 'fail' ? 'x' : 'info')}${label}</span>`);
+  }
+  return out.join('');
+}
+
 // One run inside a compare task: the harness and model stand in for the title the task shows.
 function renderRunHead(n, s, { open, live, pill }) {
   const a = S.agents.find((x) => x.id === s.agent);
@@ -233,6 +256,7 @@ function renderRunHead(n, s, { open, live, pill }) {
       ${runsOf(s).some((r) => (r.machine?.id || '') !== (s.machine?.id || '')) ? `${s.machine ? machinePill(s.machine) : `<span class="q-machine" title="Runs on this computer">${icon('laptop')}<span>This computer</span></span>`}<span class="q-proj">${esc(s.project)}</span>` : ''}
       ${live && s.state === 'running' ? `<span class="pill st-running"><i></i>Working</span>` : pill}
       ${s.queued ? `<span class="q-queued" title="Follow-ups queued">+${s.queued}</span>` : ''}
+      ${autoPill(s)}
       ${s.shipping ? shipPill(s) : s.pr ? prPill(s.pr, s.conflictFix) : ''}
       <span class="q-time">${ago(s.updatedAt)}</span>
       ${icon('chevron', 'chev')}
@@ -257,7 +281,13 @@ function taskItem(t) {
   g.lead = t.id;
   const finished = t.runs.filter((r) => r.state === 'review' || r.state === 'done').length;
   const places = new Set(t.runs.map((r) => r.machine?.id || '')).size;
-  const status = t.state === 'waiting' ? 'A run is asking you' : t.state === 'running' ? `${finished} of ${t.runs.length} finished${places > 1 ? ` · on ${places} machines` : ''}` : t.state === 'done' ? 'Done' : places > 1 ? `All finished on ${places} machines` : 'All finished · pick one to keep';
+  // Auto's groups say what Auto did: which run it picked, or who it handed the task to.
+  const picked = t.runs.find((r) => r.auto?.pick?.winner);
+  const handed = t.runs.find((r) => r.auto?.escalatedFrom);
+  const runName = (r) => `${agentName(r.agent)}${r.model ? ` · ${r.model}` : ''}`;
+  const how = handed?.auto?.reason === 'limit' ? 'The first harness was at its usage limit, so wisp moved it to' : handed?.auto?.reason === 'error' ? 'The first run failed, so wisp handed it to' : 'Tests failed, so wisp handed it to';
+  const autoLine = picked ? `wisp's pick: ${picked.auto.pick.why}` : handed ? `${how} ${runName(handed)}${handed.auto?.check?.verdict === 'pass' ? ' · tests pass now' : handed.auto?.check?.verdict === 'fail' ? ' · still failing' : ''}` : '';
+  const status = t.state === 'waiting' ? 'A run is asking you' : t.state === 'running' ? `${finished} of ${t.runs.length} finished${places > 1 ? ` · on ${places} machines` : ''}` : t.state === 'done' ? 'Done' : autoLine || (places > 1 ? `All finished on ${places} machines` : 'All finished · pick one to keep');
   g.card.className = `task-item c-${t.color} st-${t.state} ${t.unread ? 'unread' : ''}`;
   g.head.innerHTML = `
     <span class="q-dot ${t.state === 'running' ? 'live' : ''} ${t.state === 'waiting' ? 'waiting' : ''}"></span>

package/web/js/features/live.js

@@ -7,7 +7,7 @@ import { $ } from '../core/dom.js';
 import { S, saveOpen, setAgents } from '../core/state.js';
 import { toast } from '../ui/toast.js';
 import { paintAutoBtn } from './automations.js';
-import { collapse, renderFeed, scheduleRefetch, sectionOf } from './feed.js';
+import { renderFeed, scheduleRefetch, sectionOf } from './feed.js';
 import { dropPending, renderLaunchChips } from './launcher.js';
 import { loadMachines, setMachines } from './machines.js';
 import { notifyFinished } from './notify.js';
@@ -34,12 +34,7 @@ export function connect() {
     // list and focus goes to the next one instead.
     const moved = prev && was !== sectionOf(s);
     const follow = moved && s.state !== 'done' && !s.archived && watching(s.id);
-    keepInPlace(follow ? S.nodes.get(s.id).card : feedAnchor(s.id), () => {
-      // A card left open while it worked shouldn't land in "Needs you" expanded —
-      // fold it unless the user is actually watching it.
-      if (prev?.state === 'running' && s.state !== 'running' && S.open.has(s.id) && !(watching(s.id) && document.hasFocus())) collapse(s.id);
-      renderFeed();
-    });
+    keepInPlace(follow ? S.nodes.get(s.id).card : feedAnchor(s.id), renderFeed);
     if (prev?.state !== s.state || prev?.queued !== s.queued) scheduleRefetch(s.id);
     if (JSON.stringify([prev?.pr, prev?.toShip, prev?.state, prev?.shipping]) !== JSON.stringify([s.pr, s.toShip, s.state, s.shipping])) renderPrStrip(s.id);
   });

package/web/js/features/projects.js

@@ -6,7 +6,7 @@ import * as bus from '../core/bus.js';
 import { $, $$, el, icon } from '../core/dom.js';
 import { launch, S, save, saveLaunch } from '../core/state.js';
 import { present } from '../ui/overlay.js';
-import { popover } from '../ui/popover.js';
+import { clampToViewport, popover } from '../ui/popover.js';
 import { toast, toastError, tryApi } from '../ui/toast.js';
 import { clones, isRepo, repoLabel, repoName, startClone } from './clones.js';
 import { feedToTop, renderFeed } from './feed.js';
@@ -146,10 +146,7 @@ function projectMenu(id, e) {
     }
   };
   const close = popover(menu);
-  // Keep the menu on-screen when right-clicking near the window edge.
-  const r = menu.getBoundingClientRect();
-  if (r.right > innerWidth - 8) menu.style.left = `${innerWidth - r.width - 8}px`;
-  if (r.bottom > innerHeight - 8) menu.style.top = `${innerHeight - r.height - 8}px`;
+  clampToViewport(menu, e.clientX, e.clientY);
 }
 
 const COLORS = ['violet', 'teal', 'amber', 'rose', 'sky', 'lime', 'orange', 'indigo'];

package/web/js/features/runners.js

@@ -17,14 +17,15 @@ export const DEFAULT_MODE = MODES[2];
 
 export const agentName = (id) => S.agents.find((a) => a.id === id)?.name || (id === 'auto' ? 'Auto' : id === 'wisp' ? 'wisp' : id);
 
-// Auto: not a CLI but wisp's router (server/router.js), which picks harness and model per task.
-// Its "models" are the goal it optimises for; there are no thinking levels to pick.
+// Auto: not a CLI but wisp's router (server/router.js), which picks harness, model and thinking
+// level per task. Its "models" are the goal it optimises for, which also sets the level band, so
+// there are no thinking levels to pick here.
 export const AUTO_GOALS = [
-  { id: 'balanced', label: 'Balanced', hint: 'Best result per dollar' },
-  { id: 'cheap', label: 'Cheap', hint: 'Lowest cost that still gets it done' },
-  { id: 'best', label: 'Best', hint: 'Best result; cost only breaks ties' },
+  { id: 'balanced', label: 'Balanced', hint: 'Best result per dollar · default or medium thinking' },
+  { id: 'cheap', label: 'Cheap', hint: 'Lowest cost that still gets it done · low thinking' },
+  { id: 'best', label: 'Best', hint: 'Best result; cost only breaks ties · high thinking' },
 ];
-export const AUTO = { id: 'auto', name: 'Auto', available: true, delegates: true, models: AUTO_GOALS, efforts: [], hint: 'wisp picks the harness and model from what worked before' };
+export const AUTO = { id: 'auto', name: 'Auto', available: true, delegates: true, models: AUTO_GOALS, efforts: [], hint: 'wisp picks the harness, model and thinking level from what worked before' };
 
 // Harness lists per place: '' is this computer, else a machine (what it reported when it came online).
 export const agentsAt = (k) => (k ? (machineById(k)?.state === 'online' && machineById(k).remote?.agents) || null : S.agents);

package/web/js/features/settings.js

@@ -78,7 +78,7 @@ export function openSettings(opts) {
           </div>
           <div class="sx-group">
             ${row('Worktree per task', 'Each task gets its own branch from origin/main, in git repos', '<button class="switch" id="wtDefault" role="switch"></button>')}
-            ${row('Fix PR conflicts', 'When a shipped PR conflicts with its base, the task merges the base in, resolves it and pushes', '<button class="switch" id="fixConflicts" role="switch"></button>')}
+            ${row('Auto-fix PR conflicts', 'Without waiting for a click on Fix conflicts: when a shipped PR conflicts with its base, the task merges the base in, resolves it and pushes', '<button class="switch" id="fixConflicts" role="switch"></button>')}
           </div>
         </section>
         <section class="sx-pane" data-pane="notifications">
@@ -101,6 +101,13 @@ export function openSettings(opts) {
             ${row('Try new models', 'A new model or harness gets a few tasks that aren’t marked important before Auto relies on it', '<button class="switch" id="roExplore" role="switch"></button>')}
             ${row('Harnesses it may use', 'Leave all off to let Auto use every one you have', '<span class="ro-allowed"></span>')}
           </div>
+          <div class="sx-group">
+            ${row('Check with the tests', 'When the agent says it’s done, wisp runs the project’s tests itself. Only failures that are new count', '<button class="switch" id="roCheck" role="switch"></button>')}
+            ${row('Repair rounds', 'Failing tests go back to the same agent this many times', `<span class="pk-seg ro-repairs">${[0, 1, 2].map((n) => `<button data-n="${n}">${n}</button>`).join('')}</span>`)}
+            ${row('Hand over when it still fails', 'The task runs again on a stronger pick, next to the first run', '<button class="switch" id="roEscalate" role="switch"></button>')}
+            ${row('Best of two', 'Off by default. With the Best goal, two picks work side by side and wisp marks the better one', '<button class="switch" id="roBest2" role="switch"></button>')}
+            ${row('Scout first', 'A cheap model looks around the repo and tells the agent where to start', `<span class="pk-seg ro-scout">${[['off', 'Off'], ['big', 'Bigger tasks'], ['all', 'Every task']].map(([v, l]) => `<button data-v="${v}">${l}</button>`).join('')}</span>`)}
+          </div>
           <div class="sx-group">
             ${row('What it learned', '<span class="ro-hint"></span>', '<button class="ghost sm" id="openRouter">Open</button>')}
           </div>
@@ -302,10 +309,10 @@ export function openSettings(opts) {
     if (!saved) return;
     paintWt();
   const fc = $('#fixConflicts', node);
-  const paintFc = () => fc.setAttribute('aria-checked', S.config.defaults.fixConflicts !== 'off');
+  const paintFc = () => fc.setAttribute('aria-checked', S.config.defaults.fixConflicts === 'on');
   fc.onclick = async () => {
     const was = S.config.defaults.fixConflicts;
-    S.config.defaults.fixConflicts = was === 'off' ? 'on' : 'off';
+    S.config.defaults.fixConflicts = was === 'on' ? 'off' : 'on';
     paintFc();
     const saved = await tryApi(() => api('/config', { method: 'PATCH', body: { defaults: { fixConflicts: S.config.defaults.fixConflicts } } }));
     if (!saved) {
@@ -323,13 +330,18 @@ export function openSettings(opts) {
     if (!r || !node.isConnected) return;
     $$('.ro-goal button', node).forEach((b) => b.classList.toggle('on', b.dataset.goal === r.goal));
     $('#roExplore', node).setAttribute('aria-checked', r.settings.explore);
+    $('#roCheck', node).setAttribute('aria-checked', r.settings.check);
+    $('#roEscalate', node).setAttribute('aria-checked', r.settings.escalate);
+    $('#roBest2', node).setAttribute('aria-checked', r.settings.best2);
+    $$('.ro-repairs button', node).forEach((b) => b.classList.toggle('on', Number(b.dataset.n) === r.settings.repairs));
+    $$('.ro-scout button', node).forEach((b) => b.classList.toggle('on', b.dataset.v === r.settings.scout));
     const allowed = r.settings.allowed || [];
     $('.ro-allowed', node).innerHTML = S.agents
       .filter((a) => a.available)
       .map((a) => `<button class="chip-tog${allowed.includes(a.id) ? ' on' : ''}" data-id="${esc(a.id)}" aria-pressed="${allowed.includes(a.id)}" title="${esc(a.name)}"><span class="model-logo">${harnessLogo(a.id)}</span>${esc(a.name)}</button>`)
       .join('');
     $('.ro-hint', node).textContent = r.learned
-      ? `${r.learned} task${r.learned === 1 ? '' : 's'} learned from · ${r.arms.filter((a) => a.state !== 'gone').length} harness · model pairs`
+      ? `${r.learned} task${r.learned === 1 ? '' : 's'} learned from · ${r.arms.filter((a) => a.state !== 'gone').length} harness · model · level options`
       : `Nothing of yours yet · starting from wisp-bench (${r.priors.version})`;
   };
   const patchAuto = async (body) => {
@@ -349,10 +361,24 @@ export function openSettings(opts) {
       patchAuto({ goal: b.dataset.goal });
     }
   };
-  $('#roExplore', node).onclick = (e) => {
-    const on = e.currentTarget.getAttribute('aria-checked') !== 'true';
-    e.currentTarget.setAttribute('aria-checked', on);
-    patchAuto({ explore: on });
+  for (const [id, key] of [['#roExplore', 'explore'], ['#roCheck', 'check'], ['#roEscalate', 'escalate'], ['#roBest2', 'best2']]) {
+    $(id, node).onclick = (e) => {
+      const on = e.currentTarget.getAttribute('aria-checked') !== 'true';
+      e.currentTarget.setAttribute('aria-checked', on);
+      patchAuto({ [key]: on });
+    };
+  }
+  $('.ro-repairs', node).onclick = (e) => {
+    const b = e.target.closest('[data-n]');
+    if (!b) return;
+    $$('.ro-repairs button', node).forEach((x) => x.classList.toggle('on', x === b));
+    patchAuto({ repairs: Number(b.dataset.n) });
+  };
+  $('.ro-scout', node).onclick = (e) => {
+    const b = e.target.closest('[data-v]');
+    if (!b) return;
+    $$('.ro-scout button', node).forEach((x) => x.classList.toggle('on', x === b));
+    patchAuto({ scout: b.dataset.v });
   };
   $('.ro-allowed', node).onclick = (e) => {
     const b = e.target.closest('[data-id]');

package/web/js/features/ship.js

@@ -69,18 +69,45 @@ export function renderPrStrip(id) {
     <a href="${esc(pr.url)}" target="_blank" class="pr-num">PR #${pr.number}</a>
     <span class="pr-line">${esc(prLine(pr, s.conflictFix))}</span>
     <span class="grow"></span>
-    ${pr.state === 'OPEN' && pr.conflict && s.conflictFix?.step === 'failed' ? `<button class="ghost xs" data-pr="fix" title="Ask the agent to merge the base in and resolve the conflicts again">${icon('replay')}<span>Fix conflicts</span></button>` : ''}
+    ${pr.state === 'OPEN' && pr.conflict && !fixing(s.conflictFix) && s.state !== 'running' ? `<button class="ghost xs pr-fix" data-pr="fix" title="Send the task a follow-up to merge the base in and resolve the conflicts; wisp pushes the fix to the PR">${icon('merge')}<span>Fix conflicts</span></button>` : ''}
     ${pr.state === 'OPEN' ? `<button class="ghost xs" data-pr="refresh" title="Check now (wisp also checks every minute)">${icon('replay')}</button>` : ''}
     <a class="ghost xs" href="${esc(pr.url)}" target="_blank">${icon('external')}<span>GitHub</span></a>
     ${pr.state === 'OPEN' && !pr.conflict ? `<button class="ghost xs pr-merge" data-pr="merge" title="Squash-merge, then fast-forward your local ${esc(s.branch ? 'base branch' : 'checkout')}">${icon('check')}<span>Merge</span></button>` : ''}`;
   node.onclick = (e) => {
     const a = e.target.closest('[data-pr]')?.dataset.pr;
-    if (a === 'refresh') api(`/sessions/${id}/pr`, { method: 'POST', body: {} }).catch(toastError);
+    if (a === 'refresh') refreshPr(id, e.target.closest('[data-pr]'));
     if (a === 'merge') mergePr(id);
-    if (a === 'fix') api(`/sessions/${id}/fix-conflicts`, { method: 'POST', body: {} }).catch(toastError);
+    if (a === 'fix') fixPr(id);
   };
 }
 
+// Check now: the button spins at once and stops when the answer (pushed as a summary) is in.
+function refreshPr(id, btn) {
+  btn.classList.add('busy');
+  btn.disabled = true;
+  api(`/sessions/${id}/pr`, { method: 'POST', body: {} })
+    .catch(toastError)
+    .finally(() => {
+      btn.classList.remove('busy');
+      btn.disabled = false;
+    });
+}
+
+// Fix conflicts: the row flips to "Fixing merge conflicts" at once; a refusal puts it back.
+function fixPr(id) {
+  const s = S.sessions.get(id);
+  if (!s) return;
+  const was = s.conflictFix;
+  s.conflictFix = { ...was, step: 'fixing', why: '' };
+  renderPrStrip(id);
+  api(`/sessions/${id}/fix-conflicts`, { method: 'POST', body: {} }).catch((err) => {
+    const now = S.sessions.get(id);
+    if (now?.conflictFix?.step === 'fixing') now.conflictFix = was;
+    renderPrStrip(id);
+    toastError(err);
+  });
+}
+
 // The in-flight row: the stages as a track that fills in as the server reports them. Built once
 // and updated in place, so its entry animation and shimmer don't restart with every summary.
 function renderShipRun(node, id, run) {

package/web/js/features/turns.js

@@ -19,7 +19,7 @@ import { scrollByPx, watching } from './scroll.js';
 import { renderPrStrip, shipDialog } from './ship.js';
 import { copiesOf, memberLabel, renderSubs, subKey, teamLiveHtml, teamSize } from './team.js';
 
-const KIND_ICON = { read: 'read', edit: 'pen', run: 'terminal', search: 'search', web: 'web', agent: 'agent', plan: 'plan', tool: 'tool', text: 'text', error: 'warn', ask: 'ask', answer: 'check', wait: 'ask', background: 'clock' };
+const KIND_ICON = { check: 'check', read: 'read', edit: 'pen', run: 'terminal', search: 'search', web: 'web', agent: 'agent', plan: 'plan', tool: 'tool', text: 'text', error: 'warn', ask: 'ask', answer: 'check', wait: 'ask', background: 'clock' };
 
 export function ctxFor(s, turn, isLatest) {
   return {
@@ -169,7 +169,7 @@ function renderFoldedTurn(t, unfold) {
     <article class="turn folded" data-turn="${t.id}">
       <button class="t-fold" title="Show this exchange">
         ${icon('chevron', 'chev')}
-        <span class="t-prompt">${mentionHtml(esc(t.prompt.replace(/\s+/g, ' ')), { link: false })}</span>
+        <span class="t-prompt">${t.by === 'wisp' ? '<b class="t-by">wisp</b> ' : ''}${mentionHtml(esc(t.prompt.replace(/\s+/g, ' ')), { link: false })}</span>
         ${t.rolledBackAt ? '<span class="rev-tag">Rolled back</span>' : ''}
         ${hero?.title ? `<span class="t-result">${esc(hero.title)}</span>` : ''}
         <time>${new Date(t.startedAt).toLocaleString([], { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' })}</time>
@@ -194,7 +194,8 @@ function renderTurn(s, t, isLatest, fold) {
   const cp = t.checkpoint;
   const cpLabel = cp?.head ? `${cp.branch ? `${cp.branch}@` : ''}${cp.head.slice(0, 7)}${cp.dirty ? '*' : ''}` : '';
   const ask = el(`
-    <div class="ask">
+    <div class="ask${t.by === 'wisp' ? ' by-wisp' : ''}">
+      ${t.by === 'wisp' ? `<div class="ask-by">${icon('spark')}Sent by wisp after its test run</div>` : ''}
       <div class="ask-text ${long ? 'clamped' : ''}">${mentionHtml(esc(t.prompt))}</div>
       ${long ? '<button class="link xs more-btn">Show all</button>' : ''}
       ${t.attachments?.length ? `<div class="ask-atts">${t.attachments.map((a) => (a.mime?.startsWith('image/') ? `<img src="/api/uploads/${a.id}" alt="${esc(a.name)}" title="${esc(a.name)}">` : `<a class="att-pill" href="/api/uploads/${a.id}" target="_blank">${icon('file')}${esc(a.name)}</a>`)).join('')}</div>` : ''}

package/web/js/ui/popover.js

@@ -50,3 +50,13 @@ export function popover(node, { anchor, keep, capture = false, onClose } = {}) {
   document.body.append(node);
   return close;
 }
+
+// Keep a right-click menu at the pointer but on-screen near the window edges. Reads offset
+// sizes: the menu's pop-in animation starts scaled down, so its bounding box is too small
+// on the first frame and the last items would end up below the fold.
+export function clampToViewport(node, x, y) {
+  const w = node.offsetWidth;
+  const h = node.offsetHeight;
+  node.style.left = `${Math.max(8, Math.min(x, innerWidth - w - 8))}px`;
+  node.style.top = `${Math.max(8, Math.min(y, innerHeight - h - 8))}px`;
+}