wisp-agents 0.9.0 → 0.10.0

package/CHANGELOG.md

@@ -5,6 +5,20 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 
 ## [Unreleased]
 
+## [0.10.0] - 2026-10-18
+
+### Added
+
+- Machines finds hosts for you. **Found on this computer** lists the hosts this computer already reaches: `Host` entries in `~/.ssh/config`, your Tailscale peers (`tailscale status --json`, with an online dot; phones and tablets are skipped) and hosts in `~/.ssh/known_hosts` (code hosts such as github.com, hashed entries and non-default ports are skipped). Hosts you've already added aren't listed. Click one to fill in the form, then press Connect. The SSH host field suggests the same hosts. API: `GET /api/machines/discover`.
+
+### Changed
+
+- Ship it only shows when there is something to ship. It used to sit on every finished worktree task, even one that changed nothing or whose work was already on its PR. Now it appears (on the card bar, next to the composer, in the right-click menu, in ⌘K and on `S`) only if the worktree has uncommitted changes or commits its PR doesn't have yet. **Push to PR #N** shows only when there are new changes to push. wisp checks the worktree when a turn ends, after Ship it, a revert, a rollback or an action command, and at startup. Summaries carry it as `toShip: { dirty, ahead, unpushed }`.
+
+### Fixed
+
+- Updating from the top-bar Update button now restarts wisp on the port it was running on. Before, a wisp started with `--port` came back on 4477 and the open tab said "wisp did not come back".
+
 ## [0.9.0] - 2026-10-18
 
 ### Added
@@ -176,7 +190,8 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 - Session queue with follow-ups, answers to agent questions, terminal takeover and mark-as-done.
 - Older turns are folded, with a floating collapse-all button and back-to-top.
 
-[Unreleased]: https://github.com/M0xoo/wisp/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/M0xoo/wisp/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/M0xoo/wisp/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/M0xoo/wisp/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/M0xoo/wisp/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/M0xoo/wisp/compare/v0.6.0...v0.7.0

package/README.md

@@ -53,7 +53,7 @@ From there you can **follow up**, **answer its questions**, **take it over** in
 | 🤝 **Subagents** | Give the lead agent a team on other harnesses (e.g. Claude Code hands tests to Codex ×3). It delegates through a `delegate` tool; their edits land in its worktree. See [Subagents](#subagents). |
 | ⏪ **Checkpoints & rollback** | Every turn is snapshotted first. Restore to before any turn, revert a single file, or re-run a command block from the presentation. |
 | ⚖️ **Compare** | Run one task on two harnesses side by side, and keep the better run. |
-| 🧾 **Recipes & triggers** | Saved prompts with `{params}` (`wisp run release 0.9.0`), run by hand, on a schedule, when CI fails, or when an issue is labelled. |
+| 🧾 **Recipes & triggers** | Saved prompts with `{params}` (`wisp run release 0.10.0`), run by hand, on a schedule, when CI fails, or when an issue is labelled. |
 | 📊 **Usage** | Spend, success rate and questions per project and per harness · model. |
 | 📱 **Phone** | Questions and finished tasks on ntfy or Telegram; answer from there. |
 | 🔐 **Permission modes** | Choose **Plan** (read-only), **Edits** (file edits auto-accepted), or **Full auto** for each launch. `Shift+Tab` in the prompt cycles modes. |
@@ -125,7 +125,7 @@ wisp reply <id> "also do X"       # follow up (answers a pending question)
 wisp stop <id>
 wisp ship <id> [--draft]          # commit, push and open a PR for a worktree task
 wisp merge <id>                   # squash-merge its PR, fast-forward your local main
-wisp run release 0.9.0            # run a recipe; values fill its {params} (or version=0.9.0)
+wisp run release 0.10.0            # run a recipe; values fill its {params} (or version=0.10.0)
 wisp recipes                      # list recipes
 wisp usage [--days 7]             # spend and outcomes
 wisp mcp                          # MCP server for other agents and editors
@@ -305,7 +305,7 @@ Before each turn, wisp snapshots the git working tree (pinned at `refs/wisp/chec
 Prepare release {version}: update CHANGELOG, README and docs/, bump package.json, tag v{version}.
 ```
 
-Make one from ⌘K → *Recipes*, or *Save as recipe…* on any card. A recipe may pin a project, harness, model and mode. Run it from ⌘K (*Run: Release*), from the Recipes view, or from a terminal: `wisp run release 0.9.0` fills the fields in order, `wisp run release version=0.9.0` by name.
+Make one from ⌘K → *Recipes*, or *Save as recipe…* on any card. A recipe may pin a project, harness, model and mode. Run it from ⌘K (*Run: Release*), from the Recipes view, or from a terminal: `wisp run release 0.10.0` fills the fields in order, `wisp run release version=0.10.0` by name.
 
 **Triggers** launch sessions on their own while wisp is open (⌘K → *Triggers*):
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wisp-agents",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Launch coding agents, skip the transcript, read the presentation.",
   "type": "module",
   "bin": {

package/server/git.js

@@ -93,12 +93,15 @@ export async function ensureWorktree(wt) {
   await git(wt.root, ['worktree', 'add', '--quiet', wt.path, wt.branch]);
 }
 
-// { dirty: changed paths, ahead: commits past the base, exists }
+// { dirty: changed paths, ahead: commits past the base, unpushed: commits not on the remote branch, exists }
 export async function worktreeStatus(wt) {
-  if (!wt || !fs.existsSync(wt.path)) return { exists: false, dirty: 0, ahead: 0 };
+  if (!wt || !fs.existsSync(wt.path)) return { exists: false, dirty: 0, ahead: 0, unpushed: 0 };
   const porcelain = await quiet(git(wt.path, ['status', '--porcelain']));
   const ahead = Number(await quiet(git(wt.path, ['rev-list', '--count', `${wt.baseRef}..HEAD`]))) || 0;
-  return { exists: true, dirty: porcelain ? porcelain.split('\n').length : 0, ahead };
+  const pushed = wt.remote && `refs/remotes/${wt.remote}/${wt.branch}`;
+  const tracked = pushed && (await quiet(git(wt.path, ['rev-parse', '--verify', '--quiet', pushed])));
+  const unpushed = tracked ? Number(await quiet(git(wt.path, ['rev-list', '--count', `${pushed}..HEAD`]))) || 0 : ahead;
+  return { exists: true, dirty: porcelain ? porcelain.split('\n').length : 0, ahead, unpushed };
 }
 
 // force: drop uncommitted work too. The branch goes only when nothing would be lost with it.

package/server/index.js

@@ -22,7 +22,7 @@ import { createWorktree, worktreeSource, ensureWorktree, removeWorktree, worktre
 import { normalizeRecipe, findRecipe, recipeView, fill, positional } from './recipes.js';
 import { Triggers, normalizeTrigger, triggerView } from './triggers.js';
 import { Remote } from './remote.js';
-import { Machines, splitId, qualify, sshHosts } from './machines.js';
+import { Machines, splitId, qualify, sshHosts, discoverHosts } from './machines.js';
 import { usage } from './usage.js';
 import { normalizeTeam, normalizePreset, delegationReport } from './subagents.js';
 
@@ -54,6 +54,7 @@ export const API_VERSION = 1;
 const settled = (s) => s.state === 'waiting' || (s.state !== 'running' && !s.queue?.length);
 const IMAGE_EXT = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg']);
 const PR_POLL_MS = 60_000;
+const SHIP_RECHECK_MS = 5_000;
 const MAX_COMPARE = 4;
 const MODES = new Set(['plan', 'edits', 'auto']);
 const bad = (msg, status = 400) => Object.assign(new Error(msg), { status });
@@ -304,6 +305,38 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
     return s && { s: machines.session(at.machine, s), answer: (a) => call('POST', '/answer', { text: a }), reply: (t) => call('POST', '/reply', { text: t }), done: async () => !live && !!(await call('PATCH', '', { state: 'done' })) };
   }
 
+  // Ship it shows only when the worktree has something to ship: uncommitted changes, or commits
+  // not yet pushed. Rechecked whenever wisp might have changed the worktree.
+  const checkShip = async (s) => {
+    if (!s?.worktree || s.parentId) return;
+    const { dirty, ahead, unpushed } = await worktreeStatus(s.worktree);
+    const next = { dirty, ahead, unpushed };
+    if (JSON.stringify(next) === JSON.stringify(s.toShip)) return;
+    s.toShip = next;
+    store.save(s);
+    broadcast('summary', summarize(s, store));
+  };
+  // One check at a time per session (one asked for meanwhile runs right after); `lazy` (a card
+  // fetching its session) skips running sessions and runs at most every few seconds.
+  const shipChecks = new Map(); // id → true while checking, 'again' if another check is due
+  const shipCheckedAt = new Map();
+  const recheckShip = (s, { lazy = false } = {}) => {
+    if (!s?.worktree || s.parentId) return;
+    if (lazy && (runner.live.has(s.id) || shipChecks.has(s.id) || Date.now() - (shipCheckedAt.get(s.id) || 0) < SHIP_RECHECK_MS)) return;
+    if (shipChecks.has(s.id)) return void shipChecks.set(s.id, 'again');
+    shipChecks.set(s.id, true);
+    shipCheckedAt.set(s.id, Date.now());
+    checkShip(s)
+      .catch(() => {})
+      .finally(() => {
+        const again = shipChecks.get(s.id) === 'again';
+        shipChecks.delete(s.id);
+        if (again) recheckShip(s);
+      });
+  };
+  runner.on('ended', ({ session }) => recheckShip(store.get(session.id)));
+  for (const s of store.all()) if (s.worktree && !s.archived && s.pr?.state !== 'MERGED') recheckShip(s);
+
   // Ship it: follow open PRs (checks, reviews, merges) so their cards stay current.
   const refreshPr = async (s) => {
     if (!s.pr || !s.worktree) return s.pr;
@@ -717,6 +750,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
 
       if (!action) {
         // A lead comes with its subagents' sessions, so its cards can show their reports and diffs.
+        if (m === 'GET') recheckShip(s, { lazy: true }); // edits made outside wisp (in an editor) show up too
         if (m === 'GET') return send(res, 200, s.children ? { ...s, childSessions: Object.fromEntries(Object.values(s.children).map((cid) => [cid, store.get(cid)]).filter(([, c]) => c)) } : s);
         if (m === 'PATCH') {
           const body = await readJson(req);
@@ -829,6 +863,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
         broadcast('summary', summarize(s, store));
         broadcast('turn', { sessionId: s.id, turnId: turn.id });
         telemetry.track('revert_file', { agent: s.agent, restore: !!restore });
+        recheckShip(s);
         return send(res, 200, { ok: true, turnId: turn.id, ...result });
       }
 
@@ -847,6 +882,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
         broadcast('summary', summarize(s, store));
         broadcast('turn', { sessionId: s.id, turnId: turn.id });
         telemetry.track('rollback_turn', { agent: s.agent, restore: !!restore });
+        recheckShip(s);
         return send(res, 200, { ok: true, turnId: turn.id, ...result });
       }
 
@@ -869,6 +905,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
           broadcast('turn', { sessionId: s.id, turnId: turn.id });
         }
         telemetry.track('exec_action', { agent: s.agent, exitCode: resExec.exitCode });
+        recheckShip(s);
         return send(res, 200, resExec);
       }
 
@@ -902,7 +939,10 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
       // commit, push, open or update the PR.
       if (action === 'ship') {
         if (!s.worktree) return send(res, 400, { error: 'Ship it works on worktree sessions: launch with a worktree to get one.' });
-        if (m === 'GET') return send(res, 200, { branch: s.worktree.branch, base: s.worktree.base, remote: s.worktree.remote, ...(await worktreeStatus(s.worktree)), pr: s.pr || null, ...shipDraft(s) });
+        if (m === 'GET') {
+          recheckShip(s);
+          return send(res, 200, { branch: s.worktree.branch, base: s.worktree.base, remote: s.worktree.remote, ...(await worktreeStatus(s.worktree)), pr: s.pr || null, ...shipDraft(s) });
+        }
         if (m === 'POST') {
           if (runner.live.has(s.id)) return send(res, 409, { error: 'Still working: wait for it to finish, or stop it.' });
           const body = await readJson(req);
@@ -911,6 +951,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
           telemetry.track('ship', { agent: s.agent, draft: !!body.draft });
           store.save(s, { now: true });
           broadcast('summary', summarize(s, store));
+          recheckShip(s);
           return send(res, 200, s.pr);
         }
       }
@@ -963,6 +1004,7 @@ export async function startServer({ port = 4477, host = '127.0.0.1', handleSigna
       return send(res, 201, one(x.id));
     }
     if (id === 'ssh-hosts' && m === 'GET') return send(res, 200, sshHosts());
+    if (id === 'discover' && m === 'GET') return send(res, 200, await discoverHosts());
     machines.get(id); // 404s
     if (!action && m === 'PATCH') return send(res, 200, (await machines.update(id, await readJson(req)), one(id)));
     if (!action && m === 'DELETE') {

package/server/machines.js

@@ -19,7 +19,7 @@ import os from 'node:os';
 import path from 'node:path';
 import readline from 'node:readline';
 import { randomBytes } from 'node:crypto';
-import { spawn, killTree } from './proc.js';
+import { spawn, execFile, killTree } from './proc.js';
 
 export const DEFAULT_PORT = 4477;
 const READY_TIMEOUT_MS = 6 * 60_000; // the first `npx` download can take a while
@@ -151,6 +151,70 @@ export function sshHosts(file = path.join(os.homedir(), '.ssh', 'config'), seen
   return [...uniq.values()];
 }
 
+// Code hosts you push to, not computers to run agents on.
+const FORGE = /(^|\.)(github\.com|gitlab\.com|bitbucket\.org|ssh\.dev\.azure\.com|vs-ssh\.visualstudio\.com|heroku\.com|codeberg\.org|sr\.ht)$/i;
+
+// Hosts you've already SSHed to, from ~/.ssh/known_hosts. Hashed entries and ones on a
+// non-default port ([host]:2222, which a bare target can't express) are skipped.
+export function knownHosts(file = path.join(os.homedir(), '.ssh', 'known_hosts')) {
+  let text = '';
+  try {
+    text = fs.readFileSync(file, 'utf8');
+  } catch {
+    return [];
+  }
+  const out = new Map();
+  for (const raw of text.split(/\r?\n/)) {
+    const line = raw.trim();
+    if (!line || line.startsWith('#') || line.startsWith('@') || line.startsWith('|')) continue;
+    const names = line.split(/\s+/)[0].split(',').filter((n) => n && !n.startsWith('[') && !/[*?!]/.test(n));
+    // "devbox,10.0.0.5": the name, with the address as a detail.
+    const host = names.find((n) => !/^[\d.]+$|:/.test(n)) || names[0];
+    if (!host || FORGE.test(host) || /^(localhost|127\.|::1$)/.test(host) || !TARGET.test(host)) continue;
+    if (!out.has(host)) out.set(host, { host, hostname: names.find((n) => n !== host) || '' });
+  }
+  return [...out.values()];
+}
+
+const TAILSCALE_BINS = ['tailscale', '/Applications/Tailscale.app/Contents/MacOS/Tailscale'];
+
+// Peers on your tailnet, from `tailscale status --json`. Phones and tablets don't run agents.
+export function tailscalePeers({ bin = process.env.WISP_TAILSCALE, timeout = 3_000 } = {}) {
+  const bins = bin ? [bin] : TAILSCALE_BINS;
+  const run = (i) =>
+    new Promise((resolve) => {
+      if (i >= bins.length) return resolve([]);
+      execFile(bins[i], ['status', '--json'], { timeout, maxBuffer: 8 << 20 }, (err, stdout) => {
+        if (err) return resolve(err.code === 'ENOENT' ? run(i + 1) : []);
+        try {
+          const peers = Object.values(JSON.parse(stdout).Peer || {});
+          resolve(
+            peers
+              .filter((p) => !/^(ios|android|tvos)$/i.test(p.OS || ''))
+              .map((p) => ({ host: (p.DNSName || '').replace(/\.$/, '') || p.TailscaleIPs?.[0] || '', name: p.HostName || '', os: p.OS || '', online: !!p.Online }))
+              .filter((p) => p.host && TARGET.test(p.host)),
+          );
+        } catch {
+          resolve([]);
+        }
+      });
+    });
+  return run(0);
+}
+
+// Every host this computer already knows how to reach, for "Found on this computer" in Machines.
+// One entry per target: ~/.ssh/config first (your own names), then the tailnet, then known_hosts.
+export async function discoverHosts({ sshDir = path.join(os.homedir(), '.ssh'), tailscale } = {}) {
+  const out = new Map();
+  const put = (x) => {
+    if (x.target && !out.has(x.target)) out.set(x.target, x);
+  };
+  for (const h of sshHosts(path.join(sshDir, 'config'))) put({ target: h.host, name: h.host, source: 'ssh-config', detail: [h.user, h.hostname].filter(Boolean).join('@') });
+  for (const p of await tailscalePeers(tailscale)) put({ target: p.host, name: p.name || p.host.split('.')[0], source: 'tailscale', detail: [p.os, p.online ? 'online' : 'offline'].filter(Boolean).join(' · '), online: p.online });
+  for (const h of knownHosts(path.join(sshDir, 'known_hosts'))) put({ target: h.host, name: /^[\d.]+$/.test(h.host) ? h.host : h.host.split('.')[0], source: 'known-hosts', detail: h.hostname });
+  return [...out.values()].sort((a, b) => (b.online === false ? 0 : 1) - (a.online === false ? 0 : 1));
+}
+
 const freePort = () =>
   new Promise((resolve, reject) => {
     const s = net.createServer().once('error', reject);

package/server/openapi.js

@@ -151,6 +151,7 @@ export function openapi({ version, port }) {
           responses: { 201: json({ type: 'object' }), 400: err[400] },
         },
       },
+      '/machines/discover': { get: { summary: 'Hosts this computer can reach: ~/.ssh/config, Tailscale peers, ~/.ssh/known_hosts', responses: { 200: json({ type: 'array', items: { type: 'object' } }) } } },
       '/machines/ssh-hosts': { get: { summary: 'Hosts from ~/.ssh/config, for suggestions', responses: { 200: json({ type: 'array', items: { type: 'object' } }) } } },
       '/machines/{mid}': { parameters: [{ name: 'mid', in: 'path', required: true, schema: { type: 'string' } }], patch: { summary: 'Edit a machine (host, port or command changes reconnect)', responses: { 200: json({ type: 'object' }) } }, delete: { summary: 'Remove a machine and its projects here (nothing on the machine is touched)', responses: { 200: json({ type: 'object' }) } } },
       '/machines/{mid}/connect': { parameters: [{ name: 'mid', in: 'path', required: true, schema: { type: 'string' } }], post: { summary: 'Connect: SSH in, start wisp there if needed, open the tunnel', responses: { 200: json({ type: 'object' }) } } },

package/server/runner.js

@@ -67,6 +67,7 @@ export function summarize(s, store) {
     asks: !!s.ask || !!last?.presentation?.blocks?.some((b) => b.type === 'question'),
     question: s.ask?.question || '',
     branch: s.worktree?.branch || '',
+    toShip: s.toShip || null, // { dirty, ahead, unpushed } of the worktree, null until checked
     pr: s.pr ? { number: s.pr.number, url: s.pr.url, state: s.pr.state, draft: s.pr.draft, review: s.pr.review, checks: s.pr.checks } : null,
     groupId: s.groupId || null,
     origin: s.origin || null, // { kind: 'recipe' | 'trigger', id, name }

package/server/update.js

@@ -88,12 +88,16 @@ export class Updater {
       this.set({ status: 'idle', error: err.message });
       throw err;
     }
-    const args = process.versions.electron ? '' : ' --browser --no-open'; // desktop: reopen the app; browser: keep the tab
-    const node = JSON.stringify(process.versions.electron ? 'node' : process.execPath);
-    const relaunch = this.method === 'npx' ? `npx -y ${PKG.name}@latest${args}` : `${node} ${JSON.stringify(path.join(ROOT, 'bin', 'wisp.js'))}${args}`;
-    handOff(this.port, relaunch);
+    handOff(this.port, this.relaunchCommand());
     this.set({ status: 'restarting' });
   }
+
+  // Same port as now (wisp may have been started with --port), so the open tab finds it again.
+  relaunchCommand(electron = !!process.versions.electron) {
+    const args = `${electron ? '' : ' --browser --no-open'} --port ${this.port}`; // desktop: reopen the app; browser: keep the tab
+    const node = JSON.stringify(electron ? 'node' : process.execPath);
+    return this.method === 'npx' ? `npx -y ${PKG.name}@latest${args}` : `${node} ${JSON.stringify(path.join(ROOT, 'bin', 'wisp.js'))}${args}`;
+  }
 }
 
 function run(cmd) {

package/web/css/app.css

@@ -1455,6 +1455,13 @@ pre.code { margin: 0 0 12px; padding: 12px 14px; border-radius: 10px; background
 .mc-add { margin-top: 12px; }
 .mc-add h4 { margin-top: 18px; }
 .mc-new { height: 32px; }
+.mc-found { margin-bottom: 14px; }
+.mc-found h4 { margin: 0 0 8px; }
+.mc-found-list { display: flex; flex-wrap: wrap; gap: 6px; }
+.mc-found .lp-chip .i { width: 14px; height: 14px; color: var(--muted); }
+.mc-found .lp-chip.off { color: var(--muted); }
+.mc-fdot { width: 7px; height: 7px; border-radius: 50%; background: var(--good); }
+.lp-chip.off .mc-fdot { background: var(--faint); }
 .mc-form { display: flex; flex-direction: column; gap: 10px; }
 .mc-row { display: flex; gap: 10px; }
 .mc-field { display: flex; flex-direction: column; gap: 5px; width: 150px; min-width: 0; }

package/web/js/app.js

@@ -1633,7 +1633,6 @@ function renderBody(id, { fresh }) {
     ${s.origin ? `<span class="m" title="Launched by a ${esc(s.origin.kind)}">${icon(s.origin.kind === 'trigger' ? 'replay' : 'spark')}${esc(s.origin.name)}</span>` : ''}`;
   const live = s.state === 'running' || s.state === 'waiting';
   // Ship sits in the top bar and again next to the composer, so it's there after reading the result.
-  $$('[data-a="ship"]', body).forEach((b) => (b.hidden = !s.worktree || live || s.agent === 'wisp' || s.pr?.state === 'MERGED'));
   renderPrStrip(id);
   $$('[data-a="done"]', body).forEach((b) => {
     b.classList.toggle('on', s.state === 'done');
@@ -2438,7 +2437,7 @@ function taskMenu(id, e) {
       ${S.open.has(id) ? `<button data-a="collapse">${icon('chevron')}Collapse${keyHint('O')}</button>` : `<button data-a="open">${icon('chevron')}Open${keyHint('O')}</button>`}
       <button data-a="rename">${icon('pen')}Rename${keyHint('M')}</button>
       <button data-a="rerun">${icon('rerun')}Rerun…${keyHint('⇧R')}</button>
-      ${s.branch && !busy && s.pr?.state !== 'MERGED' ? `<button data-a="ship">${icon('send')}${s.pr?.state === 'OPEN' ? `Push to PR #${s.pr.number}` : 'Ship it…'}${keyHint('S')}</button>` : ''}
+      ${shippable(s) ? `<button data-a="ship">${icon('send')}${shipLabel(s)}${keyHint('S')}</button>` : ''}
       ${s.pr?.state === 'OPEN' ? `<button data-a="merge">${icon('check')}Merge PR #${s.pr.number}…</button>` : ''}
       ${s.groupId ? `<button data-a="compare"><b class="vs-mark">vs</b>Compare runs</button>` : ''}
       <button data-a="recipe">${icon('spark')}Save as recipe…</button>
@@ -2837,6 +2836,15 @@ function prLine(pr) {
   const state = pr.state === 'MERGED' ? 'Merged' : pr.state === 'CLOSED' ? 'Closed' : pr.draft ? 'Draft' : 'Open';
   return [state, pr.state === 'OPEN' ? checks : '', pr.state === 'OPEN' ? REVIEW[pr.review] : ''].filter(Boolean).join(' · ');
 }
+// Ship it only makes sense on a finished worktree task with something to ship: uncommitted
+// changes, or commits its open PR (or a new one) doesn't have yet. Unchecked yet: assume it might.
+function shippable(s) {
+  if (!s?.branch || s.agent === 'wisp' || s.state === 'running' || s.state === 'waiting' || s.pr?.state === 'MERGED') return false;
+  const t = s.toShip;
+  return !t || !!(t.dirty || (s.pr?.state === 'OPEN' ? t.unpushed : t.ahead));
+}
+const shipLabel = (s) => (s.pr?.state === 'OPEN' ? `Push to PR #${s.pr.number}` : 'Ship it…');
+
 const prPill = (pr) => `<span class="pill pr pr-${prTone(pr)}" title="PR #${pr.number}: ${esc(prLine(pr))}"><i></i>#${pr.number}</span>`;
 
 // The PR row under a card's bar; reads the live summary, so polled check results show up.
@@ -2846,7 +2854,10 @@ function renderPrStrip(id) {
   const s = S.sessions.get(id);
   if (!node || !s) return;
   const pr = s.pr;
-  $$('[data-a="ship"] span', n.body).forEach((b) => (b.textContent = pr?.state === 'OPEN' ? `Push to #${pr.number}` : pr ? 'Ship again' : 'Ship it'));
+  $$('[data-a="ship"]', n.body).forEach((b) => {
+    b.hidden = !shippable(s);
+    $('span', b).textContent = pr?.state === 'OPEN' ? `Push to #${pr.number}` : pr ? 'Ship again' : 'Ship it';
+  });
   node.hidden = !pr;
   if (!pr) return;
   const tone = prTone(pr);
@@ -3539,14 +3550,31 @@ function openMachines({ host, focusAdd = false } = {}) {
   const close = present(node, host);
   const body = $('.mc-body', node);
   let editing = null; // machine id whose form is open, '' = a new one, null = closed
-  let hosts = [];
-  api('/machines/ssh-hosts')
+  let hosts = []; // found on this computer: ~/.ssh/config, Tailscale peers, ~/.ssh/known_hosts
+  api('/machines/discover')
     .then((h) => {
       hosts = h;
+      const slot = $('.mc-found-slot', node);
+      if (slot) slot.innerHTML = found();
       const dl = $('#sshHosts', node);
-      if (dl) dl.innerHTML = hosts.map((x) => `<option value="${esc(x.host)}">${esc([x.user, x.hostname].filter(Boolean).join('@'))}</option>`).join('');
+      if (dl) dl.innerHTML = datalist();
     })
     .catch(() => {});
+  const datalist = () => hosts.map((x) => `<option value="${esc(x.target)}">${esc(x.detail || '')}</option>`).join('');
+  const SOURCE = { 'ssh-config': '~/.ssh/config', tailscale: 'Tailscale', 'known-hosts': 'You’ve SSHed here before' };
+  // Hosts not added yet, one click from a filled-in form.
+  const found = () => {
+    const added = new Set(S.machines.map((m) => m.target));
+    const list = hosts.filter((x) => !added.has(x.target));
+    if (!list.length) return '';
+    return `<div class="mc-found"><h4>Found on this computer</h4><div class="mc-found-list">${list
+      .slice(0, 12)
+      .map(
+        (x) =>
+          `<button type="button" class="lp-chip${x.online === false ? ' off' : ''}" data-a="pick" data-target="${esc(x.target)}" data-name="${esc(x.name)}" title="${esc([SOURCE[x.source], x.target, x.detail].filter(Boolean).join(' · '))}">${icon('server')}${esc(x.name)}${x.online !== undefined ? `<i class="mc-fdot"></i>` : ''}</button>`,
+      )
+      .join('')}</div></div>`;
+  };
 
   // Projects on a machine open here, with a way back.
   const sub = (view) => {
@@ -3630,8 +3658,10 @@ function openMachines({ host, focusAdd = false } = {}) {
     const add = $('.mc-add', node);
     // The form for a new machine: open when there are none yet, else behind a button.
     if (!S.machines.length || editing === '') {
-      if (!$('form[data-id=""]', add)) add.innerHTML = `<h4>${S.machines.length ? 'Add another machine' : 'Add your first machine'}</h4>${form(null)}<datalist id="sshHosts">${hosts.map((x) => `<option value="${esc(x.host)}">${esc([x.user, x.hostname].filter(Boolean).join('@'))}</option>`).join('')}</datalist>`;
-    } else add.innerHTML = `<button class="lp-chip add mc-new" data-a="new">${icon('plus')}Add a machine</button><datalist id="sshHosts">${hosts.map((x) => `<option value="${esc(x.host)}"></option>`).join('')}</datalist>`;
+      // Keep a half-filled form; only the suggestions above it change.
+      if ($('form[data-id=""]', add)) $('.mc-found-slot', add).innerHTML = found();
+      else add.innerHTML = `<div class="mc-found-slot">${found()}</div><h4>${S.machines.length ? 'Add another machine' : 'Add your first machine'}</h4>${form(null)}<datalist id="sshHosts">${datalist()}</datalist>`;
+    } else add.innerHTML = `<div class="mc-found-slot">${found()}</div><button class="lp-chip add mc-new" data-a="new">${icon('plus')}Add a machine</button><datalist id="sshHosts">${datalist()}</datalist>`;
   };
 
   const menu = (m, anchor) => {
@@ -3703,6 +3733,16 @@ function openMachines({ host, focusAdd = false } = {}) {
       $('.mc-add input[name="target"]', node)?.focus();
       return;
     }
+    if (a === 'pick') {
+      // Fill in the form; connecting still waits for the button.
+      editing = '';
+      paint();
+      const f = $('.mc-add form[data-id=""]', node);
+      f.target.value = b.dataset.target;
+      f.name.value = b.dataset.name;
+      $('button[type="submit"]', f).focus();
+      return;
+    }
     if (a === 'cancel') {
       editing = null;
       paint();
@@ -3718,8 +3758,8 @@ function openMachines({ host, focusAdd = false } = {}) {
   node.addEventListener('input', (e) => {
     if (e.target.name !== 'target') return;
     const name = $('input[name="name"]', e.target.form);
-    const h = hosts.find((x) => x.host === e.target.value.trim());
-    name.placeholder = (h?.host || e.target.value.trim().replace(/^.*@/, '')).slice(0, 40) || 'devbox';
+    const h = hosts.find((x) => x.target === e.target.value.trim());
+    name.placeholder = (h?.name || e.target.value.trim().replace(/^.*@/, '')).slice(0, 40) || 'devbox';
   });
   node.addEventListener('submit', async (e) => {
     e.preventDefault();
@@ -4201,7 +4241,7 @@ function paletteItems() {
     if (cur.archived || !live) items.push({ group: g, label: cur.archived ? 'Unarchive' : 'Archive', sub, icon: 'archive', kbd: 'A', run: () => setArchived(id, !cur.archived) });
     items.push({ group: g, label: 'Take over in terminal', sub, icon: 'terminal', kbd: 'T', run: () => takeOver(id) });
     items.push({ group: g, label: 'Rerun…', sub, icon: 'rerun', kbd: '⇧R', keywords: 'retry again restart model harness', run: () => rerun(id) });
-    if (cur.branch && !live && cur.pr?.state !== 'MERGED') items.push({ group: g, label: cur.pr?.state === 'OPEN' ? `Push to PR #${cur.pr.number}` : 'Ship it…', sub, icon: 'send', kbd: 'S', keywords: 'commit push pull request pr github', run: () => shipDialog(id) });
+    if (shippable(cur)) items.push({ group: g, label: shipLabel(cur), sub, icon: 'send', kbd: 'S', keywords: 'commit push pull request pr github', run: () => shipDialog(id) });
     if (cur.pr?.state === 'OPEN') items.push({ group: g, label: `Merge PR #${cur.pr.number}…`, sub, icon: 'check', keywords: 'squash github', run: () => mergePr(id) });
     if (cur.groupId) items.push({ group: g, label: 'Compare runs', sub, icon: 'agent', keywords: 'vs side by side harness', run: () => compareView(id) });
     items.push({ group: g, label: 'Save as recipe…', sub, icon: 'spark', keywords: 'template reuse automation', run: () => saveAsRecipe(id) });
@@ -4324,7 +4364,7 @@ function connect() {
       renderFeed();
     });
     if (prev?.state !== s.state || prev?.queued !== s.queued) scheduleRefetch(s.id);
-    if (JSON.stringify(prev?.pr) !== JSON.stringify(s.pr)) renderPrStrip(s.id);
+    if (JSON.stringify([prev?.pr, prev?.toShip, prev?.state]) !== JSON.stringify([s.pr, s.toShip, s.state])) renderPrStrip(s.id);
   });
   es.addEventListener('activity', (e) => onActivity(JSON.parse(e.data)));
   es.addEventListener('turn', (e) => scheduleRefetch(JSON.parse(e.data).sessionId));
@@ -4486,7 +4526,7 @@ document.addEventListener('keydown', (e) => {
     deleteSession(id);
   } else if (k === 't' && id) takeOver(id);
   else if (k === 'r' && e.shiftKey && id) rerun(id);
-  else if (k === 's' && id && S.sessions.get(id)?.branch) shipDialog(id);
+  else if (k === 's' && id && shippable(S.sessions.get(id))) shipDialog(id);
   else if (k === 'r' && id) replay(id);
   else if (k === '/' && id) {
     e.preventDefault();